Add templateExists function

jakejohns · jakejohns · commit 682241b65fdf · 2021-11-04T00:47:46.000+02:00
diff --git a/src/PhpRenderer.php b/src/PhpRenderer.php
@@ -72,8 +72,7 @@ public function setLayout(string $layout): void
         if ($layout === '' || $layout === null) {
             $this->layout = null;
         } else {
-            $layoutPath = $this->templatePath . $layout;
-            if (!is_file($layoutPath)) {
+            if (!$this->templateExists($layout)) {
                 throw new PhpTemplateNotFoundException('Layout template "' . $layout . '" does not exist');
             }
             $this->layout = $layout;
@@ -173,7 +172,7 @@ public function fetchTemplate(string $template, array $data = []): string
             throw new InvalidArgumentException('Duplicate template key found');
         }
 
-        if (!is_file($this->templatePath . $template)) {
+        if (!$this->templateExists($template)) {
             throw new PhpTemplateNotFoundException('View cannot render "' . $template
                                                    . '" because the template does not exist');
         }
@@ -191,6 +190,19 @@ public function fetchTemplate(string $template, array $data = []): string
         return $output;
     }
 
+    /**
+     * Returns true is template exists, false if not
+     *
+     * @param $template
+     *
+     * @return bool
+     */
+    public function templateExists(string $template) : bool
+    {
+        $path = $this->templatePath . $template;
+        return is_file($path) && is_readable($path);
+    }
+
     /**
      * @param string $template
      * @param array  $data
diff --git a/tests/PhpRendererTest.php b/tests/PhpRendererTest.php
@@ -169,4 +169,11 @@ public function testContentDataKeyShouldBeIgnored(): void
         $this->assertEquals('<html><head><title>Hello - My App</title></head><body>Hi<footer>This is the footer'
                             . '</footer></body></html>', $newResponse->getBody()->getContents());
     }
+
+    public function testTemplateExists()
+    {
+        $renderer = new PhpRenderer(__DIR__ . '/_files/');
+        $this->assertTrue($renderer->templateExists('layout.phtml'));
+        $this->assertFalse($renderer->templateExists('non-existant-template'));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -169,4 +169,11 @@ public function testContentDataKeyShouldBeIgnored(): void`
`169`	`169`	`$this->assertEquals('<html><head><title>Hello - My App</title></head><body>Hi<footer>This is the footer'`
`170`	`170`	`. '</footer></body></html>', $newResponse->getBody()->getContents());`
`171`	`171`	`}`
	`172`	`+`
	`173`	`+ public function testTemplateExists()`
	`174`	`+ {`
	`175`	`+ $renderer = new PhpRenderer(__DIR__ . '/_files/');`
	`176`	`+ $this->assertTrue($renderer->templateExists('layout.phtml'));`
	`177`	`+ $this->assertFalse($renderer->templateExists('non-existant-template'));`
	`178`	`+ }`
`172`	`179`	`}`