diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3d16e2cd..82ec108d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -31,7 +31,7 @@ jobs:
           POSTGRES_PASSWORD: postgres
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Setup Service
       if: matrix.db-type == 'mysql'
@@ -76,7 +76,7 @@ jobs:
     runs-on: ubuntu-18.04
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
@@ -84,17 +84,18 @@ jobs:
         php-version: '7.4'
         extensions: mbstring, intl
         coverage: none
+        tools: cs2pr
 
     - name: Composer Install
       run: composer stan-setup
 
     - name: Run phpcs
-      run: vendor/bin/phpcs src/ tests/
+      run: vendor/bin/phpcs --report=checkstyle src/ tests/ | cs2pr
 
     - name: Run psalm
-      if: success() || failure()
+      if: always()
       run: vendor/bin/psalm.phar --output-format=github
 
     - name: Run phpstan
-      if: success() || failure()
+      if: always()
       run: vendor/bin/phpstan
diff --git a/.stickler.yml b/.stickler.yml
deleted file mode 100644
index 96605bba..00000000
--- a/.stickler.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-linters:
-  phpcs:
-    standard: CakePHP4
-    extensions: 'php'
-    fixer: true
-
-files:
-  ignore: ['tests/comparisons/*']
-
-fixers:
-  enable: true
-  workflow: commit
diff --git a/composer.json b/composer.json
index ca04bbf9..7ccaee83 100644
--- a/composer.json
+++ b/composer.json
@@ -49,7 +49,7 @@
     "scripts": {
         "cs-check": "phpcs -p src/ tests/",
         "cs-fix": "phpcbf src/ tests/",
-        "stan-setup": "cp composer.json composer.backup && composer require --dev phpstan/phpstan:~1.4.0 psalm/phar:~4.22.0 && mv composer.backup composer.json",
+        "stan-setup": "cp composer.json composer.backup && composer require --dev phpstan/phpstan:~1.7.0 psalm/phar:~4.23.0 && mv composer.backup composer.json",
         "phpstan": "phpstan.phar analyse",
         "psalm": "psalm.phar",
         "stan": [
diff --git a/phpstan.neon b/phpstan.neon
index c69e3657..234698ff 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -6,6 +6,8 @@ parameters:
         - src/
     bootstrapFiles:
         - tests/bootstrap.php
+        - vendor/cakephp/cakephp/src/Core/Exception/CakeException.php
+        - vendor/cakephp/cakephp/src/Database/Exception/DatabaseException.php
     ignoreErrors:
         - '#Call to an undefined method Cake\\ORM\\Table::searchManager\(\)#'
         - '#PHPDoc tag @var for variable \$model contains unresolvable type#'