[DI] Fix Preloader exception when preloading a class with an unknown …

…parent/interface
symfony · Oct 27, 2020 · 4c41ad6 · 4c41ad6
1 parent b296fd4
commit 4c41ad6
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 1 deletion.
diff --git a/Dumper/Preloader.php b/Dumper/Preloader.php
@@ -87,7 +87,7 @@ private static function doPreload(string $class, array &$preloaded): void
 
                 self::preloadType($m->getReturnType(), $preloaded);
             }
-        } catch (\ReflectionException $e) {
+        } catch (\Throwable $e) {
             // ignore missing classes
         }
     }

diff --git a/Tests/Dumper/PreloaderTest.php b/Tests/Dumper/PreloaderTest.php
@@ -34,6 +34,20 @@ public function testPreload()
         self::assertTrue(class_exists('Symfony\Component\DependencyInjection\Tests\Fixtures\Preload\C', false));
     }
 
+    /**
+     * @requires PHP 7.4
+     */
+    public function testPreloadSkipsNonExistingInterface()
+    {
+        $r = new \ReflectionMethod(Preloader::class, 'doPreload');
+        $r->setAccessible(true);
+
+        $preloaded = [];
+
+        $r->invokeArgs(null, ['Symfony\Component\DependencyInjection\Tests\Fixtures\Preload\DummyWithInterface', &$preloaded]);
+        self::assertFalse(class_exists('Symfony\Component\DependencyInjection\Tests\Fixtures\Preload\DummyWithInterface', false));
+    }
+
     /**
      * @requires PHP 8
      */

diff --git a/Tests/Fixtures/Preload/DummyWithInterface.php b/Tests/Fixtures/Preload/DummyWithInterface.php
@@ -0,0 +1,16 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures\Preload;
+
+final class DummyWithInterface implements \NonExistentDummyInterface
+{
+}