Merge pull request #18 from geerteltink/feat/psr

Allow latest `psr/*` dependencies
mezzio · Jan 7, 2022 · ff62fa7 · ff62fa7
2 parents 97302a1 + de2155c
commit ff62fa7
Show file tree

Hide file tree

Showing 3 changed files with 221 additions and 155 deletions.
diff --git a/composer.json b/composer.json
@@ -21,7 +21,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": {
@@ -30,7 +34,7 @@
     },
     "require": {
         "php": "^7.4 || ~8.0.0 || ~8.1.0",
-        "psr/container": "^1.0",
+        "psr/container": "^1.0 || ^2.0",
         "psr/http-message": "^1.0.1",
         "psr/http-server-middleware": "^1.0",
         "webmozart/assert": "^1.9"
@@ -39,10 +43,10 @@
         "ext-sqlite3": "*",
         "laminas/laminas-coding-standard": "~2.3.0",
         "phpspec/prophecy": "^1.14",
-        "phpspec/prophecy-phpunit": "^2.0",
-        "phpunit/phpunit": "^9.5.5",
+        "phpspec/prophecy-phpunit": "^v2.0.1",
+        "phpunit/phpunit": "^9.5.11",
         "psalm/plugin-phpunit": "^0.16.1",
-        "vimeo/psalm": "^4.10"
+        "vimeo/psalm": "^4.17.0"
     },
     "conflict": {
         "container-interop/container-interop": "<1.2.0",