Zend\Loader\AutoloaderInterface

- s/AutoloaderInterface/Autoloadable/ - Corrected code and tests to reflect the above
adaykin · Jul 7, 2010 · 7f7bf8b · 7f7bf8b
1 parent d6d87b9
commit 7f7bf8b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/library/Zend/Loader/AutoloaderInterface.php → library/Zend/Loader/Autoloadable.php b/library/Zend/Loader/AutoloaderInterface.php → library/Zend/Loader/Autoloadable.php
@@ -30,7 +30,7 @@
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-interface AutoloaderInterface
+interface Autoloadable
 {
     public function autoload($class);
 }
diff --git a/library/Zend/Loader/Autoloader.php b/library/Zend/Loader/Autoloader.php
@@ -136,7 +136,7 @@ public static function autoload($class)
         $self = self::getInstance();
 
         foreach ($self->getClassAutoloaders($class) as $autoloader) {
-            if ($autoloader instanceof AutoloaderInterface) {
+            if ($autoloader instanceof Autoloadable) {
                 if ($autoloader->autoload($class)) {
                     return true;
                 }

diff --git a/library/Zend/Loader/ResourceAutoloader.php b/library/Zend/Loader/ResourceAutoloader.php
@@ -27,14 +27,14 @@
  *
  * @uses       Zend_Loader
  * @uses       Zend_Loader_Autoloader
- * @uses       Zend_Loader_Autoloader_Interface
+ * @uses       Zend_Loader_Autoloadable
  * @uses       Zend_Loader_Exception
  * @package    Zend_Loader
  * @subpackage Autoloader
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class ResourceAutoloader implements AutoloaderInterface
+class ResourceAutoloader implements Autoloadable
 {
     /**
      * @var string Base path to resource classes

diff --git a/tests/Zend/Loader/AutoloaderTest.php b/tests/Zend/Loader/AutoloaderTest.php
@@ -429,7 +429,7 @@ function testAutoload($class)
     return $class;
 }
 
-class TestAutoloader implements \Zend\Loader\AutoloaderInterface
+class TestAutoloader implements \Zend\Loader\Autoloadable
 {
     public function autoload($class)
     {

diff --git a/working/PHPNamespacer-MappedClasses.xml b/working/PHPNamespacer-MappedClasses.xml
@@ -8035,10 +8035,10 @@
    <mappedClass>
       <originalRelativeFilePath>Zend/Loader/Autoloader/Interface.php</originalRelativeFilePath>
       <originalClassName>Zend_Loader_Autoloader_Interface</originalClassName>
-      <newRelativeFilePath>Zend/Loader/AutoloaderInterface.php</newRelativeFilePath>
+      <newRelativeFilePath>Zend/Loader/Autoloadable.php</newRelativeFilePath>
       <newNamespace>Zend\Loader</newNamespace>
-      <newClassName>AutoloaderInterface</newClassName>
-      <newFullyQualifiedName>Zend\Loader\AutoloaderInterface</newFullyQualifiedName>
+      <newClassName>Autoloadable</newClassName>
+      <newFullyQualifiedName>Zend\Loader\Autoloadable</newFullyQualifiedName>
    </mappedClass>
    <mappedClass>
       <originalRelativeFilePath>Zend/Loader/Autoloader/Resource.php</originalRelativeFilePath>