Skip to content

Commit

Permalink
Merge pull request #8990 from othercorey/verify-param-nullable
Browse files Browse the repository at this point in the history
Verify nullable callmap parameters
  • Loading branch information
orklah committed Dec 23, 2022
2 parents 1cde7e4 + d6eca8c commit 5979579
Show file tree
Hide file tree
Showing 11 changed files with 1,088 additions and 531 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Expand Up @@ -87,7 +87,7 @@ jobs:
ini-values: zend.assertions=1, assert.exception=1
tools: composer:v2
coverage: none
extensions: none, curl, dom, filter, json, libxml, mbstring, openssl, pcre, phar, reflection, simplexml, spl, tokenizer, xml, xmlwriter
extensions: none, curl, dom, filter, intl, json, libxml, mbstring, openssl, pcre, phar, reflection, simplexml, spl, tokenizer, xml, xmlwriter

- uses: actions/checkout@v3

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows-ci.yml
Expand Up @@ -57,7 +57,7 @@ jobs:
ini-values: zend.assertions=1, assert.exception=1
tools: composer:v2
coverage: none
extensions: none, curl, dom, filter, json, libxml, mbstring, openssl, pcre, phar, reflection, simplexml, spl, tokenizer, xml, xmlwriter
extensions: none, curl, dom, filter, intl, json, libxml, mbstring, openssl, pcre, phar, reflection, simplexml, spl, tokenizer, xml, xmlwriter

- uses: actions/checkout@v3

Expand Down
466 changes: 232 additions & 234 deletions dictionaries/CallMap.php

Large diffs are not rendered by default.

4 changes: 0 additions & 4 deletions dictionaries/CallMap_71_delta.php
Expand Up @@ -58,10 +58,6 @@
'old' => ['array<array>', 'result'=>'resource'],
'new' => ['array<array>', 'result'=>'resource', 'result_type='=>'int'],
],
'pg_last_error' => [
'old' => ['string', 'connection='=>'resource'],
'new' => ['string', 'connection='=>'resource', 'operation='=>'int'],
],
'pg_select' => [
'old' => ['string|array|false', 'connection'=>'resource', 'table_name'=>'string', 'assoc_array'=>'array', 'options='=>'int'],
'new' => ['string|array|false', 'connection'=>'resource', 'table_name'=>'string', 'assoc_array'=>'array', 'options='=>'int', 'result_type='=>'int'],
Expand Down
26 changes: 25 additions & 1 deletion dictionaries/CallMap_72_delta.php
Expand Up @@ -28,7 +28,7 @@
'imageopenpolygon' => ['bool', 'image'=>'resource', 'points'=>'array', 'num_points'=>'int', 'color'=>'int'],
'imageresolution' => ['array|bool', 'image'=>'resource', 'resolution_x='=>'int', 'resolution_y='=>'int'],
'imagesetclip' => ['bool', 'image'=>'resource', 'x1'=>'int', 'y1'=>'int', 'x2'=>'int', 'y2'=>'int'],
'ldap_exop' => ['mixed', 'ldap'=>'resource', 'reqoid'=>'string', 'reqdata='=>'string', 'serverctrls='=>'array|null', '&w_response_data='=>'string', '&w_response_oid='=>'string'],
'ldap_exop' => ['resource|bool', 'ldap'=>'resource', 'request_oid'=>'string', 'request_data='=>'?string', 'controls='=>'array|null', '&w_response_data='=>'string', '&w_response_oid='=>'string'],
'ldap_exop_passwd' => ['bool|string', 'ldap'=>'resource', 'user='=>'string', 'old_password='=>'string', 'new_password='=>'string'],
'ldap_exop_refresh' => ['int|false', 'ldap'=>'resource', 'dn'=>'string', 'ttl'=>'int'],
'ldap_exop_whoami' => ['string|false', 'ldap'=>'resource'],
Expand Down Expand Up @@ -132,6 +132,22 @@
'stream_isatty' => ['bool', 'stream'=>'resource'],
],
'changed' => [
'ReflectionClass::getMethods' => [
'old' => ['list<ReflectionMethod>', 'filter='=>'int'],
'new' => ['list<ReflectionMethod>', 'filter='=>'?int'],
],
'ReflectionClass::getProperties' => [
'old' => ['list<ReflectionProperty>', 'filter='=>'int'],
'new' => ['list<ReflectionProperty>', 'filter='=>'?int'],
],
'ReflectionObject::getMethods' => [
'old' => ['ReflectionMethod[]', 'filter='=>'int'],
'new' => ['ReflectionMethod[]', 'filter='=>'?int'],
],
'ReflectionObject::getProperties' => [
'old' => ['ReflectionProperty[]', 'filter='=>'int'],
'new' => ['ReflectionProperty[]', 'filter='=>'?int'],
],
'SQLite3::openBlob' => [
'old' => ['resource|false', 'table'=>'string', 'column'=>'string', 'rowid'=>'int', 'dbname='=>'string'],
'new' => ['resource|false', 'table'=>'string', 'column'=>'string', 'rowid'=>'int', 'database='=>'string', 'flags='=>'int'],
Expand Down Expand Up @@ -160,10 +176,18 @@
'old' => ['int', 'context'=>'resource', 'handle'=>'resource', 'length='=>'int'],
'new' => ['int', 'context'=>'HashContext', 'stream'=>'resource', 'length='=>'int'],
],
'json_decode' => [
'old' => ['mixed', 'json'=>'string', 'associative='=>'bool', 'depth='=>'int', 'flags='=>'int'],
'new' => ['mixed', 'json'=>'string', 'associative='=>'?bool', 'depth='=>'int', 'flags='=>'int'],
],
'mb_check_encoding' => [
'old' => ['bool', 'value='=>'string', 'encoding='=>'string'],
'new' => ['bool', 'value='=>'array|string', 'encoding='=>'string'],
],
'preg_quote' => [
'old' => ['string', 'str'=>'string', 'delimiter='=>'string'],
'new' => ['string', 'str'=>'string', 'delimiter='=>'?string'],
],
],
'removed' => [
'Sodium\add' => ['void', '&left'=>'string', 'right'=>'string'],
Expand Down
8 changes: 8 additions & 0 deletions dictionaries/CallMap_74_delta.php
Expand Up @@ -21,6 +21,10 @@
'openssl_x509_verify' => ['int', 'certificate'=>'string|resource', 'public_key'=>'string|array|resource'],
],
'changed' => [
'Locale::lookup' => [
'old' => ['?string', 'languageTag'=>'array', 'locale'=>'string', 'canonicalize='=>'bool', 'defaultLocale='=>'string'],
'new' => ['?string', 'languageTag'=>'array', 'locale'=>'string', 'canonicalize='=>'bool', 'defaultLocale='=>'?string'],
],
'array_merge' => [
'old' => ['array', '...arrays'=>'array'],
'new' => ['array', '...arrays='=>'array'],
Expand All @@ -33,6 +37,10 @@
'old' => ['string|0', 'stream'=>'resource', 'length'=>'int'],
'new' => ['string|false', 'stream'=>'resource', 'length'=>'int'],
],
'locale_lookup' => [
'old' => ['?string', 'languageTag'=>'array', 'locale'=>'string', 'canonicalize='=>'bool', 'defaultLocale='=>'string'],
'new' => ['?string', 'languageTag'=>'array', 'locale'=>'string', 'canonicalize='=>'bool', 'defaultLocale='=>'?string'],
],
'password_hash' => [
'old' => ['string|false', 'password'=>'string', 'algo'=>'int', 'options='=>'array'],
'new' => ['string|false', 'password'=>'string', 'algo'=>'int|string|null', 'options='=>'array'],
Expand Down

0 comments on commit 5979579

Please sign in to comment.