Merge pull request #298 from FriendsOfCake/ci

Update CI
FriendsOfCake · Mar 4, 2022 · 405dc8b · 405dc8b
2 parents 4bcb8af + 378a2fa
commit 405dc8b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -57,7 +57,7 @@ jobs:
         php-version: '7.4'
         extensions: mbstring, intl
         coverage: none
-        tools: vimeo/psalm:4.15, phpstan:1.2
+        tools: vimeo/psalm:4.22, phpstan:1.4
 
     - name: Composer Install
       run: composer require --dev cakephp/cakephp-codesniffer:^4.1

diff --git a/composer.json b/composer.json
@@ -36,7 +36,7 @@
     "require-dev": {
         "friendsofcake/cakephp-test-utilities": "^2.0",
         "markstory/asset_compress": "^4.0",
-        "phpunit/phpunit": "~8.5.0"
+        "phpunit/phpunit": "~8.5.0 || ^9.3"
     },
     "autoload": {
         "psr-4": {

diff --git a/psalm.xml b/psalm.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <psalm
-    totallyTyped="false"
     resolveFromConfigFile="true"
     ignoreInternalFunctionFalseReturn="true"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -1,6 +1,7 @@
 <?php
 declare(strict_types=1);
 
+use Cake\Core\Configure;
 use Cake\Core\Plugin;
 
 /*
@@ -26,3 +27,7 @@
 require $root . '/vendor/cakephp/cakephp/tests/bootstrap.php';
 
 Plugin::getCollection()->add(new \CrudView\Plugin());
+
+Configure::write('Error.ignoredDeprecationPaths', [
+    'src/TestSuite/Fixture/FixtureInjector.php',
+]);