gabrielbull / php-ups-api

src/Entity/POA.php

Spacing +2 added lines, -2 removed lines

@@ -8,8 +8,8 @@
 
 class POA implements NodeInterface
 {
-    const POA_ONE_TIME = '1';  // One Time POA
-    const POA_BLANKET  = '2';  // Blanket POA
+    const POA_ONE_TIME = '1'; // One Time POA
+    const POA_BLANKET  = '2'; // Blanket POA
 
     /**
      * @var string

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/Tracking.php

Spacing +18 added lines, -18 removed lines

@@ -186,46 +186,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
         ];
 

src/TimeInTransit.php

Doc Comments +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
      *
      * @throws Exception
      *
-     * @return TimeInTransitRequest
+     * @return TimeInTransitResponse
      */
     public function getTimeInTransit(TimeInTransitRequest $shipment)
     {

src/Request.php

Spacing +5 added lines, -5 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(),
             ]);
@@ -141,7 +141,7 @@ 
 
                         return $responseInstance->setText($body)->setResponse($xml);
                     } elseif ($xml->Response->ResponseStatusCode == 0) {
-                        throw new InvalidResponseException('Failure: ' . $xml->Response->Error->ErrorDescription . ' (' . $xml->Response->Error->ErrorCode . ')');
+                        throw new InvalidResponseException('Failure: '.$xml->Response->Error->ErrorDescription.' ('.$xml->Response->Error->ErrorCode.')');
                     }
                 } else {
                     throw new InvalidResponseException('Failure: response is in an unexpected format.');
@@ -153,7 +153,7 @@ 
                 'endpointurl' => $this->getEndpointUrl(),
             ]);
 
-            throw new RequestException('Failure: ' . $e->getMessage());
+            throw new RequestException('Failure: '.$e->getMessage());
         }
     }
 

src/Entity/ItemizedPaymentInformation.php

Doc Comments +2 added lines, -2 removed lines

@@ -19,7 +19,7 @@ 
     }
 
     /**
-     * @return transportationShipmentCharge
+     * @return ShipmentCharge
      */
     public function getTransportationShipmentCharge()
     {
@@ -43,7 +43,7 @@ 
     }
 
     /**
-     * @return dutiesAndTaxesShipmentCharge
+     * @return ShipmentCharge
      */
     public function getDutiesAndTaxesShipmentCharge()
     {

Indentation +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
     public function setShipmentCharge(ShipmentCharge $shipmentCharge)
     {
         if ($shipmentCharge->getType() == ShipmentCharge::SHIPMENT_CHARGE_TYPE_TRANSPORTATION) { 
-           $this->transportationShipmentCharge = $shipmentCharge;
+            $this->transportationShipmentCharge = $shipmentCharge;
         } else if ($shipmentCharge->getType() == ShipmentCharge::SHIPMENT_CHARGE_TYPE_DUTIES) { 
             $this->dutiesAndTaxesShipmentCharge = $shipmentCharge;
         } else {

src/Shipping.php

Indentation +45 added lines, -45 removed lines

@@ -310,60 +310,60 @@
 
             for ($shipmentChargeRec = 1; $shipmentChargeRec <= 2; $shipmentChargeRec++)  {
                
-               if ($shipmentChargeRec == 1) { 
-                  $rec = $shipment->getItemizedPaymentInformation()->getTransportationShipmentCharge(); 
-                  if ($rec == null) continue; 
-                  $node = $paymentNode->appendChild($xml->createElement('ShipmentCharge'));
-                  $node->appendChild($xml->createElement('Type', \Ups\Entity\ShipmentCharge::SHIPMENT_CHARGE_TYPE_TRANSPORTATION));
-               } else {
-                  $rec = $shipment->getItemizedPaymentInformation()->getDutiesAndTaxesShipmentCharge(); 
-                  if ($rec == null) continue; 
-                  $node = $paymentNode->appendChild($xml->createElement('ShipmentCharge'));
-                  $node->appendChild($xml->createElement('Type', \Ups\Entity\ShipmentCharge::SHIPMENT_CHARGE_TYPE_DUTIES));
-               }
+                if ($shipmentChargeRec == 1) { 
+                    $rec = $shipment->getItemizedPaymentInformation()->getTransportationShipmentCharge(); 
+                    if ($rec == null) continue; 
+                    $node = $paymentNode->appendChild($xml->createElement('ShipmentCharge'));
+                    $node->appendChild($xml->createElement('Type', \Ups\Entity\ShipmentCharge::SHIPMENT_CHARGE_TYPE_TRANSPORTATION));
+                } else {
+                    $rec = $shipment->getItemizedPaymentInformation()->getDutiesAndTaxesShipmentCharge(); 
+                    if ($rec == null) continue; 
+                    $node = $paymentNode->appendChild($xml->createElement('ShipmentCharge'));
+                    $node->appendChild($xml->createElement('Type', \Ups\Entity\ShipmentCharge::SHIPMENT_CHARGE_TYPE_DUTIES));
+                }
                
-               if ($rec->getBillShipper()) {
-                   $node = $node->appendChild($xml->createElement('BillShipper'));
+                if ($rec->getBillShipper()) {
+                    $node = $node->appendChild($xml->createElement('BillShipper'));
    
-                   $billShipper = $rec->getBillShipper();
-                   if (isset($billShipper) && $rec->getBillShipper()->getAccountNumber()) {
-                       $node->appendChild($xml->createElement('AccountNumber', $rec->getBillShipper()->getAccountNumber()));
-                   } elseif (isset($billShipper) && $rec->getBillShipper()->getCreditCard()) {
-                       $ccNode = $node->appendChild($xml->createElement('CreditCard'));
-                       $ccNode->appendChild($xml->createElement('Type', $rec->getBillShipper()->getCreditCard()->getType()));
-                       $ccNode->appendChild($xml->createElement('Number', $rec->getBillShipper()->getCreditCard()->getNumber()));
-                       $ccNode->appendChild($xml->createElement('ExpirationDate', $rec->getBillShipper()->getCreditCard()->getExpirationDate()));
+                    $billShipper = $rec->getBillShipper();
+                    if (isset($billShipper) && $rec->getBillShipper()->getAccountNumber()) {
+                        $node->appendChild($xml->createElement('AccountNumber', $rec->getBillShipper()->getAccountNumber()));
+                    } elseif (isset($billShipper) && $rec->getBillShipper()->getCreditCard()) {
+                        $ccNode = $node->appendChild($xml->createElement('CreditCard'));
+                        $ccNode->appendChild($xml->createElement('Type', $rec->getBillShipper()->getCreditCard()->getType()));
+                        $ccNode->appendChild($xml->createElement('Number', $rec->getBillShipper()->getCreditCard()->getNumber()));
+                        $ccNode->appendChild($xml->createElement('ExpirationDate', $rec->getBillShipper()->getCreditCard()->getExpirationDate()));
    
-                       if ($rec->getBillShipper()->getCreditCard()->getSecurityCode()) {
-                           $ccNode->appendChild($xml->createElement('SecurityCode', $rec->getBillShipper()->getCreditCard()->getSecurityCode()));
-                       }
+                        if ($rec->getBillShipper()->getCreditCard()->getSecurityCode()) {
+                            $ccNode->appendChild($xml->createElement('SecurityCode', $rec->getBillShipper()->getCreditCard()->getSecurityCode()));
+                        }
    
-                       if ($rec->getBillShipper()->getCreditCard()->getAddress()) {
-                           $ccNode->appendChild($rec->getBillShipper()->getCreditCard()->getAddress()->toNode($xml));
-                       }
-                   }
-               } else if ($rec->getBillReceiver()) {
-                   // TODO not done yet 
-               } elseif ($rec->getBillThirdParty()) {
-                   $node = $node->appendChild($xml->createElement('BillThirdParty'));
-                   $btpNode = $node->appendChild($xml->createElement('BillThirdPartyShipper'));
-                   $btpNode->appendChild($xml->createElement('AccountNumber', $rec->getBillThirdParty()->getAccountNumber()));
+                        if ($rec->getBillShipper()->getCreditCard()->getAddress()) {
+                            $ccNode->appendChild($rec->getBillShipper()->getCreditCard()->getAddress()->toNode($xml));
+                        }
+                    }
+                } else if ($rec->getBillReceiver()) {
+                    // TODO not done yet 
+                } elseif ($rec->getBillThirdParty()) {
+                    $node = $node->appendChild($xml->createElement('BillThirdParty'));
+                    $btpNode = $node->appendChild($xml->createElement('BillThirdPartyShipper'));
+                    $btpNode->appendChild($xml->createElement('AccountNumber', $rec->getBillThirdParty()->getAccountNumber()));
    
-                   $tpNode = $btpNode->appendChild($xml->createElement('ThirdParty'));
-                   $addressNode = $tpNode->appendChild($xml->createElement('Address'));
+                    $tpNode = $btpNode->appendChild($xml->createElement('ThirdParty'));
+                    $addressNode = $tpNode->appendChild($xml->createElement('Address'));
    
-                   $thirdPartAddress = $rec->getBillThirdParty()->getThirdPartyAddress();
-                   if (isset($thirdPartAddress) && $rec->getBillThirdParty()->getThirdPartyAddress()->getPostalCode()) {
-                       $addressNode->appendChild($xml->createElement('PostalCode', $rec->getBillThirdParty()->getThirdPartyAddress()->getPostalCode()));
-                   }
+                    $thirdPartAddress = $rec->getBillThirdParty()->getThirdPartyAddress();
+                    if (isset($thirdPartAddress) && $rec->getBillThirdParty()->getThirdPartyAddress()->getPostalCode()) {
+                        $addressNode->appendChild($xml->createElement('PostalCode', $rec->getBillThirdParty()->getThirdPartyAddress()->getPostalCode()));
+                    }
    
-                   $addressNode->appendChild($xml->createElement('CountryCode', $rec->getBillThirdParty()->getThirdPartyAddress()->getCountryCode()));
-               } elseif ($rec->getConsigneeBilled()) {
-                   $node->appendChild($xml->createElement('ConsigneeBilled'));
-               }
+                    $addressNode->appendChild($xml->createElement('CountryCode', $rec->getBillThirdParty()->getThirdPartyAddress()->getCountryCode()));
+                } elseif ($rec->getConsigneeBilled()) {
+                    $node->appendChild($xml->createElement('ConsigneeBilled'));
+                }
             }  
             if ($shipment->getItemizedPaymentInformation()->getSplitDutyVATIndicator()) { 
-               $paymentNode->appendChild($xml->createElement('SplitDutyVATIndicator'));
+                $paymentNode->appendChild($xml->createElement('SplitDutyVATIndicator'));
             }
         }
 

Spacing +1 added lines, -1 removed lines

@@ -308,7 +308,7 @@
         } elseif ($shipment->getItemizedPaymentInformation()) {
             $paymentNode = $shipmentNode->appendChild($xml->createElement('ItemizedPaymentInformation'));
 
-            for ($shipmentChargeRec = 1; $shipmentChargeRec <= 2; $shipmentChargeRec++)  {
+            for ($shipmentChargeRec = 1; $shipmentChargeRec <= 2; $shipmentChargeRec++) {
                
                if ($shipmentChargeRec == 1) { 
                   $rec = $shipment->getItemizedPaymentInformation()->getTransportationShipmentCharge(); 

Braces +6 added lines, -2 removed lines

@@ -312,12 +312,16 @@
                
                if ($shipmentChargeRec == 1) { 
                   $rec = $shipment->getItemizedPaymentInformation()->getTransportationShipmentCharge(); 
-                  if ($rec == null) continue; 
+                  if ($rec == null) {
+                      continue;
+                  }
                   $node = $paymentNode->appendChild($xml->createElement('ShipmentCharge'));
                   $node->appendChild($xml->createElement('Type', \Ups\Entity\ShipmentCharge::SHIPMENT_CHARGE_TYPE_TRANSPORTATION));
                } else {
                   $rec = $shipment->getItemizedPaymentInformation()->getDutiesAndTaxesShipmentCharge(); 
-                  if ($rec == null) continue; 
+                  if ($rec == null) {
+                      continue;
+                  }
                   $node = $paymentNode->appendChild($xml->createElement('ShipmentCharge'));
                   $node->appendChild($xml->createElement('Type', \Ups\Entity\ShipmentCharge::SHIPMENT_CHARGE_TYPE_DUTIES));
                }