[ClassLoader] Add ability to incrementally register fallbacks.

This is useful in the cases where you might be adding forward compat classes to several components.
symfony · Feb 22, 2012 · d339e74 · d339e74
1 parent 74ebd05
commit d339e74
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 1 deletion.
diff --git a/src/Symfony/Component/ClassLoader/UniversalClassLoader.php b/src/Symfony/Component/ClassLoader/UniversalClassLoader.php
@@ -141,7 +141,17 @@ public function registerNamespaceFallbacks(array $dirs)
     }
 
     /**
-     * Registers the directory to use as a fallback for class prefixes.
+     * Registers a directory to use as a fallback for namespaces.
+     *
+     * @param string $dir A directory
+     */
+    public function registerNamespaceFallback($dir)
+    {
+        $this->namespaceFallbacks[] = $dir;
+    }
+
+    /**
+     * Registers directories to use as a fallback for class prefixes.
      *
      * @param array $dirs An array of directories
      *
@@ -152,6 +162,16 @@ public function registerPrefixFallbacks(array $dirs)
         $this->prefixFallbacks = $dirs;
     }
 
+    /**
+     * Registers a directory to use as a fallback for class prefixes.
+     *
+     * @param string $dir A directory
+     */
+    public function registerPrefixFallback($dir)
+    {
+        $this->prefixFallbacks[] = $dir;
+    }
+
     /**
      * Registers an array of namespaces
      *

diff --git a/tests/Symfony/Tests/Component/ClassLoader/UniversalClassLoaderTest.php b/tests/Symfony/Tests/Component/ClassLoader/UniversalClassLoaderTest.php
@@ -80,6 +80,20 @@ public function getLoadClassFromFallbackTests()
         );
     }
 
+    public function testRegisterPrefixFallback()
+    {
+        $loader = new UniversalClassLoader();
+        $loader->registerPrefixFallback(__DIR__.DIRECTORY_SEPARATOR.'Fixtures/fallback');
+        $this->assertEquals(array(__DIR__.DIRECTORY_SEPARATOR.'Fixtures/fallback'), $loader->getPrefixFallbacks());
+    }
+
+    public function testRegisterNamespaceFallback()
+    {
+        $loader = new UniversalClassLoader();
+        $loader->registerNamespaceFallback(__DIR__.DIRECTORY_SEPARATOR.'Fixtures/Namespaced/fallback');
+        $this->assertEquals(array(__DIR__.DIRECTORY_SEPARATOR.'Fixtures/Namespaced/fallback'), $loader->getNamespaceFallbacks());
+    }
+
     /**
      * @dataProvider getLoadClassNamespaceCollisionTests
      */