Enhance property meta with container meta

Author: veewee

src/Metadata/Converter/Types/Configurator/ElementContainerConfigurator.php

@@ -0,0 +1,71 @@
+<?php declare(strict_types=1);
+
+namespace Soap\WsdlReader\Metadata\Converter\Types\Configurator;
+
+use Closure;
+use GoetasWebservices\XML\XSDReader\Schema\Element\InterfaceSetMinMax;
+use Soap\Engine\Metadata\Collection\PropertyCollection;
+use Soap\Engine\Metadata\Model\Property;
+use Soap\Engine\Metadata\Model\TypeMeta;
+use Soap\Engine\Metadata\Model\XsdType;
+use Soap\WsdlReader\Metadata\Converter\Types\TypesConverterContext;
+use function Psl\Fun\pipe;
+use function Psl\Vec\map;
+
+final readonly class ElementContainerConfigurator
+{
+    public function __invoke(PropertyCollection $properties, mixed $xsdType, TypesConverterContext $context): PropertyCollection
+    {
+        $configure = pipe(
+            fn (PropertyCollection $properties): PropertyCollection => $this->overwriteMinMaxSettings($properties, $xsdType),
+        );
+
+        return $configure($properties);
+    }
+
+    /**
+     * @param Closure(XsdType): XsdType $mapper
+     */
+    private function mapPropertyTypes(PropertyCollection $properties, Closure $mapper): PropertyCollection
+    {
+        return new PropertyCollection(
+            ...map(
+                $properties,
+                static fn (Property $property): Property => new Property(
+                    $property->getName(),
+                    $mapper($property->getType())
+                )
+            )
+        );
+    }
+
+    private function overwriteMinMaxSettings(PropertyCollection $properties, mixed $xsdType): PropertyCollection
+    {
+        if (!$xsdType instanceof InterfaceSetMinMax) {
+            return $properties;
+        }
+
+        $groupMin = $xsdType->getMin();
+        $groupMax = $xsdType->getMax();
+
+        return $this->mapPropertyTypes($properties, static function (XsdType $type) use ($groupMin, $groupMax): XsdType {
+            $meta = $type->getMeta();
+            $min = $groupMin === 0 ? 0 : $meta->minOccurs()->unwrapOr($groupMax);
+            $max = $groupMax === -1 ? -1 : $meta->maxOccurs()->unwrapOr($groupMax);
+
+            $isNullable = $meta->isNullable()->unwrapOr(false) || ($min === 0 && $max === 1);
+            $isList = $meta->isList()->unwrapOr(false) || ($min > 1 || $max === -1);
+
+            return $type
+                ->withBaseType($isList ? 'array' : $type->getBaseType())
+                ->withMeta(
+                    static fn (TypeMeta $meta): TypeMeta => $meta
+                        ->withMinOccurs($groupMin)
+                        ->withMaxOccurs($groupMax)
+                        ->withIsNullable($isNullable)
+                        ->withIsList($isList)
+                        ->withIsRepeatingElement($isList)
+                );
+        });
+    }
+}

src/Metadata/Converter/Types/Visitor/ElementContainerVisitor.php

@@ -32,7 +32,11 @@ public function __invoke(ElementContainer $container, TypesConverterContext $con
     private function parseElementItem(ElementItem $element, TypesConverterContext $context): PropertyCollection
     {
         if ($element instanceof Group || $element instanceof Choice || $element instanceof Sequence) {
-            return $this->__invoke($element, $context);
+            $configure = pipe(
+                static fn (PropertyCollection $properties) => (new Configurator\ElementContainerConfigurator())($properties, $element, $context),
+            );
+
+            return $configure($this->__invoke($element, $context));
         }
 
         $typeName = (new ElementTypeNameDetector())($element, $context->parent()->unwrap());

tests/PhpCompatibility/schema1015.phpt

@@ -0,0 +1,29 @@
+--TEST--
+SOAP XML Schema 1015: Group ref with minOccurs / MaxOccurs
+--FILE--
+<?php
+include __DIR__."/test_schema.inc";
+$schema = <<<EOF
+    <complexType name="storeCardResult">
+        <sequence>
+            <group minOccurs="0" ref="tns:securityDetailsGroup"/>
+        </sequence>
+    </complexType>
+    <group name="securityDetailsGroup">
+        <sequence>
+            <element name="foo" type="string"/>
+            <element name="bar" type="string"/>
+        </sequence>
+    </group>
+EOF;
+test_schema($schema,'type="tns:Element"');
+?>
+--EXPECT--
+Methods:
+  > test(Element $testParam): void
+
+Types:
+  > http://test-uri/:storeCardResult {
+    ?string $foo
+    ?string $bar
+  }