Merge branch 'master' of https://github.com/ndm2/PHP_CodeSniffer

squizlabs · Sep 22, 2019 · 3c65796 · 3c65796
2 parents 991ed9a + 6924b39
commit 3c65796
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/Util/Standards.php b/src/Util/Standards.php
@@ -16,7 +16,9 @@ class Standards
 
 
     /**
-     * Get a list paths where standards are installed.
+     * Get a list of paths where standards are installed.
+     *
+     * Unresolvable relative paths will be excluded from the results.
      *
      * @return array
      */
@@ -34,6 +36,9 @@ public static function getInstalledStandardPaths()
         foreach ($installedPaths as $installedPath) {
             if (substr($installedPath, 0, 1) === '.') {
                 $installedPath = Common::realPath(__DIR__.$ds.'..'.$ds.'..'.$ds.$installedPath);
+                if ($installedPath === false) {
+                    continue;
+                }
             }
 
             $resolvedInstalledPaths[] = $installedPath;
@@ -229,6 +234,9 @@ public static function isInstalledStandard($standard)
             // This could be a custom standard, installed outside our
             // standards directory.
             $standard = Common::realPath($standard);
+            if ($standard === false) {
+                return false;
+            }
 
             // Might be an actual ruleset file itUtil.
             // If it has an XML extension, let's at least try it.
@@ -282,7 +290,7 @@ public static function getInstalledStandardPath($standard)
 
             $path = Common::realpath($standardPath.DIRECTORY_SEPARATOR.'ruleset.xml');
 
-            if (is_file($path) === true) {
+            if ($path !== false && is_file($path) === true) {
                 return $path;
             } else if (Common::isPharFile($standardPath) === true) {
                 $path = Common::realpath($standardPath);