Fix deprecation warnings in doctrine/collections:2.4

phpstan.neon

@@ -8,7 +8,6 @@ parameters:
         - tests/data/doctrine_fixtures/TestFixture1.php
         - tests/data/doctrine_fixtures/TestFixture2.php
         - tests/_support/UnitTester.php
-  checkMissingIterableValueType: false
   reportUnmatchedIgnoredErrors: true
   ignoreErrors:
       - path: tests/
@@ -21,3 +20,4 @@ parameters:
         message: '#Method \S+ has no return type specified#'
       - path: tests/
         message: '#(?:Method|Property) .+ with generic (?:interface|class) \S+ does not specify its types#'
+      - identifier: missingType.iterableValue

src/Codeception/Module/Doctrine.php

@@ -1009,7 +1009,7 @@ protected function _buildAssociationQuery(QueryBuilder $qb, string $assoc, strin
             } elseif ($val instanceof Criteria) {
                 $qb->addCriteria($val);
             } elseif ($val instanceof Expression) {
-                $qb->addCriteria(Criteria::create()->where($val));
+                $qb->addCriteria(Criteria::create(true)->where($val));
             } else {
                 $qb->andWhere(sprintf('%s.%s = ?%s', $alias, $key, $paramIndex));
                 $qb->setParameter($paramIndex, $val);

tests/unit/Codeception/Module/Doctrine2Test.php

@@ -81,18 +81,18 @@ protected function _setUp()
         $connection = DriverManager::getConnection(['driver' => $sqliteDriver, 'memory' => true]);
 
         if (version_compare(InstalledVersions::getVersion('doctrine/orm'), '3', '>=')) {
-            $this->em = new EntityManager(
-                $connection,
-                ORMSetup::createAttributeMetadataConfiguration([$dir], true)
-            );
+            $configuration = ORMSetup::createAttributeMetadataConfiguration([$dir], true);
         } else {
-            $this->em = new EntityManager(
-                $connection,
-                // @phpstan-ignore-next-line
-                ORMSetup::createAnnotationMetadataConfiguration([$dir], true)
-            );
+            // @phpstan-ignore-next-line
+            $configuration = ORMSetup::createAnnotationMetadataConfiguration([$dir], true);
         }
 
+        if (PHP_VERSION_ID >= 80400 && method_exists($configuration, 'enableNativeLazyObjects')) {
+            $configuration->enableNativeLazyObjects(true);
+        }
+
+        $this->em = new EntityManager($connection, $configuration);
+
         (new SchemaTool($this->em))->createSchema([
             $this->em->getClassMetadata(CompositePrimaryKeyEntity::class),
             $this->em->getClassMetadata(PlainEntity::class),
@@ -258,17 +258,17 @@ public function testCriteria()
     {
         $this->module->haveInRepository(PlainEntity::class, ['name' => 'Test 1']);
         $this->module->seeInRepository(PlainEntity::class, [
-            Criteria::create()->where(
+            Criteria::create(true)->where(
                 Criteria::expr()->eq('name', 'Test 1')
             ),
         ]);
         $this->module->seeInRepository(PlainEntity::class, [
-            Criteria::create()->where(
+            Criteria::create(true)->where(
                 Criteria::expr()->contains('name', 'est')
             ),
         ]);
         $this->module->seeInRepository(PlainEntity::class, [
-            Criteria::create()->where(
+            Criteria::create(true)->where(
                 Criteria::expr()->in('name', ['Test 1'])
             ),
         ]);
@@ -303,7 +303,7 @@ public function testOrderBy()
                 'c',
             ],
             array_map($getName, $this->module->grabEntitiesFromRepository(PlainEntity::class, [
-                Criteria::create()->orderBy(['name' => 'asc']),
+                Criteria::create(true)->orderBy(['name' => 'asc']),
             ]))
         );
 
@@ -314,7 +314,7 @@ public function testOrderBy()
                 'a',
             ],
             array_map($getName, $this->module->grabEntitiesFromRepository(PlainEntity::class, [
-                Criteria::create()->orderBy(['name' => 'desc']),
+                Criteria::create(true)->orderBy(['name' => 'desc']),
             ]))
         );
     }