merged branch hason/loader (PR twigphp#838)

Commits ------- c503287 Fixed typo in Filesystem loader Discussion ---------- Fixed typo in Filesystem loader
fabpot · Sep 18, 2012 · e3e8b42 · e3e8b42
2 parents c38e06f + c503287
commit e3e8b42
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/lib/Twig/Loader/Filesystem.php b/lib/Twig/Loader/Filesystem.php
@@ -51,7 +51,7 @@ public function getPaths($namespace = '__main__')
      */
     public function getNamespaces()
     {
-        return array_keys($this->paths[$namespace]);
+        return array_keys($this->paths);
     }
 
     /**

diff --git a/test/Twig/Tests/Loader/FilesystemTest.php b/test/Twig/Tests/Loader/FilesystemTest.php
@@ -78,4 +78,13 @@ public function testPaths()
         $this->assertEquals("path (final)\n", $loader->getSource('@__main__/index.html'));
         $this->assertEquals("named path (final)\n", $loader->getSource('@named/index.html'));
     }
+
+    public function testGetNamespaces()
+    {
+        $loader = new Twig_Loader_Filesystem(sys_get_temp_dir());
+        $this->assertEquals(array('__main__'), $loader->getNamespaces());
+
+        $loader->addPath(sys_get_temp_dir(), 'named');
+        $this->assertEquals(array('__main__', 'named'), $loader->getNamespaces());
+    }
 }