Merge pull request #303 from PHPCSStandards/feature/tests-update-for-phpcs-3.9.0

UseStatements/KeywordSpacing: add missing "fixed" test file

Author: jrfnl

Universal/Tests/UseStatements/KeywordSpacingUnitTest.2.inc.fixed

@@ -0,0 +1,11 @@
+<?php
+
+/*
+ * The behaviour of the sniff for this code sample will be different depending on the PHP version.
+ * For PHP < 8.0, it will correctly flag this as "no space" after the `use` keyword.
+ * For PHP 8.0+, this will no longer be flagged as keywords are allowed in namespaced names,
+ * so the `use` is tokenized as `T_STRING` instead of `T_USE` and won't be flagged.
+ *
+ * For this reason, there is no "fixed" file included as the test would not be able to pass on PHP 8.0+.
+ */
+use \Util\MyOtherClass;

Universal/Tests/UseStatements/KeywordSpacingUnitTest.php

@@ -22,6 +22,34 @@
 final class KeywordSpacingUnitTest extends AbstractSniffUnitTest
 {
 
+    /**
+     * Get a list of all test files to check.
+     *
+     * @param string $testFileBase The base path that the unit tests files will have.
+     *
+     * @return array<string>
+     */
+    protected function getTestFiles($testFileBase)
+    {
+        $testFiles = parent::getTestFiles($testFileBase);
+
+        if (\PHP_VERSION_ID < 80000) {
+            return $testFiles;
+        }
+
+        // The issue being tested in the "2" test case file cannot be flagged/fixed on PHP 8.0+.
+        $target = 'KeywordSpacingUnitTest.2.inc';
+        $length = \strlen($target);
+        foreach ($testFiles as $i => $fileName) {
+            if (\substr($fileName, -$length) === $target) {
+                unset($testFiles[$i]);
+                break;
+            }
+        }
+
+        return $testFiles;
+    }
+
     /**
      * Returns the lines where errors should occur.
      *
@@ -55,10 +83,6 @@ public function getErrorList($testFile = '')
                 ];
 
             case 'KeywordSpacingUnitTest.2.inc':
-                if (\PHP_VERSION_ID >= 80000) {
-                    return [];
-                }
-
                 return [
                     11 => 1,
                 ];