Psalm + PHP85 compatibility

Author: veewee

src/AbusedClient.php

@@ -49,7 +49,8 @@ public function __doRequest(
         string $location,
         string $action,
         int $version,
-        bool $one_way = false
+        bool $one_way = false,
+        ?string $uriParserClass = null,
     ): string {
         $this->storedRequest = new SoapRequest($request, $location, $action, $version, $one_way);
 

src/Metadata/MethodsParser.php

@@ -41,7 +41,7 @@ private function parseMethodFromString(string $methodString): Method
 
     private function transformListResponseToArray(string $methodString): string
     {
-        return preg_replace('/^list\(([^\)]*)\)(.*)/i', 'array$2', $methodString);
+        return (string) preg_replace('/^list\(([^\)]*)\)(.*)/i', 'array$2', $methodString);
     }
 
     private function parseParameters(string $methodString): ParameterCollection
@@ -51,7 +51,7 @@ private function parseParameters(string $methodString): ParameterCollection
             return new ParameterCollection();
         }
 
-        $parameters = preg_split('/,\s?/', $properties[1]);
+        $parameters = preg_split('/,\s?/', $properties[1]) ?: [];
 
         return new ParameterCollection(...array_map(
             function (string $parameter): Parameter {

src/Transport/ExtSoapServerTransport.php

@@ -20,7 +20,7 @@ public function request(SoapRequest $request): SoapResponse
     {
         ob_start();
         $this->server->handle($request->getRequest());
-        $responseBody = ob_get_contents();
+        $responseBody = (string) ob_get_contents();
         ob_end_clean();
 
         return new SoapResponse($responseBody);

tests/Functional/ExtSoap/Encoding/DuplicateTypenamesTest.php

@@ -5,6 +5,7 @@
 namespace SoapTest\ExtSoapEngine\Functional\ExtSoap\Encoding;
 
 use DOMDocument;
+use PHPUnit\Framework\Attributes\RunInSeparateProcess;
 use Soap\Engine\SimpleEngine;
 use Soap\ExtSoapEngine\Configuration\ClassMap\ClassMap;
 use Soap\ExtSoapEngine\Configuration\ClassMap\ClassMapCollection;
@@ -52,7 +53,7 @@ public function test_it_registers_both_types()
         static::assertEquals([...$store2->getProperties()][0]->getName(), 'Attribute2');
     }
 
-    #[\PHPUnit\Framework\Attributes\RunInSeparateProcess]
+    #[RunInSeparateProcess]
     public function test_it_knows_how_to_encode_both_types()
     {
         $engine = new SimpleEngine($this->driver, $this->transport);
@@ -71,7 +72,7 @@ public function test_it_knows_how_to_encode_both_types()
         static::assertStringContainsString('<output2 xsi:type="ns3:Store"><Attribute2 xsi:type="xsd:string">ok</Attribute2></output2>', $lastRequestInfo->getLastResponse());
     }
 
-    #[\PHPUnit\Framework\Attributes\RunInSeparateProcess]
+    #[RunInSeparateProcess]
     public function test_it_uses_same_model_for_both_objects()
     {
         $this->driver = $this->configureSoapDriver($this->wsdl, [
@@ -110,7 +111,7 @@ public function validate($store1, $store2)
         static::assertStringContainsString('<output2 xsi:type="ns3:Store"><Attribute2 xsi:type="xsd:string">attr2</Attribute2></output2>', $lastRequestInfo->getLastResponse());
     }
 
-    #[\PHPUnit\Framework\Attributes\RunInSeparateProcess]
+    #[RunInSeparateProcess]
     public function test_it_is_possible_to_override_a_single_instance_with_typemap()
     {
         $this->driver = $this->configureSoapDriver($this->wsdl, [

tests/Functional/ExtSoap/Encoding/EnumTest.php

@@ -6,6 +6,7 @@
 
 use DOMDocument;
 use Exception;
+use PHPUnit\Framework\Attributes\RunInSeparateProcess;
 use Soap\Engine\SimpleEngine;
 use Soap\ExtSoapEngine\ExtSoapDriver;
 use Soap\ExtSoapEngine\Transport\TraceableTransport;
@@ -43,7 +44,7 @@ public function test_it_does_not_register_a_type()
         static::assertCount(0, $types);
     }
 
-    #[\PHPUnit\Framework\Attributes\RunInSeparateProcess]
+    #[RunInSeparateProcess]
     public function test_it_knows_how_to_add_enums()
     {
         $input = 'Home';
@@ -56,7 +57,7 @@ public function test_it_knows_how_to_add_enums()
         static::assertStringContainsString('<output xsi:type="ns2:PhoneTypeEnum">Home</output>', $lastRequestInfo->getLastResponse());
     }
 
-    #[\PHPUnit\Framework\Attributes\RunInSeparateProcess]
+    #[RunInSeparateProcess]
     public function test_it_does_not_validate_enums()
     {
         $input = 'INVALID';
@@ -68,7 +69,7 @@ public function test_it_does_not_validate_enums()
         static::assertStringContainsString('<output xsi:type="ns2:PhoneTypeEnum">INVALID</output>', $lastRequestInfo->getLastResponse());
     }
 
-    #[\PHPUnit\Framework\Attributes\RunInSeparateProcess]
+    #[RunInSeparateProcess]
     public function test_it_does_not_validate_enum_types()
     {
         $input = 123;
@@ -80,7 +81,7 @@ public function test_it_does_not_validate_enum_types()
         static::assertStringContainsString('<output xsi:type="ns2:PhoneTypeEnum">123</output>', $lastRequestInfo->getLastResponse());
     }
 
-    #[\PHPUnit\Framework\Attributes\RunInSeparateProcess]
+    #[RunInSeparateProcess]
     public function test_it_can_be_transformed_with_type_map()
     {
         $this->driver = $this->configureSoapDriver($this->wsdl, [