Merge pull request #16 from boesing/feature/php81

PHP 8.1 support
mezzio · Sep 14, 2021 · 6ba46e5 · 6ba46e5
2 parents 999cedf + 2c5eda1
commit 6ba46e5
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
@@ -29,8 +29,7 @@
         }
     },
     "require": {
-        "php": "^7.3 || ~8.0.0",
-        "laminas/laminas-zendframework-bridge": "^1.0",
+        "php": "^7.3 || ~8.0.0 || ~8.1.0",
         "mezzio/mezzio-session": "^1.0",
         "psr/http-server-middleware": "^1.0"
     },
@@ -58,7 +57,7 @@
         "test": "phpunit --colors=always",
         "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
     },
-    "replace": {
-        "zendframework/zend-expressive-flash": "^1.0.1"
+    "conflict": {
+        "zendframework/zend-expressive-flash": "*"
     }
 }
diff --git a/composer.lock b/composer.lock