Use simple composer.json. (#403)

terabytesoftw · web-flow · commit ce2f0ceb139f · 2022-11-30T17:27:36.000-03:00
* Use simple composer.json.
diff --git a/.github/workflows/db-mssql.yml b/.github/workflows/db-mssql.yml
@@ -79,7 +79,7 @@ jobs:
         run: composer self-update
 
       - name: Install db-mssql.
-        run: composer config preferred-install.yiisoft/db-mssql source && composer require yiisoft/db-mssql --no-interaction --no-progress --optimize-autoloader --ansi
+        run: composer require yiisoft/db-mssql --no-interaction --no-progress --optimize-autoloader --ansi
 
       - name: Run mssql tests with phpunit and code coverage.
         run: vendor/bin/phpunit --testsuite Mssql --coverage-clover=coverage.xml --colors=always
diff --git a/.github/workflows/db-mysql.yml b/.github/workflows/db-mysql.yml
@@ -72,7 +72,7 @@ jobs:
         run: composer self-update
 
       - name: Install db-mysql.
-        run: composer config preferred-install.yiisoft/db-mysql source && composer require yiisoft/db-mysql --no-interaction --no-progress --optimize-autoloader --ansi
+        run: composer require yiisoft/db-mysql --no-interaction --no-progress --optimize-autoloader --ansi
 
       - name: Run Mssql tests with phpunit and code coverage.
         run: vendor/bin/phpunit --testsuite Mysql --coverage-clover=coverage.xml --colors=always
diff --git a/.github/workflows/db-oracle.yml b/.github/workflows/db-oracle.yml
@@ -68,7 +68,7 @@ jobs:
         run: composer self-update
 
       - name: Install db-oracle.
-        run: composer config preferred-install.yiisoft/db-oracle source && composer require yiisoft/db-oracle --no-interaction --no-progress --optimize-autoloader --ansi
+        run: composer require yiisoft/db-oracle --no-interaction --no-progress --optimize-autoloader --ansi
 
       - name: Run oracle tests with phpunit and code coverage.
         run: vendor/bin/phpunit --testsuite Oracle --coverage-clover=coverage.xml --colors=always
diff --git a/.github/workflows/db-pgsql.yml b/.github/workflows/db-pgsql.yml
@@ -76,7 +76,7 @@ jobs:
         run: composer self-update
 
       - name: Install db-pgsql.
-        run: composer config preferred-install.yiisoft/db-pgsql source && composer require yiisoft/db-pgsql --no-interaction --no-progress --optimize-autoloader --ansi
+        run: composer require yiisoft/db-pgsql --no-interaction --no-progress --optimize-autoloader --ansi
 
       - name: Run pgsql tests with phpunit and code coverage.
         run: vendor/bin/phpunit --testsuite Pgsql --coverage-clover=coverage.xml --colors=always
diff --git a/.github/workflows/db-sqlite.yml b/.github/workflows/db-sqlite.yml
@@ -59,7 +59,7 @@ jobs:
         run: composer self-update
 
       - name: Install db-sqlite.
-        run: composer config preferred-install.yiisoft/db-sqlite source && composer require yiisoft/db-sqlite --no-interaction --no-progress --optimize-autoloader --ansi
+        run: composer require yiisoft/db-sqlite --no-interaction --no-progress --optimize-autoloader --ansi
 
       - name: Run sqlite tests with phpunit and code coverage.
         run: vendor/bin/phpunit --testsuite Sqlite --coverage-clover=coverage.xml --colors=always
diff --git a/composer.dev.json b/composer.dev.json
diff --git a/composer.json b/composer.json
@@ -36,7 +36,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": "^1.1|^2.0",
         "yiisoft/di": "^1.0",
         "yiisoft/event-dispatcher": "^1.0",
@@ -49,26 +48,25 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Yiisoft\\Db\\Tests\\": "tests"
+            "Yiisoft\\Db\\Tests\\": "tests",
+            "Yiisoft\\ActiveRecord\\Tests\\": "vendor/yiisoft/active-record/tests",
+            "Yiisoft\\Db\\Mssql\\Tests\\": "vendor/yiisoft/db-mssql/tests",
+            "Yiisoft\\Db\\Mysql\\Tests\\": "vendor/yiisoft/db-mysql/tests",
+            "Yiisoft\\Db\\Oracle\\Tests\\": "vendor/yiisoft/db-oracle/tests",
+            "Yiisoft\\Db\\Pgsql\\Tests\\": "vendor/yiisoft/db-pgsql/tests",
+            "Yiisoft\\Db\\Sqlite\\Tests\\": "vendor/yiisoft/db-sqlite/tests"
         }
     },
     "extra": {
         "branch-alias": {
             "dev-master": "3.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": {
