Changed Attributes to merge in with data, updated ReadMe

Author: geggleto

README.md

@@ -40,6 +40,39 @@ $phpView = new PhpRenderer("./path/to/templates");
 $response = $phpView->render(new Response(), "/path/to/template.php", $yourData);
 ```
 
+## Template Variables
+
+You can now add variables to your renderer that will be available to all templates you render.
+
+```php
+//Via the constructor
+$templateVariables = [
+    "title" => "Title"
+];
+$phpView = new PhpRenderer("./path/to/templates", $templateVariables);
+
+//Or Setter
+$phpView->setAttributes($templateVariables);
+
+//Or Individually
+$phpView->addAttribute($key, $value);
+```
+
+Data passed in via `->render()` takes precedence over attributes.
+```php
+$templateVariables = [
+    "title" => "Title"
+];
+$phpView = new PhpRenderer("./path/to/templates", $templateVariables);
+
+//...
+
+$phpView->render($response, $template, [
+    "title" => "My Title"
+]);
+// In the view above, the $title will be "My Title" and not "Title"
+```
+
 ## Exceptions
 `\RuntimeException` - if template does not exist
 

src/PhpRenderer.php

@@ -86,6 +86,30 @@ public function setAttributes(array $attributes)
         $this->attributes = $attributes;
     }
 
+    /**
+     * Add an attribute
+     *
+     * @param $key
+     * @param $value
+     */
+    public function addAttribute($key, $value) {
+        $this->attributes[$key] = $value;
+    }
+
+    /**
+     * Retrieve an attribute
+     *
+     * @param $key
+     * @return mixed
+     */
+    public function getAttribute($key) {
+        if (!isset($this->attributes[$key])) {
+            return false;
+        }
+
+        return $this->attributes[$key];
+    }
+
     /**
      * Get the template path
      *
@@ -130,11 +154,15 @@ public function fetch($template, array $data = []) {
             throw new \RuntimeException("View cannot render `$template` because the template does not exist");
         }
 
+
+        /*
         foreach ($data as $k=>$val) {
             if (in_array($k, array_keys($this->attributes))) {
                 throw new \InvalidArgumentException("Duplicate key found in data and renderer attributes. " . $k);
             }
         }
+        */
+        $data = array_merge($this->attributes, $data);
 
         ob_start();
         $this->protectedIncludeScope($this->templatePath . $template, $data);

tests/PhpRendererTest.php

@@ -26,22 +26,21 @@ public function testRenderer() {
         $this->assertEquals("Hi", $newResponse->getBody()->getContents());
     }
 
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    public function testExceptionForAttr() {
+    public function testAttributeMerging() {
 
         $renderer = new \Slim\Views\PhpRenderer("tests/", [
-            "hello" => "Hi"
+            "hello" => "Hello"
         ]);
 
         $headers = new Headers();
         $body = new Body(fopen('php://temp', 'r+'));
         $response = new Response(200, $headers, $body);
 
-        $renderer->render($response, "testTemplate.php", [
+        $newResponse = $renderer->render($response, "testTemplate.php", [
             "hello" => "Hi"
         ]);
+        $newResponse->getBody()->rewind();
+        $this->assertEquals("Hi", $newResponse->getBody()->getContents());
     }
 
     /**