diff options
Diffstat (limited to 'tests')
40 files changed, 81 insertions, 554 deletions
diff --git a/tests/basic/bug67198.phpt b/tests/basic/bug67198.phpt index 4c2322b6de..184916197b 100644 --- a/tests/basic/bug67198.phpt +++ b/tests/basic/bug67198.phpt @@ -2,6 +2,8 @@ php://input is empty when enable_post_data_reading=Off --INI-- allow_url_fopen=1 +--CONFLICTS-- +server --SKIPIF-- <?php include __DIR__."/../../sapi/cli/tests/skipif.inc"; diff --git a/tests/basic/rfc1867_missing_boundary_2.phpt b/tests/basic/rfc1867_missing_boundary_2.phpt index bdfe977428..d3f93f8387 100644 --- a/tests/basic/rfc1867_missing_boundary_2.phpt +++ b/tests/basic/rfc1867_missing_boundary_2.phpt @@ -15,7 +15,7 @@ Content-Type: text/plain-file1 var_dump($_FILES); var_dump($_POST); ?> ---EXPECTF-- +--EXPECT-- array(1) { ["file1"]=> array(5) { diff --git a/tests/classes/array_access_012.phpt b/tests/classes/array_access_012.phpt index ba3d6780f1..3cd3dceb8a 100644 --- a/tests/classes/array_access_012.phpt +++ b/tests/classes/array_access_012.phpt @@ -32,7 +32,7 @@ $data['element'] = &$test; --EXPECTF-- Notice: Indirect modification of overloaded element of ArrayAccessImpl has no effect in %sarray_access_012.php on line 24 -Fatal error: Uncaught Error: Cannot assign by reference to overloaded object in %sarray_access_012.php:24 +Fatal error: Uncaught Error: Cannot assign by reference to an array dimension of an object in %sarray_access_012.php:24 Stack trace: #0 {main} thrown in %sarray_access_012.php on line 24 diff --git a/tests/classes/arrayobject_001.phpt b/tests/classes/arrayobject_001.phpt deleted file mode 100644 index b75f8c7ab3..0000000000 --- a/tests/classes/arrayobject_001.phpt +++ /dev/null @@ -1,13 +0,0 @@ ---TEST-- -Ensure that ArrayObject acts like an array ---FILE-- -<?php - -$a = new ArrayObject; -$a['foo'] = 'bar'; -echo reset($a); -echo count($a); -echo current($a); -?> ---EXPECT-- -bar1bar diff --git a/tests/classes/autoload_001.phpt b/tests/classes/autoload_001.phpt index 22bbb6bc7a..56e22f5e4a 100644 --- a/tests/classes/autoload_001.phpt +++ b/tests/classes/autoload_001.phpt @@ -8,7 +8,7 @@ ZE2 Autoload and class_exists <?php spl_autoload_register(function ($class_name) { - require_once(dirname(__FILE__) . '/' . $class_name . '.p5c'); + require_once(dirname(__FILE__) . '/' . $class_name . '.inc'); echo 'autoload(' . $class_name . ")\n"; }); diff --git a/tests/classes/autoload_002.phpt b/tests/classes/autoload_002.phpt index 3ea84370da..0df897495f 100644 --- a/tests/classes/autoload_002.phpt +++ b/tests/classes/autoload_002.phpt @@ -8,7 +8,7 @@ ZE2 Autoload and get_class_methods <?php spl_autoload_register(function ($class_name) { - require_once(dirname(__FILE__) . '/' . $class_name . '.p5c'); + require_once(dirname(__FILE__) . '/' . $class_name . '.inc'); echo 'autoload(' . $class_name . ")\n"; }); diff --git a/tests/classes/autoload_003.phpt b/tests/classes/autoload_003.phpt index cb82c06e19..2f173d80ab 100644 --- a/tests/classes/autoload_003.phpt +++ b/tests/classes/autoload_003.phpt @@ -8,7 +8,7 @@ ZE2 Autoload and derived classes <?php spl_autoload_register(function ($class_name) { - require_once(dirname(__FILE__) . '/' . $class_name . '.p5c'); + require_once(dirname(__FILE__) . '/' . $class_name . '.inc'); echo 'autoload(' . $class_name . ")\n"; }); diff --git a/tests/classes/autoload_004.phpt b/tests/classes/autoload_004.phpt index f5830ca6cd..2a71a893d9 100644 --- a/tests/classes/autoload_004.phpt +++ b/tests/classes/autoload_004.phpt @@ -9,7 +9,7 @@ ZE2 Autoload and recursion spl_autoload_register(function ($class_name) { var_dump(class_exists($class_name)); - require_once(dirname(__FILE__) . '/' . $class_name . '.p5c'); + require_once(dirname(__FILE__) . '/' . $class_name . '.inc'); echo 'autoload(' . $class_name . ")\n"; }); diff --git a/tests/classes/autoload_005.phpt b/tests/classes/autoload_005.phpt index c21a442056..622e1fdee4 100644 --- a/tests/classes/autoload_005.phpt +++ b/tests/classes/autoload_005.phpt @@ -9,7 +9,7 @@ ZE2 Autoload from destructor spl_autoload_register(function ($class_name) { var_dump(class_exists($class_name, false)); - require_once(dirname(__FILE__) . '/' . $class_name . '.p5c'); + require_once(dirname(__FILE__) . '/' . $class_name . '.inc'); echo 'autoload(' . $class_name . ")\n"; }); diff --git a/tests/classes/autoload_006.phpt b/tests/classes/autoload_006.phpt index 69598afc8d..a7afb3b904 100644 --- a/tests/classes/autoload_006.phpt +++ b/tests/classes/autoload_006.phpt @@ -8,7 +8,7 @@ ZE2 Autoload from destructor <?php spl_autoload_register(function ($class_name) { - require_once(dirname(__FILE__) . '/' . strtolower($class_name) . '.p5c'); + require_once(dirname(__FILE__) . '/' . strtolower($class_name) . '.inc'); echo 'autoload(' . $class_name . ")\n"; }); diff --git a/tests/classes/autoload_derived.p5c b/tests/classes/autoload_derived.inc index d897daeed0..d897daeed0 100755..100644 --- a/tests/classes/autoload_derived.p5c +++ b/tests/classes/autoload_derived.inc diff --git a/tests/classes/autoload_implements.p5c b/tests/classes/autoload_implements.inc index 55fcc3cd9f..55fcc3cd9f 100755..100644 --- a/tests/classes/autoload_implements.p5c +++ b/tests/classes/autoload_implements.inc diff --git a/tests/classes/autoload_interface.p5c b/tests/classes/autoload_interface.inc index e6a416e721..e6a416e721 100755..100644 --- a/tests/classes/autoload_interface.p5c +++ b/tests/classes/autoload_interface.inc diff --git a/tests/classes/autoload_root.p5c b/tests/classes/autoload_root.inc index 98149c59b5..98149c59b5 100755..100644 --- a/tests/classes/autoload_root.p5c +++ b/tests/classes/autoload_root.inc diff --git a/tests/classes/bug63462.phpt b/tests/classes/bug63462.phpt deleted file mode 100644 index e2c61897ec..0000000000 --- a/tests/classes/bug63462.phpt +++ /dev/null @@ -1,68 +0,0 @@ ---TEST-- -Test script to verify that magic methods should be called only once when accessing an unset property. ---CREDITS-- -Marco Pivetta <ocramius@gmail.com> ---FILE-- -<?php -class Test { - public $publicProperty; - protected $protectedProperty; - private $privateProperty; - - public function __construct() { - unset( - $this->publicProperty, - $this->protectedProperty, - $this->privateProperty - ); - } - - function __get($name) { - echo '__get ' . $name; - return $this->$name; - } - - function __set($name, $value) { - echo '__set ' . $name . "\n"; - $this->$name = $value; - } - - function __isset($name) { - echo '__isset ' . $name . "\n"; - return isset($this->$name); - } -} - -$test = new Test(); - -$test->nonExisting; -$test->publicProperty; -$test->protectedProperty; -$test->privateProperty; -isset($test->nonExisting); -isset($test->publicProperty); -isset($test->protectedProperty); -isset($test->privateProperty); -$test->nonExisting = 'value'; -$test->publicProperty = 'value'; -$test->protectedProperty = 'value'; -$test->privateProperty = 'value'; - -?> ---EXPECTF-- -__get nonExisting -Notice: Undefined property: Test::$nonExisting in %sbug63462.php on line %d -__get publicProperty -Notice: Undefined property: Test::$publicProperty in %sbug63462.php on line %d -__get protectedProperty -Notice: Undefined property: Test::$protectedProperty in %sbug63462.php on line %d -__get privateProperty -Notice: Undefined property: Test::$privateProperty in %sbug63462.php on line %d -__isset nonExisting -__isset publicProperty -__isset protectedProperty -__isset privateProperty -__set nonExisting -__set publicProperty -__set protectedProperty -__set privateProperty diff --git a/tests/classes/class_abstract.phpt b/tests/classes/class_abstract.phpt index fe95d9bcc3..d852884d52 100644 --- a/tests/classes/class_abstract.phpt +++ b/tests/classes/class_abstract.phpt @@ -1,5 +1,5 @@ --TEST-- -ZE2 An abstract class cannot be instanciated +ZE2 An abstract class cannot be instantiated --FILE-- <?php diff --git a/tests/classes/clone_004.phpt b/tests/classes/clone_004.phpt index 2059103bc5..88ad916bb4 100644 --- a/tests/classes/clone_004.phpt +++ b/tests/classes/clone_004.phpt @@ -12,7 +12,7 @@ abstract class base { class test extends base { public $b = 'test'; - // reenable cloning + // re-enable cloning public function __clone() {} public function show() { diff --git a/tests/classes/constants_basic_001.phpt b/tests/classes/constants_basic_001.phpt index b60991844f..6a281e7d32 100644 --- a/tests/classes/constants_basic_001.phpt +++ b/tests/classes/constants_basic_001.phpt @@ -73,7 +73,7 @@ float(-1.5) int(15) string(%d) "%s" string(1) "C" -string(1) "C" +string(0) "" string(0) "" int(1234) int(456) diff --git a/tests/classes/constants_visibility_008.phpt b/tests/classes/constants_visibility_008.phpt index f24b70cf59..fe1b0237f1 100644 --- a/tests/classes/constants_visibility_008.phpt +++ b/tests/classes/constants_visibility_008.phpt @@ -8,5 +8,5 @@ class Foo private const BAR = 1; } echo (int)defined('Foo::BAR'); ---EXPECTF-- +--EXPECT-- 0 diff --git a/tests/classes/ctor_dtor_inheritance.phpt b/tests/classes/ctor_dtor_inheritance.phpt index 5e240571d7..1f3d3483d0 100644 --- a/tests/classes/ctor_dtor_inheritance.phpt +++ b/tests/classes/ctor_dtor_inheritance.phpt @@ -6,7 +6,7 @@ ZE2 A derived class can use the inherited constructor/destructor // This test checks for: // - inherited constructors/destructors are not called automatically // - base classes know about derived properties in constructor/destructor -// - base class constructors/destructors know the instanciated class name +// - base class constructors/destructors know the instantiated class name class base { public $name; diff --git a/tests/classes/type_hinting_004.phpt b/tests/classes/type_hinting_004.phpt index 174664c02f..27f15a3e16 100644 --- a/tests/classes/type_hinting_004.phpt +++ b/tests/classes/type_hinting_004.phpt @@ -2,11 +2,6 @@ Ensure type hints are enforced for functions invoked as callbacks. --FILE-- <?php - set_error_handler('myErrorHandler', E_RECOVERABLE_ERROR); - function myErrorHandler($errno, $errstr, $errfile, $errline) { - echo "$errno: $errstr - $errfile($errline)\n"; - return true; - } echo "---> Type hints with callback function:\n"; class A { } diff --git a/tests/lang/engine_assignExecutionOrder_008.phpt b/tests/lang/engine_assignExecutionOrder_008.phpt index be9b3423c8..310e0d9964 100644 --- a/tests/lang/engine_assignExecutionOrder_008.phpt +++ b/tests/lang/engine_assignExecutionOrder_008.phpt @@ -70,10 +70,16 @@ Warning: Creating default object from empty value in %s on line %d good $i->p->q=f(): Warning: Creating default object from empty value in %s on line %d + +Warning: Creating default object from empty value in %s on line %d +good +$i->p[0]=f(): +Warning: Creating default object from empty value in %s on line %d good -$i->p[0]=f(): good $i->p[0]->p=f(): Warning: Creating default object from empty value in %s on line %d + +Warning: Creating default object from empty value in %s on line %d good C::$p=f(): good C::$p[0]=f(): good diff --git a/tests/lang/foreachLoop.016.phpt b/tests/lang/foreachLoop.016.phpt index 00deb5f1db..fa1267fa8d 100644 --- a/tests/lang/foreachLoop.016.phpt +++ b/tests/lang/foreachLoop.016.phpt @@ -158,18 +158,24 @@ array(1) { $a->b->c Warning: Creating default object from empty value in %s on line %d + +Warning: Creating default object from empty value in %s on line %d array(1) { [0]=> string(8) "original" } $a->b[0] + +Warning: Creating default object from empty value in %s on line %d array(1) { [0]=> string(8) "original" } $a->b[0][0] + +Warning: Creating default object from empty value in %s on line %d array(1) { [0]=> string(8) "original" @@ -178,6 +184,8 @@ array(1) { $a->b[0]->c Warning: Creating default object from empty value in %s on line %d + +Warning: Creating default object from empty value in %s on line %d array(1) { [0]=> string(8) "original" diff --git a/tests/lang/operators/bitwiseOr_basiclong_64bit.phpt b/tests/lang/operators/bitwiseOr_basiclong_64bit.phpt index dc4126cb0c..16d7dba40f 100644 --- a/tests/lang/operators/bitwiseOr_basiclong_64bit.phpt +++ b/tests/lang/operators/bitwiseOr_basiclong_64bit.phpt @@ -580,4 +580,3 @@ int(-1) --- testing: 9223372036854775807 | -9.2233720368548E+18 --- int(-1) ===DONE=== - diff --git a/tests/lang/operators/bitwiseXor_basiclong_64bit.phpt b/tests/lang/operators/bitwiseXor_basiclong_64bit.phpt index 1b63f38dee..1ed750cca9 100644 --- a/tests/lang/operators/bitwiseXor_basiclong_64bit.phpt +++ b/tests/lang/operators/bitwiseXor_basiclong_64bit.phpt @@ -580,4 +580,3 @@ int(-2) --- testing: 9223372036854775807 ^ -9.2233720368548E+18 --- int(-1) ===DONE=== - diff --git a/tests/lang/passByReference_006.phpt b/tests/lang/passByReference_006.phpt index 9f5d275333..c1478663ca 100644 --- a/tests/lang/passByReference_006.phpt +++ b/tests/lang/passByReference_006.phpt @@ -55,6 +55,18 @@ var_dump($u1, $u2, $u3, $u4, $u5); ?> --EXPECTF-- ---- Pass uninitialised array & object by ref: function call --- + +Warning: Creating default object from empty value in %spassByReference_006.php on line %d + +Warning: Creating default object from empty value in %spassByReference_006.php on line %d + +Warning: Creating default object from empty value in %spassByReference_006.php on line %d + +Warning: Creating default object from empty value in %spassByReference_006.php on line %d + +Warning: Creating default object from empty value in %spassByReference_006.php on line %d + +Warning: Creating default object from empty value in %spassByReference_006.php on line %d array(1) { [0]=> string(12) "Ref1 changed" @@ -91,6 +103,18 @@ object(stdClass)#%d (1) { ---- Pass uninitialised arrays & objects by ref: static method call --- Deprecated: Non-static method C::refs() should not be called statically in %s on line 39 + +Warning: Creating default object from empty value in %spassByReference_006.php on line %d + +Warning: Creating default object from empty value in %spassByReference_006.php on line %d + +Warning: Creating default object from empty value in %spassByReference_006.php on line %d + +Warning: Creating default object from empty value in %spassByReference_006.php on line %d + +Warning: Creating default object from empty value in %spassByReference_006.php on line %d + +Warning: Creating default object from empty value in %spassByReference_006.php on line %d array(1) { [0]=> string(12) "Ref1 changed" @@ -126,6 +150,18 @@ object(stdClass)#%d (1) { ---- Pass uninitialised arrays & objects by ref: constructor --- + +Warning: Creating default object from empty value in %spassByReference_006.php on line %d + +Warning: Creating default object from empty value in %spassByReference_006.php on line %d + +Warning: Creating default object from empty value in %spassByReference_006.php on line %d + +Warning: Creating default object from empty value in %spassByReference_006.php on line %d + +Warning: Creating default object from empty value in %spassByReference_006.php on line %d + +Warning: Creating default object from empty value in %spassByReference_006.php on line %d array(1) { [0]=> string(12) "Ref1 changed" @@ -160,6 +196,18 @@ object(stdClass)#%d (1) { } ---- Pass uninitialised arrays & objects by ref: instance method call --- + +Warning: Creating default object from empty value in %spassByReference_006.php on line %d + +Warning: Creating default object from empty value in %spassByReference_006.php on line %d + +Warning: Creating default object from empty value in %spassByReference_006.php on line %d + +Warning: Creating default object from empty value in %spassByReference_006.php on line %d + +Warning: Creating default object from empty value in %spassByReference_006.php on line %d + +Warning: Creating default object from empty value in %spassByReference_006.php on line %d array(1) { [0]=> string(12) "Ref1 changed" 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_basic_001.phpt b/tests/output/ob_get_contents_basic_001.phpt index cdf301281e..3f24ea04f6 100644 --- a/tests/output/ob_get_contents_basic_001.phpt +++ b/tests/output/ob_get_contents_basic_001.phpt @@ -25,7 +25,7 @@ var_dump($hello); ob_end_flush(); -echo "\ncheck that we dont have a reference\n"; +echo "\ncheck that we don't have a reference\n"; ob_start(); echo "Hello World\n"; $hello2 = ob_get_contents(); @@ -58,7 +58,7 @@ Hello World string(12) "Hello World " -check that we dont have a reference +check that we don't have a reference Hello World string(12) "Hello World " 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 diff --git a/tests/output/ob_implicit_flush_variation_001.phpt b/tests/output/ob_implicit_flush_variation_001.phpt deleted file mode 100644 index d6d3a45e01..0000000000 --- a/tests/output/ob_implicit_flush_variation_001.phpt +++ /dev/null @@ -1,194 +0,0 @@ ---TEST-- -Test ob_implicit_flush() function : usage variation ---SKIPIF-- -<?php if (PHP_INT_SIZE != 8) die("skip this test is for 64-bit only"); ---FILE-- -<?php -/* Prototype : 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() : usage variation ***\n"; - -// Define error handler -function test_error_handler($err_no, $err_msg, $filename, $linenum, $vars) { - if (error_reporting() != 0) { - // report non-silenced errors - echo "Error: $err_no - $err_msg, $filename($linenum)\n"; - } -} -set_error_handler('test_error_handler'); - -// Initialise function arguments not being substituted (if any) - -//get an unset variable -$unset_var = 10; -unset ($unset_var); - -// define some classes -class classWithToString -{ - public function __toString() { - return "Class A object"; - } -} - -class classWithoutToString -{ -} - -// heredoc string -$heredoc = <<<EOT -hello world -EOT; - -// add arrays -$index_array = array (1, 2, 3); -$assoc_array = array ('one' => 1, 'two' => 2); - -//array of values to iterate over -$inputs = array( - - // float data - 'float 10.5' => 10.5, - 'float -10.5' => -10.5, - 'float 12.3456789000e10' => 12.3456789000e10, - 'float -12.3456789000e10' => -12.3456789000e10, - 'float .5' => .5, - - // array data - 'empty array' => array(), - 'int indexed array' => $index_array, - 'associative array' => $assoc_array, - 'nested arrays' => array('foo', $index_array, $assoc_array), - - // null data - 'uppercase NULL' => NULL, - 'lowercase null' => null, - - // boolean data - 'lowercase true' => true, - 'lowercase false' =>false, - 'uppercase TRUE' =>TRUE, - 'uppercase FALSE' =>FALSE, - - // empty data - 'empty string DQ' => "", - 'empty string SQ' => '', - - // string data - 'string DQ' => "string", - 'string SQ' => 'string', - 'mixed case string' => "sTrInG", - 'heredoc' => $heredoc, - - // object data - 'instance of classWithToString' => new classWithToString(), - 'instance of classWithoutToString' => new classWithoutToString(), - - // undefined data - 'undefined var' => @$undefined_var, - - // unset data - 'unset var' => @$unset_var, -); - -// loop through each element of the array for flag - -foreach($inputs as $key =>$value) { - echo "\n--$key--\n"; - var_dump( ob_implicit_flush($value) ); -}; - -?> ---EXPECTF-- -*** Testing ob_implicit_flush() : usage variation *** - ---float 10.5-- -NULL - ---float -10.5-- -NULL - ---float 12.3456789000e10-- -NULL - ---float -12.3456789000e10-- -NULL - ---float .5-- -NULL - ---empty array-- -Error: 2 - ob_implicit_flush() expects parameter 1 to be int, array given, %s(97) -NULL - ---int indexed array-- -Error: 2 - ob_implicit_flush() expects parameter 1 to be int, array given, %s(97) -NULL - ---associative array-- -Error: 2 - ob_implicit_flush() expects parameter 1 to be int, array given, %s(97) -NULL - ---nested arrays-- -Error: 2 - ob_implicit_flush() expects parameter 1 to be int, array given, %s(97) -NULL - ---uppercase NULL-- -NULL - ---lowercase null-- -NULL - ---lowercase true-- -NULL - ---lowercase false-- -NULL - ---uppercase TRUE-- -NULL - ---uppercase FALSE-- -NULL - ---empty string DQ-- -Error: 2 - ob_implicit_flush() expects parameter 1 to be int, string given, %s(97) -NULL - ---empty string SQ-- -Error: 2 - ob_implicit_flush() expects parameter 1 to be int, string given, %s(97) -NULL - ---string DQ-- -Error: 2 - ob_implicit_flush() expects parameter 1 to be int, string given, %s(97) -NULL - ---string SQ-- -Error: 2 - ob_implicit_flush() expects parameter 1 to be int, string given, %s(97) -NULL - ---mixed case string-- -Error: 2 - ob_implicit_flush() expects parameter 1 to be int, string given, %s(97) -NULL - ---heredoc-- -Error: 2 - ob_implicit_flush() expects parameter 1 to be int, string given, %s(97) -NULL - ---instance of classWithToString-- -Error: 2 - ob_implicit_flush() expects parameter 1 to be int, object given, %s(97) -NULL - ---instance of classWithoutToString-- -Error: 2 - ob_implicit_flush() expects parameter 1 to be int, object given, %s(97) -NULL - ---undefined var-- -NULL - ---unset var-- -NULL diff --git a/tests/security/CONFLICTS b/tests/security/CONFLICTS new file mode 100644 index 0000000000..84eb3cfb06 --- /dev/null +++ b/tests/security/CONFLICTS @@ -0,0 +1 @@ +open_basedir diff --git a/tests/security/open_basedir_mkdir.phpt b/tests/security/open_basedir_mkdir.phpt index 91cb392206..2ef4812cd2 100644 --- a/tests/security/open_basedir_mkdir.phpt +++ b/tests/security/open_basedir_mkdir.phpt @@ -1,11 +1,5 @@ --TEST-- Test open_basedir configuration ---SKIPIF-- -<?php -if(PHP_OS_FAMILY !== "Windows") { - die('skip Windows only variation'); -} -?> --INI-- open_basedir=. --FILE-- |