Merge pull request #14 from webimpress/hotfix/string-class-reference-…

…class-reg-exp StringClassReference - fixed regular expression to match FQCN
webimpress · May 12, 2019 · 629d20e · 629d20e
2 parents 4367f51 + d373f8d
commit 629d20e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/src/WebimpressCodingStandard/Sniffs/Formatting/StringClassReferenceSniff.php b/src/WebimpressCodingStandard/Sniffs/Formatting/StringClassReferenceSniff.php
@@ -11,8 +11,8 @@
 use function interface_exists;
 use function ltrim;
 use function preg_match;
+use function str_replace;
 use function strpos;
-use function strtr;
 use function substr;
 use function trait_exists;
 
@@ -38,17 +38,8 @@ public function process(File $phpcsFile, $stackPtr)
             return;
         }
 
-        $name = strtr($tokens[$stackPtr]['content'], [
-            '"' => '',
-            "'" => '',
-            '\\\\' => '\\',
-        ]);
-
-        if (strpos($name, '\\\\') !== false
-            || preg_match('/[^\\a-zA-Z_\x80-\xff][a-zA-Z0-9_\x80-\xff]/', $name)
-            || substr($name, -1) === '\\'
-            || ltrim($name, '\\') === ''
-        ) {
+        $name = substr(str_replace('\\\\', '\\', $tokens[$stackPtr]['content']), 1, -1);
+        if (! preg_match('/^(\\\\?[a-zA-Z_\x80-\xff][a-zA-Z0-9_\x80-\xff]*)+$/', $name)) {
             return;
         }
 

diff --git a/test/Sniffs/Formatting/StringClassReferenceUnitTest.inc b/test/Sniffs/Formatting/StringClassReferenceUnitTest.inc
@@ -23,3 +23,5 @@ $spaceAtTheEnd = ' WebimpressCodingStandardTest\\Ruleset ';
 
 $namespaceSeparatorAtTheEnd = 'WebimpressCodingStandardTest\\Ruleset\\';
 $justNamespaceSeparator = '\\';
+
+$quotes = '"\DateTime"';
diff --git a/test/Sniffs/Formatting/StringClassReferenceUnitTest.inc.fixed b/test/Sniffs/Formatting/StringClassReferenceUnitTest.inc.fixed
@@ -23,3 +23,5 @@ $spaceAtTheEnd = ' WebimpressCodingStandardTest\\Ruleset ';
 
 $namespaceSeparatorAtTheEnd = 'WebimpressCodingStandardTest\\Ruleset\\';
 $justNamespaceSeparator = '\\';
+
+$quotes = '"\DateTime"';
Original file line number	Diff line number	Diff line change
Expand Up		@@ -23,3 +23,5 @@ $spaceAtTheEnd = ' WebimpressCodingStandardTest\\Ruleset ';

		$namespaceSeparatorAtTheEnd = 'WebimpressCodingStandardTest\\Ruleset\\';
		$justNamespaceSeparator = '\\';

		$quotes = '"\DateTime"';