Update Package to Support PHP 8.0+ (v1.2)

.circleci/config.yml

@@ -7,24 +7,13 @@ jobs:
     build:
         docker:
             # Specify the version you desire here
-            - image: circleci/php:7.1-node-browsers
+            - image: cimg/php:8.0
 
         steps:
             - checkout
 
-            # Download and cache dependencies
-            - restore_cache:
-                    keys:
-                        # "composer.lock" can be used if it is committed to the repo
-                        - v1-dependencies-{{ checksum "composer.json" }}
-                        # fallback to using the latest cache if no exact match is found
-                        - v1-dependencies-
-
             - run: composer install -n --prefer-dist
 
-            - save_cache:
-                    key: v1-dependencies-{{ checksum "composer.json" }}
-                    paths:
-                        - ./vendor
+            - run: composer phpcs
 
-            - run: ./vendor/bin/phpcs
+            - run: composer test

.gitignore

@@ -7,3 +7,4 @@
 
 # OS Specific Files
 .DS_Store
+/.phpunit.result.cache

README.md

@@ -8,7 +8,19 @@ This repository contains the open source PHP SDK that allows you to access the [
 
 ## Copy of Amazon's Provided Code
 
-This is a public copy of [Amazon's provided code](https://webservices.amazon.com/paapi5/documentation/quick-start/using-sdk.html), as their version is not available through Packagist as of writing.
+This is a near identical public copy of [Amazon's provided code](https://webservices.amazon.com/paapi5/documentation/quick-start/using-sdk.html), as their version is not available through Packagist as of writing.
+
+We have not changed the API in any way, however we did cleanup portions of the code and have updated dependencies. A listing of changes are provided below.
+
+### Changes from Amazon
+
+* Replaced usage of `\GuzzleHttp\Psr7\build_query` with `\GuzzleHttp\Psr7\Query::build` https://github.com/thewirecutter/paapi5-php-sdk/pull/8
+* Added Support for Guzzle 7 https://github.com/thewirecutter/paapi5-php-sdk/pull/6
+* Removed Deprecation Warnings when using PHP 8 https://github.com/thewirecutter/paapi5-php-sdk/pull/13
+* Removed Dynamic Property Creation Warnings when using PHP 8 https://github.com/thewirecutter/paapi5-php-sdk/pull/13
+* Updated PHP Minimum Version to PHP 8 https://github.com/thewirecutter/paapi5-php-sdk/pull/13
+* CodeSniffed to PSR-2 https://github.com/thewirecutter/paapi5-php-sdk/pull/13
+* Updated Dev Dependencies to reflect PHP 8 version requirement https://github.com/thewirecutter/paapi5-php-sdk/pull/13
 
 ## Installation
 The Product Advertising API PHP SDK can be installed with [Composer](https://getcomposer.org/). The SDK is available via [Packagist](http://packagist.org/) under the [`thewirecutter/paapi5-php-sdk`](https://packagist.org/packages/thewirecutter/paapi5-php-sdk) package. If Composer is installed globally on your system, you can run the following in the base directory of your project to add the SDK as a dependency:

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "thewirecutter/paapi5-php-sdk",
-    "version": "1.1.1",
+    "version": "1.2.0",
     "description": "ProductAdvertisingAPI 5.0 PHP SDK",
     "keywords": [
         "amazon",
@@ -28,21 +28,21 @@
         }
     ],
     "require": {
-        "php": ">=5.5",
+        "php": "^8.0",
         "ext-curl": "*",
         "ext-json": "*",
         "ext-mbstring": "*",
         "guzzlehttp/guzzle": "^6.2|^7.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8",
-        "squizlabs/php_codesniffer": "~2.6",
+        "phpunit/phpunit": "^9.0",
+        "squizlabs/php_codesniffer": "^3.0",
         "friendsofphp/php-cs-fixer": "~2.12"
     },
     "scripts": {
         "test": "vendor/bin/phpunit",
-        "phpcs": "vendor/bin/phpcs --standard=phpcs.xml -n SampleGetItemsApi.php SampleSearchItemsApi.php SampleGetVariationsApi.php SampleGetBrowseNodesApi.php src/com/amazon/paapi5/v1/auth/SignHelper.php",
-        "phpcbf": "vendor/bin/phpcbf --standard=phpcs.xml -n SampleGetItemsApi.php SampleSearchItemsApi.php SampleGetVariationsApi.php SampleGetBrowseNodesApi.php src/com/amazon/paapi5/v1/auth/SignHelper.php",
+        "phpcs": "vendor/bin/phpcs --standard=PSR2 -n SampleGetItemsApi.php SampleSearchItemsApi.php SampleGetVariationsApi.php SampleGetBrowseNodesApi.php src",
+        "phpcbf": "vendor/bin/phpcbf --standard=PSR2 -n SampleGetItemsApi.php SampleSearchItemsApi.php SampleGetVariationsApi.php SampleGetBrowseNodesApi.php src",
         "php-cs-fixer": "vendor/friendsofphp/php-cs-fixer/php-cs-fixer fix --allow-risky=yes --using-cache=no --config=.php_cs SampleGetItemsApi.php SampleSearchItemsApi.php SampleGetVariationsApi.php SampleGetBrowseNodesApi.php src/com/amazon/paapi5/v1/auth/SignHelper.php"
     },
     "autoload": {

phpunit.xml.dist

@@ -1,21 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="./vendor/autoload.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         stopOnFailure="false">
-    <testsuites>
-        <testsuite>
-            <directory>./test/Api</directory>
-            <directory>./test/Model</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">./src/com/amazon/paapi5/v1/api</directory>
-            <directory suffix=".php">./src/com/amazon/paapi5/v1</directory>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="./vendor/autoload.php" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage processUncoveredFiles="true">
+    <include>
+      <directory suffix=".php">./src/com/amazon/paapi5/v1/api</directory>
+      <directory suffix=".php">./src/com/amazon/paapi5/v1</directory>
+    </include>
+  </coverage>
+  <testsuites>
+    <testsuite name="api">
+      <directory>./test/Api</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>

src/com/amazon/paapi5/v1/Availability.php

@@ -16,6 +16,7 @@
  */
 
 namespace Amazon\ProductAdvertisingAPI\v1\com\amazon\paapi5\v1;
+
 use \Amazon\ProductAdvertisingAPI\v1\ObjectSerializer;
 
 /**
@@ -45,5 +46,3 @@ public static function getAllowableEnumValues()
         ];
     }
 }
-
-

src/com/amazon/paapi5/v1/BrowseNode.php

@@ -401,7 +401,7 @@ public function setSalesRank($salesRank)
      *
      * @return boolean
      */
-    public function offsetExists($offset)
+    public function offsetExists(mixed $offset): bool
     {
         return isset($this->container[$offset]);
     }
@@ -413,7 +413,7 @@ public function offsetExists($offset)
      *
      * @return mixed
      */
-    public function offsetGet($offset)
+    public function offsetGet(mixed $offset): mixed
     {
         return isset($this->container[$offset]) ? $this->container[$offset] : null;
     }
@@ -426,7 +426,7 @@ public function offsetGet($offset)
      *
      * @return void
      */
-    public function offsetSet($offset, $value)
+    public function offsetSet(mixed $offset, mixed $value): void
     {
         if (is_null($offset)) {
             $this->container[] = $value;
@@ -442,7 +442,7 @@ public function offsetSet($offset, $value)
      *
      * @return void
      */
-    public function offsetUnset($offset)
+    public function offsetUnset(mixed $offset): void
     {
         unset($this->container[$offset]);
     }
@@ -464,5 +464,3 @@ public function __toString()
         return json_encode(ObjectSerializer::sanitizeForSerialization($this));
     }
 }
-
-

src/com/amazon/paapi5/v1/BrowseNodeAncestor.php

@@ -311,7 +311,7 @@ public function setId($id)
      *
      * @return boolean
      */
-    public function offsetExists($offset)
+    public function offsetExists(mixed $offset): bool
     {
         return isset($this->container[$offset]);
     }
@@ -323,7 +323,7 @@ public function offsetExists($offset)
      *
      * @return mixed
      */
-    public function offsetGet($offset)
+    public function offsetGet(mixed $offset): mixed
     {
         return isset($this->container[$offset]) ? $this->container[$offset] : null;
     }
@@ -336,7 +336,7 @@ public function offsetGet($offset)
      *
      * @return void
      */
-    public function offsetSet($offset, $value)
+    public function offsetSet(mixed $offset, mixed $value): void
     {
         if (is_null($offset)) {
             $this->container[] = $value;
@@ -352,7 +352,7 @@ public function offsetSet($offset, $value)
      *
      * @return void
      */
-    public function offsetUnset($offset)
+    public function offsetUnset(mixed $offset): void
     {
         unset($this->container[$offset]);
     }
@@ -374,5 +374,3 @@ public function __toString()
         return json_encode(ObjectSerializer::sanitizeForSerialization($this));
     }
 }
-
-

src/com/amazon/paapi5/v1/BrowseNodeChild.php

@@ -281,7 +281,7 @@ public function setId($id)
      *
      * @return boolean
      */
-    public function offsetExists($offset)
+    public function offsetExists(mixed $offset): bool
     {
         return isset($this->container[$offset]);
     }
@@ -293,7 +293,7 @@ public function offsetExists($offset)
      *
      * @return mixed
      */
-    public function offsetGet($offset)
+    public function offsetGet(mixed $offset): mixed
     {
         return isset($this->container[$offset]) ? $this->container[$offset] : null;
     }
@@ -306,7 +306,7 @@ public function offsetGet($offset)
      *
      * @return void
      */
-    public function offsetSet($offset, $value)
+    public function offsetSet(mixed $offset, mixed $value): void
     {
         if (is_null($offset)) {
             $this->container[] = $value;
@@ -322,7 +322,7 @@ public function offsetSet($offset, $value)
      *
      * @return void
      */
-    public function offsetUnset($offset)
+    public function offsetUnset(mixed $offset): void
     {
         unset($this->container[$offset]);
     }
@@ -344,5 +344,3 @@ public function __toString()
         return json_encode(ObjectSerializer::sanitizeForSerialization($this));
     }
 }
-
-

src/com/amazon/paapi5/v1/BrowseNodeInfo.php

@@ -251,7 +251,7 @@ public function setWebsiteSalesRank($websiteSalesRank)
      *
      * @return boolean
      */
-    public function offsetExists($offset)
+    public function offsetExists(mixed $offset): bool
     {
         return isset($this->container[$offset]);
     }
@@ -263,7 +263,7 @@ public function offsetExists($offset)
      *
      * @return mixed
      */
-    public function offsetGet($offset)
+    public function offsetGet(mixed $offset): mixed
     {
         return isset($this->container[$offset]) ? $this->container[$offset] : null;
     }
@@ -276,7 +276,7 @@ public function offsetGet($offset)
      *
      * @return void
      */
-    public function offsetSet($offset, $value)
+    public function offsetSet(mixed $offset, mixed $value): void
     {
         if (is_null($offset)) {
             $this->container[] = $value;
@@ -292,7 +292,7 @@ public function offsetSet($offset, $value)
      *
      * @return void
      */
-    public function offsetUnset($offset)
+    public function offsetUnset(mixed $offset): void
     {
         unset($this->container[$offset]);
     }
@@ -314,5 +314,3 @@ public function __toString()
         return json_encode(ObjectSerializer::sanitizeForSerialization($this));
     }
 }
-
-

src/com/amazon/paapi5/v1/BrowseNodesResult.php

@@ -221,7 +221,7 @@ public function setBrowseNodes($browseNodes)
      *
      * @return boolean
      */
-    public function offsetExists($offset)
+    public function offsetExists(mixed $offset): bool
     {
         return isset($this->container[$offset]);
     }
@@ -233,7 +233,7 @@ public function offsetExists($offset)
      *
      * @return mixed
      */
-    public function offsetGet($offset)
+    public function offsetGet(mixed $offset): mixed
     {
         return isset($this->container[$offset]) ? $this->container[$offset] : null;
     }
@@ -246,7 +246,7 @@ public function offsetGet($offset)
      *
      * @return void
      */
-    public function offsetSet($offset, $value)
+    public function offsetSet(mixed $offset, mixed $value): void
     {
         if (is_null($offset)) {
             $this->container[] = $value;
@@ -262,7 +262,7 @@ public function offsetSet($offset, $value)
      *
      * @return void
      */
-    public function offsetUnset($offset)
+    public function offsetUnset(mixed $offset): void
     {
         unset($this->container[$offset]);
     }
@@ -284,5 +284,3 @@ public function __toString()
         return json_encode(ObjectSerializer::sanitizeForSerialization($this));
     }
 }
-
-

src/com/amazon/paapi5/v1/ByLineInfo.php

@@ -281,7 +281,7 @@ public function setManufacturer($manufacturer)
      *
      * @return boolean
      */
-    public function offsetExists($offset)
+    public function offsetExists(mixed $offset): bool
     {
         return isset($this->container[$offset]);
     }
@@ -293,7 +293,7 @@ public function offsetExists($offset)
      *
      * @return mixed
      */
-    public function offsetGet($offset)
+    public function offsetGet(mixed $offset): mixed
     {
         return isset($this->container[$offset]) ? $this->container[$offset] : null;
     }
@@ -306,7 +306,7 @@ public function offsetGet($offset)
      *
      * @return void
      */
-    public function offsetSet($offset, $value)
+    public function offsetSet(mixed $offset, mixed $value): void
     {
         if (is_null($offset)) {
             $this->container[] = $value;
@@ -322,7 +322,7 @@ public function offsetSet($offset, $value)
      *
      * @return void
      */
-    public function offsetUnset($offset)
+    public function offsetUnset(mixed $offset): void
     {
         unset($this->container[$offset]);
     }
@@ -344,5 +344,3 @@ public function __toString()
         return json_encode(ObjectSerializer::sanitizeForSerialization($this));
     }
 }
-
-