Allow multiple Twig paths using namespacesv1.0.0-beta2v1.0.0

1 files changed, 21 insertions, 1 deletions

diff --git a/src/View/Twig.php b/src/View/Twig.php
index 21cd885..c574323 100644
--- a/src/View/Twig.php
+++ b/src/View/Twig.php
@@ -45,12 +45,31 @@ class Twig implements ViewInterface
             throw new \BadMethodCallException("'path' option is required");
         }
 
-        $loader = new \Twig_Loader_Filesystem($options['path']);
+        $loader = new \Twig_Loader_Filesystem();
+        $this->addLoaderPaths($loader, $options['path']);
         
         return new \Twig_Environment($loader, $options);
     }
     
     /**
+     * Add paths to Twig loader
+     * 
+     * @param \Twig_Loader_Filesystem $loader
+     * @param string|array            $paths
+     * @return type
+     */
+    protected function addLoaderPaths(\Twig_Loader_Filesystem $loader, $paths)
+    {
+        foreach ((array)$paths as $namespace => $path) {
+            if (is_int($namespace)) {
+                $namespace = \Twig_Loader_Filesystem::MAIN_NAMESPACE;
+            }
+
+            $loader->addPath($path, $namespace);
+        }
+    }
+    
+    /**
      * Get Twig environment
      *
      * @return \Twig_Environment
@@ -171,3 +190,4 @@ class Twig implements ViewInterface
         return $newResponse;
     }
 }
+