Merge pull request #140 from PHPCSStandards/feature/various-minor-tweaks

Various minor tweaks

Author: jrfnl

PHPCSUtils/BackCompat/Helper.php

@@ -10,8 +10,8 @@
 
 namespace PHPCSUtils\BackCompat;
 
-use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Exceptions\RuntimeException;
+use PHP_CodeSniffer\Files\File;
 
 /**
  * Utility methods to retrieve (configuration) information from PHP_CodeSniffer.
@@ -86,7 +86,7 @@ public static function setConfigData($key, $value, $temp = false, $config = null
             return $config->setConfigData($key, $value, $temp);
         }
 
-        if (version_compare(self::getVersion(), '3.99.99', '>') === true) {
+        if (\version_compare(self::getVersion(), '3.99.99', '>') === true) {
             throw new RuntimeException('Passing the $config parameter is required in PHPCS 4.x');
         }
 
@@ -183,7 +183,7 @@ public static function getEncoding(File $phpcsFile = null)
 
         if (isset($default) === false) {
             $default = 'utf-8';
-            if (version_compare(self::getVersion(), '2.99.99', '<=') === true) {
+            if (\version_compare(self::getVersion(), '2.99.99', '<=') === true) {
                 // In PHPCS 2.x, the default encoding is `iso-8859-1`.
                 $default = 'iso-8859-1';
             }

PHPCSUtils/Utils/NamingConventions.php

@@ -66,7 +66,7 @@ class NamingConventions
      */
     public static function isValidIdentifierName($name)
     {
-        if (is_string($name) === false || $name === '' || \strpos($name, ' ') !== false) {
+        if (\is_string($name) === false || $name === '' || \strpos($name, ' ') !== false) {
             return false;
         }
 

PHPCSUtils/Utils/Numbers.php

@@ -254,7 +254,7 @@ public static function getCompleteNumber(File $phpcsFile, $stackPtr)
 
         while (isset($tokens[++$next], self::$numericLiteralAcceptedTokens[$tokens[$next]['code']]) === true) {
             if ($tokens[$next]['code'] === \T_STRING
-                && \preg_match($regex, $tokens[$next]['content'], $matches) !== 1
+                && \preg_match($regex, $tokens[$next]['content']) !== 1
             ) {
                 break;
             }

PHPCSUtils/Utils/TextStrings.php

@@ -93,7 +93,7 @@ public static function getCompleteTextString(File $phpcsFile, $stackPtr, $stripQ
 
         if ($stripNewline === true) {
             // Heredoc/nowdoc: strip the new line at the end of the string to emulate how PHP sees the string.
-            $string = rtrim($string, "\r\n");
+            $string = \rtrim($string, "\r\n");
         }
 
         if ($stripQuotes === true) {

Tests/BackCompat/Helper/ConfigDataTest.php

@@ -34,7 +34,7 @@ class ConfigDataTest extends TestCase
      */
     public function testConfigData34()
     {
-        if (version_compare(Helper::getVersion(), '2.99.99', '<=') === true) {
+        if (\version_compare(Helper::getVersion(), '2.99.99', '<=') === true) {
             $this->markTestSkipped('Test only applicable to PHPCS > 2.x');
         }
 
@@ -59,7 +59,7 @@ public function testConfigData34()
      */
     public function testConfigDataPHPCS23()
     {
-        if (version_compare(Helper::getVersion(), '3.99.99', '>') === true) {
+        if (\version_compare(Helper::getVersion(), '3.99.99', '>') === true) {
             $this->markTestSkipped('Test only applicable to PHPCS < 4.x');
         }
 
@@ -83,7 +83,7 @@ public function testConfigDataPHPCS23()
      */
     public function testConfigDataPHPCS4Exception()
     {
-        if (version_compare(Helper::getVersion(), '3.99.99', '<=') === true) {
+        if (\version_compare(Helper::getVersion(), '3.99.99', '<=') === true) {
             $this->markTestSkipped('Test only applicable to PHPCS 4.x');
         }
 

Tests/BackCompat/Helper/GetVersionTest.php

@@ -32,7 +32,7 @@ class GetVersionTest extends TestCase
      *
      * @var string
      */
-    const DEVMASTER = '3.5.4';
+    const DEVMASTER = '3.5.6';
 
     /**
      * Test the method.

Tests/Fixers/SpacesFixer/SpacesFixerNoSpaceTest.php

@@ -53,7 +53,7 @@ class SpacesFixerNoSpaceTest extends UtilityMethodTestCase
      *
      * @var string
      */
-    const CODE = 'PHPCSUtils.SpacerFixer.Test.Found';
+    const CODE = 'PHPCSUtils.SpacesFixer.Test.Found';
 
     /**
      * Dummy metric name to use for the test.
@@ -88,7 +88,7 @@ class SpacesFixerNoSpaceTest extends UtilityMethodTestCase
      *
      * @var array
      */
-    protected static $selectedSniff = ['PHPCSUtils.SpacerFixer.Test'];
+    protected static $selectedSniff = ['PHPCSUtils.SpacesFixer.Test'];
 
     /**
      * Initialize PHPCS & tokenize the test case file.

Tests/Fixers/SpacesFixer/TrailingCommentHandlingTest.php

@@ -53,7 +53,7 @@ class TrailingCommentHandlingTest extends UtilityMethodTestCase
      *
      * @var string
      */
-    const CODE = 'PHPCSUtils.SpacerFixer.Test.Found';
+    const CODE = 'PHPCSUtils.SpacesFixer.Test.Found';
 
     /**
      * Dummy metric name to use for the test.
@@ -67,7 +67,7 @@ class TrailingCommentHandlingTest extends UtilityMethodTestCase
      *
      * @var array
      */
-    protected static $selectedSniff = ['PHPCSUtils.SpacerFixer.Test'];
+    protected static $selectedSniff = ['PHPCSUtils.SpacesFixer.Test'];
 
     /**
      * Test that violations are correctly reported.

Tests/Tokens/Collections/ArrowFunctionTokensBCTest.php

@@ -44,6 +44,6 @@ public function testArrowFunctionTokensBC()
             $expected[\T_FN] = \T_FN;
         }
 
-        $this->assertSame($expected, Collections::ArrowFunctionTokensBC());
+        $this->assertSame($expected, Collections::arrowFunctionTokensBC());
     }
 }