Merge pull request #9504 from othercorey/fix-strsplit

vimeo · Mar 15, 2023 · 8d71479 · 8d71479
2 parents 293b728 + 39bb7b4
commit 8d71479
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 4 deletions.
diff --git a/dictionaries/CallMap.php b/dictionaries/CallMap.php
@@ -12898,7 +12898,7 @@
 'str_replace' => ['string|string[]', 'search'=>'string|array', 'replace'=>'string|array', 'subject'=>'string|array', '&w_count='=>'int'],
 'str_rot13' => ['string', 'string'=>'string'],
 'str_shuffle' => ['string', 'string'=>'string'],
-'str_split' => ['list<string>', 'string'=>'string', 'length='=>'positive-int'],
+'str_split' => ['list<non-empty-string>', 'string'=>'string', 'length='=>'positive-int'],
 'str_starts_with' => ['bool', 'haystack'=>'string', 'needle'=>'string'],
 'str_word_count' => ['array<int, string>|int', 'string'=>'string', 'format='=>'int', 'characters='=>'?string'],
 'strcasecmp' => ['int', 'string1'=>'string', 'string2'=>'string'],

diff --git a/dictionaries/CallMap_82_delta.php b/dictionaries/CallMap_82_delta.php
@@ -51,7 +51,7 @@
     ],
     'str_split' => [
        'old' => ['non-empty-list<string>', 'string'=>'string', 'length='=>'positive-int'],
-       'new' => ['list<string>', 'string'=>'string', 'length='=>'positive-int'],
+       'new' => ['list<non-empty-string>', 'string'=>'string', 'length='=>'positive-int'],
     ],
   ],
 

diff --git a/src/Psalm/Internal/Type/TypeTokenizer.php b/src/Psalm/Internal/Type/TypeTokenizer.php
@@ -108,7 +108,6 @@ class TypeTokenizer
      * contains the string token and the second element contains its offset,
      *
      * @return list<array{0: string, 1: int}>
-     * @psalm-suppress PossiblyUndefinedIntArrayOffset
      */
     public static function tokenize(string $string_type, bool $ignore_space = true): array
     {

diff --git a/stubs/CoreGenericFunctions.phpstub b/stubs/CoreGenericFunctions.phpstub
@@ -1050,7 +1050,8 @@ function str_shuffle(string $string): string {}
 
 /**
  * @psalm-pure
- * @return ($length is positive-int ? list<string> : false)
+ * @param positive-int $length
+ * @return non-empty-list<string>
  *
  * @psalm-flow ($string) -> return
  */

diff --git a/stubs/Php82.phpstub b/stubs/Php82.phpstub
@@ -45,4 +45,13 @@ namespace {
     {
         public function __construct() {}
     }
+
+    /**
+    * @psalm-pure
+    * @param positive-int $length
+    * @return list<non-empty-string>
+    *
+    * @psalm-flow ($string) -> return
+    */
+    function str_split(string $string, int $length = 1) {}
 }