Skip to content

Commit 750f5ab

Browse files
ondrejmirtesondrejmirtes
committed
Resolve entity metadata without objectManagerLoader
1 parent e7eef10 commit 750f5ab

14 files changed

+441
-34
lines changed

‎composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"doctrine/lexer": "^1.2.1",
2525
"doctrine/mongodb-odm": "^1.3 || ^2.1",
2626
"doctrine/orm": "^2.11.0",
27-
"doctrine/persistence": "^1.1 || ^2.0",
27+
"doctrine/persistence": "^1.3.8 || ^2.2.1",
2828
"nesbot/carbon": "^2.49",
2929
"nikic/php-parser": "^4.13.2",
3030
"php-parallel-lint/php-parallel-lint": "^1.2",

‎phpcs.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@
3737
</properties>
3838
<exclude name="SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingTraversableParameterTypeHintSpecification"/>
3939
<exclude name="SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingTraversableReturnTypeHintSpecification"/>
40+
<exclude name="SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingAnyTypeHint"/>
41+
<exclude name="SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint"/>
4042
</rule>
4143
<rule ref="SlevomatCodingStandard.TypeHints.PropertyTypeHint">
4244
<properties>
@@ -49,6 +51,7 @@
4951
<property name="enableObjectTypeHint" value="false"/>
5052
</properties>
5153
<exclude name="SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingTraversableTypeHintSpecification"/>
54+
<exclude name="SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingAnyTypeHint"/>
5255
</rule>
5356
<rule ref="SlevomatCodingStandard.ControlStructures.AssignmentInCondition"/>
5457
<rule ref="SlevomatCodingStandard.Operators.DisallowEqualOperators"/>

‎src/Doctrine/Mapping/ClassMetadataFactory.php

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
<?php declare(strict_types = 1);
2+
3+
namespace PHPStan\Doctrine\Mapping;
4+
5+
use Doctrine\Common\Annotations\AnnotationReader;
6+
use Doctrine\Common\EventManager;
7+
use Doctrine\DBAL\Platforms\MySqlPlatform;
8+
use Doctrine\ORM\Mapping\ClassMetadata;
9+
use Doctrine\ORM\Mapping\Driver\AnnotationDriver;
10+
use Doctrine\ORM\Mapping\Driver\AttributeDriver;
11+
use function class_exists;
12+
13+
class ClassMetadataFactory extends \Doctrine\ORM\Mapping\ClassMetadataFactory
14+
{
15+
16+
protected function initialize(): void
17+
{
18+
$parentReflection = new \ReflectionClass(parent::class);
19+
$driverProperty = $parentReflection->getProperty('driver');
20+
$driverProperty->setAccessible(true);
21+
22+
$drivers = [
23+
new AnnotationDriver(new AnnotationReader()),
24+
];
25+
if (class_exists(AttributeDriver::class) && PHP_VERSION_ID >= 80000) {
26+
$drivers[] = new AttributeDriver([]);
27+
}
28+
29+
$driverProperty->setValue($this, count($drivers) === 1 ? $drivers[0] : new MappingDriverChain($drivers));
30+
31+
$evmProperty = $parentReflection->getProperty('evm');
32+
$evmProperty->setAccessible(true);
33+
$evmProperty->setValue($this, new EventManager());
34+
$this->initialized = true;
35+
36+
$targetPlatformProperty = $parentReflection->getProperty('targetPlatform');
37+
$targetPlatformProperty->setAccessible(true);
38+
$targetPlatformProperty->setValue($this, new MySqlPlatform());
39+
}
40+
41+
protected function newClassMetadataInstance($className)
42+
{
43+
return new ClassMetadata($className);
44+
}
45+
46+
}

‎src/Doctrine/Mapping/MappingDriverChain.php

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
<?php declare(strict_types = 1);
2+
3+
namespace PHPStan\Doctrine\Mapping;
4+
5+
use Doctrine\Persistence\Mapping\ClassMetadata;
6+
use Doctrine\Persistence\Mapping\Driver\MappingDriver;
7+
8+
class MappingDriverChain implements MappingDriver
9+
{
10+
11+
/** @var MappingDriver[] */
12+
private $drivers;
13+
14+
/**
15+
* @param MappingDriver[] $drivers
16+
*/
17+
public function __construct(array $drivers)
18+
{
19+
$this->drivers = $drivers;
20+
}
21+
22+
/**
23+
* @param class-string $className
24+
*/
25+
public function loadMetadataForClass($className, ClassMetadata $metadata): void
26+
{
27+
foreach ($this->drivers as $driver) {
28+
if ($driver->isTransient($className)) {
29+
continue;
30+
}
31+
32+
$driver->loadMetadataForClass($className, $metadata);
33+
return;
34+
}
35+
}
36+
37+
public function getAllClassNames()
38+
{
39+
$all = [];
40+
foreach ($this->drivers as $driver) {
41+
foreach ($driver->getAllClassNames() as $className) {
42+
$all[] = $className;
43+
}
44+
}
45+
46+
return $all;
47+
}
48+
49+
/**
50+
* @param class-string $className
51+
*/
52+
public function isTransient($className)
53+
{
54+
foreach ($this->drivers as $driver) {
55+
if ($driver->isTransient($className)) {
56+
continue;
57+
}
58+
59+
return false;
60+
}
61+
62+
return true;
63+
}
64+
65+
}

‎src/Type/Doctrine/ObjectMetadataResolver.php

Lines changed: 30 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
namespace PHPStan\Type\Doctrine;
44

5+
use Doctrine\ORM\Mapping\ClassMetadata;
56
use Doctrine\ORM\Mapping\ClassMetadataInfo;
7+
use Doctrine\Persistence\Mapping\ClassMetadataFactory;
68
use Doctrine\Persistence\ObjectManager;
79
use PHPStan\Reflection\ReflectionProvider;
810
use function is_file;
@@ -26,6 +28,9 @@ final class ObjectMetadataResolver
2628
/** @var string|null */
2729
private $resolvedRepositoryClass;
2830

31+
/** @var ClassMetadataFactory<ClassMetadata>|null */
32+
private $metadataFactory;
33+
2934
public function __construct(
3035
ReflectionProvider $reflectionProvider,
3136
?string $objectManagerLoader,
@@ -66,35 +71,51 @@ public function getObjectManager(): ?ObjectManager
6671
public function isTransient(string $className): bool
6772
{
6873
$objectManager = $this->getObjectManager();
69-
if ($objectManager === null) {
70-
return true;
71-
}
7274

7375
try {
76+
if ($objectManager === null) {
77+
return $this->getMetadataFactory()->isTransient($className);
78+
}
79+
7480
return $objectManager->getMetadataFactory()->isTransient($className);
7581
} catch (\ReflectionException $e) {
7682
return true;
7783
}
7884
}
7985

86+
/**
87+
* @return ClassMetadataFactory<ClassMetadata>
88+
*/
89+
private function getMetadataFactory(): ClassMetadataFactory
90+
{
91+
if ($this->metadataFactory !== null) {
92+
return $this->metadataFactory;
93+
}
94+
95+
$metadataFactory = new \PHPStan\Doctrine\Mapping\ClassMetadataFactory();
96+
97+
return $this->metadataFactory = $metadataFactory;
98+
}
99+
80100
/**
81101
* @template T of object
82102
* @param class-string<T> $className
83103
* @return ClassMetadataInfo<T>|null
84104
*/
85105
public function getClassMetadata(string $className): ?ClassMetadataInfo
86106
{
87-
$objectManager = $this->getObjectManager();
88-
if ($objectManager === null) {
89-
return null;
90-
}
91-
92107
if ($this->isTransient($className)) {
93108
return null;
94109
}
95110

111+
$objectManager = $this->getObjectManager();
112+
96113
try {
97-
$metadata = $objectManager->getClassMetadata($className);
114+
if ($objectManager === null) {
115+
$metadata = $this->getMetadataFactory()->getMetadataFor($className);
116+
} else {
117+
$metadata = $objectManager->getClassMetadata($className);
118+
}
98119
} catch (\Doctrine\ORM\Mapping\MappingException $e) {
99120
return null;
100121
}

‎tests/DoctrineIntegration/ORM/EntityManagerWithoutObjectManagerLoaderIntegrationTest.php

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<?php declare(strict_types = 1);
2+
3+
namespace PHPStan\DoctrineIntegration\ORM;
4+
5+
use PHPStan\Testing\LevelsTestCase;
6+
7+
final class EntityManagerWithoutObjectManagerLoaderIntegrationTest extends LevelsTestCase
8+
{
9+
10+
/**
11+
* @return string[][]
12+
*/
13+
public function dataTopics(): array
14+
{
15+
return [
16+
['entityManagerDynamicReturn'],
17+
['entityManagerMergeReturn'],
18+
['customRepositoryUsage'],
19+
['dbalQueryBuilderExecuteDynamicReturn'],
20+
];
21+
}
22+
23+
public function getDataPath(): string
24+
{
25+
return __DIR__ . '/data';
26+
}
27+
28+
public function getPhpStanExecutablePath(): string
29+
{
30+
return __DIR__ . '/../../../vendor/phpstan/phpstan/phpstan';
31+
}
32+
33+
public function getPhpStanConfigPath(): string
34+
{
35+
return __DIR__ . '/phpstan-without-object-manager-loader.neon';
36+
}
37+
38+
}

‎tests/DoctrineIntegration/ORM/EntityRepositoryWithoutObjectManagerLoaderDynamicReturnIntegrationTest.php

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<?php declare(strict_types = 1);
2+
3+
namespace PHPStan\DoctrineIntegration\ORM;
4+
5+
use PHPStan\Testing\LevelsTestCase;
6+
7+
final class EntityRepositoryWithoutObjectManagerLoaderDynamicReturnIntegrationTest extends LevelsTestCase
8+
{
9+
10+
/**
11+
* @return string[][]
12+
*/
13+
public function dataTopics(): array
14+
{
15+
return [
16+
['entityRepositoryDynamicReturn'],
17+
];
18+
}
19+
20+
public function getDataPath(): string
21+
{
22+
if (PHP_MAJOR_VERSION === 7 && PHP_MINOR_VERSION === 1) {
23+
return __DIR__ . '/data-php-7.1';
24+
}
25+
26+
return __DIR__ . '/data';
27+
}
28+
29+
public function getPhpStanExecutablePath(): string
30+
{
31+
return __DIR__ . '/../../../vendor/phpstan/phpstan/phpstan';
32+
}
33+
34+
public function getPhpStanConfigPath(): string
35+
{
36+
return __DIR__ . '/phpstan-without-object-manager-loader.neon';
37+
}
38+
39+
}

‎tests/DoctrineIntegration/ORM/phpstan-without-object-manager-loader.neon

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
includes:
2+
- ../../../extension.neon
3+
- ../../../rules.neon
4+
- phar://phpstan.phar/conf/bleedingEdge.neon
5+
6+
parameters:
7+
doctrine:
8+
reportDynamicQueryBuilders: true
9+
queryBuilderClass: PHPStan\DoctrineIntegration\ORM\QueryBuilder\CustomQueryBuilder

‎tests/DoctrineIntegration/Persistence/data/managerRegistryRepositoryDynamicReturn-4.json

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)