Merge branch 'release/4.1.9'

Author: mikaelcom

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

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')),

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()) {

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 */

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',

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

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'));

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

tests/resources/generated/ValidAdGroupsSelectionCriteria.php

@@ -13,6 +13,7 @@
  * @subpackage Structs
  * @release 1.1.0
  */
+#[\AllowDynamicProperties]
 class ApiAdGroupsSelectionCriteria extends AbstractStructBase
 {
     /**

tests/resources/generated/ValidAddRequest.php

@@ -13,6 +13,7 @@
  * @subpackage Structs
  * @release 1.1.0
  */
+#[\AllowDynamicProperties]
 class ApiAddRequest extends AbstractStructBase
 {
     /**