Merge pull request #7140 from yethee/soap

Fixed compatibility with SoapClient
vimeo · Dec 14, 2021 · 646ba98 · 646ba98
2 parents f036ebc + 3a574fe
commit 646ba98
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 26 deletions.
diff --git a/dictionaries/CallMap.php b/dictionaries/CallMap.php
@@ -12243,19 +12243,19 @@
 'SoapClient::__construct' => ['void', 'wsdl'=>'mixed', 'options='=>'array|null'],
 'SoapClient::__doRequest' => ['?string', 'request'=>'string', 'location'=>'string', 'action'=>'string', 'version'=>'int', 'one_way='=>'bool'],
 'SoapClient::__getCookies' => ['array'],
-'SoapClient::__getFunctions' => ['array'],
-'SoapClient::__getLastRequest' => ['string'],
-'SoapClient::__getLastRequestHeaders' => ['string'],
-'SoapClient::__getLastResponse' => ['string'],
-'SoapClient::__getLastResponseHeaders' => ['string'],
-'SoapClient::__getTypes' => ['array'],
+'SoapClient::__getFunctions' => ['?array'],
+'SoapClient::__getLastRequest' => ['?string'],
+'SoapClient::__getLastRequestHeaders' => ['?string'],
+'SoapClient::__getLastResponse' => ['?string'],
+'SoapClient::__getLastResponseHeaders' => ['?string'],
+'SoapClient::__getTypes' => ['?array'],
 'SoapClient::__setCookie' => ['', 'name'=>'string', 'value='=>'string'],
 'SoapClient::__setLocation' => ['string', 'new_location='=>'string'],
 'SoapClient::__setSoapHeaders' => ['bool', 'soapheaders='=>''],
 'SoapClient::__soapCall' => ['', 'function_name'=>'string', 'arguments'=>'array', 'options='=>'array', 'input_headers='=>'SoapHeader|array', '&w_output_headers='=>'array'],
 'SoapClient::SoapClient' => ['object', 'wsdl'=>'mixed', 'options='=>'array|null'],
 'SoapFault::__clone' => ['void'],
-'SoapFault::__construct' => ['void', 'faultcode'=>'string', 'faultstring'=>'string', 'faultactor='=>'string', 'detail='=>'string', 'faultname='=>'string', 'headerfault='=>'string'],
+'SoapFault::__construct' => ['void', 'code'=>'array|string|null', 'string'=>'string', 'actor='=>'?string', 'details='=>'?mixed', 'name='=>'?string', 'headerFault='=>'?mixed'],
 'SoapFault::__toString' => ['string'],
 'SoapFault::__wakeup' => ['void'],
 'SoapFault::getCode' => ['int'],
@@ -12265,7 +12265,7 @@
 'SoapFault::getPrevious' => ['?Exception|?Throwable'],
 'SoapFault::getTrace' => ['list<array<string,mixed>>'],
 'SoapFault::getTraceAsString' => ['string'],
-'SoapFault::SoapFault' => ['object', 'faultcode'=>'string', 'faultstring'=>'string', 'faultactor='=>'string', 'detail='=>'string', 'faultname='=>'string', 'headerfault='=>'string'],
+'SoapFault::SoapFault' => ['object', 'faultcode'=>'string', 'faultstring'=>'string', 'faultactor='=>'?string', 'detail='=>'?mixed', 'faultname='=>'?string', 'headerfault='=>'?mixed'],
 'SoapHeader::__construct' => ['void', 'namespace'=>'string', 'name'=>'string', 'data='=>'mixed', 'mustunderstand='=>'bool', 'actor='=>'string'],
 'SoapHeader::SoapHeader' => ['object', 'namespace'=>'string', 'name'=>'string', 'data='=>'mixed', 'mustunderstand='=>'bool', 'actor='=>'string'],
 'SoapParam::__construct' => ['void', 'data'=>'mixed', 'name'=>'string'],

diff --git a/dictionaries/CallMap_historical.php b/dictionaries/CallMap_historical.php
@@ -6823,19 +6823,19 @@
     'SoapClient::__construct' => ['void', 'wsdl'=>'mixed', 'options='=>'array|null'],
     'SoapClient::__doRequest' => ['?string', 'request'=>'string', 'location'=>'string', 'action'=>'string', 'version'=>'int', 'one_way='=>'int'],
     'SoapClient::__getCookies' => ['array'],
-    'SoapClient::__getFunctions' => ['array'],
-    'SoapClient::__getLastRequest' => ['string'],
-    'SoapClient::__getLastRequestHeaders' => ['string'],
-    'SoapClient::__getLastResponse' => ['string'],
-    'SoapClient::__getLastResponseHeaders' => ['string'],
-    'SoapClient::__getTypes' => ['array'],
+    'SoapClient::__getFunctions' => ['?array'],
+    'SoapClient::__getLastRequest' => ['?string'],
+    'SoapClient::__getLastRequestHeaders' => ['?string'],
+    'SoapClient::__getLastResponse' => ['?string'],
+    'SoapClient::__getLastResponseHeaders' => ['?string'],
+    'SoapClient::__getTypes' => ['?array'],
     'SoapClient::__setCookie' => ['', 'name'=>'string', 'value='=>'string'],
     'SoapClient::__setLocation' => ['string', 'new_location='=>'string'],
     'SoapClient::__setSoapHeaders' => ['bool', 'soapheaders='=>''],
     'SoapClient::__soapCall' => ['', 'function_name'=>'string', 'arguments'=>'array', 'options='=>'array', 'input_headers='=>'SoapHeader|array', '&w_output_headers='=>'array'],
-    'SoapFault::SoapFault' => ['object', 'faultcode'=>'string', 'faultstring'=>'string', 'faultactor='=>'string', 'detail='=>'string', 'faultname='=>'string', 'headerfault='=>'string'],
+    'SoapFault::SoapFault' => ['object', 'faultcode'=>'string', 'faultstring'=>'string', 'faultactor='=>'?string', 'detail='=>'?mixed', 'faultname='=>'?string', 'headerfault='=>'?mixed'],
     'SoapFault::__clone' => ['void'],
-    'SoapFault::__construct' => ['void', 'faultcode'=>'string', 'faultstring'=>'string', 'faultactor='=>'string', 'detail='=>'string', 'faultname='=>'string', 'headerfault='=>'string'],
+    'SoapFault::__construct' => ['void', 'code'=>'array|string|null', 'string'=>'string', 'actor='=>'?string', 'details='=>'?mixed', 'name='=>'?string', 'headerFault='=>'?mixed'],
     'SoapFault::__toString' => ['string'],
     'SoapFault::__wakeup' => ['void'],
     'SoapFault::getCode' => ['int'],

diff --git a/dictionaries/PropertyMap.php b/dictionaries/PropertyMap.php
@@ -527,11 +527,12 @@
         'headers' => 'array<string, string>|null',
     ],
     'soapfault' => [
-        'faultcode' => 'string',
+        'faultcode' => 'string|null',
+        'faultcodens' => 'string|null',
         'faultstring' => 'string',
-        'faultactor' => 'string',
-        'detail' => 'string',
+        'faultactor' => 'string|null',
+        'detail' => 'mixed|null',
         '_name' => 'string',
-        'headerfault' => 'string',
+        'headerfault' => 'mixed|null',
     ],
 ];
diff --git a/stubs/soap.phpstub b/stubs/soap.phpstub
@@ -189,39 +189,39 @@ class SoapClient  {
      /**
       * Returns last SOAP request
       * @link https://php.net/manual/en/soapclient.getlastrequest.php
-      * @return string The last SOAP request, as an XML string.
+      * @return string|null The last SOAP request, as an XML string.
       * @since 5.0.1
       */
      public function __getLastRequest () {}
 
      /**
       * Returns last SOAP response
       * @link https://php.net/manual/en/soapclient.getlastresponse.php
-      * @return string The last SOAP response, as an XML string.
+      * @return string|null The last SOAP response, as an XML string.
       * @since 5.0.1
       */
      public function __getLastResponse () {}
 
      /**
       * Returns the SOAP headers from the last request
       * @link https://php.net/manual/en/soapclient.getlastrequestheaders.php
-      * @return string The last SOAP request headers.
+      * @return string|null The last SOAP request headers.
       * @since 5.0.1
       */
      public function __getLastRequestHeaders () {}
 
      /**
       * Returns the SOAP headers from the last response
       * @link https://php.net/manual/en/soapclient.getlastresponseheaders.php
-      * @return string The last SOAP response headers.
+      * @return string|null The last SOAP response headers.
       * @since 5.0.1
       */
      public function __getLastResponseHeaders () {}
 
      /**
       * Returns list of available SOAP functions
       * @link https://php.net/manual/en/soapclient.getfunctions.php
-      * @return array The array of SOAP function prototypes, detailing the return type,
+      * @return array|null The array of SOAP function prototypes, detailing the return type,
       * the function name and type-hinted parameters.
       * @since 5.0.1
       */
@@ -230,7 +230,7 @@ class SoapClient  {
      /**
       * Returns a list of SOAP types
       * @link https://php.net/manual/en/soapclient.gettypes.php
-      * @return array The array of SOAP types, detailing all structures and types.
+      * @return array|null The array of SOAP types, detailing all structures and types.
       * @since 5.0.1
       */
      public function __getTypes () {}