fix RatePackage setField value and clean-up demos

GeNyaa · Sep 8, 2022 · c3c07ea · c3c07ea
1 parent 1396dbc
commit c3c07ea
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 53 deletions.
diff --git a/demos/domestic_rate.php b/demos/domestic_rate.php
@@ -11,19 +11,19 @@
 //$rate->setTestMode(true);
 
 // Create new package object and assign the properties
-// apartently the order you assign them is important so make sure
+// apparently the order you assign them is important so make sure
 // to set them as the example below
 // set the RatePackage for more info about the constants
-$package = new RatePackage();
-$package->setService(RatePackage::SERVICE_FIRST_CLASS);
-$package->setFirstClassMailType(RatePackage::MAIL_TYPE_LETTER);
-$package->setZipOrigination(91601);
-$package->setZipDestination(91730);
-$package->setPounds(0);
-$package->setOunces(3.5);
-$package->setContainer('');
-$package->setSize(RatePackage::SIZE_REGULAR);
-$package->setField('Machinable', true);
+$package = (new RatePackage())
+    ->setService(RatePackage::SERVICE_FIRST_CLASS)
+    ->setFirstClassMailType(RatePackage::MAIL_TYPE_LETTER)
+    ->setZipOrigination(91601)
+    ->setZipDestination(91730)
+    ->setPounds(0)
+    ->setOunces(3.5)
+    ->setContainer('')
+    ->setSize(RatePackage::SIZE_REGULAR)
+    ->setField('Machinable', true);
 
 // add the package to the rate stack
 $rate->addPackage($package);

diff --git a/demos/international_express_label.php b/demos/international_express_label.php
@@ -26,9 +26,7 @@
 // Perform the request and return result
 $label->createLabel();
 
-//print_r($label->getArrayResponse());
 print_r($label->getPostData());
-//var_dump($label->isError());
 
 // See if it was successful
 if ($label->isSuccess()) {

diff --git a/demos/international_rate.php b/demos/international_rate.php
@@ -8,27 +8,27 @@
 $rate->setInternationalCall(true);
 $rate->addExtraOption('Revision', 2);
 
-$package = new RatePackage;
-$package->setPounds(15.12345678);
-$package->setOunces(0);
-$package->setField('Machinable', 'True');
-$package->setField('MailType', 'Package');
-$package->setField('GXG', array(
-  'POBoxFlag' => 'Y',
-  'GiftFlag' => 'Y'
-));
-$package->setField('ValueOfContents', 200);
-$package->setField('Country', 'Australia');
-$package->setField('Container', 'RECTANGULAR');
-$package->setField('Size', 'LARGE');
-$package->setField('Width', 10);
-$package->setField('Length', 15);
-$package->setField('Height', 10);
-$package->setField('Girth', 0);
-$package->setField('OriginZip', 18701);
-$package->setField('CommercialFlag', 'N');
-$package->setField('AcceptanceDateTime', '2016-07-05T13:15:00-06:00');
-$package->setField('DestinationPostalCode', '2046');
+$package = (new RatePackage)
+    ->setPounds(15.12345678)
+    ->setOunces(0)
+    ->setField('Machinable', 'True')
+    ->setField('MailType', 'Package')
+    ->setField('GXG', [
+        'POBoxFlag' => 'Y',
+        'GiftFlag' => 'Y'
+    ])
+    ->setField('ValueOfContents', 200)
+    ->setField('Country', 'Australia')
+    ->setField('Container', 'RECTANGULAR')
+    ->setField('Size', 'LARGE')
+    ->setField('Width', 10)
+    ->setField('Length', 15)
+    ->setField('Height', 10)
+    ->setField('Girth', 0)
+    ->setField('OriginZip', 18701)
+    ->setField('CommercialFlag', 'N')
+    ->setField('AcceptanceDateTime', '2016-07-05T13:15:00-06:00')
+    ->setField('DestinationPostalCode', '2046');
 
 // add the package to the rate stack
 $rate->addPackage($package);

diff --git a/demos/open_label.php b/demos/open_label.php
@@ -12,9 +12,7 @@
 // Perform the request and return result
 $label->createLabel();
 
-//print_r($label->getArrayResponse());
 print_r($label->getPostData());
-//var_dump($label->isError());
 
 // See if it was successful
 if ($label->isSuccess()) {

diff --git a/demos/priority_label.php b/demos/priority_label.php
@@ -13,20 +13,11 @@
 $label->setWeightOunces(1);
 $label->setField(36, 'LabelDate', '03/12/2014');
 
-//$label->setField(32, 'SeparateReceiptPage', 'true');
-
 // Perform the request and return result
 $label->createLabel();
 
-//print_r($label->getArrayResponse());
-//print_r($label->getPostData());
-//var_dump($label->isError());
-
 // See if it was successful
 if ($label->isSuccess()) {
-    //echo 'Done';
-    //echo "\n Confirmation:" . $label->getConfirmationNumber();
-
     $label = $label->getLabelContents();
 
     if ($label) {

diff --git a/demos/zipcodelookup.php b/demos/zipcodelookup.php
@@ -11,12 +11,12 @@
 // Create new address object and assign the properties
 // apartently the order you assign them is important so make sure
 // to set them as the example below
-$address = new \USPS\Address();
-$address->setFirmName('Apartment');
-$address->setApt('100');
-$address->setAddress('9200 Milliken Ave');
-$address->setCity('Rancho Cucomonga');
-$address->setState('CA');
+$address = (new \USPS\Address())
+    ->setFirmName('Apartment')
+    ->setApt('100')
+    ->setAddress('9200 Milliken Ave')
+    ->setCity('Rancho Cucomonga')
+    ->setState('CA');
 
 // Add the address object to the zipcode lookup class
 $zipcode->addAddress($address);

diff --git a/src/RatePackage.php b/src/RatePackage.php
@@ -168,11 +168,11 @@ public function setSize(string|int $value): self
      * Add an element to the stack.
      *
      * @param string|int $key
-     * @param string|int $value
+     * @param mixed $value
      *
      * @return RatePackage
      */
-    public function setField(string|int $key, string|int $value): self
+    public function setField(string|int $key, mixed $value): self
     {
         $this->packageInfo[ucwords($key)] = $value;