fix(ruleset): Autoload relative paths correctly to avoid confusion wi…

…th files from the global include path
squizlabs · Dec 7, 2019 · 5e124a8 · 5e124a8
1 parent 2ecd8dc
commit 5e124a8
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/Ruleset.php b/src/Ruleset.php
@@ -356,11 +356,13 @@ public function processRuleset($rulesetPath, $depth=0)
             }
 
             $autoloadPath = (string) $autoload;
-            if (is_file($autoloadPath) === false) {
-                $autoloadPath = Util\Common::realPath(dirname($rulesetPath).DIRECTORY_SEPARATOR.$autoloadPath);
-            }
 
-            if ($autoloadPath === false) {
+            // Try relative autoload paths first.
+            $relativePath = Util\Common::realPath(dirname($rulesetPath).DIRECTORY_SEPARATOR.$autoloadPath);
+
+            if ($relativePath !== false && is_file($$relativePath) === true) {
+                $autoloadPath = $relativePath;
+            } else if (is_file($autoloadPath) === false) {
                 throw new RuntimeException('The specified autoload file "'.$autoload.'" does not exist');
             }