[#2106] Updated to PHPCS v4 and Coder 9.

Author: AlexSkrypnyk

.vortex/installer/composer.json

@@ -37,7 +37,7 @@
         "bamarni/composer-bin-plugin": "^1.8.2",
         "dealerdirect/phpcodesniffer-composer-installer": "^1.2.0",
         "drevops/phpcs-standard": "^0.6",
-        "drupal/coder": "^8.3.31",
+        "drupal/coder": "^9@alpha",
         "ergebnis/composer-normalize": "^2.48.2",
         "laravel/serializable-closure": "^2.0.6",
         "mockery/mockery": "^1.6.12",

.vortex/installer/composer.lock

@@ -38,7 +38,7 @@ public function testParseUri(string $src, ?string $expected_repo = NULL, ?string
 
   public function testDownloadWithMockedArchiver(): void {
     $mock_http_client = $this->createMockHttpClient();
-    /** @var \PHPUnit\Framework\MockObject\MockObject&ArchiverInterface $mock_archiver */
+    /** @var \PHPUnit\Framework\MockObject\MockObject&\DrevOps\VortexInstaller\Downloader\ArchiverInterface $mock_archiver */
     $mock_archiver = $this->createMockArchiver();
     $mock_archiver->expects($this->once())->method('validate');
     $mock_archiver->expects($this->once())->method('extract');
@@ -222,7 +222,7 @@ public function testDownloadFromLocal(string $ref, string $expectedVersion): voi
       $expectedVersion = $ref;
     }
 
-    /** @var \PHPUnit\Framework\MockObject\MockObject&ArchiverInterface $mock_archiver */
+    /** @var \PHPUnit\Framework\MockObject\MockObject&\DrevOps\VortexInstaller\Downloader\ArchiverInterface $mock_archiver */
     $mock_archiver = $this->createMockArchiverWithExtract();
     $downloader = new Downloader(NULL, $mock_archiver);
     $version = $downloader->download($temp_repo_dir, $ref, $destination);

.vortex/installer/tests/Unit/Downloader/DownloaderTest.php

@@ -26,7 +26,7 @@ class GitTest extends UnitTestCase {
    * @param bool $with_commits
    *   Whether to add commits to the repository.
    *
-   * @return array{string, Git}
+   * @return array{string, \DrevOps\VortexInstaller\Utils\Git}
    *   Array with temp directory path and Git object.
    */
   protected function createTempGitRepo(bool $with_remote = FALSE, bool $with_commits = FALSE): array {
@@ -123,7 +123,8 @@ public function testRun(): void {
       // Test with another command.
       $result = $repo->run('log', '--oneline', '--max-count=1');
       $this->assertInstanceOf(RunnerResult::class, $result);
-    } finally {
+    }
+    finally {
       $this->cleanupTempGitRepo($temp_dir);
     }
   }
@@ -134,7 +135,8 @@ public function testListRemotesEmpty(): void {
     try {
       $remotes = $repo->listRemotes();
       $this->assertEmpty($remotes);
-    } finally {
+    }
+    finally {
       $this->cleanupTempGitRepo($temp_dir);
     }
   }
@@ -148,7 +150,8 @@ public function testListRemotesWithRemotes(): void {
       $this->assertArrayHasKey('upstream', $remotes);
       $this->assertEquals('https://github.com/owner/repo.git', $remotes['origin']);
       $this->assertEquals('https://github.com/upstream/repo.git', $remotes['upstream']);
-    } finally {
+    }
+    finally {
       $this->cleanupTempGitRepo($temp_dir);
     }
   }
@@ -162,7 +165,8 @@ public function testGetTrackedFilesNonGitDirectory(): void {
 
     try {
       Git::getTrackedFiles($temp_dir);
-    } finally {
+    }
+    finally {
       rmdir($temp_dir);
     }
   }
@@ -173,7 +177,8 @@ public function testGetTrackedFilesEmptyRepo(): void {
     try {
       $tracked = Git::getTrackedFiles($temp_dir);
       $this->assertEmpty($tracked);
-    } finally {
+    }
+    finally {
       $this->cleanupTempGitRepo($temp_dir);
     }
   }
@@ -186,7 +191,8 @@ public function testGetTrackedFilesWithFiles(): void {
       $this->assertCount(2, $tracked);
       $this->assertContains($temp_dir . DIRECTORY_SEPARATOR . 'test.txt', $tracked);
       $this->assertContains($temp_dir . DIRECTORY_SEPARATOR . 'another.txt', $tracked);
-    } finally {
+    }
+    finally {
       $this->cleanupTempGitRepo($temp_dir);
     }
   }
@@ -198,7 +204,8 @@ public function testGetLastShortCommitId(): void {
       $short_id = $repo->getLastShortCommitId();
       $this->assertEquals(7, strlen($short_id));
       $this->assertMatchesRegularExpression('/^[0-9a-f]{7}$/', $short_id);
-    } finally {
+    }
+    finally {
       $this->cleanupTempGitRepo($temp_dir);
     }
   }

.vortex/installer/tests/Unit/GitTest.php

@@ -189,7 +189,8 @@ public function testBox(
 
       $this->assertSame($expected_clean, $actual_clean);
 
-    } finally {
+    }
+    finally {
       // Restore environment.
       if ($original_columns !== FALSE) {
         putenv('COLUMNS=' . $original_columns);
@@ -571,7 +572,8 @@ public function testUtfPadding(
       $result = $method->invoke(NULL, $char);
       $this->assertSame($expected_padding, $result);
 
-    } finally {
+    }
+    finally {
       // Restore original environment variables.
       if ($original_terminal_emulator !== FALSE) {
         putenv('TERMINAL_EMULATOR=' . $original_terminal_emulator);

.vortex/installer/tests/Unit/TuiTest.php

@@ -27,12 +27,12 @@
         "czproject/git-php": "^4.5",
         "dealerdirect/phpcodesniffer-composer-installer": "^1.1.2",
         "drevops/phpcs-standard": "^0.6",
-        "drupal/coder": "^8.3.31",
+        "drupal/coder": "^9@alpha",
         "ergebnis/composer-normalize": "^2.48.2",
         "phpstan/phpstan": "^2.1.31",
         "phpunit/phpunit": "^12.4.2",
         "rector/rector": "^2.2.7",
-        "squizlabs/php_codesniffer": "^3.13.4"
+        "squizlabs/php_codesniffer": "^4.0"
     },
     "minimum-stability": "alpha",
     "prefer-stable": true,