FIX [2.1][ClassLoader]UniversalClassLoader not working with AnnotationRegistry::registerLoader

Tamas Szijarto · Tamas Szijarto · commit f66f11002481 · 2012-10-07T19:13:37.000+02:00
diff --git a/src/Symfony/Component/ClassLoader/Tests/UniversalClassLoaderTest.php b/src/Symfony/Component/ClassLoader/Tests/UniversalClassLoaderTest.php
@@ -23,7 +23,7 @@ public function testLoadClass($className, $testClassName, $message)
         $loader = new UniversalClassLoader();
         $loader->registerNamespace('Namespaced', __DIR__.DIRECTORY_SEPARATOR.'Fixtures');
         $loader->registerPrefix('Pearlike_', __DIR__.DIRECTORY_SEPARATOR.'Fixtures');
-        $loader->loadClass($testClassName);
+        $this->assertTrue($loader->loadClass($testClassName));
         $this->assertTrue(class_exists($className), $message);
     }
 
@@ -92,7 +92,7 @@ public function testLoadClassFromFallback($className, $testClassName, $message)
         $loader->registerPrefix('Pearlike_', __DIR__.DIRECTORY_SEPARATOR.'Fixtures');
         $loader->registerNamespaceFallbacks(array(__DIR__.DIRECTORY_SEPARATOR.'Fixtures/fallback'));
         $loader->registerPrefixFallbacks(array(__DIR__.DIRECTORY_SEPARATOR.'Fixtures/fallback'));
-        $loader->loadClass($testClassName);
+        $this->assertTrue($loader->loadClass($testClassName));
         $this->assertTrue(class_exists($className), $message);
     }
 
@@ -128,7 +128,7 @@ public function testLoadClassNamespaceCollision($namespaces, $className, $messag
         $loader = new UniversalClassLoader();
         $loader->registerNamespaces($namespaces);
 
-        $loader->loadClass($className);
+        $this->assertTrue($loader->loadClass($className));
         $this->assertTrue(class_exists($className), $message);
     }
 
@@ -178,7 +178,7 @@ public function testLoadClassPrefixCollision($prefixes, $className, $message)
         $loader = new UniversalClassLoader();
         $loader->registerPrefixes($prefixes);
 
-        $loader->loadClass($className);
+        $this->assertTrue($loader->loadClass($className));
         $this->assertTrue(class_exists($className), $message);
     }
 
diff --git a/src/Symfony/Component/ClassLoader/UniversalClassLoader.php b/src/Symfony/Component/ClassLoader/UniversalClassLoader.php
@@ -242,11 +242,15 @@ public function register($prepend = false)
      * Loads the given class or interface.
      *
      * @param string $class The name of the class
+     * 
+     * @return Boolean|null True, if loaded
      */
     public function loadClass($class)
     {
         if ($file = $this->findFile($class)) {
             require $file;
+
+            return true;
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -242,11 +242,15 @@ public function register($prepend = false)`
`242`	`242`	`* Loads the given class or interface.`
`243`	`243`	`*`
`244`	`244`	`* @param string $class The name of the class`
	`245`	`+ *`
	`246`	`+ * @return Boolean\|null True, if loaded`
`245`	`247`	`*/`
`246`	`248`	`public function loadClass($class)`
`247`	`249`	`{`
`248`	`250`	`if ($file = $this->findFile($class)) {`
`249`	`251`	`require $file;`
	`252`	`+`
	`253`	`+ return true;`
`250`	`254`	`}`
`251`	`255`	`}`
`252`	`256`