Add Yii Assets 5 support and disable Yii Config composer plugin

yiisoft · Feb 4, 2025 · aead21f · aead21f
1 parent 89f2704
commit aead21f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 205 deletions.
diff --git a/composer.json b/composer.json
@@ -33,7 +33,7 @@
         "psr/http-message": "^1.1",
         "psr/http-server-handler": "^1.0",
         "psr/http-server-middleware": "^1.0",
-        "yiisoft/assets": "^4.0",
+        "yiisoft/assets": "^4.0|^5.0",
         "yiisoft/data-response": "^2.0",
         "yiisoft/http": "^1.1",
         "yiisoft/router": "^3.1",
@@ -119,7 +119,7 @@
         "allow-plugins": {
             "infection/extension-installer": true,
             "composer/package-versions-deprecated": true,
-            "yiisoft/config": true
+            "yiisoft/config": false
         }
     },
     "scripts": {

diff --git a/config/.merge-plan.php b/config/.merge-plan.php