more tests

Author: staabm

tests/PHPStan/Analyser/AnalyserIntegrationTest.php

@@ -1593,6 +1593,7 @@ public function testBug9172(): void
 		$this->assertNotEmpty($errors);
 	}
 
+	#[RequiresPhp('>= 8.1.0')]
 	public function testPr5880(): void
 	{
 		// endless loop

tests/PHPStan/Rules/Comparison/BooleanAndConstantConditionRuleTest.php

@@ -463,6 +463,15 @@ public function testSelfContradiction(): void
 			[
 				'Result of && is always false.',
 				51,
+			],
+			[
+				'Result of && is always false.',
+				77,
+				'Because the type is coming from a PHPDoc, you can turn off this check by setting <fg=cyan>treatPhpDocTypesAsCertain: false</> in your <fg=cyan>%configurationFile%</>.',
+			],
+			[
+				'Result of && is always false.',
+				103,
 				'Because the type is coming from a PHPDoc, you can turn off this check by setting <fg=cyan>treatPhpDocTypesAsCertain: false</> in your <fg=cyan>%configurationFile%</>.',
 			],
 		]);

tests/PHPStan/Rules/Comparison/data/self-contradiction.php

@@ -8,7 +8,7 @@
 use PhpParser\Node\Expr\ConstFetch;
 use PhpParser\Node\Scalar;
 
-class Foo {
+class AssertStaticCall {
 	/**
 	 * @phpstan-assert-if-true Scalar|ClassConstFetch|ConstFetch $node
 	 */
@@ -34,7 +34,33 @@ private function getSubjectAndValue(Identical $comparison): ?array
 	}
 }
 
-class Bar {
+class AssertMethodCall {
+	/**
+	 * @phpstan-assert-if-true Scalar|ClassConstFetch|ConstFetch $node
+	 */
+	private function isSubjectNode(Expr $node): bool
+	{
+		return $node instanceof Scalar || $node instanceof ClassConstFetch || $node instanceof ConstFetch;
+	}
+
+	/**
+	 * @return array{subject: Expr, value: Scalar|ClassConstFetch|ConstFetch}|null
+	 */
+	private function getSubjectAndValue(Identical $comparison): ?array
+	{
+		if ($this->isSubjectNode($comparison->left) && !$this->isSubjectNode($comparison->left)) {
+			return ['subject' => $comparison->right, 'value' => $comparison->left];
+		}
+
+		if (!$this->isSubjectNode($comparison->left) && $this->isSubjectNode($comparison->right)) {
+			return ['subject' => $comparison->left, 'value' => $comparison->right];
+		}
+
+		return null;
+	}
+}
+
+class AssertStaticConditionalReturn {
 	/**
 	 * @return ($node is Scalar|ClassConstFetch|ConstFetch ? true : false)
 	 */
@@ -59,3 +85,29 @@ private function getSubjectAndValue(Identical $comparison): ?array
 		return null;
 	}
 }
+
+class AssertInstanceConditionalReturn {
+	/**
+	 * @return ($node is Scalar|ClassConstFetch|ConstFetch ? true : false)
+	 */
+	private function isSubjectNode(Expr $node): bool
+	{
+		return $node instanceof Scalar || $node instanceof ClassConstFetch || $node instanceof ConstFetch;
+	}
+
+	/**
+	 * @return array{subject: Expr, value: Scalar|ClassConstFetch|ConstFetch}|null
+	 */
+	private function getSubjectAndValue(Identical $comparison): ?array
+	{
+		if ($this->isSubjectNode($comparison->left) && !$this->isSubjectNode($comparison->left)) {
+			return ['subject' => $comparison->right, 'value' => $comparison->left];
+		}
+
+		if (!$this->isSubjectNode($comparison->left) && $this->isSubjectNode($comparison->right)) {
+			return ['subject' => $comparison->left, 'value' => $comparison->right];
+		}
+
+		return null;
+	}
+}