fixing FeatureBundlesListType

coleshirley · coleshirley · commit b3890971a6b0 · 2023-04-03T18:16:26.000-06:00
diff --git a/README.md b/README.md
@@ -44,9 +44,12 @@ echo $flexnetOperations->echoPhrase('Hello, Flexsim!');
 # Type Generation
 
 1. Fix types in wsdl files
-   1. LicenseService
+   1. ProductPackagineService
+      - featureBundlesListType - add minOccurs="0" to the "featureBundle" property
+   2. LicenseService
       - fulfillmentHistoryDetailsType - add minOccurs="0" to the "record" property
 
+
 2. Normalize Extension types in the wsdl file by extracting them from the base type into the child type
 3. Run the flexnet WSDL file through the xml to json tool here: https://codebeautify.org/xmlviewer
 
diff --git a/flexnet/ProductPackagingService/Type/FeatureBundlesListType.php b/flexnet/ProductPackagingService/Type/FeatureBundlesListType.php
@@ -5,40 +5,40 @@
 class FeatureBundlesListType
 {
     /**
-     * @var \Flexnet\ProductPackagingService\Type\FeatureBundleIdentifierWithCountDataType|array<\Flexnet\ProductPackagingService\Type\FeatureBundleIdentifierWithCountDataType>
+     * @var \Flexnet\ProductPackagingService\Type\FeatureBundleIdentifierWithCountDataType|array<\Flexnet\ProductPackagingService\Type\FeatureBundleIdentifierWithCountDataType>|null
      */
     private $featureBundle;
 
     /**
      * Constructor
      *
-     * @param  \Flexnet\ProductPackagingService\Type\FeatureBundleIdentifierWithCountDataType|array<\Flexnet\ProductPackagingService\Type\FeatureBundleIdentifierWithCountDataType>  $featureBundle
+     * @param  \Flexnet\ProductPackagingService\Type\FeatureBundleIdentifierWithCountDataType|array<\Flexnet\ProductPackagingService\Type\FeatureBundleIdentifierWithCountDataType>|null  $featureBundle
      */
-    public function __construct(FeatureBundleIdentifierWithCountDataType|array $featureBundle)
+    public function __construct(FeatureBundleIdentifierWithCountDataType|array|null $featureBundle = null)
     {
         $this->featureBundle = $featureBundle;
     }
 
     /**
-     * @param  \Flexnet\ProductPackagingService\Type\FeatureBundleIdentifierWithCountDataType|array<\Flexnet\ProductPackagingService\Type\FeatureBundleIdentifierWithCountDataType>  $featureBundle
+     * @param  \Flexnet\ProductPackagingService\Type\FeatureBundleIdentifierWithCountDataType|array<\Flexnet\ProductPackagingService\Type\FeatureBundleIdentifierWithCountDataType>|null  $featureBundle
      */
-    public static function create(FeatureBundleIdentifierWithCountDataType|array $featureBundle)
+    public static function create(FeatureBundleIdentifierWithCountDataType|array|null $featureBundle = null)
     {
         return new static(...\func_get_args());
     }
 
     /**
-     * @return \Flexnet\ProductPackagingService\Type\FeatureBundleIdentifierWithCountDataType|array<\Flexnet\ProductPackagingService\Type\FeatureBundleIdentifierWithCountDataType>
+     * @return \Flexnet\ProductPackagingService\Type\FeatureBundleIdentifierWithCountDataType|array<\Flexnet\ProductPackagingService\Type\FeatureBundleIdentifierWithCountDataType>|null
      */
-    public function getFeatureBundle(): FeatureBundleIdentifierWithCountDataType|array
+    public function getFeatureBundle(): FeatureBundleIdentifierWithCountDataType|array|null
     {
         return $this->featureBundle;
     }
 
     /**
-     * @param  \Flexnet\ProductPackagingService\Type\FeatureBundleIdentifierWithCountDataType|array<\Flexnet\ProductPackagingService\Type\FeatureBundleIdentifierWithCountDataType>  $featureBundle
+     * @param  \Flexnet\ProductPackagingService\Type\FeatureBundleIdentifierWithCountDataType|array<\Flexnet\ProductPackagingService\Type\FeatureBundleIdentifierWithCountDataType>|null  $featureBundle
      */
-    public function withFeatureBundle(FeatureBundleIdentifierWithCountDataType|array $featureBundle): FeatureBundlesListType
+    public function withFeatureBundle(FeatureBundleIdentifierWithCountDataType|array|null $featureBundle): FeatureBundlesListType
     {
         $new = clone $this;
         $new->featureBundle = $featureBundle;
diff --git a/productPackagingService.json b/productPackagingService.json
@@ -1564,6 +1564,7 @@
                         "sequence": {
                             "element": {
                                 "_maxOccurs": "unbounded",
+                                "_minOccurs": "0",
                                 "_name": "featureBundle",
                                 "_type": "impl:featureBundleIdentifierWithCountDataType"
                             }
diff --git a/productPackagingService.php b/productPackagingService.php
@@ -1,7 +1,7 @@
 <?php
 
+use Flexnet\ProductPackagingService\Result;
 use Flexsim\FlexnetOperations\Assembler as FlexnetAssembler;
-use Flexsim\FlexnetOperations\FlexnetOperationsResult;
 use Phpro\SoapClient\CodeGenerator\Assembler;
 use Phpro\SoapClient\CodeGenerator\Config\Config;
 use Phpro\SoapClient\CodeGenerator\Rules;
@@ -49,7 +49,7 @@
         new Rules\IsResultRule(
             $engine->getMetadata(),
             new Rules\MultiRule([
-                new Rules\AssembleRule(new FlexnetAssembler\ResultAssembler(FlexnetOperationsResult::class)),
+                new Rules\AssembleRule(new FlexnetAssembler\ResultAssembler(Result::class)),
             ])
         )
     );
diff --git a/productPackagingService.wsdl b/productPackagingService.wsdl
@@ -582,7 +582,7 @@ Built on Apr 22, 2006 (06:55:48 PDT)-->
             </complexType>
             <complexType name="featureBundlesListType">
                 <sequence>
-                    <element maxOccurs="unbounded" name="featureBundle" type="impl:featureBundleIdentifierWithCountDataType"/>
+                    <element maxOccurs="unbounded" minOccurs="0" name="featureBundle" type="impl:featureBundleIdentifierWithCountDataType"/>
                 </sequence>
             </complexType>
             <complexType name="licenseModelPKType">

Original file line number	Diff line number	Diff line change
`@@ -5,40 +5,40 @@`
`5`	`5`	`class FeatureBundlesListType`
`6`	`6`	`{`
`7`	`7`	`/**`
`8`		`- * @var \Flexnet\ProductPackagingService\Type\FeatureBundleIdentifierWithCountDataType\|array<\Flexnet\ProductPackagingService\Type\FeatureBundleIdentifierWithCountDataType>`
	`8`	`+ * @var \Flexnet\ProductPackagingService\Type\FeatureBundleIdentifierWithCountDataType\|array<\Flexnet\ProductPackagingService\Type\FeatureBundleIdentifierWithCountDataType>\|null`
`9`	`9`	`*/`
`10`	`10`	`private $featureBundle;`
`11`	`11`
`12`	`12`	`/**`
`13`	`13`	`* Constructor`
`14`	`14`	`*`
`15`		`- * @param \Flexnet\ProductPackagingService\Type\FeatureBundleIdentifierWithCountDataType\|array<\Flexnet\ProductPackagingService\Type\FeatureBundleIdentifierWithCountDataType> $featureBundle`
	`15`	`+ * @param \Flexnet\ProductPackagingService\Type\FeatureBundleIdentifierWithCountDataType\|array<\Flexnet\ProductPackagingService\Type\FeatureBundleIdentifierWithCountDataType>\|null $featureBundle`
`16`	`16`	`*/`
`17`		`- public function __construct(FeatureBundleIdentifierWithCountDataType\|array $featureBundle)`
	`17`	`+ public function __construct(FeatureBundleIdentifierWithCountDataType\|array\|null $featureBundle = null)`
`18`	`18`	`{`
`19`	`19`	`$this->featureBundle = $featureBundle;`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`/**`
`23`		`- * @param \Flexnet\ProductPackagingService\Type\FeatureBundleIdentifierWithCountDataType\|array<\Flexnet\ProductPackagingService\Type\FeatureBundleIdentifierWithCountDataType> $featureBundle`
	`23`	`+ * @param \Flexnet\ProductPackagingService\Type\FeatureBundleIdentifierWithCountDataType\|array<\Flexnet\ProductPackagingService\Type\FeatureBundleIdentifierWithCountDataType>\|null $featureBundle`
`24`	`24`	`*/`
`25`		`- public static function create(FeatureBundleIdentifierWithCountDataType\|array $featureBundle)`
	`25`	`+ public static function create(FeatureBundleIdentifierWithCountDataType\|array\|null $featureBundle = null)`
`26`	`26`	`{`
`27`	`27`	`return new static(...\func_get_args());`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`/**`
`31`		`- * @return \Flexnet\ProductPackagingService\Type\FeatureBundleIdentifierWithCountDataType\|array<\Flexnet\ProductPackagingService\Type\FeatureBundleIdentifierWithCountDataType>`
	`31`	`+ * @return \Flexnet\ProductPackagingService\Type\FeatureBundleIdentifierWithCountDataType\|array<\Flexnet\ProductPackagingService\Type\FeatureBundleIdentifierWithCountDataType>\|null`
`32`	`32`	`*/`
`33`		`- public function getFeatureBundle(): FeatureBundleIdentifierWithCountDataType\|array`
	`33`	`+ public function getFeatureBundle(): FeatureBundleIdentifierWithCountDataType\|array\|null`
`34`	`34`	`{`
`35`	`35`	`return $this->featureBundle;`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`/**`
`39`		`- * @param \Flexnet\ProductPackagingService\Type\FeatureBundleIdentifierWithCountDataType\|array<\Flexnet\ProductPackagingService\Type\FeatureBundleIdentifierWithCountDataType> $featureBundle`
	`39`	`+ * @param \Flexnet\ProductPackagingService\Type\FeatureBundleIdentifierWithCountDataType\|array<\Flexnet\ProductPackagingService\Type\FeatureBundleIdentifierWithCountDataType>\|null $featureBundle`
`40`	`40`	`*/`
`41`		`- public function withFeatureBundle(FeatureBundleIdentifierWithCountDataType\|array $featureBundle): FeatureBundlesListType`
	`41`	`+ public function withFeatureBundle(FeatureBundleIdentifierWithCountDataType\|array\|null $featureBundle): FeatureBundlesListType`
`42`	`42`	`{`
`43`	`43`	`$new = clone $this;`
`44`	`44`	`$new->featureBundle = $featureBundle;`
Original file line number	Diff line number	Diff line change
`@@ -1564,6 +1564,7 @@`
`1564`	`1564`	`"sequence": {`
`1565`	`1565`	`"element": {`
`1566`	`1566`	`"_maxOccurs": "unbounded",`
	`1567`	`+ "_minOccurs": "0",`
`1567`	`1568`	`"_name": "featureBundle",`
`1568`	`1569`	`"_type": "impl:featureBundleIdentifierWithCountDataType"`
`1569`	`1570`	`}`