Merge branch 'jaywilliams/patch-1'

Closes #52
Fixes #49

Author: akrabat

src/PhpRenderer.php

@@ -97,7 +97,7 @@ public function setLayout($layout)
             if (!is_file($layoutPath)) {
                 throw new \RuntimeException("Layout template `$layout` does not exist");
             }
-            $this->layout = $layoutPath;
+            $this->layout = $layout;
         }
     }
 
@@ -182,6 +182,33 @@ public function setTemplatePath($templatePath)
      * @throws \RuntimeException
      */
     public function fetch($template, array $data = [], $useLayout = false) {
+
+        $output = $this->fetchTemplate($template, $data);
+
+        if ($this->layout !== null && $useLayout) {
+            $data['content'] = $output;
+            $output = $this->fetchTemplate($this->layout, $data);
+        }
+
+        return $output;
+    }
+
+    /**
+     * Renders a template and returns the result as a string
+     *
+     * cannot contain template as a key
+     *
+     * throws RuntimeException if $templatePath . $template does not exist
+     *
+     * @param $template
+     * @param array $data
+     *
+     * @return mixed
+     *
+     * @throws \InvalidArgumentException
+     * @throws \RuntimeException
+     */
+    public function fetchTemplate($template, array $data = []) {
         if (isset($data['template'])) {
             throw new \InvalidArgumentException("Duplicate template key found");
         }
@@ -190,27 +217,13 @@ public function fetch($template, array $data = [], $useLayout = false) {
             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);
 
         try {
             ob_start();
             $this->protectedIncludeScope($this->templatePath . $template, $data);
             $output = ob_get_clean();
 
-            if ($this->layout !== null && $useLayout) {
-                ob_start();
-                $data['content'] = $output;
-                $this->protectedIncludeScope($this->layout, $data);
-                $output = ob_get_clean(); 
-            }
         } catch(\Throwable $e) { // PHP 7+
             ob_end_clean();
             throw $e;