Make MutatingScope::invalidateMethodsOnExpression() private

ondrejmirtes · ondrejmirtes · commit f3fe24577f0c · 2022-08-26T17:44:11.000+02:00
diff --git a/src/Analyser/MutatingScope.php b/src/Analyser/MutatingScope.php
@@ -3428,14 +3428,31 @@ public function unsetExpression(Expr $expr): self
 				$this->parentScope,
 			);
 		} elseif ($expr instanceof Expr\ArrayDimFetch && $expr->dim !== null) {
-			return $this->specifyExpressionType(
+			$exprVarType = $this->getType($expr->var);
+			$dimType = $this->getType($expr->dim);
+			$unset = $exprVarType->unsetOffset($dimType);
+			$scope = $this->specifyExpressionType(
 				$expr->var,
-				$this->getType($expr->var)->unsetOffset($this->getType($expr->dim)),
+				$unset,
 			)->invalidateExpression(
 				new FuncCall(new FullyQualified('count'), [new Arg($expr->var)]),
 			)->invalidateExpression(
 				new FuncCall(new FullyQualified('sizeof'), [new Arg($expr->var)]),
 			);
+
+			if ($expr->var instanceof Expr\ArrayDimFetch && $expr->var->dim !== null) {
+				$varVar = $this->getType($expr->var->var);
+				$varDim = $this->getType($expr->var->dim);
+				$scope = $scope->specifyExpressionType(
+					$expr->var->var,
+					TypeCombinator::union($varVar->setOffsetValueType(
+						$varDim,
+						TypeCombinator::union($varVar->getOffsetValueType($varDim), new ConstantArrayType([], [])),
+					), new ConstantArrayType([], [])),
+				);
+			}
+
+			return $scope;
 		}
 
 		return $this;
@@ -3697,7 +3714,7 @@ private function exprStringToExpr(string $exprString): ?Expr
 		return $expr->expr;
 	}
 
-	public function invalidateMethodsOnExpression(Expr $expressionToInvalidate): self
+	private function invalidateMethodsOnExpression(Expr $expressionToInvalidate): self
 	{
 		$exprStringToInvalidate = $this->getNodeKey($expressionToInvalidate);
 		$moreSpecificTypeHolders = $this->moreSpecificTypes;
diff --git a/tests/PHPStan/Analyser/NodeScopeResolverTest.php b/tests/PHPStan/Analyser/NodeScopeResolverTest.php
@@ -998,6 +998,7 @@ public function dataFileAsserts(): iterable
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/array-flip-constant.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/array-filter-constant.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/array-intersect-key-constant.php');
+		yield from $this->gatherAssertTypes(__DIR__ . '/data/composer-array-bug.php');
 	}
 
 	/**
diff --git a/tests/PHPStan/Analyser/data/composer-array-bug.php b/tests/PHPStan/Analyser/data/composer-array-bug.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace ComposerArrayBug;
+
+use function PHPStan\Testing\assertType;
+
+class Foo
+{
+
+	/** @var mixed[] */
+	private $config;
+
+	/** @var string[] */
+	private $errors;
+
+	public function doFoo(): void
+	{
+		if (!empty($this->config['authors'])) {
+			foreach ($this->config['authors'] as $key => $author) {
+				if (!is_array($author)) {
+					$this->errors[] = 'authors.'.$key.' : should be an array, '.gettype($author).' given';
+					assertType("mixed~0|0.0|''|'0'|false|null", $this->config['authors']);
+					unset($this->config['authors'][$key]);
+					assertType("mixed~0|0.0|''|'0'|false|null", $this->config['authors']);
+					continue;
+				}
+				assertType("mixed~0|0.0|''|'0'|false|null", $this->config['authors']);
+				foreach (['homepage', 'email', 'name', 'role'] as $authorData) {
+					if (isset($author[$authorData]) && !is_string($author[$authorData])) {
+						$this->errors[] = 'authors.'.$key.'.'.$authorData.' : invalid value, must be a string';
+						unset($this->config['authors'][$key][$authorData]);
+					}
+				}
+				if (isset($author['homepage'])) {
+					assertType("mixed~0|0.0|''|'0'|false|null", $this->config['authors']);
+					unset($this->config['authors'][$key]['homepage']);
+					assertType("mixed~0|0.0|''|'0'|false|null", $this->config['authors']);
+				}
+				if (isset($author['email']) && !filter_var($author['email'], FILTER_VALIDATE_EMAIL)) {
+					unset($this->config['authors'][$key]['email']);
+				}
+				if (empty($this->config['authors'][$key])) {
+					unset($this->config['authors'][$key]);
+				}
+			}
+
+			assertType("array&hasOffsetValue('authors', mixed~0|0.0|''|'0'|false|null)", $this->config);
+			assertType("mixed~0|0.0|''|'0'|false|null", $this->config['authors']);
+
+			if (empty($this->config['authors'])) {
+				unset($this->config['authors']);
+				assertType("array", $this->config);
+			} else {
+				assertType("array&hasOffsetValue('authors', mixed~0|0.0|''|'0'|array{}|false|null)", $this->config);
+			}
+
+			assertType('array', $this->config);
+		}
+	}
+
+}

Original file line number	Diff line number	Diff line change
`@@ -998,6 +998,7 @@ public function dataFileAsserts(): iterable`
`998`	`998`	`yield from $this->gatherAssertTypes(__DIR__ . '/data/array-flip-constant.php');`
`999`	`999`	`yield from $this->gatherAssertTypes(__DIR__ . '/data/array-filter-constant.php');`
`1000`	`1000`	`yield from $this->gatherAssertTypes(__DIR__ . '/data/array-intersect-key-constant.php');`
	`1001`	`+ yield from $this->gatherAssertTypes(__DIR__ . '/data/composer-array-bug.php');`
`1001`	`1002`	`}`
`1002`	`1003`
`1003`	`1004`	`/**`