From bb577ec271dc7f12032d94a71dbaeb7de1122750 Mon Sep 17 00:00:00 2001 From: Matthias Wirtz Date: Wed, 5 Jan 2022 07:33:26 +0100 Subject: [PATCH 1/2] change nullable for array signature to be equal to param signature --- dictionaries/CallMap.php | 2 +- dictionaries/CallMap_73_delta.php | 4 ++-- dictionaries/CallMap_80_delta.php | 4 ++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dictionaries/CallMap.php b/dictionaries/CallMap.php index e4977a1d2fa..c6c3e1b812b 100644 --- a/dictionaries/CallMap.php +++ b/dictionaries/CallMap.php @@ -12069,7 +12069,7 @@ 'session_reset' => ['bool'], 'session_save_path' => ['string', 'path='=>'string'], 'session_set_cookie_params' => ['bool', 'lifetime'=>'int', 'path='=>'?string', 'domain='=>'?string', 'secure='=>'?bool', 'httponly='=>'?bool'], -'session_set_cookie_params\'1' => ['bool', 'options'=>'array{lifetime?:int,path?:string,domain?:?string,secure?:bool,httponly?:bool,samesite?:string}'], +'session_set_cookie_params\'1' => ['bool', 'options'=>'array{lifetime?:int,path?:?string,domain?:?string,secure?:?bool,httponly?:?bool,samesite?:string}'], 'session_set_save_handler' => ['bool', 'open'=>'callable(string,string):bool', 'close'=>'callable():bool', 'read'=>'callable(string):string', 'write'=>'callable(string,string):bool', 'destroy'=>'callable(string):bool', 'gc'=>'callable(string):bool', 'create_sid='=>'callable():string', 'validate_sid='=>'callable(string):bool', 'update_timestamp='=>'callable(string):bool'], 'session_set_save_handler\'1' => ['bool', 'open'=>'SessionHandlerInterface', 'close='=>'bool'], 'session_start' => ['bool', 'options='=>'array'], diff --git a/dictionaries/CallMap_73_delta.php b/dictionaries/CallMap_73_delta.php index 65d5420b586..fdf6a981001 100644 --- a/dictionaries/CallMap_73_delta.php +++ b/dictionaries/CallMap_73_delta.php @@ -7,7 +7,7 @@ * The 'added' section contains function/method names from FunctionSignatureMap (And alternates, if applicable) that do not exist in php 7.2 * The 'removed' section contains the signatures that were removed in php 7.3. * The 'changed' section contains functions for which the signature has changed for php 7.3. - * Each function in the 'changed' section has an 'old' and a 'new' section, + * Each function in the 'changed' section has an 'old' and a 'new' section, * representing the function as it was in PHP 7.2 and in PHP 7.3, respectively * * @see CallMap.php @@ -42,7 +42,7 @@ 'is_countable' => ['bool', 'value'=>'mixed'], 'net_get_interfaces' => ['array>|false'], 'openssl_pkey_derive' => ['string|false', 'public_key'=>'mixed', 'private_key'=>'mixed', 'key_length='=>'?int'], - 'session_set_cookie_params\'1' => ['bool', 'options'=>'array{lifetime?:int,path?:string,domain?:?string,secure?:bool,httponly?:bool,samesite?:string}'], + 'session_set_cookie_params\'1' => ['bool', 'options'=>'array{lifetime?:int,path?:string,domain?:string,secure?:bool,httponly?:bool,samesite?:string}'], 'setcookie\'1' => ['bool', 'name'=>'string', 'value='=>'string', 'options='=>'array'], 'setrawcookie\'1' => ['bool', 'name'=>'string', 'value='=>'string', 'options='=>'array'], 'socket_wsaprotocol_info_export' => ['string|false', 'socket'=>'resource', 'process_id'=>'int'], diff --git a/dictionaries/CallMap_80_delta.php b/dictionaries/CallMap_80_delta.php index f561a75ea15..7d8946777fc 100644 --- a/dictionaries/CallMap_80_delta.php +++ b/dictionaries/CallMap_80_delta.php @@ -1133,6 +1133,10 @@ 'old' => ['bool', 'lifetime'=>'int', 'path='=>'string', 'domain='=>'string', 'secure='=>'bool', 'httponly='=>'bool'], 'new' => ['bool', 'lifetime'=>'int', 'path='=>'?string', 'domain='=>'?string', 'secure='=>'?bool', 'httponly='=>'?bool'], ], + 'session_set_cookie_params\'1' => [ + 'old' => ['bool', 'options'=>'array{lifetime?:int,path?:string,domain?:string,secure?:bool,httponly?:bool,samesite?:string}'], + 'new' => ['bool', 'options'=>'array{lifetime?:int,path?:?string,domain?:?string,secure?:?bool,httponly?:?bool,samesite?:string}'], + ], 'socket_accept' => [ 'old' => ['resource|false', 'socket'=>'resource'], 'new' => ['Socket|false', 'socket'=>'Socket'], From 5b23a0c51e588d40ce3b3bba1fccfcf9a854c009 Mon Sep 17 00:00:00 2001 From: Matthias Wirtz Date: Sat, 22 Jan 2022 15:34:16 +0100 Subject: [PATCH 2/2] in array form all attributes are nullable since PHP 7.3 --- dictionaries/CallMap.php | 2 +- dictionaries/CallMap_73_delta.php | 2 +- dictionaries/CallMap_80_delta.php | 4 ---- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dictionaries/CallMap.php b/dictionaries/CallMap.php index c6c3e1b812b..1873918d54e 100644 --- a/dictionaries/CallMap.php +++ b/dictionaries/CallMap.php @@ -12069,7 +12069,7 @@ 'session_reset' => ['bool'], 'session_save_path' => ['string', 'path='=>'string'], 'session_set_cookie_params' => ['bool', 'lifetime'=>'int', 'path='=>'?string', 'domain='=>'?string', 'secure='=>'?bool', 'httponly='=>'?bool'], -'session_set_cookie_params\'1' => ['bool', 'options'=>'array{lifetime?:int,path?:?string,domain?:?string,secure?:?bool,httponly?:?bool,samesite?:string}'], +'session_set_cookie_params\'1' => ['bool', 'options'=>'array{lifetime?:?int,path?:?string,domain?:?string,secure?:?bool,httponly?:?bool,samesite?:?string}'], 'session_set_save_handler' => ['bool', 'open'=>'callable(string,string):bool', 'close'=>'callable():bool', 'read'=>'callable(string):string', 'write'=>'callable(string,string):bool', 'destroy'=>'callable(string):bool', 'gc'=>'callable(string):bool', 'create_sid='=>'callable():string', 'validate_sid='=>'callable(string):bool', 'update_timestamp='=>'callable(string):bool'], 'session_set_save_handler\'1' => ['bool', 'open'=>'SessionHandlerInterface', 'close='=>'bool'], 'session_start' => ['bool', 'options='=>'array'], diff --git a/dictionaries/CallMap_73_delta.php b/dictionaries/CallMap_73_delta.php index fdf6a981001..7b1d9e508e6 100644 --- a/dictionaries/CallMap_73_delta.php +++ b/dictionaries/CallMap_73_delta.php @@ -42,7 +42,7 @@ 'is_countable' => ['bool', 'value'=>'mixed'], 'net_get_interfaces' => ['array>|false'], 'openssl_pkey_derive' => ['string|false', 'public_key'=>'mixed', 'private_key'=>'mixed', 'key_length='=>'?int'], - 'session_set_cookie_params\'1' => ['bool', 'options'=>'array{lifetime?:int,path?:string,domain?:string,secure?:bool,httponly?:bool,samesite?:string}'], + 'session_set_cookie_params\'1' => ['bool', 'options'=>'array{lifetime?:?int,path?:?string,domain?:?string,secure?:?bool,httponly?:?bool,samesite?:?string}'], 'setcookie\'1' => ['bool', 'name'=>'string', 'value='=>'string', 'options='=>'array'], 'setrawcookie\'1' => ['bool', 'name'=>'string', 'value='=>'string', 'options='=>'array'], 'socket_wsaprotocol_info_export' => ['string|false', 'socket'=>'resource', 'process_id'=>'int'], diff --git a/dictionaries/CallMap_80_delta.php b/dictionaries/CallMap_80_delta.php index 7d8946777fc..f561a75ea15 100644 --- a/dictionaries/CallMap_80_delta.php +++ b/dictionaries/CallMap_80_delta.php @@ -1133,10 +1133,6 @@ 'old' => ['bool', 'lifetime'=>'int', 'path='=>'string', 'domain='=>'string', 'secure='=>'bool', 'httponly='=>'bool'], 'new' => ['bool', 'lifetime'=>'int', 'path='=>'?string', 'domain='=>'?string', 'secure='=>'?bool', 'httponly='=>'?bool'], ], - 'session_set_cookie_params\'1' => [ - 'old' => ['bool', 'options'=>'array{lifetime?:int,path?:string,domain?:string,secure?:bool,httponly?:bool,samesite?:string}'], - 'new' => ['bool', 'options'=>'array{lifetime?:int,path?:?string,domain?:?string,secure?:?bool,httponly?:?bool,samesite?:string}'], - ], 'socket_accept' => [ 'old' => ['resource|false', 'socket'=>'resource'], 'new' => ['Socket|false', 'socket'=>'Socket'],