Merge branch 'develop-2' of github.com:auraphp/Aura.View into develop-2

auraphp · Nov 7, 2014 · 395dc36 · 395dc36
2 parents c9a6947 + 1f34b7a
commit 395dc36
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/TemplateRegistry.php b/src/TemplateRegistry.php
@@ -37,7 +37,9 @@ class TemplateRegistry
      */
     public function __construct(array $map = array())
     {
-        $this->map = $map;
+        foreach ($map as $name => $spec) {
+            $this->set($name, $spec);
+        }
     }
 
     /**

diff --git a/tests/unit/src/ViewTest.php b/tests/unit/src/ViewTest.php
@@ -132,4 +132,17 @@ public function testSections()
         $expect = 'foo bar baz dib zim gir irk';
         $this->assertSame($expect, $actual);
     }
+
+    public function testMapFilesToTemplateRegistryOnConstruct()
+    {
+        $view = new View(
+            new TemplateRegistry(array('foo' => __DIR__ . '/foo_template.php')),
+            new TemplateRegistry,
+            new HelperRegistry
+        );
+        $view->setView('foo');
+        $actual = $view->__invoke();
+        $expect = 'Hello Foo!';
+        $this->assertSame($expect, $actual);
+    }
 }