Merge pull request #18 from geerteltink/feat/psr

Allow latest `psr/*` dependencies
mezzio · Jan 7, 2022 · c1de04f · c1de04f
2 parents 1f791cb + 36d0bb1
commit c1de04f
Show file tree

Hide file tree

Showing 4 changed files with 373 additions and 282 deletions.
diff --git a/composer.json b/composer.json
@@ -19,7 +19,11 @@
         "forum": "https://discourse.laminas.dev"
     },
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true,
+            "composer/package-versions-deprecated": true
+        }
     },
     "extra": {
         "laminas": {
@@ -31,17 +35,17 @@
         "laminas/laminas-permissions-rbac": "^3.0",
         "mezzio/mezzio-authorization": "^1.0",
         "mezzio/mezzio-router": "^3.0",
-        "psr/container": "^1.0",
+        "psr/container": "^1.0 || ^2.0",
         "psr/http-message": "^1.0.1"
     },
     "require-dev": {
         "laminas/laminas-coding-standard": "~2.3.0",
-        "laminas/laminas-servicemanager": "^3.3",
-        "phpspec/prophecy": "^1.12",
+        "laminas/laminas-servicemanager": "^3.10",
+        "phpspec/prophecy": "^1.15",
         "phpspec/prophecy-phpunit": "^2.0",
-        "phpunit/phpunit": "^9.5.8",
+        "phpunit/phpunit": "^9.5.11",
         "psalm/plugin-phpunit": "^0.16.1",
-        "vimeo/psalm": "^4.8"
+        "vimeo/psalm": "^4.17"
     },
     "conflict": {
         "container-interop/container-interop": "<1.2.0",