Update to Rector 2.7

composer.json

@@ -76,7 +76,7 @@
         "stan-setup": "phive install",
         "lowest": "validate-prefer-lowest",
         "lowest-setup": "composer update --prefer-lowest --prefer-stable --prefer-dist --no-interaction && cp composer.json composer.backup && composer require --dev dereuromark/composer-prefer-lowest && mv composer.backup composer.json",
-        "rector-setup": "cp composer.json composer.backup && composer require --dev rector/rector:\"~2.3.1\" phpstan/phpstan:\"~2.1.40\" && mv composer.backup composer.json",
+        "rector-setup": "cp composer.json composer.backup && composer require --dev rector/rector:\"~2.7.0\" phpstan/phpstan:\"~2.3.0\" && mv composer.backup composer.json",
         "rector-check": "vendor/bin/rector process --dry-run",
         "rector-fix": "vendor/bin/rector process",
         "test": "phpunit",

phpcs.xml

@@ -18,6 +18,15 @@
 
     <rule ref="./vendor/cakephp/cakephp-codesniffer/CakePHP/ruleset.xml"/>
 
+    <rule ref="SlevomatCodingStandard.TypeHints.DeclareStrictTypes">
+        <include-pattern>*/src/*</include-pattern>
+        <include-pattern>*/tests/*</include-pattern>
+        <properties>
+            <property name="linesCountBeforeDeclare" value="0"/>
+            <property name="linesCountAfterDeclare" value="1"/>
+            <property name="spacesCountAroundEqualsSign" value="0"/>
+        </properties>
+    </rule>
     <!-- Necessary for class aliases used for backwards compat -->
     <rule ref="PSR1.Files.SideEffects.FoundWithSymbols">
         <severity>0</severity>

rector.php

@@ -3,12 +3,16 @@
 
 use Rector\Caching\ValueObject\Storage\FileCacheStorage;
 use Rector\CodeQuality\Rector\FuncCall\CompactToVariablesRector;
-use Rector\CodeQuality\Rector\If_\ExplicitBoolCompareRector;
+use Rector\CodeQuality\Rector\If_\ArrayExplicitBoolCompareRector;
+use Rector\CodeQuality\Rector\If_\ObjectExplicitBoolCompareRector;
 use Rector\CodingStyle\Rector\Assign\SplitDoubleAssignRector;
 use Rector\CodingStyle\Rector\Catch_\CatchExceptionNameMatchingTypeRector;
 use Rector\CodingStyle\Rector\Stmt\NewlineAfterStatementRector;
 use Rector\Config\RectorConfig;
+use Rector\DeadCode\Rector\ClassMethod\RemoveDuplicatedReturnSelfDocblockRector;
+use Rector\DeadCode\Rector\ClassMethod\RemoveMixedDocblockOverruledByNativeTypeRector;
 use Rector\DeadCode\Rector\ClassMethod\RemoveUselessReturnTagRector;
+use Rector\DeadCode\Rector\ClassMethod\RemoveUselessUnionReturnDocblockRector;
 use Rector\Php74\Rector\Closure\ClosureToArrowFunctionRector;
 use Rector\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector;
 use Rector\Set\ValueObject\SetList;
@@ -49,6 +53,10 @@
         ReturnTypeFromStrictFluentReturnRector::class,
         SplitDoubleAssignRector::class,
         NewlineAfterStatementRector::class,
-        ExplicitBoolCompareRector::class,
         TypedPropertyFromCreateMockAssignRector::class,
+        ArrayExplicitBoolCompareRector::class,
+        ObjectExplicitBoolCompareRector::class,
+        RemoveUselessUnionReturnDocblockRector::class,
+        RemoveMixedDocblockOverruledByNativeTypeRector::class,
+        RemoveDuplicatedReturnSelfDocblockRector::class,
     ]);

src/Command/BakeMigrationDiffCommand.php

@@ -312,9 +312,7 @@ protected function getColumns(): void
                         if ($attribute === 'length') {
                             $phinxAttributeName = 'limit';
                         }
-                        if (!isset($changedAttributes[$phinxAttributeName])) {
-                            $changedAttributes[$phinxAttributeName] = $column[$attribute];
-                        }
+                        $changedAttributes[$phinxAttributeName] ??= $column[$attribute];
                     }
 
                     // Only convert unsigned to signed if it actually changed
@@ -352,9 +350,7 @@ protected function getColumns(): void
                         unset($changedAttributes['limit']);
                     } elseif (isset($changedAttributes['length'])) {
                         // For non-decimal columns, convert 'length' to 'limit'
-                        if (!isset($changedAttributes['limit'])) {
-                            $changedAttributes['limit'] = $changedAttributes['length'];
-                        }
+                        $changedAttributes['limit'] ??= $changedAttributes['length'];
                         unset($changedAttributes['length']);
                     }
 
@@ -363,9 +359,7 @@ protected function getColumns(): void
             }
 
             // columns deletion
-            if (!isset($this->templateData[$table]['columns']['remove'])) {
-                $this->templateData[$table]['columns']['remove'] = [];
-            }
+            $this->templateData[$table]['columns']['remove'] ??= [];
             $removedColumns = array_diff($oldColumns, $currentColumns);
             foreach ($removedColumns as $columnName) {
                 $column = $this->safeGetColumn($this->dumpSchema[$table], $columnName);
@@ -484,9 +478,7 @@ protected function getIndexes(): void
             }
 
             // indexes deletion
-            if (!isset($this->templateData[$table]['indexes']['remove'])) {
-                $this->templateData[$table]['indexes']['remove'] = [];
-            }
+            $this->templateData[$table]['indexes']['remove'] ??= [];
 
             $removedIndexes = array_diff($oldIndexes, $currentIndexes);
             $parts = [];

src/Db/Adapter/MysqlAdapter.php

@@ -441,14 +441,12 @@ protected function mapColumnData(array $data): array
                     break;
                 }
             }
-            if ($data['length'] === null) {
-                $data['length'] = match ($data['type']) {
-                    self::PHINX_TYPE_TINYBLOB => TableSchema::LENGTH_TINY,
-                    self::PHINX_TYPE_MEDIUMBLOB => TableSchema::LENGTH_MEDIUM,
-                    self::PHINX_TYPE_LONGBLOB => TableSchema::LENGTH_LONG,
-                    default => null,
-                };
-            }
+            $data['length'] ??= match ($data['type']) {
+                self::PHINX_TYPE_TINYBLOB => TableSchema::LENGTH_TINY,
+                self::PHINX_TYPE_MEDIUMBLOB => TableSchema::LENGTH_MEDIUM,
+                self::PHINX_TYPE_LONGBLOB => TableSchema::LENGTH_LONG,
+                default => null,
+            };
             $data['type'] = 'binary';
         } elseif ($data['type'] === self::TYPE_INTEGER) {
             if (isset($data['length']) && $data['length'] === self::INT_BIG) {

src/Db/Adapter/SqliteAdapter.php

@@ -710,7 +710,7 @@ protected function bufferIndicesAndTriggers(AlterInstructions $instructions, str
                     case 'index':
                         $info = $indexMap[$row['name']];
                         $columns = array_map(
-                            function ($column) {
+                            function ($column): ?string {
                                 if ($column === null) {
                                     return null;
                                 }

src/Db/Plan/Plan.php

@@ -432,14 +432,10 @@ protected function gatherUpdates(array $actions): void
             $name = $table->getName();
 
             if ($action instanceof RemoveColumn) {
-                if (!isset($this->columnRemoves[$name])) {
-                    $this->columnRemoves[$name] = new AlterTable($table);
-                }
+                $this->columnRemoves[$name] ??= new AlterTable($table);
                 $this->columnRemoves[$name]->addAction($action);
             } else {
-                if (!isset($this->tableUpdates[$name])) {
-                    $this->tableUpdates[$name] = new AlterTable($table);
-                }
+                $this->tableUpdates[$name] ??= new AlterTable($table);
                 $this->tableUpdates[$name]->addAction($action);
             }
         }
@@ -465,9 +461,7 @@ protected function gatherTableMoves(array $actions): void
             $table = $action->getTable();
             $name = $table->getName();
 
-            if (!isset($this->tableMoves[$name])) {
-                $this->tableMoves[$name] = new AlterTable($table);
-            }
+            $this->tableMoves[$name] ??= new AlterTable($table);
 
             $this->tableMoves[$name]->addAction($action);
         }
@@ -492,9 +486,7 @@ protected function gatherIndexes(array $actions): void
             $table = $action->getTable();
             $name = $table->getName();
 
-            if (!isset($this->indexes[$name])) {
-                $this->indexes[$name] = new AlterTable($table);
-            }
+            $this->indexes[$name] ??= new AlterTable($table);
 
             $this->indexes[$name]->addAction($action);
         }
@@ -522,9 +514,7 @@ protected function gatherConstraints(array $actions): void
             $table = $action->getTable();
             $name = $table->getName();
 
-            if (!isset($this->constraints[$name])) {
-                $this->constraints[$name] = new AlterTable($table);
-            }
+            $this->constraints[$name] ??= new AlterTable($table);
 
             $this->constraints[$name]->addAction($action);
         }
@@ -553,9 +543,7 @@ protected function gatherPartitions(array $actions): void
             $table = $action->getTable();
             $name = $table->getName();
 
-            if (!isset($this->partitions[$name])) {
-                $this->partitions[$name] = new AlterTable($table);
-            }
+            $this->partitions[$name] ??= new AlterTable($table);
 
             $this->partitions[$name]->addAction($action);
         }
@@ -581,9 +569,7 @@ protected function gatherViewsAndTriggers(array $actions): void
             $table = $action->getTable();
             $name = $table->getName();
 
-            if (!isset($this->viewsAndTriggers[$name])) {
-                $this->viewsAndTriggers[$name] = new AlterTable($table);
-            }
+            $this->viewsAndTriggers[$name] ??= new AlterTable($table);
 
             $this->viewsAndTriggers[$name]->addAction($action);
         }

src/TestSuite/Migrator.php

@@ -93,9 +93,7 @@ public function runMany(
 
             $options[$i] = $migrationSet;
             $connectionName = $migrationSet['connection'];
-            if (!isset($connectionsList[$connectionName])) {
-                $connectionsList[$connectionName] = ['name' => $connectionName, 'skip' => $skip];
-            }
+            $connectionsList[$connectionName] ??= ['name' => $connectionName, 'skip' => $skip];
 
             // Sets sharing a connection and a plugin also share a migration history,
             // while each of them only has its own source directory on disk. Group

src/View/Helper/MigrationHelper.php

@@ -424,10 +424,7 @@ public function getColumnOption(array $options): array
         } else {
             // Convert CakePHP's precision (decimal places) to Migrations' scale
             // Only convert if scale is not already set (for decimal columns from diff)
-            if (!isset($columnOptions['scale'])) {
-                $columnOptions['scale'] = $columnOptions['precision'];
-            }
-
+            $columnOptions['scale'] ??= $columnOptions['precision'];
             if (isset($columnOptions['limit'])) {
                 $columnOptions['precision'] = $columnOptions['limit'];
                 unset($columnOptions['limit']);

tests/Fixture/ArticlesFixture.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)

tests/Fixture/CategoriesFixture.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)

tests/Fixture/CompositePkFixture.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)

tests/Fixture/EventsFixture.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Migrations\Test\Fixture;
 
 use Cake\TestSuite\Fixture\TestFixture;

tests/Fixture/OrdersFixture.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)

tests/Fixture/PartsFixture.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)

tests/Fixture/ProductsFixture.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)

tests/Fixture/SpecialPkFixture.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)

tests/Fixture/SpecialTagsFixture.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)

tests/Fixture/TextsFixture.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace Migrations\Test\Fixture;
 
 use Cake\TestSuite\Fixture\TestFixture;

tests/Fixture/UsersFixture.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 /**
  * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)

tests/TestCase/Command/EntryCommandTest.php

@@ -26,11 +26,6 @@ class EntryCommandTest extends TestCase
 {
     use ConsoleIntegrationTestTrait;
 
-    protected function setUp(): void
-    {
-        parent::setUp();
-    }
-
     /**
      * Test execute() generating help
      *

tests/TestCase/Db/Adapter/PostgresAdapterTest.php

@@ -45,9 +45,7 @@ private function isPostgresAvailable()
     {
         static $available;
 
-        if ($available === null) {
-            $available = in_array('pgsql', PDO::getAvailableDrivers(), true);
-        }
+        $available ??= in_array('pgsql', PDO::getAvailableDrivers(), true);
 
         return $available;
     }

tests/test_app/Plugin/Migrator/config/Migrations/20211001000000_migrator.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 use Migrations\BaseMigration;
 
 class Migrator extends BaseMigration

tests/test_app/Plugin/Migrator/config/Migrations2/20211002000000_migrator2.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 use Migrations\BaseMigration;
 
 class Migrator2 extends BaseMigration

tests/test_app/Plugin/TestBlog/config/CallSeeds/PluginLettersSeed.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 use Migrations\BaseSeed;
 
 /**

tests/test_app/Plugin/TestBlog/config/CallSeeds/PluginSubLettersSeed.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 use Migrations\BaseSeed;
 
 /**

tests/test_app/config/AltSeeds/AnotherNumbersSeed.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 use Migrations\BaseSeed;
 
 /**

tests/test_app/config/AltSeeds/NumbersAltSeed.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 use Migrations\BaseSeed;
 
 /**

tests/test_app/config/CallSeeds/DatabaseSeed.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 use Migrations\BaseSeed;
 
 /**

tests/test_app/config/CallSeeds/LettersSeed.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 use Migrations\BaseSeed;
 
 /**

tests/test_app/config/CallSeeds/NumbersCallSeed.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 use Migrations\BaseSeed;
 
 /**