Skip to content

Commit 3a5ed31

Browse files
Merge branch '5.4' into 6.2
* 5.4: [DoctrineBridge] Work around "Doctrine\DBAL\Connection::getEventManager()" deprecations [Routing] Fix Psalm [Lock] Fix sprintf Fix Crawler::filter throw phpdoc
2 parents 2c9d6ca + 0d2da63 commit 3a5ed31

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

Tests/DoctrineTestHelper.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
namespace Symfony\Bridge\Doctrine\Tests;
1313

1414
use Doctrine\Common\Annotations\AnnotationReader;
15+
use Doctrine\Common\EventManager;
1516
use Doctrine\DBAL\DriverManager;
1617
use Doctrine\DBAL\Schema\DefaultSchemaManagerFactory;
1718
use Doctrine\ORM\Configuration;
@@ -51,7 +52,9 @@ public static function createTestEntityManager(Configuration $config = null): En
5152
return EntityManager::create($params, $config);
5253
}
5354

54-
return new EntityManager(DriverManager::getConnection($params, $config), $config);
55+
$eventManager = new EventManager();
56+
57+
return new EntityManager(DriverManager::getConnection($params, $config, $eventManager), $config, $eventManager);
5558
}
5659

5760
public static function createTestConfiguration(): Configuration

Tests/PropertyInfo/DoctrineExtractorTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
use Doctrine\Common\Annotations\AnnotationReader;
1515
use Doctrine\Common\Collections\Collection;
16+
use Doctrine\Common\EventManager;
1617
use Doctrine\DBAL\DriverManager;
1718
use Doctrine\DBAL\Schema\DefaultSchemaManagerFactory;
1819
use Doctrine\DBAL\Types\Type as DBALType;
@@ -54,7 +55,8 @@ private function createExtractor()
5455
if (!(new \ReflectionMethod(EntityManager::class, '__construct'))->isPublic()) {
5556
$entityManager = EntityManager::create(['driver' => 'pdo_sqlite'], $config);
5657
} else {
57-
$entityManager = new EntityManager(DriverManager::getConnection(['driver' => 'pdo_sqlite'], $config), $config);
58+
$eventManager = new EventManager();
59+
$entityManager = new EntityManager(DriverManager::getConnection(['driver' => 'pdo_sqlite'], $config, $eventManager), $config, $eventManager);
5860
}
5961

6062
if (!DBALType::hasType('foo')) {

0 commit comments

Comments
 (0)