Merge pull request #11 from PiteurStudio/refactor

Refactor

Author: n4ss1m

.editorconfig

@@ -18,6 +18,7 @@ yarn-error.log
 /.idea
 /.fleet
 /.vscode
+.editorconfig
 
 # Code sniffer
 .php_cs

.github/workflows/dependabot-auto-merge.yml

@@ -9,8 +9,4 @@
         __DIR__.'/src',
         __DIR__.'/tests',
     ])
-    // uncomment to reach your current PHP version
-    // ->withPhpSets()
-    ->withTypeCoverageLevel(0)
-    ->withDeadCodeLevel(0)
-    ->withCodeQualityLevel(0);
+    ->withPhpSets();

.gitignore

@@ -26,17 +26,14 @@ class HttpClientService
 
     private bool $verifySsl = false;
 
-    private bool $test_mode;
-
-    private HttpClientInterface $httpClient;
+    private readonly HttpClientInterface $httpClient;
 
     /**
      * @param  bool  $test_mode  Whether to use the test API or not.
      * @param  HttpClientInterface|null  $httpClient  Injected HTTP client for testing (optional).
      */
-    public function __construct(bool $test_mode = false, ?HttpClientInterface $httpClient = null)
+    public function __construct(private readonly bool $test_mode = false, ?HttpClientInterface $httpClient = null)
     {
-        $this->test_mode = $test_mode;
         $this->httpClient = $httpClient ?? new RetryableHttpClient(HttpClient::create($this->getClientOptions()), null, $this->maxRetries);
     }
 

rector.php

@@ -64,7 +64,7 @@ abstract class SatimConfig
      *
      * @var non-empty-string|null
      */
-    protected ?string $failUrl;
+    protected ?string $failUrl = null;
 
     /**
      * The URL to redirect to after the payment is processed.

src/Client/HttpClientService.php

@@ -64,7 +64,7 @@ public function isRejected(): bool
             return false;
         }
 
-        if (! empty($response['ErrorMessage']) && str_contains($response['ErrorMessage'], 'Payment is declined')) {
+        if (! empty($response['ErrorMessage']) && str_contains((string) $response['ErrorMessage'], 'Payment is declined')) {
             return true;
         }
 
@@ -154,7 +154,7 @@ public function isCancelled(): bool
             return false;
         }
 
-        if (! empty($this->getResponse()['ErrorMessage']) && str_contains($this->getResponse()['ErrorMessage'], 'Payment is cancelled')) {
+        if (! empty($this->getResponse()['ErrorMessage']) && str_contains((string) $this->getResponse()['ErrorMessage'], 'Payment is cancelled')) {
             return true;
         }
 

src/SatimConfig.php

@@ -130,7 +130,7 @@
     $requestData = $method->invoke($this->satim);
 
     // Decode JSON `jsonParams`
-    $jsonParams = json_decode($requestData['jsonParams'], true);
+    $jsonParams = json_decode((string) $requestData['jsonParams'], true);
 
     expect($jsonParams)->toHaveKeys(['force_terminal_id', 'custom_field_1', 'custom_field_2'])
         ->and($jsonParams['force_terminal_id'])->toBe('123456')
@@ -157,7 +157,7 @@
     $requestData = $method->invoke($this->satim);
 
     // Decode JSON `jsonParams`
-    $jsonParams = json_decode($requestData['jsonParams'], true);
+    $jsonParams = json_decode((string) $requestData['jsonParams'], true);
 
     expect($jsonParams)->toHaveKey('force_terminal_id')
         ->and($jsonParams)->not()->toHaveKeys(['custom_field_1', 'custom_field_2']);
@@ -185,7 +185,7 @@
     $requestData = $method->invoke($this->satim);
 
     // Decode JSON `jsonParams`
-    $jsonParams = json_decode($requestData['jsonParams'], true);
+    $jsonParams = json_decode((string) $requestData['jsonParams'], true);
 
     expect($jsonParams)->toHaveKey('force_terminal_id')
         ->and($jsonParams['force_terminal_id'])->toBe('OVERWRITTEN_VALUE')