Catch exceptions for inaccessible and non-existent dirs

plesk · Sep 28, 2023 · 842881c · 842881c
1 parent cffc5c3
commit 842881c
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 22 deletions.
diff --git a/src/WappMatchers/PhpMatcher.php b/src/WappMatchers/PhpMatcher.php
@@ -5,6 +5,7 @@
 use League\Flysystem\Filesystem;
 use League\Flysystem\FilesystemException;
 use League\Flysystem\StorageAttributes;
+use League\Flysystem\UnableToListContents;
 use Plesk\Wappspector\Matchers;
 
 class PhpMatcher implements WappMatcherInterface
@@ -14,20 +15,24 @@ class PhpMatcher implements WappMatcherInterface
      */
     public function match(Filesystem $fs, string $path): iterable
     {
-        $list = $fs->listContents($path);
-        foreach ($list as $item) {
-            /** @var StorageAttributes $item */
-            if ($item->isFile() && str_ends_with($item->path(), '.php')) {
-                return [
-                    'matcher' => Matchers::PHP,
-                    'path' => $path,
-                    'version' => null,
-                ];
-            }
+        try {
+            $list = $fs->listContents($path);
+            foreach ($list as $item) {
+                /** @var StorageAttributes $item */
+                if ($item->isFile() && str_ends_with($item->path(), '.php')) {
+                    return [
+                        'matcher' => Matchers::PHP,
+                        'path' => $path,
+                        'version' => null,
+                    ];
+                }
 
-            if ($item->isDir() && $item->path() === ltrim(rtrim($path, '/') . '/src', '/')) {
-                return $this->match($fs, rtrim($path, '/') . '/src');
+                if ($item->isDir() && $item->path() === ltrim(rtrim($path, '/') . '/src', '/')) {
+                    return $this->match($fs, rtrim($path, '/') . '/src');
+                }
             }
+        } catch (UnableToListContents) {
+            // skip dir if it is inaccessible
         }
 
         return [];

diff --git a/src/WappMatchers/UpLevelMatcherTrait.php b/src/WappMatchers/UpLevelMatcherTrait.php
@@ -3,24 +3,24 @@
 namespace Plesk\Wappspector\WappMatchers;
 
 use League\Flysystem\Filesystem;
-use League\Flysystem\FilesystemException;
 use League\Flysystem\UnableToListContents;
 
 trait UpLevelMatcherTrait
 {
     abstract protected function doMatch(Filesystem $fs, string $path): array;
 
-    /**
-     * @throws FilesystemException
-     */
     public function match(Filesystem $fs, string $path): array
     {
-        if (!$result = $this->doMatch($fs, $path)) {
-            try {
-                $result = $this->doMatch($fs, rtrim($path) . '/../');
-            } catch (UnableToListContents $e) {
-                // skip parent dir if it is inaccessible
-            }
+        return $this->safeScanDir($fs, $path) ?: $this->safeScanDir($fs, rtrim($path) . '/../');
+    }
+
+    private function safeScanDir(Filesystem $fs, string $path): array
+    {
+        $result = [];
+        try {
+            $result = $this->doMatch($fs, $path);
+        } catch (UnableToListContents) {
+            // skip dir if it is inaccessible
         }
 
         return $result;