ComponentReflection: accepts value '1.0' as float [Closes #200]

note: gettype() returns 'double', ReflectionType returns 'float'
nette · Sep 12, 2018 · b808a66 · b808a66
1 parent 0b30b31
commit b808a66
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 3 deletions.
diff --git a/src/Application/UI/ComponentReflection.php b/src/Application/UI/ComponentReflection.php
@@ -217,9 +217,13 @@ public static function convertType(&$val, $type, $isClass = false)
 			return false;
 
 		} else {
-			$old = $tmp = ($val === false ? '0' : (string) $val);
+			$tmp = ($val === false ? '0' : (string) $val);
+			if ($type === 'double' || $type === 'float') {
+				$tmp = preg_replace('#\.0*\z#', '', $tmp);
+			}
+			$orig = $tmp;
 			settype($tmp, $type);
-			if ($old !== ($tmp === false ? '0' : (string) $tmp)) {
+			if ($orig !== ($tmp === false ? '0' : (string) $tmp)) {
 				return false; // data-loss occurs
 			}
 			$val = $tmp;

diff --git a/tests/UI/ComponentReflection.convertType.phpt b/tests/UI/ComponentReflection.convertType.phpt
@@ -92,7 +92,10 @@ testIt('double', '');
 testIt('double', 'a');
 testIt('double', '0', 0.0);
 testIt('double', '1', 1.0);
-testIt('double', '1.0');
+testIt('double', '1.', 1.0);
+testIt('double', '1.0', 1.0);
+testIt('double', '1.00', 1.0);
+testIt('double', '1..0');
 testIt('double', '1.1', 1.1);
 testIt('double', '1a');
 testIt('double', true, 1.0);
@@ -102,6 +105,26 @@ testIt('double', 1, 1.0);
 testIt('double', 1.0, 1.0);
 testIt('double', 1.2, 1.2);
 
+testIt('float', null);
+testIt('float', []);
+testIt('float', $obj);
+testIt('float', '');
+testIt('float', 'a');
+testIt('float', '0', 0.0);
+testIt('float', '1', 1.0);
+testIt('float', '1.', 1.0);
+testIt('float', '1.0', 1.0);
+testIt('float', '1.00', 1.0);
+testIt('float', '1..0');
+testIt('float', '1.1', 1.1);
+testIt('float', '1a');
+testIt('float', true, 1.0);
+testIt('float', false, 0.0);
+testIt('float', 0, 0.0);
+testIt('float', 1, 1.0);
+testIt('float', 1.0, 1.0);
+testIt('float', 1.2, 1.2);
+
 testIt('bool', null);
 testIt('bool', []);
 testIt('bool', $obj);