renamed some UniversalClassLoader for better consistency

rgrebenchuk · May 31, 2011 · 28527c7 · 28527c7
1 parent 02605f3
commit 28527c7
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 18 deletions.
diff --git a/UPDATE.md b/UPDATE.md
@@ -9,6 +9,11 @@ timeline closely anyway.
 beta3 to beta4
 --------------
 
+* Some `UniversalClassLoader` methods have been renamed:
+
+    * `registerPrefixFallback` to `registerPrefixFallbacks`
+    * `registerNamespaceFallback` to `registerNamespaceFallbacks`
+
 * The event system has been made more flexible. A listener can now be any
   valid PHP callable.
 

diff --git a/autoload.php.dist b/autoload.php.dist
@@ -18,7 +18,7 @@ $loader->registerPrefixes(array(
     'Swift_' => __DIR__.'/vendor/swiftmailer/lib/classes',
     'Twig_'  => __DIR__.'/vendor/twig/lib',
 ));
-$loader->register();
-$loader->registerPrefixFallback(array(
+$loader->registerPrefixFallbacks(array(
     __DIR__.'/../vendor/symfony/src/Symfony/Component/Locale/Resources/stubs',
 ));
+$loader->register();
diff --git a/src/Symfony/Component/ClassLoader/UniversalClassLoader.php b/src/Symfony/Component/ClassLoader/UniversalClassLoader.php
@@ -58,8 +58,8 @@ class UniversalClassLoader
 {
     private $namespaces = array();
     private $prefixes = array();
-    private $namespaceFallback = array();
-    private $prefixFallback = array();
+    private $namespaceFallbacks = array();
+    private $prefixFallbacks = array();
 
     /**
      * Gets the configured namespaces.
@@ -86,43 +86,43 @@ public function getPrefixes()
      *
      * @return array An array of directories
      */
-    public function getNamespaceFallback()
+    public function getNamespaceFallbacks()
     {
-        return $this->namespaceFallback;
+        return $this->namespaceFallbacks;
     }
 
     /**
      * Gets the directory(ies) to use as a fallback for class prefixes.
      *
      * @return array An array of directories
      */
-    public function getPrefixFallback()
+    public function getPrefixFallbacks()
     {
-        return $this->prefixFallback;
+        return $this->prefixFallbacks;
     }
 
     /**
      * Registers the directory to use as a fallback for namespaces.
      *
-     * @param string|array $dirs A directory path or an array of directories
+     * @param array $dirs An array of directories
      *
      * @api
      */
-    public function registerNamespaceFallback($dirs)
+    public function registerNamespaceFallbacks(array $dirs)
     {
-        $this->namespaceFallback = (array) $dirs;
+        $this->namespaceFallbacks = $dirs;
     }
 
     /**
      * Registers the directory to use as a fallback for class prefixes.
      *
-     * @param string|array $dirs A directory path or an array of directories
+     * @param array $dirs An array of directories
      *
      * @api
      */
-    public function registerPrefixFallback($dirs)
+    public function registerPrefixFallbacks(array $dirs)
     {
-        $this->prefixFallback = (array) $dirs;
+        $this->prefixFallbacks = $dirs;
     }
 
     /**
@@ -231,7 +231,7 @@ public function findFile($class)
                 }
             }
 
-            foreach ($this->namespaceFallback as $dir) {
+            foreach ($this->namespaceFallbacks as $dir) {
                 $file = $dir.DIRECTORY_SEPARATOR.str_replace('\\', DIRECTORY_SEPARATOR, $class).'.php';
                 if (file_exists($file)) {
                     return $file;
@@ -250,7 +250,7 @@ public function findFile($class)
                 }
             }
 
-            foreach ($this->prefixFallback as $dir) {
+            foreach ($this->prefixFallbacks as $dir) {
                 $file = $dir.DIRECTORY_SEPARATOR.str_replace('_', DIRECTORY_SEPARATOR, $class).'.php';
                 if (file_exists($file)) {
                     return $file;

diff --git a/tests/Symfony/Tests/Component/ClassLoader/UniversalClassLoaderTest.php b/tests/Symfony/Tests/Component/ClassLoader/UniversalClassLoaderTest.php
@@ -45,8 +45,8 @@ public function testLoadClassFromFallback($className, $testClassName, $message)
         $loader = new UniversalClassLoader();
         $loader->registerNamespace('Namespaced', __DIR__.DIRECTORY_SEPARATOR.'Fixtures');
         $loader->registerPrefix('Pearlike_', __DIR__.DIRECTORY_SEPARATOR.'Fixtures');
-        $loader->registerNamespaceFallback(__DIR__.DIRECTORY_SEPARATOR.'Fixtures/fallback');
-        $loader->registerPrefixFallback(__DIR__.DIRECTORY_SEPARATOR.'Fixtures/fallback');
+        $loader->registerNamespaceFallbacks(array(__DIR__.DIRECTORY_SEPARATOR.'Fixtures/fallback'));
+        $loader->registerPrefixFallbacks(array(__DIR__.DIRECTORY_SEPARATOR.'Fixtures/fallback'));
         $loader->loadClass($testClassName);
         $this->assertTrue(class_exists($className), $message);
     }