Merge pull request #135 from FriendsOfCake/fixes

Remove deprecations, fix up PHPStan level 8

Author: dereuromark

composer.json

@@ -44,10 +44,10 @@
         }
     ],
     "require":{
-        "cakephp/cakephp": "^4.0"
+        "cakephp/cakephp": "^4.2"
     },
     "require-dev": {
-        "phpunit/phpunit": "~8.5.0",
+        "phpunit/phpunit": "^9.5.0",
         "cakephp/cakephp-codesniffer": "^4.0"
     },
     "autoload": {
@@ -77,7 +77,12 @@
         "stan": "phpstan analyse && psalm",
         "phpstan": "phpstan analyse",
         "psalm": "psalm --show-info=false",
-        "stan-setup": "cp composer.json composer.backup && composer require --dev phpstan/phpstan:^0.12 vimeo/psalm:^3.7 && mv composer.backup composer.json",
+        "stan-setup": "cp composer.json composer.backup && composer require --dev phpstan/phpstan:^1.0.0 vimeo/psalm:^5.0 && mv composer.backup composer.json",
         "test-coverage": "phpunit --coverage-clover=clover.xml"
+    },
+    "config": {
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
     }
 }

phpstan.neon

@@ -1,7 +1,7 @@
 parameters:
-    level: 6
+    level: 8
     checkMissingIterableValueType: false
     paths:
-        - src
+        - src/
     bootstrapFiles:
         - tests/bootstrap.php

src/View/CsvView.php

@@ -3,6 +3,7 @@
 
 namespace CsvView\View;
 
+use Cake\Core\Exception\CakeException;
 use Cake\Datasource\EntityInterface;
 use Cake\Utility\Hash;
 use Cake\View\SerializedView;
@@ -304,7 +305,11 @@ protected function _generateRow(?array $row = null)
         }
 
         if ($fp === false) {
-            $fp = fopen('php://temp', 'r+');
+            $stream = 'php://temp';
+            $fp = fopen($stream, 'r+');
+            if ($fp === false) {
+                throw new CakeException(sprintf('Cannot open stream `%s`', $stream));
+            }
 
             $setSeparator = $this->getConfig('setSeparator');
             if ($setSeparator) {

tests/TestCase/View/CsvViewTest.php

@@ -5,7 +5,7 @@
 
 use Cake\Http\Response;
 use Cake\Http\ServerRequest as Request;
-use Cake\I18n\Time;
+use Cake\I18n\FrozenTime;
 use Cake\ORM\TableRegistry;
 use Cake\TestSuite\TestCase;
 use CsvView\View\CsvView;
@@ -34,7 +34,7 @@ class CsvViewTest extends TestCase
 
     public function setUp(): void
     {
-        Time::setToStringFormat('yyyy-MM-dd HH:mm:ss');
+        FrozenTime::setToStringFormat('yyyy-MM-dd HH:mm:ss');
 
         $this->request = new Request();
         $this->response = new Response();
@@ -267,7 +267,7 @@ public function testRenderViaExtract()
             [
                 'User' => [
                     'username' => 'jose',
-                    'created' => new Time('2010-01-05'),
+                    'created' => new FrozenTime('2010-01-05'),
                 ],
                 'Item' => [
                     'name' => 'beach',
@@ -343,7 +343,7 @@ public function testRenderViaExtractWithCallable()
         $data = [
             [
                 'username' => 'jose',
-                'created' => new Time('2010-01-05'),
+                'created' => new FrozenTime('2010-01-05'),
                 'item' => [
                     'name' => 'beach',
                 ],