explode() always returns non-empty-array

phpstan · Jul 7, 2021 · 25260db · 25260db
1 parent 6ef5e91
commit 25260db
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/resources/functionMap.php b/resources/functionMap.php
@@ -2639,7 +2639,7 @@
 'exp' => ['float', 'number'=>'float'],
 'expect_expectl' => ['int', 'expect'=>'resource', 'cases'=>'array', 'match='=>'array'],
 'expect_popen' => ['resource|false', 'command'=>'string'],
-'explode' => ['array<int,string>|false', 'separator'=>'string', 'str'=>'string', 'limit='=>'int'],
+'explode' => ['non-empty-array<int,string>|false', 'separator'=>'string', 'str'=>'string', 'limit='=>'int'],
 'expm1' => ['float', 'number'=>'float'],
 'extension_loaded' => ['bool', 'extension_name'=>'string'],
 'extract' => ['int', '&rw_var_array'=>'array', 'extract_type='=>'int', 'prefix='=>'string|null'],

diff --git a/resources/functionMap_php80delta.php b/resources/functionMap_php80delta.php
@@ -38,7 +38,7 @@
 		'date_time_set' => ['DateTime', 'object'=>'DateTime', 'hour'=>'int', 'minute'=>'int', 'second='=>'int', 'microseconds='=>'int'],
 		'date_timestamp_set' => ['DateTime', 'object'=>'DateTime', 'unixtimestamp'=>'int'],
 		'date_timezone_set' => ['DateTime', 'object'=>'DateTime', 'timezone'=>'DateTimeZone'],
-		'explode' => ['array<int,string>', 'separator'=>'non-empty-string', 'str'=>'string', 'limit='=>'int'],
+		'explode' => ['non-empty-array<int,string>', 'separator'=>'non-empty-string', 'str'=>'string', 'limit='=>'int'],
 		'fdiv' => ['float', 'dividend'=>'float', 'divisor'=>'float'],
 		'get_debug_type' => ['string', 'var'=>'mixed'],
 		'get_resource_id' => ['int', 'res'=>'resource'],

diff --git a/tests/PHPStan/Analyser/LegacyNodeScopeResolverTest.php b/tests/PHPStan/Analyser/LegacyNodeScopeResolverTest.php
@@ -8003,15 +8003,15 @@ public function dataExplode(): array
 				'$sureFalse',
 			],
 			[
-				PHP_VERSION_ID < 80000 ? 'array<int, string>|false' : 'array<int, string>',
+				PHP_VERSION_ID < 80000 ? '(array<int, string>&nonEmpty)|false' : 'array<int, string>&nonEmpty',
 				'$arrayOrFalse',
 			],
 			[
-				PHP_VERSION_ID < 80000 ? 'array<int, string>|false' : 'array<int, string>',
+				PHP_VERSION_ID < 80000 ? 'array<int, string>&nonEmpty|false' : 'array<int, string>&nonEmpty',
 				'$anotherArrayOrFalse',
 			],
 			[
-				PHP_VERSION_ID < 80000 ? '(array<int, string>|false)' : 'array<int, string>',
+				PHP_VERSION_ID < 80000 ? '((array<int, string>&nonEmpty)|false)' : 'array<int, string>&nonEmpty',
 				'$benevolentArrayOrFalse',
 			],
 		];

diff --git a/tests/PHPStan/Analyser/data/bug-3961-php8.php b/tests/PHPStan/Analyser/data/bug-3961-php8.php
@@ -14,8 +14,8 @@ public function doFoo(string $v, string $d, $m): void
 		assertType('array<int, string>', explode('.', $v, -2));
 		assertType('array<int, string>&nonEmpty', explode('.', $v, 0));
 		assertType('array<int, string>&nonEmpty', explode('.', $v, 1));
-		assertType('array<int, string>', explode($d, $v));
-		assertType('array<int, string>', explode($m, $v));
+		assertType('array<int, string>&nonEmpty', explode($d, $v));
+		assertType('array<int, string>&nonEmpty', explode($m, $v));
 	}
 
 }
diff --git a/tests/PHPStan/Analyser/data/bug-4711.php b/tests/PHPStan/Analyser/data/bug-4711.php
@@ -12,8 +12,8 @@ function x(string $string): void {
 			return;
 		}
 
-		assertType('array<int, string>', explode($string, ''));
-		assertType('array<int, string>', explode($string[0], ''));
+		assertType('array<int, string>&nonEmpty', explode($string, ''));
+		assertType('array<int, string>&nonEmpty', explode($string[0], ''));
 	}
 
 }