Merge branch 'feature/3388-tweaks-for-wsl-support' of https://github.…

…com/jrfnl/PHP_CodeSniffer
squizlabs · Nov 1, 2021 · 1a68116 · 1a68116
2 parents 2f6db41 + f0c1acd
commit 1a68116
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/Config.php b/src/Config.php
@@ -14,6 +14,7 @@
 
 use PHP_CodeSniffer\Exceptions\DeepExitException;
 use PHP_CodeSniffer\Exceptions\RuntimeException;
+use PHP_CodeSniffer\Util\Common;
 
 /**
  * Stores the configuration used to run PHPCS and PHPCBF.
@@ -363,7 +364,7 @@ public function __construct(array $cliArgs=[], $dieOnUnknownArg=true)
 
                 $lastDir    = $currentDir;
                 $currentDir = dirname($currentDir);
-            } while ($currentDir !== '.' && $currentDir !== $lastDir && @is_readable($currentDir) === true);
+            } while ($currentDir !== '.' && $currentDir !== $lastDir && Common::isReadable($currentDir) === true);
         }//end if
 
         if (defined('STDIN') === false
@@ -1656,7 +1657,7 @@ public static function getAllConfigData()
             return [];
         }
 
-        if (is_readable($configFile) === false) {
+        if (Common::isReadable($configFile) === false) {
             $error = 'ERROR: Config file '.$configFile.' is not readable'.PHP_EOL.PHP_EOL;
             throw new DeepExitException($error, 3);
         }

diff --git a/src/Util/Common.php b/src/Util/Common.php
@@ -60,11 +60,11 @@ public static function isPharFile($path)
      */
     public static function isReadable($path)
     {
-        if (is_readable($path) === true) {
+        if (@is_readable($path) === true) {
             return true;
         }
 
-        if (file_exists($path) === true && is_file($path) === true) {
+        if (@file_exists($path) === true && @is_file($path) === true) {
             $f = @fopen($path, 'rb');
             if (fclose($f) === true) {
                 return true;