Return simple composer.json. (#145)

* Return simple composer.json.
yiisoft · Nov 30, 2022 · e4baaaa · e4baaaa
1 parent 924fa74
commit e4baaaa
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
@@ -25,7 +25,7 @@ jobs:
   phpunit:
     uses: yiisoft/actions/.github/workflows/phpunit.yml@master
     with:
-      composer-command: composer config preferred-install.yiisoft/db source && composer update --no-interaction --no-progress --optimize-autoloader --ansi
+      composer-command: composer update --no-interaction --no-progress --optimize-autoloader --ansi
       extensions: pdo, pdo_sqlite
       os: >-
         ['ubuntu-latest', 'windows-latest']

diff --git a/.github/workflows/mutation.yml b/.github/workflows/mutation.yml
@@ -23,7 +23,7 @@ jobs:
   mutation:
     uses: yiisoft/actions/.github/workflows/roave-infection.yml@master
     with:
-      composer-command: composer config preferred-install.yiisoft/db source && composer update --no-interaction --no-progress --optimize-autoloader --ansi
+      composer-command: composer update --no-interaction --no-progress --optimize-autoloader --ansi
       os: >-
         ['ubuntu-latest']
       php: >-

diff --git a/composer.dev.json b/composer.dev.json
diff --git a/composer.json b/composer.json
@@ -34,7 +34,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/json": "^1.0"
     },
@@ -45,25 +44,19 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Yiisoft\\Db\\Sqlite\\Tests\\": "tests"
+            "Yiisoft\\Db\\Sqlite\\Tests\\": "tests",
+            "Yiisoft\\Db\\Tests\\": "vendor/yiisoft/db/tests"
         }
     },
     "extra": {
         "branch-alias": {
             "dev-master": "3.0.x-dev"
-        },
-        "merge-plugin": {
-            "include": [
-                "composer.dev.json"
-            ],
-            "merge-dev": true
         }
     },
     "config": {
         "allow-plugins": {
             "infection/extension-installer": true,
-            "composer/package-versions-deprecated": true,
-            "wikimedia/composer-merge-plugin": true
+            "composer/package-versions-deprecated": true
         },
         "sort-packages": true
     },