issue #300 - fix default method parameter value (#302)

WsdlToPhp · Aug 25, 2023 · e388039 · e388039
1 parent 5ba2f17
commit e388039
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 12 deletions.
diff --git a/src/File/Struct.php b/src/File/Struct.php
@@ -182,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/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