Fix findAbsolutePath issues

Behat · Jan 31, 2025 · 6969a49 · 6969a49
1 parent 79688b6
commit 6969a49
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 6 deletions.
diff --git a/src/Behat/Gherkin/Loader/AbstractFileLoader.php b/src/Behat/Gherkin/Loader/AbstractFileLoader.php
@@ -50,7 +50,7 @@ protected function findRelativePath($path)
      *
      * @param string $path Relative path
      *
-     * @return string
+     * @return false|string
      */
     protected function findAbsolutePath($path)
     {

diff --git a/src/Behat/Gherkin/Loader/DirectoryLoader.php b/src/Behat/Gherkin/Loader/DirectoryLoader.php
@@ -44,7 +44,8 @@ public function __construct(Gherkin $gherkin)
     public function supports($resource)
     {
         return is_string($resource)
-            && is_dir($this->findAbsolutePath($resource));
+            && ($path = $this->findAbsolutePath($resource)) !== false
+            && is_dir($path);
     }
 
     /**
@@ -57,6 +58,9 @@ public function supports($resource)
     public function load($resource)
     {
         $path = $this->findAbsolutePath($resource);
+        if ($path === false) {
+            throw new \LogicException("Unable to locate absolute path of supported resource: $resource");
+        }
 
         $iterator = new RecursiveIteratorIterator(
             new RecursiveDirectoryIterator($path, RecursiveDirectoryIterator::SKIP_DOTS)

diff --git a/src/Behat/Gherkin/Loader/GherkinFileLoader.php b/src/Behat/Gherkin/Loader/GherkinFileLoader.php
@@ -56,8 +56,9 @@ public function setCache(CacheInterface $cache)
     public function supports($resource)
     {
         return is_string($resource)
-            && is_file($absolute = $this->findAbsolutePath($resource))
-            && pathinfo($absolute, PATHINFO_EXTENSION) === 'feature';
+            && ($path = $this->findAbsolutePath($resource)) !== false
+            && is_file($path)
+            && pathinfo($path, PATHINFO_EXTENSION) === 'feature';
     }
 
     /**
@@ -70,6 +71,9 @@ public function supports($resource)
     public function load($resource)
     {
         $path = $this->findAbsolutePath($resource);
+        if ($path === false) {
+            throw new \LogicException("Unable to locate absolute path of supported resource: $resource");
+        }
 
         if ($this->cache) {
             if ($this->cache->isFresh($path, filemtime($path))) {

diff --git a/src/Behat/Gherkin/Loader/YamlFileLoader.php b/src/Behat/Gherkin/Loader/YamlFileLoader.php
@@ -37,8 +37,9 @@ public function __construct()
     public function supports($resource)
     {
         return is_string($resource)
-            && is_file($absolute = $this->findAbsolutePath($resource))
-            && pathinfo($absolute, PATHINFO_EXTENSION) === 'yml';
+            && ($path = $this->findAbsolutePath($resource)) !== false
+            && is_file($path)
+            && pathinfo($path, PATHINFO_EXTENSION) === 'yml';
     }
 
     /**
@@ -51,6 +52,9 @@ public function supports($resource)
     public function load($resource)
     {
         $path = $this->findAbsolutePath($resource);
+        if ($path === false) {
+            throw new \LogicException("Unable to locate absolute path of supported resource: $resource");
+        }
         $hash = Yaml::parse(file_get_contents($path));
 
         $features = $this->loader->load($hash);