Fix hasOffsetValueType on nested expression after unsetting

ondrejmirtes · ondrejmirtes · commit a9a2b60b9e84 · 2022-08-26T17:44:11.000+02:00
diff --git a/tests/PHPStan/Analyser/data/composer-array-bug.php b/tests/PHPStan/Analyser/data/composer-array-bug.php
@@ -19,22 +19,22 @@ public function doFoo(): void
 			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']);
+					assertType("mixed", $this->config['authors']);
 					unset($this->config['authors'][$key]);
-					assertType("mixed~0|0.0|''|'0'|false|null", $this->config['authors']);
+					assertType("mixed", $this->config['authors']);
 					continue;
 				}
-				assertType("mixed~0|0.0|''|'0'|false|null", $this->config['authors']);
+				assertType("mixed", $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']);
+					assertType("mixed", $this->config['authors']);
 					unset($this->config['authors'][$key]['homepage']);
-					assertType("mixed~0|0.0|''|'0'|false|null", $this->config['authors']);
+					assertType("mixed", $this->config['authors']);
 				}
 				if (isset($author['email']) && !filter_var($author['email'], FILTER_VALIDATE_EMAIL)) {
 					unset($this->config['authors'][$key]['email']);
@@ -44,8 +44,8 @@ public function doFoo(): void
 				}
 			}
 
-			assertType("array&hasOffsetValue('authors', mixed~0|0.0|''|'0'|false|null)", $this->config);
-			assertType("mixed~0|0.0|''|'0'|false|null", $this->config['authors']);
+			assertType("array", $this->config);
+			assertType("mixed", $this->config['authors']);
 
 			if (empty($this->config['authors'])) {
 				unset($this->config['authors']);
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
@@ -15,10 +15,10 @@ 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']);
+				assertType("mixed", $this->config['authors']);
 				if (!is_array($author)) {
 					unset($this->config['authors'][$key]);
-					assertType("mixed~0|0.0|''|'0'|false|null", $this->config['authors']);
+					assertType("mixed", $this->config['authors']);
 					continue;
 				}
 				foreach (['homepage', 'email', 'name', 'role'] as $authorData) {
@@ -33,13 +33,13 @@ public function doFoo()
 					unset($this->config['authors'][$key]['email']);
 				}
 				if (empty($this->config['authors'][$key])) {
-					assertType("mixed~0|0.0|''|'0'|false|null", $this->config['authors']);
+					assertType("mixed", $this->config['authors']);
 					unset($this->config['authors'][$key]);
-					assertType("mixed~0|0.0|''|'0'|false|null", $this->config['authors']);
+					assertType("mixed", $this->config['authors']);
 				}
-				assertType("mixed~0|0.0|''|'0'|false|null", $this->config['authors']);
+				assertType("mixed", $this->config['authors']);
 			}
-			assertType("mixed~0|0.0|''|'0'|false|null", $this->config['authors']);
+			assertType("mixed", $this->config['authors']);
 		}
 	}
 
diff --git a/tests/PHPStan/Rules/Variables/data/bug-7417.php b/tests/PHPStan/Rules/Variables/data/bug-7417.php
@@ -24,5 +24,5 @@ function doFoo() {
 	unset($extensions['theme']['test_basetheme']);
 	unset($extensions['theme']['test_subsubtheme']);
 	unset($extensions['theme']['test_subtheme']);
-	assertType("hasOffsetValue('theme', mixed)&non-empty-array", $extensions);
+	assertType("array", $extensions);
 }

Original file line number	Diff line number	Diff line change
`@@ -15,10 +15,10 @@ public function doFoo()`
`15`	`15`	`if (!empty($this->config['authors'])) {`
`16`	`16`	`assertType("mixed~0\|0.0\|''\|'0'\|array{}\|false\|null", $this->config['authors']);`
`17`	`17`	`foreach ($this->config['authors'] as $key => $author) {`
`18`		`- assertType("mixed~0\|0.0\|''\|'0'\|false\|null", $this->config['authors']);`
	`18`	`+ assertType("mixed", $this->config['authors']);`
`19`	`19`	`if (!is_array($author)) {`
`20`	`20`	`unset($this->config['authors'][$key]);`
`21`		`- assertType("mixed~0\|0.0\|''\|'0'\|false\|null", $this->config['authors']);`
	`21`	`+ assertType("mixed", $this->config['authors']);`
`22`	`22`	`continue;`
`23`	`23`	`}`
`24`	`24`	`foreach (['homepage', 'email', 'name', 'role'] as $authorData) {`
`@@ -33,13 +33,13 @@ public function doFoo()`
`33`	`33`	`unset($this->config['authors'][$key]['email']);`
`34`	`34`	`}`
`35`	`35`	`if (empty($this->config['authors'][$key])) {`
`36`		`- assertType("mixed~0\|0.0\|''\|'0'\|false\|null", $this->config['authors']);`
	`36`	`+ assertType("mixed", $this->config['authors']);`
`37`	`37`	`unset($this->config['authors'][$key]);`
`38`		`- assertType("mixed~0\|0.0\|''\|'0'\|false\|null", $this->config['authors']);`
	`38`	`+ assertType("mixed", $this->config['authors']);`
`39`	`39`	`}`
`40`		`- assertType("mixed~0\|0.0\|''\|'0'\|false\|null", $this->config['authors']);`
	`40`	`+ assertType("mixed", $this->config['authors']);`
`41`	`41`	`}`
`42`		`- assertType("mixed~0\|0.0\|''\|'0'\|false\|null", $this->config['authors']);`
	`42`	`+ assertType("mixed", $this->config['authors']);`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`
Original file line number	Diff line number	Diff line change
`@@ -24,5 +24,5 @@ function doFoo() {`
`24`	`24`	`unset($extensions['theme']['test_basetheme']);`
`25`	`25`	`unset($extensions['theme']['test_subsubtheme']);`
`26`	`26`	`unset($extensions['theme']['test_subtheme']);`
`27`		`- assertType("hasOffsetValue('theme', mixed)&non-empty-array", $extensions);`
	`27`	`+ assertType("array", $extensions);`
`28`	`28`	`}`