Merge branch 'release/5.0.4'

Author: mikaelcom

.github/workflows/sonars.yml

@@ -33,7 +33,7 @@ jobs:
             -   name: Monitor coverage
                 uses: slavcodev/coverage-monitor-action@v1
                 with:
-                    github_token: ${{ secrets.ACTIONS_GITHUB_TOKEN }}
+                    github_token: ${{ secrets.GITHUB_TOKEN }}
                     coverage_path: coverage.xml
                     threshold_alert: 95
                     threshold_warning: 90
@@ -44,5 +44,5 @@ jobs:
             -   name: SonarCloud Scan
                 uses: SonarSource/sonarcloud-github-action@master
                 env:
-                    GITHUB_TOKEN: ${{ secrets.ACTIONS_GITHUB_TOKEN }}
+                    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
                     SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

CHANGELOG.md

@@ -1,5 +1,8 @@
 # CHANGELOG
 
+## 5.0.4 - 2024/02/05
+- PR #51 - Fix overriding the custom SoapClient class
+
 ## 5.0.3 - 2023/02/09
 - PR #38 - type checking exception raised in php8
 

composer.json

@@ -48,6 +48,10 @@
         {
             "name": "maurobn",
             "role": "Contributor"
+        },
+        {
+          "name": "Christo Yovev",
+          "role": "Contributor"
         }
     ],
     "support" : {

src/AbstractSoapClientBase.php

@@ -100,7 +100,7 @@ protected static function canInstantiateSoapClientWithOptions(array $wsdlOptions
      */
     public function getSoapClientClassName(?string $soapClientClassName = null): string
     {
-        $className = self::DEFAULT_SOAP_CLIENT_CLASS;
+        $className = static::DEFAULT_SOAP_CLIENT_CLASS;
         if (!empty($soapClientClassName) && is_subclass_of($soapClientClassName, SoapClient::class)) {
             $className = $soapClientClassName;
         }

tests/CustomSoapClientService.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace WsdlToPhp\PackageBase\Tests;
+
+use WsdlToPhp\PackageBase\AbstractSoapClientBase;
+
+/**
+ * Services can specify a custom SoapClient class
+ * to be used instead of PHP default by overriding
+ * the constant below.
+ * 
+ * @see \WsdlToPhp\PackageBase\SoapClientInterface
+ * @see \WsdlToPhp\PackageBase\AbstractSoapClientBase :: getSoapClientClassName()
+ */
+
+class CustomSoapClientService extends AbstractSoapClientBase
+{
+
+    /**
+     * Custom SoapClient class used for current service.
+     */
+    const DEFAULT_SOAP_CLIENT_CLASS = Client::class;
+    
+}

tests/DefaultSoapClientService.php

@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace WsdlToPhp\PackageBase\Tests;
+
+use WsdlToPhp\PackageBase\AbstractSoapClientBase;
+
+/**
+ * By default all services extending the packagebase's
+ * abstract class rely on PHP's default SoapClient.
+ */
+
+class DefaultSoapClientService extends AbstractSoapClientBase
+{
+
+}

tests/SoapClientTest.php

@@ -25,6 +25,15 @@ public function testSoapClientNameDefault(): void
         $this->assertSame(Client::class, $soapClient->getSoapClientClassName(Client::class));
     }
 
+    public function testCustomSoapClientNameReadFromConstant()
+    {
+        $defaultService = new DefaultSoapClientService();
+        $customService  = new CustomSoapClientService();
+
+        $this->assertSame(SoapClientBase::class, $defaultService->getSoapClientClassName());
+        $this->assertSame(Client::class, $customService->getSoapClientClassName());
+    }
+
     public function testSoapClient(): void
     {
         $soapClient = new SoapClient([
@@ -489,4 +498,5 @@ public function testGetOutputHeadersWithoutRequestMustReturnAnEmptyArray(): void
         $this->assertTrue(is_array($soapClient->getOutputHeaders()));
         $this->assertEmpty($soapClient->getOutputHeaders());
     }
+
 }