Skip to content

Commit df3cef8

Browse files
alexander-schranzfabpot
authored andcommitted
[DoctrineBridge] Fix compatibility to Doctrine persistence 2.5 in Doctrine Bridge 6.4 to avoid Projects stuck on 6.3
1 parent 8529b41 commit df3cef8

File tree

6 files changed

+15
-6
lines changed

6 files changed

+15
-6
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"ext-xml": "*",
4040
"friendsofphp/proxy-manager-lts": "^1.0.2",
4141
"doctrine/event-manager": "^1.2|^2",
42-
"doctrine/persistence": "^3.1",
42+
"doctrine/persistence": "^2.5|^3.1",
4343
"twig/twig": "^2.13|^3.0.4",
4444
"psr/cache": "^2.0|^3.0",
4545
"psr/clock": "^1.0",

src/Symfony/Bridge/Doctrine/Tests/DoctrineTestHelper.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,10 @@ public static function createTestConfiguration(): Configuration
6161
if (class_exists(DefaultSchemaManagerFactory::class)) {
6262
$config->setSchemaManagerFactory(new DefaultSchemaManagerFactory());
6363
}
64-
$config->setLazyGhostObjectEnabled(true);
64+
65+
if (!class_exists(\Doctrine\Persistence\Mapping\Driver\AnnotationDriver::class)) { // doctrine/persistence >= 3.0
66+
$config->setLazyGhostObjectEnabled(true);
67+
}
6568

6669
return $config;
6770
}

src/Symfony/Bridge/Doctrine/Tests/Middleware/Debug/MiddlewareTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,9 @@ private function init(bool $withStopwatch = true): void
5555
if (class_exists(DefaultSchemaManagerFactory::class)) {
5656
$config->setSchemaManagerFactory(new DefaultSchemaManagerFactory());
5757
}
58-
$config->setLazyGhostObjectEnabled(true);
58+
if (!class_exists(\Doctrine\Persistence\Mapping\Driver\AnnotationDriver::class)) { // doctrine/persistence >= 3.0
59+
$config->setLazyGhostObjectEnabled(true);
60+
}
5961
$this->debugDataHolder = new DebugDataHolder();
6062
$config->setMiddlewares([new Middleware($this->debugDataHolder, $this->stopwatch)]);
6163

src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@ private function createExtractor(): DoctrineExtractor
4444
if (class_exists(DefaultSchemaManagerFactory::class)) {
4545
$config->setSchemaManagerFactory(new DefaultSchemaManagerFactory());
4646
}
47-
$config->setLazyGhostObjectEnabled(true);
47+
if (!class_exists(\Doctrine\Persistence\Mapping\Driver\AnnotationDriver::class)) { // doctrine/persistence >= 3.0
48+
$config->setLazyGhostObjectEnabled(true);
49+
}
4850

4951
$eventManager = new EventManager();
5052
$entityManager = new EntityManager(DriverManager::getConnection(['driver' => 'pdo_sqlite'], $config, $eventManager), $config, $eventManager);

src/Symfony/Bridge/Doctrine/Tests/Security/RememberMe/DoctrineTokenProviderTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,9 @@ protected function bootstrapProvider(): DoctrineTokenProvider
124124
$config->setSchemaManagerFactory(new DefaultSchemaManagerFactory());
125125
}
126126

127-
$config->setLazyGhostObjectEnabled(true);
127+
if (!class_exists(\Doctrine\Persistence\Mapping\Driver\AnnotationDriver::class)) { // doctrine/persistence >= 3.0
128+
$config->setLazyGhostObjectEnabled(true);
129+
}
128130

129131
$connection = DriverManager::getConnection([
130132
'driver' => 'pdo_sqlite',

src/Symfony/Bridge/Doctrine/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"require": {
1919
"php": ">=8.1",
2020
"doctrine/event-manager": "^1.2|^2",
21-
"doctrine/persistence": "^3.1",
21+
"doctrine/persistence": "^2.5|^3.1",
2222
"symfony/deprecation-contracts": "^2.5|^3",
2323
"symfony/polyfill-ctype": "~1.8",
2424
"symfony/polyfill-mbstring": "~1.0",

0 commit comments

Comments
 (0)