QA: minor code simplification

Replace a nested function call with a singular function call, which does the same.
squizlabs · Feb 6, 2022 · 6100f99 · 6100f99
1 parent 498a939
commit 6100f99
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/src/Config.php b/src/Config.php
@@ -368,7 +368,7 @@ public function __construct(array $cliArgs=[], $dieOnUnknownArg=true)
         }//end if
 
         if (defined('STDIN') === false
-            || strtoupper(substr(PHP_OS, 0, 3)) === 'WIN'
+            || stripos(PHP_OS, 'WIN') === 0
         ) {
             return;
         }
@@ -1517,7 +1517,7 @@ public static function getExecutablePath($name)
             return self::$executablePaths[$name];
         }
 
-        if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
+        if (stripos(PHP_OS, 'WIN') === 0) {
             $cmd = 'where '.escapeshellarg($name).' 2> nul';
         } else {
             $cmd = 'which '.escapeshellarg($name).' 2> /dev/null';

diff --git a/src/Reports/Code.php b/src/Reports/Code.php
@@ -225,7 +225,7 @@ public function generateFileReport($report, File $phpcsFile, $showSources=false,
                     if (strpos($tokenContent, "\t") !== false) {
                         $token            = $tokens[$i];
                         $token['content'] = $tokenContent;
-                        if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
+                        if (stripos(PHP_OS, 'WIN') === 0) {
                             $tab = "\000";
                         } else {
                             $tab = "\033[30;1m»\033[0m";

diff --git a/src/Standards/Generic/Tests/Files/ExecutableFileUnitTest.php b/src/Standards/Generic/Tests/Files/ExecutableFileUnitTest.php
@@ -25,7 +25,7 @@ protected function shouldSkipTest()
         // PEAR doesn't preserve the executable flag, so skip
         // tests when running in a PEAR install.
         // Also skip on Windows which doesn't have the concept of executable files.
-        return ($GLOBALS['PHP_CODESNIFFER_PEAR'] || (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN'));
+        return ($GLOBALS['PHP_CODESNIFFER_PEAR'] || stripos(PHP_OS, 'WIN') === 0);
 
     }//end shouldSkipTest()
 

diff --git a/src/Tokenizers/PHP.php b/src/Tokenizers/PHP.php
@@ -511,7 +511,7 @@ protected function tokenize($string)
         if (PHP_CODESNIFFER_VERBOSITY > 1) {
             echo "\t*** START PHP TOKENIZING ***".PHP_EOL;
             $isWin = false;
-            if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
+            if (stripos(PHP_OS, 'WIN') === 0) {
                 $isWin = true;
             }
         }

diff --git a/src/Util/Common.php b/src/Util/Common.php
@@ -250,7 +250,7 @@ public static function escapeshellcmd($cmd)
     {
         $cmd = escapeshellcmd($cmd);
 
-        if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
+        if (stripos(PHP_OS, 'WIN') === 0) {
             // Spaces are not escaped by escapeshellcmd on Windows, but need to be
             // for the command to be able to execute.
             $cmd = preg_replace('`(?<!^) `', '^ ', $cmd);
@@ -275,7 +275,7 @@ public static function escapeshellcmd($cmd)
      */
     public static function prepareForOutput($content, $exclude=[])
     {
-        if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
+        if (stripos(PHP_OS, 'WIN') === 0) {
             if (in_array("\r", $exclude, true) === false) {
                 $content = str_replace("\r", '\r', $content);
             }