Fix PHP 8.4 compatibility

PrestaShop · Nov 19, 2024 · d7a6a21 · d7a6a21
1 parent 1ff44e3
commit d7a6a21
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/src/AdvancedCircuitBreaker.php b/src/AdvancedCircuitBreaker.php
@@ -63,7 +63,7 @@ public function __construct(
     public function call(
         $service,
         array $serviceParameters = [],
-        callable $fallback = null
+        ?callable $fallback = null
     ): string {
         $transaction = $this->initTransaction($service);
 
@@ -124,7 +124,7 @@ public function setDefaultFallback(?callable $defaultFallback = null): self
     /**
      * {@inheritdoc}
      */
-    protected function callFallback(callable $fallback = null): string
+    protected function callFallback(?callable $fallback = null): string
     {
         return parent::callFallback(null !== $fallback ? $fallback : $this->defaultFallback);
     }

diff --git a/src/Client/SymfonyHttpClient.php b/src/Client/SymfonyHttpClient.php
@@ -69,7 +69,7 @@ class SymfonyHttpClient implements ClientInterface
      */
     private $client;
 
-    public function __construct(array $defaultOptions = [], HttpClientInterface $client = null)
+    public function __construct(array $defaultOptions = [], ?HttpClientInterface $client = null)
     {
         $this->defaultOptions = $defaultOptions;
         $this->client = $client;

diff --git a/src/Contract/CircuitBreakerInterface.php b/src/Contract/CircuitBreakerInterface.php
@@ -45,7 +45,7 @@ public function getState(): string;
      * @param array $parameters the parameters for the request
      * @param callable|null $fallback if the service is unavailable, rely on the fallback
      */
-    public function call(string $service, array $parameters = [], callable $fallback = null): string;
+    public function call(string $service, array $parameters = [], ?callable $fallback = null): string;
 
     /**
      * @return bool checks if the circuit breaker is open

diff --git a/src/PartialCircuitBreaker.php b/src/PartialCircuitBreaker.php
@@ -74,7 +74,7 @@ public function __construct(
     /**
      * {@inheritdoc}
      */
-    abstract public function call(string $service, array $serviceParameters = [], callable $fallback = null): string;
+    abstract public function call(string $service, array $serviceParameters = [], ?callable $fallback = null): string;
 
     /**
      * {@inheritdoc}
@@ -108,7 +108,7 @@ public function isClosed(): bool
         return State::CLOSED_STATE === $this->currentPlace->getState();
     }
 
-    protected function callFallback(callable $fallback = null): string
+    protected function callFallback(?callable $fallback = null): string
     {
         if (null === $fallback) {
             return '';

diff --git a/src/SimpleCircuitBreaker.php b/src/SimpleCircuitBreaker.php
@@ -56,7 +56,7 @@ public function __construct(
     public function call(
         string $service,
         array $serviceParameters = [],
-        callable $fallback = null
+        ?callable $fallback = null
     ): string {
         $transaction = $this->initTransaction($service);
         try {