Skip to content
This repository was archived by the owner on Jan 6, 2024. It is now read-only.

Commit c6ba975

Browse files
committed
Merge pull request #16 from Nyholm/patch-2
2 parents 6aa6009 + 108f49a commit c6ba975

File tree

3 files changed

+222
-4
lines changed

3 files changed

+222
-4
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ branches:
2222
- /^analysis-.*$/
2323

2424
matrix:
25-
allow_failure:
25+
allow_failures:
2626
- php: hhvm
2727
fast_finish: true
2828
include:

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
"require": {
1818
"php": ">=5.4",
1919
"php-http/httplug": "^1.0",
20-
"php-http/discovery": "~0.6.4",
20+
"php-http/discovery": "^0.7",
2121
"guzzlehttp/guzzle": "^5.1"
2222
},
2323
"require-dev": {
2424
"ext-curl": "*",
25+
"php-http/adapter-integration-tests": "^0.3",
2526
"guzzlehttp/ringphp": "^1.1",
26-
"php-http/adapter-integration-tests": "^0.2",
2727
"php-http/client-common": "^0.1.1",
2828
"guzzlehttp/psr7": "^1.2"
2929
},
@@ -50,5 +50,5 @@
5050
}
5151
},
5252
"prefer-stable": true,
53-
"minimum-stability": "dev"
53+
"minimum-stability": "beta"
5454
}

puli.json

Lines changed: 218 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,223 @@
77
"class": "Http\\Adapter\\Guzzle5\\Client",
88
"type": "Http\\Client\\HttpClient"
99
}
10+
},
11+
"config": {
12+
"bootstrap-file": "vendor/autoload.php"
13+
},
14+
"packages": {
15+
"clue/stream-filter": {
16+
"install-path": "vendor/clue/stream-filter",
17+
"installer": "composer",
18+
"env": "dev"
19+
},
20+
"doctrine/instantiator": {
21+
"install-path": "vendor/doctrine/instantiator",
22+
"installer": "composer",
23+
"env": "dev"
24+
},
25+
"guzzlehttp/guzzle": {
26+
"install-path": "vendor/guzzlehttp/guzzle",
27+
"installer": "composer"
28+
},
29+
"guzzlehttp/psr7": {
30+
"install-path": "vendor/guzzlehttp/psr7",
31+
"installer": "composer",
32+
"env": "dev"
33+
},
34+
"guzzlehttp/ringphp": {
35+
"install-path": "vendor/guzzlehttp/ringphp",
36+
"installer": "composer"
37+
},
38+
"guzzlehttp/streams": {
39+
"install-path": "vendor/guzzlehttp/streams",
40+
"installer": "composer"
41+
},
42+
"justinrainbow/json-schema": {
43+
"install-path": "vendor/justinrainbow/json-schema",
44+
"installer": "composer"
45+
},
46+
"php-http/adapter-integration-tests": {
47+
"install-path": "vendor/php-http/adapter-integration-tests",
48+
"installer": "composer",
49+
"env": "dev"
50+
},
51+
"php-http/client-common": {
52+
"install-path": "vendor/php-http/client-common",
53+
"installer": "composer",
54+
"env": "dev"
55+
},
56+
"php-http/discovery": {
57+
"install-path": "vendor/php-http/discovery",
58+
"installer": "composer"
59+
},
60+
"php-http/httplug": {
61+
"install-path": "vendor/php-http/httplug",
62+
"installer": "composer"
63+
},
64+
"php-http/message": {
65+
"install-path": "vendor/php-http/message",
66+
"installer": "composer",
67+
"env": "dev"
68+
},
69+
"php-http/message-factory": {
70+
"install-path": "vendor/php-http/message-factory",
71+
"installer": "composer",
72+
"env": "dev"
73+
},
74+
"php-http/promise": {
75+
"install-path": "vendor/php-http/promise",
76+
"installer": "composer"
77+
},
78+
"phpdocumentor/reflection-docblock": {
79+
"install-path": "vendor/phpdocumentor/reflection-docblock",
80+
"installer": "composer",
81+
"env": "dev"
82+
},
83+
"phpspec/prophecy": {
84+
"install-path": "vendor/phpspec/prophecy",
85+
"installer": "composer",
86+
"env": "dev"
87+
},
88+
"phpunit/php-code-coverage": {
89+
"install-path": "vendor/phpunit/php-code-coverage",
90+
"installer": "composer",
91+
"env": "dev"
92+
},
93+
"phpunit/php-file-iterator": {
94+
"install-path": "vendor/phpunit/php-file-iterator",
95+
"installer": "composer",
96+
"env": "dev"
97+
},
98+
"phpunit/php-text-template": {
99+
"install-path": "vendor/phpunit/php-text-template",
100+
"installer": "composer",
101+
"env": "dev"
102+
},
103+
"phpunit/php-timer": {
104+
"install-path": "vendor/phpunit/php-timer",
105+
"installer": "composer",
106+
"env": "dev"
107+
},
108+
"phpunit/php-token-stream": {
109+
"install-path": "vendor/phpunit/php-token-stream",
110+
"installer": "composer",
111+
"env": "dev"
112+
},
113+
"phpunit/phpunit": {
114+
"install-path": "vendor/phpunit/phpunit",
115+
"installer": "composer",
116+
"env": "dev"
117+
},
118+
"phpunit/phpunit-mock-objects": {
119+
"install-path": "vendor/phpunit/phpunit-mock-objects",
120+
"installer": "composer",
121+
"env": "dev"
122+
},
123+
"psr/http-message": {
124+
"install-path": "vendor/psr/http-message",
125+
"installer": "composer"
126+
},
127+
"psr/log": {
128+
"install-path": "vendor/psr/log",
129+
"installer": "composer"
130+
},
131+
"puli/composer-plugin": {
132+
"install-path": "vendor/puli/composer-plugin",
133+
"installer": "composer"
134+
},
135+
"puli/discovery": {
136+
"install-path": "vendor/puli/discovery",
137+
"installer": "composer"
138+
},
139+
"puli/repository": {
140+
"install-path": "vendor/puli/repository",
141+
"installer": "composer"
142+
},
143+
"puli/url-generator": {
144+
"install-path": "vendor/puli/url-generator",
145+
"installer": "composer"
146+
},
147+
"ramsey/uuid": {
148+
"install-path": "vendor/ramsey/uuid",
149+
"installer": "composer"
150+
},
151+
"react/promise": {
152+
"install-path": "vendor/react/promise",
153+
"installer": "composer"
154+
},
155+
"sebastian/comparator": {
156+
"install-path": "vendor/sebastian/comparator",
157+
"installer": "composer",
158+
"env": "dev"
159+
},
160+
"sebastian/diff": {
161+
"install-path": "vendor/sebastian/diff",
162+
"installer": "composer",
163+
"env": "dev"
164+
},
165+
"sebastian/environment": {
166+
"install-path": "vendor/sebastian/environment",
167+
"installer": "composer",
168+
"env": "dev"
169+
},
170+
"sebastian/exporter": {
171+
"install-path": "vendor/sebastian/exporter",
172+
"installer": "composer",
173+
"env": "dev"
174+
},
175+
"sebastian/global-state": {
176+
"install-path": "vendor/sebastian/global-state",
177+
"installer": "composer",
178+
"env": "dev"
179+
},
180+
"sebastian/recursion-context": {
181+
"install-path": "vendor/sebastian/recursion-context",
182+
"installer": "composer",
183+
"env": "dev"
184+
},
185+
"sebastian/version": {
186+
"install-path": "vendor/sebastian/version",
187+
"installer": "composer",
188+
"env": "dev"
189+
},
190+
"seld/jsonlint": {
191+
"install-path": "vendor/seld/jsonlint",
192+
"installer": "composer"
193+
},
194+
"symfony/process": {
195+
"install-path": "vendor/symfony/process",
196+
"installer": "composer"
197+
},
198+
"symfony/yaml": {
199+
"install-path": "vendor/symfony/yaml",
200+
"installer": "composer",
201+
"env": "dev"
202+
},
203+
"th3n3rd/cartesian-product": {
204+
"install-path": "vendor/th3n3rd/cartesian-product",
205+
"installer": "composer",
206+
"env": "dev"
207+
},
208+
"webmozart/assert": {
209+
"install-path": "vendor/webmozart/assert",
210+
"installer": "composer"
211+
},
212+
"webmozart/expression": {
213+
"install-path": "vendor/webmozart/expression",
214+
"installer": "composer"
215+
},
216+
"webmozart/glob": {
217+
"install-path": "vendor/webmozart/glob",
218+
"installer": "composer"
219+
},
220+
"webmozart/json": {
221+
"install-path": "vendor/webmozart/json",
222+
"installer": "composer"
223+
},
224+
"webmozart/path-util": {
225+
"install-path": "vendor/webmozart/path-util",
226+
"installer": "composer"
227+
}
10228
}
11229
}

0 commit comments

Comments
 (0)