Merge branch 'PHP-7.4'

10 files changed, 0 insertions, 250 deletions

diff --git a/tests/output/flush_error_001.phpt b/tests/output/flush_error_001.phpt
deleted file mode 100644
index e80f69c6b8..0000000000
--- a/tests/output/flush_error_001.phpt
+++ /dev/null
@@ -1,18 +0,0 @@
---TEST--
-Test wrong number of arguments for flush() (no impact)
---FILE--
-<?php
-/*
- * proto void flush(void)
- * Function is implemented in ext/standard/basic_functions.c.
- */
-
-$extra_arg = 1;
-echo "\nToo many arguments\n";
-var_dump(flush($extra_arg));
-?>
---EXPECTF--
-Too many arguments
-
-Warning: flush() expects exactly 0 parameters, 1 given in %s on line %d
-NULL
diff --git a/tests/output/ob_clean_error_001.phpt b/tests/output/ob_clean_error_001.phpt
deleted file mode 100644
index fffe484074..0000000000
--- a/tests/output/ob_clean_error_001.phpt
+++ /dev/null
@@ -1,27 +0,0 @@
---TEST--
-Test ob_clean() function : error conditions
---FILE--
-<?php
-/* Prototype  : proto bool ob_clean(void)
- * Description: Clean (delete) the current output buffer
- * Source code: main/output.c
- * Alias to functions:
- */
-
-echo "*** Testing ob_clean() : error conditions ***\n";
-
-// One argument
-echo "\n-- Testing ob_clean() function with one argument --\n";
-$extra_arg = 10;
-var_dump( ob_clean($extra_arg) );
-
-echo "Done";
-?>
---EXPECTF--
-*** Testing ob_clean() : error conditions ***
-
--- Testing ob_clean() function with one argument --
-
-Warning: ob_clean() expects exactly 0 parameters, 1 given in %s on line 13
-NULL
-Done
diff --git a/tests/output/ob_end_clean_error_001.phpt b/tests/output/ob_end_clean_error_001.phpt
deleted file mode 100644
index 821831ee50..0000000000
--- a/tests/output/ob_end_clean_error_001.phpt
+++ /dev/null
@@ -1,21 +0,0 @@
---TEST--
-Test wrong number of arguments for ob_end_clean()
---FILE--
-<?php
-/*
- * proto bool ob_end_clean(void)
- * Function is implemented in main/output.c
-*/
-
-$extra_arg = 1;
-
-echo "\nToo many arguments\n";
-var_dump(ob_end_clean($extra_arg));
-
-
-?>
---EXPECTF--
-Too many arguments
-
-Warning: ob_end_clean() expects exactly 0 parameters, 1 given in %s on line 10
-NULL
diff --git a/tests/output/ob_end_flush_error_001.phpt b/tests/output/ob_end_flush_error_001.phpt
deleted file mode 100644
index e9c15bd05f..0000000000
--- a/tests/output/ob_end_flush_error_001.phpt
+++ /dev/null
@@ -1,27 +0,0 @@
---TEST--
-Test ob_end_flush() function : error conditions
---FILE--
-<?php
-/* Prototype  : proto bool ob_end_flush(void)
- * Description: Flush (send) the output buffer, and delete current output buffer
- * Source code: main/output.c
- * Alias to functions:
- */
-
-echo "*** Testing ob_end_flush() : error conditions ***\n";
-
-// One argument
-echo "\n-- Testing ob_end_flush() function with one argument --\n";
-$extra_arg = 10;
-var_dump( ob_end_flush($extra_arg) );
-
-echo "Done";
-?>
---EXPECTF--
-*** Testing ob_end_flush() : error conditions ***
-
--- Testing ob_end_flush() function with one argument --
-
-Warning: ob_end_flush() expects exactly 0 parameters, 1 given in %s on line 13
-NULL
-Done
diff --git a/tests/output/ob_flush_error_001.phpt b/tests/output/ob_flush_error_001.phpt
deleted file mode 100644
index 6e95810dce..0000000000
--- a/tests/output/ob_flush_error_001.phpt
+++ /dev/null
@@ -1,27 +0,0 @@
---TEST--
-Test ob_flush() function : error conditions
---FILE--
-<?php
-/* Prototype  : proto bool ob_flush(void)
- * Description: Flush (send) contents of the output buffer. The last buffer content is sent to next buffer
- * Source code: main/output.c
- * Alias to functions:
- */
-
-echo "*** Testing ob_flush() : error conditions ***\n";
-
-// One argument
-echo "\n-- Testing ob_flush() function with one argument --\n";
-$extra_arg = 10;
-var_dump( ob_flush($extra_arg) );
-
-echo "Done";
-?>
---EXPECTF--
-*** Testing ob_flush() : error conditions ***
-
--- Testing ob_flush() function with one argument --
-
-Warning: ob_flush() expects exactly 0 parameters, 1 given in %s on line 13
-NULL
-Done
diff --git a/tests/output/ob_get_clean_error_001.phpt b/tests/output/ob_get_clean_error_001.phpt
deleted file mode 100644
index cbedc03297..0000000000
--- a/tests/output/ob_get_clean_error_001.phpt
+++ /dev/null
@@ -1,21 +0,0 @@
---TEST--
-Test wrong number of arguments for ob_get_clean()
---FILE--
-<?php
-/*
- * proto bool ob_get_clean(void)
- * Function is implemented in main/output.c
-*/
-
-$extra_arg = 1;
-
-echo "\nToo many arguments\n";
-var_dump(ob_get_clean($extra_arg));
-
-
-?>
---EXPECTF--
-Too many arguments
-
-Warning: ob_get_clean() expects exactly 0 parameters, 1 given in %s on line 10
-NULL
diff --git a/tests/output/ob_get_contents_error_001.phpt b/tests/output/ob_get_contents_error_001.phpt
deleted file mode 100644
index 2c1c043ba7..0000000000
--- a/tests/output/ob_get_contents_error_001.phpt
+++ /dev/null
@@ -1,32 +0,0 @@
---TEST--
-Test ob_get_contents() function : error cases
---CREDITS--
-Iain Lewis <ilewis@php.net>
---FILE--
-<?php
-/* Prototype  : proto string ob_get_contents(void)
- * Description: Return the contents of the output buffer
- * Source code: main/output.c
- * Alias to functions:
- */
-
-
-echo "*** Testing ob_get_contents() : error cases ***\n";
-
-var_dump(ob_get_contents("bob"));
-
-ob_start();
-
-var_dump(ob_get_contents("bob2",345));
-
-echo "Done\n";
-?>
---EXPECTF--
-*** Testing ob_get_contents() : error cases ***
-
-Warning: ob_get_contents() expects exactly 0 parameters, 1 given in %s on line 11
-NULL
-
-Warning: ob_get_contents() expects exactly 0 parameters, 2 given in %s on line 15
-NULL
-Done
diff --git a/tests/output/ob_get_length_error_001.phpt b/tests/output/ob_get_length_error_001.phpt
deleted file mode 100644
index f7fcfd2c96..0000000000
--- a/tests/output/ob_get_length_error_001.phpt
+++ /dev/null
@@ -1,21 +0,0 @@
---TEST--
-Test wrong number of arguments for ob_get_length()
---FILE--
-<?php
-/*
- * proto int ob_get_length(void)
- * Function is implemented in main/output.c
-*/
-
-$extra_arg = 1;
-
-echo "\nToo many arguments\n";
-var_dump(ob_get_length($extra_arg));
-
-
-?>
---EXPECTF--
-Too many arguments
-
-Warning: ob_get_length() expects exactly 0 parameters, 1 given in %s on line 10
-NULL
diff --git a/tests/output/ob_get_level_error_001.phpt b/tests/output/ob_get_level_error_001.phpt
deleted file mode 100644
index 00e9eca555..0000000000
--- a/tests/output/ob_get_level_error_001.phpt
+++ /dev/null
@@ -1,27 +0,0 @@
---TEST--
-Test ob_get_level() function : error conditions
---FILE--
-<?php
-/* Prototype  : proto int ob_get_level(void)
- * Description: Return the nesting level of the output buffer
- * Source code: main/output.c
- * Alias to functions:
- */
-
-echo "*** Testing ob_get_level() : error conditions ***\n";
-
-// One argument
-echo "\n-- Testing ob_get_level() function with one argument --\n";
-$extra_arg = 10;
-var_dump( ob_get_level($extra_arg) );
-
-echo "Done";
-?>
---EXPECTF--
-*** Testing ob_get_level() : error conditions ***
-
--- Testing ob_get_level() function with one argument --
-
-Warning: ob_get_level() expects exactly 0 parameters, 1 given in %s on line 13
-NULL
-Done
diff --git a/tests/output/ob_implicit_flush_error_001.phpt b/tests/output/ob_implicit_flush_error_001.phpt
deleted file mode 100644
index 63c892e0c4..0000000000
--- a/tests/output/ob_implicit_flush_error_001.phpt
+++ /dev/null
@@ -1,29 +0,0 @@
---TEST--
-Test ob_implicit_flush() function : wrong number of arguments
---FILE--
-<?php
-/* Prototype  : proto void ob_implicit_flush([int flag])
- * Description: Turn implicit flush on/off and is equivalent to calling flush() after every output call
- * Source code: main/output.c
- * Alias to functions:
- */
-
-echo "*** Testing ob_implicit_flush() : error conditions ***\n";
-
-
-//Test ob_implicit_flush with one more than the expected number of arguments
-echo "\n-- Testing ob_implicit_flush() function with more than expected no. of arguments --\n";
-$flag = 10;
-$extra_arg = 10;
-var_dump( ob_implicit_flush($flag, $extra_arg) );
-
-echo "Done";
-?>
---EXPECTF--
-*** Testing ob_implicit_flush() : error conditions ***
-
--- Testing ob_implicit_flush() function with more than expected no. of arguments --
-
-Warning: ob_implicit_flush() expects at most 1 parameter, 2 given in %s on line 15
-NULL
-Done