Merge remote-tracking branch 'origin/master'

Author: Gregor Becker

config/soap.php

@@ -1,41 +1,41 @@
-<?php
-
-use RobRichards\XMLSecLibs\XMLSecurityKey;
-
-return [
-
-	/*
-	|--------------------------------------------------------------------------
-	| SOAP Client Configuration
-	|--------------------------------------------------------------------------
-	|
-	| Her you can setup your soap client by configuration so that ou just need
-	| a name.
-	|
-	| example: Soap::buildClient('laravel_soap')
-	*/
-
-	'clients' => [
-		'laravel_soap' => [
-		    'base_wsdl' => 'test.wsdl',
-		    'with_wsa' => true,
-		    'with_basic_auth' => [
-			    'username' => 'username',
-			    'password' => 'password',
-		    ],
-            'with_wsse' => [
-                'user_token_name' => 'username',
-                'user_token_password' => 'password',
-                'private_key_file' => 'path/to/privatekey.pem',
-                'public_key_file' => 'path/to/publickey.pyb',
-                'server_certificate_file' => 'path/to/client-cert.pem',
-                'server_certificate_has_subject_key_identifier' => false,
-                'user_token_digest' => false,
-                'digital_sign_method' => XMLSecurityKey::RSA_SHA1,
-                'timestamp' => 3600,
-                'sign_all_headers' => false,
-            ]
-        ],
-	],
-
-];
+<?php
+
+use RobRichards\XMLSecLibs\XMLSecurityKey;
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | SOAP Client Configuration
+    |--------------------------------------------------------------------------
+    |
+    | Her you can setup your soap client by configuration so that ou just need
+    | a name.
+    |
+    | example: Soap::buildClient('laravel_soap')
+    */
+
+    'clients' => [
+        'laravel_soap' => [
+            'base_wsdl' => 'test.wsdl',
+            'with_wsa' => true,
+            'with_basic_auth' => [
+                'username' => 'username',
+                'password' => 'password',
+            ],
+            'with_wsse' => [
+                'user_token_name' => 'username',
+                'user_token_password' => 'password',
+                'private_key_file' => 'path/to/privatekey.pem',
+                'public_key_file' => 'path/to/publickey.pyb',
+                'server_certificate_file' => 'path/to/client-cert.pem',
+                'server_certificate_has_subject_key_identifier' => false,
+                'user_token_digest' => false,
+                'digital_sign_method' => XMLSecurityKey::RSA_SHA1,
+                'timestamp' => 3600,
+                'sign_all_headers' => false,
+            ],
+        ],
+    ],
+
+];

src/Client/Request.php

@@ -7,8 +7,7 @@
 use Illuminate\Support\Arr;
 
 /**
- * Class Request
- * @package CodeDredd\Soap\Client
+ * Class Request.
  */
 class Request
 {
@@ -41,26 +40,30 @@ public function action(): string
     /**
      * @return \Psr\Http\Message\RequestInterface
      */
-    public function getRequest() {
+    public function getRequest()
+    {
         return $this->request;
     }
 
     /**
-     * Return complete xml request body
+     * Return complete xml request body.
      *
      * @return string
      */
-    public function xmlContent() {
+    public function xmlContent()
+    {
         return $this->request->getBody()->getContents();
     }
 
     /**
-     * Return request arguments
+     * Return request arguments.
      *
      * @return array
      */
-    public function arguments(): array {
+    public function arguments(): array
+    {
         $xml = SoapXml::fromString($this->xmlContent());
+
         return Arr::first(XMLSerializer::domNodeToArray($xml->getBody()));
     }
 }

src/Client/Response.php

@@ -2,18 +2,17 @@
 
 namespace CodeDredd\Soap\Client;
 
-use LogicException;
 use ArrayAccess;
 use CodeDredd\Soap\Exceptions\RequestException;
 use CodeDredd\Soap\Xml\SoapXml;
 use GuzzleHttp\Psr7\Response as Psr7Response;
 use Illuminate\Support\Str;
 use Illuminate\Support\Traits\Macroable;
+use LogicException;
 use Phpro\SoapClient\Type\ResultInterface;
 
 /**
- * Class Response
- * @package CodeDredd\Soap\Client
+ * Class Response.
  */
 class Response implements ResultInterface, ArrayAccess
 {
@@ -65,7 +64,7 @@ public static function fromSoapFault(\SoapFault $soapFault)
     }
 
     /**
-     * Get the full SOAP enveloppe response
+     * Get the full SOAP enveloppe response.
      *
      * @return string
      */
@@ -96,8 +95,10 @@ public function body($transformXml = true, $sanitizeXmlFaultMessage = true)
         $body = (string) $this->response->getBody();
         if ($transformXml && Str::contains($body, '<?xml')) {
             $message = SoapXml::fromString($body)->getFaultMessage();
+
             return trim($sanitizeXmlFaultMessage ? Str::after($message, 'Exception:') : $message);
         }
+
         return $body;
     }
 
@@ -195,7 +196,7 @@ public function offsetExists($offset)
      */
     public function json()
     {
-        if (!$this->decoded) {
+        if (! $this->decoded) {
             $this->decoded = json_decode($this->body(), true);
         }
 

src/Client/ResponseSequence.php

@@ -143,7 +143,7 @@ public function __invoke()
             throw new OutOfBoundsException('A request was made, but the response sequence is empty.');
         }
 
-        if (!$this->failWhenEmpty && count($this->responses) === 0) {
+        if (! $this->failWhenEmpty && count($this->responses) === 0) {
             return value($this->emptyResponse ?? SoapFactory::response());
         }
 

src/Driver/ExtSoap/ExtSoapDriver.php

@@ -10,6 +10,7 @@ class ExtSoapDriver extends PhproExtSoapDriver
     public static function createFromOptions(ExtSoapOptions $options): PhproExtSoapDriver
     {
         $client = AbusedClient::createFromOptions($options);
+
         return self::createFromClient($client);
     }
 }

src/Exceptions/SoapException.php

@@ -3,9 +3,7 @@
 namespace CodeDredd\Soap\Exceptions;
 
 /**
- * Class SoapException
- *
- * @package CodeDredd\Soap\Exceptions
+ * Class SoapException.
  */
 class SoapException extends \RuntimeException
 {

src/Facades/Soap.php

@@ -6,7 +6,7 @@
 use Illuminate\Support\Facades\Facade;
 
 /**
- * Class Soap
+ * Class Soap.
  *
  * @method static \CodeDredd\Soap\SoapClient baseWsdl(string $wsdl)
  * @method static \CodeDredd\Soap\SoapClient stub(callable $callback)
@@ -28,12 +28,11 @@
  * @method static assertActionCalled(string $action)
  * @method static assertNothingSent()
  * @method static assertSequencesAreEmpty()
- * @package CodeDredd\Soap
  */
 class Soap extends Facade
 {
     /**
-     * {@inheritDoc}
+     * {@inheritdoc}
      */
     protected static function getFacadeAccessor()
     {

src/Faker/EngineFaker.php

@@ -11,11 +11,9 @@
 use Phpro\SoapClient\Soap\Handler\HandlerInterface;
 use Phpro\SoapClient\Soap\HttpBinding\LastRequestInfo;
 use Phpro\SoapClient\Soap\HttpBinding\SoapRequest;
-use Phpro\SoapClient\Xml\SoapXml;
 
 /**
- * Class EngineFaker
- * @package CodeDredd\Soap\Faker
+ * Class EngineFaker.
  */
 class EngineFaker implements EngineInterface
 {

src/Middleware/WsseMiddleware.php

@@ -12,7 +12,6 @@
 
 class WsseMiddleware extends Middleware
 {
-
     /**
      * @var string
      */
@@ -135,11 +134,11 @@ public function beforeRequest(callable $handler, RequestInterface $request): Pro
         $wsse->addTimestamp($this->timestamp);
 
         // Add a user token if this is configured.
-        if (!empty($this->userTokenName) && !empty($this->userTokenPassword)) {
+        if (! empty($this->userTokenName) && ! empty($this->userTokenPassword)) {
             $wsse->addUserToken($this->userTokenName, $this->userTokenPassword, $this->userTokenDigest);
         }
 
-        if (!empty($this->privateKeyFile) && !empty($this->publicKeyFile)) {
+        if (! empty($this->privateKeyFile) && ! empty($this->publicKeyFile)) {
             // Create new XMLSec Key using the dsigType and type is private key
             $key = new XMLSecurityKey($this->digitalSignMethod, ['type' => 'private']);
             $key->loadKey($this->privateKeyFile, true);
@@ -159,17 +158,18 @@ public function beforeRequest(callable $handler, RequestInterface $request): Pro
             $wsse->encryptSoapDoc($siteKey, $key, [
                 'KeyInfo' => [
                     'X509SubjectKeyIdentifier' => $this->serverCertificateHasSubjectKeyIdentifier,
-                ]
+                ],
             ]);
         }
 
         $request = $request->withBody($xml->toStream());
+
         return $handler($request);
     }
 
     public function afterResponse(ResponseInterface $response): ResponseInterface
     {
-        if (!$this->encrypt) {
+        if (! $this->encrypt) {
             return $response;
         }
 
@@ -183,8 +183,8 @@ public function afterResponse(ResponseInterface $response): ResponseInterface
                         'key' => $this->privateKeyFile,
                         'isFile' => true,
                         'isCert' => false,
-                    ]
-                ]
+                    ],
+                ],
             ]
         );