Merge pull request #2 from php-soap/invalid-type

Use bool  for SoapClient::__doRequest() $one_way

.phive/phars.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-  <phar name="psalm" version="^4.3.1" installed="4.8.1" location="./tools/psalm.phar" copy="true"/>
+  <phar name="psalm" version="^4.3.1" installed="4.12.0" location="./tools/psalm.phar" copy="true"/>
   <phar name="php-cs-fixer" version="^2.18.2" installed="2.19.0" location="./tools/php-cs-fixer.phar" copy="true"/>
 </phive>

composer.json

@@ -24,7 +24,7 @@
         "ext-soap": "*",
         "ext-dom": "*",
         "azjezz/psl": "^1.7",
-        "php-soap/engine": "^1.0",
+        "php-soap/engine": "^1.1",
         "php-soap/wsdl": "^1.0",
         "symfony/options-resolver": "^5.3"
     },

psalm.xml

@@ -5,7 +5,6 @@
     forbidEcho="true"
     strictBinaryOperands="true"
     phpVersion="8.0"
-    allowPhpStormGenerics="true"
     allowStringToStandInForClass="true"
     rememberPropertyAssignmentsAfterCall="false"
     skipChecksOnUnresolvableIncludes="false"
@@ -20,4 +19,7 @@
             <directory name="tests" />
         </ignoreFiles>
     </projectFiles>
+    <stubs>
+        <file name="stubs/SoapClient.phpstub" />
+    </stubs>
 </psalm>

src/AbusedClient.php

@@ -43,12 +43,14 @@ public static function createFromOptions(ExtSoapOptions $options): self
         return new self($options->getWsdl(), $options->getOptions());
     }
 
-    /**
-     * @psalm-suppress RedundantCastGivenDocblockType - Whatever psalm says ... $oneWay can be bool :-(
-     */
-    public function __doRequest($request, $location, $action, $version, $oneWay = 0)
-    {
-        $this->storedRequest = new SoapRequest($request, $location, $action, $version, (int) $oneWay);
+    public function __doRequest(
+        string $request,
+        string $location,
+        string $action,
+        int $version,
+        bool $one_way = false
+    ): string {
+        $this->storedRequest = new SoapRequest($request, $location, $action, $version, $one_way);
 
         return $this->storedResponse ? $this->storedResponse->getPayload() : '';
     }
@@ -58,7 +60,7 @@ public function doActualRequest(
         string $location,
         string $action,
         int $version,
-        int $oneWay = 0
+        bool $oneWay = false
     ): string {
         $this->__last_request = $request;
         $this->__last_response = parent::__doRequest($request, $location, $action, $version, $oneWay);

src/Configuration/TypeConverter/TypeConverterCollection.php

@@ -9,7 +9,7 @@
 final class TypeConverterCollection implements IteratorAggregate
 {
     /**
-     * @var array|TypeConverterInterface[]
+     * @var array<TypeConverterInterface>
      */
     private array $converters = [];
 
@@ -81,7 +81,7 @@ public function has(TypeConverterInterface $converter): bool
     }
 
     /**
-     * @return ArrayIterator|TypeConverterInterface[]
+     * @return ArrayIterator<array-key, TypeConverterInterface>
      */
     public function getIterator(): ArrayIterator
     {

stubs/SoapClient.phpstub

@@ -0,0 +1,11 @@
+<?php
+declare(strict_types=1);
+
+class SoapClient
+{
+    /**
+     * @see https://github.com/vimeo/psalm/issues/6901
+     * This can be removed once it is fixed in psalm
+     */
+    public function __doRequest (string $request, string $location, string $action, int $version, bool $one_way = false) {}
+}