Skip to content

Commit

Permalink
Return simple composer.json. (yiisoft#113)
Browse files Browse the repository at this point in the history
* Return simple composer.json.
  • Loading branch information
terabytesoftw authored Nov 30, 2022
1 parent 490640e commit a5b48f7
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mutation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
7 changes: 0 additions & 7 deletions composer.dev.json

This file was deleted.

13 changes: 3 additions & 10 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand All @@ -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,
Expand Down

0 comments on commit a5b48f7

Please sign in to comment.