Merge pull request #27 from boesing/feature/php81

PHP 8.1 support
mezzio · Sep 13, 2021 · cc75482 · cc75482
2 parents 862d402 + 6e8e701
commit cc75482
Show file tree

Hide file tree

Showing 6 changed files with 251 additions and 223 deletions.
diff --git a/.laminas-ci.json b/.laminas-ci.json
@@ -0,0 +1,5 @@
+{
+    "ignore_php_platform_requirements": {
+        "8.1": true
+    }
+}
diff --git a/composer.json b/composer.json
@@ -28,18 +28,17 @@
         }
     },
     "require": {
-        "php": "^7.3 || ~8.0.0",
+        "php": "^7.3 || ~8.0.0 || ~8.1.0",
         "ext-session": "*",
-        "laminas/laminas-zendframework-bridge": "^1.0",
         "mezzio/mezzio-session": "^1.4"
     },
     "require-dev": {
         "dflydev/fig-cookies": "^2.0.1 || ^3.0",
         "laminas/laminas-coding-standard": "~2.2.0",
         "laminas/laminas-diactoros": "^2.5.0",
         "phpunit/phpunit": "^9.3",
-        "psalm/plugin-phpunit": "^0.12.2",
-        "vimeo/psalm": "^3.16"
+        "psalm/plugin-phpunit": "^0.16.1",
+        "vimeo/psalm": "^4.10"
     },
     "autoload": {
         "psr-4": {
@@ -62,7 +61,7 @@
         "test": "phpunit --colors=always",
         "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
     },
-    "replace": {
-        "zendframework/zend-expressive-session-ext": "^1.7.0"
+    "conflict": {
+        "zendframework/zend-expressive-session-ext": "*"
     }
 }