Update build-cs

Author: ondrejmirtes

.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)
 	{