Merge pull request #27 from Koen1999/php81

Added support for PHP 8.1
laminas · Dec 3, 2021 · cd5689d · cd5689d
2 parents 62bf3a8 + 13132e8
commit cd5689d
Show file tree

Hide file tree

Showing 2 changed files with 69 additions and 73 deletions.
diff --git a/composer.json b/composer.json
@@ -19,11 +19,11 @@
         "sort-packages": true
     },
     "conflict": {
-        "laminas/laminas-servicemanager": "<3.0"
+        "laminas/laminas-servicemanager": "<3.0",
+        "zendframework/zend-permissions-acl": "*"
     },
     "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",
@@ -55,8 +55,5 @@
         "static-analysis": "psalm --shepherd --stats",
         "test": "phpunit --colors=always",
         "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
-    },
-    "replace": {
-        "zendframework/zend-permissions-acl": "^2.7.1"
     }
 }
diff --git a/composer.lock b/composer.lock