Merge pull request #689 from FriendsOfCake/ci

Update CI config
FriendsOfCake · Feb 18, 2023 · 66b96d0 · 66b96d0
2 parents 77a7305 + 3733c78
commit 66b96d0
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -4,19 +4,17 @@ on: [push, pull_request]
 
 jobs:
   testsuite:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['7.4', '8.0']
+        php-version: ['7.4', '8.0', '8.1', '8.2']
         db-type: [sqlite, mysql, pgsql]
         prefer-lowest: ['']
         include:
           - php-version: '7.2'
-            db-type: 'mysql'
+            db-type: 'sqlite'
             prefer-lowest: 'prefer-lowest'
-          - php-version: '8.1'
-            db-type: 'mysql'
 
     services:
       postgres:
@@ -27,7 +25,7 @@ jobs:
           POSTGRES_PASSWORD: postgres
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Setup Service
       if: matrix.db-type == 'mysql'
@@ -68,18 +66,18 @@ jobs:
 
   cs-stan:
     name: Coding Standard & Static Analysis
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
       with:
         php-version: '7.4'
         extensions: mbstring, intl
         coverage: none
-        tools: vimeo/psalm:4.23, phpstan:1.8, cs2pr
+        tools: vimeo/psalm:4.23, phpstan:1.9, cs2pr
 
     - name: Composer Install
       run: composer require --dev cakephp/cakephp-codesniffer:^4.1

diff --git a/phpstan.neon b/phpstan.neon
@@ -6,6 +6,7 @@ parameters:
 	paths:
 		- src
 	checkMissingIterableValueType: false
+	checkGenericClassInNonGenericObjectType: false
 	excludePaths:
 		- */src/TestSuite/*
 	universalObjectCratesClasses:

diff --git a/src/Action/Bulk/BaseAction.php b/src/Action/Bulk/BaseAction.php
@@ -82,10 +82,12 @@ protected function _processIds(): array
             unset($ids['_all']);
         }
 
+        // @phpstan-ignore-next-line
         if (!is_array($ids)) {
             throw new BadRequestException('Bad request data');
         }
 
+        // @phpstan-ignore-next-line
         if ($all) {
             foreach ($ids as $key => $value) {
                 $ids[$key] = 1;

diff --git a/src/Event/Subject.php b/src/Event/Subject.php
@@ -13,6 +13,7 @@
  * Licensed under The MIT License
  * For full copyright and license information, please see the LICENSE.txt
  */
+#[\AllowDynamicProperties]
 class Subject
 {
     /**