[ClassLoader] made DebugClassLoader idempotent

kriswallsmith · kriswallsmith · commit 73bead7eb699 · 2013-03-02T11:24:53.000-08:00
diff --git a/src/Symfony/Component/ClassLoader/DebugClassLoader.php b/src/Symfony/Component/ClassLoader/DebugClassLoader.php
@@ -53,7 +53,7 @@ public static function enable()
         }
 
         foreach ($functions as $function) {
-            if (is_array($function) && method_exists($function[0], 'findFile')) {
+            if (is_array($function) && !$function[0] instanceof self && method_exists($function[0], 'findFile')) {
                 $function = array(new static($function[0]), 'loadClass');
             }
 
@@ -104,4 +104,9 @@ public function loadClass($class)
             return true;
         }
     }
+
+    public function getClassFinder()
+    {
+        return $this->classFinder;
+    }
 }
diff --git a/src/Symfony/Component/ClassLoader/Tests/DebugClassLoaderTest.php b/src/Symfony/Component/ClassLoader/Tests/DebugClassLoaderTest.php
@@ -0,0 +1,47 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\ClassLoader\Tests;
+
+use Symfony\Component\ClassLoader\DebugClassLoader;
+use Symfony\Component\ClassLoader\UniversalClassLoader;
+
+class DebugClassLoaderTest extends \PHPUnit_Framework_TestCase
+{
+    private $loader;
+
+    protected function setUp()
+    {
+        $this->loader = new UniversalClassLoader();
+        spl_autoload_register(array($this->loader, 'loadClass'));
+    }
+
+    protected function tearDown()
+    {
+        spl_autoload_unregister(array($this->loader, 'loadClass'));
+    }
+
+    public function testIdempotence()
+    {
+        DebugClassLoader::enable();
+        DebugClassLoader::enable();
+
+        $functions = spl_autoload_functions();
+        foreach ($functions as $function) {
+            if (is_array($function) && $function[0] instanceof DebugClassLoader) {
+                $this->assertNotInstanceOf('Symfony\Component\ClassLoader\DebugClassLoader', $function[0]->getClassFinder());
+                return;
+            }
+        }
+
+        throw new \Exception('DebugClassLoader did not register');
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public static function enable()`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`foreach ($functions as $function) {`
`56`		`- if (is_array($function) && method_exists($function[0], 'findFile')) {`
	`56`	`+ if (is_array($function) && !$function[0] instanceof self && method_exists($function[0], 'findFile')) {`
`57`	`57`	`$function = array(new static($function[0]), 'loadClass');`
`58`	`58`	`}`
`59`	`59`
`@@ -104,4 +104,9 @@ public function loadClass($class)`
`104`	`104`	`return true;`
`105`	`105`	`}`
`106`	`106`	`}`
	`107`	`+`
	`108`	`+ public function getClassFinder()`
	`109`	`+ {`
	`110`	`+ return $this->classFinder;`
	`111`	`+ }`
`107`	`112`	`}`