Update build-cs

ondrejmirtes · ondrejmirtes · commit fb9cf756bc97 · 2024-09-04T22:49:02.000+02:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -56,7 +56,7 @@ jobs:
         with:
           repository: "phpstan/build-cs"
           path: "build-cs"
-          ref: "1.x"
+          ref: "2.x"
 
       - name: "Install PHP"
         uses: "shivammathur/setup-php@v2"
diff --git a/Makefile b/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
diff --git a/src/Reflection/Nette/HtmlMethodReflection.php b/src/Reflection/Nette/HtmlMethodReflection.php
@@ -18,11 +18,9 @@
 class HtmlMethodReflection implements MethodReflection
 {
 
-	/** @var string */
-	private $name;
+	private string $name;
 
-	/** @var ClassReflection */
-	private $declaringClass;
+	private ClassReflection $declaringClass;
 
 	public function __construct(string $name, ClassReflection $declaringClass)
 	{
@@ -56,7 +54,7 @@ public function getVariants(): array
 				TemplateTypeMap::createEmpty(),
 				[],
 				true,
-				substr($this->name, 0, 3) === 'get' ? new MixedType() : new ObjectType('Nette\Utils\Html')
+				substr($this->name, 0, 3) === 'get' ? new MixedType() : new ObjectType('Nette\Utils\Html'),
 			),
 		];
 	}
diff --git a/src/Reflection/Nette/HtmlPropertyReflection.php b/src/Reflection/Nette/HtmlPropertyReflection.php
@@ -11,11 +11,9 @@
 class HtmlPropertyReflection implements PropertyReflection
 {
 
-	/** @var ClassReflection */
-	private $declaringClass;
+	private ClassReflection $declaringClass;
 
-	/** @var Type */
-	private $type;
+	private Type $type;
 
 	public function __construct(ClassReflection $declaringClass)
 	{
diff --git a/src/Reflection/Nette/NetteObjectEventListenerMethodReflection.php b/src/Reflection/Nette/NetteObjectEventListenerMethodReflection.php
@@ -15,11 +15,9 @@
 class NetteObjectEventListenerMethodReflection implements MethodReflection
 {
 
-	/** @var string */
-	private $name;
+	private string $name;
 
-	/** @var ClassReflection */
-	private $declaringClass;
+	private ClassReflection $declaringClass;
 
 	public function __construct(string $name, ClassReflection $declaringClass)
 	{
@@ -58,7 +56,7 @@ public function getVariants(): array
 				TemplateTypeMap::createEmpty(),
 				[],
 				true,
-				new VoidType()
+				new VoidType(),
 			),
 		];
 	}
diff --git a/src/Reflection/Nette/NetteObjectPropertyReflection.php b/src/Reflection/Nette/NetteObjectPropertyReflection.php
@@ -10,11 +10,9 @@
 class NetteObjectPropertyReflection implements PropertyReflection
 {
 
-	/** @var ClassReflection */
-	private $declaringClass;
+	private ClassReflection $declaringClass;
 
-	/** @var Type */
-	private $type;
+	private Type $type;
 
 	public function __construct(ClassReflection $declaringClass, Type $type)
 	{
diff --git a/src/Rule/Nette/DoNotExtendNetteObjectRule.php b/src/Rule/Nette/DoNotExtendNetteObjectRule.php
@@ -34,7 +34,7 @@ public function processNode(Node $node, Scope $scope): array
 					"Class %s extends %s - it's better to use %s trait.",
 					$classReflection->getDisplayName(),
 					'Nette\Object',
-					'Nette\SmartObject'
+					'Nette\SmartObject',
 				))->identifier('class.extendsNetteObject')->build(),
 			];
 		}
diff --git a/src/Rule/Nette/RethrowExceptionRule.php b/src/Rule/Nette/RethrowExceptionRule.php
@@ -28,7 +28,7 @@ class RethrowExceptionRule implements Rule
 {
 
 	/** @var array<string, string[]> */
-	private $methods;
+	private array $methods;
 
 	/**
 	 * @param string[][] $methods
@@ -68,9 +68,7 @@ public function processNode(Node $node, Scope $scope): array
 		foreach ($exceptions as $exceptionName) {
 			$exceptionType = new ObjectType($exceptionName);
 			foreach ($node->catches as $catch) {
-				$caughtType = TypeCombinator::union(...array_map(static function (Name $class): ObjectType {
-					return new ObjectType((string) $class);
-				}, $catch->types));
+				$caughtType = TypeCombinator::union(...array_map(static fn (Name $class): ObjectType => new ObjectType((string) $class), $catch->types));
 				if (!$caughtType->isSuperTypeOf($exceptionType)->yes()) {
 					continue;
 				}
diff --git a/src/Type/Nette/ComponentGetPresenterDynamicReturnTypeExtension.php b/src/Type/Nette/ComponentGetPresenterDynamicReturnTypeExtension.php
@@ -27,7 +27,7 @@ public function isMethodSupported(MethodReflection $methodReflection): bool
 	public function getTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): Type
 	{
 		$methodDefinition = ParametersAcceptorSelector::selectSingle(
-			$methodReflection->getVariants()
+			$methodReflection->getVariants(),
 		);
 		$defaultReturnType = $methodDefinition->getReturnType();
 		$firstParameterExists = count($methodDefinition->getParameters()) > 0;
diff --git a/src/Type/Nette/ComponentLookupDynamicReturnTypeExtension.php b/src/Type/Nette/ComponentLookupDynamicReturnTypeExtension.php
@@ -27,7 +27,7 @@ public function isMethodSupported(MethodReflection $methodReflection): bool
 	public function getTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): Type
 	{
 		$defaultReturnType = ParametersAcceptorSelector::selectSingle(
-			$methodReflection->getVariants()
+			$methodReflection->getVariants(),
 		)->getReturnType();
 		if (count($methodCall->getArgs()) < 2) {
 			return $defaultReturnType;
diff --git a/src/Type/Nette/StringsMatchAllDynamicReturnTypeExtension.php b/src/Type/Nette/StringsMatchAllDynamicReturnTypeExtension.php
@@ -22,8 +22,7 @@
 class StringsMatchAllDynamicReturnTypeExtension implements DynamicStaticMethodReturnTypeExtension
 {
 
-	/** @var RegexArrayShapeMatcher */
-	private $regexArrayShapeMatcher;
+	private RegexArrayShapeMatcher $regexArrayShapeMatcher;
 
 	public function __construct(RegexArrayShapeMatcher $regexArrayShapeMatcher)
 	{
@@ -53,7 +52,7 @@ public function getTypeFromStaticMethodCall(MethodReflection $methodReflection,
 			$patternArg->value,
 			$this->resolveFlagsType($args, $scope),
 			TrinaryLogic::createYes(),
-			$scope
+			$scope,
 		);
 	}
 
@@ -83,7 +82,7 @@ private function resolveFlagsType(array $args, Scope $scope): ConstantIntegerTyp
 		$patternOrder = $patternOrderType->isTrue()->yes();
 
 		return new ConstantIntegerType(
-			($captureOffset ? PREG_OFFSET_CAPTURE : 0) | ($unmatchedAsNull ? PREG_UNMATCHED_AS_NULL : 0) | ($patternOrder ? PREG_PATTERN_ORDER : 0)
+			($captureOffset ? PREG_OFFSET_CAPTURE : 0) | ($unmatchedAsNull ? PREG_UNMATCHED_AS_NULL : 0) | ($patternOrder ? PREG_PATTERN_ORDER : 0),
 		);
 	}
 
diff --git a/src/Type/Nette/StringsMatchDynamicReturnTypeExtension.php b/src/Type/Nette/StringsMatchDynamicReturnTypeExtension.php
@@ -22,8 +22,7 @@
 class StringsMatchDynamicReturnTypeExtension implements DynamicStaticMethodReturnTypeExtension
 {
 
-	/** @var RegexArrayShapeMatcher */
-	private $regexArrayShapeMatcher;
+	private RegexArrayShapeMatcher $regexArrayShapeMatcher;
 
 	public function __construct(RegexArrayShapeMatcher $regexArrayShapeMatcher)
 	{
@@ -53,7 +52,7 @@ public function getTypeFromStaticMethodCall(MethodReflection $methodReflection,
 			$patternArg->value,
 			$this->resolveFlagsType($args, $scope),
 			TrinaryLogic::createYes(),
-			$scope
+			$scope,
 		);
 
 		if ($arrayShape === null) {
@@ -84,7 +83,7 @@ private function resolveFlagsType(array $args, Scope $scope): ConstantIntegerTyp
 		$unmatchedAsNull = $unmatchedAsNullType->isTrue()->yes();
 
 		return new ConstantIntegerType(
-			($captureOffset ? PREG_OFFSET_CAPTURE : 0) | ($unmatchedAsNull ? PREG_UNMATCHED_AS_NULL : 0)
+			($captureOffset ? PREG_OFFSET_CAPTURE : 0) | ($unmatchedAsNull ? PREG_UNMATCHED_AS_NULL : 0),
 		);
 	}
 
diff --git a/src/Type/Nette/StringsReplaceCallbackClosureTypeExtension.php b/src/Type/Nette/StringsReplaceCallbackClosureTypeExtension.php
@@ -24,8 +24,7 @@
 final class StringsReplaceCallbackClosureTypeExtension implements StaticMethodParameterClosureTypeExtension
 {
 
-	/** @var RegexArrayShapeMatcher */
-	private $regexArrayShapeMatcher;
+	private RegexArrayShapeMatcher $regexArrayShapeMatcher;
 
 	public function __construct(RegexArrayShapeMatcher $regexArrayShapeMatcher)
 	{
@@ -59,7 +58,7 @@ public function getTypeFromStaticMethodCall(MethodReflection $methodReflection,
 			$patternArg->value,
 			$this->resolveFlagsType($args, $scope),
 			TrinaryLogic::createYes(),
-			$scope
+			$scope,
 		);
 
 		if ($matchesType === null) {
@@ -70,7 +69,7 @@ public function getTypeFromStaticMethodCall(MethodReflection $methodReflection,
 			[
 				$this->createParameterReflectionClass($parameter, $matchesType),
 			],
-			new StringType()
+			new StringType(),
 		);
 	}
 
@@ -92,11 +91,9 @@ private function createParameterReflectionClass(ParameterReflection $parameter,
 	{
 		return new class($parameter, $matchesType) implements ParameterReflection {
 
-			/** @var ParameterReflection */
-			private $parameter;
+			private ParameterReflection $parameter;
 
-			/** @var Type */
-			private $matchesType;
+			private Type $matchesType;
 
 			public function __construct(
 				ParameterReflection $parameter,
diff --git a/tests/NetteObjectChild.php b/tests/NetteObjectChild.php
@@ -8,10 +8,10 @@ class NetteObjectChild extends LegacyObject
 {
 
 	/** @var callable[] */
-	public $onPublicEvent = [];
+	public array $onPublicEvent = [];
 
 	/** @var callable[] */
-	protected $onProtectedEvent = [];
+	protected array $onProtectedEvent = [];
 
 	public static function getStaticProperty(): string
 	{
diff --git a/tests/Reflection/Nette/HtmlClassReflectionExtensionTest.php b/tests/Reflection/Nette/HtmlClassReflectionExtensionTest.php
@@ -12,11 +12,9 @@
 class HtmlClassReflectionExtensionTest extends PHPStanTestCase
 {
 
-	/** @var Broker */
-	private $broker;
+	private Broker $broker;
 
-	/** @var HtmlClassReflectionExtension */
-	private $extension;
+	private HtmlClassReflectionExtension $extension;
 
 	protected function setUp(): void
 	{
diff --git a/tests/Reflection/Nette/NetteObjectClassReflectionExtensionTest.php b/tests/Reflection/Nette/NetteObjectClassReflectionExtensionTest.php
@@ -11,11 +11,9 @@
 class NetteObjectClassReflectionExtensionTest extends PHPStanTestCase
 {
 
-	/** @var Broker */
-	private $broker;
+	private Broker $broker;
 
-	/** @var NetteObjectClassReflectionExtension */
-	private $extension;
+	private NetteObjectClassReflectionExtension $extension;
 
 	protected function setUp(): void
 	{
diff --git a/tests/Rule/Nette/RegularExpressionPatternRuleTest.php b/tests/Rule/Nette/RegularExpressionPatternRuleTest.php
@@ -67,7 +67,7 @@ public function testValidRegexPatternBefore73(): void
 					'Regex pattern is invalid: Compilation failed: missing ) at offset 1 in pattern: ~(~',
 					26,
 				],
-			]
+			],
 		);
 	}
 
@@ -128,7 +128,7 @@ public function testValidRegexPatternAfter73(): void
 					'Regex pattern is invalid: Compilation failed: missing closing parenthesis at offset 1 in pattern: ~(~',
 					26,
 				],
-			]
+			],
 		);
 	}
 
diff --git a/tests/Rule/Nette/RethrowExceptionRuleTest.php b/tests/Rule/Nette/RethrowExceptionRuleTest.php
@@ -16,7 +16,7 @@ class RethrowExceptionRuleTest extends RuleTestCase
 	protected function getRule(): Rule
 	{
 		return new RethrowExceptionRule(
-			[FooPresenter::class => ['redirect' => AbortException::class]]
+			[FooPresenter::class => ['redirect' => AbortException::class]],
 		);
 	}
 
diff --git a/tests/SmartObjectChild.php b/tests/SmartObjectChild.php
@@ -10,9 +10,9 @@ class SmartObjectChild
 	use SmartObject;
 
 	/** @var callable[] */
-	public $onPublicEvent = [];
+	public array $onPublicEvent = [];
 
 	/** @var callable[] */
-	protected $onProtectedEvent = [];
+	protected array $onProtectedEvent = [];
 
 }
diff --git a/tests/Type/Nette/FormContainerValuesDynamicReturnTypeExtensionTest.php b/tests/Type/Nette/FormContainerValuesDynamicReturnTypeExtensionTest.php
@@ -22,8 +22,7 @@
 final class FormContainerValuesDynamicReturnTypeExtensionTest extends TestCase
 {
 
-	/** @var FormContainerValuesDynamicReturnTypeExtension */
-	private $extension;
+	private FormContainerValuesDynamicReturnTypeExtension $extension;
 
 	protected function setUp(): void
 	{
@@ -40,7 +39,7 @@ public function testParameterAsArray(): void
 				TemplateTypeMap::createEmpty(),
 				[],
 				true,
-				new UnionType([new ArrayType(new MixedType(), new MixedType()), new IterableType(new MixedType(), new ObjectType(ArrayHash::class))])
+				new UnionType([new ArrayType(new MixedType(), new MixedType()), new IterableType(new MixedType(), new ObjectType(ArrayHash::class))]),
 			)]);
 
 		$scope = $this->createMock(Scope::class);

Original file line number	Diff line number	Diff line change
`@@ -18,11 +18,9 @@`
`18`	`18`	`class HtmlMethodReflection implements MethodReflection`
`19`	`19`	`{`
`20`	`20`
`21`		`- /** @var string */`
`22`		`- private $name;`
	`21`	`+ private string $name;`
`23`	`22`
`24`		`- /** @var ClassReflection */`
`25`		`- private $declaringClass;`
	`23`	`+ private ClassReflection $declaringClass;`
`26`	`24`
`27`	`25`	`public function __construct(string $name, ClassReflection $declaringClass)`
`28`	`26`	`{`
`@@ -56,7 +54,7 @@ public function getVariants(): array`
`56`	`54`	`TemplateTypeMap::createEmpty(),`
`57`	`55`	`[],`
`58`	`56`	`true,`
`59`		`- substr($this->name, 0, 3) === 'get' ? new MixedType() : new ObjectType('Nette\Utils\Html')`
	`57`	`+ substr($this->name, 0, 3) === 'get' ? new MixedType() : new ObjectType('Nette\Utils\Html'),`
`60`	`58`	`),`
`61`	`59`	`];`
`62`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,11 +11,9 @@`
`11`	`11`	`class HtmlPropertyReflection implements PropertyReflection`
`12`	`12`	`{`
`13`	`13`
`14`		`- /** @var ClassReflection */`
`15`		`- private $declaringClass;`
	`14`	`+ private ClassReflection $declaringClass;`
`16`	`15`
`17`		`- /** @var Type */`
`18`		`- private $type;`
	`16`	`+ private Type $type;`
`19`	`17`
`20`	`18`	`public function __construct(ClassReflection $declaringClass)`
`21`	`19`	`{`
Original file line number	Diff line number	Diff line change
`@@ -15,11 +15,9 @@`
`15`	`15`	`class NetteObjectEventListenerMethodReflection implements MethodReflection`
`16`	`16`	`{`
`17`	`17`
`18`		`- /** @var string */`
`19`		`- private $name;`
	`18`	`+ private string $name;`
`20`	`19`
`21`		`- /** @var ClassReflection */`
`22`		`- private $declaringClass;`
	`20`	`+ private ClassReflection $declaringClass;`
`23`	`21`
`24`	`22`	`public function __construct(string $name, ClassReflection $declaringClass)`
`25`	`23`	`{`
`@@ -58,7 +56,7 @@ public function getVariants(): array`
`58`	`56`	`TemplateTypeMap::createEmpty(),`
`59`	`57`	`[],`
`60`	`58`	`true,`
`61`		`- new VoidType()`
	`59`	`+ new VoidType(),`
`62`	`60`	`),`
`63`	`61`	`];`
`64`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,11 +10,9 @@`
`10`	`10`	`class NetteObjectPropertyReflection implements PropertyReflection`
`11`	`11`	`{`
`12`	`12`
`13`		`- /** @var ClassReflection */`
`14`		`- private $declaringClass;`
	`13`	`+ private ClassReflection $declaringClass;`
`15`	`14`
`16`		`- /** @var Type */`
`17`		`- private $type;`
	`15`	`+ private Type $type;`
`18`	`16`
`19`	`17`	`public function __construct(ClassReflection $declaringClass, Type $type)`
`20`	`18`	`{`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public function processNode(Node $node, Scope $scope): array`
`34`	`34`	`"Class %s extends %s - it's better to use %s trait.",`
`35`	`35`	`$classReflection->getDisplayName(),`
`36`	`36`	`'Nette\Object',`
`37`		`- 'Nette\SmartObject'`
	`37`	`+ 'Nette\SmartObject',`
`38`	`38`	`))->identifier('class.extendsNetteObject')->build(),`
`39`	`39`	`];`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public function isMethodSupported(MethodReflection $methodReflection): bool`
`27`	`27`	`public function getTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): Type`
`28`	`28`	`{`
`29`	`29`	`$methodDefinition = ParametersAcceptorSelector::selectSingle(`
`30`		`- $methodReflection->getVariants()`
	`30`	`+ $methodReflection->getVariants(),`
`31`	`31`	`);`
`32`	`32`	`$defaultReturnType = $methodDefinition->getReturnType();`
`33`	`33`	`$firstParameterExists = count($methodDefinition->getParameters()) > 0;`