6.x initial release (#637)

* Initial Release of 6.x

Add Warehouse and Distribution API.
Remove FBA Small and Light API.
Remove Authorization API.
Update Fulfillment Inbound API to v2024-03-20.
Update php-cs-fixer deprecated config properties.

* Update ObjectSerializer, SellingPartnerSDK, and Tests

Author: jasonhebert

.github/workflows/test-suite.yml

@@ -4,7 +4,7 @@ on:
   pull_request:
   push:
     branches:
-      - "5.x"
+      - "6.x"
   schedule:
     - cron:  '0 8 * * *'
 

.php-cs-fixer.php

@@ -98,7 +98,7 @@
         'no_alternative_syntax' => true,
         'no_blank_lines_after_class_opening' => true,
         'no_blank_lines_after_phpdoc' => true,
-        'no_blank_lines_before_namespace' => false,
+        'blank_lines_before_namespace' => true,
         'no_closing_tag' => true,
         'no_empty_comment' => true,
         'no_empty_phpdoc' => true,
@@ -117,9 +117,8 @@
         'no_spaces_around_offset' => true,
         'no_spaces_inside_parenthesis' => true,
         'no_superfluous_elseif' => true,
-        'no_superfluous_phpdoc_tags' => false,
-        'no_trailing_comma_in_list_call' => true,
-        'no_trailing_comma_in_singleline_array' => true,
+        'no_superfluous_phpdoc_tags' => true,
+        'no_trailing_comma_in_singleline' => true,
         'no_trailing_whitespace' => true,
         'no_trailing_whitespace_in_comment' => true,
         'no_unneeded_control_parentheses' => true,

README.md

@@ -56,12 +56,13 @@ This library is not in a stable stage yet, please use with caution.
 ### Releases
 
 | branch                                                   | maintained |
-| -------------------------------------------------------- | ---------- |
+|----------------------------------------------------------| ---------- |
 | [1.x](https://github.com/amazon-php/sp-api-sdk/tree/1.x) | 🚫         |
 | [2.x](https://github.com/amazon-php/sp-api-sdk/tree/2.x) | 🚫         |
-| [3.x](https://github.com/amazon-php/sp-api-sdk/tree/3.x) | ✅         |
-| [4.x](https://github.com/amazon-php/sp-api-sdk/tree/4.x) | ✅         |
+| [3.x](https://github.com/amazon-php/sp-api-sdk/tree/3.x) | 🚫         |
+| [4.x](https://github.com/amazon-php/sp-api-sdk/tree/4.x) | 🚫         |
 | [5.x](https://github.com/amazon-php/sp-api-sdk/tree/5.x) | ✅         |
+| [6.x](https://github.com/amazon-php/sp-api-sdk/tree/5.x) | ✅         |
 
 Version <s> [1.x](https://github.com/amazon-php/sp-api-sdk/tree/1.x) </s> is deprecated becuase of the attempt to
 make a little more sense of what Amazon is doing with using "tags" in their Open API specification.
@@ -87,17 +88,25 @@ Additionally, uuid used to generate correlation identifiers was replaced with Id
 default is using php internal uniqid(). This change allowed us to drop one additional dependency.
 Some minor adjustments were made in the template files for models/api.
 
+[6.x](https://github.com/amazon-php/sp-api-sdk/tree/6.x) comes with changes to the Fulfillment Inbound API as well as other additions and removals.
+- Additions
+  - Fulfillment Inbound API v2024-03-20
+  - Amazon Warehousing and Distribution API v2024-05-09
+- Removals
+  - Fulfillment Inbound API v0
+  - Authorization API
+  - FBA Small and Light API
+    - You can retrieve the new fees for affected products by using the Product Fees API and/or the relevant FBA and Referral Fee reports.
+
 ### Available SDKs
 
 [SellingPartnerSDK](/src/AmazonPHP/SellingPartner/SellingPartnerSDK.php) - Facade for all SDK's
 
 - [APlusSDK](/src/AmazonPHP/SellingPartner/Api/AplusContentApi/APlusSDK.php)
-- [AuthorizationSDK](/src/AmazonPHP/SellingPartner/Api/AuthorizationApi/AuthorizationSDK.php)
 - [CatalogItemSDK](/src/AmazonPHP/SellingPartner/Api/CatalogApi/CatalogItemSDK.php)
 - [FBAInboundSDK](/src/AmazonPHP/SellingPartner/Api/FbaInboundApi/FBAInboundSDK.php)
 - [FBAInventorySDK](/src/AmazonPHP/SellingPartner/Api/FbaInventoryApi/FBAInventorySDK.php)
 - [FulfillmentInboundSDK](/src/AmazonPHP/SellingPartner/Api/FbaInboundApi/FulfillmentInboundSDK.php)
-- [FBASmallAndLightSDK](/src/AmazonPHP/SellingPartner/Api/SmallAndLightApi/FBASmallAndLightSDK.php)
 - [FeedsSDK](/src/AmazonPHP/SellingPartner/Api/FeedsApi/FeedsSDK.php)
 - [FinancesSDK](/src/AmazonPHP/SellingPartner/Api/DefaultApi/FinancesSDK.php)
 - [FulfillmentOutboundSDK](/src/AmazonPHP/SellingPartner/Api/FbaOutboundApi/FulfillmentOutboundSDK.php)
@@ -118,6 +127,7 @@ Some minor adjustments were made in the template files for models/api.
 - [SolicitationsSDK](/src/AmazonPHP/SellingPartner/Api/SolicitationsApi/SolicitationsSDK.php)
 - [TokensSDK](/src/AmazonPHP/SellingPartner/Api/TokensApi/TokensSDK.php)
 - [UploadsSDK](/src/AmazonPHP/SellingPartner/Api/UploadsApi/UploadsSDK.php)
+- [WarehousingAndDistributionSDK](/src/AmazonPHP/SellingPartner/Api/AwdApi/WarehousingAndDistributionSDK.php)
 - VendorSDK
   - [VendorInvoicesSDK](/src/AmazonPHP/SellingPartner/Api/VendorPaymentsApi/VendorInvoicesSDK.php)
   - [VendorOrdersSDK](/src/AmazonPHP/SellingPartner/Api/VendorOrdersApi/VendorOrdersSDK.php)

bin/generate.sh

@@ -6,14 +6,6 @@ docker run --user "$(id -u)":"$(id -g)" --rm -v "${PWD}:/sp-api" openapitools/op
     --language-specific-primitives \\DateTimeInterface \
     --type-mappings date=\\DateTimeInterface,Date=\\DateTimeInterface,DateTime=\\DateTimeInterface
 
-docker run --user "$(id -u)":"$(id -g)" --rm -v "${PWD}:/sp-api" openapitools/openapi-generator-cli generate \
-    -i https://raw.githubusercontent.com/amzn/selling-partner-api-models/main/models/authorization-api-model/authorization.json \
-    -c /sp-api/config/generator-authorization.yaml \
-    --global-property models,apis,apiDocs=false,modelDocs=false,modelTests=false,apiTests=false,supportingFiles=false \
-    -o /sp-api \
-    --language-specific-primitives \\DateTimeInterface \
-    --type-mappings date=\\DateTimeInterface,Date=\\DateTimeInterface,DateTime=\\DateTimeInterface
-
 docker run --user "$(id -u)":"$(id -g)" --rm -v "${PWD}:/sp-api" openapitools/openapi-generator-cli generate \
     -i https://raw.githubusercontent.com/amzn/selling-partner-api-models/main/models/catalog-items-api-model/catalogItems_2022-04-01.json \
     --skip-validate-spec \
@@ -39,14 +31,6 @@ docker run --user "$(id -u)":"$(id -g)" --rm -v "${PWD}:/sp-api" openapitools/op
     --language-specific-primitives \\DateTimeInterface \
     --type-mappings date=\\DateTimeInterface,Date=\\DateTimeInterface,DateTime=\\DateTimeInterface
 
-docker run --user "$(id -u)":"$(id -g)" --rm -v "${PWD}:/sp-api" openapitools/openapi-generator-cli generate \
-    -i https://raw.githubusercontent.com/amzn/selling-partner-api-models/main/models/fba-small-and-light-api-model/fbaSmallandLight.json \
-    -c /sp-api/config/generator-fba-small-and-light.yaml \
-    --global-property models,apis,apiDocs=false,modelDocs=false,modelTests=false,apiTests=false,supportingFiles=false \
-    -o /sp-api \
-    --language-specific-primitives \\DateTimeInterface \
-    --type-mappings date=\\DateTimeInterface,Date=\\DateTimeInterface,DateTime=\\DateTimeInterface
-
 docker run --user "$(id -u)":"$(id -g)" --rm -v "${PWD}:/sp-api" openapitools/openapi-generator-cli generate \
     -i https://raw.githubusercontent.com/amzn/selling-partner-api-models/main/models/feeds-api-model/feeds_2021-06-30.json \
     -c /sp-api/config/generator-feeds.yaml \
@@ -64,7 +48,7 @@ docker run --user "$(id -u)":"$(id -g)" --rm -v "${PWD}:/sp-api" openapitools/op
     --type-mappings date=\\DateTimeInterface,Date=\\DateTimeInterface,DateTime=\\DateTimeInterface
 
 docker run --user "$(id -u)":"$(id -g)" --rm -v "${PWD}:/sp-api" openapitools/openapi-generator-cli generate \
-    -i https://raw.githubusercontent.com/amzn/selling-partner-api-models/main/models/fulfillment-inbound-api-model/fulfillmentInboundV0.json \
+    -i https://raw.githubusercontent.com/amzn/selling-partner-api-models/main/models/fulfillment-inbound-api-model/fulfillmentInbound_2024-03-20.json \
     -c /sp-api/config/generator-fulfillment-inbound.yaml \
     --global-property models,apis,apiDocs=false,modelDocs=false,modelTests=false,apiTests=false,supportingFiles=false \
     -o /sp-api \
@@ -294,3 +278,11 @@ docker run --user "$(id -u)":"$(id -g)" --rm -v "${PWD}:/sp-api" openapitools/op
     --language-specific-primitives \\DateTimeInterface \
     --type-mappings date=\\DateTimeInterface,Date=\\DateTimeInterface,DateTime=\\DateTimeInterface
 
+docker run --user "$(id -u)":"$(id -g)" --rm -v "${PWD}:/sp-api" openapitools/openapi-generator-cli generate \
+    -i https://raw.githubusercontent.com/amzn/selling-partner-api-models/main/models/amazon-warehousing-and-distribution-model/awd_2024-05-09.json \
+    -c /sp-api/config/generator-warehousing-and-distribution.yaml \
+    --global-property models,apis,apiDocs=false,modelDocs=false,modelTests=false,apiTests=false,supportingFiles=false \
+    -o /sp-api \
+    --language-specific-primitives \\DateTimeInterface \
+    --type-mappings date=\\DateTimeInterface,Date=\\DateTimeInterface,DateTime=\\DateTimeInterface
+

config/generator-fba-small-and-light.yaml

@@ -3,12 +3,12 @@ templateDir: sp-api/resources/php-amazon-selling-partner-api
 additionalProperties:
   invokerPackage: AmazonPHP\SellingPartner
   srcBasePath: src/AmazonPHP/SellingPartner
-  modelPackage: Model\Authorization
-  packageName: Authorization
+  modelPackage: Model\WarehousingAndDistribution
+  packageName: WarehousingAndDistribution
 files:
   api.mustache:
     templateType: API
-    destinationFilename: /AuthorizationSDK.php
+    destinationFilename: /WarehousingAndDistributionSDK.php
   api_interface.mustache:
     templateType: API
-    destinationFilename: /AuthorizationSDKInterface.php
+    destinationFilename: /WarehousingAndDistributionSDKInterface.php