[DV-8390] Added CS rules just like the Commerce System.

superbrave · Apr 18, 2024 · 9dae832 · 9dae832
1 parent f8331ec
commit 9dae832
Show file tree

Hide file tree

Showing 10 changed files with 57 additions and 8 deletions.
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -15,10 +15,43 @@
     ->setRules([
         '@Symfony' => true,
         '@PSR12' => true,
-        'ordered_imports' => true,
-        'yoda_style' => false,
+        'array_syntax' => [
+            'syntax' => 'short',
+        ],
+        'phpdoc_to_comment' => false,
+        'declare_strict_types' => true,
         'global_namespace_import' => [
             'import_classes' => true,
         ],
+        'phpdoc_separation' => false,
+        'multiline_whitespace_before_semicolons' => true,
+        'trailing_comma_in_multiline' => [
+            'elements' => [
+                'arrays',
+                'parameters',
+                'match',
+            ],
+        ],
+        'no_unused_imports' => true,
+        'ordered_class_elements' => [
+            'order' => [
+                'use_trait',
+                'constant_public',
+                'constant_protected',
+                'constant_private',
+                'case',
+                'property',
+                'construct',
+                'destruct',
+                'magic',
+                'phpunit',
+                'method_public',
+                'method_protected',
+                'method_private',
+            ],
+        ],
+        'ordered_imports' => true,
+        'yoda_style' => false,
+        'nullable_type_declaration_for_default_null_value' => false,
     ])
     ->setFinder($finder);
diff --git a/composer.json b/composer.json
@@ -40,8 +40,8 @@
     },
     "scripts": {
         "check-phpstan": "vendor/bin/phpstan analyse",
-        "check-code-style": "vendor/bin/php-cs-fixer fix --dry-run -v",
-        "fix-code-style": "vendor/bin/php-cs-fixer fix",
+        "check-code-style": "vendor/bin/php-cs-fixer fix --allow-risky=yes --dry-run -v",
+        "fix-code-style": "vendor/bin/php-cs-fixer fix --allow-risky=yes",
         "test": "phpunit"
     }
 }
diff --git a/src/Exception/ClientException.php b/src/Exception/ClientException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Superbrave\VerboseErrorHttpClient\Exception;
 
 use RuntimeException;

diff --git a/src/Exception/HttpExceptionTrait.php b/src/Exception/HttpExceptionTrait.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Superbrave\VerboseErrorHttpClient\Exception;
 
 use Symfony\Contracts\HttpClient\ResponseInterface;

diff --git a/src/Exception/RedirectionException.php b/src/Exception/RedirectionException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Superbrave\VerboseErrorHttpClient\Exception;
 
 use RuntimeException;

diff --git a/src/Exception/ServerException.php b/src/Exception/ServerException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Superbrave\VerboseErrorHttpClient\Exception;
 
 use RuntimeException;

diff --git a/src/Response/VerboseErrorResponse.php b/src/Response/VerboseErrorResponse.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Superbrave\VerboseErrorHttpClient\Response;
 
 use Superbrave\VerboseErrorHttpClient\Exception\ClientException;

diff --git a/src/VerboseErrorHttpClient.php b/src/VerboseErrorHttpClient.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Superbrave\VerboseErrorHttpClient;
 
 use Superbrave\VerboseErrorHttpClient\Response\VerboseErrorResponse;

diff --git a/tests/Response/VerboseErrorResponseTest.php b/tests/Response/VerboseErrorResponseTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Superbrave\VerboseErrorHttpClient\Tests\Response;
 
 use PHPUnit\Framework\MockObject\MockObject;
@@ -68,7 +70,7 @@ public function testGetHeaders(
         ?HttpExceptionInterface $exception,
         int $httpCode,
         ?string $expectedExceptionClass,
-        ?string $expectedExceptionMessage
+        ?string $expectedExceptionMessage,
     ): void {
         $method = $this->wrappedResponseMock->expects($this->once())
             ->method('getHeaders')
@@ -110,7 +112,7 @@ public function testGetContent(
         ?HttpExceptionInterface $exception,
         int $httpCode,
         ?string $expectedExceptionClass,
-        ?string $expectedExceptionMessage
+        ?string $expectedExceptionMessage,
     ): void {
         $method = $this->wrappedResponseMock->expects($this->atLeastOnce())
             ->method('getContent')
@@ -161,7 +163,7 @@ public function testToArray(
         ?HttpExceptionInterface $exception,
         int $httpCode,
         ?string $expectedExceptionClass,
-        ?string $expectedExceptionMessage
+        ?string $expectedExceptionMessage,
     ): void {
         $method = $this->wrappedResponseMock->expects($this->once())
             ->method('toArray')

diff --git a/tests/VerboseErrorHttpClientTest.php b/tests/VerboseErrorHttpClientTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Superbrave\VerboseErrorHttpClient\Tests;
 
 use ArrayIterator;
@@ -68,7 +70,7 @@ public function testRequestThrowsClientException(MockResponse $response, string
      */
     public function testRequestThrowsRedirectionException(
         MockResponse $response,
-        string $expectedExceptionMessage
+        string $expectedExceptionMessage,
     ): void {
         $this->mockResponses[] = $response;