Skip to content

Commit

Permalink
Merge pull request #9212 from othercorey/drop-rpc
Browse files Browse the repository at this point in the history
Fix xmlrpc callmap functions that were dropped in PHP 8.0
  • Loading branch information
orklah committed Feb 2, 2023
2 parents ab9d745 + f922e57 commit 2c8f143
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 22 deletions.
14 changes: 0 additions & 14 deletions dictionaries/CallMap.php
Original file line number Diff line number Diff line change
Expand Up @@ -15665,20 +15665,6 @@
'XMLReader::setRelaxNGSchemaSource' => ['bool', 'source'=>'?string'],
'XMLReader::setSchema' => ['bool', 'filename'=>'?string'],
'XMLReader::XML' => ['bool', 'source'=>'string', 'encoding='=>'?string', 'options='=>'int'],
'xmlrpc_decode' => ['mixed', 'xml'=>'string', 'encoding='=>'string'],
'xmlrpc_decode_request' => ['?array', 'xml'=>'string', '&w_method'=>'string', 'encoding='=>'string'],
'xmlrpc_encode' => ['string', 'value'=>'mixed'],
'xmlrpc_encode_request' => ['string', 'method'=>'string', 'params'=>'mixed', 'output_options='=>'array'],
'xmlrpc_get_type' => ['string', 'value'=>'mixed'],
'xmlrpc_is_fault' => ['bool', 'arg'=>'array'],
'xmlrpc_parse_method_descriptions' => ['array', 'xml'=>'string'],
'xmlrpc_server_add_introspection_data' => ['int', 'server'=>'resource', 'desc'=>'array'],
'xmlrpc_server_call_method' => ['string', 'server'=>'resource', 'xml'=>'string', 'user_data'=>'mixed', 'output_options='=>'array'],
'xmlrpc_server_create' => ['resource'],
'xmlrpc_server_destroy' => ['int', 'server'=>'resource'],
'xmlrpc_server_register_introspection_callback' => ['bool', 'server'=>'resource', 'function'=>'string'],
'xmlrpc_server_register_method' => ['bool', 'server'=>'resource', 'method_name'=>'string', 'function'=>'string'],
'xmlrpc_set_type' => ['bool', '&rw_value'=>'string|DateTime', 'type'=>'string'],
'XMLWriter::endAttribute' => ['bool'],
'XMLWriter::endCdata' => ['bool'],
'XMLWriter::endComment' => ['bool'],
Expand Down
14 changes: 14 additions & 0 deletions dictionaries/CallMap_80_delta.php
Original file line number Diff line number Diff line change
Expand Up @@ -2520,5 +2520,19 @@
'SimpleXMLIterator::hasChildren' => ['bool'],
'SimpleXMLIterator::getChildren' => ['?SimpleXMLIterator'],
'SplTempFileObject::fgetss' => ['string', 'allowable_tags='=>'string'],
'xmlrpc_decode' => ['mixed', 'xml'=>'string', 'encoding='=>'string'],
'xmlrpc_decode_request' => ['?array', 'xml'=>'string', '&w_method'=>'string', 'encoding='=>'string'],
'xmlrpc_encode' => ['string', 'value'=>'mixed'],
'xmlrpc_encode_request' => ['string', 'method'=>'string', 'params'=>'mixed', 'output_options='=>'array'],
'xmlrpc_get_type' => ['string', 'value'=>'mixed'],
'xmlrpc_is_fault' => ['bool', 'arg'=>'array'],
'xmlrpc_parse_method_descriptions' => ['array', 'xml'=>'string'],
'xmlrpc_server_add_introspection_data' => ['int', 'server'=>'resource', 'desc'=>'array'],
'xmlrpc_server_call_method' => ['string', 'server'=>'resource', 'xml'=>'string', 'user_data'=>'mixed', 'output_options='=>'array'],
'xmlrpc_server_create' => ['resource'],
'xmlrpc_server_destroy' => ['int', 'server'=>'resource'],
'xmlrpc_server_register_introspection_callback' => ['bool', 'server'=>'resource', 'function'=>'string'],
'xmlrpc_server_register_method' => ['bool', 'server'=>'resource', 'method_name'=>'string', 'function'=>'string'],
'xmlrpc_set_type' => ['bool', '&rw_value'=>'string|DateTime', 'type'=>'string'],
],
];
8 changes: 0 additions & 8 deletions tests/Internal/Codebase/InternalCallMapHandlerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -841,12 +841,6 @@ class InternalCallMapHandlerTest extends TestCase
'xmlreader::next',
'xmlreader::open',
'xmlreader::xml',
'xmlrpc_encode_request',
'xmlrpc_server_add_introspection_data',
'xmlrpc_server_call_method',
'xmlrpc_server_destroy',
'xmlrpc_server_register_introspection_callback',
'xmlrpc_server_register_method',
'xsltprocessor::registerphpfunctions',
'xsltprocessor::transformtodoc',
'yaml_emit',
Expand Down Expand Up @@ -915,8 +909,6 @@ class InternalCallMapHandlerTest extends TestCase
'register_shutdown_function' => ['8.0', '8.1'],
'splfileobject::fscanf' => ['8.1', '8.2'],
'spltempfileobject::fscanf' => ['8.1', '8.2'],
'xmlrpc_encode',
'xmlrpc_server_create',
'xsltprocessor::transformtoxml' => ['8.1', '8.2'],
];

Expand Down

0 comments on commit 2c8f143

Please sign in to comment.