Some code refresh

.github/workflows/build-mysql5.yml

@@ -30,7 +30,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install PHP
         uses: shivammathur/setup-php@v2

.github/workflows/build-mysql8.yml

@@ -30,7 +30,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install PHP
         uses: shivammathur/setup-php@v2

.github/workflows/build-pgsql.yml

@@ -28,7 +28,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install PHP
         uses: shivammathur/setup-php@v2

.github/workflows/build-sqlite.yml

@@ -17,7 +17,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install PHP
         uses: shivammathur/setup-php@v2

.github/workflows/mutation.yml

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install PHP
         uses: shivammathur/setup-php@v2

.github/workflows/static-anal.yml

@@ -16,7 +16,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install PHP
         uses: shivammathur/setup-php@v2

composer.json

@@ -28,7 +28,7 @@
   "require-dev": {
     "infection/infection": "*",
     "phpstan/phpstan": "*",
-    "phpunit/phpunit": "*",
+    "phpunit/phpunit": "<10.0",
     "roave/security-advisories": "dev-latest"
   },
   "autoload": {

phpunit-no-yii-autoload.xml.dist

@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<phpunit bootstrap="./tests/bootstrap-no-autoload.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         stopOnFailure="false"
-         processIsolation="true">
-    <testsuites>
-        <testsuite name="Yii 2 Migration Test Suite (No Yii Autoloader)">
-            <directory>./tests</directory>
-        </testsuite>
-    </testsuites>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="./tests/bootstrap-no-autoload.php" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" stopOnFailure="false" processIsolation="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage processUncoveredFiles="true">
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+    <exclude>
+      <directory suffix=".php">./src/dummy</directory>
+      <directory suffix=".php">./src/views</directory>
+    </exclude>
+  </coverage>
+  <testsuites>
+    <testsuite name="Yii 2 Migration Test Suite (No Yii Autoloader)">
+      <directory>./tests</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>

phpunit.xml.dist

@@ -1,23 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<phpunit bootstrap="./tests/bootstrap.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         stopOnFailure="false"
-         processIsolation="true">
-    <testsuites>
-        <testsuite name="Yii 2 Migration Test Suite">
-            <directory>./tests</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">./src</directory>
-            <exclude>
-                <directory suffix=".php">./src/dummy</directory>
-                <directory suffix=".php">./src/views</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="./tests/bootstrap.php" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" stopOnFailure="false" processIsolation="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage processUncoveredFiles="true">
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+    <exclude>
+      <directory suffix=".php">./src/dummy</directory>
+      <directory suffix=".php">./src/views</directory>
+    </exclude>
+  </coverage>
+  <testsuites>
+    <testsuite name="Yii 2 Migration Test Suite">
+      <directory>./tests</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>

src/Arranger.php

@@ -6,12 +6,6 @@
 
 use yii\base\NotSupportedException;
 
-use function array_diff;
-use function array_key_exists;
-use function array_merge_recursive;
-use function array_unique;
-use function count;
-
 final class Arranger implements ArrangerInterface
 {
     /** @var TableMapperInterface */
@@ -49,12 +43,10 @@ public function arrangeTables(array $inputTables): void
 
     /**
      * Adds dependency of the table.
-     * @param string $table
-     * @param string|null $dependsOnTable
      */
     private function addDependency(string $table, string $dependsOnTable = null): void
     {
-        if (!array_key_exists($table, $this->dependencies)) {
+        if (!\array_key_exists($table, $this->dependencies)) {
             $this->dependencies[$table] = [];
         }
 
@@ -92,7 +84,7 @@ public function getReferencesToPostpone(): array
             }
         }
 
-        return array_unique($flattenedReferencesToPostpone);
+        return \array_unique($flattenedReferencesToPostpone);
     }
 
     /**
@@ -104,21 +96,21 @@ private function arrangeDependencies(array $input): void
         $order = [];
         $checkList = [];
 
-        $inputCount = count($input);
+        $inputCount = \count($input);
 
-        while ($inputCount > count($order)) {
+        while ($inputCount > \count($order)) {
             $done = false;
             $lastCheckedName = $lastCheckedDependency = null;
 
             foreach ($input as $name => $dependencies) {
-                if (array_key_exists($name, $checkList)) {
+                if (\array_key_exists($name, $checkList)) {
                     continue;
                 }
 
                 $resolved = true;
 
                 foreach ($dependencies as $dependency) {
-                    if (!array_key_exists($dependency, $checkList)) {
+                    if (!\array_key_exists($dependency, $checkList)) {
                         $resolved = false;
                         $lastCheckedName = $name;
                         $lastCheckedDependency = $dependency;
@@ -135,7 +127,7 @@ private function arrangeDependencies(array $input): void
             }
 
             if ($done === false) {
-                $input[$lastCheckedName] = array_diff($input[$lastCheckedName], [$lastCheckedDependency]);
+                $input[$lastCheckedName] = \array_diff($input[$lastCheckedName], [$lastCheckedDependency]);
 
                 $this->arrangeDependencies($input);
                 $order = $this->getTablesInOrder();