feat: run rector, and fix issues

Author: pongee

.github/workflows/tests.yml

@@ -41,5 +41,8 @@ jobs:
       - name: Run static analysis
         run: composer run-script phpstan
 
+      - name: Run rector
+        run: composer run-script rector-dry-run
+
       - name: Run phpcs analysis
         run: composer run-script phpcs

composer.json

@@ -38,7 +38,9 @@
   "scripts": {
     "phpcs": "phpcs",
     "phpstan": "phpstan analyse --memory-limit=512M",
-    "test": "php ./vendor/bin/phpunit"
+    "test": "php ./vendor/bin/phpunit",
+    "rector": "php ./vendor/bin/rector process example src test",
+    "rector-dry-run": "php ./vendor/bin/rector process example src test --dry-run"
   },
   "config": {
     "allow-plugins": {

rector.php

@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+use Rector\Config\RectorConfig;
+use Rector\DeadCode\Rector\ClassMethod\RemoveUselessParamTagRector;
+use Rector\DeadCode\Rector\ClassMethod\RemoveUselessReturnTagRector;
+use Rector\DeadCode\Rector\Node\RemoveNonExistingVarAnnotationRector;
+use Rector\DeadCode\Rector\Property\RemoveUselessReadOnlyTagRector;
+use Rector\DeadCode\Rector\Property\RemoveUselessVarTagRector;
+
+return RectorConfig::configure()
+    ->withRules([
+        RemoveUselessParamTagRector::class,
+        RemoveUselessReturnTagRector::class,
+        RemoveUselessReadOnlyTagRector::class,
+        RemoveNonExistingVarAnnotationRector::class,
+        RemoveUselessVarTagRector::class,
+    ])
+    ->withPreparedSets(
+        typeDeclarations: true,
+    )
+    ->withPhpSets(
+        php81: true,
+    );

src/DataObject/Sql/Database/Table/ColumnCollection.php

@@ -9,7 +9,7 @@ class ColumnCollection implements ColumnCollectionInterface
     /** @var ColumnInterface[] */
     private array $columns = [];
 
-    public function add(ColumnInterface $column)
+    public function add(ColumnInterface $column): void
     {
         $this->columns[$column->getName()] = $column;
     }

src/Parser/CassandraParser.php

@@ -219,19 +219,15 @@ protected function getColumnsWithoutRequiredTypeParametersFromCreateTableSchema(
     protected function trimNames(string ...$strings): array
     {
         return array_map(
-            function ($string) {
-                return $this->trimName($string);
-            },
+            fn($string): string => $this->trimName($string),
             $strings
         );
     }
 
     protected function getFormatedParameters(string ...$strings): array
     {
         return array_map(
-            function ($string) {
-                return $this->getFormatedParameter($string);
-            },
+            fn($string): string => $this->getFormatedParameter($string),
             $strings
         );
     }
@@ -535,9 +531,7 @@ private function handleMapAndSetConnections(
         ConnectionCollectionInterface $connections
     ): ConnectionCollection {
         $allDefinedTables = array_map(
-            function (TableInterface $table) {
-                return $table->getName();
-            },
+            fn(TableInterface $table): string => $table->getName(),
             $tables->getIterator()->getArrayCopy()
         );
 

src/Parser/MysqlParser.php

@@ -184,19 +184,15 @@ protected function getColumnsWithoutRequiredTypeParametersFromCreateTableSchema(
     protected function trimNames(string ...$strings): array
     {
         return array_map(
-            function ($string) {
-                return $this->trimName($string);
-            },
+            fn($string): string => $this->trimName($string),
             $strings
         );
     }
 
     protected function getFormatedParameters(string ...$strings): array
     {
         return array_map(
-            function ($string) {
-                return $this->getFormatedParameter($string);
-            },
+            fn($string): string => $this->getFormatedParameter($string),
             $strings
         );
     }

src/Parser/ParserAbstract.php

@@ -129,12 +129,10 @@ private function generateConnections(array $conditions): ConnectionCollectionInt
                             $matches['childTableColumns'][$index]
                         );
                         $childTableColumns = array_map(
-                            static function ($column): string {
-                                return trim(
-                                    $column,
-                                    '` '
-                                );
-                            },
+                            static fn(string $column): string => trim(
+                                $column,
+                                '` '
+                            ),
                             $childTableColumns
                         );
 
@@ -143,12 +141,10 @@ static function ($column): string {
                             (string) $matches['parentTableColumns'][$index]
                         );
                         $parentTableColumns = array_map(
-                            static function ($column): string {
-                                return trim(
-                                    $column,
-                                    '` '
-                                );
-                            },
+                            static fn(string $column): string => trim(
+                                $column,
+                                '` '
+                            ),
                             $parentTableColumns
                         );
 
@@ -219,12 +215,12 @@ protected function removeMultiLineComments($schema): string
     protected function getSafeRandomString(string $schema): string
     {
         do {
-            $safeRandomString = (string)rand();
+            $safeRandomString = (string)random_int(0, mt_getrandmax());
         } while (
-            strpos(
+            str_contains(
                 $schema,
                 $safeRandomString
-            ) !== false
+            )
         );
 
         return $safeRandomString;
@@ -234,12 +230,10 @@ protected function replaceCharactersInString(string $schema, array $replacePairs
     {
         return preg_replace_callback(
             '#(\'.*\')#Uxsm',
-            static function ($matches) use ($replacePairs): string {
-                return strtr(
-                    $matches[0],
-                    $replacePairs
-                );
-            },
+            static fn($matches): string => strtr(
+                $matches[0],
+                $replacePairs
+            ),
             $schema
         );
     }

test/Unit/Parser/CassandraParserTest.php

@@ -68,7 +68,7 @@ public function testParser(
         SplFileInfo $file,
         SchemaInterface $schemaObject,
         ConnectionCollectionInterface $forcedConnections
-    ) {
+    ): void {
         $sut = new CassandraParser();
         $result = $sut->run(file_get_contents($file->getRealPath()), $forcedConnections); //@todo
 

test/Unit/Parser/MysqlParserTest.php

@@ -67,7 +67,7 @@ public function testParser(
         SplFileInfo $file,
         SchemaInterface $schemaObject,
         ConnectionCollectionInterface $forcedConnections
-    ) {
+    ): void {
         $sut = new MysqlParser();
         $result = $sut->run(file_get_contents($file->getRealPath()), $forcedConnections); //@todo
 

test/Unit/Template/Plantuml/V1TemplateTest.php

@@ -373,7 +373,7 @@ public function getSchemaProvider(): array
     /**
      * @dataProvider getSchemaProvider
      */
-    public function testExport(SchemaInterface $schema, string $extendOutput)
+    public function testExport(SchemaInterface $schema, string $extendOutput): void
     {
         $template = file_get_contents(__DIR__ . '/../../../../src/Template/Plantuml/v1.twig');
 
@@ -388,7 +388,7 @@ public function testExport(SchemaInterface $schema, string $extendOutput)
     protected function trim($text): string
     {
         return trim(
-            preg_replace(
+            (string) preg_replace(
                 '/^\s+/m',
                 '',
                 (string) $text