issue #268 - Fix element contained by a sequence with maxOccurs > 1

Author: mikaelcom

src/ConfigurationReader/GeneratorOptions.php

@@ -133,11 +133,6 @@ protected function __construct(string $filename)
         $this->parseOptions($filename);
     }
 
-    public static function instance(?string $filename = null): self
-    {
-        return parent::instance($filename);
-    }
-
     public function __call($name, $arguments)
     {
         if ('set' === substr($name, 0, 3) && 1 === count($arguments)) {
@@ -150,6 +145,11 @@ public function __call($name, $arguments)
         throw new \BadMethodCallException(sprintf('Method %s undefined', $name));
     }
 
+    public static function instance(?string $filename = null): self
+    {
+        return parent::instance($filename);
+    }
+
     public function getOptionValue(string $optionName)
     {
         if (!array_key_exists($optionName, $this->options)) {

src/ConfigurationReader/XsdTypes.php

@@ -8,6 +8,7 @@ final class XsdTypes extends AbstractYamlReader
 {
     public const MAIN_KEY = 'xsd_types';
     public const ANONYMOUS_KEY = 'anonymous';
+
     /**
      * This type is returned by the \SoapClient class when
      * it does not succeed to define the type of a struct or an attribute.

src/Container/Model/Service.php

@@ -37,6 +37,7 @@ public function getServiceByName(string $name): ?Model
     public function getMethods(): Method
     {
         $methods = new Method($this->generator);
+
         /** @var Model $service */
         foreach ($this->objects as $service) {
             foreach ($service->getMethods() as $method) {

src/File/Struct.php

@@ -454,6 +454,7 @@ protected function getStructMethodsSetAndGetAnnotationBlock(PhpMethod $method):
         } else {
             $parameterName = mb_substr($method->getName(), 3);
         }
+
         /**
          * Since properties can be duplicated with different case, we assume that _\d+ is replaceable by an empty string as methods are "duplicated" with this suffix.
          */
@@ -607,6 +608,7 @@ protected function addStructPropertiesToAnnotationBlockParams(PhpAnnotationBlock
     protected function getStructMethodsAddToAnnotationBlock(PhpMethod $method): PhpAnnotationBlock
     {
         $methodParameters = $method->getParameters();
+
         /** @var PhpFunctionParameter $firstParameter */
         $firstParameter = array_shift($methodParameters);
         $attribute = $this->getModel()->getAttribute($firstParameter->getModel()->getName());

src/File/StructArray.php

@@ -90,6 +90,7 @@ protected function addArrayMethodGetAttributeName(): self
     {
         /** @var StructModel $model */
         $model = $this->getModel();
+
         return $this->addArrayMethodGenericMethod(
             self::METHOD_GET_ATTRIBUTE_NAME,
             sprintf(
@@ -146,6 +147,7 @@ protected function getArrayMethodGetAttributeNameAnnotationBlock(): PhpAnnotatio
     {
         /** @var StructModel $model */
         $model = $this->getModel();
+
         return new PhpAnnotationBlock([
             'Returns the attribute name',
             new PhpAnnotation(self::ANNOTATION_SEE, sprintf('%s::%s()', $model->getExtends(true), self::METHOD_GET_ATTRIBUTE_NAME)),

src/File/StructEnum.php

@@ -47,6 +47,7 @@ protected function getConstantAnnotationBlock(PhpConstant $constant): ?PhpAnnota
         $block = new PhpAnnotationBlock([
             sprintf('Constant for value \'%s\'', $constant->getValue()),
         ]);
+
         /** @var StructModel $model */
         $model = $this->getModel();
         if (($value = $model->getValue($constant->getValue())) instanceof StructValueModel) {
@@ -92,6 +93,7 @@ protected function getEnumMethodGetValidValues(): PhpMethod
     protected function getEnumMethodValues(): array
     {
         $values = [];
+
         /** @var StructModel $model */
         $model = $this->getModel();
         foreach ($model->getValues() as $value) {

src/Parser/SoapClient/Functions.php

@@ -46,6 +46,7 @@ public function parse(): void
                     $infos = explode(' ', preg_replace('/(list\(.*\)\s)/i', '', $method));
                     array_unshift($infos, 'array');
                 }
+
                 /**
                  * Returns type is not defined in some case.
                  */

src/Parser/Wsdl/TagElement.php

@@ -6,7 +6,9 @@
 
 use WsdlToPhp\PackageGenerator\Model\AbstractModel;
 use WsdlToPhp\PackageGenerator\Model\StructAttribute;
+use WsdlToPhp\WsdlHandler\AbstractDocument;
 use WsdlToPhp\WsdlHandler\Tag\AbstractTag as Tag;
+use WsdlToPhp\WsdlHandler\Tag\TagSequence;
 use WsdlToPhp\WsdlHandler\Wsdl as WsdlDocument;
 
 final class TagElement extends AbstractAttributesParser
@@ -25,6 +27,11 @@ protected function parseTagAttributes(Tag $tag, AbstractModel $model = null, Str
                 ->setContainsElements($tag->canOccurSeveralTimes())
                 ->setRemovableFromRequest($tag->isRemovable())
             ;
+
+            $sequence = $tag->getSuitableParent(false, [AbstractDocument::TAG_SEQUENCE]);
+            if ($sequence instanceof TagSequence && $sequence->canOccurSeveralTimes()) {
+                $structAttribute->setContainsElements();
+            }
         }
     }
 }

src/Parser/Wsdl/TagRestriction.php

@@ -80,6 +80,7 @@ protected function parseRestrictionAttributes(AbstractModel $model, Restriction
         if ($restriction->hasAttributes()) {
             // ensure inheritance of model is well-defined, SoapClient parser is based on SoapClient::__getTypes which can be false in some case
             $model->setInheritance($restriction->getAttributeBase());
+
             /** @var AbstractAttributeHandler $attribute */
             foreach ($restriction->getAttributes() as $attribute) {
                 $model->addMeta($attribute->getName(), $attribute->getValue(true));

tests/File/StructTest.php

@@ -481,6 +481,21 @@ public function testStructResultFromUnitTestsWithBooleanAttribute()
         }
     }
 
+    public function testStructValueListTypeFromUnitTests()
+    {
+        $generator = self::unitTestsInstance();
+        if (($model = $generator->getStructByName('ValueListType')) instanceof StructModel) {
+            $struct = new StructFile($generator, $model->getName());
+            $struct
+                ->setModel($model)
+                ->write()
+            ;
+            $this->assertSameFileContent('ValidUnitTestsValueListType', $struct);
+        } else {
+            $this->fail('Unable to find ValueListType struct for file generation');
+        }
+    }
+
     public function testWriteDeliveryDetails()
     {
         $generator = self::deliveryServiceInstance();