Update exception handling for PHP 7

No need to catch Throwable and Exception any more. Also import and
document exceptions used.

Author: akrabat

src/PhpRenderer.php

@@ -13,6 +13,8 @@
 
 use InvalidArgumentException;
 use Psr\Http\Message\ResponseInterface;
+use RuntimeException;
+use Throwable;
 
 /**
  * Class PhpRenderer
@@ -49,8 +51,9 @@ public function __construct(string $templatePath = "", array $attributes = [], s
      *
      * @note $data cannot contain template as a key
      *
-     * @throws \InvalidArgumentException
-     * @throws \RuntimeException if $templatePath . $template does not exist
+     * @throws InvalidArgumentException
+     * @throws RuntimeException if $templatePath . $template does not exist
+     * @throws Throwable
      */
     public function render(ResponseInterface $response, string $template, array $data = []): ResponseInterface
     {
@@ -74,12 +77,12 @@ public function getLayout(): string
      */
     public function setLayout(string $layout): void
     {
-        if ($layout === "" || $layout === null) {
+        if ($layout === '' || $layout === null) {
             $this->layout = null;
         } else {
             $layoutPath = $this->templatePath . $layout;
             if (!is_file($layoutPath)) {
-                throw new \RuntimeException("Layout template `$layout` does not exist");
+                throw new RuntimeException("Layout template `$layout` does not exist");
             }
             $this->layout = $layout;
         }
@@ -144,8 +147,9 @@ public function setTemplatePath(string $templatePath): void
      *
      * @note $data cannot contain template as a key
      *
-     * @throws \InvalidArgumentException
-     * @throws \RuntimeException
+     * @throws InvalidArgumentException
+     * @throws RuntimeException
+     * @throws Throwable
      */
     public function fetch(string $template, array $data = [], bool $useLayout = false): string
     {
@@ -164,17 +168,18 @@ public function fetch(string $template, array $data = [], bool $useLayout = fals
      *
      * @note $data cannot contain template as a key
      *
-     * @throws \InvalidArgumentException
-     * @throws \RuntimeException
+     * @throws InvalidArgumentException
+     * @throws RuntimeException
+     * @throws Throwable
      */
     public function fetchTemplate(string $template, array $data = []): string
     {
         if (isset($data['template'])) {
-            throw new \InvalidArgumentException("Duplicate template key found");
+            throw new InvalidArgumentException('Duplicate template key found');
         }
 
         if (!is_file($this->templatePath . $template)) {
-            throw new \RuntimeException("View cannot render `$template` because the template does not exist");
+            throw new RuntimeException("View cannot render `$template` because the template does not exist");
         }
 
         $data = array_merge($this->attributes, $data);
@@ -183,10 +188,7 @@ public function fetchTemplate(string $template, array $data = []): string
             ob_start();
             $this->protectedIncludeScope($this->templatePath . $template, $data);
             $output = ob_get_clean();
-        } catch (\Throwable $e) { // PHP 7+
-            ob_end_clean();
-            throw $e;
-        } catch (\Exception $e) { // PHP < 7
+        } catch (Throwable $e) {
             ob_end_clean();
             throw $e;
         }

tests/PhpRendererTest.php

@@ -4,7 +4,9 @@
 
 namespace Slim\ViewsTest;
 
+use InvalidArgumentException;
 use PHPUnit\Framework\TestCase;
+use RuntimeException;
 use Slim\Psr7\Headers;
 use Slim\Psr7\Response;
 use Slim\Psr7\Stream;
@@ -78,12 +80,7 @@ public function testExceptionInTemplate()
 
         try {
             $newResponse = $renderer->render($response, "exception_layout.phtml");
-        } catch (Throwable $t) { // PHP 7+
-            // Simulates an error template
-            $newResponse = $renderer->render($response, "template.phtml", [
-                "hello" => "Hi"
-            ]);
-        } catch (Exception $e) { // PHP < 7
+        } catch (Throwable $t) {
             // Simulates an error template
             $newResponse = $renderer->render($response, "template.phtml", [
                 "hello" => "Hi"
@@ -176,12 +173,6 @@ public function testExceptionInLayout()
             $newResponse = $renderer->render($response, "template.phtml", [
                 "hello" => "Hi"
             ]);
-        } catch (Exception $e) { // PHP < 7
-            // Simulates an error template
-            $renderer->setLayout(null);
-            $newResponse = $renderer->render($response, "template.phtml", [
-                "hello" => "Hi"
-            ]);
         }
 
         $newResponse->getBody()->rewind();