refactor(laravel-soap-179): Apply review discussion

- Added Flattingloader
- Using SoapActionDetector
- bit more code clean up to PHP 8 standard

Author: Gregor Becker

src/Client/Request.php

@@ -6,25 +6,26 @@
 use CodeDredd\Soap\Xml\XMLSerializer;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
+use Psr\Http\Message\RequestInterface;
+use Soap\Psr18Transport\HttpBinding\SoapActionDetector;
 use Soap\Xml\Locator\SoapBodyLocator;
 use VeeWee\Xml\Dom\Document;
+use function VeeWee\Xml\Dom\Configurator\optimize_namespaces;
+use function VeeWee\Xml\Dom\Configurator\pretty_print;
+use function VeeWee\Xml\Dom\Configurator\utf8;
+use function VeeWee\Xml\Encoding\xml_decode;
 
 /**
  * Class Request.
  */
 class Request
 {
-    /**
-     * The underlying PSR request.
-     *
-     * @var \Psr\Http\Message\RequestInterface
-     */
-    protected $request;
+    protected RequestInterface $request;
 
     /**
      * Create a new request instance.
      *
-     * @param  \Psr\Http\Message\RequestInterface  $request
+     * @param  RequestInterface  $request
      * @return void
      */
     public function __construct($request)
@@ -34,42 +35,27 @@ public function __construct($request)
 
     /**
      * Get the soap action for soap 1.1 and 1.2.
-     *
-     * @return string
      */
     public function action(): string
     {
-        $contentType = $this->request->getHeaderLine('Content-Type');
-        $soapAction = $this->request->getHeaderLine('SOAPAction');
-        if (empty($soapAction)) {
-            return Str::of($contentType)->afterLast('action=')->remove('"');
-        }
-
-        return Str::of($this->request->getHeaderLine('SOAPAction'))->remove('"');
+        return Str::remove('"', SoapActionDetector::detectFromRequest($this->request));
     }
 
-    /**
-     * @return \Psr\Http\Message\RequestInterface
-     */
-    public function getRequest()
+    public function getRequest(): RequestInterface
     {
         return $this->request;
     }
 
     /**
      * Return complete xml request body.
-     *
-     * @return string
      */
-    public function xmlContent()
+    public function xmlContent(): string
     {
         return $this->request->getBody()->getContents();
     }
 
     /**
      * Return request arguments.
-     *
-     * @return array
      */
     public function arguments(): array
     {

src/SoapClient.php

@@ -7,32 +7,30 @@
 use CodeDredd\Soap\Driver\ExtSoap\ExtSoapEngineFactory;
 use CodeDredd\Soap\Exceptions\NotFoundConfigurationException;
 use CodeDredd\Soap\Exceptions\SoapException;
-use CodeDredd\Soap\Faker\EngineFaker;
 use CodeDredd\Soap\Middleware\CisDhlMiddleware;
 use CodeDredd\Soap\Middleware\WsseMiddleware;
 use GuzzleHttp\Client;
 use GuzzleHttp\HandlerStack;
 use Http\Client\Common\PluginClient;
 use Http\Client\Exception\HttpException;
-use Http\Client\HttpClient;
-use Http\Discovery\Psr17FactoryDiscovery;
 use Illuminate\Contracts\Validation\Validator;
-use Illuminate\Support\Facades\Http;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 use Illuminate\Support\Traits\Macroable;
 use Phpro\SoapClient\Type\ResultInterface;
 use Phpro\SoapClient\Type\ResultProviderInterface;
 use Psr\Http\Client\ClientInterface;
 use Soap\Engine\Engine;
 use Soap\Engine\Transport;
+use Soap\ExtSoapEngine\AbusedClient;
 use Soap\ExtSoapEngine\ExtSoapOptions;
 use Soap\ExtSoapEngine\Transport\TraceableTransport;
-use Soap\ExtSoapEngine\Wsdl\InMemoryWsdlProvider;
 use Soap\ExtSoapEngine\Wsdl\PassThroughWsdlProvider;
 use Soap\ExtSoapEngine\Wsdl\WsdlProvider;
 use Soap\Psr18Transport\Psr18Transport;
 use Soap\Psr18Transport\Wsdl\Psr18Loader;
 use Soap\Psr18WsseMiddleware\WsaMiddleware;
+use Soap\Wsdl\Loader\FlatteningLoader;
 
 /**
  * Class SoapClient.
@@ -47,76 +45,37 @@ class SoapClient
 
     protected PluginClient $pluginClient;
 
-    /**
-     * @var Engine
-     */
-    protected $engine;
+    protected Engine $engine;
 
-    /**
-     * @var array
-     */
-    protected $options = [];
+    protected array $options = [];
 
-    /**
-     * @var ExtSoapOptions
-     */
-    protected $extSoapOptions;
+    protected ExtSoapOptions $extSoapOptions;
 
-    /**
-     * @var TraceableTransport
-     */
-    protected $transport;
+    protected TraceableTransport $transport;
 
-    /**
-     * @var array
-     */
-    protected $guzzleClientOptions = [];
+    protected array $guzzleClientOptions = [];
 
-    /**
-     * @var string
-     */
-    protected $wsdl = '';
+    protected string $wsdl = '';
 
-    /**
-     * @var bool
-     */
-    protected $isClientBuilded = false;
+    protected bool $isClientBuilded = false;
 
-    /**
-     * @var array
-     */
-    protected $middlewares = [];
+    protected array $middlewares = [];
 
-    /**
-     * @var SoapFactory|null
-     */
-    protected $factory;
+    protected SoapFactory|null $factory;
 
-    /**
-     * @var Psr18Loader|WsdlProvider
-     */
-    protected $wsdlProvider;
+    protected FlatteningLoader|WsdlProvider $wsdlProvider;
 
-    /**
-     * The request cookies.
-     *
-     * @var array
-     */
-    protected $cookies;
+    protected array $cookies;
 
     /**
      * The callbacks that should execute before the request is sent.
-     *
-     * @var array
      */
-    protected $beforeSendingCallbacks;
+    protected \Illuminate\Support\Collection $beforeSendingCallbacks;
 
     /**
      * The stub callables that will handle requests.
-     *
-     * @var \Illuminate\Support\Collection|null
      */
-    protected $stubCallbacks;
+    protected \Illuminate\Support\Collection|null $stubCallbacks;
 
     /**
      * Create a new Soap Client instance.
@@ -129,16 +88,16 @@ public function __construct(SoapFactory $factory = null)
         $this->factory = $factory;
         $this->client = new Client($this->guzzleClientOptions);
         $this->pluginClient = new PluginClient($this->client, $this->middlewares);
-        $this->wsdlProvider = Psr18Loader::createForClient($this->pluginClient);
+        $this->wsdlProvider = new FlatteningLoader(Psr18Loader::createForClient($this->pluginClient));
         $this->beforeSendingCallbacks = collect([
             function (Request $request, array $options) {
-                $this->cookies = $options['cookies'];
+                $this->cookies = Arr::wrap($options['cookies']);
             },
         ]);
     }
 
     public function refreshWsdlProvider(){
-        $this->wsdlProvider = Psr18Loader::createForClient($this->pluginClient);
+        $this->wsdlProvider = new FlatteningLoader(Psr18Loader::createForClient($this->pluginClient));
 
         return $this;
     }
@@ -160,7 +119,7 @@ public function getPluginClient(): PluginClient
 
     protected function setTransport(Transport $handler = null): static
     {
-        $soapClient = \Soap\ExtSoapEngine\AbusedClient::createFromOptions(
+        $soapClient = AbusedClient::createFromOptions(
             ExtSoapOptions::defaults($this->wsdl, $this->options)
         );
         $transport = $handler ?? Psr18Transport::createForClient($this->pluginClient);