Merge branch 'release/4.1.9'

WsdlToPhp · Aug 25, 2023 · 430361c · 430361c
2 parents d8ac0a4 + 1c73fad
commit 430361c
Show file tree

Hide file tree

Showing 39 changed files with 60 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 4.1.9 - 2023-08-25
+- issue #299, pr #301 - Deprecated Warnings for Dynamic Properties
+- issue #300, pr #302 - Incorrect default value for integer attribute
+
 ## 4.1.8 - 2023-04-20
 - issue #285, pr #288 - Type-Error when using regex pattern for decimal restriction
 - issue #292, pr #293 - Wrong type for gYearMonth and gMonthDay

diff --git a/src/File/Struct.php b/src/File/Struct.php
@@ -43,10 +43,17 @@ public function getModel(): ?StructModel
         return parent::getModel();
     }
 
+    protected function addClassElement(): AbstractModelFile
+    {
+        $this->getFile()->addString('#[\AllowDynamicProperties]');
+
+        return parent::addClassElement();
+    }
+
     protected function defineUseStatements(): self
     {
         if ($this->getGenerator()->getOptionValidation()) {
-            $this->getFile()->addUse(\InvalidArgumentException::class, null, false);
+            $this->getFile()->addUse(\InvalidArgumentException::class);
         }
 
         return parent::defineUseStatements();
@@ -175,7 +182,7 @@ protected function getStructMethodParameter(StructAttributeModel $attribute): Ph
         }
 
         try {
-            $defaultValue = $attribute->getDefaultValue();
+            $defaultValue = $attribute->getDefaultValue($this->getStructAttributeTypeAsPhpType($attribute));
 
             return new PhpFunctionParameter(
                 lcfirst($attribute->getUniqueString($attribute->getCleanName(), 'method')),

diff --git a/src/File/StructArray.php b/src/File/StructArray.php
@@ -40,6 +40,11 @@ public function addStructMethodsSetAndGet(): self
         return $this;
     }
 
+    protected function addClassElement(): AbstractModelFile
+    {
+        return AbstractModelFile::addClassElement();
+    }
+
     public function setModel(AbstractModel $model): self
     {
         if ($model instanceof StructModel && !$model->isArray()) {

diff --git a/src/File/StructEnum.php b/src/File/StructEnum.php
@@ -27,6 +27,11 @@ public function setModel(AbstractModel $model): self
         return parent::setModel($model);
     }
 
+    protected function addClassElement(): AbstractModelFile
+    {
+        return AbstractModelFile::addClassElement();
+    }
+
     protected function fillClassConstants(ConstantContainer $constants): void
     {
         /** @var StructModel $model */

diff --git a/src/Generator/Utils.php b/src/Generator/Utils.php
@@ -104,23 +104,17 @@ public static function getStreamContextOptions(?string $basicAuthLogin = null, ?
     public static function getValueWithinItsType($value, ?string $knownType = null)
     {
         if (is_int($value) || (!is_null($value) && in_array($knownType, [
-            'time',
-            'positiveInteger',
-            'unsignedLong',
-            'unsignedInt',
-            'short',
-            'long',
             'int',
             'integer',
         ], true))) {
-            return intval($value);
+            return (int) $value;
         }
         if (is_float($value) || (!is_null($value) && in_array($knownType, [
             'float',
             'double',
             'decimal',
         ], true))) {
-            return floatval($value);
+            return (float) $value;
         }
         if (is_bool($value) || (!is_null($value) && in_array($knownType, [
             'bool',

diff --git a/src/Model/StructAttribute.php b/src/Model/StructAttribute.php
@@ -137,7 +137,7 @@ public function isList(): bool
     /**
      * @return null|array|bool|float|int|string
      */
-    public function getDefaultValue()
+    public function getDefaultValue(?string $type = null)
     {
         if (($struct = $this->getTypeStruct()) && $struct->isStruct()) {
             return null;
@@ -149,7 +149,7 @@ public function getDefaultValue()
             'DefaultValue',
             'defaultValue',
             'defaultvalue',
-        ]), $this->getType(true));
+        ]), $type);
     }
 
     public function isRequired(): bool

diff --git a/tests/Generator/UtilsTest.php b/tests/Generator/UtilsTest.php
@@ -35,6 +35,7 @@ public function testGetValueWithinItsType(): void
     {
         $this->assertSame('020', Utils::getValueWithinItsType('020', 'string'));
         $this->assertSame('01', Utils::getValueWithinItsType('01', 'string'));
+        $this->assertSame(1, Utils::getValueWithinItsType('1', 'int'));
         $this->assertSame(2.568, Utils::getValueWithinItsType('2.568', 'float'));
         $this->assertSame(true, Utils::getValueWithinItsType('true', 'bool'));
         $this->assertSame(false, Utils::getValueWithinItsType('false', 'bool'));

diff --git a/tests/Model/StructAttributeTest.php b/tests/Model/StructAttributeTest.php
@@ -76,7 +76,7 @@ public function testStructAttributeTypeMustBeBool(): void
 
         $this->assertSame('boolean', $structAttribute->getType(true));
         $this->assertSame('Success', $structAttribute->getType());
-        $this->assertFalse($structAttribute->getDefaultValue());
+        $this->assertFalse($structAttribute->getDefaultValue('boolean'));
     }
 
     public function testIsNullableMustReturnFalse(): void

diff --git a/tests/resources/generated/ValidAdGroupsSelectionCriteria.php b/tests/resources/generated/ValidAdGroupsSelectionCriteria.php
@@ -13,6 +13,7 @@
  * @subpackage Structs
  * @release 1.1.0
  */
+#[\AllowDynamicProperties]
 class ApiAdGroupsSelectionCriteria extends AbstractStructBase
 {
     /**

diff --git a/tests/resources/generated/ValidAddRequest.php b/tests/resources/generated/ValidAddRequest.php
@@ -13,6 +13,7 @@
  * @subpackage Structs
  * @release 1.1.0
  */
+#[\AllowDynamicProperties]
 class ApiAddRequest extends AbstractStructBase
 {
     /**

diff --git a/tests/resources/generated/ValidAddRequestRepeatedMaxOccurs.php b/tests/resources/generated/ValidAddRequestRepeatedMaxOccurs.php
@@ -13,6 +13,7 @@
  * @subpackage Structs
  * @release 1.1.0
  */
+#[\AllowDynamicProperties]
 class ApiAddRequest extends AbstractStructBase
 {
     /**

diff --git a/tests/resources/generated/ValidAddress.php b/tests/resources/generated/ValidAddress.php
@@ -13,6 +13,7 @@
  * @subpackage Structs
  * @release 1.1.0
  */
+#[\AllowDynamicProperties]
 class ApiАдресРФ extends ApiСостав
 {
     /**

diff --git a/tests/resources/generated/ValidAddressDelivery_Type.php b/tests/resources/generated/ValidAddressDelivery_Type.php
@@ -15,6 +15,7 @@
  * @subpackage Structs
  * @release 1.1.0
  */
+#[\AllowDynamicProperties]
 class ApiAddressDelivery_Type extends AbstractStructBase
 {
     /**

diff --git a/tests/resources/generated/ValidAddressType.php b/tests/resources/generated/ValidAddressType.php
@@ -15,6 +15,7 @@
  * @subpackage Structs
  * @release 1.1.0
  */
+#[\AllowDynamicProperties]
 class ApiAddressType extends AbstractStructBase
 {
     /**

diff --git a/tests/resources/generated/ValidApiControlsType.php b/tests/resources/generated/ValidApiControlsType.php
@@ -13,6 +13,7 @@
  * @subpackage Structs
  * @release 1.1.0
  */
+#[\AllowDynamicProperties]
 class ApiControlsType extends AbstractStructBase
 {
     /**

diff --git a/tests/resources/generated/ValidApiFareItinerary.php b/tests/resources/generated/ValidApiFareItinerary.php
@@ -13,6 +13,7 @@
  * @subpackage Structs
  * @release 1.1.0
  */
+#[\AllowDynamicProperties]
 class ApiFareItinerary extends AbstractStructBase
 {
     /**

diff --git a/tests/resources/generated/ValidApiItem.php b/tests/resources/generated/ValidApiItem.php
@@ -13,6 +13,7 @@
  * @subpackage Structs
  * @release 1.1.0
  */
+#[\AllowDynamicProperties]
 class ApiItem extends AbstractStructBase
 {
     /**

diff --git a/tests/resources/generated/ValidApiNewsArticle.php b/tests/resources/generated/ValidApiNewsArticle.php
@@ -13,6 +13,7 @@
  * @subpackage Structs
  * @release 1.1.0
  */
+#[\AllowDynamicProperties]
 class ApiNewsArticle extends StructClass
 {
     /**

diff --git a/tests/resources/generated/ValidApiOffer.php b/tests/resources/generated/ValidApiOffer.php
@@ -16,6 +16,7 @@
  * @subpackage Structs
  * @release 1.1.0
  */
+#[\AllowDynamicProperties]
 class ApiOffer extends ApiOrder
 {
     /**

diff --git a/tests/resources/generated/ValidApiQuery.php b/tests/resources/generated/ValidApiQuery.php
@@ -13,6 +13,7 @@
  * @subpackage Structs
  * @release 1.1.0
  */
+#[\AllowDynamicProperties]
 class ApiQuery extends AbstractStructBase
 {
     /**

diff --git a/tests/resources/generated/ValidApiQueryWithIdenticalPropertiesDifferentByCase.php b/tests/resources/generated/ValidApiQueryWithIdenticalPropertiesDifferentByCase.php
@@ -13,6 +13,7 @@
  * @subpackage Structs
  * @release 1.1.0
  */
+#[\AllowDynamicProperties]
 class ApiQuery extends AbstractStructBase
 {
     /**

diff --git a/tests/resources/generated/ValidApiSearchRequest.php b/tests/resources/generated/ValidApiSearchRequest.php
@@ -13,6 +13,7 @@
  * @subpackage Structs
  * @release 1.1.0
  */
+#[\AllowDynamicProperties]
 class ApiSearchRequest extends AbstractStructBase
 {
     /**

diff --git a/tests/resources/generated/ValidApiVideoRequest.php b/tests/resources/generated/ValidApiVideoRequest.php
@@ -13,6 +13,7 @@
  * @subpackage Structs
  * @release 1.1.0
  */
+#[\AllowDynamicProperties]
 class ApiVideoRequest extends AbstractStructBase
 {
     /**

diff --git a/tests/resources/generated/ValidBannerInfo.php b/tests/resources/generated/ValidBannerInfo.php
@@ -13,6 +13,7 @@
  * @subpackage Structs
  * @release 1.1.0
  */
+#[\AllowDynamicProperties]
 class ApiBannerInfo extends AbstractStructBase
 {
     /**

diff --git a/tests/resources/generated/ValidCampaignGetItem.php b/tests/resources/generated/ValidCampaignGetItem.php
@@ -12,6 +12,7 @@
  * @subpackage Structs
  * @release 1.1.0
  */
+#[\AllowDynamicProperties]
 class ApiCampaignGetItem extends ApiCampaignBase
 {
     /**

diff --git a/tests/resources/generated/ValidDetails.php b/tests/resources/generated/ValidDetails.php
@@ -13,6 +13,7 @@
  * @subpackage Structs
  * @release 1.1.0
  */
+#[\AllowDynamicProperties]
 class ApiDetails extends AbstractStructBase
 {
     /**

diff --git a/tests/resources/generated/ValidExpiryDate.php b/tests/resources/generated/ValidExpiryDate.php
@@ -13,6 +13,7 @@
  * @subpackage Structs
  * @release 1.1.0
  */
+#[\AllowDynamicProperties]
 class ApiExpiryDate extends AbstractStructBase
 {
     /**

diff --git a/tests/resources/generated/ValidFieldString1000.php b/tests/resources/generated/ValidFieldString1000.php
@@ -13,6 +13,7 @@
  * @subpackage Structs
  * @release 1.1.0
  */
+#[\AllowDynamicProperties]
 class ApiFieldString1000 extends ApiFieldString
 {
 }
diff --git a/tests/resources/generated/ValidHotelReservationType.php b/tests/resources/generated/ValidHotelReservationType.php
@@ -15,6 +15,7 @@
  * @subpackage Structs
  * @release 1.1.0
  */
+#[\AllowDynamicProperties]
 class ApiHotelReservationType extends AbstractStructBase
 {
     /**

diff --git a/tests/resources/generated/ValidHouseProfileData.php b/tests/resources/generated/ValidHouseProfileData.php
@@ -13,6 +13,7 @@
  * @subpackage Structs
  * @release 1.1.0
  */
+#[\AllowDynamicProperties]
 class ApiHouseProfileData extends AbstractStructBase
 {
     /**

diff --git a/tests/resources/generated/ValidPaymentCardType.php b/tests/resources/generated/ValidPaymentCardType.php
@@ -16,6 +16,7 @@
  * @subpackage Structs
  * @release 1.1.0
  */
+#[\AllowDynamicProperties]
 class ApiPaymentCardType extends AbstractStructBase
 {
     /**

diff --git a/tests/resources/generated/ValidProposeNewTimeType.php b/tests/resources/generated/ValidProposeNewTimeType.php
@@ -13,6 +13,7 @@
  * @subpackage Structs
  * @release 1.1.0
  */
+#[\AllowDynamicProperties]
 class ApiProposeNewTimeType extends ApiResponseObjectType
 {
 }
diff --git a/tests/resources/generated/ValidSetExpressCheckoutRequestDetailsType.php b/tests/resources/generated/ValidSetExpressCheckoutRequestDetailsType.php
@@ -13,6 +13,7 @@
  * @subpackage Structs
  * @release 1.1.0
  */
+#[\AllowDynamicProperties]
 class ApiSetExpressCheckoutRequestDetailsType extends AbstractStructBase
 {
     /**

diff --git a/tests/resources/generated/ValidShopper.php b/tests/resources/generated/ValidShopper.php
@@ -13,6 +13,7 @@
  * @subpackage Structs
  * @release 1.1.0
  */
+#[\AllowDynamicProperties]
 class ApiShopper extends AbstractStructBase
 {
     /**

diff --git a/tests/resources/generated/ValidTaxType.php b/tests/resources/generated/ValidTaxType.php
@@ -15,6 +15,7 @@
  * @subpackage Structs
  * @release 1.1.0
  */
+#[\AllowDynamicProperties]
 class ApiTaxType extends AbstractStructBase
 {
     /**

diff --git a/tests/resources/generated/ValidUniqueID_Type.php b/tests/resources/generated/ValidUniqueID_Type.php
@@ -15,6 +15,7 @@
  * @subpackage Structs
  * @release 1.1.0
  */
+#[\AllowDynamicProperties]
 class ApiUniqueID_Type extends AbstractStructBase
 {
     /**

diff --git a/tests/resources/generated/ValidUnitTestsStructResult.php b/tests/resources/generated/ValidUnitTestsStructResult.php
@@ -13,6 +13,7 @@
  * @subpackage Structs
  * @release 1.1.0
  */
+#[\AllowDynamicProperties]
 class ApiResult extends AbstractStructBase
 {
     /**

diff --git a/tests/resources/generated/ValidUnitTestsValueListType.php b/tests/resources/generated/ValidUnitTestsValueListType.php
@@ -13,6 +13,7 @@
  * @subpackage Structs
  * @release 1.1.0
  */
+#[\AllowDynamicProperties]
 class ApiValueListType extends AbstractStructBase
 {
     /**

diff --git a/tests/resources/generated/ValidWorkingPeriod.php b/tests/resources/generated/ValidWorkingPeriod.php
@@ -13,6 +13,7 @@
  * @subpackage Structs
  * @release 1.1.0
  */
+#[\AllowDynamicProperties]
 class ApiWorkingPeriod extends AbstractStructBase
 {
     /**