fix(cache): Fixed issue with cache middleware and serialization of the query result.

Author: TheCelavi

src/RunOpenCode/Bundle/QueryResourcesLoader/Cache/CacheMiddleware.php

@@ -70,8 +70,8 @@ public function __invoke(string $query, Parameters $parameters, Options $options
              * @var CacheIdentityInterface $identity
              */
             $item->expiresAfter($identity->getTtl());
-            
-            if (method_exists($item, 'tag')) {
+
+            if (\method_exists($item, 'tag')) {
                 $item->tag(\array_merge(
                     $identity->getTags(),
                     [self::TAG]

src/RunOpenCode/Bundle/QueryResourcesLoader/Executor/Dbal/ArrayResult.php

@@ -5,8 +5,9 @@
 namespace RunOpenCode\Bundle\QueryResourcesLoader\Executor\Dbal;
 
 use Doctrine\DBAL\Driver\FetchUtils;
-use Doctrine\DBAL\Driver\Result;
+use Doctrine\DBAL\Driver\Result as DbalDriverResult;
 use Doctrine\DBAL\Exception\InvalidColumnIndex;
+use Doctrine\DBAL\Result as DbalResult;
 
 /**
  * @psalm-suppress InternalClass, InternalMethod
@@ -15,7 +16,7 @@
  *
  * @internal
  */
-final class ArrayResult implements Result
+final class ArrayResult implements DbalDriverResult
 {
     private int $num = 0;
 
@@ -26,10 +27,33 @@ final class ArrayResult implements Result
      */
     public function __construct(
         private readonly array $columnNames,
-        private array $rows,
+        private array          $rows,
     ) {
     }
 
+    public static function create(DbalDriverResult|DbalResult $result): self
+    {
+        // A new implementation of Dbal, let's leverage it.
+        if (\method_exists($result, 'getColumnName')) {
+            $rows        = $result->fetchAllNumeric();
+            $columnNames = \array_map(fn(int $index): string => $result->getColumnName($index), \range(0, $result->columnCount() - 1));
+
+            return new self($columnNames, $rows);
+        }
+
+        // A legacy implementation of Dbal, let's use the old way.
+        $data = $result->fetchAllAssociative();
+
+        if (0 === \count($data)) {
+            return new self([], []);
+        }
+
+        $columnNames = \array_keys($data[0]);
+        $rows        = \array_map(fn(array $row): array => \array_values($row), $data);
+
+        return new self($columnNames, $rows);
+    }
+
     public function fetchNumeric(): array|false
     {
         return $this->fetch();
@@ -107,28 +131,16 @@ public function __serialize(): array
         return [$this->columnNames, $this->rows];
     }
 
-    /** @param mixed[] $data */
+    /** @param array{list<string>, list<list<mixed>>} $data */
     public function __unserialize(array $data): void
     {
-        // Handle objects serialized with DBAL 4.1 and earlier.
-        if (isset($data["\0" . self::class . "\0data"])) {
-            /** @var list<array<string, mixed>> $legacyData */
-            $legacyData = $data["\0" . self::class . "\0data"];
-
-            $this->columnNames = \array_keys($legacyData[0] ?? []);
-            $this->rows        = \array_map(array_values(...), $legacyData);
-
-            return;
-        }
-
-        // @phpstan-ignore-next-line
         [$this->columnNames, $this->rows] = $data;
     }
 
     /** @return list<mixed>|false */
     private function fetch(): array|false
     {
-        if (! isset($this->rows[$this->num])) {
+        if (!isset($this->rows[$this->num])) {
             return false;
         }
 

src/RunOpenCode/Bundle/QueryResourcesLoader/Executor/Dbal/DoctrineDbalExecutionResult.php

@@ -4,8 +4,8 @@
 
 namespace RunOpenCode\Bundle\QueryResourcesLoader\Executor\Dbal;
 
-use Doctrine\DBAL\Driver\Result;
-use Doctrine\DBAL\Result as ExecutionResult;
+use Doctrine\DBAL\Driver\Result as DbalDriverResult;
+use Doctrine\DBAL\Result as DbalResult;
 use RunOpenCode\Bundle\QueryResourcesLoader\Contract\ExecutionResultInterface;
 use RunOpenCode\Bundle\QueryResourcesLoader\Exception\NonUniqueResultException;
 use RunOpenCode\Bundle\QueryResourcesLoader\Exception\NoResultException;
@@ -20,13 +20,12 @@
  *
  * @psalm-suppress InternalMethod, InternalClass
  */
-final readonly class DoctrineDbalExecutionResult implements \IteratorAggregate, ExecutionResultInterface, Result
+final class DoctrineDbalExecutionResult implements \IteratorAggregate, ExecutionResultInterface, DbalDriverResult
 {
-    private ResultProxy $result;
-
-    public function __construct(ExecutionResult|ArrayResult $result)
-    {
-        $this->result = new ResultProxy($result);
+    public function __construct(
+        private DbalDriverResult|DbalResult $result
+    ) {
+        // noop.
     }
 
     /**
@@ -208,7 +207,7 @@ public function free(): void
      */
     public function rowCount(): int
     {
-        return $this->result->rowCount();
+        return (int)$this->result->rowCount();
     }
 
     /**
@@ -226,6 +225,27 @@ public function getIterator(): \Traversable
      */
     public function count(): int
     {
-        return $this->result->count();
+        if (0 === $this->columnCount()) {
+            return $this->rowCount();
+        }
+
+        $count = $this->rowCount();
+
+        if ($count > 0) {
+            return $count;
+        }
+
+        $this->__sleep();
+
+        return $this->rowCount();
+    }
+
+    public function __sleep(): array
+    {
+        if (!$this->result instanceof ArrayResult) {
+            $this->result = ArrayResult::create($this->result);
+        }
+
+        return ['result'];
     }
 }