Merge pull request #13 from boesing/feature/php81

PHP 8.1 support
mezzio · Sep 14, 2021 · c84650b · c84650b
2 parents 5f331e4 + b4c0e79
commit c84650b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 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
@@ -25,9 +25,8 @@
         }
     },
     "require": {
-        "php": "^7.3 || ~8.0.0",
+        "php": "^7.3 || ~8.0.0 || ~8.1.0",
         "laminas/laminas-authentication": "^2.6.0",
-        "laminas/laminas-zendframework-bridge": "^1.0",
         "mezzio/mezzio-authentication": "^1.0",
         "psr/container": "^1.0",
         "psr/http-message": "^1.0.1"
@@ -57,7 +56,7 @@
         "test": "phpunit --colors=always",
         "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
     },
-    "replace": {
-        "zendframework/zend-expressive-authentication-zendauthentication": "^1.0.1"
+    "conflict": {
+        "zendframework/zend-expressive-authentication-zendauthentication": "*"
     }
 }
diff --git a/composer.lock b/composer.lock