Create cross-kind conditional expression holders in BooleanAnd/BooleanOr type specifier with truthy fallback for isset()

src/Analyser/TypeSpecifier.php

@@ -735,6 +735,18 @@ public function specifyTypesInCondition(
 						$rightTypesForHolders = $this->specifyTypesInCondition($rightScope, $expr->right, TypeSpecifierContext::createFalsey())->setRootExpr($expr);
 					}
 				}
+				if ($leftTypesForHolders->getSureTypes() === [] && $leftTypesForHolders->getSureNotTypes() === []) {
+					$truthyLeftTypes = $this->specifyTypesInCondition($scope, $expr->left, TypeSpecifierContext::createTruthy());
+					if ($this->allExpressionsTrackable($truthyLeftTypes)) {
+						$leftTypesForHolders = new SpecifiedTypes($truthyLeftTypes->getSureNotTypes(), $truthyLeftTypes->getSureTypes());
+					}
+				}
+				if ($rightTypesForHolders->getSureTypes() === [] && $rightTypesForHolders->getSureNotTypes() === []) {
+					$truthyRightTypes = $this->specifyTypesInCondition($rightScope, $expr->right, TypeSpecifierContext::createTruthy());
+					if ($this->allExpressionsTrackable($truthyRightTypes)) {
+						$rightTypesForHolders = new SpecifiedTypes($truthyRightTypes->getSureNotTypes(), $truthyRightTypes->getSureTypes());
+					}
+				}
 				$result = new SpecifiedTypes(
 					$types->getSureTypes(),
 					$types->getSureNotTypes(),
@@ -747,6 +759,10 @@ public function specifyTypesInCondition(
 					$this->processBooleanConditionalTypes($scope, $rightTypesForHolders, false, $leftTypesForHolders, false, $scope),
 					$this->processBooleanConditionalTypes($scope, $leftTypesForHolders, true, $rightTypesForHolders, true, $rightScope),
 					$this->processBooleanConditionalTypes($scope, $rightTypesForHolders, true, $leftTypesForHolders, true, $scope),
+					$this->processBooleanConditionalTypes($scope, $leftTypesForHolders, false, $rightTypesForHolders, true, $rightScope),
+					$this->processBooleanConditionalTypes($scope, $rightTypesForHolders, false, $leftTypesForHolders, true, $scope),
+					$this->processBooleanConditionalTypes($scope, $leftTypesForHolders, true, $rightTypesForHolders, false, $rightScope),
+					$this->processBooleanConditionalTypes($scope, $rightTypesForHolders, true, $leftTypesForHolders, false, $scope),
 				))->setRootExpr($expr);
 			}
 
@@ -800,6 +816,10 @@ public function specifyTypesInCondition(
 					$this->processBooleanConditionalTypes($scope, $rightTypes, false, $leftTypes, false, $scope),
 					$this->processBooleanConditionalTypes($scope, $leftTypes, true, $rightTypes, true, $rightScope),
 					$this->processBooleanConditionalTypes($scope, $rightTypes, true, $leftTypes, true, $scope),
+					$this->processBooleanConditionalTypes($scope, $leftTypes, false, $rightTypes, true, $rightScope),
+					$this->processBooleanConditionalTypes($scope, $rightTypes, false, $leftTypes, true, $scope),
+					$this->processBooleanConditionalTypes($scope, $leftTypes, true, $rightTypes, false, $rightScope),
+					$this->processBooleanConditionalTypes($scope, $rightTypes, true, $leftTypes, false, $scope),
 				))->setRootExpr($expr);
 			}
 
@@ -2143,6 +2163,22 @@ private function isTrackableExpression(Expr $expr): bool
 			|| $expr instanceof Expr\StaticPropertyFetch;
 	}
 
+	private function allExpressionsTrackable(SpecifiedTypes $types): bool
+	{
+		foreach ($types->getSureTypes() as [$expr]) {
+			if (!$this->isTrackableExpression($expr)) {
+				return false;
+			}
+		}
+		foreach ($types->getSureNotTypes() as [$expr]) {
+			if (!$this->isTrackableExpression($expr)) {
+				return false;
+			}
+		}
+
+		return $types->getSureTypes() !== [] || $types->getSureNotTypes() !== [];
+	}
+
 	/**
 	 * Flatten a deep BooleanOr chain into leaf expressions and process them
 	 * without recursive filterByFalseyValue calls. This reduces O(n^2) to O(n)

tests/PHPStan/Analyser/nsrt/bug-10644.php

@@ -0,0 +1,127 @@
+<?php declare(strict_types = 1);
+
+namespace Bug10644;
+
+use function PHPStan\Testing\assertType;
+
+/**
+ * @param array<string, mixed> $data
+ */
+function testIssetCoalesce(array $data): void
+{
+	if (isset($data['subtitle']) && !is_string($data['subtitle'])) {
+		throw new \InvalidArgumentException('Subtitle must be a string');
+	}
+
+	if (isset($data['subtitle'])) {
+		assertType("string", $data['subtitle']);
+	}
+	assertType("string", $data['subtitle'] ?? '');
+}
+
+/**
+ * @param mixed $y
+ */
+function testSimpleBool(bool $a, $y): void
+{
+	if ($a && !is_string($y)) {
+		throw new \Exception();
+	}
+
+	if ($a) {
+		assertType("string", $y);
+	}
+	assertType("mixed", $y);
+}
+
+/**
+ * @param mixed $y
+ */
+function testSimpleInt(bool $a, $y): void
+{
+	if ($a && !is_int($y)) {
+		throw new \Exception();
+	}
+
+	if ($a) {
+		assertType("int", $y);
+	}
+}
+
+/**
+ * @param mixed $y
+ */
+function testSimpleArray(bool $a, $y): void
+{
+	if ($a && !is_array($y)) {
+		throw new \Exception();
+	}
+
+	if ($a) {
+		assertType("array<mixed, mixed>", $y);
+	}
+}
+
+/**
+ * @param mixed $y
+ */
+function testNotNull(?int $x, $y): void
+{
+	if ($x !== null && !is_string($y)) {
+		throw new \Exception();
+	}
+
+	if ($x !== null) {
+		assertType("string", $y);
+	}
+}
+
+/**
+ * @param mixed $x
+ * @param mixed $y
+ */
+function testInstanceof($x, $y): void
+{
+	if ($x instanceof \stdClass && !is_int($y)) {
+		throw new \Exception();
+	}
+
+	if ($x instanceof \stdClass) {
+		assertType("int", $y);
+	}
+}
+
+/**
+ * @param array<string, mixed> $data
+ */
+function testIssetMultipleKeys(array $data): void
+{
+	if (isset($data['a']) && !is_string($data['a'])) {
+		throw new \Exception();
+	}
+	if (isset($data['b']) && !is_int($data['b'])) {
+		throw new \Exception();
+	}
+
+	if (isset($data['a'])) {
+		assertType("string", $data['a']);
+	}
+	if (isset($data['b'])) {
+		assertType("int", $data['b']);
+	}
+	assertType("string", $data['a'] ?? '');
+	assertType("int", $data['b'] ?? 0);
+}
+
+/**
+ * @param array<string, mixed> $data
+ */
+function testArrayKeyExists(array $data): void
+{
+	if (array_key_exists('subtitle', $data) && !is_string($data['subtitle'])) {
+		throw new \Exception();
+	}
+	if (array_key_exists('subtitle', $data)) {
+		assertType("string", $data['subtitle']);
+	}
+}

tests/PHPStan/Analyser/nsrt/bug-11918.php

@@ -0,0 +1,18 @@
+<?php declare(strict_types = 1);
+
+namespace Bug11918;
+
+use function PHPStan\Testing\assertType;
+
+/**
+ * @param array<string, list<mixed>|string|false> $options
+ */
+function testArrayKeyExistsCoalesce(array $options): void
+{
+	if (array_key_exists('a', $options) && !is_string($options['a'])) {
+		exit(1);
+	}
+
+	$a = $options['a'] ?? 'fallback';
+	assertType('string', $a);
+}

tests/PHPStan/Analyser/nsrt/bug-14455.php

@@ -0,0 +1,27 @@
+<?php declare(strict_types = 1);
+
+namespace Bug14455;
+
+use function PHPStan\Testing\assertType;
+
+/**
+ * @param array<string, mixed> $aggregation
+ * @param non-falsy-string $type
+ */
+function testTriviallyTrueConditionSkipped(array $aggregation, string $type): void
+{
+	if (empty($aggregation['field']) && $type === 'filter') {
+		return;
+	}
+
+	assertType("array<string, mixed>", $aggregation);
+	assertType('non-falsy-string', $type);
+
+	if ($type === 'filter') {
+		assertType("non-empty-array<string, mixed>&hasOffset('field')", $aggregation);
+	} else {
+		assertType("array<string, mixed>", $aggregation);
+	}
+
+	assertType('non-falsy-string', $type);
+}

tests/PHPStan/Analyser/nsrt/bug-3385.php

@@ -0,0 +1,40 @@
+<?php declare(strict_types = 1);
+
+namespace Bug3385;
+
+use function PHPStan\Testing\assertType;
+
+class Greeter
+{
+
+	public function sayHello(): string
+	{
+		return 'hello';
+	}
+
+	public function isEqualTo(Greeter $otherGreeter): bool
+	{
+		return $this->sayHello() === $otherGreeter->sayHello();
+	}
+
+}
+
+function isGreeterDifferent(?Greeter $greeterA, ?Greeter $greeterB): bool
+{
+	if ($greeterA === null && $greeterB !== null) {
+		return true;
+	}
+
+	if ($greeterA !== null && $greeterB === null) {
+		return true;
+	}
+
+	if ($greeterA === null && $greeterB === null) {
+		return false;
+	}
+
+	assertType('Bug3385\Greeter', $greeterA);
+	assertType('Bug3385\Greeter', $greeterB);
+
+	return $greeterA->isEqualTo($greeterB);
+}

tests/PHPStan/Analyser/nsrt/bug-6202.php

@@ -0,0 +1,21 @@
+<?php declare(strict_types = 1);
+
+namespace Bug6202;
+
+use function PHPStan\Testing\assertType;
+
+class HelloWorld
+{
+
+	/**
+	 * @param array<string, mixed> $array
+	 */
+	public function sayHello(array $array): void
+	{
+		if (isset($array['mightExist']) && !is_string($array['mightExist'])) {
+			throw new \Exception('Has to be string if set');
+		}
+		assertType('string', $array['mightExist'] ?? '');
+	}
+
+}