Merge pull request #301 from commercetools/fix-deprecation

Fix deprecation

Author: kodiakhq[bot]

.github/workflows/ci.yml

@@ -98,6 +98,9 @@ jobs:
           - "7.4"
           - "8.0"
           - "8.1"
+          - "8.2"
+          - "8.3"
+          - "8.4"
         dependencies:
           - lowest
           - highest

lib/commercetools-base/src/Client/ClientCredentials.php

@@ -32,18 +32,18 @@ class ClientCredentials
      *   The client id.
      * @param string $clientSecret
      *   The client secret.
-     * @param string $scope
+     * @param ?string $scope
      *   Provide the scope when you want to request a specific ones for the client.
      *   Can be omitted to use all scopes of the oauth client.
      *   Format: `<the scope name>:<the project key>`.
      *   Example: `manage_products:project1`.
      */
-    public function __construct(string $clientId, string $clientSecret, string $scope = null)
+    public function __construct(string $clientId, string $clientSecret, ?string $scope = null)
     {
         $this->clientId = $clientId;
         $this->clientSecret = $clientSecret;
         $this->scope = $scope;
-        $this->cacheKey = sha1($clientId . (string)$scope);
+        $this->cacheKey = sha1($clientId . $scope);
     }
 
     public function getClientId(): string

test/unit/MiscTest.php

@@ -37,6 +37,7 @@
 use Commercetools\Api\Models\Type\TypeReferenceBuilder;
 use Commercetools\Api\Models\Type\TypeResourceIdentifierBuilder;
 use Commercetools\Base\JsonObject;
+use Commercetools\Client\ClientCredentials;
 use Commercetools\Client\ClientFactory;
 use GuzzleHttp\Psr7\Response;
 use PHPUnit\Framework\TestCase;
@@ -289,4 +290,11 @@ public function testAddressDraft()
             json_encode($cart)
         );
     }
+
+
+    public function testCredentials()
+    {
+        $credentials = new ClientCredentials("clientId", "clientSecret");
+        $this->assertInstanceOf(ClientCredentials::class, $credentials);
+    }
 }