Merge pull request #1 from merk/class-loader/idempotent

kriswallsmith · kriswallsmith · commit 27cc0df83596 · 2013-03-07T20:51:06.000-08:00
Fixed test to use Reflection
diff --git a/src/Symfony/Component/ClassLoader/DebugClassLoader.php b/src/Symfony/Component/ClassLoader/DebugClassLoader.php
@@ -104,9 +104,4 @@ 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
@@ -37,7 +37,11 @@ public function testIdempotence()
         $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());
+                $reflClass = new \ReflectionClass($function[0]);
+                $reflProp = $reflClass->getProperty('classFinder');
+                $reflProp->setAccessible(true);
+
+                $this->assertNotInstanceOf('Symfony\Component\ClassLoader\DebugClassLoader', $reflProp->getValue($function[0]));
                 return;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -104,9 +104,4 @@ public function loadClass($class)`
`104`	`104`	`return true;`
`105`	`105`	`}`
`106`	`106`	`}`
`107`		`-`
`108`		`- public function getClassFinder()`
`109`		`- {`
`110`		`- return $this->classFinder;`
`111`		`- }`
`112`	`107`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,11 @@ public function testIdempotence()`
`37`	`37`	`$functions = spl_autoload_functions();`
`38`	`38`	`foreach ($functions as $function) {`
`39`	`39`	`if (is_array($function) && $function[0] instanceof DebugClassLoader) {`
`40`		`- $this->assertNotInstanceOf('Symfony\Component\ClassLoader\DebugClassLoader', $function[0]->getClassFinder());`
	`40`	`+ $reflClass = new \ReflectionClass($function[0]);`
	`41`	`+ $reflProp = $reflClass->getProperty('classFinder');`
	`42`	`+ $reflProp->setAccessible(true);`
	`43`	`+`
	`44`	`+ $this->assertNotInstanceOf('Symfony\Component\ClassLoader\DebugClassLoader', $reflProp->getValue($function[0]));`
`41`	`45`	`return;`
`42`	`46`	`}`
`43`	`47`	`}`