Skip to content

Commit dbe94ae

Browse files
authored
Merge pull request #22 from localheinz/feature/normalize
Enhancement: Normalize composer.json
2 parents 19c03df + 8274ad6 commit dbe94ae

File tree

3 files changed

+298
-8
lines changed

3 files changed

+298
-8
lines changed

.travis.yml

+2
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,11 @@ jobs:
9999

100100
before_install:
101101
- phpenv config-rm xdebug.ini
102+
- composer validate
102103

103104
install:
104105
- composer install
105106

106107
script:
108+
- composer normalize --dry-run
107109
- vendor/bin/php-cs-fixer fix --diff --dry-run --verbose

composer.json

+10-7
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,18 @@
1212
"php": "^7.1",
1313
"phpstan/phpstan": "^0.10.0 || ^0.11.0"
1414
},
15+
"conflict": {
16+
"phpspec/prophecy": "<1.7,>=2.0",
17+
"phpunit/phpunit": "<6.0,>=9.0"
18+
},
1519
"require-dev": {
1620
"friendsofphp/php-cs-fixer": "~2.15.0",
21+
"localheinz/composer-normalize": "^1.1.3",
1722
"phpspec/prophecy": "^1.7",
18-
"phpunit/phpunit": "^6.0||^7.0"
23+
"phpunit/phpunit": "^6.0 || ^7.0"
1924
},
20-
"conflict": {
21-
"phpspec/prophecy": "<1.7, >=2.0",
22-
"phpunit/phpunit": "<6.0, >=9.0"
25+
"config": {
26+
"sort-packages": true
2327
},
2428
"autoload": {
2529
"psr-4": {
@@ -33,15 +37,14 @@
3337
},
3438
"scripts": {
3539
"build": [
40+
"@composer validate",
41+
"@composer normalize",
3642
"@cs",
3743
"@stan",
3844
"@test"
3945
],
4046
"cs": "php-cs-fixer fix --diff --verbose",
4147
"stan": "phpstan analyse -l max -c phpstan.neon src tests",
4248
"test": "phpunit"
43-
},
44-
"config": {
45-
"sort-packages": true
4649
}
4750
}

composer.lock

+286-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)