Merge pull request #21 from boesing/feature/php81

PHP 8.1 support
laminas · Sep 14, 2021 · 7d70628 · 7d70628
2 parents fc02110 + 471c9c3
commit 7d70628
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,11 +19,9 @@
     "config": {
         "sort-packages": true
     },
-    "extra": {
-    },
+    "extra": {},
     "require": {
-        "php": "^7.3 || ~8.0.0",
-        "laminas/laminas-zendframework-bridge": "^1.0"
+        "php": "^7.3 || ~8.0.0 || ~8.1.0"
     },
     "require-dev": {
         "laminas/laminas-coding-standard": "~1.0.0",
@@ -49,7 +47,7 @@
         "test": "phpunit --colors=always",
         "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
     },
-    "replace": {
-        "zendframework/zend-i18n-resources": "^2.6.1"
+    "conflict": {
+        "zendframework/zend-i18n-resources": "*"
     }
 }
diff --git a/composer.lock b/composer.lock