Merge pull request #61 from PHPCSStandards/feature/variable-implement-textstrings-stripquotes

jrfnl · web-flow · commit 3879272fed78 · 2020-01-23T05:46:39.000+01:00
Variables::isSuperglobal(): implement use of TextStrings::stripQuotes()
diff --git a/PHPCSUtils/Utils/Variables.php b/PHPCSUtils/Utils/Variables.php
@@ -15,6 +15,7 @@
 use PHP_CodeSniffer\Util\Tokens;
 use PHPCSUtils\Tokens\Collections;
 use PHPCSUtils\Utils\Scopes;
+use PHPCSUtils\Utils\TextStrings;
 
 /**
  * Utility functions for use when examining variables.
@@ -277,7 +278,7 @@ public static function isSuperglobal(File $phpcsFile, $stackPtr)
             }
 
             // Strip quotes.
-            $content = \preg_replace('`^([\'"])(.*)\1$`Ds', '$2', $content);
+            $content = TextStrings::stripQuotes($content);
         }
 
         return self::isSuperglobalName($content);

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`	`use PHP_CodeSniffer\Util\Tokens;`
`16`	`16`	`use PHPCSUtils\Tokens\Collections;`
`17`	`17`	`use PHPCSUtils\Utils\Scopes;`
	`18`	`+use PHPCSUtils\Utils\TextStrings;`
`18`	`19`
`19`	`20`	`/**`
`20`	`21`	`* Utility functions for use when examining variables.`
`@@ -277,7 +278,7 @@ public static function isSuperglobal(File $phpcsFile, $stackPtr)`
`277`	`278`	`}`
`278`	`279`
`279`	`280`	`// Strip quotes.`
`280`		- $content = \preg_replace('`^([\'"])(.*)\1$`Ds', '$2', $content);
	`281`	`+ $content = TextStrings::stripQuotes($content);`
`281`	`282`	`}`
`282`	`283`
`283`	`284`	`return self::isSuperglobalName($content);`