Fixed working with hydration modes

- a Query returned from a `QueryObjectInterface` can define a hydration mode itself - removed strict return type from a method `ExecutableQueryObjectInterface::fetchOne()` - the method can returns an array or a scalar value
68publishers · Nov 2, 2021 · 016b72c · 016b72c
1 parent 68d606b
commit 016b72c
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 6 deletions.
diff --git a/src/ExecutableQueryObject.php b/src/ExecutableQueryObject.php
@@ -89,8 +89,14 @@ public function fetch()
 				->setMaxResults(NULL);
 		}
 
-		if (NULL !== $this->resultSetOptions && AbstractQuery::HYDRATE_OBJECT !== $this->resultSetOptions->getOption(ResultSetOptionsInterface::OPTION_HYDRATION_MODE, AbstractQuery::HYDRATE_OBJECT)) {
-			return $query->execute(NULL, $this->resultSetOptions->getOption(ResultSetOptionsInterface::OPTION_HYDRATION_MODE));
+		$hydrationMode = $query->getHydrationMode();
+
+		if (NULL !== $this->resultSetOptions) {
+			$hydrationMode = $this->resultSetOptions->getOption(ResultSetOptionsInterface::OPTION_HYDRATION_MODE, $hydrationMode);
+		}
+
+		if (AbstractQuery::HYDRATE_OBJECT !== $hydrationMode) {
+			return $query->execute(NULL, $hydrationMode);
 		}
 
 		return $this->lastResultSet;
@@ -101,7 +107,7 @@ public function fetch()
 	 *
 	 * @throws \Doctrine\ORM\NonUniqueResultException
 	 */
-	public function fetchOne(): ?object
+	public function fetchOne()
 	{
 		$query = $this->getQuery();
 

diff --git a/src/ExecutableQueryObjectInterface.php b/src/ExecutableQueryObjectInterface.php
@@ -23,5 +23,5 @@ public function fetch();
 	/**
 	 * @return object|NULL|mixed
 	 */
-	public function fetchOne(): ?object;
+	public function fetchOne();
 }
diff --git a/src/ResultSet/ResultSet.php b/src/ResultSet/ResultSet.php
@@ -137,7 +137,7 @@ public function getIterator(): Iterator
 		$query = $this->context->getQuery();
 		$options = $this->getOptions();
 
-		$query->setHydrationMode($options->getOption(ResultSetOptionsInterface::OPTION_HYDRATION_MODE, AbstractQuery::HYDRATE_OBJECT));
+		$query->setHydrationMode($options->getOption(ResultSetOptionsInterface::OPTION_HYDRATION_MODE, $query->getHydrationMode()));
 
 		if ($query instanceof Query && $options->getOption(ResultSetOptionsInterface::OPTION_FETCH_JOIN_COLLECTION) && (0 < $query->getMaxResults() || 0 < $query->getFirstResult())) {
 			$iterator = $this->createPaginator($query)->getIterator();

diff --git a/src/ResultSet/ResultSetOptions.php b/src/ResultSet/ResultSetOptions.php
@@ -10,11 +10,19 @@ class ResultSetOptions implements ResultSetOptionsInterface
 {
 	/** @var array  */
 	protected $options = [
-		self::OPTION_HYDRATION_MODE => AbstractQuery::HYDRATE_OBJECT,
+		self::OPTION_HYDRATION_MODE => NULL,
 		self::OPTION_FETCH_JOIN_COLLECTION => FALSE,
 		self::OPTION_USE_OUTPUT_WALKERS => NULL,
 	];
 
+	/**
+	 * @return \SixtyEightPublishers\DoctrineQueryObjects\ResultSet\ResultSetOptions
+	 */
+	public function create(): self
+	{
+		return new static();
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */