Merge pull request #324 from commercetools/fix-php-deprecations

fix PHP deprecations

Author: jenschude

.gitattributes

@@ -17,3 +17,5 @@
 phpunit.xml.dist export-ignore
 prettify.sh export-ignore
 psalm.xml export-ignore
+phpstan.neon export-ignore
+phpstan-baseline.neon export-ignore

composer.json

@@ -63,7 +63,8 @@
     "monolog/monolog": "^1.3 || ^2.0",
     "phpunit/phpunit": "^9.0 | 8.5.22",
     "cache/array-adapter": "^1.0",
-    "symplify/easy-coding-standard": "12.5.8"
+    "symplify/easy-coding-standard": "12.5.8",
+    "phpstan/phpstan": "^2.1.6"
   },
   "config": {
     "allow-plugins": {

lib/commercetools-base/src/Base/CMap.php

@@ -38,7 +38,7 @@ public function jsonSerialize(): ?array;
      * @psalm-param ?stdClass $data
      * @psalm-return static
      */
-    public static function fromStdClass(stdClass $data = null);
+    public static function fromStdClass(?stdClass $data = null);
 
     /**
      * @template T
@@ -62,7 +62,7 @@ public function at(string $key);
     /**
      * @return static|mixed
      */
-    public function with(string $key, callable $callable = null);
+    public function with(string $key, ?callable $callable = null);
 
     public function getIterator(): MapperIterator;
 

lib/commercetools-base/src/Base/MapperMap.php

@@ -28,7 +28,7 @@ abstract class MapperMap implements CMap
      * @psalm-param ?array<string, TObject|stdClass> $data
      * @param array|null $data
      */
-    final public function __construct(array $data = null)
+    final public function __construct(?array $data = null)
     {
         if (!is_null($data)) {
             $this->index($data);
@@ -72,7 +72,7 @@ public function jsonSerialize(): ?array
      * @psalm-param ?stdClass $data
      * @psalm-return static
      */
-    final public static function fromStdClass(stdClass $data = null)
+    final public static function fromStdClass(?stdClass $data = null)
     {
         /** @psalm-var array<string, TObject|stdClass> $t */
         $t = (array)$data;
@@ -150,7 +150,7 @@ public function at(string $key)
     /**
      * @return ?TObject|mixed
      */
-    public function with(string $key, callable $callable = null)
+    public function with(string $key, ?callable $callable = null)
     {
         $data = $this->at($key);
         if (is_null($callable)) {

lib/commercetools-base/src/Base/MapperScalarSequence.php

@@ -28,7 +28,7 @@ abstract class MapperScalarSequence implements CSequence
      * @psalm-param ?array<int, TScalar|scalar> $data
      * @param array|null $data
      */
-    final public function __construct(array $data = null)
+    final public function __construct(?array $data = null)
     {
         if (!is_null($data)) {
             $this->index($data);

lib/commercetools-base/src/Base/MapperSequence.php

@@ -28,7 +28,7 @@ abstract class MapperSequence implements CSequence
      * @psalm-param ?array<int, TObject|stdClass> $data
      * @param array|null $data
      */
-    final public function __construct(array $data = null)
+    final public function __construct(?array $data = null)
     {
         if (!is_null($data)) {
             $this->index($data);

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

@@ -30,7 +30,7 @@ class CachedTokenProvider implements TokenProvider
     /**
      * @psalm-param CacheItemPoolInterface|CacheInterface|mixed $cache
      */
-    public function __construct(TokenProvider $provider, $cache, string $cacheKey = null)
+    public function __construct(TokenProvider $provider, $cache, ?string $cacheKey = null)
     {
         $this->validateCache($cache);
         $this->cache = $cache;

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

@@ -38,7 +38,7 @@ class ClientCredentials
      *   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;

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

@@ -26,7 +26,7 @@ class TokenModel implements Token
      */
     private $expiresIn;
 
-    public function __construct(string $value, int $expiresIn = null)
+    public function __construct(string $value, ?int $expiresIn = null)
     {
         $this->value = $value;
         $this->expiresIn = $expiresIn ?? 0;

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

@@ -21,7 +21,7 @@ class UserAgentProvider
     private $userAgent;
     public const USER_AGENT = 'commercetools-sdk-php-v2';
 
-    public function __construct(string $suffix = null)
+    public function __construct(?string $suffix = null)
     {
         if (defined('\GuzzleHttp\ClientInterface::MAJOR_VERSION')) {
             $clientVersion = (string) constant(ClientInterface::class . '::MAJOR_VERSION');