Require PHPStan 1.10

composer.json

@@ -7,7 +7,7 @@
  ],
  "require": {
  "php": "^7.2 || ^8.0",
- "phpstan/phpstan": "^1.9.11"
+ "phpstan/phpstan": "^1.10"
  },
  "conflict": {
  "doctrine/collections": "<1.0",

phpstan-baseline.neon

@@ -1,10 +1,5 @@
 parameters:
  ignoreErrors:
- -
- message: "#^Parameter \\#1 \\$entityName of class Doctrine\\\\ORM\\\\Mapping\\\\ClassMetadata constructor expects class\\-string\\<T of object\\>, string given\\.$#"
- count: 1
- path: src/Doctrine/Mapping/ClassMetadataFactory.php
-
  -
  message: "#^Calling PHPStan\\\\Type\\\\ParserNodeTypeToPHPStanType\\:\\:resolve\\(\\) is not covered by backward compatibility promise\\. The method might change in a minor PHPStan version\\.$#"
  count: 1
@@ -26,14 +21,9 @@ parameters:
  path: src/Rules/Doctrine/ORM/EntityRelationRule.php
 
  -
- message: "#^Calling PHPStan\\\\Analyser\\\\MutatingScope\\:\\:enterNamespace\\(\\) is not covered by backward compatibility promise\\. The method might change in a minor PHPStan version\\.$#"
- count: 1
- path: src/Type/Doctrine/QueryBuilder/OtherMethodQueryBuilderParser.php
-
- -
- message: "#^Call to method getProperty\\(\\) on an unknown class PHPStan\\\\BetterReflection\\\\Reflection\\\\Adapter\\\\ReflectionEnum\\.$#"
+ message: "#^PHPDoc tag @var with type class\\-string is not subtype of native type 'Doctrine\\\\\\\\Bundle…'\\.$#"
  count: 1
- path: src/Rules/Gedmo/PropertiesExtension.php
+ path: src/Stubs/Doctrine/StubFilesExtensionLoader.php
 
  -
  message: "#^Accessing PHPStan\\\\Rules\\\\DeadCode\\\\UnusedPrivatePropertyRule\\:\\:class is not covered by backward compatibility promise\\. The class might change in a minor PHPStan version\\.$#"

src/Type/Doctrine/ObjectMetadataResolver.php

@@ -3,11 +3,10 @@
 namespace PHPStan\Type\Doctrine;
 
 use Doctrine\Common\Annotations\AnnotationException;
-use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Mapping\ClassMetadataInfo;
 use Doctrine\ORM\Mapping\MappingException;
-use Doctrine\Persistence\Mapping\ClassMetadataFactory;
 use Doctrine\Persistence\ObjectManager;
+use PHPStan\Doctrine\Mapping\ClassMetadataFactory;
 use PHPStan\ShouldNotHappenException;
 use ReflectionException;
 use function class_exists;
@@ -24,7 +23,7 @@ final class ObjectMetadataResolver
  /** @var ObjectManager|false|null */
  private $objectManager;
 
- /** @var ClassMetadataFactory<ClassMetadata<object>>|null */
+ /** @var ClassMetadataFactory|null */
  private $metadataFactory;
 
  public function __construct(
@@ -88,9 +87,6 @@ public function isTransient(string $className): bool
  }
  }
 
- /**
- * @return ClassMetadataFactory<ClassMetadata<object>>
- */
  private function getMetadataFactory(): ?ClassMetadataFactory
  {
  if ($this->metadataFactory !== null) {
@@ -101,10 +97,7 @@ private function getMetadataFactory(): ?ClassMetadataFactory
  return null;
  }
 
- /** @var ClassMetadataFactory<ClassMetadata<object>> $metadataFactory */
- $metadataFactory = new \PHPStan\Doctrine\Mapping\ClassMetadataFactory();
-
- return $this->metadataFactory = $metadataFactory;
+ return $this->metadataFactory = new ClassMetadataFactory();
  }
 
  /**