Skip to content

Commit daeb1ee

Browse files
committed
Add doctrine/orm 3 support
1 parent ee51d1a commit daeb1ee

File tree

3 files changed

+10
-42
lines changed

3 files changed

+10
-42
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"php": "^8.1",
2121
"doctrine/collections": "^1.5|^2.0",
2222
"doctrine/common": "^2.11|^3.0",
23-
"doctrine/orm": "^2.13"
23+
"doctrine/orm": "^2.13|^3.0"
2424
},
2525
"require-dev": {
2626
"doctrine/cache": "^1.11|^2.0",

tests/RefetchManagerTest.php

Lines changed: 6 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -293,13 +293,12 @@ public function testInIterate($useRefetchObjectMethod): void
293293
$queryBuilder->select('b')
294294
->andWhere('b.bookId != :bookId')
295295
->setParameter('bookId', 7);
296-
$iterableResult = $queryBuilder->getQuery()->iterate();
296+
$iterableResult = $queryBuilder->getQuery()->toIterable();
297297

298298
$i = 0;
299-
foreach ($iterableResult as $row) {
299+
/** @var Book $book */
300+
foreach ($iterableResult as $book) {
300301
++$i;
301-
/** @var Book $book */
302-
$book = current($row);
303302

304303
if (!$book->getAuthors()->contains($author)) {
305304
$book->addAuthor($author);
@@ -367,35 +366,6 @@ public function testNotManagedObject($useRefetchObjectMethod): void
367366
$this->em->flush();
368367
}
369368

370-
#[DataProvider('getUseRefetchObjectMethodProdiver')]
371-
public function testIndirectRefetch($useRefetchObjectMethod): void
372-
{
373-
/** @var Author $author */
374-
$author = $this->em->getRepository(Author::class)->find(2);
375-
$this->assertNotNull($author);
376-
/** @var Book $book */
377-
$book = $this->em->getRepository(Book::class)->find(1);
378-
$this->assertNotNull($book);
379-
380-
$this->em->clear();
381-
382-
if ($useRefetchObjectMethod) {
383-
$this->refetchManager->refetchObject($book);
384-
} else {
385-
$book = $this->refetchManager->getObject($book);
386-
}
387-
388-
$this->expectException(\InvalidArgumentException::class);
389-
$this->expectExceptionMessage('Entity has to be managed');
390-
$author->setLastName('My new last name');
391-
$this->em->flush($author);
392-
393-
$countAuthors = $book->getAuthors()->count(); // (lazy association collection
394-
$author->setLastName('My new last name');
395-
$this->em->flush($author);
396-
$this->checkUnitOfWork(2, [$book, $author]);
397-
}
398-
399369
#[DataProvider('getUseRefetchObjectMethodProdiver')]
400370
public function testWithCompositePk($useRefetchObjectMethod): void
401371
{
@@ -505,13 +475,12 @@ public function testGetCollectionFromCriteriaInIterate(): void
505475
$queryBuilder->select('b')
506476
->andWhere('b.bookId != :bookId')
507477
->setParameter('bookId', 9);
508-
$iterableResult = $queryBuilder->getQuery()->iterate();
478+
$iterableResult = $queryBuilder->getQuery()->toIterable();
509479

510480
$i = 0;
511-
foreach ($iterableResult as $row) {
481+
/** @var Book $book */
482+
foreach ($iterableResult as $book) {
512483
++$i;
513-
/** @var Book $book */
514-
$book = current($row);
515484

516485
foreach ($authors as $author) {
517486
if (!$book->getAuthors()->contains($author)) {

tests/SnapshotManagerTest.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,13 +128,12 @@ public function testInIterate(): void
128128
$queryBuilder->select('b')
129129
->andWhere('b.bookId != :bookId')
130130
->setParameter('bookId', 7);
131-
$iterableResult = $queryBuilder->getQuery()->iterate();
131+
$iterableResult = $queryBuilder->getQuery()->toIterable();
132132

133133
$i = 0;
134-
foreach ($iterableResult as $row) {
134+
/** @var Book $book */
135+
foreach ($iterableResult as $book) {
135136
++$i;
136-
/** @var Book $book */
137-
$book = current($row);
138137

139138
if (!$book->getAuthors()->contains($author)) {
140139
$book->addAuthor($author);

0 commit comments

Comments
 (0)