EWPP-4991: Use CodeGeneratorEngineFactory.

openeuropa · Jan 21, 2025 · c059f1e · c059f1e
1 parent 85a46a9
commit c059f1e
Show file tree

Hide file tree

Showing 81 changed files with 2,162 additions and 1,289 deletions.
diff --git a/config/soap-client-authentication.php b/config/soap-client-authentication.php
@@ -3,20 +3,16 @@
 use Phpro\SoapClient\CodeGenerator\Assembler;
 use Phpro\SoapClient\CodeGenerator\Rules;
 use Phpro\SoapClient\CodeGenerator\Config\Config;
-use Soap\ExtSoapEngine\ExtSoapOptions;
-use Phpro\SoapClient\Soap\DefaultEngineFactory;
-use OpenEuropa\EPoetry\CodeGenerator as OpenEuropa;
+use Phpro\SoapClient\Soap\CodeGeneratorEngineFactory;
 
 // Generate SOAP client library to perform ECAS client certificate login.
 // @link https://citnet.tech.ec.europa.eu/CITnet/confluence/display/IAM/ECAS+Certificate+Login
 // WSDL used for generating the SOAP codebase can be found here:
 // @link https://webgate.ec.europa.eu/cas/ws/CertLoginService.wsdl
 // The content returned by the URL above is stored locally in resources/authentication.wsdl.
+$engine = CodeGeneratorEngineFactory::create('./resources/authentication.wsdl');
 return Config::create()
-    ->setEngine($engine = DefaultEngineFactory::create(
-        ExtSoapOptions::defaults(__DIR__.'/../resources/authentication.wsdl', [])
-            ->disableWsdlCache()
-    ))
+    ->setEngine($engine)
     ->setTypeDestination('src/Authentication/ClientCertificate/Type')
     ->setTypeNamespace('OpenEuropa\EPoetry\Authentication\ClientCertificate\Type')
     ->setClientDestination('src/Authentication/ClientCertificate')
@@ -25,12 +21,6 @@
     ->setClassMapDestination('src/Authentication/ClientCertificate')
     ->setClassMapName('ClientCertificateClassmap')
     ->setClassMapNamespace('OpenEuropa\EPoetry\Authentication\ClientCertificate')
-    ->addRule(new Rules\AssembleRule(
-        new OpenEuropa\Assembler\OverridePropertyTypeAssembler(
-            (new OpenEuropa\Assembler\OverridePropertyTypeAssemblerOptions())
-                ->setPropertyTypeMapping([])
-        )
-    ))
     ->addRule(new Rules\AssembleRule(new Assembler\GetterAssembler(new Assembler\GetterAssemblerOptions())))
     ->addRule(new Rules\AssembleRule(new Assembler\ImmutableSetterAssembler(
         new Assembler\ImmutableSetterAssemblerOptions()

diff --git a/config/soap-client-notification.php b/config/soap-client-notification.php
@@ -2,20 +2,18 @@
 
 use OpenEuropa\EPoetry\CodeGenerator\ConfigProcessor;
 use Phpro\SoapClient\CodeGenerator\Config\Config;
-use Soap\ExtSoapEngine\ExtSoapOptions;
-use Phpro\SoapClient\Soap\DefaultEngineFactory;
+use Phpro\SoapClient\Soap\CodeGeneratorEngineFactory;
 
+$engine = CodeGeneratorEngineFactory::create('./resources/notification.wsdl');
 $config = Config::create()
-    ->setEngine($engine = DefaultEngineFactory::create(
-        ExtSoapOptions::defaults('./resources/notification.wsdl', [])
-            ->disableWsdlCache()
-    ))
+    ->setEngine($engine)
     ->setTypeDestination('src/Notification/Type')
     ->setTypeNamespace('OpenEuropa\EPoetry\Notification\Type')
     ->setClientDestination('src/Notification/')
     ->setClientNamespace('OpenEuropa\EPoetry\Notification')
     ->setClassMapDestination('src/Notification/')
     ->setClassMapName('NotificationClassmap')
-    ->setClassMapNamespace('OpenEuropa\EPoetry\Notification');
+    ->setClassMapNamespace('OpenEuropa\EPoetry\Notification')
+;
 
 return ConfigProcessor::addRules($config);
diff --git a/config/soap-client-request.php b/config/soap-client-request.php
@@ -2,14 +2,11 @@
 
 use OpenEuropa\EPoetry\CodeGenerator\ConfigProcessor;
 use Phpro\SoapClient\CodeGenerator\Config\Config;
-use Soap\ExtSoapEngine\ExtSoapOptions;
-use Phpro\SoapClient\Soap\DefaultEngineFactory;
+use Phpro\SoapClient\Soap\CodeGeneratorEngineFactory;
 
+$engine = CodeGeneratorEngineFactory::create('./resources/request.wsdl');
 $config = Config::create()
-    ->setEngine($engine = DefaultEngineFactory::create(
-        ExtSoapOptions::defaults('./resources/request.wsdl', [])
-            ->disableWsdlCache()
-    ))
+    ->setEngine($engine)
     ->setTypeDestination('src/Request/Type')
     ->setTypeNamespace('OpenEuropa\EPoetry\Request\Type')
     ->setClientDestination('src/Request/')

diff --git a/src/Authentication/ClientCertificate/Type/GetServiceTicket.php b/src/Authentication/ClientCertificate/Type/GetServiceTicket.php
@@ -7,6 +7,9 @@
 class GetServiceTicket implements RequestInterface
 {
     /**
+     * The target service for which you want to obtain a service ticket.
+     *  This must be a valid URL.
+     *
      * @var string
      */
     private string $service;

diff --git a/src/Authentication/ClientCertificate/Type/GetServiceTicketResponse.php b/src/Authentication/ClientCertificate/Type/GetServiceTicketResponse.php
@@ -7,6 +7,8 @@
 class GetServiceTicketResponse implements ResultInterface
 {
     /**
+     * Service ticket for the specified service.
+     *
      * @var string
      */
     private string $serviceTicket;

diff --git a/src/CodeGenerator/Assembler/NullableGetterAssembler.php b/src/CodeGenerator/Assembler/NullableGetterAssembler.php
diff --git a/src/CodeGenerator/Assembler/NullableGetterAssemblerOptions.php b/src/CodeGenerator/Assembler/NullableGetterAssemblerOptions.php
diff --git a/src/CodeGenerator/ConfigProcessor.php b/src/CodeGenerator/ConfigProcessor.php
@@ -59,11 +59,10 @@ public static function addRules(Config $config, array $specialClassesAndProperti
                 ->whitelist($specialClassesAndProperties)
         );
 
-        $defaultGetterAssembler = new OpenEuropa\Assembler\NullableGetterAssembler(
-            OpenEuropa\Assembler\NullableGetterAssemblerOptions::create()
+        $defaultGetterAssembler = new Assembler\GetterAssembler(
+            Assembler\GetterAssemblerOptions::create()
                 ->withReturnType()
                 ->withBoolGetters()
-                ->withReturnNull()
         );
 
         $arrayGetterAssembler = new OpenEuropa\Assembler\ArrayGetterAssembler(