Skip to content

Commit 8a66c0e

Browse files
authored
Merge pull request #335 from localheinz/feature/normalize
Enhancement: Normalize composer.json
2 parents c5d38ed + 69a0f39 commit 8a66c0e

File tree

1 file changed

+27
-18
lines changed

1 file changed

+27
-18
lines changed

composer.json

Lines changed: 27 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
11
{
22
"name": "php-http/httplug-bundle",
3-
"description": "Symfony integration for HTTPlug",
43
"type": "symfony-bundle",
5-
"keywords": ["http", "discovery", "adapter", "message", "factory", "bundle", "httplug", "php-http"],
4+
"description": "Symfony integration for HTTPlug",
5+
"keywords": [
6+
"http",
7+
"discovery",
8+
"adapter",
9+
"message",
10+
"factory",
11+
"bundle",
12+
"httplug",
13+
"php-http"
14+
],
615
"homepage": "http://httplug.io",
716
"license": "MIT",
817
"authors": [
@@ -32,6 +41,9 @@
3241
"symfony/http-kernel": "^3.4.20 || ^4.0.15 || ^4.1.9 || ^4.2.1",
3342
"symfony/options-resolver": "^3.4.20 || ^4.0.15 || ^4.1.9 || ^4.2.1"
3443
},
44+
"conflict": {
45+
"php-http/guzzle6-adapter": "<1.1"
46+
},
3547
"require-dev": {
3648
"guzzlehttp/psr7": "^1.0",
3749
"matthiasnoback/symfony-dependency-injection-test": "^3.0",
@@ -53,13 +65,18 @@
5365
"symfony/web-profiler-bundle": "^3.4.20 || ^4.0.15 || ^4.1.9 || ^4.2.1",
5466
"twig/twig": "^1.36 || ^2.6"
5567
},
56-
"conflict": {
57-
"php-http/guzzle6-adapter": "<1.1"
58-
},
5968
"suggest": {
60-
"twig/twig": "Add this to your require-dev section when using the WebProfilerBundle",
6169
"php-http/cache-plugin": "To configure clients that cache responses",
62-
"php-http/mock-client": "Add this to your require-dev section to mock HTTP responses easily"
70+
"php-http/mock-client": "Add this to your require-dev section to mock HTTP responses easily",
71+
"twig/twig": "Add this to your require-dev section when using the WebProfilerBundle"
72+
},
73+
"config": {
74+
"sort-packages": true
75+
},
76+
"extra": {
77+
"branch-alias": {
78+
"dev-master": "1.x-dev"
79+
}
6380
},
6481
"autoload": {
6582
"psr-4": {
@@ -77,18 +94,10 @@
7794
"tests/Resources/app/AppKernel.php"
7895
]
7996
},
97+
"minimum-stability": "dev",
98+
"prefer-stable": true,
8099
"scripts": {
81100
"test": "vendor/bin/simple-phpunit",
82101
"test-ci": "vendor/bin/simple-phpunit --coverage-text --coverage-clover=build/coverage.xml"
83-
},
84-
"config": {
85-
"sort-packages": true
86-
},
87-
"extra": {
88-
"branch-alias": {
89-
"dev-master": "1.x-dev"
90-
}
91-
},
92-
"prefer-stable": true,
93-
"minimum-stability": "dev"
102+
}
94103
}

0 commit comments

Comments
 (0)