Merge pull request #7008 from kamil-tekiela/strftime

vimeo · Nov 27, 2021 · eb31ef3 · eb31ef3
2 parents 66eb665 + b44c16b
commit eb31ef3
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/dictionaries/CallMap.php b/dictionaries/CallMap.php
@@ -4050,7 +4050,7 @@
 'gmp_sub' => ['GMP', 'num1'=>'GMP|string|int', 'num2'=>'GMP|string|int'],
 'gmp_testbit' => ['bool', 'num'=>'GMP|string|int', 'index'=>'int'],
 'gmp_xor' => ['GMP', 'num1'=>'GMP|string|int', 'num2'=>'GMP|string|int'],
-'gmstrftime' => ['string', 'format'=>'string', 'timestamp='=>'int'],
+'gmstrftime' => ['string|false', 'format'=>'string', 'timestamp='=>'?int'],
 'gnupg::adddecryptkey' => ['bool', 'fingerprint'=>'string', 'passphrase'=>'string'],
 'gnupg::addencryptkey' => ['bool', 'fingerprint'=>'string'],
 'gnupg::addsignkey' => ['bool', 'fingerprint'=>'string', 'passphrase='=>'string'],
@@ -13838,7 +13838,7 @@
 'streamWrapper::stream_write' => ['int', 'data'=>'string'],
 'streamWrapper::unlink' => ['bool', 'path'=>'string'],
 'streamWrapper::url_stat' => ['array', 'path'=>'string', 'flags'=>'int'],
-'strftime' => ['string', 'format'=>'string', 'timestamp='=>'int'],
+'strftime' => ['string|false', 'format'=>'string', 'timestamp='=>'?int'],
 'strip_tags' => ['string', 'string'=>'string', 'allowed_tags='=>'string'],
 'stripcslashes' => ['string', 'string'=>'string'],
 'stripos' => ['int|false', 'haystack'=>'string', 'needle'=>'string', 'offset='=>'int'],

diff --git a/dictionaries/CallMap_80_delta.php b/dictionaries/CallMap_80_delta.php
@@ -313,6 +313,10 @@
       'old' => ['GMP|false', 'n'=>'GMP|string|int', 'k'=>'int'],
       'new' => ['GMP', 'n'=>'GMP|string|int', 'k'=>'int'],
     ],
+    'gmstrftime' => [
+      'old' => ['string|false', 'format'=>'string', 'timestamp='=>'int'],
+      'new' => ['string|false', 'format'=>'string', 'timestamp='=>'?int'],
+    ],
     'hash_init' => [
       'old' => ['HashContext|false', 'algo'=>'string', 'flags='=>'int', 'key='=>'string'],
       'new' => ['HashContext', 'algo'=>'string', 'flags='=>'int', 'key='=>'string'],
@@ -1137,6 +1141,10 @@
       'old' => ['string|false', 'haystack'=>'string', 'needle'=>'string|int', 'before_needle='=>'bool'],
       'new' => ['string|false', 'haystack'=>'string', 'needle'=>'string', 'before_needle='=>'bool'],
     ],
+    'strftime' => [
+      'old' => ['string|false', 'format'=>'string', 'timestamp='=>'int'],
+      'new' => ['string|false', 'format'=>'string', 'timestamp='=>'?int'],
+    ],
     'stripos' => [
       'old' => ['int|false', 'haystack'=>'string', 'needle'=>'string|int', 'offset='=>'int'],
       'new' => ['int|false', 'haystack'=>'string', 'needle'=>'string', 'offset='=>'int'],

diff --git a/dictionaries/CallMap_historical.php b/dictionaries/CallMap_historical.php
@@ -11160,7 +11160,7 @@
     'gmp_sub' => ['GMP', 'num1'=>'GMP|string|int', 'num2'=>'GMP|string|int'],
     'gmp_testbit' => ['bool', 'num'=>'GMP|string|int', 'index'=>'int'],
     'gmp_xor' => ['GMP', 'num1'=>'GMP|string|int', 'num2'=>'GMP|string|int'],
-    'gmstrftime' => ['string', 'format'=>'string', 'timestamp='=>'int'],
+    'gmstrftime' => ['string|false', 'format'=>'string', 'timestamp='=>'int'],
     'gnupg::adddecryptkey' => ['bool', 'fingerprint'=>'string', 'passphrase'=>'string'],
     'gnupg::addencryptkey' => ['bool', 'fingerprint'=>'string'],
     'gnupg::addsignkey' => ['bool', 'fingerprint'=>'string', 'passphrase='=>'string'],
@@ -15257,7 +15257,7 @@
     'stream_wrapper_register' => ['bool', 'protocol'=>'string', 'class'=>'string', 'flags='=>'int'],
     'stream_wrapper_restore' => ['bool', 'protocol'=>'string'],
     'stream_wrapper_unregister' => ['bool', 'protocol'=>'string'],
-    'strftime' => ['string', 'format'=>'string', 'timestamp='=>'int'],
+    'strftime' => ['string|false', 'format'=>'string', 'timestamp='=>'int'],
     'strip_tags' => ['string', 'string'=>'string', 'allowed_tags='=>'string'],
     'stripcslashes' => ['string', 'string'=>'string'],
     'stripos' => ['int|false', 'haystack'=>'string', 'needle'=>'string|int', 'offset='=>'int'],