phpstan · renovate · Sep 4, 2024 · Sep 4, 2024 · Sep 4, 2024 · Sep 4, 2024
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -6,7 +6,7 @@ on:
   pull_request:
   push:
     branches:
-      - "1.6.x"
+      - "2.0.x"
 
 jobs:
   lint:
@@ -16,8 +16,6 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "7.2"
-          - "7.3"
           - "7.4"
           - "8.0"
           - "8.1"
@@ -41,10 +39,6 @@ jobs:
       - name: "Install dependencies"
         run: "composer install --no-interaction --no-progress"
 
-      - name: "Downgrade PHPUnit"
-        if: matrix.php-version == '7.2' || matrix.php-version == '7.3'
-        run: "composer require --dev phpunit/phpunit:^7.5.20 --update-with-dependencies"
-
       - name: "Lint"
         run: "make lint"
 
@@ -62,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"
@@ -94,8 +88,6 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - "7.2"
-          - "7.3"
           - "7.4"
           - "8.0"
           - "8.1"
@@ -124,10 +116,6 @@ jobs:
         if: ${{ matrix.dependencies == 'highest' }}
         run: "composer update --no-interaction --no-progress"
 
-      - name: "Downgrade PHPUnit"
-        if: matrix.php-version == '7.2' || matrix.php-version == '7.3'
-        run: "composer require --dev phpunit/phpunit:^7.5.20 --update-with-dependencies"
-
       - name: "Tests"
         run: "make tests"
 
@@ -139,8 +127,6 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - "7.2"
-          - "7.3"
           - "7.4"
           - "8.0"
           - "8.1"
@@ -171,9 +157,5 @@ jobs:
         if: ${{ matrix.dependencies == 'highest' }}
         run: "composer update --no-interaction --no-progress"
 
-      - name: "Downgrade PHPUnit"
-        if: matrix.php-version == '7.2' || matrix.php-version == '7.3'
-        run: "composer require --dev phpunit/phpunit:^7.5.20 --update-with-dependencies"
-
       - name: "PHPStan"
         run: "make phpstan"
diff --git a/.github/workflows/release-tweet.yml b/.github/workflows/release-tweet.yml
@@ -10,7 +10,7 @@ jobs:
   tweet:
     runs-on: ubuntu-latest
     steps:
-      - uses: Eomm/why-don-t-you-tweet@v1
+      - uses: Eomm/why-don-t-you-tweet@v2
         if: ${{ !github.event.repository.private }}
         with:
           # GitHub event payload

diff --git a/Makefile b/Makefile
@@ -13,7 +13,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/composer.json b/composer.json
@@ -6,15 +6,15 @@
 		"MIT"
 	],
 	"require": {
-		"php": "^7.2 || ^8.0",
-		"phpstan/phpstan": "^1.12"
+		"php": "^7.4 || ^8.0",
+		"phpstan/phpstan": "^2.0"
 	},
 	"require-dev": {
 		"nikic/php-parser": "^4.13.0",
 		"php-parallel-lint/php-parallel-lint": "^1.2",
-		"phpstan/phpstan-deprecation-rules": "^1.1",
-		"phpstan/phpstan-phpunit": "^1.0",
-		"phpunit/phpunit": "^9.5"
+		"phpstan/phpstan-deprecation-rules": "^2.0",
+		"phpstan/phpstan-phpunit": "^2.0",
+		"phpunit/phpunit": "^9.6"
 	},
 	"config": {
 		"platform": {

diff --git a/src/Rules/BooleansInConditions/BooleanInBooleanAndRule.php b/src/Rules/BooleansInConditions/BooleanInBooleanAndRule.php
@@ -16,11 +16,9 @@
 class BooleanInBooleanAndRule implements Rule
 {
 
-	/** @var BooleanRuleHelper */
-	private $helper;
+	private BooleanRuleHelper $helper;
 
-	/** @var bool */
-	private $bleedingEdge;
+	private bool $bleedingEdge;
 
 	public function __construct(BooleanRuleHelper $helper, bool $bleedingEdge)
 	{
@@ -44,7 +42,7 @@ public function processNode(Node $node, Scope $scope): array
 			$messages[] = RuleErrorBuilder::message(sprintf(
 				'Only booleans are allowed in %s, %s given on the left side.',
 				$nodeText,
-				$leftType->describe(VerbosityLevel::typeOnly())
+				$leftType->describe(VerbosityLevel::typeOnly()),
 			))->identifier(sprintf('%s.leftNotBoolean', $identifierType))->build();
 		}
 
@@ -54,7 +52,7 @@ public function processNode(Node $node, Scope $scope): array
 			$messages[] = RuleErrorBuilder::message(sprintf(
 				'Only booleans are allowed in %s, %s given on the right side.',
 				$nodeText,
-				$rightType->describe(VerbosityLevel::typeOnly())
+				$rightType->describe(VerbosityLevel::typeOnly()),
 			))->identifier(sprintf('%s.rightNotBoolean', $identifierType))->build();
 		}
 

diff --git a/src/Rules/BooleansInConditions/BooleanInBooleanNotRule.php b/src/Rules/BooleansInConditions/BooleanInBooleanNotRule.php
@@ -16,8 +16,7 @@
 class BooleanInBooleanNotRule implements Rule
 {
 
-	/** @var BooleanRuleHelper */
-	private $helper;
+	private BooleanRuleHelper $helper;
 
 	public function __construct(BooleanRuleHelper $helper)
 	{
@@ -40,7 +39,7 @@ public function processNode(Node $node, Scope $scope): array
 		return [
 			RuleErrorBuilder::message(sprintf(
 				'Only booleans are allowed in a negated boolean, %s given.',
-				$expressionType->describe(VerbosityLevel::typeOnly())
+				$expressionType->describe(VerbosityLevel::typeOnly()),
 			))->identifier('booleanNot.exprNotBoolean')->build(),
 		];
 	}

diff --git a/src/Rules/BooleansInConditions/BooleanInBooleanOrRule.php b/src/Rules/BooleansInConditions/BooleanInBooleanOrRule.php
@@ -16,11 +16,9 @@
 class BooleanInBooleanOrRule implements Rule
 {
 
-	/** @var BooleanRuleHelper */
-	private $helper;
+	private BooleanRuleHelper $helper;
 
-	/** @var bool */
-	private $bleedingEdge;
+	private bool $bleedingEdge;
 
 	public function __construct(BooleanRuleHelper $helper, bool $bleedingEdge)
 	{
@@ -44,7 +42,7 @@ public function processNode(Node $node, Scope $scope): array
 			$messages[] = RuleErrorBuilder::message(sprintf(
 				'Only booleans are allowed in %s, %s given on the left side.',
 				$nodeText,
-				$leftType->describe(VerbosityLevel::typeOnly())
+				$leftType->describe(VerbosityLevel::typeOnly()),
 			))->identifier(sprintf('%s.leftNotBoolean', $identifierType))->build();
 		}
 
@@ -54,7 +52,7 @@ public function processNode(Node $node, Scope $scope): array
 			$messages[] = RuleErrorBuilder::message(sprintf(
 				'Only booleans are allowed in %s, %s given on the right side.',
 				$nodeText,
-				$rightType->describe(VerbosityLevel::typeOnly())
+				$rightType->describe(VerbosityLevel::typeOnly()),
 			))->identifier(sprintf('%s.rightNotBoolean', $identifierType))->build();
 		}
 

diff --git a/src/Rules/BooleansInConditions/BooleanInElseIfConditionRule.php b/src/Rules/BooleansInConditions/BooleanInElseIfConditionRule.php
@@ -16,8 +16,7 @@
 class BooleanInElseIfConditionRule implements Rule
 {
 
-	/** @var BooleanRuleHelper */
-	private $helper;
+	private BooleanRuleHelper $helper;
 
 	public function __construct(BooleanRuleHelper $helper)
 	{
@@ -40,7 +39,7 @@ public function processNode(Node $node, Scope $scope): array
 		return [
 			RuleErrorBuilder::message(sprintf(
 				'Only booleans are allowed in an elseif condition, %s given.',
-				$conditionExpressionType->describe(VerbosityLevel::typeOnly())
+				$conditionExpressionType->describe(VerbosityLevel::typeOnly()),
 			))->identifier('elseif.condNotBoolean')->build(),
 		];
 	}

diff --git a/src/Rules/BooleansInConditions/BooleanInIfConditionRule.php b/src/Rules/BooleansInConditions/BooleanInIfConditionRule.php
@@ -16,8 +16,7 @@
 class BooleanInIfConditionRule implements Rule
 {
 
-	/** @var BooleanRuleHelper */
-	private $helper;
+	private BooleanRuleHelper $helper;
 
 	public function __construct(BooleanRuleHelper $helper)
 	{
@@ -40,7 +39,7 @@ public function processNode(Node $node, Scope $scope): array
 		return [
 			RuleErrorBuilder::message(sprintf(
 				'Only booleans are allowed in an if condition, %s given.',
-				$conditionExpressionType->describe(VerbosityLevel::typeOnly())
+				$conditionExpressionType->describe(VerbosityLevel::typeOnly()),
 			))->identifier('if.condNotBoolean')->build(),
 		];
 	}

diff --git a/src/Rules/BooleansInConditions/BooleanInTernaryOperatorRule.php b/src/Rules/BooleansInConditions/BooleanInTernaryOperatorRule.php
@@ -16,8 +16,7 @@
 class BooleanInTernaryOperatorRule implements Rule
 {
 
-	/** @var BooleanRuleHelper */
-	private $helper;
+	private BooleanRuleHelper $helper;
 
 	public function __construct(BooleanRuleHelper $helper)
 	{
@@ -44,7 +43,7 @@ public function processNode(Node $node, Scope $scope): array
 		return [
 			RuleErrorBuilder::message(sprintf(
 				'Only booleans are allowed in a ternary operator condition, %s given.',
-				$conditionExpressionType->describe(VerbosityLevel::typeOnly())
+				$conditionExpressionType->describe(VerbosityLevel::typeOnly()),
 			))->identifier('ternary.condNotBoolean')->build(),
 		];
 	}

diff --git a/src/Rules/BooleansInConditions/BooleanRuleHelper.php b/src/Rules/BooleansInConditions/BooleanRuleHelper.php
@@ -12,8 +12,7 @@
 class BooleanRuleHelper
 {
 
-	/** @var RuleLevelHelper */
-	private $ruleLevelHelper;
+	private RuleLevelHelper $ruleLevelHelper;
 
 	public function __construct(RuleLevelHelper $ruleLevelHelper)
 	{
@@ -30,9 +29,7 @@ public function passesAsBoolean(Scope $scope, Expr $expr): bool
 			$scope,
 			$expr,
 			'',
-			static function (Type $type): bool {
-				return $type->isBoolean()->yes();
-			}
+			static fn (Type $type): bool => $type->isBoolean()->yes(),
 		);
 		$foundType = $typeToCheck->getType();
 		if ($foundType instanceof ErrorType) {

diff --git a/src/Rules/Cast/UselessCastRule.php b/src/Rules/Cast/UselessCastRule.php
@@ -18,8 +18,7 @@
 class UselessCastRule implements Rule
 {
 
-	/** @var bool */
-	private $treatPhpDocTypesAsCertain;
+	private bool $treatPhpDocTypesAsCertain;
 
 	public function __construct(bool $treatPhpDocTypesAsCertain)
 	{
@@ -61,7 +60,7 @@ public function processNode(Node $node, Scope $scope): array
 				$addTip(RuleErrorBuilder::message(sprintf(
 					'Casting to %s something that\'s already %s.',
 					$castType->describe(VerbosityLevel::typeOnly()),
-					$expressionType->describe(VerbosityLevel::typeOnly())
+					$expressionType->describe(VerbosityLevel::typeOnly()),
 				)))->identifier('cast.useless')->build(),
 			];
 		}

diff --git a/src/Rules/Classes/RequireParentConstructCallRule.php b/src/Rules/Classes/RequireParentConstructCallRule.php
@@ -59,7 +59,7 @@
 				RuleErrorBuilder::message(sprintf(
 					'%s::__construct() does not call parent constructor from %s.',
 					$classReflection->getName(),
-					$parentClass->getName()
+					$parentClass->getName(),
 				))->identifier('constructor.missingParentCall')->build(),
 			];
 		}
@@ -104,9 +104,9 @@
 	 */
 	private function getParentConstructorClass($classReflection)
 	{
 		while ($classReflection->getParentClass() !== false) {
 			$constructor = $classReflection->getParentClass()->hasMethod('__construct') ? $classReflection->getParentClass()->getMethod('__construct') : null;
 			$constructorWithClassName = $classReflection->getParentClass()->hasMethod($classReflection->getParentClass()->getName()) ? $classReflection->getParentClass()->getMethod($classReflection->getParentClass()->getName()) : null;
 			if (
 				(
 					$constructor !== null

diff --git a/src/Rules/DisallowedConstructs/DisallowedLooseComparisonRule.php b/src/Rules/DisallowedConstructs/DisallowedLooseComparisonRule.php
@@ -26,7 +26,7 @@ public function processNode(Node $node, Scope $scope): array
 		if ($node instanceof Equal) {
 			return [
 				RuleErrorBuilder::message(
-					'Loose comparison via "==" is not allowed.'
+					'Loose comparison via "==" is not allowed.',
 				)->tip('Use strict comparison via "===" instead.')
 					->identifier('equal.notAllowed')
 					->build(),
@@ -35,7 +35,7 @@ public function processNode(Node $node, Scope $scope): array
 		if ($node instanceof NotEqual) {
 			return [
 				RuleErrorBuilder::message(
-					'Loose comparison via "!=" is not allowed.'
+					'Loose comparison via "!=" is not allowed.',
 				)->tip('Use strict comparison via "!==" instead.')
 					->identifier('notEqual.notAllowed')
 					->build(),

diff --git a/src/Rules/Functions/ArrayFilterStrictRule.php b/src/Rules/Functions/ArrayFilterStrictRule.php
@@ -23,14 +23,11 @@
 class ArrayFilterStrictRule implements Rule
 {
 
-	/** @var ReflectionProvider */
-	private $reflectionProvider;
+	private ReflectionProvider $reflectionProvider;
 
-	/** @var bool */
-	private $treatPhpDocTypesAsCertain;
+	private bool $treatPhpDocTypesAsCertain;
 
-	/** @var bool */
-	private $checkNullables;
+	private bool $checkNullables;
 
 	public function __construct(
 		ReflectionProvider $reflectionProvider,
@@ -68,7 +65,7 @@ public function processNode(Node $node, Scope $scope): array
 			$scope,
 			$node->getArgs(),
 			$functionReflection->getVariants(),
-			$functionReflection->getNamedArgumentsVariants()
+			$functionReflection->getNamedArgumentsVariants(),
 		);
 
 		$normalizedFuncCall = ArgumentsNormalizer::reorderFuncArguments($parametersAcceptor, $node);
@@ -132,7 +129,7 @@ public function processNode(Node $node, Scope $scope): array
 			$message = 'Parameter #2 of array_filter() cannot be null to avoid loose comparison semantics (%s given).';
 			$errorBuilder = RuleErrorBuilder::message(sprintf(
 				$message,
-				$callbackType->describe(VerbosityLevel::typeOnly())
+				$callbackType->describe(VerbosityLevel::typeOnly()),
 			))->identifier('arrayFilter.strict');
 
 			if (!$this->isCallbackTypeNull($nativeCallbackType) && $this->treatPhpDocTypesAsCertain) {

diff --git a/src/Rules/Methods/WrongCaseOfInheritedMethodRule.php b/src/Rules/Methods/WrongCaseOfInheritedMethodRule.php
@@ -35,7 +35,7 @@ public function processNode(
 			$parentMessage = $this->findMethod(
 				$declaringClass,
 				$declaringClass->getParentClass(),
-				$methodReflection->getName()
+				$methodReflection->getName(),
 			);
 			if ($parentMessage !== null) {
 				$messages[] = $parentMessage;
@@ -46,7 +46,7 @@ public function processNode(
 			$interfaceMessage = $this->findMethod(
 				$declaringClass,
 				$interface,
-				$methodReflection->getName()
+				$methodReflection->getName(),
 			);
 			if ($interfaceMessage === null) {
 				continue;
@@ -79,7 +79,7 @@ private function findMethod(
 			$methodName,
 			$classReflection->isInterface() ? 'interface' : 'parent',
 			$classReflection->getDisplayName(),
-			$parentMethod->getName()
+			$parentMethod->getName(),
 		))->identifier('method.nameCase')->build();
 	}