Classes/NewClasses: bug fix

All parts of a type should be checked, the sniff should not bow out if the first part of the type is not a new class. Fixed now. Includes test.
PHPCompatibility · Apr 20, 2024 · 6e2c140 · 6e2c140
1 parent a988e5b
commit 6e2c140
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/PHPCompatibility/Sniffs/Classes/NewClassesSniff.php b/PHPCompatibility/Sniffs/Classes/NewClassesSniff.php
@@ -1351,12 +1351,12 @@ private function checkTypeDeclaration($phpcsFile, $stackPtr, $typeString)
             $type = \ltrim($type, '\\');
 
             if ($type === '') {
-                return;
+                continue;
             }
 
             $typeLc = \strtolower($type);
             if (isset($this->newClasses[$typeLc]) === false) {
-                return;
+                continue;
             }
 
             $itemInfo = [

diff --git a/PHPCompatibility/Tests/Classes/NewClassesUnitTest.inc b/PHPCompatibility/Tests/Classes/NewClassesUnitTest.inc
@@ -483,3 +483,8 @@ class MyRandom extends \Random\Randomizer {
         }
     }
 }
+
+
+function CheckAllTypeParts(
+    NotATarget|XMLReader $a
+) : NotATarget|ReflectionType {}
diff --git a/PHPCompatibility/Tests/Classes/NewClassesUnitTest.php b/PHPCompatibility/Tests/Classes/NewClassesUnitTest.php
@@ -134,7 +134,7 @@ public static function dataNewClass()
             ['RecursiveCachingIterator', '5.0', [297], '5.1'],
             ['RecursiveFilterIterator', '5.0', [298], '5.1'],
             ['SimpleXMLIterator', '5.0', [311], '5.1'],
-            ['XMLReader', '5.0', [312, 336], '5.1'],
+            ['XMLReader', '5.0', [312, 336, 489], '5.1'],
             ['SplFileObject', '5.0', [302, 336], '5.1'],
             ['SplObjectStorage', '5.0', [282], '5.1'],
             ['SplFileInfo', '5.1.1', [303], '5.2', '5.1'],
@@ -197,7 +197,7 @@ public static function dataNewClass()
             ['UConverter', '5.4', [276], '5.5'],
             ['GMP', '5.5', [281], '5.6'],
             ['IntlChar', '5.6', [277, 448], '7.0'],
-            ['ReflectionType', '5.6', [308], '7.0'],
+            ['ReflectionType', '5.6', [308, 490], '7.0'],
             ['ReflectionGenerator', '5.6', [309], '7.0'],
             ['ReflectionClassConstant', '7.0', [306, 465], '7.1'],
             ['ReflectionNamedType', '7.0', [359, 465], '7.1'],