Apply Rector

MGatner · MGatner · commit 024ac1432094 · 2022-09-01T16:44:36.000Z
diff --git a/rector.php b/rector.php
@@ -82,6 +82,7 @@
         // Ignore files that should not be namespaced
         NormalizeNamespaceByPSR4ComposerAutoloadRector::class => [
             __DIR__ . '/src/Helpers',
+            __DIR__ . '/tests/_support',
         ],
 
         // May load view files directly when detecting classes
diff --git a/src/Handlers/ArrayHandler.php b/src/Handlers/ArrayHandler.php
@@ -17,15 +17,15 @@ class ArrayHandler extends BaseHandler
      *
      * @var array<string,array<string,array>>
      */
-    private $general = [];
+    private array $general = [];
 
     /**
      * Storage for context settings.
      * Format: ['context' => ['class' => ['property' => ['value', 'type']]]]
      *
      * @var array<string,array|null>
      */
-    private $contexts = [];
+    private array $contexts = [];
 
     public function has(string $class, string $property, ?string $context = null): bool
     {
@@ -53,14 +53,10 @@ public function forget(string $class, string $property, ?string $context = null)
     protected function hasStored(string $class, string $property, ?string $context): bool
     {
         if ($context === null) {
-            return isset($this->general[$class])
-                ? array_key_exists($property, $this->general[$class])
-                : false;
+            return isset($this->general[$class]) && array_key_exists($property, $this->general[$class]);
         }
 
-        return isset($this->contexts[$context][$class])
-            ? array_key_exists($property, $this->contexts[$context][$class])
-            : false;
+        return isset($this->contexts[$context][$class]) && array_key_exists($property, $this->contexts[$context][$class]);
     }
 
     /**
diff --git a/src/Handlers/DatabaseHandler.php b/src/Handlers/DatabaseHandler.php
@@ -13,10 +13,8 @@ class DatabaseHandler extends ArrayHandler
 {
     /**
      * The database table to use.
-     *
-     * @var string
      */
-    private $table;
+    private string $table;
 
     /**
      * Array of contexts that have been stored.
diff --git a/src/Settings.php b/src/Settings.php
@@ -19,7 +19,7 @@ class Settings
      *
      * @var BaseHandler[]
      */
-    private $handlers = [];
+    private array $handlers = [];
 
     /**
      * An array of the config options for each handler.
@@ -55,7 +55,7 @@ public function get(string $key, ?string $context = null)
         [$class, $property, $config] = $this->prepareClassAndProperty($key);
 
         // Check each of our handlers
-        foreach ($this->handlers as $name => $handler) {
+        foreach ($this->handlers as $handler) {
             if ($handler->has($class, $property, $context)) {
                 return $handler->get($class, $property, $context);
             }
diff --git a/tests/HelperTest.php b/tests/HelperTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace CodeIgniter4\Tests;
+namespace Tests;
 
 use CodeIgniter\Settings\Settings;
 use CodeIgniter\Test\DatabaseTestTrait;

Original file line number	Diff line number	Diff line change
`@@ -17,15 +17,15 @@ class ArrayHandler extends BaseHandler`
`17`	`17`	`*`
`18`	`18`	`* @var array<string,array<string,array>>`
`19`	`19`	`*/`
`20`		`- private $general = [];`
	`20`	`+ private array $general = [];`
`21`	`21`
`22`	`22`	`/**`
`23`	`23`	`* Storage for context settings.`
`24`	`24`	`* Format: ['context' => ['class' => ['property' => ['value', 'type']]]]`
`25`	`25`	`*`
`26`	`26`	`* @var array<string,array\|null>`
`27`	`27`	`*/`
`28`		`- private $contexts = [];`
	`28`	`+ private array $contexts = [];`
`29`	`29`
`30`	`30`	`public function has(string $class, string $property, ?string $context = null): bool`
`31`	`31`	`{`
`@@ -53,14 +53,10 @@ public function forget(string $class, string $property, ?string $context = null)`
`53`	`53`	`protected function hasStored(string $class, string $property, ?string $context): bool`
`54`	`54`	`{`
`55`	`55`	`if ($context === null) {`
`56`		`- return isset($this->general[$class])`
`57`		`- ? array_key_exists($property, $this->general[$class])`
`58`		`- : false;`
	`56`	`+ return isset($this->general[$class]) && array_key_exists($property, $this->general[$class]);`
`59`	`57`	`}`
`60`	`58`
`61`		`- return isset($this->contexts[$context][$class])`
`62`		`- ? array_key_exists($property, $this->contexts[$context][$class])`
`63`		`- : false;`
	`59`	`+ return isset($this->contexts[$context][$class]) && array_key_exists($property, $this->contexts[$context][$class]);`
`64`	`60`	`}`
`65`	`61`
`66`	`62`	`/**`