Merge pull request #361 from FriendsOfCake/tests

Update tests.

Author: dereuromark

.editorconfig

@@ -14,3 +14,6 @@ trim_trailing_whitespace = true
 [*.yml]
 indent_style = space
 indent_size = 2
+
+[*.neon]
+indent_style = tab

.github/workflows/ci.yml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['7.2', '7.4', '8.0']
+        php-version: ['7.4', '8.0', '8.1']
         prefer-lowest: ['']
         include:
           - php-version: '7.2'
@@ -29,9 +29,7 @@ jobs:
           POSTGRES_PASSWORD: postgres
 
     steps:
-    - uses: actions/checkout@v1
-      with:
-        fetch-depth: 1
+    - uses: actions/checkout@v2
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
@@ -62,24 +60,22 @@ jobs:
 
     - name: Code Coverage Report
       if: matrix.php-version == '7.4'
-      uses: codecov/codecov-action@v1
+      uses: codecov/codecov-action@v2
 
   cs-stan:
     name: Coding Standard & Static Analysis
     runs-on: ubuntu-18.04
 
     steps:
-    - uses: actions/checkout@v1
-      with:
-        fetch-depth: 1
+    - uses: actions/checkout@v2
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
       with:
         php-version: '7.4'
         extensions: mbstring, intl
         coverage: none
-        tools: cs2pr, psalm:^4.4, phpstan:^0.12
+        tools: cs2pr, vimeo/psalm:4.21, phpstan:1.4
 
     - name: Composer Install
       run: composer install

composer.json

@@ -20,7 +20,7 @@
         "cakephp/cakephp": "^4.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "~8.5.0",
+        "phpunit/phpunit": "^8.5 || ^9.3",
         "cakephp/bake": "^2.1",
         "cakephp/cakephp-codesniffer": "^4.1"
     },
@@ -48,7 +48,12 @@
         "cs-fix": "phpcbf --standard=vendor/cakephp/cakephp-codesniffer/CakePHP --ignore=comparisons src/ tests/",
         "stan": "phpstan analyse && psalm.phar",
         "psalm": "psalm.phar",
-        "stan-setup": "cp composer.json composer.backup && composer require --dev phpstan/phpstan:^0.12 psalm/phar:^3.14 && mv composer.backup composer.json",
+        "stan-setup": "cp composer.json composer.backup && composer require --dev phpstan/phpstan:^1.4 psalm/phar:^4.21 && mv composer.backup composer.json",
         "test": "phpunit"
+    },
+    "config": {
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
     }
 }

phpstan.neon

@@ -1,12 +1,12 @@
 parameters:
-    level: 7
-    checkMissingIterableValueType: false
-    bootstrapFiles:
-        - tests/bootstrap.php
-    paths:
-        - src
-    ignoreErrors:
-        -
-            message: "#^Offset 'element' does not exist on array\\('params' \\=\\> mixed\\)\\.$#"
-            count: 1
-            path: src/View/Helper/FlashHelper.php
+	level: 7
+	checkMissingIterableValueType: false
+	bootstrapFiles:
+		- tests/bootstrap.php
+	paths:
+		- src
+	ignoreErrors:
+		-
+			message: "#^Parameter \\#1 \\$options of method Cake\\\\View\\\\StringTemplate\\:\\:formatAttributes\\(\\) expects array\\<string, mixed\\>\\|null, array given\\.$#"
+			count: 1
+			path: src/View/Helper/FormHelper.php

src/View/Helper/FlashHelper.php

@@ -16,7 +16,7 @@ class FlashHelper extends Helper
      * - class: List of classes to be applied to the div containing message
      * - attributes: Additional attributes for the div containing message
      *
-     * @var array
+     * @var array<string, mixed>
      */
     protected $_defaultConfig = [
         'class' => ['alert', 'alert-dismissible', 'fade', 'show'],
@@ -57,6 +57,7 @@ public function render(string $key = 'flash', array $options = []): ?string
 
         $out = '';
         foreach ($stack as $message) {
+            /** @var array<string, mixed> $message */
             $message = $options + $message;
             $message['params'] += $this->_config;
             $this->getView()->getRequest()->getSession()->delete("Flash.$key");