gabrielbull / php-ups-api

src/Entity/ShipperFiled.php

Spacing +3 added lines, -3 removed lines

@@ -8,9 +8,9 @@
 
 class ShipperFiled implements NodeInterface
 {
-    const SF_ITN                   = 'A';  // Requires the ITN
-    const SF_EXEMPTION_LEGEND      = 'B';  // Requires the Exemption Legend
-    const SF_POST_DEPARTURE_FILING = 'C';  // Requires Post Departure Filing Citation
+    const SF_ITN                   = 'A'; // Requires the ITN
+    const SF_EXEMPTION_LEGEND      = 'B'; // Requires the Exemption Legend
+    const SF_POST_DEPARTURE_FILING = 'C'; // Requires Post Departure Filing Citation
 
     /**
      * @var string

src/Entity/EEIFilingOption.php

Spacing +2 added lines, -2 removed lines

@@ -8,8 +8,8 @@
 
 class EEIFilingOption implements NodeInterface
 {
-    const FO_SHIPPER = '1';  // Shipper Filed
-    const FO_UPS     = '3';  // UPS Filed
+    const FO_SHIPPER = '1'; // Shipper Filed
+    const FO_UPS     = '3'; // UPS Filed
 
     /**
      * @var string

src/Entity/StatusType.php

Spacing +5 added lines, -5 removed lines

@@ -4,11 +4,11 @@
 
 class StatusType
 {
-    const ST_IN_TRANSIT       = 'I';  // In Transit
-    const ST_DELIVERED        = 'D';  // Delivered
-    const ST_EXCEPTION        = 'X';  // Exception
-    const ST_PICKUP           = 'P';  // Pickup
-    const ST_MANIFEST_PICKUP  = 'M';  // Manifest Pickup
+    const ST_IN_TRANSIT       = 'I'; // In Transit
+    const ST_DELIVERED        = 'D'; // Delivered
+    const ST_EXCEPTION        = 'X'; // Exception
+    const ST_PICKUP           = 'P'; // Pickup
+    const ST_MANIFEST_PICKUP  = 'M'; // Manifest Pickup
 
     public $Code;
     public $Description;

src/Request.php

Spacing +4 added lines, -4 removed lines

@@ -101,7 +101,7 @@ 
             'endpointurl' => $this->getEndpointUrl(),
         ]);
 
-        $this->logger->debug('Request: ' . $this->getRequest(), [
+        $this->logger->debug('Request: '.$this->getRequest(), [
             'id' => $id,
             'endpointurl' => $this->getEndpointUrl(),
         ]);
@@ -110,7 +110,7 @@ 
             $response = $this->client->post(
                 $this->getEndpointUrl(),
                 [
-                    'body' => $this->getAccess() . $this->getRequest(),
+                    'body' => $this->getAccess().$this->getRequest(),
                     'headers' => [
                         'Content-type' => 'application/x-www-form-urlencoded; charset=utf-8',
                         'Accept-Charset' => 'UTF-8',
@@ -126,7 +126,7 @@ 
                 'endpointurl' => $this->getEndpointUrl(),
             ]);
 
-            $this->logger->debug('Response: ' . $body, [
+            $this->logger->debug('Response: '.$body, [
                 'id' => $id,
                 'endpointurl' => $this->getEndpointUrl(),
             ]);
@@ -153,7 +153,7 @@ 
                 'endpointurl' => $this->getEndpointUrl(),
             ]);
 
-            throw new RequestException('Failure: ' . $e->getMessage());
+            throw new RequestException('Failure: '.$e->getMessage());
         }
     }
 

src/Entity/InternationalForms.php

Spacing +5 added lines, -8 removed lines

@@ -151,16 +151,16 @@ 
      * @var EEIFilingOption
      */
     private $eeiFilingOption;
-=======
+=== === =
      * @var OtherCharges
-     */
+     * /
     private $otherCharges;
 
     /**
      * @var string $declarationStatement
      */
     private $declarationStatement;
->>>>>>> develop
+>> >> >> > develop
 
     /**
      * @return array
@@ -210,7 +210,7 @@ 
             if (isset($attributes->CurrencyCode)) {
                 $this->setCurrencyCode($attributes->CurrencyCode);
             }
-<<<<<<< HEAD
+<< << <<< HEAD
             if (isset($attributes->EEIFilingOption)) {
                 $this->setEEIFilingOption(new EEIFilingOption($attributes->EEIFilingOption));
 =======
@@ -616,7 +616,4 @@ 
     {
         $this->declarationStatement = $statement;
 
-        return $this;
-    }
->>>>>>> develop
-}
+        return $this
\ No newline at end of file

src/Tracking.php

Spacing +20 added lines, -20 removed lines

@@ -167,7 +167,7 @@ 
         );
 
         $response = '';
-        if($this->response) {
+        if ($this->response) {
           $response = $this->response->getResponse();
         }
 
@@ -178,7 +178,7 @@ 
                 (int)$response->Response->Error->ErrorCode
             );
         }
-        if($response)
+        if ($response)
           return $this->formatResponse($response);
         else
           return $response;
@@ -195,46 +195,46 @@ 
         $patterns = [
 
             // UPS Mail Innovations tracking numbers
-            '/^MI\d{6}\d{1,22}$/',// MI 000000 00000000+
+            '/^MI\d{6}\d{1,22}$/', // MI 000000 00000000+
 
             // USPS - Certified Mail
-            '/^94071\d{17}$/',    // 9407 1000 0000 0000 0000 00
-            '/^7\d{19}$/',        // 7000 0000 0000 0000 0000
+            '/^94071\d{17}$/', // 9407 1000 0000 0000 0000 00
+            '/^7\d{19}$/', // 7000 0000 0000 0000 0000
 
             // USPS - Collect on Delivery
-            '/^93033\d{17}$/',    // 9303 3000 0000 0000 0000 00
-            '/^M\d{9}$/',         // M000 0000 00
+            '/^93033\d{17}$/', // 9303 3000 0000 0000 0000 00
+            '/^M\d{9}$/', // M000 0000 00
 
             // USPS - Global Express Guaranteed
-            '/^82\d{10}$/',       // 82 000 000 00
+            '/^82\d{10}$/', // 82 000 000 00
 
             // USPS - Priority Mail Express International
-            '/^EC\d{9}US$/',      // EC 000 000 000 US
+            '/^EC\d{9}US$/', // EC 000 000 000 US
 
             // USPS Innovations Expedited
-            '/^927\d{23}$/',      // 9270 8900 8900 8900 8900 8900 00
+            '/^927\d{23}$/', // 9270 8900 8900 8900 8900 8900 00
 
             // USPS - Priority Mail Express
-            '/^927\d{19}$/',      // 9270 1000 0000 0000 0000 00
-            '/^EA\d{9}US$/',      // EA 000 000 000 US
+            '/^927\d{19}$/', // 9270 1000 0000 0000 0000 00
+            '/^EA\d{9}US$/', // EA 000 000 000 US
 
             // USPS - Priority Mail International
-            '/^CP\d{9}US$/',      // CP 000 000 000 US
+            '/^CP\d{9}US$/', // CP 000 000 000 US
 
             // USPS - Priority Mail
-            '/^92055\d{17}$/',    // 9205 5000 0000 0000 0000 00
-            '/^14\d{18}$/',       // 1400 0000 0000 0000 0000
+            '/^92055\d{17}$/', // 9205 5000 0000 0000 0000 00
+            '/^14\d{18}$/', // 1400 0000 0000 0000 0000
 
             // USPS - Registered Mail
-            '/^92088\d{17}$/',    // 9208 8000 0000 0000 0000 00
-            '/^RA\d{9}US$/',      // RA 000 000 000 US
+            '/^92088\d{17}$/', // 9208 8000 0000 0000 0000 00
+            '/^RA\d{9}US$/', // RA 000 000 000 US
 
             // USPS - Signature Confirmation
-            '/^9202\d{16}US$/',   // 9202 1000 0000 0000 0000 00
-            '/^23\d{16}US$/',     // 2300 0000 0000 0000 0000
+            '/^9202\d{16}US$/', // 9202 1000 0000 0000 0000 00
+            '/^23\d{16}US$/', // 2300 0000 0000 0000 0000
 
             // USPS - Tracking
-            '/^94\d{20}$/',       // 9400 1000 0000 0000 0000 00
+            '/^94\d{20}$/', // 9400 1000 0000 0000 0000 00
             '/^03\d{18}$/'        // 0300 0000 0000 0000 0000
         ];