Skip to content

Commit d5ec7d7

Browse files
dbudbu
authored
Merge pull request #191 from php-http/styleci
fix cs config
2 parents 7c27fe6 + 546de53 commit d5ec7d7

29 files changed

+87
-88
lines changed

‎.php_cs.dist

+1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@ return PhpCsFixer\Config::create()
1919
],
2020
'no_empty_phpdoc' => true,
2121
'no_superfluous_phpdoc_tags' => true,
22+
'single_line_throw' => false,
2223
])
2324
->setFinder($finder);

‎spec/BatchClientSpec.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
namespace spec\Http\Client\Common;
44

5-
use Http\Client\HttpClient;
6-
use Psr\Http\Message\RequestInterface;
7-
use Psr\Http\Message\ResponseInterface;
8-
use PhpSpec\ObjectBehavior;
95
use Http\Client\Common\BatchClient;
106
use Http\Client\Common\BatchResult;
11-
use Http\Client\Exception\HttpException;
127
use Http\Client\Common\Exception\BatchException;
8+
use Http\Client\Exception\HttpException;
9+
use Http\Client\HttpClient;
10+
use PhpSpec\ObjectBehavior;
11+
use Psr\Http\Message\RequestInterface;
12+
use Psr\Http\Message\ResponseInterface;
1313

1414
class BatchClientSpec extends ObjectBehavior
1515
{

‎spec/BatchResultSpec.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
namespace spec\Http\Client\Common;
44

5+
use Http\Client\Common\BatchResult;
56
use Http\Client\Exception;
7+
use PhpSpec\ObjectBehavior;
68
use Psr\Http\Message\RequestInterface;
79
use Psr\Http\Message\ResponseInterface;
8-
use PhpSpec\ObjectBehavior;
9-
use Http\Client\Common\BatchResult;
1010

1111
class BatchResultSpec extends ObjectBehavior
1212
{

‎spec/EmulatedHttpAsyncClientSpec.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
namespace spec\Http\Client\Common;
44

5-
use Http\Client\HttpClient;
6-
use Psr\Http\Message\RequestInterface;
7-
use Psr\Http\Message\ResponseInterface;
8-
use PhpSpec\ObjectBehavior;
95
use Http\Client\Common\EmulatedHttpAsyncClient;
6+
use Http\Client\Exception\TransferException;
107
use Http\Client\HttpAsyncClient;
8+
use Http\Client\HttpClient;
119
use Http\Client\Promise\HttpFulfilledPromise;
12-
use Http\Client\Exception\TransferException;
1310
use Http\Client\Promise\HttpRejectedPromise;
11+
use PhpSpec\ObjectBehavior;
12+
use Psr\Http\Message\RequestInterface;
13+
use Psr\Http\Message\ResponseInterface;
1414

1515
class EmulatedHttpAsyncClientSpec extends ObjectBehavior
1616
{

‎spec/EmulatedHttpClientSpec.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
namespace spec\Http\Client\Common;
44

5+
use Http\Client\Common\EmulatedHttpClient;
6+
use Http\Client\Exception;
57
use Http\Client\Exception\TransferException;
68
use Http\Client\HttpAsyncClient;
79
use Http\Client\HttpClient;
810
use Http\Promise\Promise;
11+
use PhpSpec\ObjectBehavior;
912
use Psr\Http\Message\RequestInterface;
1013
use Psr\Http\Message\ResponseInterface;
11-
use PhpSpec\ObjectBehavior;
12-
use Http\Client\Common\EmulatedHttpClient;
13-
use Http\Client\Exception;
1414

1515
class EmulatedHttpClientSpec extends ObjectBehavior
1616
{

‎spec/Exception/BatchExceptionSpec.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
namespace spec\Http\Client\Common\Exception;
44

55
use Http\Client\Common\BatchResult;
6+
use Http\Client\Common\Exception\BatchException;
67
use Http\Client\Exception;
78
use PhpSpec\ObjectBehavior;
8-
use Http\Client\Common\Exception\BatchException;
99

1010
class BatchExceptionSpec extends ObjectBehavior
1111
{

‎spec/FlexibleHttpClientSpec.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
namespace spec\Http\Client\Common;
44

5+
use Http\Client\Common\FlexibleHttpClient;
56
use Http\Client\HttpAsyncClient;
67
use Http\Client\HttpClient;
78
use Http\Promise\Promise;
9+
use PhpSpec\ObjectBehavior;
810
use Psr\Http\Message\RequestInterface;
911
use Psr\Http\Message\ResponseInterface;
10-
use PhpSpec\ObjectBehavior;
11-
use Http\Client\Common\FlexibleHttpClient;
1212

1313
class FlexibleHttpClientSpec extends ObjectBehavior
1414
{

‎spec/HttpClientPool/HttpClientPoolItemSpec.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace spec\Http\Client\Common\HttpClientPool;
44

55
use Http\Client\Exception;
6+
use Http\Client\Exception\RequestException;
67
use Http\Client\Exception\TransferException;
78
use Http\Client\HttpAsyncClient;
89
use Http\Client\HttpClient;
@@ -12,7 +13,6 @@
1213
use Prophecy\Argument;
1314
use Psr\Http\Message\RequestInterface;
1415
use Psr\Http\Message\ResponseInterface;
15-
use Http\Client\Exception\RequestException;
1616

1717
class HttpClientPoolItemSpec extends ObjectBehavior
1818
{

‎spec/HttpClientPool/LeastUsedClientPoolSpec.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22

33
namespace spec\Http\Client\Common\HttpClientPool;
44

5+
use Http\Client\Common\Exception\HttpClientNotFoundException;
56
use Http\Client\Common\HttpClientPool\HttpClientPoolItem;
7+
use Http\Client\Common\HttpClientPool\LeastUsedClientPool;
8+
use Http\Client\Exception\HttpException;
69
use Http\Client\HttpAsyncClient;
710
use Http\Client\HttpClient;
811
use Http\Promise\Promise;
912
use PhpSpec\ObjectBehavior;
1013
use Prophecy\Argument;
1114
use Psr\Http\Message\RequestInterface;
1215
use Psr\Http\Message\ResponseInterface;
13-
use Http\Client\Common\HttpClientPool\LeastUsedClientPool;
14-
use Http\Client\Common\Exception\HttpClientNotFoundException;
15-
use Http\Client\Exception\HttpException;
1616

1717
class LeastUsedClientPoolSpec extends ObjectBehavior
1818
{

‎spec/HttpClientPool/RandomClientPoolSpec.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22

33
namespace spec\Http\Client\Common\HttpClientPool;
44

5+
use Http\Client\Common\Exception\HttpClientNotFoundException;
56
use Http\Client\Common\HttpClientPool\HttpClientPoolItem;
7+
use Http\Client\Common\HttpClientPool\RandomClientPool;
8+
use Http\Client\Exception\HttpException;
69
use Http\Client\HttpAsyncClient;
710
use Http\Client\HttpClient;
811
use Http\Promise\Promise;
912
use PhpSpec\ObjectBehavior;
1013
use Prophecy\Argument;
1114
use Psr\Http\Message\RequestInterface;
1215
use Psr\Http\Message\ResponseInterface;
13-
use Http\Client\Common\HttpClientPool\RandomClientPool;
14-
use Http\Client\Common\Exception\HttpClientNotFoundException;
15-
use Http\Client\Exception\HttpException;
1616

1717
class RandomClientPoolSpec extends ObjectBehavior
1818
{

‎spec/HttpClientPool/RoundRobinClientPoolSpec.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22

33
namespace spec\Http\Client\Common\HttpClientPool;
44

5+
use Http\Client\Common\Exception\HttpClientNotFoundException;
56
use Http\Client\Common\HttpClientPool\HttpClientPoolItem;
7+
use Http\Client\Common\HttpClientPool\RoundRobinClientPool;
8+
use Http\Client\Exception\HttpException;
69
use Http\Client\HttpAsyncClient;
710
use Http\Client\HttpClient;
811
use Http\Promise\Promise;
912
use PhpSpec\ObjectBehavior;
1013
use Prophecy\Argument;
1114
use Psr\Http\Message\RequestInterface;
1215
use Psr\Http\Message\ResponseInterface;
13-
use Http\Client\Common\HttpClientPool\RoundRobinClientPool;
14-
use Http\Client\Common\Exception\HttpClientNotFoundException;
15-
use Http\Client\Exception\HttpException;
1616

1717
class RoundRobinClientPoolSpec extends ObjectBehavior
1818
{

‎spec/HttpClientRouterSpec.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44

55
use Http\Client\Common\Exception\HttpClientNoMatchException;
66
use Http\Client\Common\HttpClientRouter;
7-
use Http\Message\RequestMatcher;
7+
use Http\Client\Common\HttpClientRouterInterface;
88
use Http\Client\HttpAsyncClient;
99
use Http\Client\HttpClient;
10+
use Http\Message\RequestMatcher;
1011
use Http\Promise\Promise;
12+
use PhpSpec\ObjectBehavior;
1113
use Psr\Http\Message\RequestInterface;
1214
use Psr\Http\Message\ResponseInterface;
13-
use PhpSpec\ObjectBehavior;
14-
use Http\Client\Common\HttpClientRouterInterface;
1515

1616
class HttpClientRouterSpec extends ObjectBehavior
1717
{

‎spec/Plugin/AddHostPluginSpec.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
namespace spec\Http\Client\Common\Plugin;
44

5+
use Http\Client\Common\Plugin;
6+
use Http\Client\Common\Plugin\AddHostPlugin;
7+
use PhpSpec\ObjectBehavior;
58
use Psr\Http\Message\RequestInterface;
69
use Psr\Http\Message\UriInterface;
7-
use PhpSpec\ObjectBehavior;
8-
use Http\Client\Common\Plugin\AddHostPlugin;
9-
use Http\Client\Common\Plugin;
1010

1111
class AddHostPluginSpec extends ObjectBehavior
1212
{

‎spec/Plugin/AddPathPluginSpec.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
namespace spec\Http\Client\Common\Plugin;
44

5+
use Http\Client\Common\Plugin;
6+
use Http\Client\Common\Plugin\AddPathPlugin;
7+
use PhpSpec\ObjectBehavior;
58
use Psr\Http\Message\RequestInterface;
69
use Psr\Http\Message\UriInterface;
7-
use PhpSpec\ObjectBehavior;
8-
use Http\Client\Common\Plugin\AddPathPlugin;
9-
use Http\Client\Common\Plugin;
1010

1111
class AddPathPluginSpec extends ObjectBehavior
1212
{

‎spec/Plugin/AuthenticationPluginSpec.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
namespace spec\Http\Client\Common\Plugin;
44

5+
use Http\Client\Common\Plugin;
6+
use Http\Client\Common\Plugin\AuthenticationPlugin;
57
use Http\Message\Authentication;
68
use Http\Promise\Promise;
7-
use Psr\Http\Message\RequestInterface;
89
use PhpSpec\ObjectBehavior;
910
use Prophecy\Argument;
10-
use Http\Client\Common\Plugin\AuthenticationPlugin;
11-
use Http\Client\Common\Plugin;
11+
use Psr\Http\Message\RequestInterface;
1212

1313
class AuthenticationPluginSpec extends ObjectBehavior
1414
{

‎spec/Plugin/BaseUriPluginSpec.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
namespace spec\Http\Client\Common\Plugin;
44

5+
use Http\Client\Common\Plugin;
6+
use Http\Client\Common\Plugin\BaseUriPlugin;
7+
use PhpSpec\ObjectBehavior;
58
use Psr\Http\Message\RequestInterface;
69
use Psr\Http\Message\UriInterface;
7-
use PhpSpec\ObjectBehavior;
8-
use Http\Client\Common\Plugin\BaseUriPlugin;
9-
use Http\Client\Common\Plugin;
1010

1111
class BaseUriPluginSpec extends ObjectBehavior
1212
{

‎spec/Plugin/ContentLengthPluginSpec.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
namespace spec\Http\Client\Common\Plugin;
44

5+
use Http\Client\Common\Plugin;
6+
use Http\Client\Common\Plugin\ContentLengthPlugin;
57
use PhpSpec\Exception\Example\SkippingException;
6-
use Psr\Http\Message\RequestInterface;
7-
use Psr\Http\Message\StreamInterface;
88
use PhpSpec\ObjectBehavior;
99
use Prophecy\Argument;
10-
use Http\Client\Common\Plugin\ContentLengthPlugin;
11-
use Http\Client\Common\Plugin;
10+
use Psr\Http\Message\RequestInterface;
11+
use Psr\Http\Message\StreamInterface;
1212

1313
class ContentLengthPluginSpec extends ObjectBehavior
1414
{

‎spec/Plugin/CookiePluginSpec.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22

33
namespace spec\Http\Client\Common\Plugin;
44

5+
use Http\Client\Common\Plugin;
6+
use Http\Client\Common\Plugin\CookiePlugin;
7+
use Http\Client\Exception\TransferException;
58
use Http\Client\Promise\HttpFulfilledPromise;
9+
use Http\Client\Promise\HttpRejectedPromise;
610
use Http\Message\Cookie;
711
use Http\Message\CookieJar;
812
use Http\Promise\Promise;
13+
use PhpSpec\ObjectBehavior;
914
use Psr\Http\Message\RequestInterface;
1015
use Psr\Http\Message\ResponseInterface;
1116
use Psr\Http\Message\UriInterface;
12-
use PhpSpec\ObjectBehavior;
13-
use Http\Client\Common\Plugin\CookiePlugin;
14-
use Http\Client\Common\Plugin;
15-
use Http\Client\Promise\HttpRejectedPromise;
16-
use Http\Client\Exception\TransferException;
1717

1818
class CookiePluginSpec extends ObjectBehavior
1919
{

‎spec/Plugin/DecoderPluginSpec.php

+7-7
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22

33
namespace spec\Http\Client\Common\Plugin;
44

5+
use Http\Client\Common\Plugin;
6+
use Http\Client\Common\Plugin\DecoderPlugin;
57
use Http\Client\Promise\HttpFulfilledPromise;
6-
use Psr\Http\Message\RequestInterface;
7-
use Psr\Http\Message\ResponseInterface;
8-
use Psr\Http\Message\StreamInterface;
8+
use Http\Message\Encoding\DecompressStream;
9+
use Http\Message\Encoding\GzipDecodeStream;
910
use PhpSpec\Exception\Example\SkippingException;
1011
use PhpSpec\ObjectBehavior;
1112
use Prophecy\Argument;
12-
use Http\Client\Common\Plugin\DecoderPlugin;
13-
use Http\Client\Common\Plugin;
14-
use Http\Message\Encoding\GzipDecodeStream;
15-
use Http\Message\Encoding\DecompressStream;
13+
use Psr\Http\Message\RequestInterface;
14+
use Psr\Http\Message\ResponseInterface;
15+
use Psr\Http\Message\StreamInterface;
1616

1717
class DecoderPluginSpec extends ObjectBehavior
1818
{

‎spec/Plugin/ErrorPluginSpec.php

+7-7
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22

33
namespace spec\Http\Client\Common\Plugin;
44

5+
use Http\Client\Common\Exception\ClientErrorException;
6+
use Http\Client\Common\Exception\ServerErrorException;
7+
use Http\Client\Common\Plugin;
8+
use Http\Client\Common\Plugin\ErrorPlugin;
59
use Http\Client\Promise\HttpFulfilledPromise;
6-
use Psr\Http\Message\RequestInterface;
7-
use Psr\Http\Message\ResponseInterface;
10+
use Http\Client\Promise\HttpRejectedPromise;
811
use PhpSpec\ObjectBehavior;
912
use Prophecy\Argument;
10-
use Http\Client\Common\Plugin\ErrorPlugin;
11-
use Http\Client\Common\Plugin;
12-
use Http\Client\Promise\HttpRejectedPromise;
13-
use Http\Client\Common\Exception\ClientErrorException;
14-
use Http\Client\Common\Exception\ServerErrorException;
13+
use Psr\Http\Message\RequestInterface;
14+
use Psr\Http\Message\ResponseInterface;
1515

1616
class ErrorPluginSpec extends ObjectBehavior
1717
{

‎spec/Plugin/HistoryPluginSpec.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
namespace spec\Http\Client\Common\Plugin;
44

5-
use Http\Client\Exception\TransferException;
5+
use Http\Client\Common\Plugin;
66
use Http\Client\Common\Plugin\Journal;
7+
use Http\Client\Exception\TransferException;
78
use Http\Client\Promise\HttpFulfilledPromise;
89
use Http\Client\Promise\HttpRejectedPromise;
9-
use Psr\Http\Message\RequestInterface;
10-
use Psr\Http\Message\ResponseInterface;
1110
use PhpSpec\ObjectBehavior;
1211
use Prophecy\Argument;
13-
use Http\Client\Common\Plugin;
12+
use Psr\Http\Message\RequestInterface;
13+
use Psr\Http\Message\ResponseInterface;
1414

1515
class HistoryPluginSpec extends ObjectBehavior
1616
{

‎spec/Plugin/QueryDefaultsPluginSpec.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
namespace spec\Http\Client\Common\Plugin;
44

55
use Http\Client\Common\Plugin;
6-
use Psr\Http\Message\RequestInterface;
6+
use Http\Client\Common\Plugin\QueryDefaultsPlugin;
77
use PhpSpec\ObjectBehavior;
8+
use Psr\Http\Message\RequestInterface;
89
use Psr\Http\Message\UriInterface;
9-
use Http\Client\Common\Plugin\QueryDefaultsPlugin;
1010

1111
class QueryDefaultsPluginSpec extends ObjectBehavior
1212
{

0 commit comments

Comments
 (0)