Skip to content

Commit 3c9bc83

Browse files
derrabusnicolas-grekas
authored andcommitted
Remove calls to AnnotationRegistry::registerLoader()
1 parent 2169ac4 commit 3c9bc83

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

Tests/PropertyInfo/DoctrineExtractorTest.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
use Doctrine\ORM\EntityManager;
1717
use Doctrine\ORM\Mapping\Column;
1818
use Doctrine\ORM\ORMSetup;
19-
use Doctrine\ORM\Tools\Setup;
2019
use PHPUnit\Framework\TestCase;
2120
use Symfony\Bridge\Doctrine\PropertyInfo\DoctrineExtractor;
2221
use Symfony\Bridge\Doctrine\Tests\PropertyInfo\Fixtures\DoctrineDummy;
@@ -34,9 +33,7 @@ class DoctrineExtractorTest extends TestCase
3433
{
3534
private function createExtractor()
3635
{
37-
$config = class_exists(ORMSetup::class)
38-
? ORMSetup::createAnnotationMetadataConfiguration([__DIR__.\DIRECTORY_SEPARATOR.'Fixtures'], true)
39-
: Setup::createAnnotationMetadataConfiguration([__DIR__.\DIRECTORY_SEPARATOR.'Fixtures'], true);
36+
$config = ORMSetup::createAnnotationMetadataConfiguration([__DIR__.\DIRECTORY_SEPARATOR.'Fixtures'], true);
4037
$entityManager = EntityManager::create(['driver' => 'pdo_sqlite'], $config);
4138

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

composer.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,18 @@
4242
"symfony/validator": "^5.4|^6.0",
4343
"symfony/translation": "^5.4|^6.0",
4444
"symfony/var-dumper": "^5.4|^6.0",
45-
"doctrine/annotations": "^1.10.4|^2",
45+
"doctrine/annotations": "^1.13.1|^2",
4646
"doctrine/collections": "^1.0|^2.0",
4747
"doctrine/data-fixtures": "^1.1",
4848
"doctrine/dbal": "^2.13.1|^3.0",
49-
"doctrine/orm": "^2.7.4",
49+
"doctrine/orm": "^2.12",
5050
"psr/log": "^1|^2|^3"
5151
},
5252
"conflict": {
53+
"doctrine/annotations": "<1.13.1",
5354
"doctrine/dbal": "<2.13.1",
5455
"doctrine/lexer": "<1.1",
55-
"doctrine/orm": "<2.7.4",
56+
"doctrine/orm": "<2.12",
5657
"phpunit/phpunit": "<5.4.3",
5758
"symfony/cache": "<5.4",
5859
"symfony/dependency-injection": "<6.2",

0 commit comments

Comments
 (0)