diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 63883a9..2eead69 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -9,9 +9,3 @@ parameters: message: "#^Cannot call static method fromBytes\\(\\) on Broadway\\\\UuidGenerator\\\\Converter\\\\BinaryUuidConverterInterface\\|null\\.$#" count: 1 path: src/DBALEventStore.php - - - - message: "#^Method Broadway\\\\EventStore\\\\Dbal\\\\DBALEventStore\\:\\:prepareVisitEventsStatement\\(\\) should return Doctrine\\\\DBAL\\\\Driver\\\\Statement but returns Doctrine\\\\DBAL\\\\Driver\\\\ResultStatement\\.$#" - count: 1 - path: src/DBALEventStore.php - diff --git a/src/DBALEventStore.php b/src/DBALEventStore.php index 8bea171..2f0c2a1 100644 --- a/src/DBALEventStore.php +++ b/src/DBALEventStore.php @@ -28,6 +28,7 @@ use Broadway\UuidGenerator\Converter\BinaryUuidConverterInterface; use Doctrine\DBAL\Connection; use Doctrine\DBAL\DBALException; +use Doctrine\DBAL\Driver\ResultStatement; use Doctrine\DBAL\Driver\Statement; use Doctrine\DBAL\Exception\UniqueConstraintViolationException; use Doctrine\DBAL\Schema\Schema; @@ -294,7 +295,6 @@ private function convertStorageValueToIdentifier($id) public function visitEvents(Criteria $criteria, EventVisitor $eventVisitor): void { $statement = $this->prepareVisitEventsStatement($criteria); - $statement->execute(); while ($row = $statement->fetch()) { $domainMessage = $this->deserializeEvent($row); @@ -303,7 +303,7 @@ public function visitEvents(Criteria $criteria, EventVisitor $eventVisitor): voi } } - private function prepareVisitEventsStatement(Criteria $criteria): Statement + private function prepareVisitEventsStatement(Criteria $criteria): ResultStatement { list($where, $bindValues, $bindValueTypes) = $this->prepareVisitEventsStatementWhereAndBindValues($criteria); $query = 'SELECT uuid, playhead, metadata, payload, recorded_on