catch errors and undefined interfaces while traversing composer class…

… map
alekitto · Mar 30, 2021 · e8b9c81 · e8b9c81
1 parent 1394507
commit e8b9c81
Show file tree

Hide file tree

Showing 7 changed files with 115 additions and 80 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/data/Psr4WithClassMap/NonExistentImplementation.php b/data/Psr4WithClassMap/NonExistentImplementation.php
@@ -0,0 +1,7 @@
+<?php declare(strict_types=1);
+
+namespace Kcs\ClassFinder\Fixtures\Psr4WithClassMap;
+
+class NonExistentImplementation implements NonExistentInterface
+{
+}
diff --git a/lib/Finder/FinderInterface.php b/lib/Finder/FinderInterface.php
@@ -104,7 +104,7 @@ public function filter(?callable $callback): self;
      *
      * @return $this
      */
-    public function path($pattern): self;
+    public function path(string $pattern): self;
 
     /**
      * Adds rules that filenames must not match.
@@ -120,5 +120,5 @@ public function path($pattern): self;
      *
      * @return $this
      */
-    public function notPath($pattern): self;
+    public function notPath(string $pattern): self;
 }
diff --git a/lib/Iterator/ComposerIterator.php b/lib/Iterator/ComposerIterator.php
@@ -38,12 +38,14 @@ private function searchInClassMap(): Generator
         foreach ($this->classLoader->getClassMap() as $class => $file) {
             ErrorHandler::register();
             try {
-                yield $class => new ReflectionClass($class);
+                $reflectionClass = new ReflectionClass($class);
             } catch (Throwable $e) { /** @phpstan-ignore-line */
-                // @ignoreException
+                continue;
             } finally {
                 ErrorHandler::unregister();
             }
+
+            yield $class => $reflectionClass;
         }
     }
 

diff --git a/lib/Iterator/FilteredComposerIterator.php b/lib/Iterator/FilteredComposerIterator.php
@@ -7,7 +7,9 @@
 use Composer\Autoload\ClassLoader;
 use Generator;
 use Kcs\ClassFinder\PathNormalizer;
+use Kcs\ClassFinder\Util\ErrorHandler;
 use ReflectionClass;
+use Throwable;
 
 use function array_map;
 use function array_unique;
@@ -82,7 +84,16 @@ private function searchInClassMap(): Generator
                 continue;
             }
 
-            yield $class => new ReflectionClass($class);
+            ErrorHandler::register();
+            try {
+                $reflectionClass = new ReflectionClass($class);
+            } catch (Throwable $e) { /** @phpstan-ignore-line */
+                continue;
+            } finally {
+                ErrorHandler::unregister();
+            }
+
+            yield $class => $reflectionClass;
         }
     }
 

diff --git a/lib/Iterator/Psr0Iterator.php b/lib/Iterator/Psr0Iterator.php
@@ -52,7 +52,7 @@ public function __construct(string $namespace, string $path, int $flags = 0, arr
     protected function getGenerator(): Generator
     {
         $pattern = defined('HHVM_VERSION') ? '/\\.(php|hh)$/i' : '/\\.php$/i';
-        $include = Closure::bind(static function (string $path) {
+        $include = Closure::bind(static function (string $path): void {
             include_once $path;
         }, null, null);
 

diff --git a/lib/Iterator/Psr4Iterator.php b/lib/Iterator/Psr4Iterator.php
@@ -52,7 +52,7 @@ public function __construct(string $namespace, string $path, int $flags = 0, arr
     protected function getGenerator(): Generator
     {
         $pattern = defined('HHVM_VERSION') ? '/\\.(php|hh)$/i' : '/\\.php$/i';
-        $include = Closure::bind(static function (string $path) {
+        $include = Closure::bind(static function (string $path): void {
             include_once $path;
         }, null, null);