Fix content type switching for error pages.

FriendsOfCake · Oct 3, 2023 · ffd03d7 · ffd03d7
1 parent f77e019
commit ffd03d7
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" bootstrap="./tests/bootstrap.php" colors="true" processIsolation="false" stopOnError="false" stopOnFailure="false" stopOnIncomplete="false" stopOnSkipped="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.3/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" bootstrap="./tests/bootstrap.php" colors="true" processIsolation="false" stopOnError="false" stopOnFailure="false" stopOnIncomplete="false" stopOnSkipped="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.3/phpunit.xsd" backupStaticProperties="false">
   <testsuites>
     <testsuite name="CakePdf Plugin Tests">
       <directory>./tests/TestCase</directory>

diff --git a/src/View/PdfView.php b/src/View/PdfView.php
@@ -83,7 +83,23 @@ public function __construct(
     }
 
     /**
-     * @inheritDoc
+     * Set the response content-type based on the view's contentType()
+     *
+     * @return void
+     */
+    protected function setContentType(): void
+    {
+        parent::setContentType();
+
+        if ($this->templatePath === 'Error') {
+            $this->response = $this->response->withType('html');
+        }
+    }
+
+    /**
+     * Mime-type this view class renders as.
+     *
+     * @return string 'application/pdf'
      */
     public static function contentType(): string
     {

diff --git a/tests/TestCase/View/PdfViewTest.php b/tests/TestCase/View/PdfViewTest.php
@@ -123,9 +123,7 @@ public function testRenderTemplateWithNoOutput()
      */
     public function testRenderErrorTemplate()
     {
-        $request = new ServerRequest();
-        $response = new Response();
-        $this->View = new PdfView($request, $response, null, ['templatePath' => 'Error']);
+        $this->View = new PdfView(viewOptions: ['templatePath' => 'Error']);
 
         $this->assertSame('', $this->View->getSubDir());
         $this->assertSame('', $this->View->getLayoutPath());