From 81bf07053e0d8c7fd9675116de94979676cd3697 Mon Sep 17 00:00:00 2001 From: "David T. Sadler" Date: Wed, 1 Mar 2017 12:06:18 +0000 Subject: [PATCH] 9.0.0 release --- CHANGELOG.md | 10 ++ .../Enums/FulfillmentInstructionsType.php | 19 +++ .../Enums/OrderFulfillmentStatus.php | 18 +++ .../Types/FulfillmentInstructionsType.php | 39 ------- .../Types/FulfillmentStartInstruction.php | 4 +- src/Fulfillment/Types/Order.php | 4 +- src/Inventory/Types/InventoryLocationFull.php | 4 +- src/Inventory/Types/Location.php | 7 ++ .../Types/LocationDetails.php} | 20 ++-- src/Order/Services/OrderBaseService.php | 2 +- src/Order/Types/GuestPurchaseOrder.php | 12 +- src/Order/Types/LineItem.php | 43 +++---- src/Order/Types/LineItem_0.php | 109 ------------------ src/Order/Types/PricingSummary_0.php | 95 --------------- src/Order/Types/PurchaseOrder.php | 16 +-- src/Order/Types/ShippingAddress_0.php | 102 ---------------- src/Sdk.php | 2 +- .../Enums/NotificationEventTypeCodeType.php | 9 ++ src/Trading/Services/TradingService.php | 2 +- .../Types/GetMyeBaySellingResponseType.php | 7 -- .../Types/GetSellerDashboardResponseType.php | 7 ++ .../Types/GroupValidationRulesType.php} | 23 ++-- src/Trading/Types/ProductIdentifiersType.php | 57 +++++++++ src/Trading/Types/RecommendationType.php | 35 ------ src/Trading/Types/RecommendationsType.php | 7 ++ .../Types/ShippingOverrideType.php} | 8 +- src/Trading/Types/SiteDefaultsType.php | 14 +++ .../FulfillmentInstructionsTypeTest.php | 11 +- .../OrderFulfillmentStatusTest.php | 11 +- .../Types/LocationDetailsTest.php} | 10 +- test/Order/Types/ShippingAddress_0Test.php | 33 ------ .../Types/GroupValidationRulesTypeTest.php} | 10 +- .../Types/ProductIdentifiersTypeTest.php} | 10 +- .../Types/ShippingOverrideTypeTest.php} | 10 +- 34 files changed, 241 insertions(+), 529 deletions(-) create mode 100644 src/Fulfillment/Enums/FulfillmentInstructionsType.php create mode 100644 src/Fulfillment/Enums/OrderFulfillmentStatus.php delete mode 100644 src/Fulfillment/Types/FulfillmentInstructionsType.php rename src/{Order/Types/Adjustment_0.php => Inventory/Types/LocationDetails.php} (68%) delete mode 100644 src/Order/Types/LineItem_0.php delete mode 100644 src/Order/Types/PricingSummary_0.php delete mode 100644 src/Order/Types/ShippingAddress_0.php rename src/{Order/Types/Amount_0.php => Trading/Types/GroupValidationRulesType.php} (68%) create mode 100644 src/Trading/Types/ProductIdentifiersType.php rename src/{Fulfillment/Types/OrderFulfillmentStatus.php => Trading/Types/ShippingOverrideType.php} (77%) rename test/Fulfillment/{Types => Enums}/FulfillmentInstructionsTypeTest.php (62%) rename test/Fulfillment/{Types => Enums}/OrderFulfillmentStatusTest.php (61%) rename test/{Order/Types/Adjustment_0Test.php => Inventory/Types/LocationDetailsTest.php} (61%) delete mode 100644 test/Order/Types/ShippingAddress_0Test.php rename test/{Order/Types/PricingSummary_0Test.php => Trading/Types/GroupValidationRulesTypeTest.php} (58%) rename test/{Order/Types/LineItem_0Test.php => Trading/Types/ProductIdentifiersTypeTest.php} (59%) rename test/{Order/Types/Amount_0Test.php => Trading/Types/ShippingOverrideTypeTest.php} (59%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 216501a20..e01c27253 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ # CHANGELOG +## 9.0.0 - 2017-03-01 + +### Breaking changes + +* Correct production URL now used for Order service. +* Support Inventory API version 1.1.0. +* Support Order API version v1_beta.4.0 +* Support Trading API version 991. +* Use correct string type for orderFulfillmentStatus and fulfillmentInstructionsType properties. + ## 8.0.0 - 2017-01-26 ### Breaking changes diff --git a/src/Fulfillment/Enums/FulfillmentInstructionsType.php b/src/Fulfillment/Enums/FulfillmentInstructionsType.php new file mode 100644 index 000000000..6270c3e81 --- /dev/null +++ b/src/Fulfillment/Enums/FulfillmentInstructionsType.php @@ -0,0 +1,19 @@ +setValues(__CLASS__, $childValues); - } -} diff --git a/src/Fulfillment/Types/FulfillmentStartInstruction.php b/src/Fulfillment/Types/FulfillmentStartInstruction.php index 6c457cd42..a54300a1e 100644 --- a/src/Fulfillment/Types/FulfillmentStartInstruction.php +++ b/src/Fulfillment/Types/FulfillmentStartInstruction.php @@ -14,7 +14,7 @@ * * @property boolean $ebaySupportedFulfillment * @property \DTS\eBaySDK\Fulfillment\Types\Address $finalDestinationAddress - * @property \DTS\eBaySDK\Fulfillment\Types\FulfillmentInstructionsType $fulfillmentInstructionsType + * @property \DTS\eBaySDK\Fulfillment\Enums\FulfillmentInstructionsType $fulfillmentInstructionsType * @property string $maxEstimatedDeliveryDate * @property string $minEstimatedDeliveryDate * @property \DTS\eBaySDK\Fulfillment\Types\ShippingStep $shippingStep @@ -38,7 +38,7 @@ class FulfillmentStartInstruction extends \DTS\eBaySDK\Types\BaseType 'elementName' => 'finalDestinationAddress' ], 'fulfillmentInstructionsType' => [ - 'type' => 'DTS\eBaySDK\Fulfillment\Types\FulfillmentInstructionsType', + 'type' => 'string', 'repeatable' => false, 'attribute' => false, 'elementName' => 'fulfillmentInstructionsType' diff --git a/src/Fulfillment/Types/Order.php b/src/Fulfillment/Types/Order.php index 5ee51e302..301064954 100644 --- a/src/Fulfillment/Types/Order.php +++ b/src/Fulfillment/Types/Order.php @@ -20,7 +20,7 @@ * @property \DTS\eBaySDK\Fulfillment\Types\FulfillmentStartInstruction[] $fulfillmentStartInstructions * @property string $lastModifiedDate * @property \DTS\eBaySDK\Fulfillment\Types\LineItem[] $lineItems - * @property \DTS\eBaySDK\Fulfillment\Types\OrderFulfillmentStatus $orderFulfillmentStatus + * @property \DTS\eBaySDK\Fulfillment\Enums\OrderFulfillmentStatus $orderFulfillmentStatus * @property string $orderId * @property \DTS\eBaySDK\Fulfillment\Enums\OrderPaymentStatusEnum $orderPaymentStatus * @property \DTS\eBaySDK\Fulfillment\Types\PaymentSummary $paymentSummary @@ -82,7 +82,7 @@ class Order extends \DTS\eBaySDK\Types\BaseType 'elementName' => 'lineItems' ], 'orderFulfillmentStatus' => [ - 'type' => 'DTS\eBaySDK\Fulfillment\Types\OrderFulfillmentStatus', + 'type' => 'string', 'repeatable' => false, 'attribute' => false, 'elementName' => 'orderFulfillmentStatus' diff --git a/src/Inventory/Types/InventoryLocationFull.php b/src/Inventory/Types/InventoryLocationFull.php index 12b26e084..e4287e8ae 100644 --- a/src/Inventory/Types/InventoryLocationFull.php +++ b/src/Inventory/Types/InventoryLocationFull.php @@ -12,7 +12,7 @@ /** * - * @property \DTS\eBaySDK\Inventory\Types\Location $location + * @property \DTS\eBaySDK\Inventory\Types\LocationDetails $location * @property string $locationAdditionalInformation * @property string $locationInstructions * @property \DTS\eBaySDK\Inventory\Enums\StoreTypeEnum[] $locationTypes @@ -30,7 +30,7 @@ class InventoryLocationFull extends \DTS\eBaySDK\Types\BaseType */ private static $propertyTypes = [ 'location' => [ - 'type' => 'DTS\eBaySDK\Inventory\Types\Location', + 'type' => 'DTS\eBaySDK\Inventory\Types\LocationDetails', 'repeatable' => false, 'attribute' => false, 'elementName' => 'location' diff --git a/src/Inventory/Types/Location.php b/src/Inventory/Types/Location.php index 09c22f987..dd94b1426 100644 --- a/src/Inventory/Types/Location.php +++ b/src/Inventory/Types/Location.php @@ -14,6 +14,7 @@ * * @property \DTS\eBaySDK\Inventory\Types\Address $address * @property \DTS\eBaySDK\Inventory\Types\GeoCoordinates $geoCoordinates + * @property string $locationId */ class Location extends \DTS\eBaySDK\Types\BaseType { @@ -32,6 +33,12 @@ class Location extends \DTS\eBaySDK\Types\BaseType 'repeatable' => false, 'attribute' => false, 'elementName' => 'geoCoordinates' + ], + 'locationId' => [ + 'type' => 'string', + 'repeatable' => false, + 'attribute' => false, + 'elementName' => 'locationId' ] ]; diff --git a/src/Order/Types/Adjustment_0.php b/src/Inventory/Types/LocationDetails.php similarity index 68% rename from src/Order/Types/Adjustment_0.php rename to src/Inventory/Types/LocationDetails.php index 9066f0e99..329054dcc 100644 --- a/src/Order/Types/Adjustment_0.php +++ b/src/Inventory/Types/LocationDetails.php @@ -8,30 +8,30 @@ * is updated. You've been warned! */ -namespace DTS\eBaySDK\Order\Types; +namespace DTS\eBaySDK\Inventory\Types; /** * - * @property \DTS\eBaySDK\Order\Types\Amount_0 $amount - * @property string $label + * @property \DTS\eBaySDK\Inventory\Types\Address $address + * @property \DTS\eBaySDK\Inventory\Types\GeoCoordinates $geoCoordinates */ -class Adjustment_0 extends \DTS\eBaySDK\Types\BaseType +class LocationDetails extends \DTS\eBaySDK\Types\BaseType { /** * @var array Properties belonging to objects of this class. */ private static $propertyTypes = [ - 'amount' => [ - 'type' => 'DTS\eBaySDK\Order\Types\Amount_0', + 'address' => [ + 'type' => 'DTS\eBaySDK\Inventory\Types\Address', 'repeatable' => false, 'attribute' => false, - 'elementName' => 'amount' + 'elementName' => 'address' ], - 'label' => [ - 'type' => 'string', + 'geoCoordinates' => [ + 'type' => 'DTS\eBaySDK\Inventory\Types\GeoCoordinates', 'repeatable' => false, 'attribute' => false, - 'elementName' => 'label' + 'elementName' => 'geoCoordinates' ] ]; diff --git a/src/Order/Services/OrderBaseService.php b/src/Order/Services/OrderBaseService.php index b85d26c54..f8ec59748 100644 --- a/src/Order/Services/OrderBaseService.php +++ b/src/Order/Services/OrderBaseService.php @@ -11,7 +11,7 @@ class OrderBaseService extends \DTS\eBaySDK\Services\BaseRestService */ protected static $endPoints = [ 'sandbox' => 'https://api.sandbox.ebay.com/buy/order', - 'production' => 'https://api.ebay.com/buy/order' + 'production' => 'https://apix.ebay.com/buy/order' ]; /** diff --git a/src/Order/Types/GuestPurchaseOrder.php b/src/Order/Types/GuestPurchaseOrder.php index 99ab6d2f0..7671b9103 100644 --- a/src/Order/Types/GuestPurchaseOrder.php +++ b/src/Order/Types/GuestPurchaseOrder.php @@ -12,13 +12,13 @@ /** * - * @property \DTS\eBaySDK\Order\Types\LineItem_0[] $lineItems - * @property \DTS\eBaySDK\Order\Types\PricingSummary_0 $pricingSummary + * @property \DTS\eBaySDK\Order\Types\LineItem[] $lineItems + * @property \DTS\eBaySDK\Order\Types\PricingSummary $pricingSummary * @property string $purchaseOrderCreationDate * @property string $purchaseOrderId * @property \DTS\eBaySDK\Order\Enums\PurchaseOrderPaymentStatusEnum $purchaseOrderPaymentStatus * @property \DTS\eBaySDK\Order\Enums\PurchaseOrderStatusEnum $purchaseOrderStatus - * @property \DTS\eBaySDK\Order\Types\Amount_0 $refundedAmount + * @property \DTS\eBaySDK\Order\Types\Amount $refundedAmount * @property \DTS\eBaySDK\Order\Types\ErrorDetailV3[] $warnings */ class GuestPurchaseOrder extends \DTS\eBaySDK\Types\BaseType @@ -28,13 +28,13 @@ class GuestPurchaseOrder extends \DTS\eBaySDK\Types\BaseType */ private static $propertyTypes = [ 'lineItems' => [ - 'type' => 'DTS\eBaySDK\Order\Types\LineItem_0', + 'type' => 'DTS\eBaySDK\Order\Types\LineItem', 'repeatable' => true, 'attribute' => false, 'elementName' => 'lineItems' ], 'pricingSummary' => [ - 'type' => 'DTS\eBaySDK\Order\Types\PricingSummary_0', + 'type' => 'DTS\eBaySDK\Order\Types\PricingSummary', 'repeatable' => false, 'attribute' => false, 'elementName' => 'pricingSummary' @@ -64,7 +64,7 @@ class GuestPurchaseOrder extends \DTS\eBaySDK\Types\BaseType 'elementName' => 'purchaseOrderStatus' ], 'refundedAmount' => [ - 'type' => 'DTS\eBaySDK\Order\Types\Amount_0', + 'type' => 'DTS\eBaySDK\Order\Types\Amount', 'repeatable' => false, 'attribute' => false, 'elementName' => 'refundedAmount' diff --git a/src/Order/Types/LineItem.php b/src/Order/Types/LineItem.php index 65f814f9d..d2f22efa1 100644 --- a/src/Order/Types/LineItem.php +++ b/src/Order/Types/LineItem.php @@ -12,16 +12,15 @@ /** * - * @property \DTS\eBaySDK\Order\Types\Amount $baseUnitPrice * @property \DTS\eBaySDK\Order\Types\Image $image * @property string $itemId * @property string $lineItemId + * @property \DTS\eBaySDK\Order\Enums\LineItemPaymentStatusEnum $lineItemPaymentStatus + * @property \DTS\eBaySDK\Order\Enums\LineItemStatusEnum $lineItemStatus * @property \DTS\eBaySDK\Order\Types\Amount $netPrice - * @property \DTS\eBaySDK\Order\Types\Promotion[] $promotions * @property integer $quantity * @property \DTS\eBaySDK\Order\Types\Seller $seller - * @property \DTS\eBaySDK\Order\Types\ShippingOption[] $shippingOptions - * @property string $shortDescription + * @property \DTS\eBaySDK\Order\Types\ShippingDetail $shippingDetail * @property string $title */ class LineItem extends \DTS\eBaySDK\Types\BaseType @@ -30,12 +29,6 @@ class LineItem extends \DTS\eBaySDK\Types\BaseType * @var array Properties belonging to objects of this class. */ private static $propertyTypes = [ - 'baseUnitPrice' => [ - 'type' => 'DTS\eBaySDK\Order\Types\Amount', - 'repeatable' => false, - 'attribute' => false, - 'elementName' => 'baseUnitPrice' - ], 'image' => [ 'type' => 'DTS\eBaySDK\Order\Types\Image', 'repeatable' => false, @@ -54,18 +47,24 @@ class LineItem extends \DTS\eBaySDK\Types\BaseType 'attribute' => false, 'elementName' => 'lineItemId' ], + 'lineItemPaymentStatus' => [ + 'type' => 'string', + 'repeatable' => false, + 'attribute' => false, + 'elementName' => 'lineItemPaymentStatus' + ], + 'lineItemStatus' => [ + 'type' => 'string', + 'repeatable' => false, + 'attribute' => false, + 'elementName' => 'lineItemStatus' + ], 'netPrice' => [ 'type' => 'DTS\eBaySDK\Order\Types\Amount', 'repeatable' => false, 'attribute' => false, 'elementName' => 'netPrice' ], - 'promotions' => [ - 'type' => 'DTS\eBaySDK\Order\Types\Promotion', - 'repeatable' => true, - 'attribute' => false, - 'elementName' => 'promotions' - ], 'quantity' => [ 'type' => 'integer', 'repeatable' => false, @@ -78,17 +77,11 @@ class LineItem extends \DTS\eBaySDK\Types\BaseType 'attribute' => false, 'elementName' => 'seller' ], - 'shippingOptions' => [ - 'type' => 'DTS\eBaySDK\Order\Types\ShippingOption', - 'repeatable' => true, - 'attribute' => false, - 'elementName' => 'shippingOptions' - ], - 'shortDescription' => [ - 'type' => 'string', + 'shippingDetail' => [ + 'type' => 'DTS\eBaySDK\Order\Types\ShippingDetail', 'repeatable' => false, 'attribute' => false, - 'elementName' => 'shortDescription' + 'elementName' => 'shippingDetail' ], 'title' => [ 'type' => 'string', diff --git a/src/Order/Types/LineItem_0.php b/src/Order/Types/LineItem_0.php deleted file mode 100644 index b93bd9dca..000000000 --- a/src/Order/Types/LineItem_0.php +++ /dev/null @@ -1,109 +0,0 @@ - [ - 'type' => 'DTS\eBaySDK\Order\Types\Image', - 'repeatable' => false, - 'attribute' => false, - 'elementName' => 'image' - ], - 'itemId' => [ - 'type' => 'string', - 'repeatable' => false, - 'attribute' => false, - 'elementName' => 'itemId' - ], - 'lineItemId' => [ - 'type' => 'string', - 'repeatable' => false, - 'attribute' => false, - 'elementName' => 'lineItemId' - ], - 'lineItemPaymentStatus' => [ - 'type' => 'string', - 'repeatable' => false, - 'attribute' => false, - 'elementName' => 'lineItemPaymentStatus' - ], - 'lineItemStatus' => [ - 'type' => 'string', - 'repeatable' => false, - 'attribute' => false, - 'elementName' => 'lineItemStatus' - ], - 'netPrice' => [ - 'type' => 'DTS\eBaySDK\Order\Types\Amount_0', - 'repeatable' => false, - 'attribute' => false, - 'elementName' => 'netPrice' - ], - 'quantity' => [ - 'type' => 'integer', - 'repeatable' => false, - 'attribute' => false, - 'elementName' => 'quantity' - ], - 'seller' => [ - 'type' => 'DTS\eBaySDK\Order\Types\Seller', - 'repeatable' => false, - 'attribute' => false, - 'elementName' => 'seller' - ], - 'shippingDetail' => [ - 'type' => 'DTS\eBaySDK\Order\Types\ShippingDetail', - 'repeatable' => false, - 'attribute' => false, - 'elementName' => 'shippingDetail' - ], - 'title' => [ - 'type' => 'string', - 'repeatable' => false, - 'attribute' => false, - 'elementName' => 'title' - ] - ]; - - /** - * @param array $values Optional properties and values to assign to the object. - */ - public function __construct(array $values = []) - { - list($parentValues, $childValues) = self::getParentValues(self::$propertyTypes, $values); - - parent::__construct($parentValues); - - if (!array_key_exists(__CLASS__, self::$properties)) { - self::$properties[__CLASS__] = array_merge(self::$properties[get_parent_class()], self::$propertyTypes); - } - - $this->setValues(__CLASS__, $childValues); - } -} diff --git a/src/Order/Types/PricingSummary_0.php b/src/Order/Types/PricingSummary_0.php deleted file mode 100644 index 5c62d7562..000000000 --- a/src/Order/Types/PricingSummary_0.php +++ /dev/null @@ -1,95 +0,0 @@ - [ - 'type' => 'DTS\eBaySDK\Order\Types\Adjustment_0', - 'repeatable' => false, - 'attribute' => false, - 'elementName' => 'adjustment' - ], - 'deliveryCost' => [ - 'type' => 'DTS\eBaySDK\Order\Types\Amount_0', - 'repeatable' => false, - 'attribute' => false, - 'elementName' => 'deliveryCost' - ], - 'deliveryDiscount' => [ - 'type' => 'DTS\eBaySDK\Order\Types\Amount_0', - 'repeatable' => false, - 'attribute' => false, - 'elementName' => 'deliveryDiscount' - ], - 'fee' => [ - 'type' => 'DTS\eBaySDK\Order\Types\Amount_0', - 'repeatable' => false, - 'attribute' => false, - 'elementName' => 'fee' - ], - 'priceDiscount' => [ - 'type' => 'DTS\eBaySDK\Order\Types\Amount_0', - 'repeatable' => false, - 'attribute' => false, - 'elementName' => 'priceDiscount' - ], - 'priceSubtotal' => [ - 'type' => 'DTS\eBaySDK\Order\Types\Amount_0', - 'repeatable' => false, - 'attribute' => false, - 'elementName' => 'priceSubtotal' - ], - 'tax' => [ - 'type' => 'DTS\eBaySDK\Order\Types\Amount_0', - 'repeatable' => false, - 'attribute' => false, - 'elementName' => 'tax' - ], - 'total' => [ - 'type' => 'DTS\eBaySDK\Order\Types\Amount_0', - 'repeatable' => false, - 'attribute' => false, - 'elementName' => 'total' - ] - ]; - - /** - * @param array $values Optional properties and values to assign to the object. - */ - public function __construct(array $values = []) - { - list($parentValues, $childValues) = self::getParentValues(self::$propertyTypes, $values); - - parent::__construct($parentValues); - - if (!array_key_exists(__CLASS__, self::$properties)) { - self::$properties[__CLASS__] = array_merge(self::$properties[get_parent_class()], self::$propertyTypes); - } - - $this->setValues(__CLASS__, $childValues); - } -} diff --git a/src/Order/Types/PurchaseOrder.php b/src/Order/Types/PurchaseOrder.php index b0ac5287e..ba5ac304d 100644 --- a/src/Order/Types/PurchaseOrder.php +++ b/src/Order/Types/PurchaseOrder.php @@ -12,15 +12,15 @@ /** * - * @property \DTS\eBaySDK\Order\Types\LineItem_0[] $lineItems + * @property \DTS\eBaySDK\Order\Types\LineItem[] $lineItems * @property \DTS\eBaySDK\Order\Types\PaymentInstrument $paymentInstrument - * @property \DTS\eBaySDK\Order\Types\PricingSummary_0 $pricingSummary + * @property \DTS\eBaySDK\Order\Types\PricingSummary $pricingSummary * @property string $purchaseOrderCreationDate * @property string $purchaseOrderId * @property \DTS\eBaySDK\Order\Enums\PurchaseOrderPaymentStatusEnum $purchaseOrderPaymentStatus * @property \DTS\eBaySDK\Order\Enums\PurchaseOrderStatusEnum $purchaseOrderStatus - * @property \DTS\eBaySDK\Order\Types\Amount_0 $refundedAmount - * @property \DTS\eBaySDK\Order\Types\ShippingAddress_0 $shippingAddress + * @property \DTS\eBaySDK\Order\Types\Amount $refundedAmount + * @property \DTS\eBaySDK\Order\Types\ShippingAddress $shippingAddress * @property \DTS\eBaySDK\Order\Types\ShippingFulfillment[] $shippingFulfillments * @property \DTS\eBaySDK\Order\Types\ErrorDetailV3[] $warnings */ @@ -31,7 +31,7 @@ class PurchaseOrder extends \DTS\eBaySDK\Types\BaseType */ private static $propertyTypes = [ 'lineItems' => [ - 'type' => 'DTS\eBaySDK\Order\Types\LineItem_0', + 'type' => 'DTS\eBaySDK\Order\Types\LineItem', 'repeatable' => true, 'attribute' => false, 'elementName' => 'lineItems' @@ -43,7 +43,7 @@ class PurchaseOrder extends \DTS\eBaySDK\Types\BaseType 'elementName' => 'paymentInstrument' ], 'pricingSummary' => [ - 'type' => 'DTS\eBaySDK\Order\Types\PricingSummary_0', + 'type' => 'DTS\eBaySDK\Order\Types\PricingSummary', 'repeatable' => false, 'attribute' => false, 'elementName' => 'pricingSummary' @@ -73,13 +73,13 @@ class PurchaseOrder extends \DTS\eBaySDK\Types\BaseType 'elementName' => 'purchaseOrderStatus' ], 'refundedAmount' => [ - 'type' => 'DTS\eBaySDK\Order\Types\Amount_0', + 'type' => 'DTS\eBaySDK\Order\Types\Amount', 'repeatable' => false, 'attribute' => false, 'elementName' => 'refundedAmount' ], 'shippingAddress' => [ - 'type' => 'DTS\eBaySDK\Order\Types\ShippingAddress_0', + 'type' => 'DTS\eBaySDK\Order\Types\ShippingAddress', 'repeatable' => false, 'attribute' => false, 'elementName' => 'shippingAddress' diff --git a/src/Order/Types/ShippingAddress_0.php b/src/Order/Types/ShippingAddress_0.php deleted file mode 100644 index f4dede9d1..000000000 --- a/src/Order/Types/ShippingAddress_0.php +++ /dev/null @@ -1,102 +0,0 @@ - [ - 'type' => 'string', - 'repeatable' => false, - 'attribute' => false, - 'elementName' => 'addressLine1' - ], - 'addressLine2' => [ - 'type' => 'string', - 'repeatable' => false, - 'attribute' => false, - 'elementName' => 'addressLine2' - ], - 'city' => [ - 'type' => 'string', - 'repeatable' => false, - 'attribute' => false, - 'elementName' => 'city' - ], - 'country' => [ - 'type' => 'string', - 'repeatable' => false, - 'attribute' => false, - 'elementName' => 'country' - ], - 'county' => [ - 'type' => 'string', - 'repeatable' => false, - 'attribute' => false, - 'elementName' => 'county' - ], - 'phoneNumber' => [ - 'type' => 'string', - 'repeatable' => false, - 'attribute' => false, - 'elementName' => 'phoneNumber' - ], - 'postalCode' => [ - 'type' => 'string', - 'repeatable' => false, - 'attribute' => false, - 'elementName' => 'postalCode' - ], - 'recipient' => [ - 'type' => 'string', - 'repeatable' => false, - 'attribute' => false, - 'elementName' => 'recipient' - ], - 'stateOrProvince' => [ - 'type' => 'string', - 'repeatable' => false, - 'attribute' => false, - 'elementName' => 'stateOrProvince' - ] - ]; - - /** - * @param array $values Optional properties and values to assign to the object. - */ - public function __construct(array $values = []) - { - list($parentValues, $childValues) = self::getParentValues(self::$propertyTypes, $values); - - parent::__construct($parentValues); - - if (!array_key_exists(__CLASS__, self::$properties)) { - self::$properties[__CLASS__] = array_merge(self::$properties[get_parent_class()], self::$propertyTypes); - } - - $this->setValues(__CLASS__, $childValues); - } -} diff --git a/src/Sdk.php b/src/Sdk.php index 3f88de2ec..7facaff81 100644 --- a/src/Sdk.php +++ b/src/Sdk.php @@ -30,7 +30,7 @@ */ class Sdk { - const VERSION = '8.0.0'; + const VERSION = '9.0.0'; /** * @var bool Controls if the SDK should enforce strict types diff --git a/src/Trading/Enums/NotificationEventTypeCodeType.php b/src/Trading/Enums/NotificationEventTypeCodeType.php index cf0ffd9f2..eb38ec0da 100644 --- a/src/Trading/Enums/NotificationEventTypeCodeType.php +++ b/src/Trading/Enums/NotificationEventTypeCodeType.php @@ -26,6 +26,7 @@ class NotificationEventTypeCodeType const C_BID_RECEIVED = 'BidReceived'; const C_BULK_DATA_EXCHANGE_JOB_COMPLETED = 'BulkDataExchangeJobCompleted'; const C_BUYER_CANCEL_REQUESTED = 'BuyerCancelRequested'; + const C_BUYER_NO_SHOW = 'BuyerNoShow'; const C_BUYER_RESPONSE_DISPUTE = 'BuyerResponseDispute'; const C_CHECKOUT_BUYER_REQUESTS_TOTAL = 'CheckoutBuyerRequestsTotal'; const C_COUNTER_OFFER_RECEIVED = 'CounterOfferReceived'; @@ -60,6 +61,8 @@ class NotificationEventTypeCodeType const C_ITEM_LOST = 'ItemLost'; const C_ITEM_MARKED_PAID = 'ItemMarkedPaid'; const C_ITEM_MARKED_SHIPPED = 'ItemMarkedShipped'; + const C_ITEM_OUT_OF_STOCK = 'ItemOutOfStock'; + const C_ITEM_READY_FOR_PICKUP = 'ItemReadyForPickup'; const C_ITEM_REMOVED_FROM_WATCH_LIST = 'ItemRemovedFromWatchList'; const C_ITEM_REVISED = 'ItemRevised'; const C_ITEM_REVISED_ADD_CHARITY = 'ItemRevisedAddCharity'; @@ -75,6 +78,11 @@ class NotificationEventTypeCodeType const C_MY_MESSAGES_HIGH_PRIORITY_MESSAGE = 'MyMessagesHighPriorityMessage'; const C_MY_MESSAGES_HIGH_PRIORITY_MESSAGE_HEADER = 'MyMessagesHighPriorityMessageHeader'; const C_NONE = 'None'; + const C_ORDER_INQUIRY_CLOSED = 'OrderInquiryClosed'; + const C_ORDER_INQUIRY_ESCALATED_TO_CASE = 'OrderInquiryEscalatedToCase'; + const C_ORDER_INQUIRY_OPENED = 'OrderInquiryOpened'; + const C_ORDER_INQUIRY_PROVIDE_SHIPMENT_INFORMATION = 'OrderInquiryProvideShipmentInformation'; + const C_ORDER_INQUIRY_REMINDER_FOR_ESCALATION = 'OrderInquiryReminderForEscalation'; const C_OUT_BID = 'OutBid'; const C_PASSWORD_CHANGED = 'PasswordChanged'; const C_PASSWORD_HINT_CHANGED = 'PasswordHintChanged'; @@ -104,4 +112,5 @@ class NotificationEventTypeCodeType const C_UNMATCHED_PAYMENT_RECEIVED = 'UnmatchedPaymentReceived'; const C_USERID_CHANGED = 'UserIDChanged'; const C_WATCHED_ITEM_ENDING_SOON = 'WatchedItemEndingSoon'; + const C_WEBNEXT_MOBILE_PHOTO_SYNC = 'WebnextMobilePhotoSync'; } diff --git a/src/Trading/Services/TradingService.php b/src/Trading/Services/TradingService.php index 4bf2e8bbc..732b0c7ff 100644 --- a/src/Trading/Services/TradingService.php +++ b/src/Trading/Services/TradingService.php @@ -12,7 +12,7 @@ class TradingService extends \DTS\eBaySDK\Trading\Services\TradingBaseService { - const API_VERSION = '983'; + const API_VERSION = '993'; /** * @param array $config Configuration option values. diff --git a/src/Trading/Types/GetMyeBaySellingResponseType.php b/src/Trading/Types/GetMyeBaySellingResponseType.php index 96b6727fb..aeb3d97a2 100644 --- a/src/Trading/Types/GetMyeBaySellingResponseType.php +++ b/src/Trading/Types/GetMyeBaySellingResponseType.php @@ -18,7 +18,6 @@ * @property \DTS\eBaySDK\Trading\Types\PaginatedOrderTransactionArrayType $SoldList * @property \DTS\eBaySDK\Trading\Types\PaginatedItemArrayType $UnsoldList * @property \DTS\eBaySDK\Trading\Types\MyeBaySellingSummaryType $Summary - * @property \DTS\eBaySDK\Trading\Types\PaginatedItemArrayType $BidList * @property \DTS\eBaySDK\Trading\Types\PaginatedOrderTransactionArrayType $DeletedFromSoldList * @property \DTS\eBaySDK\Trading\Types\PaginatedItemArrayType $DeletedFromUnsoldList */ @@ -64,12 +63,6 @@ class GetMyeBaySellingResponseType extends \DTS\eBaySDK\Trading\Types\AbstractRe 'attribute' => false, 'elementName' => 'Summary' ], - 'BidList' => [ - 'type' => 'DTS\eBaySDK\Trading\Types\PaginatedItemArrayType', - 'repeatable' => false, - 'attribute' => false, - 'elementName' => 'BidList' - ], 'DeletedFromSoldList' => [ 'type' => 'DTS\eBaySDK\Trading\Types\PaginatedOrderTransactionArrayType', 'repeatable' => false, diff --git a/src/Trading/Types/GetSellerDashboardResponseType.php b/src/Trading/Types/GetSellerDashboardResponseType.php index 78f50fd4e..0043409a4 100644 --- a/src/Trading/Types/GetSellerDashboardResponseType.php +++ b/src/Trading/Types/GetSellerDashboardResponseType.php @@ -15,6 +15,7 @@ * @property \DTS\eBaySDK\Trading\Types\SearchStandingDashboardType $SearchStanding * @property \DTS\eBaySDK\Trading\Types\SellerFeeDiscountDashboardType $SellerFeeDiscount * @property \DTS\eBaySDK\Trading\Types\PowerSellerDashboardType $PowerSellerStatus + * @property \DTS\eBaySDK\Trading\Types\PolicyComplianceDashboardType $PolicyCompliance * @property \DTS\eBaySDK\Trading\Types\BuyerSatisfactionDashboardType $BuyerSatisfaction * @property \DTS\eBaySDK\Trading\Types\SellerAccountDashboardType $SellerAccount * @property \DTS\eBaySDK\Trading\Types\PerformanceDashboardType[] $Performance @@ -43,6 +44,12 @@ class GetSellerDashboardResponseType extends \DTS\eBaySDK\Trading\Types\Abstract 'attribute' => false, 'elementName' => 'PowerSellerStatus' ], + 'PolicyCompliance' => [ + 'type' => 'DTS\eBaySDK\Trading\Types\PolicyComplianceDashboardType', + 'repeatable' => false, + 'attribute' => false, + 'elementName' => 'PolicyCompliance' + ], 'BuyerSatisfaction' => [ 'type' => 'DTS\eBaySDK\Trading\Types\BuyerSatisfactionDashboardType', 'repeatable' => false, diff --git a/src/Order/Types/Amount_0.php b/src/Trading/Types/GroupValidationRulesType.php similarity index 68% rename from src/Order/Types/Amount_0.php rename to src/Trading/Types/GroupValidationRulesType.php index 6e00a534f..d2260cff9 100644 --- a/src/Order/Types/Amount_0.php +++ b/src/Trading/Types/GroupValidationRulesType.php @@ -8,30 +8,23 @@ * is updated. You've been warned! */ -namespace DTS\eBaySDK\Order\Types; +namespace DTS\eBaySDK\Trading\Types; /** * - * @property \DTS\eBaySDK\Order\Enums\CurrencyCodeEnum $currency - * @property string $value + * @property integer $MinRequired */ -class Amount_0 extends \DTS\eBaySDK\Types\BaseType +class GroupValidationRulesType extends \DTS\eBaySDK\Types\BaseType { /** * @var array Properties belonging to objects of this class. */ private static $propertyTypes = [ - 'currency' => [ - 'type' => 'string', + 'MinRequired' => [ + 'type' => 'integer', 'repeatable' => false, 'attribute' => false, - 'elementName' => 'currency' - ], - 'value' => [ - 'type' => 'string', - 'repeatable' => false, - 'attribute' => false, - 'elementName' => 'value' + 'elementName' => 'MinRequired' ] ]; @@ -48,6 +41,10 @@ public function __construct(array $values = []) self::$properties[__CLASS__] = array_merge(self::$properties[get_parent_class()], self::$propertyTypes); } + if (!array_key_exists(__CLASS__, self::$xmlNamespaces)) { + self::$xmlNamespaces[__CLASS__] = 'xmlns="urn:ebay:apis:eBLBaseComponents"'; + } + $this->setValues(__CLASS__, $childValues); } } diff --git a/src/Trading/Types/ProductIdentifiersType.php b/src/Trading/Types/ProductIdentifiersType.php new file mode 100644 index 000000000..bca621ea3 --- /dev/null +++ b/src/Trading/Types/ProductIdentifiersType.php @@ -0,0 +1,57 @@ + [ + 'type' => 'DTS\eBaySDK\Trading\Types\GroupValidationRulesType', + 'repeatable' => false, + 'attribute' => false, + 'elementName' => 'ValidationRules' + ], + 'NameRecommendation' => [ + 'type' => 'DTS\eBaySDK\Trading\Types\NameRecommendationType', + 'repeatable' => true, + 'attribute' => false, + 'elementName' => 'NameRecommendation' + ] + ]; + + /** + * @param array $values Optional properties and values to assign to the object. + */ + public function __construct(array $values = []) + { + list($parentValues, $childValues) = self::getParentValues(self::$propertyTypes, $values); + + parent::__construct($parentValues); + + if (!array_key_exists(__CLASS__, self::$properties)) { + self::$properties[__CLASS__] = array_merge(self::$properties[get_parent_class()], self::$propertyTypes); + } + + if (!array_key_exists(__CLASS__, self::$xmlNamespaces)) { + self::$xmlNamespaces[__CLASS__] = 'xmlns="urn:ebay:apis:eBLBaseComponents"'; + } + + $this->setValues(__CLASS__, $childValues); + } +} diff --git a/src/Trading/Types/RecommendationType.php b/src/Trading/Types/RecommendationType.php index 4948d8275..b09294bbd 100644 --- a/src/Trading/Types/RecommendationType.php +++ b/src/Trading/Types/RecommendationType.php @@ -12,11 +12,6 @@ /** * - * @property string $FieldGroup - * @property string $FieldName - * @property string $RecommendationCode - * @property string[] $RecommendedValue - * @property string $Message */ class RecommendationType extends \DTS\eBaySDK\Types\BaseType { @@ -24,36 +19,6 @@ class RecommendationType extends \DTS\eBaySDK\Types\BaseType * @var array Properties belonging to objects of this class. */ private static $propertyTypes = [ - 'FieldGroup' => [ - 'type' => 'string', - 'repeatable' => false, - 'attribute' => false, - 'elementName' => 'FieldGroup' - ], - 'FieldName' => [ - 'type' => 'string', - 'repeatable' => false, - 'attribute' => false, - 'elementName' => 'FieldName' - ], - 'RecommendationCode' => [ - 'type' => 'string', - 'repeatable' => false, - 'attribute' => false, - 'elementName' => 'RecommendationCode' - ], - 'RecommendedValue' => [ - 'type' => 'string', - 'repeatable' => true, - 'attribute' => false, - 'elementName' => 'RecommendedValue' - ], - 'Message' => [ - 'type' => 'string', - 'repeatable' => false, - 'attribute' => false, - 'elementName' => 'Message' - ] ]; /** diff --git a/src/Trading/Types/RecommendationsType.php b/src/Trading/Types/RecommendationsType.php index 846957363..e1e7932a6 100644 --- a/src/Trading/Types/RecommendationsType.php +++ b/src/Trading/Types/RecommendationsType.php @@ -13,6 +13,7 @@ /** * * @property string $CategoryID + * @property \DTS\eBaySDK\Trading\Types\ProductIdentifiersType[] $ProductIdentifiers * @property \DTS\eBaySDK\Trading\Types\NameRecommendationType[] $NameRecommendation * @property boolean $Updated */ @@ -28,6 +29,12 @@ class RecommendationsType extends \DTS\eBaySDK\Types\BaseType 'attribute' => false, 'elementName' => 'CategoryID' ], + 'ProductIdentifiers' => [ + 'type' => 'DTS\eBaySDK\Trading\Types\ProductIdentifiersType', + 'repeatable' => true, + 'attribute' => false, + 'elementName' => 'ProductIdentifiers' + ], 'NameRecommendation' => [ 'type' => 'DTS\eBaySDK\Trading\Types\NameRecommendationType', 'repeatable' => true, diff --git a/src/Fulfillment/Types/OrderFulfillmentStatus.php b/src/Trading/Types/ShippingOverrideType.php similarity index 77% rename from src/Fulfillment/Types/OrderFulfillmentStatus.php rename to src/Trading/Types/ShippingOverrideType.php index 0079ffd21..efc80c5aa 100644 --- a/src/Fulfillment/Types/OrderFulfillmentStatus.php +++ b/src/Trading/Types/ShippingOverrideType.php @@ -8,12 +8,12 @@ * is updated. You've been warned! */ -namespace DTS\eBaySDK\Fulfillment\Types; +namespace DTS\eBaySDK\Trading\Types; /** * */ -class OrderFulfillmentStatus extends \DTS\eBaySDK\Types\BaseType +class ShippingOverrideType extends \DTS\eBaySDK\Types\BaseType { /** * @var array Properties belonging to objects of this class. @@ -34,6 +34,10 @@ public function __construct(array $values = []) self::$properties[__CLASS__] = array_merge(self::$properties[get_parent_class()], self::$propertyTypes); } + if (!array_key_exists(__CLASS__, self::$xmlNamespaces)) { + self::$xmlNamespaces[__CLASS__] = 'xmlns="urn:ebay:apis:eBLBaseComponents"'; + } + $this->setValues(__CLASS__, $childValues); } } diff --git a/src/Trading/Types/SiteDefaultsType.php b/src/Trading/Types/SiteDefaultsType.php index 61434a74b..dec894aae 100644 --- a/src/Trading/Types/SiteDefaultsType.php +++ b/src/Trading/Types/SiteDefaultsType.php @@ -98,6 +98,7 @@ * @property \DTS\eBaySDK\Trading\Enums\GeographicExposureCodeType $RegularSubscription * @property \DTS\eBaySDK\Trading\Enums\GeographicExposureCodeType $PremiumSubscription * @property \DTS\eBaySDK\Trading\Enums\GeographicExposureCodeType $NonSubscription + * @property boolean $PayPalRequiredForStoreOwner * @property boolean $ReviseQuantityAllowed * @property boolean $RevisePriceAllowed * @property boolean $StoreOwnerExtendedListingDurationsEnabled @@ -125,6 +126,7 @@ * @property \DTS\eBaySDK\Trading\Enums\ProductIdentiferEnabledCodeType $UPCEnabled * @property integer $MaxGranularFitmentCount * @property string $CompatibleVehicleType + * @property \DTS\eBaySDK\Trading\Enums\PaymentOptionsGroupEnabledCodeType $PaymentOptionsGroup * @property \DTS\eBaySDK\Trading\Enums\ProfileCategoryGroupCodeType $ShippingProfileCategoryGroup * @property \DTS\eBaySDK\Trading\Enums\ProfileCategoryGroupCodeType $PaymentProfileCategoryGroup * @property \DTS\eBaySDK\Trading\Enums\ProfileCategoryGroupCodeType $ReturnPolicyProfileCategoryGroup @@ -661,6 +663,12 @@ class SiteDefaultsType extends \DTS\eBaySDK\Types\BaseType 'attribute' => false, 'elementName' => 'NonSubscription' ], + 'PayPalRequiredForStoreOwner' => [ + 'type' => 'boolean', + 'repeatable' => false, + 'attribute' => false, + 'elementName' => 'PayPalRequiredForStoreOwner' + ], 'ReviseQuantityAllowed' => [ 'type' => 'boolean', 'repeatable' => false, @@ -823,6 +831,12 @@ class SiteDefaultsType extends \DTS\eBaySDK\Types\BaseType 'attribute' => false, 'elementName' => 'CompatibleVehicleType' ], + 'PaymentOptionsGroup' => [ + 'type' => 'string', + 'repeatable' => false, + 'attribute' => false, + 'elementName' => 'PaymentOptionsGroup' + ], 'ShippingProfileCategoryGroup' => [ 'type' => 'string', 'repeatable' => false, diff --git a/test/Fulfillment/Types/FulfillmentInstructionsTypeTest.php b/test/Fulfillment/Enums/FulfillmentInstructionsTypeTest.php similarity index 62% rename from test/Fulfillment/Types/FulfillmentInstructionsTypeTest.php rename to test/Fulfillment/Enums/FulfillmentInstructionsTypeTest.php index 360ca6bb2..e0887980a 100644 --- a/test/Fulfillment/Types/FulfillmentInstructionsTypeTest.php +++ b/test/Fulfillment/Enums/FulfillmentInstructionsTypeTest.php @@ -8,9 +8,9 @@ * is updated. You've been warned! */ -namespace DTS\eBaySDK\Test\Fulfillment\Types; +namespace DTS\eBaySDK\Test\Fulfillment\Enums; -use DTS\eBaySDK\Fulfillment\Types\FulfillmentInstructionsType; +use DTS\eBaySDK\Fulfillment\Enums\FulfillmentInstructionsType; class FulfillmentInstructionsTypeTest extends \PHPUnit_Framework_TestCase { @@ -23,11 +23,6 @@ protected function setUp() public function testCanBeCreated() { - $this->assertInstanceOf('\DTS\eBaySDK\Fulfillment\Types\FulfillmentInstructionsType', $this->obj); - } - - public function testExtendsBaseType() - { - $this->assertInstanceOf('\DTS\eBaySDK\Types\BaseType', $this->obj); + $this->assertInstanceOf('\DTS\eBaySDK\Fulfillment\Enums\FulfillmentInstructionsType', $this->obj); } } diff --git a/test/Fulfillment/Types/OrderFulfillmentStatusTest.php b/test/Fulfillment/Enums/OrderFulfillmentStatusTest.php similarity index 61% rename from test/Fulfillment/Types/OrderFulfillmentStatusTest.php rename to test/Fulfillment/Enums/OrderFulfillmentStatusTest.php index 2952fe5eb..786bb7581 100644 --- a/test/Fulfillment/Types/OrderFulfillmentStatusTest.php +++ b/test/Fulfillment/Enums/OrderFulfillmentStatusTest.php @@ -8,9 +8,9 @@ * is updated. You've been warned! */ -namespace DTS\eBaySDK\Test\Fulfillment\Types; +namespace DTS\eBaySDK\Test\Fulfillment\Enums; -use DTS\eBaySDK\Fulfillment\Types\OrderFulfillmentStatus; +use DTS\eBaySDK\Fulfillment\Enums\OrderFulfillmentStatus; class OrderFulfillmentStatusTest extends \PHPUnit_Framework_TestCase { @@ -23,11 +23,6 @@ protected function setUp() public function testCanBeCreated() { - $this->assertInstanceOf('\DTS\eBaySDK\Fulfillment\Types\OrderFulfillmentStatus', $this->obj); - } - - public function testExtendsBaseType() - { - $this->assertInstanceOf('\DTS\eBaySDK\Types\BaseType', $this->obj); + $this->assertInstanceOf('\DTS\eBaySDK\Fulfillment\Enums\OrderFulfillmentStatus', $this->obj); } } diff --git a/test/Order/Types/Adjustment_0Test.php b/test/Inventory/Types/LocationDetailsTest.php similarity index 61% rename from test/Order/Types/Adjustment_0Test.php rename to test/Inventory/Types/LocationDetailsTest.php index 8c8c98225..b58a411b0 100644 --- a/test/Order/Types/Adjustment_0Test.php +++ b/test/Inventory/Types/LocationDetailsTest.php @@ -8,22 +8,22 @@ * is updated. You've been warned! */ -namespace DTS\eBaySDK\Test\Order\Types; +namespace DTS\eBaySDK\Test\Inventory\Types; -use DTS\eBaySDK\Order\Types\Adjustment_0; +use DTS\eBaySDK\Inventory\Types\LocationDetails; -class Adjustment_0Test extends \PHPUnit_Framework_TestCase +class LocationDetailsTest extends \PHPUnit_Framework_TestCase { private $obj; protected function setUp() { - $this->obj = new Adjustment_0(); + $this->obj = new LocationDetails(); } public function testCanBeCreated() { - $this->assertInstanceOf('\DTS\eBaySDK\Order\Types\Adjustment_0', $this->obj); + $this->assertInstanceOf('\DTS\eBaySDK\Inventory\Types\LocationDetails', $this->obj); } public function testExtendsBaseType() diff --git a/test/Order/Types/ShippingAddress_0Test.php b/test/Order/Types/ShippingAddress_0Test.php deleted file mode 100644 index 74b1a75ce..000000000 --- a/test/Order/Types/ShippingAddress_0Test.php +++ /dev/null @@ -1,33 +0,0 @@ -obj = new ShippingAddress_0(); - } - - public function testCanBeCreated() - { - $this->assertInstanceOf('\DTS\eBaySDK\Order\Types\ShippingAddress_0', $this->obj); - } - - public function testExtendsBaseType() - { - $this->assertInstanceOf('\DTS\eBaySDK\Types\BaseType', $this->obj); - } -} diff --git a/test/Order/Types/PricingSummary_0Test.php b/test/Trading/Types/GroupValidationRulesTypeTest.php similarity index 58% rename from test/Order/Types/PricingSummary_0Test.php rename to test/Trading/Types/GroupValidationRulesTypeTest.php index 87b820468..7ce204ddd 100644 --- a/test/Order/Types/PricingSummary_0Test.php +++ b/test/Trading/Types/GroupValidationRulesTypeTest.php @@ -8,22 +8,22 @@ * is updated. You've been warned! */ -namespace DTS\eBaySDK\Test\Order\Types; +namespace DTS\eBaySDK\Test\Trading\Types; -use DTS\eBaySDK\Order\Types\PricingSummary_0; +use DTS\eBaySDK\Trading\Types\GroupValidationRulesType; -class PricingSummary_0Test extends \PHPUnit_Framework_TestCase +class GroupValidationRulesTypeTest extends \PHPUnit_Framework_TestCase { private $obj; protected function setUp() { - $this->obj = new PricingSummary_0(); + $this->obj = new GroupValidationRulesType(); } public function testCanBeCreated() { - $this->assertInstanceOf('\DTS\eBaySDK\Order\Types\PricingSummary_0', $this->obj); + $this->assertInstanceOf('\DTS\eBaySDK\Trading\Types\GroupValidationRulesType', $this->obj); } public function testExtendsBaseType() diff --git a/test/Order/Types/LineItem_0Test.php b/test/Trading/Types/ProductIdentifiersTypeTest.php similarity index 59% rename from test/Order/Types/LineItem_0Test.php rename to test/Trading/Types/ProductIdentifiersTypeTest.php index 1acb39c69..b349b5098 100644 --- a/test/Order/Types/LineItem_0Test.php +++ b/test/Trading/Types/ProductIdentifiersTypeTest.php @@ -8,22 +8,22 @@ * is updated. You've been warned! */ -namespace DTS\eBaySDK\Test\Order\Types; +namespace DTS\eBaySDK\Test\Trading\Types; -use DTS\eBaySDK\Order\Types\LineItem_0; +use DTS\eBaySDK\Trading\Types\ProductIdentifiersType; -class LineItem_0Test extends \PHPUnit_Framework_TestCase +class ProductIdentifiersTypeTest extends \PHPUnit_Framework_TestCase { private $obj; protected function setUp() { - $this->obj = new LineItem_0(); + $this->obj = new ProductIdentifiersType(); } public function testCanBeCreated() { - $this->assertInstanceOf('\DTS\eBaySDK\Order\Types\LineItem_0', $this->obj); + $this->assertInstanceOf('\DTS\eBaySDK\Trading\Types\ProductIdentifiersType', $this->obj); } public function testExtendsBaseType() diff --git a/test/Order/Types/Amount_0Test.php b/test/Trading/Types/ShippingOverrideTypeTest.php similarity index 59% rename from test/Order/Types/Amount_0Test.php rename to test/Trading/Types/ShippingOverrideTypeTest.php index e81abea11..adf102302 100644 --- a/test/Order/Types/Amount_0Test.php +++ b/test/Trading/Types/ShippingOverrideTypeTest.php @@ -8,22 +8,22 @@ * is updated. You've been warned! */ -namespace DTS\eBaySDK\Test\Order\Types; +namespace DTS\eBaySDK\Test\Trading\Types; -use DTS\eBaySDK\Order\Types\Amount_0; +use DTS\eBaySDK\Trading\Types\ShippingOverrideType; -class Amount_0Test extends \PHPUnit_Framework_TestCase +class ShippingOverrideTypeTest extends \PHPUnit_Framework_TestCase { private $obj; protected function setUp() { - $this->obj = new Amount_0(); + $this->obj = new ShippingOverrideType(); } public function testCanBeCreated() { - $this->assertInstanceOf('\DTS\eBaySDK\Order\Types\Amount_0', $this->obj); + $this->assertInstanceOf('\DTS\eBaySDK\Trading\Types\ShippingOverrideType', $this->obj); } public function testExtendsBaseType()