Skip to content

Commit c7e2c16

Browse files
committed
Fix tests for old php and doctrine
1 parent a59b33b commit c7e2c16

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed

tests/Type/Doctrine/Query/QueryResultTypeWalkerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
use PHPStan\Type\Type;
3737
use PHPStan\Type\TypeCombinator;
3838
use PHPStan\Type\VerbosityLevel;
39-
use QueryResult\Entities\Dbal4Entity;
4039
use QueryResult\Entities\Embedded;
4140
use QueryResult\Entities\JoinedChild;
4241
use QueryResult\Entities\Many;
@@ -45,6 +44,7 @@
4544
use QueryResult\Entities\One;
4645
use QueryResult\Entities\OneId;
4746
use QueryResult\Entities\SingleTableChild;
47+
use QueryResult\EntitiesDbal42\Dbal4Entity;
4848
use QueryResult\EntitiesEnum\EntityWithEnum;
4949
use QueryResult\EntitiesEnum\IntEnum;
5050
use QueryResult\EntitiesEnum\StringEnum;

tests/Type/Doctrine/data/QueryResult/Entities/Dbal4Entity.php renamed to tests/Type/Doctrine/data/QueryResult/EntitiesDbal42/Dbal4Entity.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php declare(strict_types=1);
22

3-
namespace QueryResult\Entities;
3+
namespace QueryResult\EntitiesDbal42;
44

55
use Doctrine\ORM\Mapping\Column;
66
use Doctrine\ORM\Mapping\Entity;

tests/Type/Doctrine/data/QueryResult/entity-manager.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
<?php declare(strict_types = 1);
22

33
use Cache\Adapter\PHPArray\ArrayCachePool;
4+
use Composer\InstalledVersions;
5+
use Composer\Semver\VersionParser;
46
use Doctrine\Common\Annotations\AnnotationReader;
57
use Doctrine\DBAL\DriverManager;
68
use Doctrine\ORM\Configuration;
@@ -9,6 +11,7 @@
911
use Doctrine\ORM\Mapping\Driver\AnnotationDriver;
1012
use Doctrine\ORM\Mapping\Driver\AttributeDriver;
1113
use Doctrine\Persistence\Mapping\Driver\MappingDriverChain;
14+
use QueryResult\EntitiesDbal42\Dbal4Entity;
1215

1316
$config = new Configuration();
1417
$config->setProxyDir(__DIR__);
@@ -29,6 +32,13 @@
2932
), 'QueryResult\EntitiesEnum\\');
3033
}
3134

35+
if (InstalledVersions::satisfies(new VersionParser(), 'doctrine/dbal', '>=4.2')) {
36+
$metadataDriver->addDriver(new AnnotationDriver(
37+
new AnnotationReader(),
38+
[__DIR__ . '/EntitiesDbal42']
39+
), 'QueryResult\EntitiesDbal42\\');
40+
}
41+
3242
$config->setMetadataDriverImpl($metadataDriver);
3343

3444
return new EntityManager(

0 commit comments

Comments
 (0)