Merge pull request #592 from veewee/fix-xsd-language-like-simple-types

Fix xsd:language-like simple type generations.

Author: veewee

src/Phpro/SoapClient/CodeGenerator/Model/Property.php

@@ -100,6 +100,12 @@ public function getType(): string
             return $this->type;
         }
 
+        if ($this->meta->isSimple()->unwrapOr(false)
+                && Normalizer::isKnownType($this->xsdType->getBaseType())
+        ) {
+            return $this->xsdType->getBaseType();
+        }
+
         if (!$this->namespace) {
             return '\\'.Normalizer::normalizeClassname($this->type);
         }

test/PhproTest/SoapClient/Unit/CodeGenerator/Model/PropertyTest.php

@@ -3,10 +3,12 @@
 namespace PhproTest\SoapClient\Unit\CodeGenerator\Model;
 
 use Phpro\SoapClient\CodeGenerator\Model\Property;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use PHPUnit\Framework\Attributes\Test;
 use Psl\Option\Option;
 use Soap\Engine\Metadata\Model\Property as EngineProperty;
+use Soap\Engine\Metadata\Model\TypeMeta;
 use Soap\Engine\Metadata\Model\XsdType;
 
 /**
@@ -57,4 +59,62 @@ public function it_can_use_a_php_built_in_class_as_type_name(): void
         self::assertSame('DateInterval', $property->getXsdType()->getName());
         self::assertSame('DateInterval', $property->getXsdType()->getBaseType());
     }
+
+    #[Test]
+    #[DataProvider('provideTypes')]
+    public function it_can_figure_out_the_type(Property $property, string $expectedType): void
+    {
+        self::assertSame($expectedType, $property->getType());
+    }
+
+    public static function provideTypes()
+    {
+        yield 'known_simple_type' => [
+            Property::fromMetaData(
+                'MyApp',
+                new EngineProperty(
+                    'property',
+                    XsdType::create('string')
+                )
+            ),
+            'string'
+        ];
+        yield 'known_simple_base_type' => [
+            Property::fromMetaData(
+                'MyApp',
+                new EngineProperty(
+                    'property',
+                    XsdType::create('language')
+                        ->withXmlNamespace('http://www.w3.org/2001/XMLSchema')
+                        ->withXmlNamespaceName('xsd')
+                        ->withBaseType('string')
+                        ->withMemberTypes(['token'])
+                        ->withMeta(static fn (TypeMeta $meta) => $meta->withIsSimple(true))
+                )
+            ),
+            'string'
+        ];
+
+        yield 'root namespace' => [
+            Property::fromMetaData(
+                '',
+                new EngineProperty(
+                    'property',
+                    XsdType::create('MyType')
+                )
+            ),
+            '\\MyType'
+        ];
+
+        yield 'namespaced' => [
+            Property::fromMetaData(
+                'MyApp',
+                new EngineProperty(
+                    'property',
+                    XsdType::create('MyType')
+                )
+            ),
+            '\\MyApp\\MyType'
+        ];
+    }
 }