ci: run qa on php 8.4 and 8.5

Author: brianvarskonst

.github/workflows/qa.yml

@@ -16,8 +16,6 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - '8.2'
-          - '8.3'
           - '8.4'
           - '8.5'
 
@@ -42,5 +40,4 @@ jobs:
         run: vendor/bin/phpcs -i
 
       - name: Run QA
-        if: matrix['php-version'] == '8.5'
         run: composer qa

SymPress/Helpers/Names.php

@@ -14,6 +14,8 @@
 use function array_merge;
 use function array_unique;
 use function array_values;
+use function constant;
+use function defined;
 use function in_array;
 use function ltrim;
 
@@ -102,7 +104,7 @@ private static function operatorTokens(): array
         static $tokens;
 
         if ($tokens === null) {
-            $tokens = array_values(array_unique(array_merge(
+            $tokens = array_merge(
                 array_keys(Tokens::$arithmeticTokens),
                 array_keys(Tokens::$assignmentTokens),
                 array_keys(Tokens::$equalityTokens),
@@ -125,12 +127,17 @@ private static function operatorTokens(): array
                     T_ELLIPSIS,
                     T_FN_ARROW,
                     T_MATCH_ARROW,
-                    T_PIPE,
                     T_STRING_CONCAT,
                     T_TYPE_INTERSECTION,
                     T_TYPE_UNION,
                 ],
-            )));
+            );
+
+            if (defined('T_PIPE')) {
+                $tokens[] = constant('T_PIPE');
+            }
+
+            $tokens = array_values(array_unique($tokens));
         }
 
         return $tokens;

composer.json

@@ -75,7 +75,7 @@
         ],
         "static-analysis": [
             "Composer\\Config::disableProcessTimeout",
-            "phpstan analyse"
+            "phpstan analyse --memory-limit=1G"
         ],
         "tests": [
             "Composer\\Config::disableProcessTimeout",

docs/Release.md

@@ -25,7 +25,7 @@ Every release candidate must be verified against the required matrix before tagg
 
 | Dimension | Required | Experimental |
 | --------- | -------- | ------------ |
-| PHP runtime | Install and PHPCS discovery on 8.2, 8.3, 8.4, and 8.5; full package QA on 8.5 | next PHP minor when available |
+| PHP runtime | Full package QA on 8.4 and 8.5 | next PHP minor when available |
 | PHP_CodeSniffer | 3.x supported range | 4.x until promoted |
 | WordPress target config | 6.5, 7.0 | latest trunk when useful |
 | Standards | WPCS, VIPWPCS, Slevomat, PHPCompatibility | dependency pre-releases |

tests/fixtures/disallow-short-open-tag.php

@@ -11,7 +11,19 @@ function (string $sniff, array $messages, array $warnings, array $errors, array
         return [$sniff, $messages, $errors, $warnings, $properties];
     }
 
-    return [$sniff, $messages, $warnings, $errors, $properties];
+    return [
+        $sniff,
+        $messages,
+        $warnings,
+        array_map(
+            static fn (array $codes): array => array_map(
+                static fn (string $code): string => $code === 'PossibleFound' ? 'Found' : $code,
+                $codes,
+            ),
+            $errors,
+        ),
+        $properties,
+    ];
 }
 // @phpcsProcessFixtureEnd
 ?>

tests/unit/Php85SyntaxTest.php

@@ -51,6 +51,8 @@ public function callback(): Closure
     #[Test]
     public function php85PipeTokenIsClassifiedAsOperator(): void
     {
+        $this->requiresPhp85Runtime();
+
         $file = $this->factoryFile(self::CODE, '8.5');
         $tokens = $file->getTokens();
 
@@ -64,6 +66,8 @@ public function php85PipeTokenIsClassifiedAsOperator(): void
     #[Test]
     public function sympressPureParsesPhp85SyntaxWithoutSyntaxErrors(): void
     {
+        $this->requiresPhp85Runtime();
+
         $tempDir = sys_get_temp_dir() . '/sympress-cs-php85-' . bin2hex(random_bytes(8));
         self::assertTrue(mkdir($tempDir));
 
@@ -91,4 +95,13 @@ public function sympressPureParsesPhp85SyntaxWithoutSyntaxErrors(): void
             rmdir($tempDir);
         }
     }
+
+    private function requiresPhp85Runtime(): void
+    {
+        if (PHP_VERSION_ID >= 80500) {
+            return;
+        }
+
+        self::markTestSkipped('PHP 8.5 syntax tokenization requires a PHP 8.5 runtime.');
+    }
 }