Return simple composer.json. (#142)

* Return simple composer.json.
yiisoft · Nov 30, 2022 · 2ee91bd · 2ee91bd
1 parent a25f5fc
commit 2ee91bd
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 19 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -83,7 +83,7 @@ jobs:
         run: composer self-update
 
       - name: Install dependencies with composer.
-        run: composer config preferred-install.yiisoft/db source && composer update --no-interaction --no-progress --optimize-autoloader --ansi
+        run: composer update --no-interaction --no-progress --optimize-autoloader --ansi
 
       - name: Run tests with phpunit with code coverage.
         run: vendor/bin/phpunit --coverage-clover=coverage.xml --colors=always

diff --git a/.github/workflows/mutation.yml b/.github/workflows/mutation.yml
@@ -67,7 +67,7 @@ jobs:
         run: composer self-update
 
       - name: Install dependencies with composer.
-        run: composer config preferred-install.yiisoft/db source && composer update --no-interaction --no-progress --optimize-autoloader --ansi
+        run: composer update --no-interaction --no-progress --optimize-autoloader --ansi
 
       - name: Run infection.
         run: |

diff --git a/composer.dev.json b/composer.dev.json
diff --git a/composer.json b/composer.json
@@ -31,7 +31,6 @@
         "roave/infection-static-analysis-plugin": "^1.16",
         "spatie/phpunit-watcher": "^1.23",
         "vimeo/psalm": "^4.18",
-        "wikimedia/composer-merge-plugin": "^2.0",
         "yiisoft/aliases": "^2.0",
         "yiisoft/cache": "^2.0"
     },
@@ -42,26 +41,20 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Yiisoft\\Db\\Mssql\\Tests\\": "tests"
+            "Yiisoft\\Db\\Mssql\\Tests\\": "tests",
+            "Yiisoft\\Db\\Tests\\": "vendor/yiisoft/db/tests"
         }
     },
     "extra": {
         "branch-alias": {
             "dev-master": "1.0.x-dev"
-        },
-        "merge-plugin": {
-            "include": [
-                "composer.dev.json"
-            ],
-            "merge-dev": true
         }
     },
     "config": {
         "sort-packages": true,
         "allow-plugins": {
             "infection/extension-installer": true,
-            "composer/package-versions-deprecated": true,
-            "wikimedia/composer-merge-plugin": true
+            "composer/package-versions-deprecated": true
         }
     },
     "scripts": {