Fix

phpstan · Dec 13, 2019 · fd2e954 · fd2e954
1 parent fe7bb6d
commit fd2e954
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/Analyser/MutatingScope.php b/src/Analyser/MutatingScope.php
@@ -2483,7 +2483,7 @@ public function unsetExpression(Expr $expr): self
 				);
 			}
 
-			return $this->invalidateExpression($expr->var);
+			return $this->invalidateExpression($expr->var)->invalidateExpression(new FuncCall(new Name('count'), [new Node\Arg($expr->var)]));
 		}
 
 		return $this;
@@ -2556,16 +2556,16 @@ public function invalidateExpression(Expr $expressionToInvalidate, bool $require
 			if ($requireMoreCharacters && $exprString === $exprStringToInvalidate) {
 				continue;
 			}
+			if (!Strings::startsWith($exprString, $exprStringToInvalidate)) {
+				continue;
+			}
 
 			if ($exprString === $exprStringToInvalidate) {
 				unset($moreSpecificTypeHolders[$exprString]);
 				continue;
 			}
 
 			$nextLetter = substr($exprString, strlen($exprStringToInvalidate), 1);
-			if (!is_string($nextLetter)) {
-				continue;
-			}
 			if (Strings::match($nextLetter, '#[a-zA-Z_0-9\x7f-\xff]#') !== null) {
 				continue;
 			}