PHP 8.4 support

.github/workflows/build.yml

@@ -29,4 +29,4 @@ jobs:
       os: >-
         ['ubuntu-latest', 'windows-latest']
       php: >-
-        ['7.4', '8.0', '8.1', '8.2', '8.3']
+        ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4']

.github/workflows/composer-require-checker.yml

@@ -31,4 +31,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['7.4', '8.0', '8.1', '8.2', '8.3']
+        ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4']

.github/workflows/rector.yml

@@ -21,4 +21,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.3']
+        ['8.4']

.github/workflows/static.yml

@@ -29,20 +29,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.1', '8.2']
-  psalm74-80:
-    uses: yiisoft/actions/.github/workflows/psalm.yml@master
-    with:
-      psalm-config: psalm74-80.xml
-      os: >-
-        ['ubuntu-latest']
-      php: >-
-        ['7.4', '8.0']
-  psalm83:
-    uses: yiisoft/actions/.github/workflows/psalm.yml@master
-    with:
-      psalm-config: psalm83.xml
-      os: >-
-        ['ubuntu-latest']
-      php: >-
-        ['8.3']
+        ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4']

composer.json

@@ -36,23 +36,23 @@
         "ext-hash": "*",
         "psr/http-factory": "^1.0",
         "psr/http-factory-implementation": "1.0",
-        "psr/http-message": "^1.0|^2.0",
+        "psr/http-message": "^1.0 || ^2.0",
         "psr/http-message-implementation": "1.0",
         "psr/http-server-handler": "^1.0",
         "psr/http-server-middleware": "^1.0",
         "yiisoft/http": "^1.2",
         "yiisoft/security": "^1.0",
-        "yiisoft/session": "^1.0|^2.0",
+        "yiisoft/session": "^1.0 || ^2.0",
         "yiisoft/strings": "^2.0"
     },
     "require-dev": {
-        "maglnet/composer-require-checker": "^3.8|^4.2",
-        "nyholm/psr7": "^1.3",
-        "phpunit/phpunit": "^9.5",
-        "rector/rector": "^2.0",
-        "roave/infection-static-analysis-plugin": "^1.16",
-        "spatie/phpunit-watcher": "^1.23",
-        "vimeo/psalm": "^4.30|^5.24",
+        "maglnet/composer-require-checker": "^3.8 || ^4.2",
+        "nyholm/psr7": "^1.8.2",
+        "phpunit/phpunit": "^9.6.22",
+        "rector/rector": "^2.0.9",
+        "roave/infection-static-analysis-plugin": "^1.18",
+        "spatie/phpunit-watcher": "^1.23.6",
+        "vimeo/psalm": "^4.30 || ^5.26.1 || ^6.6",
         "yiisoft/di": "^1.1"
     },
     "autoload": {
@@ -76,6 +76,7 @@
     },
     "config": {
         "sort-packages": true,
+        "bump-after-update": "dev",
         "allow-plugins": {
             "infection/extension-installer": true,
             "composer/package-versions-deprecated": true

src/Synchronizer/Storage/SessionCsrfTokenStorage.php

@@ -10,6 +10,9 @@
 
 /**
  * Persists a token between requests in a user session.
+ *
+ * @psalm-suppress ClassMustBeFinal Class will be marked as final in the next major version.
+ * See https://github.com/yiisoft/csrf/issues/74
  */
 class SessionCsrfTokenStorage implements CsrfTokenStorageInterface
 {