Skip to content

Commit 2466c73

Browse files
committed
Change the order of imports
1 parent 175a6b1 commit 2466c73

9 files changed

+28
-24
lines changed

.php-cs-fixer.php

+7-3
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@
44

55
/*
66
* This file is part of SolidWorx/SimpleHttp project.
7+
*
78
* Copyright (c) Pierre du Plessis <[email protected]>
89
*
9-
* For the full copyright and license information, please view
10-
* the LICENSE.md file that was distributed with this source code.
10+
* This source file is subject to the MIT license that is bundled
11+
* with this source code in the file LICENSE.
1112
*/
1213

1314
$header = <<<'EOF'
@@ -28,7 +29,7 @@
2829
'@PSR1' => true,
2930
'@PSR2' => true,
3031
'@Symfony' => true,
31-
'array_syntax' => array('syntax' => 'short'),
32+
'array_syntax' => ['syntax' => 'short'],
3233
'phpdoc_no_package' => true,
3334
'phpdoc_summary' => false,
3435
'declare_strict_types' => true,
@@ -39,6 +40,9 @@
3940
'location' => 'after_declare_strict',
4041
'separate' => 'both',
4142
],
43+
'ordered_imports' => [
44+
'imports_order' => ['const', 'class', 'function'],
45+
],
4246
]
4347
)
4448
->setFinder($finder)

src/Discovery/HttpAsyncClientDiscovery.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,19 @@
1313

1414
namespace SolidWorx\SimpleHttp\Discovery;
1515

16-
use function array_unique;
17-
use function array_unshift;
18-
use function assert;
1916
use Http\Client\Common\EmulatedHttpAsyncClient;
2017
use Http\Client\HttpAsyncClient;
2118
use Http\Discovery\ClassDiscovery;
2219
use Http\Discovery\Exception\DiscoveryFailedException;
2320
use Http\Discovery\Exception\NotFoundException;
24-
use function is_a;
2521
use Psr\Http\Client\ClientInterface;
2622
use SolidWorx\SimpleHttp\Discovery\Strategy\HttpAsyncClientStrategy;
2723
use SolidWorx\SimpleHttp\Factory\HttpAsyncClientFactory;
2824
use SolidWorx\SimpleHttp\RequestOptions;
25+
use function array_unique;
26+
use function array_unshift;
27+
use function assert;
28+
use function is_a;
2929

3030
final class HttpAsyncClientDiscovery extends ClassDiscovery
3131
{

src/Exception/NotImplementedException.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
namespace SolidWorx\SimpleHttp\Exception;
1515

16-
use function sprintf;
1716
use Throwable;
17+
use function sprintf;
1818

1919
final class NotImplementedException extends \InvalidArgumentException
2020
{

src/Factory/Guzzle7Factory.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,18 @@
1313

1414
namespace SolidWorx\SimpleHttp\Factory;
1515

16-
use function array_merge_recursive;
17-
use function class_exists;
1816
use GuzzleHttp\Client;
19-
use function GuzzleHttp\Psr7\stream_for;
20-
use function GuzzleHttp\Psr7\try_fopen;
2117
use GuzzleHttp\Psr7\Utils;
2218
use Http\Adapter\Guzzle7\Client as Guzzle7Client;
23-
use function is_string;
2419
use Psr\Http\Client\ClientInterface;
2520
use Psr\Http\Message\StreamInterface;
2621
use SolidWorx\SimpleHttp\Progress;
2722
use SolidWorx\SimpleHttp\RequestOptions;
23+
use function array_merge_recursive;
24+
use function class_exists;
25+
use function GuzzleHttp\Psr7\stream_for;
26+
use function GuzzleHttp\Psr7\try_fopen;
27+
use function is_string;
2828

2929
final class Guzzle7Factory implements HttpAsyncClientFactory
3030
{

src/RequestBuilder.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515

1616
use Http\Client\Common\PluginClient;
1717
use Http\Discovery\Psr17FactoryDiscovery;
18-
use function in_array;
1918
use Psr\Http\Client\ClientInterface;
2019
use Psr\Http\Message\RequestInterface;
2120
use Psr\Http\Message\UriInterface;
@@ -24,6 +23,7 @@
2423
use SolidWorx\SimpleHttp\Traits\HttpMethodsTrait;
2524
use SolidWorx\SimpleHttp\Traits\HttpOptionsTrait;
2625
use Throwable;
26+
use function in_array;
2727

2828
final class RequestBuilder
2929
{

src/RequestOptions.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313

1414
namespace SolidWorx\SimpleHttp;
1515

16-
use function array_merge;
17-
use function http_build_query;
18-
use function is_array;
19-
use function is_string;
2016
use SolidWorx\SimpleHttp\Exception\InvalidArgumentException;
2117
use Symfony\Component\Mime\Header\HeaderInterface;
2218
use Symfony\Component\Mime\Part\DataPart;
2319
use Symfony\Component\Mime\Part\Multipart\FormDataPart;
20+
use function array_merge;
21+
use function http_build_query;
22+
use function is_array;
23+
use function is_string;
2424

2525
final class RequestOptions
2626
{

src/Response.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@
1313

1414
namespace SolidWorx\SimpleHttp;
1515

16+
use const JSON_THROW_ON_ERROR;
1617
use Exception;
1718
use Http\Promise\Promise;
18-
use function is_array;
19-
use function is_string;
20-
use function json_decode;
21-
use const JSON_THROW_ON_ERROR;
2219
use JsonException;
2320
use Psr\Http\Message\ResponseInterface;
2421
use Psr\Http\Message\StreamInterface;
2522
use SolidWorx\SimpleHttp\Exception\InvalidArgumentException;
2623
use SolidWorx\SimpleHttp\Exception\NotImplementedException;
24+
use function is_array;
25+
use function is_string;
26+
use function json_decode;
2727
use function stream_copy_to_stream;
2828

2929
final class Response implements ResponseInterface

src/Traits/HttpOptionsTrait.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
namespace SolidWorx\SimpleHttp\Traits;
1515

1616
use Closure;
17-
use function fopen;
1817
use Http\Client\Common\Plugin;
1918
use Http\Client\Common\Plugin\BaseUriPlugin;
2019
use Http\Client\Common\Plugin\QueryDefaultsPlugin;
@@ -32,6 +31,7 @@
3231
use function sprintf;
3332
use Symfony\Component\Mime\Part\DataPart;
3433
use Traversable;
34+
use function fopen;
3535

3636
trait HttpOptionsTrait
3737
{

tests/HttpClientTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
namespace SolidWorx\SimpleHttp\Tests;
1515

1616
use Closure;
17-
use function file_get_contents;
1817
use GuzzleHttp\Client;
1918
use GuzzleHttp\Handler\MockHandler;
2019
use GuzzleHttp\HandlerStack;
@@ -39,6 +38,7 @@
3938
use SolidWorx\SimpleHttp\HttpClient;
4039
use SolidWorx\SimpleHttp\RequestBuilder;
4140
use stdClass;
41+
use function file_get_contents;
4242

4343
final class HttpClientTest extends TestCase
4444
{

0 commit comments

Comments
 (0)