Skip to content

Commit ebc21fc

Browse files
committed
Merge remote-tracking branch 'origin/master'
2 parents 52d0c7c + 2fdfa22 commit ebc21fc

File tree

3 files changed

+19
-4
lines changed

3 files changed

+19
-4
lines changed

.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,3 @@ build/
33
vendor/
44
composer.lock
55
phpunit.xml
6-
puli.json

composer.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
}
1212
],
1313
"prefer-stable": true,
14-
"minimum-stability": "dev",
14+
"minimum-stability": "beta",
1515
"require": {
1616
"php": ">=5.5",
1717
"ext-curl": "*",
@@ -21,10 +21,10 @@
2121
"require-dev": {
2222
"guzzlehttp/psr7": "^1.0",
2323
"php-http/adapter-integration-tests": "dev-master#836cdff8294174cceeae54601ab4079c309227b7",
24-
"php-http/message": "^1.0",
24+
"php-http/message": "^1.0.2",
2525
"php-http/discovery": "~0.8.0",
2626
"phpunit/phpunit": "^4.8",
27-
"puli/composer-plugin": "^1.0",
27+
"puli/composer-plugin": "1.0.0-beta9",
2828
"zendframework/zend-diactoros": "^1.0"
2929
},
3030
"autoload": {

puli.json

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"version": "1.0",
3+
"name": "php-http/curl-client",
4+
"bindings": {
5+
"98239b8b-103b-4f47-94c7-4cba49a05a1f": {
6+
"_class": "Puli\\Discovery\\Binding\\ClassBinding",
7+
"class": "Http\\Client\\Curl\\Client",
8+
"type": "Http\\Client\\HttpAsyncClient"
9+
},
10+
"a6a79968-2aa5-427c-bbe1-a581d9a48321": {
11+
"_class": "Puli\\Discovery\\Binding\\ClassBinding",
12+
"class": "Http\\Client\\Curl\\Client",
13+
"type": "Http\\Client\\HttpClient"
14+
}
15+
}
16+
}

0 commit comments

Comments
 (0)