Merge pull request #13 from boesing/feature/php81

PHP 8.1 support
mezzio · Sep 14, 2021 · c8dc3b9 · c8dc3b9
2 parents 4755575 + 35898df
commit c8dc3b9
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 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
@@ -19,12 +19,10 @@
     "config": {
         "sort-packages": true
     },
-    "extra": {
-    },
+    "extra": {},
     "require": {
-        "php": "^7.3 || ~8.0.0",
+        "php": "^7.3 || ~8.0.0 || ~8.1.0",
         "ext-json": "*",
-        "laminas/laminas-zendframework-bridge": "^1.0",
         "symfony/console": "^2.8 || ^3.0 || ^4.0 || ^5.0"
     },
     "require-dev": {
@@ -54,7 +52,7 @@
         "test": "phpunit --colors=always",
         "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
     },
-    "replace": {
-        "zendframework/zend-expressive-migration": "^0.1.4"
+    "conflict": {
+        "zendframework/zend-expressive-migration": "*"
     }
 }
diff --git a/composer.lock b/composer.lock