Merge pull request #291 from kyleweishaupt/cake-4.x

Cake 4.x Stable
FriendsOfCake · Dec 18, 2019 · 2f40aab · 2f40aab
2 parents cbf6b17 + cb73d8b
commit 2f40aab
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -5,7 +5,7 @@
     "homepage": "http://github.com/friendsofcake/CakePdf",
     "license": "MIT",
     "require": {
-        "cakephp/cakephp": "4.x-dev"
+        "cakephp/cakephp": "^4.0.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^7.0",

diff --git a/src/Pdf/CakePdf.php b/src/Pdf/CakePdf.php
@@ -955,7 +955,7 @@ protected function _render()
             $viewOptions[$var] = $this->{$prop};
         }
 
-        $request = Router::getRequest(true);
+        $request = Router::getRequest();
         if (!$request) {
             $request = ServerRequestFactory::fromGlobals();
         }

diff --git a/src/Pdf/Engine/MpdfEngine.php b/src/Pdf/Engine/MpdfEngine.php
@@ -17,7 +17,8 @@ public function output()
     {
         $orientation = $this->_Pdf->orientation() === 'landscape' ? 'L' : 'P';
         $format = $this->_Pdf->pageSize();
-        if (is_string($format)
+        if (
+            is_string($format)
             && $orientation === 'L'
             && strpos($format, '-L') === false
         ) {

diff --git a/tests/TestCase/Pdf/CakePdfTest.php b/tests/TestCase/Pdf/CakePdfTest.php
@@ -98,7 +98,7 @@ public function testCustomTemplatePaths($config)
         $pdf->templatePath('Posts/pdf');
         $result = $pdf->output();
         $expected = '<h2>Rendered with default layout</h2>' . "\n" . 'Post data: testing';
-        $this->assertEquals($expected, $result);
+        $this->assertTextEquals($expected, $result);
     }
 
     /**