Merge branch 'feature/update-wsdls'

Stefan Ashwell · Stefan Ashwell · commit 6a3b8c7e41b5 · 2020-08-06T11:15:57.000+01:00
diff --git a/examples/rate-request.php b/examples/rate-request.php
@@ -24,7 +24,7 @@
 
 //version
 $rateRequest->Version->ServiceId = 'crs';
-$rateRequest->Version->Major = 24;
+$rateRequest->Version->Major = 28;
 $rateRequest->Version->Minor = 0;
 $rateRequest->Version->Intermediate = 0;
 
diff --git a/src/FedEx/RateService/ComplexType/CommitDetail.php b/src/FedEx/RateService/ComplexType/CommitDetail.php
@@ -11,7 +11,7 @@
  * @subpackage  Rate Service
  *
  * @property string $CommodityName
- * @property \FedEx\RateService\SimpleType\ServiceType|string $ServiceType
+ * @property string $ServiceType
  * @property ServiceDescription $ServiceDescription
  * @property \FedEx\RateService\SimpleType\ServiceOptionType|string[] $AppliedOptions
  * @property ServiceSubOptionDetail $AppliedSubOptions
@@ -61,9 +61,9 @@ public function setCommodityName($commodityName)
     }
 
     /**
-     * Deprecated: This field will be removed in a future DOM release. New code should use serviceDescription.serviceType instead.
+     * Set ServiceType
      *
-     * @param \FedEx\RateService\SimpleType\ServiceType|string $serviceType
+     * @param string $serviceType
      * @return $this
      */
     public function setServiceType($serviceType)
diff --git a/src/FedEx/RateService/ComplexType/Commodity.php b/src/FedEx/RateService/ComplexType/Commodity.php
@@ -172,7 +172,7 @@ public function setUnitPrice(Money $unitPrice)
     }
 
     /**
-     * Set CustomsValue
+     * The value of the commodity for customs purposes. The field should be the unit price multiplied by the quantity.
      *
      * @param Money $customsValue
      * @return $this
diff --git a/src/FedEx/RateService/ComplexType/ContentRecord.php b/src/FedEx/RateService/ComplexType/ContentRecord.php
@@ -4,7 +4,7 @@
 use FedEx\AbstractComplexType;
 
 /**
- * ContentRecord
+ * Details the contents of the package.
  *
  * @author      Jeremy Dunn <jeremy@jsdunn.info>
  * @package     PHP FedEx API wrapper
diff --git a/src/FedEx/RateService/ComplexType/CustomsClearanceDetail.php b/src/FedEx/RateService/ComplexType/CustomsClearanceDetail.php
@@ -121,7 +121,7 @@ public function setDocumentContent($documentContent)
     }
 
     /**
-     * Set CustomsValue
+     * This represents the total commodity value of the shipment plus the charges required by the destination country.
      *
      * @param Money $customsValue
      * @return $this
diff --git a/src/FedEx/RateService/ComplexType/EdtCommodityTax.php b/src/FedEx/RateService/ComplexType/EdtCommodityTax.php
@@ -12,6 +12,7 @@
  *
  * @property string $HarmonizedCode
  * @property EdtTaxDetail[] $Taxes
+ * @property Money $Total
 
  */
 class EdtCommodityTax extends AbstractComplexType
@@ -46,4 +47,16 @@ public function setTaxes(array $taxes)
         $this->values['Taxes'] = $taxes;
         return $this;
     }
+
+    /**
+     * Set Total
+     *
+     * @param Money $total
+     * @return $this
+     */
+    public function setTotal(Money $total)
+    {
+        $this->values['Total'] = $total;
+        return $this;
+    }
 }
diff --git a/src/FedEx/RateService/ComplexType/FreightServiceCenterDetail.php b/src/FedEx/RateService/ComplexType/FreightServiceCenterDetail.php
@@ -13,7 +13,7 @@
  * @property string $InterlineCarrierCode
  * @property string $InterlineCarrierName
  * @property int $AdditionalDays
- * @property \FedEx\RateService\SimpleType\ServiceType|string $LocalService
+ * @property string $LocalService
  * @property Distance $LocalDistance
  * @property string $LocalDuration
  * @property \FedEx\RateService\SimpleType\FreightServiceSchedulingType|string $LocalServiceScheduling
@@ -69,9 +69,9 @@ public function setAdditionalDays($additionalDays)
     }
 
     /**
-     * Service branding which may be used for local pickup or delivery, distinct from service used for line-haul of customer's shipment.
+     * Set LocalService
      *
-     * @param \FedEx\RateService\SimpleType\ServiceType|string $localService
+     * @param string $localService
      * @return $this
      */
     public function setLocalService($localService)
diff --git a/src/FedEx/RateService/ComplexType/FreightSpecialServicePayment.php b/src/FedEx/RateService/ComplexType/FreightSpecialServicePayment.php
@@ -10,7 +10,7 @@
  * @package     PHP FedEx API wrapper
  * @subpackage  Rate Service
  *
- * @property \FedEx\RateService\SimpleType\ShipmentSpecialServiceType|string $SpecialService
+ * @property string $SpecialService
  * @property \FedEx\RateService\SimpleType\FreightShipmentRoleType|string $PaymentType
 
  */
@@ -26,7 +26,7 @@ class FreightSpecialServicePayment extends AbstractComplexType
     /**
      * Identifies the special service.
      *
-     * @param \FedEx\RateService\SimpleType\ShipmentSpecialServiceType|string $specialService
+     * @param string $specialService
      * @return $this
      */
     public function setSpecialService($specialService)
diff --git a/src/FedEx/RateService/ComplexType/PackageSpecialServicesRequested.php b/src/FedEx/RateService/ComplexType/PackageSpecialServicesRequested.php
@@ -10,7 +10,7 @@
  * @package     PHP FedEx API wrapper
  * @subpackage  Rate Service
  *
- * @property \FedEx\RateService\SimpleType\PackageSpecialServiceType|string[] $SpecialServiceTypes
+ * @property string[] $SpecialServiceTypes
  * @property CodDetail $CodDetail
  * @property DangerousGoodsDetail $DangerousGoodsDetail
  * @property BatteryClassificationDetail[] $BatteryDetails
@@ -30,12 +30,12 @@ class PackageSpecialServicesRequested extends AbstractComplexType
     protected $name = 'PackageSpecialServicesRequested';
 
     /**
-     * The types of all special services requested for the enclosing shipment or package.
+     * Indicates the package special service types that are requested on this shipment. For a list of the valid package special service types, please consult your integration documentation or get the list of the available special services from the getAllSpecialServices method of the Validation Availability and Commitment service.
      *
-     * @param \FedEx\RateService\SimpleType\PackageSpecialServiceType[]|string[] $specialServiceTypes
+     * @param string $specialServiceTypes
      * @return $this
      */
-    public function setSpecialServiceTypes(array $specialServiceTypes)
+    public function setSpecialServiceTypes($specialServiceTypes)
     {
         $this->values['SpecialServiceTypes'] = $specialServiceTypes;
         return $this;
diff --git a/src/FedEx/RateService/ComplexType/ProductName.php b/src/FedEx/RateService/ComplexType/ProductName.php
@@ -25,7 +25,7 @@ class ProductName extends AbstractComplexType
     protected $name = 'ProductName';
 
     /**
-     * The type of branded, translated, and/or localized name to which this value refers.
+     * The type of name (long, medium, short, etc.) to which this value refers.
      *
      * @param string $type
      * @return $this
diff --git a/src/FedEx/RateService/ComplexType/RateReplyDetail.php b/src/FedEx/RateService/ComplexType/RateReplyDetail.php
@@ -10,9 +10,9 @@
  * @package     PHP FedEx API wrapper
  * @subpackage  Rate Service
  *
- * @property \FedEx\RateService\SimpleType\ServiceType|string $ServiceType
+ * @property string $ServiceType
  * @property ServiceDescription $ServiceDescription
- * @property \FedEx\RateService\SimpleType\PackagingType|string $PackagingType
+ * @property string $PackagingType
  * @property \FedEx\RateService\SimpleType\ServiceOptionType|string[] $AppliedOptions
  * @property ServiceSubOptionDetail $AppliedSubOptions
  * @property string $DeliveryStation
@@ -40,9 +40,9 @@ class RateReplyDetail extends AbstractComplexType
     protected $name = 'RateReplyDetail';
 
     /**
-     * Deprecated: This field will be removed in a future DOM release. New code should use serviceDescription.serviceType instead.
+     * Set ServiceType
      *
-     * @param \FedEx\RateService\SimpleType\ServiceType|string $serviceType
+     * @param string $serviceType
      * @return $this
      */
     public function setServiceType($serviceType)
@@ -66,7 +66,7 @@ public function setServiceDescription(ServiceDescription $serviceDescription)
     /**
      * Set PackagingType
      *
-     * @param \FedEx\RateService\SimpleType\PackagingType|string $packagingType
+     * @param string $packagingType
      * @return $this
      */
     public function setPackagingType($packagingType)
diff --git a/src/FedEx/RateService/ComplexType/RequestedPackageLineItem.php b/src/FedEx/RateService/ComplexType/RequestedPackageLineItem.php
@@ -4,7 +4,7 @@
 use FedEx\AbstractComplexType;
 
 /**
- * This class rationalizes RequestedPackage and RequestedPackageSummary from previous interfaces.
+ * RequestedPackageLineItem
  *
  * @author      Jeremy Dunn <jeremy@jsdunn.info>
  * @package     PHP FedEx API wrapper
@@ -24,6 +24,7 @@
  * @property CustomerReference[] $CustomerReferences
  * @property PackageSpecialServicesRequested $SpecialServicesRequested
  * @property ContentRecord[] $ContentRecords
+ * @property ShipperConveyanceDetail $ConveyanceDetail
 
  */
 class RequestedPackageLineItem extends AbstractComplexType
@@ -36,7 +37,7 @@ class RequestedPackageLineItem extends AbstractComplexType
     protected $name = 'RequestedPackageLineItem';
 
     /**
-     * Used only with INDIVIDUAL_PACKAGE, as a unique identifier of each requested package.
+     * A unique identifier of each requested package line item.
      *
      * @param int $sequenceNumber
      * @return $this
@@ -48,7 +49,7 @@ public function setSequenceNumber($sequenceNumber)
     }
 
     /**
-     * Used only with PACKAGE_GROUPS, as a unique identifier of each group of identical packages.
+     * An identifier of each group of identical packages.
      *
      * @param int $groupNumber
      * @return $this
@@ -60,7 +61,7 @@ public function setGroupNumber($groupNumber)
     }
 
     /**
-     * Used only with PACKAGE_GROUPS, as a count of packages within a group of identical packages.
+     * Used as the number or count of identical packages in a group.
      *
      * @param int $groupPackageCount
      * @return $this
@@ -84,7 +85,7 @@ public function setVariableHandlingChargeDetail(VariableHandlingChargeDetail $va
     }
 
     /**
-     * Specifies the declared value for carriage of the package. The declared value for carriage represents the maximum liability of FedEx in connection with a shipment, including, but not limited to, any loss, damage, delay, mis-delivery, nondelivery, misinformation, any failure to provide information, or mis-delivery of information relating to the package. This field is only used for INDIVIDUAL_PACKAGES and PACKAGE_GROUPS. Ignored for PACKAGE_SUMMARY, in which case totalInsuredValue and packageCount on the shipment will be used to determine this value.
+     * Specifies the declared value for carriage of the package. The declared value for carriage represents the maximum liability of FedEx in connection with a shipment, including, but not limited to, any loss, damage, delay, mis-delivery, nondelivery, misinformation, any failure to provide information, or mis-delivery of information relating to the package.
      *
      * @param Money $insuredValue
      * @return $this
@@ -96,7 +97,7 @@ public function setInsuredValue(Money $insuredValue)
     }
 
     /**
-     * Only used for INDIVIDUAL_PACKAGES and PACKAGE_GROUPS. Ignored for PACKAGE_SUMMARY, in which case total weight and packageCount on the shipment will be used to determine this value.
+     * Represents the gross weight of the package line item.
      *
      * @param Weight $weight
      * @return $this
@@ -192,7 +193,7 @@ public function setSpecialServicesRequested(PackageSpecialServicesRequested $spe
     }
 
     /**
-     * Only used for INDIVIDUAL_PACKAGES and PACKAGE_GROUPS.
+     * Details the contents of the package.
      *
      * @param ContentRecord[] $contentRecords
      * @return $this
@@ -202,4 +203,16 @@ public function setContentRecords(array $contentRecords)
         $this->values['ContentRecords'] = $contentRecords;
         return $this;
     }
+
+    /**
+     * Set ConveyanceDetail
+     *
+     * @param ShipperConveyanceDetail $conveyanceDetail
+     * @return $this
+     */
+    public function setConveyanceDetail(ShipperConveyanceDetail $conveyanceDetail)
+    {
+        $this->values['ConveyanceDetail'] = $conveyanceDetail;
+        return $this;
+    }
 }
diff --git a/src/FedEx/RateService/ComplexType/RequestedShipment.php b/src/FedEx/RateService/ComplexType/RequestedShipment.php
@@ -12,8 +12,8 @@
  *
  * @property string $ShipTimestamp
  * @property \FedEx\RateService\SimpleType\DropoffType|string $DropoffType
- * @property \FedEx\RateService\SimpleType\ServiceType|string $ServiceType
- * @property \FedEx\RateService\SimpleType\PackagingType|string $PackagingType
+ * @property string $ServiceType
+ * @property string $PackagingType
  * @property ShipmentVariationOptionDetail[] $VariationOptions
  * @property Weight $TotalWeight
  * @property Money $TotalInsuredValue
@@ -78,9 +78,9 @@ public function setDropoffType($dropoffType)
     }
 
     /**
-     * Set ServiceType
+     * This field contains the service type values, like PRIORITY_OVERNIGHT and FEDEX_GROUND.
      *
-     * @param \FedEx\RateService\SimpleType\ServiceType|string $serviceType
+     * @param string $serviceType
      * @return $this
      */
     public function setServiceType($serviceType)
@@ -90,9 +90,9 @@ public function setServiceType($serviceType)
     }
 
     /**
-     * Set PackagingType
+     * This field contains the packaging type values, like YOUR_PACKAGING and FEDEX_ENVELOPE.
      *
-     * @param \FedEx\RateService\SimpleType\PackagingType|string $packagingType
+     * @param string $packagingType
      * @return $this
      */
     public function setPackagingType($packagingType)
diff --git a/src/FedEx/RateService/ComplexType/ServiceDescription.php b/src/FedEx/RateService/ComplexType/ServiceDescription.php
@@ -10,7 +10,7 @@
  * @package     PHP FedEx API wrapper
  * @subpackage  Rate Service
  *
- * @property \FedEx\RateService\SimpleType\ServiceType|string $ServiceType
+ * @property string $ServiceType
  * @property string $Code
  * @property ProductName[] $Names
  * @property string $Description
@@ -29,7 +29,7 @@ class ServiceDescription extends AbstractComplexType
     /**
      * Set ServiceType
      *
-     * @param \FedEx\RateService\SimpleType\ServiceType|string $serviceType
+     * @param string $serviceType
      * @return $this
      */
     public function setServiceType($serviceType)
diff --git a/src/FedEx/RateService/ComplexType/ShipmentSpecialServicesRequested.php b/src/FedEx/RateService/ComplexType/ShipmentSpecialServicesRequested.php
@@ -10,7 +10,7 @@
  * @package     PHP FedEx API wrapper
  * @subpackage  Rate Service
  *
- * @property \FedEx\RateService\SimpleType\ShipmentSpecialServiceType|string[] $SpecialServiceTypes
+ * @property string[] $SpecialServiceTypes
  * @property CodDetail $CodDetail
  * @property DeliveryOnInvoiceAcceptanceDetail $DeliveryOnInvoiceAcceptanceDetail
  * @property HoldAtLocationDetail $HoldAtLocationDetail
@@ -37,12 +37,12 @@ class ShipmentSpecialServicesRequested extends AbstractComplexType
     protected $name = 'ShipmentSpecialServicesRequested';
 
     /**
-     * The types of all special services requested for the enclosing shipment (or other shipment-level transaction).
+     * Indicates the shipment special service types that are requested on this shipment. For a list of the valid shipment special service types, please consult your integration documentation or get the list of the available special services from the getAllSpecialServices method of the Validation Availability and Commitment service.
      *
-     * @param \FedEx\RateService\SimpleType\ShipmentSpecialServiceType[]|string[] $specialServiceTypes
+     * @param string $specialServiceTypes
      * @return $this
      */
-    public function setSpecialServiceTypes(array $specialServiceTypes)
+    public function setSpecialServiceTypes($specialServiceTypes)
     {
         $this->values['SpecialServiceTypes'] = $specialServiceTypes;
         return $this;
diff --git a/src/FedEx/RateService/ComplexType/ShipperConveyanceDetail.php b/src/FedEx/RateService/ComplexType/ShipperConveyanceDetail.php
@@ -0,0 +1,36 @@
+<?php
+namespace FedEx\RateService\ComplexType;
+
+use FedEx\AbstractComplexType;
+
+/**
+ * ShipperConveyanceDetail
+ *
+ * @author      Jeremy Dunn <jeremy@jsdunn.info>
+ * @package     PHP FedEx API wrapper
+ * @subpackage  Rate Service
+ *
+ * @property string $Id
+
+ */
+class ShipperConveyanceDetail extends AbstractComplexType
+{
+    /**
+     * Name of this complex type
+     *
+     * @var string
+     */
+    protected $name = 'ShipperConveyanceDetail';
+
+    /**
+     * This indicates the identifier of a conveyance, such as a trailer ID.
+     *
+     * @param string $id
+     * @return $this
+     */
+    public function setId($id)
+    {
+        $this->values['Id'] = $id;
+        return $this;
+    }
+}
diff --git a/src/FedEx/RateService/Request.php b/src/FedEx/RateService/Request.php
@@ -15,7 +15,7 @@ class Request extends AbstractRequest
     const PRODUCTION_URL = 'https://ws.fedex.com:443/web-services/rate';
     const TESTING_URL = 'https://wsbeta.fedex.com:443/web-services/rate';
 
-    protected static $wsdlFileName = 'RateService_v24.wsdl';
+    protected static $wsdlFileName = 'RateService_v28.wsdl';
             
     /**
      * Sends the RateRequest and returns the response
diff --git a/src/FedEx/RateService/SimpleType/CarrierCodeType.php b/src/FedEx/RateService/SimpleType/CarrierCodeType.php
diff --git a/src/FedEx/RateService/SimpleType/FedExLocationType.php b/src/FedEx/RateService/SimpleType/FedExLocationType.php
diff --git a/src/FedEx/RateService/SimpleType/NotificationEventType.php b/src/FedEx/RateService/SimpleType/NotificationEventType.php
diff --git a/src/FedEx/RateService/SimpleType/RegulatoryControlType.php b/src/FedEx/RateService/SimpleType/RegulatoryControlType.php
diff --git a/src/FedEx/RateService/SimpleType/ShipmentNotificationRoleType.php b/src/FedEx/RateService/SimpleType/ShipmentNotificationRoleType.php
diff --git a/src/FedEx/RateService/SimpleType/SurchargeType.php b/src/FedEx/RateService/SimpleType/SurchargeType.php
diff --git a/src/FedEx/_wsdl/RateService_v28.wsdl b/src/FedEx/_wsdl/RateService_v28.wsdl
diff --git a/util/Cli/GenerateCode/Command/GenerateCode.php b/util/Cli/GenerateCode/Command/GenerateCode.php

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`* @subpackage Rate Service`
`12`	`12`	`*`
`13`	`13`	`* @property string $CommodityName`
`14`		`- * @property \FedEx\RateService\SimpleType\ServiceType\|string $ServiceType`
	`14`	`+ * @property string $ServiceType`
`15`	`15`	`* @property ServiceDescription $ServiceDescription`
`16`	`16`	`* @property \FedEx\RateService\SimpleType\ServiceOptionType\|string[] $AppliedOptions`
`17`	`17`	`* @property ServiceSubOptionDetail $AppliedSubOptions`
`@@ -61,9 +61,9 @@ public function setCommodityName($commodityName)`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`/**`
`64`		`- * Deprecated: This field will be removed in a future DOM release. New code should use serviceDescription.serviceType instead.`
	`64`	`+ * Set ServiceType`
`65`	`65`	`*`
`66`		`- * @param \FedEx\RateService\SimpleType\ServiceType\|string $serviceType`
	`66`	`+ * @param string $serviceType`
`67`	`67`	`* @return $this`
`68`	`68`	`*/`
`69`	`69`	`public function setServiceType($serviceType)`
Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ public function setUnitPrice(Money $unitPrice)`
`172`	`172`	`}`
`173`	`173`
`174`	`174`	`/**`
`175`		`- * Set CustomsValue`
	`175`	`+ * The value of the commodity for customs purposes. The field should be the unit price multiplied by the quantity.`
`176`	`176`	`*`
`177`	`177`	`* @param Money $customsValue`
`178`	`178`	`* @return $this`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`use FedEx\AbstractComplexType;`
`5`	`5`
`6`	`6`	`/**`
`7`		`- * ContentRecord`
	`7`	`+ * Details the contents of the package.`
`8`	`8`	`*`
`9`	`9`	`* @author Jeremy Dunn <jeremy@jsdunn.info>`
`10`	`10`	`* @package PHP FedEx API wrapper`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ public function setDocumentContent($documentContent)`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`/**`
`124`		`- * Set CustomsValue`
	`124`	`+ * This represents the total commodity value of the shipment plus the charges required by the destination country.`
`125`	`125`	`*`
`126`	`126`	`* @param Money $customsValue`
`127`	`127`	`* @return $this`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ class ProductName extends AbstractComplexType`
`25`	`25`	`protected $name = 'ProductName';`
`26`	`26`
`27`	`27`	`/**`
`28`		`- * The type of branded, translated, and/or localized name to which this value refers.`
	`28`	`+ * The type of name (long, medium, short, etc.) to which this value refers.`
`29`	`29`	`*`
`30`	`30`	`* @param string $type`
`31`	`31`	`* @return $this`