Fixed SDK namespaces

amazon-php · May 31, 2021 · ce2f6f8 · ce2f6f8
1 parent 48d38a8
commit ce2f6f8
Show file tree

Hide file tree

Showing 165 changed files with 1,189 additions and 511 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -5,10 +5,12 @@
 /docs export-ignore
 /tests export-ignore
 /tools export-ignore
+/config export-ignore
 
 /.php_cs export-ignore
 /composer.lock export-ignore
 /README.md export-ignore
+/psalm.xml export-ignore
 
 /.gitattributes export-ignore
 /.gitignore export-ignore
diff --git a/bin/generate.sh b/bin/generate.sh
@@ -18,7 +18,7 @@ docker run --rm -v "${PWD}:/sp-api" openapitools/openapi-generator-cli generate
 
 docker run --rm -v "${PWD}:/sp-api" openapitools/openapi-generator-cli generate \
     -i https://raw.githubusercontent.com/amzn/selling-partner-api-models/main/models/fba-inbound-eligibility-api-model/fbaInbound.json \
-    -c /sp-api/config/generator-fba-inbound-eligibility.yaml \
+    -c /sp-api/config/generator-fba-inbound.yaml \
     --global-property models,apis,apiDocs=false,modelDocs=false,modelTests=false,apiTests=false,supportingFiles=false \
     -o /sp-api
 

diff --git a/composer.json b/composer.json
@@ -34,12 +34,18 @@
         "psr-4": { "AmazonPHP\\Test\\" : "test/" }
     },
     "scripts": {
+        "clean": [
+            "rm -rf src/AmazonPHP/SellingPartner/API",
+            "rm -rf src/AmazonPHP/SellingPartner/Model"
+        ],
         "generate": [
             "Composer\\Config::disableProcessTimeout",
+            "@clean",
             "bin/generate.sh",
             "@rector:process:force",
             "@rector:process:force",
-            "@cs:php:fix"
+            "@cs:php:fix",
+            "@cs:php:fix:namespaces"
         ],
         "build": [
             "@static:analyze"
@@ -62,6 +68,24 @@
         ],
         "post-update-cmd": [
             "@tools:install"
+        ],
+        "cs:php:fix:namespaces": [
+            "tools/vendor/bin/psalm-refactor --move \"AmazonPHP\\SellingPartner\\Api\\AplusContentApi\\APlusSDK\" --into \"AmazonPHP\\SellingPartner\\Api\"",
+            "rm -rf src/AmazonPHP/SellingPartner/Api/AplusContentApi",
+            "tools/vendor/bin/psalm-refactor --move \"AmazonPHP\\SellingPartner\\Api\\AuthorizationApi\\AuthorizationSDK\" --into \"AmazonPHP\\SellingPartner\\Api\"",
+            "rm -rf src/AmazonPHP/SellingPartner/Api/AuthorizationApi",
+            "tools/vendor/bin/psalm-refactor --move \"AmazonPHP\\SellingPartner\\Api\\CatalogApi\\CatalogItemSDK\" --into \"AmazonPHP\\SellingPartner\\Api\"",
+            "rm -rf src/AmazonPHP/SellingPartner/Api/CatalogApi",
+            "tools/vendor/bin/psalm-refactor --move \"AmazonPHP\\SellingPartner\\Api\\FbaInboundApi\\FBAInboundSDK\" --into \"AmazonPHP\\SellingPartner\\Api\"",
+            "rm -rf src/AmazonPHP/SellingPartner/Api/FbaInboundApi",
+            "tools/vendor/bin/psalm-refactor --move \"AmazonPHP\\SellingPartner\\Api\\FbaInventoryApi\\FBAInventorySDK\" --into \"AmazonPHP\\SellingPartner\\Api\"",
+            "rm -rf src/AmazonPHP/SellingPartner/Api/FbaInventoryApi",
+            "tools/vendor/bin/psalm-refactor --move \"AmazonPHP\\SellingPartner\\Api\\OrdersV0Api\\OrdersSDK\" --into \"AmazonPHP\\SellingPartner\\Api\"",
+            "rm -rf src/AmazonPHP/SellingPartner/Api/OrdersV0Api",
+            "tools/vendor/bin/psalm-refactor --move \"AmazonPHP\\SellingPartner\\Api\\ReportsApi\\ReportsSDK\" --into \"AmazonPHP\\SellingPartner\\Api\"",
+            "rm -rf src/AmazonPHP/SellingPartner/Api/ReportsApi",
+            "tools/vendor/bin/psalm-refactor --move \"AmazonPHP\\SellingPartner\\Api\\TokensApi\\TokensSDK\" --into \"AmazonPHP\\SellingPartner\\Api\"",
+            "rm -rf src/AmazonPHP/SellingPartner/Api/TokensApi"
         ]
     }
 }
diff --git a/...ig/generator-fba-inbound-eligibility.yaml → config/generator-fba-inbound.yaml b/...ig/generator-fba-inbound-eligibility.yaml → config/generator-fba-inbound.yaml
@@ -4,9 +4,9 @@ additionalProperties:
   invokerPackage: AmazonPHP\SellingPartner
   srcBasePath: src/AmazonPHP/SellingPartner
   variableNamingConvention: camelCase
-  modelPackage: Model\FBAInboundEligibility
-  packageName: FBAInboundEligibilitySDK
+  modelPackage: Model\FBAInbound
+  packageName: FBAInboundSDK
 files:
   api.mustache:
     templateType: API
-    destinationFilename: /FBAInboundEligibilitySDK.php
+    destinationFilename: /FBAInboundSDK.php
diff --git a/psalm.xml b/psalm.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<psalm
+    errorLevel="7"
+    resolveFromConfigFile="true"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="https://getpsalm.org/schema/config"
+    xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+>
+    <projectFiles>
+        <directory name="src" />
+        <ignoreFiles>
+            <directory name="vendor" />
+        </ignoreFiles>
+    </projectFiles>
+</psalm>
diff --git a/resources/php-amazon-selling-partner-api/model.mustache b/resources/php-amazon-selling-partner-api/model.mustache
@@ -27,7 +27,7 @@ use \ArrayAccess;
 {{/parentSchema}}
 {{/isEnum}}
 use \{{invokerPackage}}\ObjectSerializer;
-use \{{invokerPackage}}\Model\ModelInterface;
+use \{{invokerPackage}}\ModelInterface;
 
 /**
  * This class was auto-generated by https://github.com/OpenAPITools/openapi-generator/.

diff --git a/...gPartner/Api/AplusContentApi/APlusSDK.php → ...AmazonPHP/SellingPartner/Api/APlusSDK.php b/...gPartner/Api/AplusContentApi/APlusSDK.php → ...AmazonPHP/SellingPartner/Api/APlusSDK.php
diff --git a/...Api/AuthorizationApi/AuthorizationSDK.php → ...P/SellingPartner/Api/AuthorizationSDK.php b/...Api/AuthorizationApi/AuthorizationSDK.php → ...P/SellingPartner/Api/AuthorizationSDK.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace AmazonPHP\SellingPartner\Api\AuthorizationApi;
+namespace AmazonPHP\SellingPartner\Api;
 
 use AmazonPHP\SellingPartner\Exception\ApiException;
 use AmazonPHP\SellingPartner\Exception\InvalidArgumentException;
@@ -32,8 +32,8 @@ public function __construct(OAuth $authentication)
      * @param string $developerId Your developer ID. This must be one of the developer ID values that you provided when you registered your application in Developer Central. (required)
      * @param string $mwsAuthToken The MWS Auth Token that was generated when the seller authorized your application on the Marketplace Appstore. (required)
      *
-     * @throws \AmazonPHP\SellingPartner\Exception\ApiException on non-2xx response
-     * @throws \AmazonPHP\SellingPartner\Exception\InvalidArgumentException
+     * @throws ApiException on non-2xx response
+     * @throws InvalidArgumentException
      */
     public function getAuthorizationCode(string $sellingPartnerId, string $developerId, string $mwsAuthToken) : \AmazonPHP\SellingPartner\Model\Authorization\GetAuthorizationCodeResponse
     {
@@ -49,7 +49,7 @@ public function getAuthorizationCode(string $sellingPartnerId, string $developer
      * @param string $developerId Your developer ID. This must be one of the developer ID values that you provided when you registered your application in Developer Central. (required)
      * @param string $mwsAuthToken The MWS Auth Token that was generated when the seller authorized your application on the Marketplace Appstore. (required)
      *
-     * @throws \AmazonPHP\SellingPartner\Exception\InvalidArgumentException
+     * @throws InvalidArgumentException
      *
      * @return RequestInterface
      */
@@ -178,10 +178,10 @@ public function getAuthorizationCodeRequest(string $sellingPartnerId, string $de
      * @param string $developerId Your developer ID. This must be one of the developer ID values that you provided when you registered your application in Developer Central. (required)
      * @param string $mwsAuthToken The MWS Auth Token that was generated when the seller authorized your application on the Marketplace Appstore. (required)
      *
-     * @throws \AmazonPHP\SellingPartner\Exception\ApiException on non-2xx response
-     * @throws \AmazonPHP\SellingPartner\Exception\InvalidArgumentException
+     * @throws ApiException on non-2xx response
+     * @throws InvalidArgumentException
      *
-     * @return array<\AmazonPHP\SellingPartner\Model\Authorization\GetAuthorizationCodeResponse>
+     * @return array<array-key, \AmazonPHP\SellingPartner\Model\Authorization\GetAuthorizationCodeResponse>
      */
     private function getAuthorizationCodeWithHttpInfo(string $sellingPartnerId, string $developerId, string $mwsAuthToken) : array
     {