Merge remote-tracking branch 'origin/1.x' into 1-to-2

doctrine · Sep 19, 2023 · 632d34f · 632d34f
2 parents f0640a0 + 47825e5
commit 632d34f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/Doctrine/ODM/PHPCR/Query/Query.php b/lib/Doctrine/ODM/PHPCR/Query/Query.php
@@ -183,7 +183,7 @@ public function getResult(int $hydrationMode = self::HYDRATE_DOCUMENT)
      *
      * Alias for execute(null, HYDRATE_PHPCR).
      *
-     * @return Collection|QueryResultInterface
+     * @return QueryResultInterface
      */
     public function getPhpcrNodeResult()
     {

diff --git a/tests/Doctrine/Tests/ODM/PHPCR/Functional/QueryBuilderTest.php b/tests/Doctrine/Tests/ODM/PHPCR/Functional/QueryBuilderTest.php
@@ -282,7 +282,7 @@ public function testSelect(): void
 
         $result = $qb->getQuery()->getPhpcrNodeResult();
         $rows = $result->getRows();
-        $values = $rows->current()->getValues('a');
+        $values = $rows->current()->getValues();
         $values = $this->cleanValues($values);
         $this->assertInstanceOf(\Countable::class, $rows);
         $this->assertCount(1, $rows);
@@ -305,7 +305,7 @@ public function testSelect(): void
 
         $result = $qb->getQuery()->getPhpcrNodeResult();
         $rows = $result->getRows();
-        $values = $rows->current()->getValues('a');
+        $values = $rows->current()->getValues();
         $values = $this->cleanValues($values);
 
         switch ($qb->getQuery()->getLanguage()) {