Skip to content

Commit 561af35

Browse files
ddeboerddeboer
committed
Move mock client to php-http/mock-client
1 parent 5dcaf8a commit 561af35

File tree

6 files changed

+41
-110
lines changed

6 files changed

+41
-110
lines changed

‎composer.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,20 @@
2121
}
2222
],
2323
"minimum-stability": "dev",
24+
"prefer-stable": true,
2425
"require": {
2526
"php": ">=5.4.8",
2627
"symfony/event-dispatcher": "^2.3||^3.0",
2728
"symfony/options-resolver": "^2.3||^3.0",
2829
"php-http/client-implementation": "^1.0.0",
29-
"php-http/discovery": "^0.3.0"
30+
"php-http/discovery": "^0.5.0",
31+
"php-http/message": "^0.1.2"
3032
},
3133
"require-dev": {
3234
"mockery/mockery": "~0.9.1",
3335
"monolog/monolog": "~1.0",
34-
"php-http/guzzle6-adapter": "^0.2.0",
36+
"php-http/guzzle6-adapter": "0.3.x-dev",
37+
"php-http/mock-client": "0.1.x-dev",
3538
"symfony/process": "^2.3||^3.0",
3639
"symfony/http-kernel": "^2.3||^3.0"
3740
},

‎src/ProxyClient/Http/HttpAdapter.php

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
use Http\Client\Exception\HttpException;
1212
use Http\Client\Exception\RequestException;
1313
use Http\Client\HttpAsyncClient;
14-
use Http\Client\Promise;
14+
use Http\Promise\Promise;
1515
use Http\Discovery\UriFactoryDiscovery;
1616
use Psr\Http\Message\RequestInterface;
1717
use Psr\Http\Message\UriInterface;
@@ -29,9 +29,9 @@ class HttpAdapter
2929
private $httpClient;
3030

3131
/**
32-
* Asynchronously sent requests
32+
* Queued requests
3333
*
34-
* @var Promise[]
34+
* @var RequestInterface[]
3535
*/
3636
private $queue = [];
3737

@@ -110,20 +110,14 @@ public function flush()
110110
}
111111

112112
foreach ($promises as $promise) {
113-
// TODO: or will the final version of promise return the value in wait()?
114-
$promise->wait();
115-
if (Promise::FULFILLED === $promise->getState()) {
116-
continue;
117-
}
118-
$exception = $promise->getException();
119-
if ($exception instanceof \Exception) {
120-
if ($exception instanceof HttpException) {
121-
$exceptions->add(ProxyResponseException::proxyResponse($exception->getResponse()));
122-
} elseif ($exception instanceof RequestException) {
123-
$exceptions->add(ProxyUnreachableException::proxyUnreachable($exception));
124-
} else {
113+
try {
114+
$promise->wait();
115+
} catch (HttpException $exception) {
116+
$exceptions->add(ProxyResponseException::proxyResponse($exception->getResponse()));
117+
} catch (RequestException $exception) {
118+
$exceptions->add(ProxyUnreachableException::proxyUnreachable($exception));
119+
} catch (\Exception $exception) {
125120
$exceptions->add(new InvalidArgumentException($exception));
126-
}
127121
}
128122
}
129123

‎src/Test/HttpClient/MockHttpClient.php

Lines changed: 0 additions & 65 deletions
This file was deleted.

‎tests/Unit/ProxyClient/AbstractProxyClientTest.php

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,10 @@
1313

1414
use FOS\HttpCache\Exception\ExceptionCollection;
1515
use FOS\HttpCache\ProxyClient\Varnish;
16-
use FOS\HttpCache\Test\HttpClient\MockHttpClient;
16+
use Http\Mock\Client;
1717
use Http\Client\Exception\RequestException;
18-
use Http\Client\Promise;
19-
use Http\Client\Tools\Promise\FulfilledPromise;
2018
use Http\Discovery\MessageFactoryDiscovery;
19+
use Http\Promise\Promise;
2120
use Psr\Http\Message\RequestInterface;
2221
use \Mockery;
2322

@@ -27,7 +26,9 @@
2726
class AbstractProxyClientTest extends \PHPUnit_Framework_TestCase
2827
{
2928
/**
30-
* @var MockHttpClient
29+
* Mock client
30+
*
31+
* @var Client
3132
*/
3233
private $client;
3334

@@ -40,7 +41,7 @@ class AbstractProxyClientTest extends \PHPUnit_Framework_TestCase
4041
*/
4142
public function testExceptions(\Exception $exception, $type, $message = null)
4243
{
43-
$this->client->setException($exception);
44+
$this->client->addException($exception);
4445
$varnish = new Varnish(['127.0.0.1:123'], ['base_uri' => 'my_hostname.dev'], $this->client);
4546

4647
$varnish->purge('/');
@@ -59,8 +60,6 @@ public function testExceptions(\Exception $exception, $type, $message = null)
5960
}
6061
}
6162

62-
$this->client->clear();
63-
6463
// Queue must now be empty, so exception above must not be thrown again.
6564
$varnish->purge('/path')->flush();
6665
}
@@ -87,6 +86,8 @@ public function exceptionProvider()
8786

8887
public function testErrorResponsesAreConvertedToExceptions()
8988
{
89+
$this->markTestSkipped('Default php-http behaviour is not to exceptions');
90+
9091
$response = MessageFactoryDiscovery::find()->createResponse(
9192
405,
9293
'Not allowed'
@@ -180,7 +181,7 @@ public function testFlushCountSuccess()
180181
{
181182
$httpClient = \Mockery::mock('\Http\Client\HttpAsyncClient')
182183
->shouldReceive('sendAsyncRequest')
183-
->between(4, 4)
184+
->times(4)
184185
->with(
185186
\Mockery::on(
186187
function (RequestInterface $request) {
@@ -191,13 +192,13 @@ function (RequestInterface $request) {
191192
)
192193
)
193194
->andReturn(
194-
\Mockery::mock('\Http\Client\Promise')
195+
\Mockery::mock('\Http\Promise\Promise')
195196
->shouldReceive('wait')
196-
->between(4, 4)
197-
->andReturnNull()
198-
->shouldReceive('getState')
199-
->between(4, 4)
200-
->andReturn(Promise::FULFILLED)
197+
->times(4)
198+
// ->andReturnNull()
199+
// ->shouldReceive('getState')
200+
// ->between(4, 4)
201+
// ->andReturn(Promise::FULFILLED)
201202
->getMock()
202203
)
203204
->getMock();
@@ -217,7 +218,7 @@ public function testEliminateDuplicates()
217218
{
218219
$httpClient = \Mockery::mock('\Http\Client\HttpAsyncClient')
219220
->shouldReceive('sendAsyncRequest')
220-
->between(4, 4)
221+
->times(4)
221222
->with(
222223
\Mockery::on(
223224
function (RequestInterface $request) {
@@ -228,13 +229,9 @@ function (RequestInterface $request) {
228229
)
229230
)
230231
->andReturn(
231-
\Mockery::mock('\Http\Client\Promise')
232+
\Mockery::mock('\Http\Promise\Promise')
232233
->shouldReceive('wait')
233-
->between(4, 4)
234-
->andReturnNull()
235-
->shouldReceive('getState')
236-
->between(4, 4)
237-
->andReturn(Promise::FULFILLED)
234+
->times(4)
238235
->getMock()
239236
)
240237
->getMock();
@@ -254,7 +251,7 @@ function (RequestInterface $request) {
254251

255252
protected function setUp()
256253
{
257-
$this->client = new MockHttpClient();
254+
$this->client = new Client();
258255
}
259256

260257
/**

‎tests/Unit/ProxyClient/SymfonyTest.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,16 @@
1212
namespace FOS\HttpCache\Tests\Unit\ProxyClient;
1313

1414
use FOS\HttpCache\ProxyClient\Symfony;
15-
use FOS\HttpCache\Test\HttpClient\MockHttpClient;
15+
use Http\Adapter\Client;
1616
use \Mockery;
1717
use Psr\Http\Message\RequestInterface;
1818

1919
class SymfonyTest extends \PHPUnit_Framework_TestCase
2020
{
2121
/**
22-
* @var MockHttpClient
22+
* Mock client
23+
*
24+
* @var Client
2325
*/
2426
protected $client;
2527

@@ -62,7 +64,7 @@ public function testRefresh()
6264

6365
protected function setUp()
6466
{
65-
$this->client = new MockHttpClient();
67+
$this->client = new Client();
6668
}
6769

6870
/**

‎tests/Unit/ProxyClient/VarnishTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
namespace FOS\HttpCache\Tests\Unit\ProxyClient;
1313

1414
use FOS\HttpCache\ProxyClient\Varnish;
15+
use Http\Adapter\Client;
1516
use Psr\Http\Message\RequestInterface;
16-
use FOS\HttpCache\Test\HttpClient\MockHttpClient;
1717
use \Mockery;
1818

1919
class VarnishTest extends \PHPUnit_Framework_TestCase
@@ -176,7 +176,7 @@ public function testRefresh()
176176

177177
protected function setUp()
178178
{
179-
$this->client = new MockHttpClient();
179+
$this->client = new Client();
180180
}
181181

182182
/**

0 commit comments

Comments
 (0)