summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Joye <pajoye@php.net>2006-07-22 08:58:03 +0000
committerPierre Joye <pajoye@php.net>2006-07-22 08:58:03 +0000
commit697f4e1f08bd8a72058c489966497ebcc7889ec9 (patch)
treebc10e04506990978a3cb3481f8aab18900b3924e
parent1223119155dfc587ea1913456394945e0b5ba595 (diff)
downloadphp-git-697f4e1f08bd8a72058c489966497ebcc7889ec9.tar.gz
- API Shake up #1, use input type as first argument in input_get_args
(INPUT_GET/POST)
-rw-r--r--ext/filter/filter.c4
-rw-r--r--ext/filter/tests/032.phpt2
-rw-r--r--ext/filter/tests/bug7586.phpt2
-rw-r--r--ext/filter/tests/bug7733.phpt2
4 files changed, 5 insertions, 5 deletions
diff --git a/ext/filter/filter.c b/ext/filter/filter.c
index a8eacf6a10..013315e048 100644
--- 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 a7f8a7c6cb..aae51512f1 100644
--- 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 af4be33f78..ff29b0cab2 100644
--- 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 f8497122a5..7b8c4634ca 100644
--- 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(