Apply fixes from StyleCI

src/Client/Request.php

@@ -2,7 +2,6 @@
 
 namespace CodeDredd\Soap\Client;
 
-use CodeDredd\Soap\Xml\SoapXml;
 use CodeDredd\Soap\Xml\XMLSerializer;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Str;

src/Driver/ExtSoap/ExtSoapEngineFactory.php

@@ -19,7 +19,6 @@ public static function fromOptionsWithHandler(
     ): EngineFaker|SimpleEngine {
         $driver = ExtSoapDriver::createFromOptions($options);
         if ($withMocking) {
-
         }
 
         return $withMocking ? new EngineFaker($driver, $transport, $options) : new SimpleEngine($driver, $transport);

src/Faker/EngineFaker.php

@@ -43,5 +43,4 @@ public function getMetadata(): Metadata
     {
         return $this->driver->getMetadata();
     }
-
 }

src/Middleware/CisDhlMiddleware.php

@@ -5,15 +5,15 @@
 use Http\Client\Common\Plugin;
 use Http\Promise\Promise;
 use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
 use Soap\Psr18Transport\Xml\XmlMessageManipulator;
 use Soap\Xml\Builder\SoapHeader;
 use Soap\Xml\Builder\SoapHeaders;
 use Soap\Xml\Manipulator\PrependSoapHeaders;
-use VeeWee\Xml\Dom\Document;
-use Psr\Http\Message\ResponseInterface;
 use function VeeWee\Xml\Dom\Builder\children;
 use function VeeWee\Xml\Dom\Builder\namespaced_element;
 use function VeeWee\Xml\Dom\Builder\value;
+use VeeWee\Xml\Dom\Document;
 
 class CisDhlMiddleware implements Plugin
 {
@@ -48,7 +48,7 @@ public function handleRequest(RequestInterface $request, callable $next, callabl
         return $next(
             (new XmlMessageManipulator)(
                 $request,
-                function (Document $document) use ($request) {
+                function (Document $document) {
                     $builder = new SoapHeaders(
                         new SoapHeader(
                             self::CIS_NS,

src/Middleware/WsseMiddleware.php

@@ -120,8 +120,6 @@ function (Document $xml) {
                     $wsse->attachTokentoSig($token);
                 }
 
-
-
                 // Add end-to-end encryption if configured:
                 if ($this->encrypt) {
                     $key = new XMLSecurityKey(XMLSecurityKey::AES256_CBC);
@@ -131,7 +129,7 @@ function (Document $xml) {
                     $wsse->encryptSoapDoc($siteKey, $key, [
                         'KeyInfo' => [
                             'X509SubjectKeyIdentifier' => $this->serverCertificateHasSubjectKeyIdentifier,
-                        ]
+                        ],
                     ]);
                 }
             }
@@ -142,7 +140,7 @@ function (Document $xml) {
 
     public function afterResponse(ResponseInterface $response): ResponseInterface
     {
-        if (!$this->encrypt) {
+        if (! $this->encrypt) {
             return $response;
         }
 
@@ -158,8 +156,8 @@ function (Document $xml) {
                                 'key'    => $this->privateKeyFile,
                                 'isFile' => true,
                                 'isCert' => false,
-                            ]
-                        ]
+                            ],
+                        ],
                     ]
                 );
             }

src/SoapClient.php

@@ -7,17 +7,14 @@
 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\Str;
 use Illuminate\Support\Traits\Macroable;
 use Phpro\SoapClient\Type\ResultInterface;
@@ -27,7 +24,6 @@
 use Soap\Engine\Transport;
 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;
@@ -137,7 +133,8 @@ function (Request $request, array $options) {
         ]);
     }
 
-    public function refreshWsdlProvider(){
+    public function refreshWsdlProvider()
+    {
         $this->wsdlProvider = Psr18Loader::createForClient($this->pluginClient);
 
         return $this;
@@ -170,7 +167,6 @@ protected function setTransport(Transport $handler = null): static
                 $transport
             );
 
-
         return $this;
     }
 
@@ -205,10 +201,10 @@ public function withGuzzleClientOptions($options)
     {
         $this->guzzleClientOptions = array_merge_recursive($this->guzzleClientOptions, $options);
         $this->client = new Client($this->guzzleClientOptions);
+
         return $this;
     }
 
-
     public function getEngine(): Engine
     {
         return $this->engine;
@@ -369,7 +365,7 @@ public function __call($method, $parameters)
     public function call(string $method, $arguments = []): Response
     {
         try {
-            if (!$this->isClientBuilded) {
+            if (! $this->isClientBuilded) {
                 $this->buildClient();
             }
             $this->refreshEngine();
@@ -384,7 +380,7 @@ public function call(string $method, $arguments = []): Response
             if ($result instanceof ResultProviderInterface) {
                 $result = Response::fromSoapResponse($result->getResult());
             }
-            if (!$result instanceof ResultInterface) {
+            if (! $result instanceof ResultInterface) {
                 $result = Response::fromSoapResponse($result);
             }
         } catch (\Exception $exception) {
@@ -430,9 +426,9 @@ public function buildClient(string $setup = '')
      */
     public function byConfig(string $setup)
     {
-        if (!empty($setup)) {
+        if (! empty($setup)) {
             $setup = config()->get('soap.clients.'.$setup);
-            if (!$setup) {
+            if (! $setup) {
                 throw new NotFoundConfigurationException($setup);
             }
             foreach ($setup as $setupItem => $setupItemConfig) {

tests/Unit/Commands/MakeValidationCommandTest.php

@@ -6,7 +6,6 @@
 
 class MakeValidationCommandTest extends TestCase
 {
-
     public function testConsoleCommand()
     {
         $this->markTestSkipped('wsdl2Php package has been removed. Needs refactoring');

tests/Unit/Middleware/CisDhlMiddlewareTest.php

@@ -12,7 +12,7 @@ class CisDhlMiddlewareTest extends TestCase
     public function testCisDHLMiddleware()
     {
         Soap::fake();
-        $client = Soap::withCisDHLAuth('test', 'dhl')->baseWsdl(dirname(__DIR__, 2) . '/Fixtures/Wsdl/weather.wsdl');
+        $client = Soap::withCisDHLAuth('test', 'dhl')->baseWsdl(dirname(__DIR__, 2).'/Fixtures/Wsdl/weather.wsdl');
         $response = $client->call('GetWeatherInformation');
         Soap::assertSent(function (Request $request) {
             return Str::contains($request->xmlContent(), '<cis:Authentification');

tests/Unit/SoapClientTest.php

@@ -10,7 +10,6 @@
 use CodeDredd\Soap\Tests\Fixtures\CustomSoapClient;
 use CodeDredd\Soap\Tests\TestCase;
 use GuzzleHttp\RedirectMiddleware;
-use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 
 class SoapClientTest extends TestCase
@@ -24,7 +23,7 @@ public function testSimpleCall()
     {
         Soap::fake();
         Soap::assertNothingSent();
-        $response = Soap::baseWsdl(dirname(__DIR__, 1) . '/Fixtures/Wsdl/weather.wsdl')
+        $response = Soap::baseWsdl(dirname(__DIR__, 1).'/Fixtures/Wsdl/weather.wsdl')
             ->call('GetWeatherInformation');
         self::assertTrue($response->ok());
         Soap::assertSent(function (Request $request) {
@@ -46,14 +45,14 @@ public function testMagicCallByConfig()
     public function testWsseWithWsaCall()
     {
         Soap::fake();
-        $client = Soap::baseWsdl(dirname(__DIR__, 1) . '/Fixtures/Wsdl/weather.wsdl')->withWsse([
+        $client = Soap::baseWsdl(dirname(__DIR__, 1).'/Fixtures/Wsdl/weather.wsdl')->withWsse([
             'userTokenName' => 'Test',
             'userTokenPassword' => 'passwordTest',
             'mustUnderstand' => false,
         ])->withWsa();
         $response = $client->GetWeatherInformation();
         Soap::assertSent(function (Request $request) {
-            return !Str::contains($request->xmlContent(), 'mustUnderstand');
+            return ! Str::contains($request->xmlContent(), 'mustUnderstand');
         });
         self::assertTrue($response->ok());
     }
@@ -116,7 +115,7 @@ public function testSoapFake($action, $fake, $exspected)
             return Soap::response($item);
         })->all();
         Soap::fake($fake);
-        $response = Soap::baseWsdl(dirname(__DIR__, 1) . '/Fixtures/Wsdl/weather.wsdl')
+        $response = Soap::baseWsdl(dirname(__DIR__, 1).'/Fixtures/Wsdl/weather.wsdl')
             ->call($action);
         self::assertEquals($exspected, $response->json());
     }
@@ -149,10 +148,10 @@ public function testSoapOptions(): void
     {
         Soap::fake();
         $client = Soap::withOptions(['soap_version' => SOAP_1_2])
-            ->baseWsdl(dirname(__DIR__, 1) . '/Fixtures/Wsdl/weather.wsdl');
+            ->baseWsdl(dirname(__DIR__, 1).'/Fixtures/Wsdl/weather.wsdl');
         $response = $client->call('GetWeatherInformation');
         self::assertTrue($response->ok());
-        Soap::assertSent(function (Request $request)  {
+        Soap::assertSent(function (Request $request) {
             return Str::contains(
                 $request->getRequest()->getHeaderLine('Content-Type'),
                 'application/soap+xml; charset="utf-8"'
@@ -190,9 +189,9 @@ public function testRealSoapCall(): void
     public function testSoapWithDifferentHeaders($header, $exspected): void
     {
         Soap::fake();
-        $client = Soap::withHeaders($header)->baseWsdl(dirname(__DIR__, 1) . '/Fixtures/Wsdl/weather.wsdl');
+        $client = Soap::withHeaders($header)->baseWsdl(dirname(__DIR__, 1).'/Fixtures/Wsdl/weather.wsdl');
         $response = $client->call('GetWeatherInformation');
-        Soap::assertSent(function (Request $request) use ($exspected)  {
+        Soap::assertSent(function (Request $request) use ($exspected) {
             return $request->getRequest()->getHeaderLine('test') === $exspected;
         });
         self::assertTrue($response->ok());
@@ -224,7 +223,7 @@ public function testSoapClientClassMayBeCustomized(): void
     public function testHandlerOptions(): void
     {
         Soap::fake();
-        $client = Soap::baseWsdl(dirname(__DIR__, 1) . '/Fixtures/Wsdl/weather.wsdl');
+        $client = Soap::baseWsdl(dirname(__DIR__, 1).'/Fixtures/Wsdl/weather.wsdl');
         $response = $client->call('GetWeatherInformation');
         self::assertTrue($response->ok());
         self::assertEquals(true, $client->getClient()->getConfig()['verify']);

tests/Unit/Xml/XmlSerializerTest.php

@@ -3,7 +3,6 @@
 namespace CodeDredd\Soap\Tests\Unit\Xml;
 
 use CodeDredd\Soap\Tests\TestCase;
-use CodeDredd\Soap\Xml\SoapXml;
 use CodeDredd\Soap\Xml\XMLSerializer;
 
 class XmlSerializerTest extends TestCase