- API Shake up #1, use input type as first argument in input_get_args

  (INPUT_GET/POST)

diff --git a/ext/filter/filter.c b/ext/filter/filter.c
index a8eacf6a10dd594a9f35307d6d9f915864949e71..013315e0481d48016730ccdce4170e3cecabe400 100644 (file)
--- a/ext/filter/filter.c
+++ b/ext/filter/filter.c
@@ -621,8 +621,8 @@ PHP_FUNCTION(input_get)
 }
 /* }}} */
 
-/* {{{ proto mixed input_get_args(array definition, constant type [, array data])
- * Returns an array with all arguments defined in 'definition'.
+/* {{{ proto mixed input_get_args(constant type, array definition, [, array data])
+ * Returns an array with all arguments defined in 'definition'. INPUT_DATA will use the data given as last argument.
  */
 PHP_FUNCTION(input_get_args)
 {

diff --git a/ext/filter/tests/032.phpt b/ext/filter/tests/032.phpt
index a7f8a7c6cb11ef8fb22cf0995c552e7bd3d97088..aae51512f1723ee1a888666d611484e66f5b627f 100644 (file)
--- a/ext/filter/tests/032.phpt
+++ b/ext/filter/tests/032.phpt
@@ -29,7 +29,7 @@ $args = array(
 
 );
 
-$myinputs = input_get_args($args, INPUT_DATA, $data);
+$myinputs = input_get_args(INPUT_DATA, $args, $data);
 var_dump($myinputs);
 ?>
 --EXPECT--

diff --git a/ext/filter/tests/bug7586.phpt b/ext/filter/tests/bug7586.phpt
index af4be33f782bae1ae75fca066417380cde9d8ca5..ff29b0cab2df84e0a2c505583ac5a586b0b97b6e 100644 (file)
--- a/ext/filter/tests/bug7586.phpt
+++ b/ext/filter/tests/bug7586.phpt
@@ -27,7 +27,7 @@ $args = array(
                         )
 
 );
-$out = input_get_args($args, INPUT_DATA, $data);
+$out = input_get_args(INPUT_DATA, $args, $data);
 var_dump($out);
 ?>
 --EXPECTF--    

diff --git a/ext/filter/tests/bug7733.phpt b/ext/filter/tests/bug7733.phpt
index f8497122a5bbaeeec329cd4e22aca8e75bc380d0..7b8c4634cac808d5290defe9706b2b63a17b30d9 100644 (file)
--- a/ext/filter/tests/bug7733.phpt
+++ b/ext/filter/tests/bug7733.phpt
@@ -1,5 +1,5 @@
 --TEST--
-input_get_args() filter not reseted between elements
+filter_data() Float exponential weird result
 --FILE--
 <?php
 $data = array(