⬆️ Support drupal/coder ^8 and ^9

.github/workflows/workflows.yml

@@ -5,7 +5,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: ['8.2', '8.3', '8.4']
+        php-versions: ['8.2', '8.3', '8.4', '8.5']
     steps:
       - uses: actions/checkout@v4
       - uses: "shivammathur/setup-php@v2"
@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: ['8.2', '8.3', '8.4']
+        php-versions: ['8.2', '8.3', '8.4', '8.5']
     steps:
       - uses: actions/checkout@v4
       - uses: "shivammathur/setup-php@v2"
@@ -41,7 +41,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: ['8.2', '8.3', '8.4']
+        php-versions: ['8.2', '8.3', '8.4', '8.5']
         dependency-versions: ['highest', 'lowest']
     steps:
       - uses: actions/checkout@v4

composer.json

@@ -6,9 +6,9 @@
     "require": {
         "php": "^8.2",
         "dealerdirect/phpcodesniffer-composer-installer": "^1.0.0",
-        "drupal/coder": "^8.3.26",
-        "slevomat/coding-standard": "^8.16.0",
-        "squizlabs/php_codesniffer": "^3.11.1"
+        "drupal/coder": "^8.3.26 || ^9.0",
+        "slevomat/coding-standard": "^8.11",
+        "squizlabs/php_codesniffer": "^3.9.1 || ^4.0.1"
     },
     "require-dev": {
         "phpstan/extension-installer": "^1.4.3",

tests/Sniffs/AlphabeticallySortedUsesTest.php

@@ -21,8 +21,8 @@ public function testError(): void {
     self::assertSniffError($report, 8, AlphabeticallySortedUsesSniff::CODE_INCORRECT_ORDER);
   }
 
-  protected static function getSniffName(): string {
-    return 'SlevomatCodingStandard.Namespaces.AlphabeticallySortedUses';
+  protected static function getSniffClassName(): string {
+    return AlphabeticallySortedUsesSniff::class;
   }
 
 }

tests/Sniffs/Base.php

@@ -1,8 +1,7 @@
 <?php
-
+// phpcs:ignoreFile
 // Most of this file ported from slevomat/coding-standard and is immune from
 // rule of this standard until it has been reworked.
-// @codingStandardsIgnoreFile
 
 declare(strict_types=1);
 
@@ -46,8 +45,9 @@ protected static function checkFile(string $filePath, array $sniffProperties = [
 
     $codeSniffer->init();
 
-    if (count($sniffProperties) > 0) {
-      $codeSniffer->ruleset->ruleset[self::getSniffName()]['properties'] = $sniffProperties;
+    $sniffName = self::getSniffName();
+    if (count($sniffProperties) > 0 && $sniffName !== null) {
+      $codeSniffer->ruleset->ruleset[$sniffName]['properties'] = $sniffProperties;
     }
 
     $sniffClassName = static::getSniffClassName();

tests/Sniffs/DrupalRulesetTest.php

@@ -4,6 +4,8 @@
 
 namespace PreviousNext\CodingStandard\Tests\Sniffs;
 
+use Drupal\Sniffs\ControlStructures\InlineControlStructureSniff;
+
 /**
  * Tests inherits from Drupal ruleset.
  */
@@ -17,7 +19,11 @@ public function testNoError(): void {
   public function testMissing(): void {
     $report = self::checkFile(__DIR__ . '/fixtures/DrupalRulesetError.php');
     self::assertSame(2, $report->getErrorCount());
-    self::assertSniffError($report, 5, sniffName: 'Drupal.ControlStructures.InlineControlStructure', code: 'NotAllowed');
+    // Sniff removed in drupal/coder 9.x.
+    $inlineControlSniff = \class_exists(InlineControlStructureSniff::class)
+        ? 'Drupal.ControlStructures.InlineControlStructure'
+        : 'Generic.ControlStructures.InlineControlStructure';
+    self::assertSniffError($report, 5, sniffName: $inlineControlSniff, code: 'NotAllowed');
     self::assertSniffError($report, 5, sniffName: 'Generic.PHP.UpperCaseConstant', code: 'Found');
   }