Merge pull request #18 from boesing/feature/php81

PHP 8.1 support
laminas-api-tools · Sep 14, 2021 · 4538f8b · 4538f8b
2 parents 150b9f5 + be76b85
commit 4538f8b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 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
@@ -27,11 +27,10 @@
         }
     },
     "require": {
-        "php": "^7.3 || ~8.0.0",
+        "php": "^7.3 || ~8.0.0 || ~8.1.0",
         "laminas/laminas-config": "^2.6 || ^3.0",
         "laminas/laminas-modulemanager": "^2.7.1",
-        "laminas/laminas-stdlib": "^2.7.7 || ^3.0.1",
-        "laminas/laminas-zendframework-bridge": "^1.0"
+        "laminas/laminas-stdlib": "^2.7.7 || ^3.0.1"
     },
     "require-dev": {
         "container-interop/container-interop": "^1.1",
@@ -61,7 +60,7 @@
         "test": "phpunit --colors=always",
         "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
     },
-    "replace": {
-        "zfcampus/zf-configuration": "^1.3.3"
+    "conflict": {
+        "zfcampus/zf-configuration": "*"
     }
 }
diff --git a/composer.lock b/composer.lock