clean up testing situation, add path tracking for debug info

auraphp · Dec 29, 2011 · e4c60e0 · e4c60e0
1 parent 2ba0799
commit e4c60e0
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 32 deletions.
diff --git a/config/default.php b/config/default.php
@@ -2,4 +2,4 @@
 /**
  * Package prefix for autoloader.
  */
-$loader->addPrefix('Aura\Autoload\\', dirname(__DIR__) . DIRECTORY_SEPARATOR . 'src');
+$loader->add('Aura\Autoload\\', dirname(__DIR__) . DIRECTORY_SEPARATOR . 'src');
diff --git a/config/test.php b/config/test.php
@@ -2,4 +2,4 @@
 /**
  * Package prefix for autoloader.
  */
-$loader->addPrefix('Aura\Autoload\\', dirname(__DIR__) . DIRECTORY_SEPARATOR . 'tests');
+$loader->add('Aura\Autoload\\', dirname(__DIR__) . DIRECTORY_SEPARATOR . 'tests');
diff --git a/src/Aura/Autoload/Loader.php b/src/Aura/Autoload/Loader.php
@@ -83,6 +83,8 @@ class Loader
      */
     protected $mode = self::MODE_NORMAL;
 
+    protected $tried_paths;
+
     /**
      * 
      * Sets the autoloader operational mode.
@@ -298,7 +300,9 @@ public function load($spec)
                 return;
             } else {
                 // yes, throw an exception
-                throw new Exception\NotFound($spec);
+                $message = $spec . PHP_EOL
+                         . implode(PHP_EOL, $this->tried_paths);
+                throw new Exception\NotFound($message);
             }
         }
 
@@ -321,7 +325,16 @@ public function load($spec)
         $this->loaded[$spec] = $file;
     }
 
-    public function isDeclared($spec)
+    /**
+     * 
+     * Tells if a class or interface exists.
+     * 
+     * @param string $spec The class or interface.
+     * 
+     * @return bool
+     * 
+     */
+    protected function isDeclared($spec)
     {
         return class_exists($spec, false)
             || interface_exists($spec, false);
@@ -344,6 +357,8 @@ public function find($spec)
             return $this->classes[$spec];
         }
 
+        $this->tried_paths = array();
+
         // go through each of the path prefixes
         foreach ($this->paths as $prefix => $paths) {
 
@@ -360,7 +375,10 @@ public function find($spec)
             $ctf = $this->classToFile($spec);
 
             // ... and go through each of the paths for the prefix
-            foreach ($paths as $path) {
+            foreach ($paths as $i => $path) {
+
+                // track which paths we have tried
+                $this->tried_paths[] = "#{$i}: {$path}";
 
                 // convert the remaining spec to a file name
                 $file = $path . DIRECTORY_SEPARATOR . $ctf;
@@ -373,26 +391,13 @@ public function find($spec)
             }
         }
 
-        // fall back to the include-path
-        return $this->findInclude($spec);
-    }
-
-    /**
-     * 
-     * Finds a class in the include-path.
-     * 
-     * @param string $spec The class or interface to find.
-     * 
-     * @return mixed The path to the file, or false if not found.
-     * 
-     */
-    protected function findInclude($spec)
-    {
         // fall back to the include path
         $file = $this->classToFile($spec);
         try {
             $obj = new \SplFileObject($file, 'r', true);
         } catch (\RuntimeException $e) {
+            $k = count($this->tried_paths);
+            $this->tried_paths[] = "#{$k}" . get_include_path();
             return false;
         }
         $path = $obj->getRealPath();

diff --git a/tests/Aura/Autoload/Bar/MockAutoloadRouterClass.php b/tests/Aura/Autoload/Bar/MockAutoloadRouterClass.php
@@ -0,0 +1,3 @@
+<?php
+namespace Aura\Autoload\Bar;
+class MockAutoloadRouterClass {}
diff --git a/tests/Aura/Autoload/Foo/MockAutoloadCliClass.php b/tests/Aura/Autoload/Foo/MockAutoloadCliClass.php
@@ -0,0 +1,3 @@
+<?php
+namespace Aura\Autoload\Foo;
+class MockAutoloadCliClass {}
diff --git a/tests/Aura/Autoload/LoaderTest.php b/tests/Aura/Autoload/LoaderTest.php
@@ -233,12 +233,12 @@ public function testSetClasses()
 
     public function testSetPaths()
     {
-        $class1 = 'Aura\Cli\MockAutoloadCliClass';
-        $class2 = 'Aura\Router\MockAutoloadRouterClass';
+        $class1 = 'Aura\Autoload\Foo\MockAutoloadCliClass';
+        $class2 = 'Aura\Autoload\Bar\MockAutoloadRouterClass';
         $autoloader = new Loader;
         $autoloader->setPaths(array(
-            'Aura\Cli\\', dirname(dirname(__DIR__)),
-            'Aura\Router\\', dirname(dirname(__DIR__))
+            'Aura\Autoload\Foo\\' => dirname(dirname(__DIR__)),
+            'Aura\Autoload\Bar\\' => dirname(dirname(__DIR__))
         ));
         $autoloader->load($class1);
         $autoloader->load($class2);
@@ -249,8 +249,8 @@ public function testSetPaths()
         $this->assertSame($class1, $actual);
 
         $expect = array(
-            $class1 => dirname( dirname( __DIR__ ) ) . DIRECTORY_SEPARATOR . 'Aura/Cli/MockAutoloadCliClass.php',
-            $class2 => dirname( dirname( __DIR__ ) ) . DIRECTORY_SEPARATOR . 'Aura/Router/MockAutoloadRouterClass.php',
+            $class1 => dirname( dirname( __DIR__ ) ) . DIRECTORY_SEPARATOR . 'Aura/Autoload/Foo/MockAutoloadCliClass.php',
+            $class2 => dirname( dirname( __DIR__ ) ) . DIRECTORY_SEPARATOR . 'Aura/Autoload/Bar/MockAutoloadRouterClass.php',
         );
 
         $actual = $autoloader->getLoaded();

diff --git a/tests/Aura/Cli/MockAutoloadCliClass.php b/tests/Aura/Cli/MockAutoloadCliClass.php
diff --git a/tests/Aura/Router/MockAutoloadRouterClass.php b/tests/Aura/Router/MockAutoloadRouterClass.php