Skip to content

Commit ad2393c

Browse files
committed
Merge pull request #68 from php-http/composer-fix
Removed puli/composer-plugin and added Nyholm as author
2 parents 3f38b04 + 3cd2502 commit ad2393c

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

composer.json

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
{
1010
"name": "David Buchmann",
1111
"email": "[email protected]"
12+
},
13+
{
14+
"name": "Tobias Nyholm",
15+
"email": "[email protected]"
1216
}
1317
],
1418
"require": {
@@ -25,11 +29,14 @@
2529
"php-http/guzzle6-adapter": "^1.0",
2630
"php-http/react-adapter": "^0.1",
2731
"php-http/message": "^1.0",
28-
"puli/composer-plugin": "1.0.0-beta9",
2932
"symfony/symfony": "^2.7|^3.0",
3033
"polishsymfonycommunity/symfony-mocker-container": "^1.0",
3134
"matthiasnoback/symfony-dependency-injection-test": "^0.7",
32-
"puli/symfony-bundle": "^1.0@beta,>1.0.0-beta7"
35+
"puli/symfony-bundle": "^1.0@beta"
36+
},
37+
"conflict": {
38+
"puli/composer-plugin": "<1.0.0-beta9",
39+
"puli/symfony-bundle": "<=1.0.0-beta7"
3340
},
3441
"suggest": {
3542
"puli/symfony-bundle": "Used for automatic service discovery"

0 commit comments

Comments
 (0)