Fix aliased use statements leading to problem with classes called lik…

…e keywords, fixes #9
composer · Jun 12, 2024 · b1b3fd0 · b1b3fd0
1 parent 61804f9
commit b1b3fd0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/PhpFileParser.php b/src/PhpFileParser.php
@@ -63,8 +63,8 @@ public static function findClasses(string $path): array
 
         Preg::matchAll('{
             (?:
-                 \b(?<![\$:>])(?P<type>class|interface|trait'.$extraTypes.') \s++ (?P<name>[a-zA-Z_\x7f-\xff:][a-zA-Z0-9_\x7f-\xff:\-]*+)
-               | \b(?<![\$:>])(?P<ns>namespace) (?P<nsname>\s++[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*+(?:\s*+\\\\\s*+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*+)*+)? \s*+ [\{;]
+                 \b(?<![\\\\$:>])(?P<type>class|interface|trait'.$extraTypes.') \s++ (?P<name>[a-zA-Z_\x7f-\xff:][a-zA-Z0-9_\x7f-\xff:\-]*+)
+               | \b(?<![\\\\$:>])(?P<ns>namespace) (?P<nsname>\s++[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*+(?:\s*+\\\\\s*+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*+)*+)? \s*+ [\{;]
             )
         }ix', $contents, $matches);
 

diff --git a/tests/Fixtures/psrViolations/ClassWithCorrectNameSpace.php b/tests/Fixtures/psrViolations/ClassWithCorrectNameSpace.php
@@ -2,4 +2,6 @@
 
 namespace ExpectedNamespace;
 
+use Foo\Baz\Enum as Bar;
+
 class ClassWithCorrectNameSpace {}
diff --git a/tests/Fixtures/psrViolations/ClassWithIncorrectSubNamespace.php b/tests/Fixtures/psrViolations/ClassWithIncorrectSubNamespace.php
@@ -2,4 +2,6 @@
 
 namespace ExpectedNamespace\UnexpectedSubNamespace;
 
-class ClassWithIncorrectSubNamespace {}
+use Foo\Baz\Enum as Bar;
+
+CLass ClassWithIncorrectSubNamespace {}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,6 @@

		namespace ExpectedNamespace;

		use Foo\Baz\Enum as Bar;

		class ClassWithCorrectNameSpace {}