Revert "Improvement"

This reverts commit 6af082c.

Author: VincentLanglet

src/Analyser/MutatingScope.php

@@ -3266,9 +3266,8 @@ public function filterByTruthyValue(Expr $expr): self
 
 		$specifiedTypes = $this->typeSpecifier->specifyTypesInCondition($this, $expr, TypeSpecifierContext::createTruthy());
 		if ($specifiedTypes->shouldSpecifyOnly()) {
-			[$markerExpr, $markerValue] = $this->unwrapSpecifyOnlyMarker($expr, true);
 			$specifiedTypes = $specifiedTypes->unionWith(
-				$this->typeSpecifier->create($markerExpr, new ConstantBooleanType($markerValue), TypeSpecifierContext::createTrue(), $this),
+				$this->typeSpecifier->create($expr, new ConstantBooleanType(true), TypeSpecifierContext::createTrue(), $this),
 			);
 		}
 		$scope = $this->filterBySpecifiedTypes($specifiedTypes);
@@ -3289,9 +3288,8 @@ public function filterByFalseyValue(Expr $expr): self
 
 		$specifiedTypes = $this->typeSpecifier->specifyTypesInCondition($this, $expr, TypeSpecifierContext::createFalsey());
 		if ($specifiedTypes->shouldSpecifyOnly()) {
-			[$markerExpr, $markerValue] = $this->unwrapSpecifyOnlyMarker($expr, false);
 			$specifiedTypes = $specifiedTypes->unionWith(
-				$this->typeSpecifier->create($markerExpr, new ConstantBooleanType($markerValue), TypeSpecifierContext::createTrue(), $this),
+				$this->typeSpecifier->create($expr, new ConstantBooleanType(false), TypeSpecifierContext::createTrue(), $this),
 			);
 		}
 		$scope = $this->filterBySpecifiedTypes($specifiedTypes);
@@ -3300,24 +3298,6 @@ public function filterByFalseyValue(Expr $expr): self
 		return $scope;
 	}
 
-	/**
-	 * Strips BooleanNot wrappers from a specifyOnly condition so the boolean
-	 * result marker is stored for the underlying call (e.g. `array_key_exists(...)`)
-	 * rather than for the negated form (`!array_key_exists(...)`). The negated form
-	 * is then derived from the inner value instead of being capped at bool.
-	 *
-	 * @return array{Expr, bool}
-	 */
-	private function unwrapSpecifyOnlyMarker(Expr $expr, bool $value): array
-	{
-		while ($expr instanceof Expr\BooleanNot) {
-			$expr = $expr->expr;
-			$value = !$value;
-		}
-
-		return [$expr, $value];
-	}
-
 	/**
 	 * @return static
 	 */

src/Rules/Methods/MethodCallWithPossiblyRenamedNamedArgumentRule.php

@@ -51,6 +51,10 @@ public function processNode(Node $node, NodeCallbackInvoker&Scope&CollectedDataE
 					continue;
 				}
 
+				if (!array_key_exists($prototypeParameterName, $prototypeMethodCalls)) {
+					continue;
+				}
+
 				$callsWithParameter = $prototypeMethodCalls[$prototypeParameterName];
 				foreach ($callsWithParameter as [$file, $line]) {
 					$errors[] = RuleErrorBuilder::message(sprintf(

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

@@ -128,14 +128,8 @@ public function realpathElvisWithLoop(string $fileName, array $paths): void
 	}
 
 	/**
-	 * Duplicate array_key_exists after an early-continue narrows both the negated
-	 * and the bare positive call.
-	 *
-	 * The condition is the BooleanNot `!array_key_exists(...)`. When the specifyOnly
-	 * duplicate-detection marker is stored, the BooleanNot wrapper is stripped so the
-	 * marker records the underlying `array_key_exists(...)` call as true. The negated
-	 * form is then derived from that inner value (false), and the bare positive call
-	 * reads the stored true directly.
+	 * Duplicate array_key_exists after an early-continue narrows the negated
+	 * call to false, while the non-negated call stays bool.
 	 *
 	 * @param array<string,string|array<int,string>> $theInput
 	 * @phpstan-param array{'name':string,'owners':array<int,string>} $theInput
@@ -148,7 +142,7 @@ public function arrayKeyExistsDuplicateInLoop(array $theInput, array $theTags):
 				continue;
 			}
 			assertType('false', !array_key_exists($tag, $theInput));
-			assertType('true', array_key_exists($tag, $theInput));
+			assertType('bool', array_key_exists($tag, $theInput));
 		}
 	}
 

tests/PHPStan/Rules/Comparison/ImpossibleCheckTypeFunctionCallRuleTest.php

@@ -510,16 +510,7 @@ public function testNonEmptySpecifiedString(): void
 	public function testBug14705(): void
 	{
 		$this->treatPhpDocTypesAsCertain = true;
-		$this->analyse([__DIR__ . '/../../Analyser/nsrt/bug-14705.php'], [
-			[
-				'Call to function array_key_exists() with \'name\'|\'owners\' and array{name: string, owners: array<int, string>} will always evaluate to true.',
-				150,
-			],
-			[
-				'Call to function array_key_exists() with \'name\'|\'owners\' and array{name: string, owners: array<int, string>} will always evaluate to true.',
-				151,
-			],
-		]);
+		$this->analyse([__DIR__ . '/../../Analyser/nsrt/bug-14705.php'], []);
 	}
 
 	#[RequiresPhp('>= 8.0')]