diff options
author | Máté Kocsis <kocsismate@woohoolabs.com> | 2020-06-24 11:34:14 +0200 |
---|---|---|
committer | Máté Kocsis <kocsismate@woohoolabs.com> | 2020-06-24 13:13:44 +0200 |
commit | b5c7a83dcab670a5ac6070ac3774a5d221fd5ecc (patch) | |
tree | f8ed9902f65b0b31656703d33100427ad9d077ba /tests | |
parent | 187d7f05c2529779006840e34cbd9de4faabb229 (diff) | |
download | php-git-b5c7a83dcab670a5ac6070ac3774a5d221fd5ecc.tar.gz |
Remove unnecessary PHPDoc-alike blocks from tests
Closes GH-5759
Diffstat (limited to 'tests')
21 files changed, 33 insertions, 90 deletions
diff --git a/tests/output/flush_basic_001.phpt b/tests/output/flush_basic_001.phpt index fb1ce2c208..266cda1e24 100644 --- a/tests/output/flush_basic_001.phpt +++ b/tests/output/flush_basic_001.phpt @@ -3,7 +3,6 @@ Test basic functionality of flush() --FILE-- <?php /* - * proto void flush(void) * Function is implemented in ext/standard/basic_functions.c. */ diff --git a/tests/output/ob_clean_basic_001.phpt b/tests/output/ob_clean_basic_001.phpt index 584df6b81c..c247fd12f7 100644 --- a/tests/output/ob_clean_basic_001.phpt +++ b/tests/output/ob_clean_basic_001.phpt @@ -2,12 +2,6 @@ Test ob_clean() function : basic functionality --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() : basic functionality ***\n"; // Zero arguments @@ -29,7 +23,7 @@ echo "Done"; -- Testing ob_clean() function with Zero arguments -- -Notice: ob_clean(): Failed to delete buffer. No buffer to delete in %s on line 12 +Notice: ob_clean(): Failed to delete buffer. No buffer to delete in %s on line %d bool(false) string(61) "bool(true) Ensure the buffer is still active after the clean." diff --git a/tests/output/ob_end_clean_basic_001.phpt b/tests/output/ob_end_clean_basic_001.phpt index 491618ddbf..e3432a2243 100644 --- a/tests/output/ob_end_clean_basic_001.phpt +++ b/tests/output/ob_end_clean_basic_001.phpt @@ -3,7 +3,6 @@ Test return type and value, as well as basic behaviour, for ob_end_clean() --FILE-- <?php /* - * proto bool ob_end_clean(void) * Function is implemented in main/output.c */ @@ -20,10 +19,10 @@ var_dump(ob_end_clean()); ?> --EXPECTF-- -Notice: ob_end_clean(): Failed to delete buffer. No buffer to delete in %s on line 7 +Notice: ob_end_clean(): Failed to delete buffer. No buffer to delete in %s on line %d bool(false) bool(true) bool(true) -Notice: ob_end_clean(): Failed to delete buffer. No buffer to delete in %s on line 16 +Notice: ob_end_clean(): Failed to delete buffer. No buffer to delete in %s on line %d bool(false) diff --git a/tests/output/ob_end_flush_basic_001.phpt b/tests/output/ob_end_flush_basic_001.phpt index 00e70b3b92..1a2e7f63a3 100644 --- a/tests/output/ob_end_flush_basic_001.phpt +++ b/tests/output/ob_end_flush_basic_001.phpt @@ -2,12 +2,6 @@ Test ob_end_flush() function : basic functionality --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() : basic functionality ***\n"; // Zero arguments @@ -30,12 +24,12 @@ echo "Done"; -- Testing ob_end_flush() function with Zero arguments -- -Notice: ob_end_flush(): Failed to delete and flush buffer. No buffer to delete or flush in %s on line 12 +Notice: ob_end_flush(): Failed to delete and flush buffer. No buffer to delete or flush in %s on line %d bool(false) bool(true) Hello bool(true) -Notice: ob_end_flush(): Failed to delete and flush buffer. No buffer to delete or flush in %s on line 21 +Notice: ob_end_flush(): Failed to delete and flush buffer. No buffer to delete or flush in %s on line %d bool(false) Done diff --git a/tests/output/ob_flush_basic_001.phpt b/tests/output/ob_flush_basic_001.phpt index 6c98738d47..e26f69f1a4 100644 --- a/tests/output/ob_flush_basic_001.phpt +++ b/tests/output/ob_flush_basic_001.phpt @@ -2,12 +2,6 @@ Test ob_flush() function : basic functionality --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() : basic functionality ***\n"; // Zero arguments @@ -30,7 +24,7 @@ echo "Done"; -- Testing ob_flush() function with Zero arguments -- -Notice: ob_flush(): Failed to flush buffer. No buffer to flush in %s on line 12 +Notice: ob_flush(): Failed to flush buffer. No buffer to flush in %s on line %d bool(false) This should get flushed. bool(true) diff --git a/tests/output/ob_get_clean_basic_001.phpt b/tests/output/ob_get_clean_basic_001.phpt index 2ccf490485..c545dcbd14 100644 --- a/tests/output/ob_get_clean_basic_001.phpt +++ b/tests/output/ob_get_clean_basic_001.phpt @@ -3,7 +3,6 @@ Test return type and value, as well as basic behaviour, of ob_get_clean() --FILE-- <?php /* - * proto bool ob_get_clean(void) * Function is implemented in main/output.c */ diff --git a/tests/output/ob_get_clean_basic_002.phpt b/tests/output/ob_get_clean_basic_002.phpt index 9b74438594..30e2adcfab 100644 --- a/tests/output/ob_get_clean_basic_002.phpt +++ b/tests/output/ob_get_clean_basic_002.phpt @@ -3,7 +3,6 @@ Test basic behaviour of ob_get_clean() --FILE-- <?php /* - * proto bool ob_get_clean(void) * Function is implemented in main/output.c */ diff --git a/tests/output/ob_get_contents_basic_001.phpt b/tests/output/ob_get_contents_basic_001.phpt index 3f24ea04f6..21c7d3c83a 100644 --- a/tests/output/ob_get_contents_basic_001.phpt +++ b/tests/output/ob_get_contents_basic_001.phpt @@ -4,13 +4,6 @@ Test ob_get_contents() function : basic functionality 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() : basic functionality ***\n"; // Zero arguments diff --git a/tests/output/ob_get_length_basic_001.phpt b/tests/output/ob_get_length_basic_001.phpt index 892d106719..9895d3d806 100644 --- a/tests/output/ob_get_length_basic_001.phpt +++ b/tests/output/ob_get_length_basic_001.phpt @@ -3,7 +3,6 @@ Test return type and value, as well as basic behaviour, of ob_get_length() --FILE-- <?php /* - * proto int ob_get_length(void) * Function is implemented in main/output.c */ diff --git a/tests/output/ob_get_level_basic_001.phpt b/tests/output/ob_get_level_basic_001.phpt index f9b009ac8e..3c95d3661a 100644 --- a/tests/output/ob_get_level_basic_001.phpt +++ b/tests/output/ob_get_level_basic_001.phpt @@ -2,12 +2,6 @@ Test ob_get_level() function : basic functionality --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() : basic functionality ***\n"; // Zero arguments @@ -42,6 +36,6 @@ int(2) int(1) int(0) -Notice: ob_end_flush(): Failed to delete and flush buffer. No buffer to delete or flush in %s on line 26 +Notice: ob_end_flush(): Failed to delete and flush buffer. No buffer to delete or flush in %s on line %d int(0) Done diff --git a/tests/output/ob_implicit_flush_basic_001.phpt b/tests/output/ob_implicit_flush_basic_001.phpt index 780eb6dfbb..a5370eda52 100644 --- a/tests/output/ob_implicit_flush_basic_001.phpt +++ b/tests/output/ob_implicit_flush_basic_001.phpt @@ -2,12 +2,6 @@ Test ob_implicit_flush() function : check return value (always null). --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() : check return value ***\n"; var_dump(ob_implicit_flush()); diff --git a/tests/output/ob_implicit_flush_basic_002.phpt b/tests/output/ob_implicit_flush_basic_002.phpt index 37d10ba640..3e46d8f810 100644 --- a/tests/output/ob_implicit_flush_basic_002.phpt +++ b/tests/output/ob_implicit_flush_basic_002.phpt @@ -2,12 +2,6 @@ Test ob_implicit_flush() function : ensure implicit flushing does not apply to user buffers. --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() : ensure implicit flushing does not apply to user buffers. ***\n"; // Start a user buffer diff --git a/tests/output/ob_start_basic_001.phpt b/tests/output/ob_start_basic_001.phpt index 0b06f6077f..8d9b3be2ac 100644 --- a/tests/output/ob_start_basic_001.phpt +++ b/tests/output/ob_start_basic_001.phpt @@ -3,7 +3,6 @@ Test return type and value for ob_start() --FILE-- <?php /* - * proto bool ob_start([ string|array user_function [, int chunk_size [, bool erase]]]) * Function is implemented in main/output.c */ diff --git a/tests/output/ob_start_basic_004.phpt b/tests/output/ob_start_basic_004.phpt index f072a31f13..41edb01eb9 100644 --- a/tests/output/ob_start_basic_004.phpt +++ b/tests/output/ob_start_basic_004.phpt @@ -5,7 +5,6 @@ opcache.optimization_level=0 --FILE-- <?php /* - * proto bool ob_start([ string|array user_function [, int chunk_size [, bool erase]]]) * Function is implemented in main/output.c */ // In HEAD, $chunk_size value of 1 should not have any special behaviour (http://marc.info/?l=php-internals&m=123476465621346&w=2). diff --git a/tests/output/ob_start_basic_005.phpt b/tests/output/ob_start_basic_005.phpt index 4c3aa9c7eb..d13c27c4af 100644 --- a/tests/output/ob_start_basic_005.phpt +++ b/tests/output/ob_start_basic_005.phpt @@ -3,7 +3,6 @@ ob_start(): non-static method as static callbacks. --FILE-- <?php /* - * proto bool ob_start([ string|array user_function [, int chunk_size [, bool erase]]]) * Function is implemented in main/output.c */ diff --git a/tests/output/ob_start_basic_006.phpt b/tests/output/ob_start_basic_006.phpt index 6df545ea22..3e5666fd6b 100644 --- a/tests/output/ob_start_basic_006.phpt +++ b/tests/output/ob_start_basic_006.phpt @@ -3,7 +3,6 @@ ob_start(): ensure multiple buffer initialization with a single call using array --FILE-- <?php /* - * proto bool ob_start([ string|array user_function [, int chunk_size [, bool erase]]]) * Function is implemented in main/output.c */ @@ -72,43 +71,43 @@ var_dump(ob_start(array('f', 'C::g', array(array($c, "g"), array($c, "h"))))); checkAndClean(); ?> --EXPECTF-- - ---> Test arrays: +---> Test arrays: -Warning: ob_start(): array must have exactly two members in %s on line 44 +Warning: ob_start(): array must have exactly two members in %s on line %d -Notice: ob_start(): Failed to create buffer in %s on line 44 +Notice: ob_start(): Failed to create buffer in %s on line %d bool(false) Array ( ) -Warning: ob_start(): class 'f' not found in %s on line 47 +Warning: ob_start(): class 'f' not found in %s on line %d -Notice: ob_start(): Failed to create buffer in %s on line 47 +Notice: ob_start(): Failed to create buffer in %s on line %d bool(false) Array ( ) -Warning: ob_start(): array must have exactly two members in %s on line 50 +Warning: ob_start(): array must have exactly two members in %s on line %d -Notice: ob_start(): Failed to create buffer in %s on line 50 +Notice: ob_start(): Failed to create buffer in %s on line %d bool(false) Array ( ) -Warning: ob_start(): array must have exactly two members in %s on line 53 +Warning: ob_start(): array must have exactly two members in %s on line %d -Notice: ob_start(): Failed to create buffer in %s on line 53 +Notice: ob_start(): Failed to create buffer in %s on line %d bool(false) Array ( ) -Warning: ob_start(): array must have exactly two members in %s on line 56 +Warning: ob_start(): array must have exactly two members in %s on line %d -Notice: ob_start(): Failed to create buffer in %s on line 56 +Notice: ob_start(): Failed to create buffer in %s on line %d bool(false) Array ( @@ -126,9 +125,9 @@ Array ) -Warning: ob_start(): array must have exactly two members in %s on line 68 +Warning: ob_start(): array must have exactly two members in %s on line %d -Notice: ob_start(): Failed to create buffer in %s on line 68 +Notice: ob_start(): Failed to create buffer in %s on line %d bool(false) Array ( diff --git a/tests/output/ob_start_error_001.phpt b/tests/output/ob_start_error_001.phpt index 36efb124a7..98c348fe4a 100644 --- a/tests/output/ob_start_error_001.phpt +++ b/tests/output/ob_start_error_001.phpt @@ -3,7 +3,6 @@ Test wrong number of arguments and wrong arg types for ob_start() --FILE-- <?php /* - * proto bool ob_start([ string|array user_function [, int chunk_size [, bool erase]]]) * Function is implemented in main/output.c */ @@ -23,7 +22,7 @@ var_dump(ob_start(1.5)); --EXPECTF-- Arg 1 wrong type -Warning: ob_start(): no array or string given in %s on line 17 +Warning: ob_start(): no array or string given in %s on line %d -Notice: ob_start(): Failed to create buffer in %s on line 17 +Notice: ob_start(): Failed to create buffer in %s on line %d bool(false) diff --git a/tests/output/ob_start_error_002.phpt b/tests/output/ob_start_error_002.phpt index 447547182b..7de4b77061 100644 --- a/tests/output/ob_start_error_002.phpt +++ b/tests/output/ob_start_error_002.phpt @@ -3,7 +3,6 @@ Test wrong number of arguments and wrong arg types for ob_start() --FILE-- <?php /* - * proto bool ob_start([ string|array user_function [, int chunk_size [, bool erase]]]) * Function is implemented in main/output.c */ @@ -20,23 +19,23 @@ var_dump(ob_start("no")); echo "done" ?> --EXPECTF-- -Warning: ob_start(): class 'nonExistent' not found in %s on line 13 +Warning: ob_start(): class 'nonExistent' not found in %s on line %d -Notice: ob_start(): Failed to create buffer in %s on line 13 +Notice: ob_start(): Failed to create buffer in %s on line %d bool(false) -Warning: ob_start(): class 'C' does not have a method 'nonExistent' in %s on line 14 +Warning: ob_start(): class 'C' does not have a method 'nonExistent' in %s on line %d -Notice: ob_start(): Failed to create buffer in %s on line 14 +Notice: ob_start(): Failed to create buffer in %s on line 13 bool(false) -Warning: ob_start(): class 'C' does not have a method 'no' in %s on line 15 +Warning: ob_start(): class 'C' does not have a method 'no' in %s on line %d -Notice: ob_start(): Failed to create buffer in %s on line 15 +Notice: ob_start(): Failed to create buffer in %s on line 14 bool(false) -Warning: ob_start(): function 'no' not found or invalid function name in %s on line 16 +Warning: ob_start(): function 'no' not found or invalid function name in %s on line %d -Notice: ob_start(): Failed to create buffer in %s on line 16 +Notice: ob_start(): Failed to create buffer in %s on line 15 bool(false) done diff --git a/tests/output/ob_start_error_003.phpt b/tests/output/ob_start_error_003.phpt index 30b030daf7..70e86e3728 100644 --- a/tests/output/ob_start_error_003.phpt +++ b/tests/output/ob_start_error_003.phpt @@ -3,7 +3,6 @@ Test ob_start() with object supplied but no method. --FILE-- <?php /* - * proto bool ob_start([ string|array user_function [, int chunk_size [, bool erase]]]) * Function is implemented in main/output.c */ @@ -17,6 +16,6 @@ echo "done" --EXPECTF-- Warning: ob_start(): array must have exactly two members in %s on line %d -Notice: ob_start(): Failed to create buffer in %s on line 11 +Notice: ob_start(): Failed to create buffer in %s on line %d bool(false) done diff --git a/tests/output/ob_start_error_004.phpt b/tests/output/ob_start_error_004.phpt index ecbb40e7fc..003c61d1fd 100644 --- a/tests/output/ob_start_error_004.phpt +++ b/tests/output/ob_start_error_004.phpt @@ -3,7 +3,6 @@ Test ob_start() with non existent callback method. --FILE-- <?php /* - * proto bool ob_start([ string|array user_function [, int chunk_size [, bool erase]]]) * Function is implemented in main/output.c */ @@ -17,6 +16,6 @@ echo "done" --EXPECTF-- Warning: ob_start(): class 'C' does not have a method 'f' in %s on line %d -Notice: ob_start(): Failed to create buffer in %s on line 11 +Notice: ob_start(): Failed to create buffer in %s on line %d bool(false) done diff --git a/tests/output/ob_start_error_005.phpt b/tests/output/ob_start_error_005.phpt index e11fc3ad89..2930a04748 100644 --- a/tests/output/ob_start_error_005.phpt +++ b/tests/output/ob_start_error_005.phpt @@ -4,7 +4,6 @@ ob_start(): ensure buffers can't be added from within callback. <?php /* - * proto bool ob_start([ string|array user_function [, int chunk_size [, bool erase]]]) * Function is implemented in main/output.c */ @@ -20,4 +19,4 @@ var_dump(ob_start('f')); echo "done"; ?> --EXPECTF-- -Fatal error: ob_start(): Cannot use output buffering in output buffering display handlers in %s on line 9 +Fatal error: ob_start(): Cannot use output buffering in output buffering display handlers in %s on line %d |