PHP 8.4 fix implicitly nullable via default value null

packagist · Dec 9, 2024 · 8afe5aa · 8afe5aa
1 parent 3e49b43
commit 8afe5aa
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/Api/AbstractApi.php b/src/Api/AbstractApi.php
@@ -19,10 +19,10 @@ abstract class AbstractApi
     /** @var ResponseMediator */
     private $responseMediator;
 
-    public function __construct(Client $client, ResponseMediator $responseMediator = null)
+    public function __construct(Client $client, ?ResponseMediator $responseMediator = null)
     {
         $this->client = $client;
-        $this->responseMediator = $responseMediator ? $responseMediator : new ResponseMediator();
+        $this->responseMediator = $responseMediator ? : new ResponseMediator();
     }
 
     /**

diff --git a/src/Client.php b/src/Client.php
@@ -25,7 +25,7 @@ class Client
     private $responseMediator;
 
     /** @param string $privatePackagistUrl */
-    public function __construct(HttpPluginClientBuilder $httpClientBuilder = null, $privatePackagistUrl = null, ResponseMediator $responseMediator = null)
+    public function __construct(?HttpPluginClientBuilder $httpClientBuilder = null, $privatePackagistUrl = null, ?ResponseMediator $responseMediator = null)
     {
         $this->httpClientBuilder = $builder = $httpClientBuilder ?: new HttpPluginClientBuilder();
         $privatePackagistUrl = $privatePackagistUrl ? : 'https://packagist.com';

diff --git a/src/Exception/HttpTransportException.php b/src/Exception/HttpTransportException.php
@@ -15,7 +15,7 @@ class HttpTransportException extends RuntimeException
 {
     private $requestUri;
 
-    public function __construct($message = "", $code = 0, $requestUri = "", Throwable $previous = null)
+    public function __construct($message = "", $code = 0, $requestUri = "", ?Throwable $previous = null)
     {
         $this->requestUri = $requestUri;
         parent::__construct($message, $code, $previous);

diff --git a/src/HttpClient/Plugin/ExceptionThrower.php b/src/HttpClient/Plugin/ExceptionThrower.php
@@ -24,9 +24,9 @@ class ExceptionThrower implements Plugin
     /** @var ResponseMediator */
     private $responseMediator;
 
-    public function __construct(ResponseMediator $responseMediator = null)
+    public function __construct(?ResponseMediator $responseMediator = null)
     {
-        $this->responseMediator = $responseMediator ? $responseMediator : new ResponseMediator();
+        $this->responseMediator = $responseMediator ? : new ResponseMediator();
     }
 
     protected function doHandleRequest(RequestInterface $request, callable $next, callable $first)