Merge branch 'Chris-Whitmore-Associates-master'

Author: JeremyDunn

examples/create-pickup.php

@@ -17,7 +17,7 @@
 
 // Version.
 $createPickupRequest->Version->ServiceId = 'disp';
-$createPickupRequest->Version->Major = 17;
+$createPickupRequest->Version->Major = 22;
 $createPickupRequest->Version->Intermediate = 0;
 $createPickupRequest->Version->Minor = 0;
 

examples/location-service.php

@@ -19,7 +19,7 @@
 
 // Version.
 $searchLocationsRequest->Version->ServiceId = 'locs';
-$searchLocationsRequest->Version->Major = 9;
+$searchLocationsRequest->Version->Major = 12;
 $searchLocationsRequest->Version->Intermediate = 0;
 $searchLocationsRequest->Version->Minor = 0;
 

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;
 

examples/ship.php

@@ -27,7 +27,7 @@
 
 $version = new ComplexType\VersionId();
 $version
-    ->setMajor(21)
+    ->setMajor(26)
     ->setIntermediate(0)
     ->setMinor(0)
     ->setServiceId('ship');

examples/validation-availability-and-commitment-service.php

@@ -18,7 +18,7 @@
 $serviceAvailabilityRequest->ClientDetail->MeterNumber = FEDEX_METER_NUMBER;
 //version
 $serviceAvailabilityRequest->Version->ServiceId = 'vacs';
-$serviceAvailabilityRequest->Version->Major = 8;
+$serviceAvailabilityRequest->Version->Major = 14;
 $serviceAvailabilityRequest->Version->Intermediate = 0;
 $serviceAvailabilityRequest->Version->Minor = 0;
 //origin

src/FedEx/LocationsService/ComplexType/CarrierDetail.php

@@ -12,7 +12,7 @@
  *
  * @property \FedEx\LocationsService\SimpleType\CarrierCodeType|string $Carrier
  * @property \FedEx\LocationsService\SimpleType\ServiceCategoryType|string $ServiceCategory
- * @property \FedEx\LocationsService\SimpleType\ServiceType|string $ServiceType
+ * @property string $ServiceType
  * @property \FedEx\LocationsService\SimpleType\CountryRelationshipType|string $CountryRelationship
  * @property LatestDropOffDetail[] $NormalLatestDropOffDetails
  * @property LatestDropOffDetail[] $ExceptionalLatestDropOffDetails
@@ -56,7 +56,7 @@ public function setServiceCategory($serviceCategory)
     /**
      * Set ServiceType
      *
-     * @param \FedEx\LocationsService\SimpleType\ServiceType|string $serviceType
+     * @param string $serviceType
      * @return $this
      */
     public function setServiceType($serviceType)

src/FedEx/LocationsService/ComplexType/ClearanceCountryDetail.php

@@ -11,8 +11,8 @@
  * @subpackage  Locations Service
  *
  * @property string $ClearanceCountry
- * @property \FedEx\LocationsService\SimpleType\ServiceType|string[] $ServicesSupported
- * @property \FedEx\LocationsService\SimpleType\PackageSpecialServiceType|string[] $SpecialServicesSupported
+ * @property string[] $ServicesSupported
+ * @property string[] $SpecialServicesSupported
 
  */
 class ClearanceCountryDetail extends AbstractComplexType
@@ -39,22 +39,22 @@ public function setClearanceCountry($clearanceCountry)
     /**
      * Set ServicesSupported
      *
-     * @param \FedEx\LocationsService\SimpleType\ServiceType[]|string[] $servicesSupported
+     * @param string $servicesSupported
      * @return $this
      */
-    public function setServicesSupported(array $servicesSupported)
+    public function setServicesSupported($servicesSupported)
     {
         $this->values['ServicesSupported'] = $servicesSupported;
         return $this;
     }
 
     /**
-     * Identifies the constrained special services supported for the country above.
+     * Set SpecialServicesSupported
      *
-     * @param \FedEx\LocationsService\SimpleType\PackageSpecialServiceType[]|string[] $specialServicesSupported
+     * @param string $specialServicesSupported
      * @return $this
      */
-    public function setSpecialServicesSupported(array $specialServicesSupported)
+    public function setSpecialServicesSupported($specialServicesSupported)
     {
         $this->values['SpecialServicesSupported'] = $specialServicesSupported;
         return $this;

src/FedEx/LocationsService/ComplexType/ClearanceLocationDetail.php

@@ -10,10 +10,10 @@
  * @package     PHP FedEx API wrapper
  * @subpackage  Locations Service
  *
- * @property \FedEx\LocationsService\SimpleType\ServiceType|string[] $ServicesSupported
+ * @property string[] $ServicesSupported
  * @property \FedEx\LocationsService\SimpleType\ConsolidationType|string $ConsolidationType
  * @property \FedEx\LocationsService\SimpleType\DistributionClearanceType|string $ClearanceLocationType
- * @property \FedEx\LocationsService\SimpleType\PackageSpecialServiceType|string[] $SpecialServicesSupported
+ * @property string[] $SpecialServicesSupported
  * @property ClearanceCountryDetail[] $ClearanceCountries
  * @property string $ClearanceRoutingCode
 
@@ -28,12 +28,12 @@ class ClearanceLocationDetail extends AbstractComplexType
     protected $name = 'ClearanceLocationDetail';
 
     /**
-     * Services supported for clearance
+     * Services supported for clearance.
      *
-     * @param \FedEx\LocationsService\SimpleType\ServiceType[]|string[] $servicesSupported
+     * @param string $servicesSupported
      * @return $this
      */
-    public function setServicesSupported(array $servicesSupported)
+    public function setServicesSupported($servicesSupported)
     {
         $this->values['ServicesSupported'] = $servicesSupported;
         return $this;
@@ -64,12 +64,12 @@ public function setClearanceLocationType($clearanceLocationType)
     }
 
     /**
-     * Identifies the constrained special services supported at this location.
+     * Set SpecialServicesSupported
      *
-     * @param \FedEx\LocationsService\SimpleType\PackageSpecialServiceType[]|string[] $specialServicesSupported
+     * @param string $specialServicesSupported
      * @return $this
      */
-    public function setSpecialServicesSupported(array $specialServicesSupported)
+    public function setSpecialServicesSupported($specialServicesSupported)
     {
         $this->values['SpecialServicesSupported'] = $specialServicesSupported;
         return $this;

src/FedEx/LocationsService/ComplexType/LocationCapabilityDetail.php

@@ -11,7 +11,7 @@
  * @subpackage  Locations Service
  *
  * @property \FedEx\LocationsService\SimpleType\CarrierCodeType|string $CarrierCode
- * @property \FedEx\LocationsService\SimpleType\ServiceType|string $ServiceType
+ * @property string $ServiceType
  * @property \FedEx\LocationsService\SimpleType\ServiceCategoryType|string $ServiceCategory
  * @property \FedEx\LocationsService\SimpleType\LocationTransferOfPossessionType|string $TransferOfPossessionType
  * @property \FedEx\LocationsService\SimpleType\DayOfWeekType|string[] $DaysOfWeek
@@ -41,7 +41,7 @@ public function setCarrierCode($carrierCode)
     /**
      * Set ServiceType
      *
-     * @param \FedEx\LocationsService\SimpleType\ServiceType|string $serviceType
+     * @param string $serviceType
      * @return $this
      */
     public function setServiceType($serviceType)

src/FedEx/LocationsService/ComplexType/LocationDetail.php

@@ -14,10 +14,10 @@
  * @property string $StoreNumber
  * @property LocationContactAndAddress $LocationContactAndAddress
  * @property string $SpecialInstructions
- * @property string $GeographicCoordinates
  * @property string $TimeZoneOffset
  * @property \FedEx\LocationsService\SimpleType\FedExLocationType|string $LocationType
  * @property string $LocationTypeForDisplay
+ * @property LocationFieldsForInternalFedexUseDetail $InternalFieldsDetail
  * @property \FedEx\LocationsService\SimpleType\LocationAttributesType|string[] $Attributes
  * @property LocationCapabilityDetail[] $LocationCapabilities
  * @property LocationPackageLimitsDetail $PackageMaximumLimits
@@ -90,18 +90,6 @@ public function setSpecialInstructions($specialInstructions)
         return $this;
     }
 
-    /**
-     * Set GeographicCoordinates
-     *
-     * @param string $geographicCoordinates
-     * @return $this
-     */
-    public function setGeographicCoordinates($geographicCoordinates)
-    {
-        $this->values['GeographicCoordinates'] = $geographicCoordinates;
-        return $this;
-    }
-
     /**
      * Set TimeZoneOffset
      *
@@ -138,6 +126,18 @@ public function setLocationTypeForDisplay($locationTypeForDisplay)
         return $this;
     }
 
+    /**
+     * Set InternalFieldsDetail
+     *
+     * @param LocationFieldsForInternalFedexUseDetail $internalFieldsDetail
+     * @return $this
+     */
+    public function setInternalFieldsDetail(LocationFieldsForInternalFedexUseDetail $internalFieldsDetail)
+    {
+        $this->values['InternalFieldsDetail'] = $internalFieldsDetail;
+        return $this;
+    }
+
     /**
      * Set Attributes
      *