Updated PHPStan

Author: ondrejmirtes

Diff for: src/Rules/BooleansInConditions/BooleanInBooleanAndRule.php

@@ -2,6 +2,8 @@
 
 namespace PHPStan\Rules\BooleansInConditions;
 
+use PHPStan\Type\VerbosityLevel;
+
 class BooleanInBooleanAndRule implements \PHPStan\Rules\Rule
 {
 
@@ -23,15 +25,15 @@ public function processNode(\PhpParser\Node $node, \PHPStan\Analyser\Scope $scop
 		if (!BooleanRuleHelper::passesAsBoolean($leftType)) {
 			$messages[] = sprintf(
 				'Only booleans are allowed in &&, %s given on the left side.',
-				$leftType->describe()
+				$leftType->describe(VerbosityLevel::typeOnly())
 			);
 		}
 
 		$rightType = $scope->getType($node->right);
 		if (!BooleanRuleHelper::passesAsBoolean($rightType)) {
 			$messages[] = sprintf(
 				'Only booleans are allowed in &&, %s given on the right side.',
-				$rightType->describe()
+				$rightType->describe(VerbosityLevel::typeOnly())
 			);
 		}
 

Diff for: src/Rules/BooleansInConditions/BooleanInBooleanNotRule.php

@@ -2,6 +2,8 @@
 
 namespace PHPStan\Rules\BooleansInConditions;
 
+use PHPStan\Type\VerbosityLevel;
+
 class BooleanInBooleanNotRule implements \PHPStan\Rules\Rule
 {
 
@@ -25,7 +27,7 @@ public function processNode(\PhpParser\Node $node, \PHPStan\Analyser\Scope $scop
 		return [
 			sprintf(
 				'Only booleans are allowed in a negated boolean, %s given.',
-				$expressionType->describe()
+				$expressionType->describe(VerbosityLevel::typeOnly())
 			),
 		];
 	}

Diff for: src/Rules/BooleansInConditions/BooleanInBooleanOrRule.php

@@ -2,6 +2,8 @@
 
 namespace PHPStan\Rules\BooleansInConditions;
 
+use PHPStan\Type\VerbosityLevel;
+
 class BooleanInBooleanOrRule implements \PHPStan\Rules\Rule
 {
 
@@ -22,15 +24,15 @@ public function processNode(\PhpParser\Node $node, \PHPStan\Analyser\Scope $scop
 		if (!BooleanRuleHelper::passesAsBoolean($leftType)) {
 			$messages[] = sprintf(
 				'Only booleans are allowed in ||, %s given on the left side.',
-				$leftType->describe()
+				$leftType->describe(VerbosityLevel::typeOnly())
 			);
 		}
 
 		$rightType = $scope->getType($node->right);
 		if (!BooleanRuleHelper::passesAsBoolean($rightType)) {
 			$messages[] = sprintf(
 				'Only booleans are allowed in ||, %s given on the right side.',
-				$rightType->describe()
+				$rightType->describe(VerbosityLevel::typeOnly())
 			);
 		}
 

Diff for: src/Rules/BooleansInConditions/BooleanInElseIfConditionRule.php

@@ -2,6 +2,8 @@
 
 namespace PHPStan\Rules\BooleansInConditions;
 
+use PHPStan\Type\VerbosityLevel;
+
 class BooleanInElseIfConditionRule implements \PHPStan\Rules\Rule
 {
 
@@ -25,7 +27,7 @@ public function processNode(\PhpParser\Node $node, \PHPStan\Analyser\Scope $scop
 		return [
 			sprintf(
 				'Only booleans are allowed in an elseif condition, %s given.',
-				$conditionExpressionType->describe()
+				$conditionExpressionType->describe(VerbosityLevel::typeOnly())
 			),
 		];
 	}

Diff for: src/Rules/BooleansInConditions/BooleanInIfConditionRule.php

@@ -2,6 +2,8 @@
 
 namespace PHPStan\Rules\BooleansInConditions;
 
+use PHPStan\Type\VerbosityLevel;
+
 class BooleanInIfConditionRule implements \PHPStan\Rules\Rule
 {
 
@@ -25,7 +27,7 @@ public function processNode(\PhpParser\Node $node, \PHPStan\Analyser\Scope $scop
 		return [
 			sprintf(
 				'Only booleans are allowed in an if condition, %s given.',
-				$conditionExpressionType->describe()
+				$conditionExpressionType->describe(VerbosityLevel::typeOnly())
 			),
 		];
 	}

Diff for: src/Rules/BooleansInConditions/BooleanInTernaryOperatorRule.php

@@ -2,6 +2,8 @@
 
 namespace PHPStan\Rules\BooleansInConditions;
 
+use PHPStan\Type\VerbosityLevel;
+
 class BooleanInTernaryOperatorRule implements \PHPStan\Rules\Rule
 {
 
@@ -29,7 +31,7 @@ public function processNode(\PhpParser\Node $node, \PHPStan\Analyser\Scope $scop
 		return [
 			sprintf(
 				'Only booleans are allowed in a ternary operator condition, %s given.',
-				$conditionExpressionType->describe()
+				$conditionExpressionType->describe(VerbosityLevel::typeOnly())
 			),
 		];
 	}

Diff for: src/Rules/SwitchConditions/MatchingTypeInSwitchCaseConditionRule.php

@@ -2,6 +2,8 @@
 
 namespace PHPStan\Rules\SwitchConditions;
 
+use PHPStan\Type\VerbosityLevel;
+
 class MatchingTypeInSwitchCaseConditionRule implements \PHPStan\Rules\Rule
 {
 
@@ -39,9 +41,9 @@ public function processNode(\PhpParser\Node $node, \PHPStan\Analyser\Scope $scop
 
 			$messages[] = sprintf(
 				'Switch condition type (%s) does not match case condition %s (%s).',
-				$conditionType->describe(),
+				$conditionType->describe(VerbosityLevel::value()),
 				$this->printer->prettyPrintExpr($case->cond),
-				$caseType->describe()
+				$caseType->describe(VerbosityLevel::typeOnly())
 			);
 		}
 

Diff for: tests/Rules/SwitchConditions/MatchingTypeInSwitchCaseConditionRuleTest.php

@@ -16,23 +16,23 @@ public function testRule(): void
 	{
 		$this->analyse([__DIR__ . '/data/matching-type.php'], [
 			[
-				'Switch condition type (int(1)) does not match case condition \'test\' (string).',
+				'Switch condition type (1) does not match case condition \'test\' (string).',
 				8,
 			],
 			[
-				'Switch condition type (int(1)) does not match case condition 1 > 2 (bool).',
+				'Switch condition type (1) does not match case condition 1 > 2 (bool).',
 				8,
 			],
 			[
-				'Switch condition type (string) does not match case condition 1 (int(1)).',
+				'Switch condition type (\'1\') does not match case condition 1 (int).',
 				19,
 			],
 			[
-				'Switch condition type (string) does not match case condition \'test\' (string).',
+				'Switch condition type (\'1\') does not match case condition \'test\' (string).',
 				19,
 			],
 			[
-				'Switch condition type (string) does not match case condition 1 > 2 (bool).',
+				'Switch condition type (\'1\') does not match case condition 1 > 2 (bool).',
 				19,
 			],
 		]);