Make it possible to configure a mapping of type namespaces based on xmlns

Author: veewee

src/Phpro/SoapClient/CodeGenerator/Assembler/ClassMapAssembler.php

@@ -42,8 +42,6 @@ public function assemble(ContextInterface $context)
         $file->setClass($class);
         $file->setNamespace($context->getNamespace());
         $typeMap = $context->getTypeMap();
-        $typeNamespace = $typeMap->getNamespace();
-        $file->setUse($typeNamespace, preg_match('/\\\\Type$/', $typeNamespace) ? null : 'Type');
 
         try {
             $file->setUse(ClassMapCollection::class);
@@ -117,7 +115,7 @@ private function assembleClassMap(
                 $indentation,
                 $type->getXsdType()->getXmlNamespace(),
                 $type->getXsdType()->getName(),
-                'Type\\'.$type->getName()
+                '\\' . $type->getFullName(),
             );
         }
 

src/Phpro/SoapClient/CodeGenerator/ClassMapGenerator.php

@@ -2,9 +2,9 @@
 
 namespace Phpro\SoapClient\CodeGenerator;
 
+use Phpro\SoapClient\CodeGenerator\Config\ClassMapConfig;
 use Phpro\SoapClient\CodeGenerator\Context\ClassMapContext;
 use Phpro\SoapClient\CodeGenerator\Context\FileContext;
-use Phpro\SoapClient\CodeGenerator\Model\Type;
 use Phpro\SoapClient\CodeGenerator\Model\TypeMap;
 use Phpro\SoapClient\CodeGenerator\Rules\RuleSetInterface;
 use Laminas\Code\Generator\FileGenerator;
@@ -14,33 +14,10 @@
  */
 class ClassMapGenerator implements GeneratorInterface
 {
-    /**
-     * @var RuleSetInterface
-     */
-    private $ruleSet;
-
-    /**
-     * @var string
-     */
-    private $name;
-
-    /**
-     * @var string
-     */
-    private $namespace;
-
-    /**
-     * TypeGenerator constructor.
-     *
-     * @param RuleSetInterface $ruleSet
-     * @param string           $name
-     * @param string           $namespace
-     */
-    public function __construct(RuleSetInterface $ruleSet, string $name, string $namespace)
-    {
-        $this->ruleSet = $ruleSet;
-        $this->name = $name;
-        $this->namespace = $namespace;
+    public function __construct(
+        private RuleSetInterface $ruleSet,
+        private ClassMapConfig $classMap
+    ) {
     }
 
     /**
@@ -51,7 +28,7 @@ public function __construct(RuleSetInterface $ruleSet, string $name, string $nam
      */
     public function generate(FileGenerator $file, $typeMap): string
     {
-        $this->ruleSet->applyRules(new ClassMapContext($file, $typeMap, $this->name, $this->namespace));
+        $this->ruleSet->applyRules(new ClassMapContext($file, $typeMap, $this->classMap));
         $this->ruleSet->applyRules(new FileContext($file));
 
         return $file->generate();

src/Phpro/SoapClient/CodeGenerator/ClientGenerator.php

@@ -50,7 +50,7 @@ public function generate(FileGenerator $file, $client): string
         $class->setNamespaceName($client->getNamespace());
         $class->setName($client->getName());
 
-        $this->ruleSet->applyRules(new ClientContext($class, $client->getName(), $client->getNamespace()));
+        $this->ruleSet->applyRules(new ClientContext($class, $client->config()));
 
         $methods = $client->getMethodMap();
         foreach ($methods->getMethods() as $method) {

src/Phpro/SoapClient/CodeGenerator/Config/ClassMapConfig.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace Phpro\SoapClient\CodeGenerator\Config;
+
+final readonly class ClassMapConfig
+{
+    /**
+     * @param non-empty-string $name
+     */
+    public function __construct(
+        public string $name,
+        public Destination $destination,
+    ) {
+    }
+
+    /**
+     * @return non-empty-string
+     */
+    public function path(): string
+    {
+        return $this->destination->path . '/' . $this->name . '.php';
+    }
+
+    /**
+     * @return non-empty-string
+     */
+    public function fqcn(): string
+    {
+        return $this->destination->namespace . '\\' . $this->name;
+    }
+}

src/Phpro/SoapClient/CodeGenerator/Config/ClientConfig.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace Phpro\SoapClient\CodeGenerator\Config;
+
+final readonly class ClientConfig
+{
+    /**
+     * @param non-empty-string $name
+     */
+    public function __construct(
+        public string $name,
+        public Destination $destination,
+    ) {
+    }
+
+    /**
+     * @return non-empty-string
+     */
+    public function path(): string
+    {
+        return $this->destination->path . '/' . $this->name . '.php';
+    }
+
+    /**
+     * @return non-empty-string
+     */
+    public function fqcn(): string
+    {
+        return $this->destination->namespace . '\\' . $this->name;
+    }
+}