Merge remote-tracking branch 'origin/master'

Author: CodeDredd

.github/workflows/dependabot-auto-merge.yml

@@ -14,7 +14,7 @@ jobs:
 
       - name: Dependabot metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v1.3.0
+        uses: dependabot/fetch-metadata@v1.3.1
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
 

.github/workflows/releaseDrafter.yml

@@ -12,6 +12,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       # Drafts your next Release notes as Pull Requests are merged into "master"
-      - uses: release-drafter/release-drafter@v5.19.0
+      - uses: release-drafter/release-drafter@v5.20.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

composer.lock

@@ -42,6 +42,12 @@ Like Wss/Wsse it uses the same package:
         ->withWsa()
         ->call(...)
 
+You can also use the 2005 version of Wsa with 
+
+    $response = Soap::baseWsdl(...)
+        ->withWsa2005()
+        ->call(...)
+
 ### DHL Cis Authentication
 
 DHL uses his own authentication header

docs/client/authentication.md

@@ -7185,12 +7185,7 @@ minimatch@~3.0.4:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
-  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
-
-minimist@^1.2.6:
+minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5, minimist@^1.2.6:
   version "1.2.6"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
   integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==

docs/v3/yarn.lock

@@ -38,6 +38,7 @@
 use Soap\Psr18Transport\Psr18Transport;
 use Soap\Psr18Transport\Wsdl\Psr18Loader;
 use Soap\Psr18WsseMiddleware\WsaMiddleware;
+use Soap\Psr18WsseMiddleware\WsaMiddleware2005;
 use Soap\Wsdl\Loader\FlatteningLoader;
 use Soap\Wsdl\Loader\StreamWrapperLoader;
 
@@ -248,6 +249,18 @@ public function withWsa()
         return $this;
     }
 
+    /**
+     * @return $this
+     */
+    public function withWsa2005()
+    {
+        $this->middlewares = array_merge_recursive($this->middlewares, [
+            new WsaMiddleware2005(),
+        ]);
+
+        return $this;
+    }
+
     public function withWsse(array $options): static
     {
         $this->middlewares = array_merge_recursive($this->middlewares, [

src/SoapClient.php

@@ -70,6 +70,22 @@ public function testWsseWithWsaCall()
         self::assertTrue($response->ok());
     }
 
+    public function testWsseWithWsa2005Call()
+    {
+        Soap::fake();
+        ray()->showSoapClientRequests();
+        $client = Soap::baseWsdl(dirname(__DIR__, 1).'/Fixtures/Wsdl/weather.wsdl')->withWsse([
+            'userTokenName' => 'Test',
+            'userTokenPassword' => 'passwordTest',
+            'mustUnderstand' => false,
+        ])->withWsa2005();
+        $response = $client->GetWeatherInformation();
+        Soap::assertSent(function (Request $request) {
+            return ! Str::contains($request->xmlContent(), 'mustUnderstand');
+        });
+        self::assertTrue($response->ok());
+    }
+
     public function testArrayAccessResponse()
     {
         Soap::fakeSequence()->push('test');