Apply Rector fixes

Author: MGatner

rector.php

@@ -66,6 +66,7 @@
 
     // Are there files or rules you need to skip?
     $rectorConfig->skip([
+        __DIR__ . '/src/Archiver/Handlers/CliHandler.php', // Rector doesn't like the Kint modifier
         __DIR__ . '/src/Views',
 
         JsonThrowOnErrorRector::class,
@@ -114,6 +115,6 @@
     $rectorConfig->rule(NormalizeNamespaceByPSR4ComposerAutoloadRector::class);
     $rectorConfig
         ->ruleWithConfiguration(TypedPropertyRector::class, [
-            TypedPropertyRector::INLINE_PUBLIC => true,
+            TypedPropertyRector::INLINE_PUBLIC => false,
         ]);
 };

src/Collectors/Schema.php

@@ -70,7 +70,7 @@ public function getTitleDetails(): string
             return '(No tables)';
         }
 
-        return '(' . count($this->schema->tables) . ' tables)';
+        return '(' . (is_countable($this->schema->tables) ? count($this->schema->tables) : 0) . ' tables)';
     }
 
     //--------------------------------------------------------------------

src/Language/en/Schemas.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Tatter\Schemas\Language\en;
+
 return [
     'methodNotImplemented' => '{0} does not have a {1} method',
     'unsupportedHandler'   => 'Handler not supported: {0}',

src/Reader/Handlers/CacheHandler.php

@@ -32,11 +32,9 @@ public function __construct(?SchemasConfig $config = null, ?CacheInterface $cach
         $this->cacheInit($cache);
 
         // Start $tables as the cached scaffold version
-        if ($scaffold = $this->cache->get($this->cacheKey)) {
-            if (isset($scaffold->tables)) {
-                $this->tables = $scaffold->tables ?? new Mergeable();
-                $this->ready  = true;
-            }
+        if (($scaffold = $this->cache->get($this->cacheKey)) && isset($scaffold->tables)) {
+            $this->tables = $scaffold->tables ?? new Mergeable();
+            $this->ready  = true;
         }
     }
 
@@ -131,7 +129,7 @@ public function __isset($name): bool
      */
     public function count(): int
     {
-        return count($this->tables);
+        return $this->tables === null ? 0 : count($this->tables);
     }
 
     /**

src/Structures/Mergeable.php

@@ -11,8 +11,6 @@ class Mergeable implements Countable, IteratorAggregate
 {
     /**
      * Merge two structures together.
-     *
-     * @return $this
      */
     public function merge(?Mergeable $object): Mergeable
     {

src/Traits/CacheHandlerTrait.php

@@ -11,7 +11,7 @@ trait CacheHandlerTrait
     /**
      * The cache handler instance.
      *
-     * @var \CodeIgniter\Cache\CacheInterface
+     * @var CacheInterface
      */
     protected $cache;
 

tests/_support/Database/Migrations/2019-09-02-092335_create_test_tables.php

@@ -2,10 +2,11 @@
 
 namespace Tests\Support\Database\Migrations;
 
+use CodeIgniter\Database\BaseConnection;
 use CodeIgniter\Database\Migration;
 
 /**
- * @property \CodeIgniter\Database\BaseConnection $db
+ * @property BaseConnection $db
  */
 class CreateTestTables extends Migration
 {

tests/_support/Database/Seeds/TestSeeder.php

@@ -2,7 +2,9 @@
 
 namespace Tests\Support\Database\Seeds;
 
-class TestSeeder extends \CodeIgniter\Database\Seeder
+use CodeIgniter\Database\Seeder;
+
+class TestSeeder extends Seeder
 {
     public function run()
     {

tests/_support/DatabaseTestCase.php

@@ -4,6 +4,7 @@
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
+use Tatter\Schemas\Config\Schemas;
 
 /**
  * @internal
@@ -64,7 +65,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $config                    = new \Tatter\Schemas\Config\Schemas();
+        $config                    = new Schemas();
         $config->silent            = false;
         $config->ignoredTables     = ['migrations'];
         $config->ignoredNamespaces = [];

tests/_support/Schemas/Good/Products.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Support;
+namespace Tests\Support\Schemas\Good;
 
 use Tatter\Schemas\Structures\Relation;
 use Tatter\Schemas\Structures\Schema;