- add var_name##_len to FETCH_STRING_OPTION

- add tests for float (031)
- fix name for IPv6 test

diff --git a/ext/filter/tests/030.phpt b/ext/filter/tests/030.phpt
index af5eb5746583fa6c54cf3a8e7f35d9c0bd20055a..4f4c702a2cb9240685ffcc37e5c30dd2ac71fac5 100644 (file)
--- a/ext/filter/tests/030.phpt
+++ b/ext/filter/tests/030.phpt
@@ -1,5 +1,5 @@
 --TEST--
-filter_data() and FILTER_CALLBACK
+filter_data() and IPv6 
 --FILE--
 <?php
 $ipv6_test = array(

diff --git a/ext/filter/tests/031.phpt b/ext/filter/tests/031.phpt
new file mode 100644 (file)
index 0000000..2ac2429
--- /dev/null
+++ b/ext/filter/tests/031.phpt
@@ -0,0 +1,54 @@
+--TEST--
+filter_data() and FLOAT
+--FILE--
+<?php
+
+$floats = array(
+'1.234   ',
+'   1.234',
+'1.234'        ,
+'1.2e3',
+'7E3',
+'7E3     ',
+'  7E3     ',
+'  7E-3     '
+);
+
+foreach ($floats as $float) {
+       $out = filter_data($float, FILTER_VALIDATE_FLOAT);
+       var_dump($out);
+}
+
+$floats = array(
+'1.234   '     => ',',
+'1,234'                => ',',
+'   1.234'     => '.',
+'1.234'                => '..',
+'1.2e3'                => ','
+);
+
+echo "\ncustom decimal:\n";
+foreach ($floats as $float => $dec) {
+       $out = filter_data($float, FILTER_VALIDATE_FLOAT, array('decimal' => $dec));
+       var_dump($out);
+}
+
+?>
+--EXPECTF--
+float(1.234)
+float(1.234)
+float(1.234)
+float(1200)
+float(7000)
+float(7000)
+float(7000)
+float(0.007)
+
+custom decimal:
+NULL
+float(1.234)
+float(1.234)
+
+Warning: filter_data(): decimal separator must be one char in %s on line %d
+NULL
+NULL