Merge remote-tracking branch 'origin/1.12.x' into 2.0.x

Author: ondrejmirtes

src/Rules/Comparison/StrictComparisonOfDifferentTypesRule.php

@@ -65,15 +65,15 @@ public function processNode(Node $node, Scope $scope): array
 		if (
 			(
 				$leftType->isConstantScalarValue()->yes()
-				&& $leftType->isString()->yes()
-				&& $rightType->isConstantScalarValue()->no()
-				&& $rightType->isString()->yes()
+				&& !$leftType->isString()->no()
+				&& !$rightType->isConstantScalarValue()->yes()
+				&& !$rightType->isString()->no()
 				&& TrinaryLogic::extremeIdentity($leftType->isLowercaseString(), $rightType->isLowercaseString())->maybe()
 			) || (
 				$rightType->isConstantScalarValue()->yes()
-				&& $rightType->isString()->yes()
-				&& $leftType->isConstantScalarValue()->no()
-				&& $leftType->isString()->yes()
+				&& !$rightType->isString()->no()
+				&& !$leftType->isConstantScalarValue()->yes()
+				&& !$leftType->isString()->no()
 				&& TrinaryLogic::extremeIdentity($leftType->isLowercaseString(), $rightType->isLowercaseString())->maybe()
 			)
 		) {

tests/PHPStan/Rules/Comparison/StrictComparisonOfDifferentTypesRuleTest.php

@@ -266,6 +266,11 @@ public function testStrictComparison(): void
 					996,
 					'Remove remaining cases below this one and this error will disappear too.',
 				],
+				[
+					'Strict comparison using === between lowercase-string|false and \'AB\' will always evaluate to false.',
+					1014,
+					$tipText,
+				],
 			],
 		);
 	}

tests/PHPStan/Rules/Comparison/data/strict-comparison.php

@@ -1002,3 +1002,18 @@ public function doFoo()
 	}
 
 }
+
+class TestLiteralStringVerbosityFix
+{
+
+	/**
+	 * @param lowercase-string|false $a
+	 */
+	public function doFoo($a): void
+	{
+		if ($a === 'AB') {
+
+		}
+	}
+
+}