Merge branch 'main' of github.com:hypervel/components

Author: albertcht

src/redis/src/Redis.php

@@ -28,13 +28,15 @@ public function __call($name, $arguments)
         $hasContextConnection = Context::has($this->getContextKey());
         $connection = $this->getConnection($hasContextConnection);
 
+        $hasError = false;
         $start = (float) microtime(true);
 
         try {
             /** @var RedisConnection $connection */
             $connection = $connection->getConnection();
             $result = $connection->{$name}(...$arguments);
         } catch (Throwable $exception) {
+            $hasError = true;
             throw $exception;
         } finally {
             $time = round((microtime(true) - $start) * 1000, 2);
@@ -51,7 +53,7 @@ public function __call($name, $arguments)
             );
 
             if ($hasContextConnection) {
-                return;
+                return $hasError ? null : $result; // @phpstan-ignore-line
             }
 
             // Release connection.
@@ -65,7 +67,7 @@ public function __call($name, $arguments)
                     $this->releaseContextConnection();
                 });
 
-                return;
+                return $hasError ? null : $result; // @phpstan-ignore-line
             }
 
             // Release the connection after command executed.