Fix PSR container conflicts (#7525)

Co-authored-by: Jessy P <[email protected]>
Automattic · Oct 20, 2023 · 87c4e91 · 87c4e91
1 parent ac179c4
commit 87c4e91
Show file tree

Hide file tree

Showing 18 changed files with 187 additions and 111 deletions.
diff --git a/changelog/fix-psr-container-conflicts b/changelog/fix-psr-container-conflicts
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Fix PSR container conflicts
diff --git a/composer.json b/composer.json
@@ -27,8 +27,7 @@
         "automattic/jetpack-autoloader": "2.11.18",
         "automattic/jetpack-identity-crisis": "0.8.43",
         "automattic/jetpack-sync": "1.47.7",
-        "woocommerce/subscriptions-core": "6.3.0",
-        "psr/container": "^1.1"
+        "woocommerce/subscriptions-core": "6.3.0"
     },
     "require-dev": {
         "composer/installers": "1.10.0",

diff --git a/composer.lock b/composer.lock
diff --git a/lib/composer.json b/lib/composer.json
@@ -4,7 +4,8 @@
     "minimum-stability": "dev",
     "require-dev": {
         "league/container": "4.2",
-        "coenjacobs/mozart": "0.7.1"
+        "coenjacobs/mozart": "0.7.1",
+        "psr/container": "^1.1"
     },
     "license": "GPL-3.0-or-later",
     "scripts": {
@@ -20,9 +21,7 @@
             "dep_namespace": "WCPay\\Vendor\\",
             "dep_directory": "/packages/",
             "packages": [
-                "league/container"
-            ],
-            "excluded_packages":[
+                "league/container",
                 "psr/container"
             ],
             "classmap_directory": "/classmaps/",