From a5b48f7169da6c9aa3d34319ac38b6e741f3c14d Mon Sep 17 00:00:00 2001
From: Wilmer Arambula <42547589+terabytesoftw@users.noreply.github.com>
Date: Wed, 30 Nov 2022 17:46:08 -0300
Subject: [PATCH] Return simple composer.json. (#113)

* Return simple composer.json.
---
 .github/workflows/build.yml    |  2 +-
 .github/workflows/mutation.yml |  2 +-
 composer.dev.json              |  7 -------
 composer.json                  | 13 +++----------
 4 files changed, 5 insertions(+), 19 deletions(-)
 delete mode 100644 composer.dev.json

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 32dba9c..4c3eff3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -64,7 +64,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
index 72427de..ed9ea81 100644
--- a/.github/workflows/mutation.yml
+++ b/.github/workflows/mutation.yml
@@ -58,7 +58,7 @@ jobs:
           tools: composer:v2, pecl
 
       - 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
deleted file mode 100644
index a814a27..0000000
--- a/composer.dev.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "autoload-dev": {
-        "psr-4": {
-            "Yiisoft\\Db\\Tests\\": "vendor/yiisoft/db/tests"
-        }
-    }
-}
diff --git a/composer.json b/composer.json
index 21e3410..8a66531 100644
--- a/composer.json
+++ b/composer.json
@@ -30,7 +30,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"
     },
@@ -41,26 +40,20 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Yiisoft\\Db\\Oracle\\Tests\\": "tests"
+            "Yiisoft\\Db\\Oracle\\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
         }
     },
     "prefer-stable": true,