Skip to content

Commit 898eb68

Browse files
Fix
1 parent 26956fe commit 898eb68

15 files changed

+200
-257
lines changed

src/Doctrine/Mapping/ClassMetadataFactory.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public function __construct(string $tmpDir)
2828
protected function initialize(): void
2929
{
3030
$drivers = [];
31-
if (class_exists(AnnotationReader::class)) {
31+
if (class_exists(AnnotationDriver::class) && class_exists(AnnotationReader::class)) {
3232
$docParser = new DocParser();
3333
$docParser->setIgnoreNotImportedAnnotations(true);
3434
$drivers[] = new AnnotationDriver(new AnnotationReader($docParser));
@@ -47,7 +47,7 @@ protected function initialize(): void
4747
'memory' => true,
4848
], $config);
4949

50-
$em = EntityManager::create($connection, $config);
50+
$em = new EntityManager($connection, $config);
5151
$this->setEntityManager($em);
5252
parent::initialize();
5353

@@ -59,7 +59,7 @@ protected function initialize(): void
5959
* @param class-string<T> $className
6060
* @return ClassMetadata<T>
6161
*/
62-
protected function newClassMetadataInstance($className)
62+
protected function newClassMetadataInstance($className): ClassMetadata
6363
{
6464
return new ClassMetadata($className);
6565
}

src/Type/Doctrine/ObjectMetadataResolver.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
namespace PHPStan\Type\Doctrine;
44

55
use Doctrine\Common\Annotations\AnnotationException;
6-
use Doctrine\ORM\Mapping\ClassMetadataInfo;
6+
use Doctrine\ORM\Mapping\ClassMetadata;
77
use Doctrine\ORM\Mapping\MappingException;
88
use Doctrine\Persistence\ObjectManager;
99
use PHPStan\Doctrine\Mapping\ClassMetadataFactory;
@@ -108,9 +108,9 @@ private function getMetadataFactory(): ?ClassMetadataFactory
108108
/**
109109
* @template T of object
110110
* @param class-string<T> $className
111-
* @return ClassMetadataInfo<T>|null
111+
* @return ClassMetadata<T>|null
112112
*/
113-
public function getClassMetadata(string $className): ?ClassMetadataInfo
113+
public function getClassMetadata(string $className): ?ClassMetadata
114114
{
115115
if ($this->isTransient($className)) {
116116
return null;
@@ -135,11 +135,11 @@ public function getClassMetadata(string $className): ?ClassMetadataInfo
135135
return null;
136136
}
137137

138-
if (!$metadata instanceof ClassMetadataInfo) {
138+
if (!$metadata instanceof ClassMetadata) {
139139
return null;
140140
}
141141

142-
/** @var ClassMetadataInfo<T> $ormMetadata */
142+
/** @var ClassMetadata<T> $ormMetadata */
143143
$ormMetadata = $metadata;
144144

145145
return $ormMetadata;

0 commit comments

Comments
 (0)