Unsetting an offset should remove non-empty-array

ondrejmirtes · ondrejmirtes · commit 32353a92691b · 2022-08-22T17:08:07.000+02:00
diff --git a/src/Type/MixedType.php b/src/Type/MixedType.php
@@ -16,6 +16,7 @@
 use PHPStan\Reflection\Type\UnresolvedMethodPrototypeReflection;
 use PHPStan\Reflection\Type\UnresolvedPropertyPrototypeReflection;
 use PHPStan\TrinaryLogic;
+use PHPStan\Type\Constant\ConstantArrayType;
 use PHPStan\Type\Constant\ConstantBooleanType;
 use PHPStan\Type\Generic\TemplateMixedType;
 use PHPStan\Type\Generic\TemplateType;
@@ -120,6 +121,9 @@ public function setOffsetValueType(?Type $offsetType, Type $valueType, bool $uni
 
 	public function unsetOffset(Type $offsetType): Type
 	{
+		if ($this->subtractedType !== null) {
+			return new self($this->isExplicitMixed, TypeCombinator::remove($this->subtractedType, new ConstantArrayType([], [])));
+		}
 		return $this;
 	}
 
diff --git a/tests/PHPStan/Analyser/NodeScopeResolverTest.php b/tests/PHPStan/Analyser/NodeScopeResolverTest.php
@@ -979,6 +979,7 @@ public function dataFileAsserts(): iterable
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/closure-argument-type.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7788.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7809.php');
+		yield from $this->gatherAssertTypes(__DIR__ . '/data/composer-non-empty-array-after-unset.php');
 	}
 
 	/**
diff --git a/tests/PHPStan/Analyser/data/composer-non-empty-array-after-unset.php b/tests/PHPStan/Analyser/data/composer-non-empty-array-after-unset.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace ComposerNonEmptyArrayAfterUnset;
+
+use function PHPStan\Testing\assertType;
+
+class Foo
+{
+
+	/** @var mixed[] */
+	private $config;
+
+	public function doFoo()
+	{
+		if (!empty($this->config['authors'])) {
+			assertType("mixed~0|0.0|''|'0'|array{}|false|null", $this->config['authors']);
+			foreach ($this->config['authors'] as $key => $author) {
+				assertType("mixed~0|0.0|''|'0'|false|null", $this->config['authors']);
+				if (!is_array($author)) {
+					unset($this->config['authors'][$key]);
+					assertType("mixed~0|0.0|''|'0'|false|null", $this->config['authors']);
+					continue;
+				}
+				foreach (['homepage', 'email', 'name', 'role'] as $authorData) {
+					if (isset($author[$authorData]) && !is_string($author[$authorData])) {
+						unset($this->config['authors'][$key][$authorData]);
+					}
+				}
+				if (isset($author['homepage'])) {
+					unset($this->config['authors'][$key]['homepage']);
+				}
+				if (isset($author['email']) && !filter_var($author['email'], FILTER_VALIDATE_EMAIL)) {
+					unset($this->config['authors'][$key]['email']);
+				}
+				if (empty($this->config['authors'][$key])) {
+					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']);
+				}
+				assertType("mixed~0|0.0|''|'0'|false|null", $this->config['authors']);
+			}
+			assertType("mixed~0|0.0|''|'0'|false|null", $this->config['authors']);
+		}
+	}
+
+}

Original file line number	Diff line number	Diff line change
`@@ -979,6 +979,7 @@ public function dataFileAsserts(): iterable`
`979`	`979`	`yield from $this->gatherAssertTypes(__DIR__ . '/data/closure-argument-type.php');`
`980`	`980`	`yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7788.php');`
`981`	`981`	`yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7809.php');`
	`982`	`+ yield from $this->gatherAssertTypes(__DIR__ . '/data/composer-non-empty-array-after-unset.php');`
`982`	`983`	`}`
`983`	`984`
`984`	`985`	`/**`