File tree Expand file tree Collapse file tree 2 files changed +5
-7
lines changed Expand file tree Collapse file tree 2 files changed +5
-7
lines changed Original file line number Diff line number Diff line change 16
16
use Doctrine \ORM \EntityManager ;
17
17
use Doctrine \ORM \Mapping \Column ;
18
18
use Doctrine \ORM \ORMSetup ;
19
- use Doctrine \ORM \Tools \Setup ;
20
19
use PHPUnit \Framework \TestCase ;
21
20
use Symfony \Bridge \Doctrine \PropertyInfo \DoctrineExtractor ;
22
21
use Symfony \Bridge \Doctrine \Tests \PropertyInfo \Fixtures \DoctrineDummy ;
@@ -34,9 +33,7 @@ class DoctrineExtractorTest extends TestCase
34
33
{
35
34
private function createExtractor ()
36
35
{
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 );
40
37
$ entityManager = EntityManager::create (['driver ' => 'pdo_sqlite ' ], $ config );
41
38
42
39
if (!DBALType::hasType ('foo ' )) {
Original file line number Diff line number Diff line change 42
42
"symfony/validator" : " ^5.4|^6.0" ,
43
43
"symfony/translation" : " ^5.4|^6.0" ,
44
44
"symfony/var-dumper" : " ^5.4|^6.0" ,
45
- "doctrine/annotations" : " ^1.10.4 |^2" ,
45
+ "doctrine/annotations" : " ^1.13.1 |^2" ,
46
46
"doctrine/collections" : " ^1.0|^2.0" ,
47
47
"doctrine/data-fixtures" : " ^1.1" ,
48
48
"doctrine/dbal" : " ^2.13.1|^3.0" ,
49
- "doctrine/orm" : " ^2.7.4 " ,
49
+ "doctrine/orm" : " ^2.12 " ,
50
50
"psr/log" : " ^1|^2|^3"
51
51
},
52
52
"conflict" : {
53
+ "doctrine/annotations" : " <1.13.1" ,
53
54
"doctrine/dbal" : " <2.13.1" ,
54
55
"doctrine/lexer" : " <1.1" ,
55
- "doctrine/orm" : " <2.7.4 " ,
56
+ "doctrine/orm" : " <2.12 " ,
56
57
"phpunit/phpunit" : " <5.4.3" ,
57
58
"symfony/cache" : " <5.4" ,
58
59
"symfony/dependency-injection" : " <6.2" ,
You can’t perform that action at this time.
0 commit comments