Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit f06f85f

Browse filesBrowse files
[DoctrineBridge] fix setting default mapping type to attribute/annotation on php 8/7 respectively
1 parent 120f3d6 commit f06f85f
Copy full SHA for f06f85f

File tree

1 file changed

+20
-0
lines changed
Filter options

1 file changed

+20
-0
lines changed

‎src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php
+20Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace Symfony\Bridge\Doctrine\DependencyInjection;
1313

14+
use Symfony\Component\Config\Resource\GlobResource;
1415
use Symfony\Component\DependencyInjection\Alias;
1516
use Symfony\Component\DependencyInjection\ContainerBuilder;
1617
use Symfony\Component\DependencyInjection\Definition;
@@ -88,6 +89,25 @@ protected function loadMappingInformation(array $objectManager, ContainerBuilder
8889
if (!$mappingConfig) {
8990
continue;
9091
}
92+
} elseif (!$mappingConfig['type'] && \PHP_VERSION_ID < 80000) {
93+
$mappingConfig['type'] = 'annotation';
94+
} elseif (!$mappingConfig['type']) {
95+
$mappingConfig['type'] = 'attribute';
96+
97+
$glob = new GlobResource($mappingConfig['dir'], '*', true);
98+
$container->addResource($glob);
99+
100+
foreach ($glob as $file) {
101+
$content = file_get_contents($file);
102+
103+
if (preg_match('/^#\[.*Entity\b/m', $content)) {
104+
break;
105+
}
106+
if (preg_match('/^ \* @.*Entity\b/m', $content)) {
107+
$mappingConfig['type'] = 'annotation';
108+
break;
109+
}
110+
}
91111
}
92112

93113
$this->assertValidMappingConfiguration($mappingConfig, $objectManager['name']);

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.