refactor: run rector

PiteurStudio · Feb 2, 2025 · 2b0f79a · 2b0f79a
1 parent 2000c7c
commit 2b0f79a
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 44 deletions.
diff --git a/src/ProviderIntegrations/EcotrackProviderIntegration.php b/src/ProviderIntegrations/EcotrackProviderIntegration.php
@@ -95,24 +95,20 @@ public function testCredentials(): bool
             ];
 
             // Make the GET request
-            $response = $client->request('GET', $this->apiDomain().'api/v1/get/wilayas', [
+            $response = $client->request('GET', static::apiDomain().'api/v1/get/wilayas', [
                 'headers' => $headers,
                 'Content-Type' => 'application/json',
             ]);
 
             // Check the status code
-            switch ($response->getStatusCode()) {
-                case 200:
-                    // If the request is successful, return true
-                    return true;
-                case 401:
-                case 403:
-                    // If the request returns a 401 or 403 status code, return false
-                    return false;
-                default:
-                    // If the request returns any other status code, throw an HttpException
-                    throw new HttpException('Ecotrack '.$this->metadata()['name'].', Unexpected error occurred.');
-            }
+            return match ($response->getStatusCode()) {
+                // If the request is successful, return true
+                200 => true,
+                // If the request returns a 401 or 403 status code, return false
+                401, 403 => false,
+                // If the request returns any other status code, throw an HttpException
+                default => throw new HttpException('Ecotrack '.static::metadata()['name'].', Unexpected error occurred.'),
+            };
         } catch (GuzzleException $e) {
             // Handle exceptions
             throw new HttpException($e->getMessage());
@@ -134,7 +130,7 @@ public function getRates(?int $from_wilaya_id, ?int $to_wilaya_id): array
             ];
 
             // Make the GET request
-            $response = $client->request('GET', $this->apiDomain().'api/v1/get/fees', [
+            $response = $client->request('GET', static::apiDomain().'api/v1/get/fees', [
                 'headers' => $headers,
                 'Content-Type' => 'application/json',
             ]);
@@ -200,7 +196,7 @@ public function createOrder(array $orderData): array
             ];
 
             // Make the POST request
-            $request = new Request('POST', $this->apiDomain().'api/v1/create/order', $headers, $requestBody);
+            $request = new Request('POST', static::apiDomain().'api/v1/create/order', $headers, $requestBody);
 
             $response = $client->send($request);
 
@@ -239,7 +235,7 @@ public function orderLabel(string $orderId): array
             ];
 
             // Make the GET request
-            $response = $client->request('GET', $this->apiDomain().'api/v1/get/order/label?tracking='.$orderId, [
+            $response = $client->request('GET', static::apiDomain().'api/v1/get/order/label?tracking='.$orderId, [
                 'headers' => $headers,
                 'Content-Type' => 'application/json',
             ]);

diff --git a/src/ProviderIntegrations/ProcolisProviderIntegration.php b/src/ProviderIntegrations/ProcolisProviderIntegration.php
@@ -100,17 +100,14 @@ public function testCredentials(): bool
             $data = json_decode($body, true);
 
             // Check the status code
-            switch ($response->getStatusCode()) {
-                case 200:
-                    // If the request is successful, return true
-                    return $data['Statut'] === 'Accès activé';
-                case 401:
-                    // If the request returns a 401 status code, return false
-                    return false;
-                default:
-                    // If the request returns any other status code, throw an HttpException
-                    throw new HttpException('Procolis, Unexpected error occurred.');
-            }
+            return match ($response->getStatusCode()) {
+                // If the request is successful, return true
+                200 => $data['Statut'] === 'Accès activé',
+                // If the request returns a 401 status code, return false
+                401 => false,
+                // If the request returns any other status code, throw an HttpException
+                default => throw new HttpException('Procolis, Unexpected error occurred.'),
+            };
         } catch (GuzzleException $e) {
             // Handle exceptions
             throw new HttpException($e->getMessage());

diff --git a/src/ProviderIntegrations/YalidineProviderIntegration.php b/src/ProviderIntegrations/YalidineProviderIntegration.php
@@ -106,7 +106,7 @@ public function testCredentials(): bool
             ];
 
             // Make the GET request
-            $response = $client->request('GET', $this->apiDomain().'/v1/wilayas/', [
+            $response = $client->request('GET', static::apiDomain().'/v1/wilayas/', [
                 'headers' => $headers,
             ]);
 
@@ -149,7 +149,7 @@ public function getRates($from_wilaya_id, $to_wilaya_id): array
             ];
 
             // Make the GET request
-            $response = $client->request('GET', $this->apiDomain().'/v1/fees/?from_wilaya_id='.$from_wilaya_id.'&to_wilaya_id='.$to_wilaya_id, [
+            $response = $client->request('GET', static::apiDomain().'/v1/fees/?from_wilaya_id='.$from_wilaya_id.'&to_wilaya_id='.$to_wilaya_id, [
                 'headers' => $headers,
             ]);
 
@@ -191,7 +191,7 @@ public function createOrder(array $orderData): array
                 throw new CreateOrderException('Create Order failed : JSON encoding error');
             }
 
-            $request = new Request('POST', $this->apiDomain().'/v1/parcels/', $headers, $requestBody);
+            $request = new Request('POST', static::apiDomain().'/v1/parcels/', $headers, $requestBody);
 
             $response = $client->send($request);
 

diff --git a/src/Services/ShippingService.php b/src/Services/ShippingService.php
@@ -7,7 +7,7 @@
 
 class ShippingService
 {
-    private ShippingProviderContract $provider;
+    private readonly ShippingProviderContract $provider;
 
     /**
      * Create a new ShippingService instance for the given provider.

diff --git a/src/ShippingProviders/MaystroDeliveryProvider.php b/src/ShippingProviders/MaystroDeliveryProvider.php
@@ -92,18 +92,14 @@ public function testCredentials(): bool
             ]);
 
             // Check the status code
-            switch ($response->getStatusCode()) {
-                case 200:
-                    // If the request is successful, return true
-                    return true;
-                case 401:
-                case 403:
-                    // If the request returns a 401 or 403 status code, return false
-                    return false;
-                default:
-                    // If the request returns any other status code, throw an HttpException
-                    throw new HttpException($this->metadata()['name'].', Unexpected error occurred.');
-            }
+            return match ($response->getStatusCode()) {
+                // If the request is successful, return true
+                200 => true,
+                // If the request returns a 401 or 403 status code, return false
+                401, 403 => false,
+                // If the request returns any other status code, throw an HttpException
+                default => throw new HttpException(static::metadata()['name'].', Unexpected error occurred.'),
+            };
         } catch (GuzzleException $e) {
             // Handle exceptions
             throw new HttpException($e->getMessage());

diff --git a/src/Support/ValidatorSetup.php b/src/Support/ValidatorSetup.php
@@ -19,7 +19,7 @@ class ValidatorSetup
     public static function makeValidator(?string $langPath = null, string $locale = 'fr'): ValidatorFactory
     {
         // Step 1: Set default language files directory
-        $langPath = $langPath ?? __DIR__.'/lang';
+        $langPath ??= __DIR__.'/lang';
 
         // Step 2: Create a FileLoader instance to load language files
         // The FileLoader is responsible for loading language files from the specified directory