Fix glob CallMap and stub to prevent crash on alpine (and possibly ot…

…her systems)
vimeo · Jun 21, 2023 · de61060 · de61060
1 parent 8e63608
commit de61060
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/dictionaries/CallMap.php b/dictionaries/CallMap.php
@@ -3330,7 +3330,7 @@
 'gettimeofday' => ['array<string, int>'],
 'gettimeofday\'1' => ['float', 'as_float='=>'true'],
 'gettype' => ['string', 'value'=>'mixed'],
-'glob' => ['false|list{0?:string, ...<non-empty-string>}', 'pattern'=>'string', 'flags='=>'int-mask<GLOB_MARK, GLOB_NOSORT, GLOB_NOCHECK, GLOB_NOESCAPE, GLOB_BRACE, GLOB_ONLYDIR, GLOB_ERR>'],
+'glob' => ['false|list{0?:string, ...<non-empty-string>}', 'pattern'=>'string', 'flags='=>'int<0, max>'],
 'GlobIterator::__construct' => ['void', 'pattern'=>'string', 'flags='=>'int'],
 'GlobIterator::count' => ['int'],
 'GlobIterator::current' => ['FilesystemIterator|SplFileInfo|string'],

diff --git a/dictionaries/CallMap_historical.php b/dictionaries/CallMap_historical.php
@@ -10728,7 +10728,7 @@
     'gettimeofday' => ['array<string, int>'],
     'gettimeofday\'1' => ['float', 'as_float='=>'true'],
     'gettype' => ['string', 'value'=>'mixed'],
-    'glob' => ['false|list{0?:string, ...<non-empty-string>}', 'pattern'=>'string', 'flags='=>'int-mask<GLOB_MARK, GLOB_NOSORT, GLOB_NOCHECK, GLOB_NOESCAPE, GLOB_BRACE, GLOB_ONLYDIR, GLOB_ERR>'],
+    'glob' => ['false|list{0?:string, ...<non-empty-string>}', 'pattern'=>'string', 'flags='=>'int<0, max>'],
     'gmdate' => ['string', 'format'=>'string', 'timestamp='=>'int'],
     'gmmktime' => ['int|false', 'hour='=>'int', 'minute='=>'int', 'second='=>'int', 'month='=>'int', 'day='=>'int', 'year='=>'int'],
     'gmp_abs' => ['GMP', 'num'=>'GMP|string|int'],

diff --git a/stubs/CoreGenericFunctions.phpstub b/stubs/CoreGenericFunctions.phpstub
@@ -1716,6 +1716,10 @@ function pg_escape_literal($string1, $string2 = null) {}
  */
 function pg_escape_string($string1, $string2 = null) {}
 
+if (!defined('GLOB_BRACE')) {
+    /** @psalm-type GLOB_BRACE = 0 */
+}
+
 /**
  * @psalm-template P of string
  * @psalm-template F of int-mask<GLOB_MARK, GLOB_NOSORT, GLOB_NOCHECK, GLOB_NOESCAPE, GLOB_BRACE, GLOB_ONLYDIR, GLOB_ERR>