Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit e4baaaa

Browse files
Return simple composer.json. (#145)
* Return simple composer.json.
1 parent 924fa74 commit e4baaaa

File tree

4 files changed

+5
-19
lines changed

4 files changed

+5
-19
lines changed

.github/workflows/build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
phpunit:
2626
uses: yiisoft/actions/.github/workflows/phpunit.yml@master
2727
with:
28-
composer-command: composer config preferred-install.yiisoft/db source && composer update --no-interaction --no-progress --optimize-autoloader --ansi
28+
composer-command: composer update --no-interaction --no-progress --optimize-autoloader --ansi
2929
extensions: pdo, pdo_sqlite
3030
os: >-
3131
['ubuntu-latest', 'windows-latest']

.github/workflows/mutation.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
mutation:
2424
uses: yiisoft/actions/.github/workflows/roave-infection.yml@master
2525
with:
26-
composer-command: composer config preferred-install.yiisoft/db source && composer update --no-interaction --no-progress --optimize-autoloader --ansi
26+
composer-command: composer update --no-interaction --no-progress --optimize-autoloader --ansi
2727
os: >-
2828
['ubuntu-latest']
2929
php: >-

composer.dev.json

-7
This file was deleted.

composer.json

+3-10
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
"roave/infection-static-analysis-plugin": "^1.16",
3535
"spatie/phpunit-watcher": "^1.23",
3636
"vimeo/psalm": "^4.18",
37-
"wikimedia/composer-merge-plugin": "^2.0",
3837
"yiisoft/aliases": "^2.0",
3938
"yiisoft/json": "^1.0"
4039
},
@@ -45,25 +44,19 @@
4544
},
4645
"autoload-dev": {
4746
"psr-4": {
48-
"Yiisoft\\Db\\Sqlite\\Tests\\": "tests"
47+
"Yiisoft\\Db\\Sqlite\\Tests\\": "tests",
48+
"Yiisoft\\Db\\Tests\\": "vendor/yiisoft/db/tests"
4949
}
5050
},
5151
"extra": {
5252
"branch-alias": {
5353
"dev-master": "3.0.x-dev"
54-
},
55-
"merge-plugin": {
56-
"include": [
57-
"composer.dev.json"
58-
],
59-
"merge-dev": true
6054
}
6155
},
6256
"config": {
6357
"allow-plugins": {
6458
"infection/extension-installer": true,
65-
"composer/package-versions-deprecated": true,
66-
"wikimedia/composer-merge-plugin": true
59+
"composer/package-versions-deprecated": true
6760
},
6861
"sort-packages": true
6962
},

0 commit comments

Comments
 (0)