Update build-cs

.github/workflows/build.yml

@@ -63,7 +63,7 @@ jobs:
         with:
           repository: "phpstan/build-cs"
           path: "build-cs"
-          ref: "1.x"
+          ref: "2.x"
 
       - name: "Install PHP"
         uses: "shivammathur/setup-php@v2"

Makefile

@@ -14,7 +14,7 @@ lint:
 .PHONY: cs-install
 cs-install:
 	git clone https://github.com/phpstan/build-cs.git || true
-	git -C build-cs fetch origin && git -C build-cs reset --hard origin/1.x
+	git -C build-cs fetch origin && git -C build-cs reset --hard origin/2.x
 	composer install --working-dir build-cs
 
 .PHONY: cs

src/Classes/DoctrineProxyForbiddenClassNamesExtension.php

@@ -8,8 +8,7 @@
 class DoctrineProxyForbiddenClassNamesExtension implements ForbiddenClassNameExtension
 {
 
-	/** @var ObjectMetadataResolver */
-	private $objectMetadataResolver;
+	private ObjectMetadataResolver $objectMetadataResolver;
 
 	public function __construct(ObjectMetadataResolver $objectMetadataResolver)
 	{

src/Doctrine/DoctrineDiagnoseExtension.php

@@ -15,11 +15,9 @@
 class DoctrineDiagnoseExtension implements DiagnoseExtension
 {
 
-	/** @var ObjectMetadataResolver */
-	private $objectMetadataResolver;
+	private ObjectMetadataResolver $objectMetadataResolver;
 
-	/** @var DriverDetector */
-	private $driverDetector;
+	private DriverDetector $driverDetector;
 
 	public function __construct(
 		ObjectMetadataResolver $objectMetadataResolver,
@@ -34,7 +32,7 @@ public function print(Output $output): void
 	{
 		$output->writeLineFormatted(sprintf(
 			'<info>Doctrine\'s objectManagerLoader:</info> %s',
-			$this->objectMetadataResolver->hasObjectManagerLoader() ? 'In use' : 'No'
+			$this->objectMetadataResolver->hasObjectManagerLoader() ? 'In use' : 'No',
 		));
 
 		$objectManager = $this->objectMetadataResolver->getObjectManager();
@@ -44,7 +42,7 @@ public function print(Output $output): void
 
 			$output->writeLineFormatted(sprintf(
 				'<info>Detected driver:</info> %s',
-				$driver === null ? 'None' : $driver
+				$driver === null ? 'None' : $driver,
 			));
 		}
 

src/Doctrine/Mapping/ClassMetadataFactory.php

@@ -18,8 +18,7 @@
 class ClassMetadataFactory extends \Doctrine\ORM\Mapping\ClassMetadataFactory
 {
 
-	/** @var string */
-	private $tmpDir;
+	private string $tmpDir;
 
 	public function __construct(string $tmpDir)
 	{

src/Doctrine/Mapping/MappingDriverChain.php

@@ -11,7 +11,7 @@ class MappingDriverChain implements MappingDriver
 {
 
 	/** @var MappingDriver[] */
-	private $drivers;
+	private array $drivers;
 
 	/**
 	 * @param MappingDriver[] $drivers

src/PhpDoc/Doctrine/DoctrineLiteralStringTypeNodeResolverExtension.php

@@ -14,8 +14,7 @@
 class DoctrineLiteralStringTypeNodeResolverExtension implements TypeNodeResolverExtension
 {
 
-	/** @var bool */
-	private $enabled;
+	private bool $enabled;
 
 	public function __construct(bool $enabled)
 	{

src/PhpDoc/Doctrine/QueryTypeNodeResolverExtension.php

@@ -18,8 +18,7 @@
 class QueryTypeNodeResolverExtension implements TypeNodeResolverExtension, TypeNodeResolverAwareExtension
 {
 
-	/** @var TypeNodeResolver */
-	private $typeNodeResolver;
+	private TypeNodeResolver $typeNodeResolver;
 
 	public function setTypeNodeResolver(TypeNodeResolver $typeNodeResolver): void
 	{
@@ -47,7 +46,7 @@ public function resolve(TypeNode $typeNode, NameScope $nameScope): ?Type
 			[
 				new NullType(),
 				$this->typeNodeResolver->resolve($typeNode->genericTypes[0], $nameScope),
-			]
+			],
 		);
 	}
 

src/Reflection/Doctrine/DoctrineSelectableClassReflectionExtension.php

@@ -10,8 +10,7 @@
 class DoctrineSelectableClassReflectionExtension implements MethodsClassReflectionExtension
 {
 
-	/** @var ReflectionProvider */
-	private $reflectionProvider;
+	private ReflectionProvider $reflectionProvider;
 
 	public function __construct(ReflectionProvider $reflectionProvider)
 	{

src/Reflection/Doctrine/DummyParameter.php

@@ -9,23 +9,17 @@
 class DummyParameter implements ParameterReflection
 {
 
-	/** @var string */
-	private $name;
+	private string $name;
 
-	/** @var Type */
-	private $type;
+	private Type $type;
 
-	/** @var bool */
-	private $optional;
+	private bool $optional;
 
-	/** @var PassedByReference */
-	private $passedByReference;
+	private PassedByReference $passedByReference;
 
-	/** @var bool */
-	private $variadic;
+	private bool $variadic;
 
-	/** @var Type|null */
-	private $defaultValue;
+	private ?Type $defaultValue = null;
 
 	public function __construct(string $name, Type $type, bool $optional, ?PassedByReference $passedByReference, bool $variadic, ?Type $defaultValue)
 	{

src/Reflection/Doctrine/EntityRepositoryClassReflectionExtension.php

@@ -22,8 +22,7 @@
 class EntityRepositoryClassReflectionExtension implements MethodsClassReflectionExtension
 {
 
-	/** @var ObjectMetadataResolver */
-	private $objectMetadataResolver;
+	private ObjectMetadataResolver $objectMetadataResolver;
 
 	public function __construct(ObjectMetadataResolver $objectMetadataResolver)
 	{

src/Reflection/Doctrine/MagicRepositoryMethodReflection.php

@@ -21,14 +21,11 @@
 class MagicRepositoryMethodReflection implements MethodReflection
 {
 
-	/** @var ClassReflection */
-	private $declaringClass;
+	private ClassReflection $declaringClass;
 
-	/** @var string */
-	private $name;
+	private string $name;
 
-	/** @var Type */
-	private $type;
+	private Type $type;
 
 	public function __construct(
 		ClassReflection $declaringClass,
@@ -104,7 +101,7 @@ public function getVariants(): array
 				null,
 				$arguments,
 				false,
-				$this->type
+				$this->type,
 			),
 		];
 	}

src/Rules/Doctrine/ORM/DqlRule.php

@@ -21,8 +21,7 @@
 class DqlRule implements Rule
 {
 
-	/** @var ObjectMetadataResolver */
-	private $objectMetadataResolver;
+	private ObjectMetadataResolver $objectMetadataResolver;
 
 	public function __construct(ObjectMetadataResolver $objectMetadataResolver)
 	{

src/Rules/Doctrine/ORM/EntityColumnRule.php

@@ -34,23 +34,17 @@
 class EntityColumnRule implements Rule
 {
 
-	/** @var ObjectMetadataResolver */
-	private $objectMetadataResolver;
+	private ObjectMetadataResolver $objectMetadataResolver;
 
-	/** @var DescriptorRegistry */
-	private $descriptorRegistry;
+	private DescriptorRegistry $descriptorRegistry;
 
-	/** @var ReflectionProvider */
-	private $reflectionProvider;
+	private ReflectionProvider $reflectionProvider;
 
-	/** @var bool */
-	private $reportUnknownTypes;
+	private bool $reportUnknownTypes;
 
-	/** @var bool */
-	private $allowNullablePropertyForRequiredField;
+	private bool $allowNullablePropertyForRequiredField;
 
-	/** @var bool */
-	private $bleedingEdge;
+	private bool $bleedingEdge;
 
 	public function __construct(
 		ObjectMetadataResolver $objectMetadataResolver,
@@ -106,7 +100,7 @@ public function processNode(Node $node, Scope $scope): array
 					'Property %s::$%s: Doctrine type "%s" does not have any registered descriptor.',
 					$className,
 					$propertyName,
-					$fieldMapping['type']
+					$fieldMapping['type'],
 				))->identifier('doctrine.descriptorNotFound')->build(),
 			] : [];
 		}
@@ -128,7 +122,7 @@ public function processNode(Node $node, Scope $scope): array
 								$propertyName,
 								$backedEnumType->describe(VerbosityLevel::typeOnly()),
 								$enumReflection->getDisplayName(),
-								$writableToDatabaseType->describe(VerbosityLevel::typeOnly())
+								$writableToDatabaseType->describe(VerbosityLevel::typeOnly()),
 							))->identifier('doctrine.enumType')->build();
 						}
 					}
@@ -151,20 +145,20 @@ public function processNode(Node $node, Scope $scope): array
 									$backedEnumType->describe(VerbosityLevel::typeOnly()),
 									$enumReflection->getDisplayName(),
 									$writableToDatabaseType->getIterableValueType()->describe(VerbosityLevel::typeOnly()),
-									$writableToDatabaseType->describe(VerbosityLevel::typeOnly())
-								)
+									$writableToDatabaseType->describe(VerbosityLevel::typeOnly()),
+								),
 							)->identifier('doctrine.enumType')->build();
 						}
 					}
 				}
 
 				$writableToPropertyType = TypeCombinator::intersect(new ArrayType(
 					$writableToPropertyType->getIterableKeyType(),
-					$enumType
+					$enumType,
 				), ...TypeUtils::getAccessoryTypes($writableToPropertyType));
 				$writableToDatabaseType = TypeCombinator::intersect(new ArrayType(
 					$writableToDatabaseType->getIterableKeyType(),
-					$enumType
+					$enumType,
 				), ...TypeUtils::getAccessoryTypes($writableToDatabaseType));
 
 			}
@@ -211,23 +205,23 @@ public function processNode(Node $node, Scope $scope): array
 				$className,
 				$propertyName,
 				$writableToPropertyType->describe(VerbosityLevel::getRecommendedLevelByType($propertyTransformedType, $writableToPropertyType)),
-				$propertyType->describe(VerbosityLevel::getRecommendedLevelByType($propertyTransformedType, $writableToPropertyType))
+				$propertyType->describe(VerbosityLevel::getRecommendedLevelByType($propertyTransformedType, $writableToPropertyType)),
 			))->identifier('doctrine.columnType')->build();
 		}
 
 		if (
 			!$writableToDatabaseType->isSuperTypeOf(
 				$this->allowNullablePropertyForRequiredField || (in_array($propertyName, $identifiers, true) && !$nullable)
 					? TypeCombinator::removeNull($propertyType)
-					: $propertyType
+					: $propertyType,
 			)->yes()
 		) {
 			$errors[] = RuleErrorBuilder::message(sprintf(
 				'Property %s::$%s type mapping mismatch: property can contain %s but database expects %s.',
 				$className,
 				$propertyName,
 				$propertyTransformedType->describe(VerbosityLevel::getRecommendedLevelByType($writableToDatabaseType, $propertyType)),
-				$writableToDatabaseType->describe(VerbosityLevel::getRecommendedLevelByType($writableToDatabaseType, $propertyType))
+				$writableToDatabaseType->describe(VerbosityLevel::getRecommendedLevelByType($writableToDatabaseType, $propertyType)),
 			))->identifier('doctrine.columnType')->build();
 		}
 		return $errors;

src/Rules/Doctrine/ORM/EntityConstructorNotFinalRule.php

@@ -17,8 +17,7 @@
 class EntityConstructorNotFinalRule implements Rule
 {
 
-	/** @var ObjectMetadataResolver */
-	private $objectMetadataResolver;
+	private ObjectMetadataResolver $objectMetadataResolver;
 
 	public function __construct(ObjectMetadataResolver $objectMetadataResolver)
 	{
@@ -57,7 +56,7 @@ public function processNode(Node $node, Scope $scope): array
 		return [
 			RuleErrorBuilder::message(sprintf(
 				'Constructor of class %s is final which can cause problems with proxies.',
-				$classReflection->getDisplayName()
+				$classReflection->getDisplayName(),
 			))->identifier('doctrine.finalConstructor')->build(),
 		];
 	}

src/Rules/Doctrine/ORM/EntityMappingExceptionRule.php

@@ -18,8 +18,7 @@
 class EntityMappingExceptionRule implements Rule
 {
 
-	/** @var ObjectMetadataResolver */
-	private $objectMetadataResolver;
+	private ObjectMetadataResolver $objectMetadataResolver;
 
 	public function __construct(
 		ObjectMetadataResolver $objectMetadataResolver

src/Rules/Doctrine/ORM/EntityNotFinalRule.php

@@ -17,8 +17,7 @@
 class EntityNotFinalRule implements Rule
 {
 
-	/** @var ObjectMetadataResolver */
-	private $objectMetadataResolver;
+	private ObjectMetadataResolver $objectMetadataResolver;
 
 	public function __construct(ObjectMetadataResolver $objectMetadataResolver)
 	{
@@ -52,7 +51,7 @@ public function processNode(Node $node, Scope $scope): array
 		return [
 			RuleErrorBuilder::message(sprintf(
 				'Entity class %s is final which can cause problems with proxies.',
-				$classReflection->getDisplayName()
+				$classReflection->getDisplayName(),
 			))->identifier('doctrine.finalEntity')->build(),
 		];
 	}