ext/soap: Use more accurate return types in implementations of SoapClient::__doRequest()

Girgias · Girgias · commit badb561f7ed9 · 2024-06-16T15:05:48.000+01:00
The do_request() function that calls this methods, assumes that a string is being returned from the method
otherwise it bails out.

However, the default implementation of SoapClient::__doRequest() indicates that it can return null when it
fails to set-up and execute the HTTP SOAP request, but this always results in a SoapFault exception being
thrown, and thus cannot happen in practice.

We need to investigate further if the return type should be changed from ?string to string or not.
diff --git a/ext/soap/soap.c b/ext/soap/soap.c
@@ -2744,7 +2744,7 @@ PHP_METHOD(SoapClient, __doRequest)
 	    return_value)) {
 		return;
 	}
-	RETURN_NULL();
+	RETURN_EMPTY_STRING();
 }
 /* }}} */
 
diff --git a/ext/soap/tests/any.phpt b/ext/soap/tests/any.phpt
@@ -33,7 +33,7 @@ class TestSoapClient extends SoapClient {
     $this->server->addFunction('echoAnyElement');
   }
 
-  function __doRequest($request, $location, $action, $version, $one_way = 0): ?string {
+  function __doRequest($request, $location, $action, $version, $one_way = 0): string {
     ob_start();
     $this->server->handle($request);
     $response = ob_get_contents();
diff --git a/ext/soap/tests/bug69280.phpt b/ext/soap/tests/bug69280.phpt
@@ -25,7 +25,7 @@ class TestWS extends \SoapClient {
 		);
 	}
 
-	public function __doRequest(string $request, string $location, string $action, int $version, bool $oneWay = false): ?string {
+	public function __doRequest(string $request, string $location, string $action, int $version, bool $oneWay = false): never {
 		die($request);
 	}
 }
diff --git a/ext/soap/tests/bugs/bug28969.phpt b/ext/soap/tests/bugs/bug28969.phpt
@@ -18,7 +18,7 @@ class LocalSoapClient extends SoapClient {
     $this->server->addFunction('test');
   }
 
-  function __doRequest($request, $location, $action, $version, $one_way = 0): ?string {
+  function __doRequest($request, $location, $action, $version, $one_way = 0): string {
     ob_start();
     $this->server->handle($request);
     $response = ob_get_contents();
diff --git a/ext/soap/tests/bugs/bug29795.phpt b/ext/soap/tests/bugs/bug29795.phpt
@@ -12,7 +12,7 @@ class LocalSoapClient extends SoapClient {
     parent::__construct($wsdl, $options);
   }
 
-  function __doRequest($request, $location, $action, $version, $one_way = 0): ?string {
+  function __doRequest($request, $location, $action, $version, $one_way = 0): string {
     return <<<EOF
 <?xml version="1.0" encoding="UTF-8"?><SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
 xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"
diff --git a/ext/soap/tests/bugs/bug29839.phpt b/ext/soap/tests/bugs/bug29839.phpt
@@ -20,7 +20,7 @@ class LocalSoapClient extends SoapClient {
     $this->server->addFunction('EchoString');
   }
 
-  function __doRequest($request, $location, $action, $version, $one_way = 0): ?string {
+  function __doRequest($request, $location, $action, $version, $one_way = 0): string {
     ob_start();
     $this->server->handle($request);
     $response = ob_get_contents();
diff --git a/ext/soap/tests/bugs/bug29844.phpt b/ext/soap/tests/bugs/bug29844.phpt
@@ -22,7 +22,7 @@ class LocalSoapClient extends SoapClient {
     $this->server->setClass('hello_world');
   }
 
-  function __doRequest($request, $location, $action, $version, $one_way = 0): ?string {
+  function __doRequest($request, $location, $action, $version, $one_way = 0): string {
     ob_start();
     $this->server->handle($request);
     $response = ob_get_contents();
diff --git a/ext/soap/tests/bugs/bug30045.phpt b/ext/soap/tests/bugs/bug30045.phpt
@@ -21,7 +21,7 @@ class LocalSoapClient extends SoapClient {
     $this->server->addFunction('foo');
   }
 
-  function __doRequest($request, $location, $action, $version, $one_way = 0): ?string {
+  function __doRequest($request, $location, $action, $version, $one_way = 0): string {
     $xml = simplexml_load_string($request);
     echo $xml->children("http://schemas.xmlsoap.org/soap/envelope/")->Body->children("http://test-uri")->children()->param1->asXML(),"\n";
     unset($xml);
diff --git a/ext/soap/tests/bugs/bug30106.phpt b/ext/soap/tests/bugs/bug30106.phpt
@@ -21,7 +21,7 @@ class LocalSoapClient extends SoapClient {
         $this->server->addFunction("getContinentList");
   }
 
-  function __doRequest($request, $location, $action, $version, $one_way = 0): ?string {
+  function __doRequest($request, $location, $action, $version, $one_way = 0): string {
     echo $request;
     ob_start();
     $this->server->handle($request);
diff --git a/ext/soap/tests/bugs/bug30175.phpt b/ext/soap/tests/bugs/bug30175.phpt
@@ -9,7 +9,7 @@ soap.wsdl_cache_enabled=0
 
 class LocalSoapClient extends SoapClient {
 
-  function __doRequest($request, $location, $action, $version, $one_way = 0): ?string {
+  function __doRequest($request, $location, $action, $version, $one_way = 0): string {
     return <<<EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <SOAP-ENV:Envelope
diff --git a/ext/soap/tests/bugs/bug30928.phpt b/ext/soap/tests/bugs/bug30928.phpt
@@ -25,7 +25,7 @@ class LocalSoapClient extends SoapClient {
     $this->server->addFunction('test');
   }
 
-  function __doRequest($request, $location, $action, $version, $one_way = 0): ?string {
+  function __doRequest($request, $location, $action, $version, $one_way = 0): string {
     ob_start();
     $this->server->handle($request);
     $response = ob_get_contents();
diff --git a/ext/soap/tests/bugs/bug31695.phpt b/ext/soap/tests/bugs/bug31695.phpt
@@ -19,7 +19,7 @@ class LocalSoapClient extends SoapClient {
     $this->server->addFunction("Test");
   }
 
-  function __doRequest($request, $location, $action, $version, $one_way = 0): ?string {
+  function __doRequest($request, $location, $action, $version, $one_way = 0): string {
     echo "$location\n";
     ob_start();
     $this->server->handle($request);
diff --git a/ext/soap/tests/bugs/bug32776.phpt b/ext/soap/tests/bugs/bug32776.phpt
@@ -23,7 +23,7 @@ class LocalSoapClient extends SoapClient {
     $this->server->addFunction('test');
   }
 
-  function __doRequest($request, $location, $action, $version, $one_way = 0): ?string {
+  function __doRequest($request, $location, $action, $version, $one_way = 0): string {
     ob_start();
     $this->server->handle($request);
     $response = ob_get_contents();
diff --git a/ext/soap/tests/bugs/bug32941.phpt b/ext/soap/tests/bugs/bug32941.phpt
@@ -5,7 +5,7 @@ soap
 --FILE--
 <?php
 class TestSoapClient extends SoapClient {
-  function __doRequest($request, $location, $action, $version, $one_way = 0): ?string {
+  function __doRequest($request, $location, $action, $version, $one_way = 0): string {
     return <<<EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <soapenv:Envelope
diff --git a/ext/soap/tests/bugs/bug34449.phpt b/ext/soap/tests/bugs/bug34449.phpt
@@ -5,7 +5,7 @@ soap
 --FILE--
 <?php
 class TestSoapClient extends SoapClient {
-  function __doRequest($request, $location, $action, $version, $one_way = 0): ?string {
+  function __doRequest($request, $location, $action, $version, $one_way = 0): never {
     echo "$request\n";
     exit;
   }
diff --git a/ext/soap/tests/bugs/bug34453.phpt b/ext/soap/tests/bugs/bug34453.phpt
@@ -20,7 +20,7 @@ class LocalSoapClient extends SoapClient {
     $this->server->addFunction('EchoString');
   }
 
-  function __doRequest($request, $location, $action, $version, $one_way = 0): ?string {
+  function __doRequest($request, $location, $action, $version, $one_way = 0): string {
     ob_start();
     $this->server->handle($request);
     $response = ob_get_contents();
diff --git a/ext/soap/tests/bugs/bug34643.phpt b/ext/soap/tests/bugs/bug34643.phpt
@@ -23,7 +23,7 @@ class LocalSoapClient extends SoapClient {
     $this->server->setClass('fp');
   }
 
-  function __doRequest($request, $location, $action, $version, $one_way = 0): ?string {
+  function __doRequest($request, $location, $action, $version, $one_way = 0): string {
     ob_start();
     $this->server->handle($request);
     $response = ob_get_contents();
diff --git a/ext/soap/tests/bugs/bug35142.phpt b/ext/soap/tests/bugs/bug35142.phpt
@@ -25,9 +25,12 @@ class TestSoapClient extends SoapClient {
     $this->server->addFunction('PostEvents');
   }
 
-  function __doRequest($request, $location, $action, $version, $one_way = 0): ?string {
-        echo "$request\n";
+  function __doRequest($request, $location, $action, $version, $one_way = 0): string {
+    echo "$request\n";
+    ob_start();
     $this->server->handle($request);
+    $response = ob_get_contents();
+    ob_end_clean();
     return $response;
   }
 
diff --git a/ext/soap/tests/bugs/bug35273.phpt b/ext/soap/tests/bugs/bug35273.phpt
@@ -7,10 +7,10 @@ soap.wsdl_cache_enabled=0
 --FILE--
 <?php
 class TestSoapClient extends SoapClient {
-  function __doRequest($request, $location, $action, $version, $one_way = 0): ?string {
+  function __doRequest($request, $location, $action, $version, $one_way = 0): never {
     echo $request;
     exit;
-    }
+  }
 }
 
 ini_set("soap.wsdl_cache_enabled", 0);
diff --git a/ext/soap/tests/bugs/bug36226-2.phpt b/ext/soap/tests/bugs/bug36226-2.phpt
@@ -24,7 +24,7 @@ class TestSoapClient extends SoapClient {
     $this->server->addFunction('PostEvents');
   }
 
-  function __doRequest($request, $location, $action, $version, $one_way = 0): ?string {
+  function __doRequest($request, $location, $action, $version, $one_way = 0): string {
     echo "$request\n";
     $this->server->handle($request);
     return $response;
diff --git a/ext/soap/tests/bugs/bug36226.phpt b/ext/soap/tests/bugs/bug36226.phpt
@@ -25,9 +25,12 @@ class TestSoapClient extends SoapClient {
     $this->server->addFunction('PostEvents');
   }
 
-  function __doRequest($request, $location, $action, $version, $one_way = 0): ?string {
-        echo "$request\n";
+  function __doRequest($request, $location, $action, $version, $one_way = 0): string {
+    echo "$request\n";
+    ob_start();
     $this->server->handle($request);
+    $response = ob_get_contents();
+    ob_end_clean();
     return $response;
   }
 
diff --git a/ext/soap/tests/bugs/bug36999.phpt b/ext/soap/tests/bugs/bug36999.phpt
@@ -20,7 +20,7 @@ class LocalSoapClient extends SoapClient {
     $this->server->addFunction('echoLong');
   }
 
-  function __doRequest($request, $location, $action, $version, $one_way = 0): ?string {
+  function __doRequest($request, $location, $action, $version, $one_way = 0): string {
     ob_start();
     $this->server->handle($request);
     $response = ob_get_contents();
diff --git a/ext/soap/tests/bugs/bug37083.phpt b/ext/soap/tests/bugs/bug37083.phpt
@@ -7,7 +7,7 @@ soap.wsdl_cache=3
 --FILE--
 <?php
 class TestSoapClient extends SoapClient {
-    function __doRequest($request, $location, $action, $version, $one_way = 0): ?string {
+    function __doRequest($request, $location, $action, $version, $one_way = 0): string {
         return <<<EOF
 <?xml version="1.0" encoding="utf-8"?>
 <soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
diff --git a/ext/soap/tests/bugs/bug38004.phpt b/ext/soap/tests/bugs/bug38004.phpt
@@ -21,7 +21,7 @@ class TestSoapClient extends SoapClient {
     $this->server->addFunction('Test');
   }
 
-  function __doRequest($request, $location, $action, $version, $one_way = 0): ?string {
+  function __doRequest($request, $location, $action, $version, $one_way = 0): string {
     ob_start();
     $this->server->handle($request);
     $response = ob_get_contents();
diff --git a/ext/soap/tests/bugs/bug38005.phpt b/ext/soap/tests/bugs/bug38005.phpt
@@ -19,7 +19,7 @@ class TestSoapClient extends SoapClient {
     $this->server->addFunction('Test');
   }
 
-  function __doRequest($request, $location, $action, $version, $one_way = 0): ?string {
+  function __doRequest($request, $location, $action, $version, $one_way = 0): string {
     ob_start();
     $this->server->handle($request);
     $response = ob_get_contents();
diff --git a/ext/soap/tests/bugs/bug38055.phpt b/ext/soap/tests/bugs/bug38055.phpt
@@ -22,7 +22,7 @@ class TestSoapClient extends SoapClient {
     $this->server->addFunction('Test');
   }
 
-  function __doRequest($request, $location, $action, $version, $one_way = 0): ?string {
+  function __doRequest($request, $location, $action, $version, $one_way = 0): string {
     ob_start();
     $this->server->handle($request);
     $response = ob_get_contents();
diff --git a/ext/soap/tests/bugs/bug38067.phpt b/ext/soap/tests/bugs/bug38067.phpt
@@ -21,7 +21,7 @@ class TestSoapClient extends SoapClient {
     $this->server->addFunction('Test');
   }
 
-  function __doRequest($request, $location, $action, $version, $one_way = 0): ?string {
+  function __doRequest($request, $location, $action, $version, $one_way = 0): string {
     ob_start();
     $this->server->handle($request);
     $response = ob_get_contents();
diff --git a/ext/soap/tests/bugs/bug38536.phpt b/ext/soap/tests/bugs/bug38536.phpt
@@ -7,7 +7,7 @@ soap.wsdl_cache_enabled=0
 --FILE--
 <?php
 class LocalSoapClient extends SoapClient {
-  function __doRequest($request, $location, $action, $version, $one_way = 0): ?string {
+  function __doRequest($request, $location, $action, $version, $one_way = 0): string {
     return <<<EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <SOAP-ENV:Envelope
diff --git a/ext/soap/tests/bugs/bug39121.phpt b/ext/soap/tests/bugs/bug39121.phpt
@@ -7,7 +7,7 @@ soap.wsdl_cache_enabled=0
 --FILE--
 <?php
 class LocalSoapClient extends SoapClient {
-  function __doRequest($request, $location, $action, $version, $one_way = 0): ?string {
+  function __doRequest($request, $location, $action, $version, $one_way = 0): string {
     return <<<EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <soap:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" soap:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
diff --git a/ext/soap/tests/bugs/bug39815.phpt b/ext/soap/tests/bugs/bug39815.phpt
@@ -23,7 +23,7 @@ class LocalSoapClient extends SoapClient {
     $this->server->addFunction('test');
   }
 
-  function __doRequest($request, $location, $action, $version, $one_way = 0): ?string {
+  function __doRequest($request, $location, $action, $version, $one_way = 0): string {
     ob_start();
     $this->server->handle($request);
     $response = ob_get_contents();
diff --git a/ext/soap/tests/bugs/bug42692.phpt b/ext/soap/tests/bugs/bug42692.phpt
@@ -19,7 +19,7 @@ class TestSoap extends SoapClient {
         $this->server->addFunction("checkAuth");
     }
 
-    function __doRequest($request, $location, $action, $version, $one_way = 0): ?string {
+    function __doRequest($request, $location, $action, $version, $one_way = 0): string {
         ob_start();
         $this->server->handle($request);
         $response = ob_get_contents();
diff --git a/ext/soap/tests/bugs/bug43045.phpt b/ext/soap/tests/bugs/bug43045.phpt
@@ -16,7 +16,7 @@ class TestSoapClient extends SoapClient {
     $this->server = new SoapServer($wsdl, $options);
     $this->server->addFunction('test');
   }
-  function __doRequest($request, $location, $action, $version, $one_way = 0): ?string {
+  function __doRequest($request, $location, $action, $version, $one_way = 0): string {
     ob_start();
     $this->server->handle($request);
     $response = ob_get_contents();
diff --git a/ext/soap/tests/bugs/bug44882.phpt b/ext/soap/tests/bugs/bug44882.phpt
@@ -8,7 +8,7 @@ soap.wsdl_cache_enabled=0
 <?php
 class TestSoapClient extends SoapClient
 {
-    public function __doRequest($req, $loc, $act, $ver, $one_way = 0): ?string
+    public function __doRequest($req, $loc, $act, $ver, $one_way = 0): string
     {
         return <<<XML
 <?xml version="1.0" encoding="UTF-8"?>
diff --git a/ext/soap/tests/bugs/bug46419.phpt b/ext/soap/tests/bugs/bug46419.phpt
@@ -17,7 +17,7 @@ class LocalSoapClient extends SoapClient {
     $this->server->addFunction('bar');
   }
 
-  function __doRequest($request, $location, $action, $version, $one_way = 0): ?string {
+  function __doRequest($request, $location, $action, $version, $one_way = 0): string {
     ob_start();
     $this->server->handle($request);
     $response = ob_get_contents();
diff --git a/ext/soap/tests/bugs/bug47021.phpt b/ext/soap/tests/bugs/bug47021.phpt
@@ -57,7 +57,7 @@ $options = [
 
 class BugSoapClient extends SoapClient
 {
-    public function __doRequest($request, $location, $action, $version, $one_way = null): ?string
+    public function __doRequest($request, $location, $action, $version, $one_way = null): string
     {
         $response = parent::__doRequest($request, $location, $action, $version, $one_way);
 
diff --git a/ext/soap/tests/bugs/bug50675.phpt b/ext/soap/tests/bugs/bug50675.phpt
@@ -6,7 +6,7 @@ soap
 <?php
 
 class TestSoapClient extends SoapClient {
-  function __doRequest($request, $location, $action, $version, $one_way = 0): ?string {
+  function __doRequest($request, $location, $action, $version, $one_way = 0): string {
     return <<<EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <soapenv:Envelope
diff --git a/ext/soap/tests/bugs/bug50762.phpt b/ext/soap/tests/bugs/bug50762.phpt
@@ -23,7 +23,7 @@ class LocalSoapClient extends SoapClient {
     $this->server->setObject(new testSoap());
   }
 
-  function __doRequest($request, $location, $action, $version, $one_way = 0): ?string {
+  function __doRequest($request, $location, $action, $version, $one_way = 0): string {
     ob_start();
     $this->server->handle($request);
     $response = ob_get_contents();
diff --git a/ext/soap/tests/bugs/bug54911.phpt b/ext/soap/tests/bugs/bug54911.phpt
@@ -5,7 +5,7 @@ soap
 --FILE--
 <?php
     class XSoapClient extends SoapClient {
-        function __doRequest($request, $location, $action, $version, $one_way=false): ?string {
+        function __doRequest($request, $location, $action, $version, $one_way=false): never {
             echo self::$crash;
         }
     }
diff --git a/ext/soap/tests/bugs/bug55323.phpt b/ext/soap/tests/bugs/bug55323.phpt
@@ -14,7 +14,7 @@ class TestSoapClient extends SoapClient {
     parent::__construct($wsdl, $options);
   }
 
-  function __doRequest($request, $location, $action, $version, $one_way = 0): ?string {
+  function __doRequest($request, $location, $action, $version, $one_way = 0): string {
     return <<<EOF
 <SOAP-ENV:Envelope SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://test.com/soap/v3/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/">
    <SOAP-ENV:Body>
diff --git a/ext/soap/tests/bugs/bug69668.phpt b/ext/soap/tests/bugs/bug69668.phpt
@@ -5,7 +5,7 @@ soap
 --FILE--
 <?php
 class MySoapClient extends SoapClient {
-    public function __doRequest($request, $location, $action, $version, $one_way = 0): ?string {
+    public function __doRequest($request, $location, $action, $version, $one_way = 0): string {
         echo $request, PHP_EOL;
         return '';
     }
diff --git a/ext/soap/tests/bugs/bug70875.phpt b/ext/soap/tests/bugs/bug70875.phpt
@@ -9,7 +9,7 @@ soap.wsdl_cache_enabled=0
 
 class bug70875 extends SOAPClient
 {
-    public function __doRequest($request, $location, $action, $version, $one_way = 0): ?string
+    public function __doRequest($request, $location, $action, $version, $one_way = 0): never
     {
         die("no SIGSEGV");
     }
diff --git a/ext/soap/tests/bugs/bug71711.phpt b/ext/soap/tests/bugs/bug71711.phpt
@@ -6,7 +6,7 @@ soap
 <?php
 
 $client = new class(null, [ 'location' => '', 'uri' => 'http://example.org']) extends SoapClient {
-    public function __doRequest($request, $location, $action, $version, $one_way = 0): ?string {
+    public function __doRequest($request, $location, $action, $version, $one_way = 0): string {
         echo $request;
         return '';
     }
diff --git a/ext/soap/tests/bugs/bug71996.phpt b/ext/soap/tests/bugs/bug71996.phpt
diff --git a/ext/soap/tests/bugs/bug73237.phpt b/ext/soap/tests/bugs/bug73237.phpt
diff --git a/ext/soap/tests/bugs/bug77410.phpt b/ext/soap/tests/bugs/bug77410.phpt
diff --git a/ext/soap/tests/bugs/segfault_assertion_props.phpt b/ext/soap/tests/bugs/segfault_assertion_props.phpt
diff --git a/ext/soap/tests/classmap002.phpt b/ext/soap/tests/classmap002.phpt
diff --git a/ext/soap/tests/classmap003.phpt b/ext/soap/tests/classmap003.phpt
diff --git a/ext/soap/tests/classmap004.phpt b/ext/soap/tests/classmap004.phpt
diff --git a/ext/soap/tests/classmap005.phpt b/ext/soap/tests/classmap005.phpt
diff --git a/ext/soap/tests/classmap006.phpt b/ext/soap/tests/classmap006.phpt
diff --git a/ext/soap/tests/classmap007.phpt b/ext/soap/tests/classmap007.phpt
diff --git a/ext/soap/tests/transport001.phpt b/ext/soap/tests/transport001.phpt
diff --git a/ext/soap/tests/typemap003.phpt b/ext/soap/tests/typemap003.phpt
diff --git a/ext/soap/tests/typemap004.phpt b/ext/soap/tests/typemap004.phpt
diff --git a/ext/soap/tests/typemap007.phpt b/ext/soap/tests/typemap007.phpt
diff --git a/ext/soap/tests/typemap008.phpt b/ext/soap/tests/typemap008.phpt
diff --git a/ext/soap/tests/typemap011.phpt b/ext/soap/tests/typemap011.phpt
diff --git a/ext/soap/tests/typemap012.phpt b/ext/soap/tests/typemap012.phpt

Original file line number	Diff line number	Diff line change
`@@ -2744,7 +2744,7 @@ PHP_METHOD(SoapClient, __doRequest)`
`2744`	`2744`	`return_value)) {`
`2745`	`2745`	`return;`
`2746`	`2746`	`}`
`2747`		`- RETURN_NULL();`
	`2747`	`+ RETURN_EMPTY_STRING();`
`2748`	`2748`	`}`
`2749`	`2749`	`/* }}} */`
`2750`	`2750`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ class TestSoapClient extends SoapClient {`
`33`	`33`	`$this->server->addFunction('echoAnyElement');`
`34`	`34`	`}`
`35`	`35`
`36`		`- function __doRequest($request, $location, $action, $version, $one_way = 0): ?string {`
	`36`	`+ function __doRequest($request, $location, $action, $version, $one_way = 0): string {`
`37`	`37`	`ob_start();`
`38`	`38`	`$this->server->handle($request);`
`39`	`39`	`$response = ob_get_contents();`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ class TestWS extends \SoapClient {`
`25`	`25`	`);`
`26`	`26`	`}`
`27`	`27`
`28`		`- public function __doRequest(string $request, string $location, string $action, int $version, bool $oneWay = false): ?string {`
	`28`	`+ public function __doRequest(string $request, string $location, string $action, int $version, bool $oneWay = false): never {`
`29`	`29`	`die($request);`
`30`	`30`	`}`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ class LocalSoapClient extends SoapClient {`
`18`	`18`	`$this->server->addFunction('test');`
`19`	`19`	`}`
`20`	`20`
`21`		`- function __doRequest($request, $location, $action, $version, $one_way = 0): ?string {`
	`21`	`+ function __doRequest($request, $location, $action, $version, $one_way = 0): string {`
`22`	`22`	`ob_start();`
`23`	`23`	`$this->server->handle($request);`
`24`	`24`	`$response = ob_get_contents();`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ class LocalSoapClient extends SoapClient {`
`12`	`12`	`parent::__construct($wsdl, $options);`
`13`	`13`	`}`
`14`	`14`
`15`		`- function __doRequest($request, $location, $action, $version, $one_way = 0): ?string {`
	`15`	`+ function __doRequest($request, $location, $action, $version, $one_way = 0): string {`
`16`	`16`	`return <<<EOF`
`17`	`17`	`<?xml version="1.0" encoding="UTF-8"?><SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"`
`18`	`18`	`xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class LocalSoapClient extends SoapClient {`
`20`	`20`	`$this->server->addFunction('EchoString');`
`21`	`21`	`}`
`22`	`22`
`23`		`- function __doRequest($request, $location, $action, $version, $one_way = 0): ?string {`
	`23`	`+ function __doRequest($request, $location, $action, $version, $one_way = 0): string {`
`24`	`24`	`ob_start();`
`25`	`25`	`$this->server->handle($request);`
`26`	`26`	`$response = ob_get_contents();`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ class LocalSoapClient extends SoapClient {`
`22`	`22`	`$this->server->setClass('hello_world');`
`23`	`23`	`}`
`24`	`24`
`25`		`- function __doRequest($request, $location, $action, $version, $one_way = 0): ?string {`
	`25`	`+ function __doRequest($request, $location, $action, $version, $one_way = 0): string {`
`26`	`26`	`ob_start();`
`27`	`27`	`$this->server->handle($request);`
`28`	`28`	`$response = ob_get_contents();`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ class LocalSoapClient extends SoapClient {`
`21`	`21`	`$this->server->addFunction('foo');`
`22`	`22`	`}`
`23`	`23`
`24`		`- function __doRequest($request, $location, $action, $version, $one_way = 0): ?string {`
	`24`	`+ function __doRequest($request, $location, $action, $version, $one_way = 0): string {`
`25`	`25`	`$xml = simplexml_load_string($request);`
`26`	`26`	`echo $xml->children("http://schemas.xmlsoap.org/soap/envelope/")->Body->children("http://test-uri")->children()->param1->asXML(),"\n";`
`27`	`27`	`unset($xml);`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ class LocalSoapClient extends SoapClient {`
`25`	`25`	`$this->server->addFunction('test');`
`26`	`26`	`}`
`27`	`27`
`28`		`- function __doRequest($request, $location, $action, $version, $one_way = 0): ?string {`
	`28`	`+ function __doRequest($request, $location, $action, $version, $one_way = 0): string {`
`29`	`29`	`ob_start();`
`30`	`30`	`$this->server->handle($request);`
`31`	`31`	`$response = ob_get_contents();`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ class LocalSoapClient extends SoapClient {`
`19`	`19`	`$this->server->addFunction("Test");`
`20`	`20`	`}`
`21`	`21`
`22`		`- function __doRequest($request, $location, $action, $version, $one_way = 0): ?string {`
	`22`	`+ function __doRequest($request, $location, $action, $version, $one_way = 0): string {`
`23`	`23`	`echo "$location\n";`
`24`	`24`	`ob_start();`
`25`	`25`	`$this->server->handle($request);`