Prevent error when the autoload function is an instance of DebugClassloader, but does not wrap a closure

mpdude · mpdude · commit d698d23bb451 · 2020-01-08T14:23:56.000+01:00
diff --git a/src/Symfony/Component/ErrorHandler/Tests/ErrorEnhancer/ClassNotFoundErrorEnhancerTest.php b/src/Symfony/Component/ErrorHandler/Tests/ErrorEnhancer/ClassNotFoundErrorEnhancerTest.php
@@ -27,13 +27,15 @@ public static function setUpBeforeClass(): void
                 continue;
             }
 
+            $function = $function[0];
+
             // get class loaders wrapped by DebugClassLoader
-            if ($function[0] instanceof DebugClassLoader) {
-                $function = $function[0]->getClassLoader();
+            if ($function instanceof DebugClassLoader) {
+                $function = $function->getClassLoader();
             }
 
-            if ($function[0] instanceof ComposerClassLoader) {
-                $function[0]->add('Symfony_Component_ErrorHandler_Tests_Fixtures', \dirname(__DIR__, 5));
+            if ($function instanceof ComposerClassLoader) {
+                $function->add('Symfony_Component_ErrorHandler_Tests_Fixtures', \dirname(__DIR__, 5));
                 break;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -27,13 +27,15 @@ public static function setUpBeforeClass(): void`
`27`	`27`	`continue;`
`28`	`28`	`}`
`29`	`29`
	`30`	`+ $function = $function[0];`
	`31`	`+`
`30`	`32`	`// get class loaders wrapped by DebugClassLoader`
`31`		`- if ($function[0] instanceof DebugClassLoader) {`
`32`		`- $function = $function[0]->getClassLoader();`
	`33`	`+ if ($function instanceof DebugClassLoader) {`
	`34`	`+ $function = $function->getClassLoader();`
`33`	`35`	`}`
`34`	`36`
`35`		`- if ($function[0] instanceof ComposerClassLoader) {`
`36`		`- $function[0]->add('Symfony_Component_ErrorHandler_Tests_Fixtures', \dirname(__DIR__, 5));`
	`37`	`+ if ($function instanceof ComposerClassLoader) {`
	`38`	`+ $function->add('Symfony_Component_ErrorHandler_Tests_Fixtures', \dirname(__DIR__, 5));`
`37`	`39`	`break;`
`38`	`40`	`}`
`39`	`41`	`}`