diff --git a/.github/workflows/analyzers.yaml b/.github/workflows/analyzers.yaml
index 8670bcf..a1d3d57 100644
--- a/.github/workflows/analyzers.yaml
+++ b/.github/workflows/analyzers.yaml
@@ -7,7 +7,7 @@ jobs:
         strategy:
             matrix:
                 operating-system: [ubuntu-latest]
-                php-versions: ['8.2', '8.3', '8.4']
+                php-versions: ['8.3', '8.4', '8.5']
                 composer-options: ['--ignore-platform-req=php+']
             fail-fast: false
         name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }}
@@ -24,3 +24,4 @@ jobs:
               run: composer update --prefer-dist --no-progress --no-suggest ${{ matrix.composer-options }}
             - name: Run the tests
               run: ./vendor/bin/psalm
+              continue-on-error: ${{ matrix.php-versions == '8.5' }}
diff --git a/.github/workflows/code-style.yaml b/.github/workflows/code-style.yaml
index 8600cb5..fb19bca 100644
--- a/.github/workflows/code-style.yaml
+++ b/.github/workflows/code-style.yaml
@@ -7,7 +7,7 @@ jobs:
         strategy:
             matrix:
                 operating-system: [ubuntu-latest]
-                php-versions: [ '8.2', '8.3', '8.4' ]
+                php-versions: [ '8.3', '8.4', '8.5' ]
                 composer-options: [ '--ignore-platform-req=php+' ]
             fail-fast: false
         name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }}
@@ -23,4 +23,4 @@ jobs:
             - name: Install dependencies
               run: composer update --prefer-dist --no-progress --no-suggest ${{ matrix.composer-options }}
             - name: Run the tests
-              run: PHP_CS_FIXER_IGNORE_ENV=1 ./tools/php-cs-fixer.phar fix --dry-run
+              run: PHP_CS_FIXER_IGNORE_ENV=1 ./vendor/bin/php-cs-fixer fix --dry-run
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 06eb08e..5ad6bba 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -7,7 +7,7 @@ jobs:
         strategy:
             matrix:
                 operating-system: [ubuntu-latest]
-                php-versions: [ '8.2', '8.3', '8.4' ]
+                php-versions: [ '8.3', '8.4', '8.5' ]
                 composer-options: [ '--ignore-platform-req=php+' ]
             fail-fast: false
         name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }}
diff --git a/.phive/phars.xml b/.phive/phars.xml
deleted file mode 100644
index 4aa93da..0000000
--- a/.phive/phars.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phive xmlns="https://phar.io/phive">
-  <phar name="php-cs-fixer" version="^3.13.0" installed="3.64.0" location="./tools/php-cs-fixer.phar" copy="true"/>
-</phive>
diff --git a/composer.json b/composer.json
index 7df4df9..400d34a 100644
--- a/composer.json
+++ b/composer.json
@@ -20,14 +20,16 @@
         }
     ],
     "require": {
-        "php": "~8.2.0 || ~8.3.0 || ~8.4.0",
-        "php-soap/engine": "^2.13.0",
+        "php": "~8.3.0 || ~8.4.0 || ~8.5.0",
+        "php-soap/engine": "^2.16.0",
         "psr/cache": "^3.0",
-        "psr/cache-implementation": "^3.0"
+        "psr/cache-implementation": "^3.0",
+        "azjezz/psl": "^3.0 || ^4.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^10.0",
-        "vimeo/psalm": "^5.26",
+        "phpunit/phpunit": "~12.3.0",
+        "vimeo/psalm": "~6.13.0",
+        "php-cs-fixer/shim": "~3.88.0",
         "symfony/cache": "^7.0 || ^6.4"
     }
 }
diff --git a/phpunit.xml b/phpunit.xml
index 63f65e9..91c513d 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,4 +1,11 @@
-<phpunit bootstrap="./vendor/autoload.php" colors="true">
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+         bootstrap="./vendor/autoload.php"
+         colors="true"
+         displayDetailsOnTestsThatTriggerWarnings="true"
+         failOnWarning="true"
+         failOnPhpunitWarning="true">
     <testsuites>
         <testsuite name="Unit">
             <directory>./tests/Unit</directory>
diff --git a/psalm.xml b/psalm.xml
index c05873f..8d82a15 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -8,6 +8,8 @@
     skipChecksOnUnresolvableIncludes="false"
     checkForThrowsDocblock="true"
     checkForThrowsInGlobalScope="true"
+    findUnusedCode="false"
+    ensureOverrideAttribute="false"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
diff --git a/tools/php-cs-fixer.phar b/tools/php-cs-fixer.phar
deleted file mode 100755
index d071fa5..0000000
Binary files a/tools/php-cs-fixer.phar and /dev/null differ