Update code style and reformat code

misantron · May 26, 2023 · 30831ce · 30831ce
1 parent d589924
commit 30831ce
Show file tree

Hide file tree

Showing 11 changed files with 60 additions and 78 deletions.
diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ Collection of [PHPUnit](https://phpunit.de/) test helper traits created for test
 The recommended way to install is through [Composer](https://getcomposer.org/).
 
 ```bash
-composer require misantron/phpunit-guzzle-test-client
+composer require --dev misantron/phpunit-guzzle-test-client
 ```
 
 ## Supported versions

diff --git a/ecs.php b/ecs.php
@@ -2,89 +2,41 @@
 
 declare(strict_types=1);
 
-use PhpCsFixer\Fixer\CastNotation\CastSpacesFixer;
-use PhpCsFixer\Fixer\ClassNotation\ClassAttributesSeparationFixer;
-use PhpCsFixer\Fixer\FunctionNotation\SingleLineThrowFixer;
-use PhpCsFixer\Fixer\Import\NoUnusedImportsFixer;
-use PhpCsFixer\Fixer\Operator\ConcatSpaceFixer;
+use PhpCsFixer\Fixer\Import\OrderedImportsFixer;
 use PhpCsFixer\Fixer\Operator\NotOperatorWithSuccessorSpaceFixer;
-use PhpCsFixer\Fixer\Phpdoc\PhpdocSummaryFixer;
-use PhpCsFixer\Fixer\PhpUnit\PhpUnitConstructFixer;
-use PhpCsFixer\Fixer\PhpUnit\PhpUnitDedicateAssertFixer;
-use PhpCsFixer\Fixer\PhpUnit\PhpUnitDedicateAssertInternalTypeFixer;
-use PhpCsFixer\Fixer\PhpUnit\PhpUnitMockFixer;
-use PhpCsFixer\Fixer\PhpUnit\PhpUnitMockShortWillReturnFixer;
-use PhpCsFixer\Fixer\PhpUnit\PhpUnitTestCaseStaticMethodCallsFixer;
-use PhpCsFixer\Fixer\Strict\DeclareStrictTypesFixer;
-use PhpCsFixer\Fixer\StringNotation\ExplicitStringVariableFixer;
-use Symplify\CodingStandard\Fixer\ArrayNotation\ArrayListItemNewlineFixer;
-use Symplify\CodingStandard\Fixer\ArrayNotation\ArrayOpenerAndCloserNewlineFixer;
 use Symplify\EasyCodingStandard\Config\ECSConfig;
 use Symplify\EasyCodingStandard\ValueObject\Set\SetList;
 
 return static function (ECSConfig $ecsConfig): void {
     $ecsConfig->parallel();
 
-    $services = $ecsConfig->services();
-    $services->set(ClassAttributesSeparationFixer::class)
-        ->call('configure',
-            [
-                ['elements' => ['method' => 'one']],
-            ]
-        );
-    $services->set(ConcatSpaceFixer::class)
-        ->call('configure',
-            [
-                ['spacing' => 'one'],
-            ]
-        );
-    $services->set(CastSpacesFixer::class)
-        ->call('configure',
-            [
-                ['space' => 'one'],
-            ]
-        );
-    $services->set(DeclareStrictTypesFixer::class);
-    $services->set(PhpUnitConstructFixer::class);
-    $services->set(PhpUnitDedicateAssertFixer::class)
-        ->call('configure',
-            [
-                ['target' => 'newest'],
-            ]
-        );
-    $services->set(PhpUnitDedicateAssertInternalTypeFixer::class);
-    $services->set(PhpUnitMockFixer::class);
-    $services->set(PhpUnitMockShortWillReturnFixer::class);
-    $services
-        ->set(PhpUnitTestCaseStaticMethodCallsFixer::class)
-        ->call('configure',
-            [
-                ['call_type' => 'self'],
-            ]
-        );
-
     $ecsConfig->paths([
         __DIR__ . '/examples',
         __DIR__ . '/src',
         __DIR__ . '/tests',
     ]);
 
     $ecsConfig->skip([
-        ArrayOpenerAndCloserNewlineFixer::class => null,
-        ArrayListItemNewlineFixer::class => null,
         NotOperatorWithSuccessorSpaceFixer::class,
-        SingleLineThrowFixer::class => null,
-        ExplicitStringVariableFixer::class => null,
-        PhpdocSummaryFixer::class => null,
-        NoUnusedImportsFixer::class => null,
     ]);
 
     $ecsConfig->sets([
-        SetList::ARRAY,
-        SetList::CONTROL_STRUCTURES,
         SetList::SPACES,
+        SetList::ARRAY,
         SetList::CLEAN_CODE,
         SetList::STRICT,
         SetList::PSR_12,
+        SetList::PHPUNIT,
+        SetList::CONTROL_STRUCTURES,
+        SetList::NAMESPACES,
+    ]);
+
+    $ecsConfig->ruleWithConfiguration(OrderedImportsFixer::class, [
+        'sort_algorithm' => 'alpha',
+        'imports_order' => [
+            'const',
+            'class',
+            'function',
+        ],
     ]);
 };
diff --git a/examples/RequestAssertsTestClientTestExample.php b/examples/RequestAssertsTestClientTestExample.php
@@ -52,7 +52,9 @@ public function testMethodTwo(): void
         $service = new ServiceExample(
             new Client($config)
         );
-        $result = $service->methodTwo(['foo' => 'bar']);
+        $result = $service->methodTwo([
+            'foo' => 'bar',
+        ]);
 
         self::assertSame(200, $result->getStatusCode());
         self::assertSame('{"ok":true}', $result->getBody()->getContents());

diff --git a/examples/RequestHistoryTestClientTestExample.php b/examples/RequestHistoryTestClientTestExample.php
@@ -46,7 +46,9 @@ public function testMethodTwo(): void
         $service = new ServiceExample(
             new Client($config)
         );
-        $result = $service->methodTwo(['foo' => 'bar']);
+        $result = $service->methodTwo([
+            'foo' => 'bar',
+        ]);
 
         self::assertSame(200, $result->getStatusCode());
         self::assertSame('{"ok":true}', $result->getBody()->getContents());

diff --git a/examples/TestClientTestExample.php b/examples/TestClientTestExample.php
@@ -44,7 +44,9 @@ public function testMethodTwo(): void
         $service = new ServiceExample(
             new Client($clientConfig)
         );
-        $result = $service->methodTwo(['foo' => 'bar']);
+        $result = $service->methodTwo([
+            'foo' => 'bar',
+        ]);
 
         self::assertSame(200, $result->getStatusCode());
         self::assertSame('{"ok":true}', $result->getBody()->getContents());

diff --git a/src/RequestAssertsTestClientTrait.php b/src/RequestAssertsTestClientTrait.php
@@ -31,6 +31,8 @@ public function createRequestAssertsTestHttpClientConfig(
         $requestMapperMiddleware = Middleware::mapRequest($assertsCallback);
         $handlerStack->push($requestMapperMiddleware);
 
-        return array_merge($config, ['handler' => $handlerStack]);
+        return array_merge($config, [
+            'handler' => $handlerStack,
+        ]);
     }
 }
diff --git a/src/RequestHistoryTestClientTrait.php b/src/RequestHistoryTestClientTrait.php
@@ -28,7 +28,9 @@ public function createRequestHistoryTestHttpClientConfig(array $queue, array $co
         $requestHistoryMiddleware = Middleware::history($this->requestHistory);
         $handlerStack->push($requestHistoryMiddleware);
 
-        return array_merge($config, ['handler' => $handlerStack]);
+        return array_merge($config, [
+            'handler' => $handlerStack,
+        ]);
     }
 
     /**

diff --git a/src/TestClientTrait.php b/src/TestClientTrait.php
@@ -21,6 +21,8 @@ public function createTestHttpClientConfig(array $queue, array $config = []): ar
         $mockHandler = new MockHandler($queue);
         $handlerStack = HandlerStack::create($mockHandler);
 
-        return array_merge($config, ['handler' => $handlerStack]);
+        return array_merge($config, [
+            'handler' => $handlerStack,
+        ]);
     }
 }
diff --git a/tests/RequestAssertsTestClientTraitTest.php b/tests/RequestAssertsTestClientTraitTest.php
@@ -49,7 +49,9 @@ function (array $actual) {
                 [],
                 static function () {
                 },
-                ['base_uri' => 'https://example.com'],
+                [
+                    'base_uri' => 'https://example.com',
+                ],
                 function (array $actual) {
                     self::assertArrayHasKey('base_uri', $actual);
                     self::assertSame('https://example.com', $actual['base_uri']);
@@ -66,7 +68,9 @@ function (Request $request) {
 
                     return $request;
                 },
-                ['base_uri' => 'https://example.com'],
+                [
+                    'base_uri' => 'https://example.com',
+                ],
                 function (array $actual) {
                     self::assertArrayHasKey('base_uri', $actual);
                     self::assertSame('https://example.com', $actual['base_uri']);
@@ -89,14 +93,18 @@ public function testCreateRequestAssertsTestHttpClient(): void
 
             return $request;
         };
-        $config = ['base_uri' => 'https://example.com'];
+        $config = [
+            'base_uri' => 'https://example.com',
+        ];
 
         $test = new class() {
             use RequestAssertsTestClientTrait;
         };
         $client = $test->createRequestAssertsTestHttpClient($queue, $assertsCallback, $config);
         $response = $client->request('GET', '/path', [
-            RequestOptions::HEADERS => ['Content-Type' => 'text/plain'],
+            RequestOptions::HEADERS => [
+                'Content-Type' => 'text/plain',
+            ],
         ]);
 
         self::assertSame(200, $response->getStatusCode());

diff --git a/tests/RequestHistoryTestClientTraitTest.php b/tests/RequestHistoryTestClientTraitTest.php
@@ -40,7 +40,9 @@ function (array $actual) {
             ],
             '#2' => [
                 [],
-                ['base_uri' => 'https://example.com'],
+                [
+                    'base_uri' => 'https://example.com',
+                ],
                 function (array $actual) {
                     self::assertArrayHasKey('base_uri', $actual);
                     self::assertSame('https://example.com', $actual['base_uri']);
@@ -52,7 +54,9 @@ function (array $actual) {
                 [
                     new Response(),
                 ],
-                ['base_uri' => 'https://example.com'],
+                [
+                    'base_uri' => 'https://example.com',
+                ],
                 function (array $actual) {
                     self::assertArrayHasKey('base_uri', $actual);
                     self::assertSame('https://example.com', $actual['base_uri']);
@@ -92,7 +96,9 @@ public function testPullRequestHistoryRecord(): void
             new Response(200, [], 'test'),
             new Response(404, [], 'Not found'),
         ];
-        $config = [RequestOptions::HTTP_ERRORS => false];
+        $config = [
+            RequestOptions::HTTP_ERRORS => false,
+        ];
 
         $test = new class() {
             use RequestHistoryTestClientTrait;

diff --git a/tests/TestClientTraitTest.php b/tests/TestClientTraitTest.php
@@ -39,7 +39,9 @@ function (array $actual) {
             ],
             '#2' => [
                 [],
-                ['base_uri' => 'https://example.com'],
+                [
+                    'base_uri' => 'https://example.com',
+                ],
                 function (array $actual) {
                     self::assertArrayHasKey('base_uri', $actual);
                     self::assertSame('https://example.com', $actual['base_uri']);
@@ -51,7 +53,9 @@ function (array $actual) {
                 [
                     new Response(),
                 ],
-                ['base_uri' => 'https://example.com'],
+                [
+                    'base_uri' => 'https://example.com',
+                ],
                 function (array $actual) {
                     self::assertArrayHasKey('base_uri', $actual);
                     self::assertSame('https://example.com', $actual['base_uri']);