diff --git a/Zend/tests/019.phpt b/Zend/tests/019.phpt index 819fdc2c2b9..4ea10e97214 100644 --- a/Zend/tests/019.phpt +++ b/Zend/tests/019.phpt @@ -360,7 +360,6 @@ var_dump($global_var); //Note: No error conditions relating to passing arguments can be tested // because these are not functions but statements, it will result in syntax error. ?> -===DONE=== --EXPECTF-- *** Testing unset(), empty() & isset() with scalar variables *** -- Iteration 1 -- @@ -1330,4 +1329,3 @@ bool(false) bool(false) bool(true) int(10) -===DONE=== diff --git a/Zend/tests/bug26166.phpt b/Zend/tests/bug26166.phpt index 7a3be86c3fa..bd16050a871 100644 --- a/Zend/tests/bug26166.phpt +++ b/Zend/tests/bug26166.phpt @@ -61,11 +61,9 @@ try { } ?> -===DONE=== --EXPECT-- Hello World! ===NONE=== Method NoneTest::__toString() must return a string value ===THROW=== This is an error! -===DONE=== diff --git a/Zend/tests/bug26229.phpt b/Zend/tests/bug26229.phpt index cf23f157f88..393b49f3d03 100644 --- a/Zend/tests/bug26229.phpt +++ b/Zend/tests/bug26229.phpt @@ -23,7 +23,5 @@ catch(Exception $e) echo $e->getMessage() . "\n"; } ?> -===DONE=== --EXPECT-- Objects returned by array_iterator::getIterator() must be traversable or implement interface Iterator -===DONE=== diff --git a/Zend/tests/bug26696.phpt b/Zend/tests/bug26696.phpt index 14083dfb9f5..57ba310c1dc 100644 --- a/Zend/tests/bug26696.phpt +++ b/Zend/tests/bug26696.phpt @@ -16,7 +16,5 @@ for ($i = 0; $i < $len; $i++) { } ?> -===DONE=== --EXPECT-- a-s-d-d-/-?+ -===DONE=== diff --git a/Zend/tests/bug26697.phpt b/Zend/tests/bug26697.phpt index c0a4850e558..1692e388efb 100644 --- a/Zend/tests/bug26697.phpt +++ b/Zend/tests/bug26697.phpt @@ -12,10 +12,8 @@ spl_autoload_register(function ($name) { var_dump(class_exists('NotExistingClass')); ?> -===DONE=== --EXPECT-- {closure}(NotExistingClass) bool(false) {closure}(NotExistingClass), done bool(false) -===DONE=== diff --git a/Zend/tests/bug26698.phpt b/Zend/tests/bug26698.phpt index 8fbf551b6bf..066fdc3a374 100644 --- a/Zend/tests/bug26698.phpt +++ b/Zend/tests/bug26698.phpt @@ -65,9 +65,7 @@ $p->callOne(); $p->callTwo(); $p->callThree(); ?> -===DONE=== --EXPECT-- Caught: NONE Caught: NONE Caught: NONE -===DONE=== diff --git a/Zend/tests/bug26802.phpt b/Zend/tests/bug26802.phpt index 0ab4760d488..11e468d088a 100644 --- a/Zend/tests/bug26802.phpt +++ b/Zend/tests/bug26802.phpt @@ -30,8 +30,6 @@ foo::$method(); ?> -===DONE=== --EXPECT-- global_func foo::foo_func -===DONE=== diff --git a/Zend/tests/bug27304.phpt b/Zend/tests/bug27304.phpt index 9eb1ececf7f..f9ca3e2ecfd 100644 --- a/Zend/tests/bug27304.phpt +++ b/Zend/tests/bug27304.phpt @@ -16,8 +16,6 @@ Staticexample::test(); $b->test(); ?> -===DONE=== --EXPECT-- bool(false) bool(false) -===DONE=== diff --git a/Zend/tests/bug27669.phpt b/Zend/tests/bug27669.phpt index 747593031ff..679c7a61056 100644 --- a/Zend/tests/bug27669.phpt +++ b/Zend/tests/bug27669.phpt @@ -10,7 +10,5 @@ Bug #27669 (PHP 5 didn't support all possibilities for calling static methods dy $y[0] = 'hello'; A::{$y[0]}(); ?> -===DONE=== --EXPECTF-- Hello World -===DONE=== diff --git a/Zend/tests/bug27798.phpt b/Zend/tests/bug27798.phpt index 2545d9e1003..9c84731fe67 100644 --- a/Zend/tests/bug27798.phpt +++ b/Zend/tests/bug27798.phpt @@ -32,7 +32,6 @@ var_dump(get_object_vars(new Base)); var_dump(get_object_vars(new Child)); ?> -===DONE=== --EXPECT-- Base::__construct array(3) { @@ -69,4 +68,3 @@ array(1) { ["Foo"]=> int(1) } -===DONE=== diff --git a/Zend/tests/bug28442.phpt b/Zend/tests/bug28442.phpt index 36a6fc6ab99..fd57fef854f 100644 --- a/Zend/tests/bug28442.phpt +++ b/Zend/tests/bug28442.phpt @@ -44,7 +44,6 @@ var_dump(ClassB::$prop); var_dump(ClassC::$prop); ?> -===DONE=== --EXPECT-- ===INIT=== string(1) "A" @@ -62,4 +61,3 @@ string(2) "B2" string(2) "A2" string(2) "C2" string(2) "C2" -===DONE=== diff --git a/Zend/tests/bug28444.phpt b/Zend/tests/bug28444.phpt index 464aaef4c79..245a1f2704c 100644 --- a/Zend/tests/bug28444.phpt +++ b/Zend/tests/bug28444.phpt @@ -52,7 +52,6 @@ var_dump($t->x = 5); var_dump($y->z->x = 6); ?> -===DONE=== --EXPECT-- object(ObjectOne)#2 (1) { ["x"]=> @@ -75,4 +74,3 @@ Overloaded::__get(z) int(5) Overloaded::__get(z) int(6) -===DONE=== diff --git a/Zend/tests/bug29368.phpt b/Zend/tests/bug29368.phpt index 1987fa9b45d..20dc59a6447 100644 --- a/Zend/tests/bug29368.phpt +++ b/Zend/tests/bug29368.phpt @@ -27,8 +27,6 @@ try unset($bar); ?> -===DONE=== --EXPECT-- Foo::__construct Caught exception! -===DONE=== diff --git a/Zend/tests/bug29505.phpt b/Zend/tests/bug29505.phpt index 4d7c0535167..a52ea669295 100644 --- a/Zend/tests/bug29505.phpt +++ b/Zend/tests/bug29505.phpt @@ -11,7 +11,6 @@ class Test { var_dump(get_class_vars('Test')); ?> -===DONE=== --EXPECT-- array(2) { ["empty"]=> @@ -28,4 +27,3 @@ array(2) { } } } -===DONE=== diff --git a/Zend/tests/bug30162.phpt b/Zend/tests/bug30162.phpt index cd0ca4872e1..4b2739ab2e0 100644 --- a/Zend/tests/bug30162.phpt +++ b/Zend/tests/bug30162.phpt @@ -41,7 +41,6 @@ $db = new hariCow; var_dump($db); ?> -===DONE=== --EXPECTF-- Warning: Undefined variable: db in %s on line %d NULL @@ -51,4 +50,3 @@ object(hariCow)#%d (2) { ["y"]=> string(1) "y" } -===DONE=== diff --git a/Zend/tests/bug30346.phpt b/Zend/tests/bug30346.phpt index 8db080f820f..3a4caa6f7a8 100644 --- a/Zend/tests/bug30346.phpt +++ b/Zend/tests/bug30346.phpt @@ -18,7 +18,5 @@ echo $post[$id.'_show']; echo "\n"; ?> -===DONE=== --EXPECT-- page_show -===DONE=== diff --git a/Zend/tests/bug30407.phpt b/Zend/tests/bug30407.phpt index 6dcc6b3481f..ad1993897d5 100644 --- a/Zend/tests/bug30407.phpt +++ b/Zend/tests/bug30407.phpt @@ -11,8 +11,6 @@ function haricow($a = 'one') { haricow(); haricow(); ?> -===DONE=== --EXPECT-- string(3) "one" string(3) "one" -===DONE=== diff --git a/Zend/tests/bug30725.phpt b/Zend/tests/bug30725.phpt index 75cb04843c6..bbcf09dfdd9 100644 --- a/Zend/tests/bug30725.phpt +++ b/Zend/tests/bug30725.phpt @@ -26,7 +26,5 @@ catch(Exception $e) } ?> -===DONE=== --EXPECT-- Caught -===DONE=== diff --git a/Zend/tests/bug30998.phpt b/Zend/tests/bug30998.phpt index 2ff3068e5ca..310c08d75f4 100644 --- a/Zend/tests/bug30998.phpt +++ b/Zend/tests/bug30998.phpt @@ -13,9 +13,7 @@ set_error_handler('my_error'); $f = fopen("/tmp/blah", "r"); ?> -===DONE=== --EXPECTF-- fopen(/tmp/blah): failed to open stream: %s (2) in %s:%d Warning: fopen(/tmp/blah): failed to open stream: %s in %s on line %d -===DONE=== diff --git a/Zend/tests/bug31102.phpt b/Zend/tests/bug31102.phpt index 624eee52ba4..c01c2e004a7 100644 --- a/Zend/tests/bug31102.phpt +++ b/Zend/tests/bug31102.phpt @@ -36,7 +36,6 @@ while($test++ < 5) } ?> ===DONE=== - --EXPECTF-- {closure}(Test1,1) Caught: Test1::__construct diff --git a/Zend/tests/bug31720.phpt b/Zend/tests/bug31720.phpt index b5e935cd802..1e01d417729 100644 --- a/Zend/tests/bug31720.phpt +++ b/Zend/tests/bug31720.phpt @@ -10,8 +10,6 @@ try { echo $e->getMessage(), "\n"; } ?> -===DONE=== --EXPECTF-- Warning: Undefined variable: nonesuchvar in %s on line %d array_walk() expects parameter 2 to be a valid callback, first array member is not a valid class name or object -===DONE=== diff --git a/Zend/tests/bug32226.phpt b/Zend/tests/bug32226.phpt index f8e13cfb6eb..d3432c4247f 100644 --- a/Zend/tests/bug32226.phpt +++ b/Zend/tests/bug32226.phpt @@ -30,7 +30,5 @@ catch(Exception $e) } ?> -===DONE=== --EXPECT-- Caught -===DONE=== diff --git a/Zend/tests/bug32252.phpt b/Zend/tests/bug32252.phpt index 706da18cfb4..ce97384c0e8 100644 --- a/Zend/tests/bug32252.phpt +++ b/Zend/tests/bug32252.phpt @@ -40,8 +40,6 @@ catch (Exception $e) } ?> -===DONE=== --EXPECT-- Test::offsetSet(-1, 123) CAUGHT -===DONE=== diff --git a/Zend/tests/bug32290.phpt b/Zend/tests/bug32290.phpt index e73bca12ace..a58bcf4ce38 100644 --- a/Zend/tests/bug32290.phpt +++ b/Zend/tests/bug32290.phpt @@ -94,8 +94,6 @@ echo "\n===E===\n"; var_dump($x->doSomethingStatic(1)); ?> -===DONE=== - --EXPECT-- ===A=== TestB::doSomething(1) @@ -121,4 +119,3 @@ int(1) TestB::doSomethingStatic(1) TestA::doSomethingStatic(2) int(1) -===DONE=== diff --git a/Zend/tests/bug37212.phpt b/Zend/tests/bug37212.phpt index 212ef23ec7f..0d19efa8f13 100644 --- a/Zend/tests/bug37212.phpt +++ b/Zend/tests/bug37212.phpt @@ -38,7 +38,6 @@ $B->copyValue($C); var_dump($B); ?> -===DONE=== --EXPECTF-- object(B)#%d (1) { ["value":protected]=> @@ -52,4 +51,3 @@ object(B)#%d (1) { ["value":protected]=> string(1) "C" } -===DONE=== diff --git a/Zend/tests/bug37667.phpt b/Zend/tests/bug37667.phpt index ecf43c5b80b..83a87a96881 100644 --- a/Zend/tests/bug37667.phpt +++ b/Zend/tests/bug37667.phpt @@ -26,7 +26,6 @@ $obj->property[] = 2; var_dump($obj); ?> -===DONE=== --EXPECTF-- string(3) "bar" @@ -50,4 +49,3 @@ object(Test)#%d (1) { string(3) "bar" } } -===DONE=== diff --git a/Zend/tests/bug46196.phpt b/Zend/tests/bug46196.phpt index 7a6a753d878..9b2ca618ee8 100644 --- a/Zend/tests/bug46196.phpt +++ b/Zend/tests/bug46196.phpt @@ -22,10 +22,8 @@ function myErrorHandler($errno, $errstr, $errfile, $errline) } ?> -===DONE=== --EXPECT-- *** Testing restore_error_handler() : error bug #46196 *** NULL bool(true) NULL -===DONE=== diff --git a/Zend/tests/bug48215.phpt b/Zend/tests/bug48215.phpt index 4582057d986..6af18673614 100644 --- a/Zend/tests/bug48215.phpt +++ b/Zend/tests/bug48215.phpt @@ -27,10 +27,8 @@ class B extends A $b = new B(); $b->A(); ?> -===DONE=== --EXPECT-- B::__construct A::__construct B::A A::A -===DONE=== diff --git a/Zend/tests/bug66015.phpt b/Zend/tests/bug66015.phpt index 5e0815240d3..1222ab3a96c 100644 --- a/Zend/tests/bug66015.phpt +++ b/Zend/tests/bug66015.phpt @@ -24,7 +24,6 @@ class Test $test = new Test(); ?> -===DONE=== --EXPECT-- array ( 1 => 'first', @@ -32,4 +31,3 @@ array ( 3 => 'third', 4 => 4, ) -===DONE=== diff --git a/Zend/tests/bug68797.phpt b/Zend/tests/bug68797.phpt index db0306049fa..0202a63125c 100644 --- a/Zend/tests/bug68797.phpt +++ b/Zend/tests/bug68797.phpt @@ -7,7 +7,5 @@ precision=17 echo 2.2250738585072012e-308, "\n"; ?> -==DONE== --EXPECT-- 2.2250738585072014E-308 -==DONE== diff --git a/Zend/tests/bug71572.phpt b/Zend/tests/bug71572.phpt index f4f44449cd6..063a98fcb91 100644 --- a/Zend/tests/bug71572.phpt +++ b/Zend/tests/bug71572.phpt @@ -10,7 +10,6 @@ var_dump($str[3] = ""); var_dump($str[10] = ""); var_dump($str); ?> -==DONE== --EXPECTF-- Warning: Cannot assign an empty string to a string offset in %s on line %d NULL @@ -24,4 +23,3 @@ NULL Warning: Cannot assign an empty string to a string offset in %s on line %d NULL string(3) "abc" -==DONE== diff --git a/Zend/tests/bug72918.phpt b/Zend/tests/bug72918.phpt index 403d4e69c50..92ee518de59 100644 --- a/Zend/tests/bug72918.phpt +++ b/Zend/tests/bug72918.phpt @@ -13,10 +13,8 @@ $string[-3] EOT; ?> -===DONE=== --EXPECT-- foo c foo c -===DONE=== diff --git a/Zend/tests/bug76965.phpt b/Zend/tests/bug76965.phpt index 1a8e7d2d351..ce157733a5f 100644 --- a/Zend/tests/bug76965.phpt +++ b/Zend/tests/bug76965.phpt @@ -15,7 +15,6 @@ END; var_dump(parse_ini_string($ini, false, INI_SCANNER_RAW)); ?> -===DONE=== --EXPECT-- array(7) { [1]=> @@ -33,4 +32,3 @@ array(7) { [7]=> string(7) "foo"bar" } -===DONE=== diff --git a/Zend/tests/bug77291.phpt b/Zend/tests/bug77291.phpt index 2960648a7c4..e5977eba085 100644 --- a/Zend/tests/bug77291.phpt +++ b/Zend/tests/bug77291.phpt @@ -35,8 +35,6 @@ var_dump(isset($foo->a)); $foo = new Foo45; var_dump($foo->a); ?> -===DONE=== --EXPECT-- bool(true) string(10) "Some value" -===DONE=== diff --git a/Zend/tests/bug_debug_backtrace.phpt b/Zend/tests/bug_debug_backtrace.phpt index 71ce129201a..95530e01e46 100644 --- a/Zend/tests/bug_debug_backtrace.phpt +++ b/Zend/tests/bug_debug_backtrace.phpt @@ -18,11 +18,9 @@ eval("foo();"); echo "Done\n"; ?> -===DONE=== --EXPECTF-- #0 boo() called at [%s:%d] #1 bar() called at [%s:%d] #2 foo() called at [%s(%d) : eval()'d code:1] #3 eval() called at [%s:%d] Done -===DONE=== diff --git a/Zend/tests/closure_034.phpt b/Zend/tests/closure_034.phpt index 8ba276a68a7..27981a5c74b 100644 --- a/Zend/tests/closure_034.phpt +++ b/Zend/tests/closure_034.phpt @@ -7,7 +7,6 @@ $a = function () use(&$a) {}; var_dump($a); ?> -===DONE=== --EXPECTF-- object(Closure)#%d (1) { ["static"]=> @@ -16,4 +15,3 @@ object(Closure)#%d (1) { *RECURSION* } } -===DONE=== diff --git a/Zend/tests/closures/closure_from_callable_basic.phpt b/Zend/tests/closures/closure_from_callable_basic.phpt index 0aacaf2ff53..d4c6427ae8b 100644 --- a/Zend/tests/closures/closure_from_callable_basic.phpt +++ b/Zend/tests/closures/closure_from_callable_basic.phpt @@ -96,7 +96,6 @@ echo $fn(" OK".PHP_EOL); ?> -===DONE=== --EXPECT-- Access public static function OK Access public static function with different case OK @@ -118,4 +117,3 @@ Access public instance method of parent object through "self::" to parent method Access proteced instance method of parent object through "self::" to parent method OK MagicCall __call instance method __call,nonExistentMethod, OK MagicCall __callStatic static method __callStatic,nonExistentMethod, OK -===DONE=== diff --git a/Zend/tests/closures/closure_from_callable_error.phpt b/Zend/tests/closures/closure_from_callable_error.phpt index c6e4a7e0bb8..5ada0ef2bf1 100644 --- a/Zend/tests/closures/closure_from_callable_error.phpt +++ b/Zend/tests/closures/closure_from_callable_error.phpt @@ -193,7 +193,6 @@ catch (\Throwable $t) { echo "OK\n"; ?> -===DONE=== --EXPECT-- Cannot access privateInstance method statically Cannot access privateInstance method statically with colon scheme @@ -211,4 +210,3 @@ Function scope cannot closure over protected instance method Function scope cannot closure over private instance method Access private instance method of parent object through "self::" to parent method OK -===DONE=== diff --git a/Zend/tests/function_exists_basic.phpt b/Zend/tests/function_exists_basic.phpt index 58322315513..5125350d8dc 100644 --- a/Zend/tests/function_exists_basic.phpt +++ b/Zend/tests/function_exists_basic.phpt @@ -28,7 +28,6 @@ Class C { } var_dump(function_exists('C::f')); ?> -===Done=== --EXPECT-- *** Testing function_exists() : basic functionality *** Internal function: bool(true) @@ -36,4 +35,3 @@ User defined function: bool(true) Case sensitivity: bool(true) Non existent function: bool(false) Method: bool(false) -===Done=== diff --git a/Zend/tests/get_defined_functions_basic.phpt b/Zend/tests/get_defined_functions_basic.phpt index f782b90892c..1ea5df7ec73 100644 --- a/Zend/tests/get_defined_functions_basic.phpt +++ b/Zend/tests/get_defined_functions_basic.phpt @@ -52,8 +52,6 @@ if (count($user) == 2 && in_array("foo", $user) && in_array("helloworld", $user) } ?> -===Done=== --EXPECT-- *** Testing get_defined_functions() : basic functionality *** TEST PASSED -===Done=== diff --git a/Zend/tests/halt_compiler2.phpt b/Zend/tests/halt_compiler2.phpt index a89274a804c..09af8b2a030 100644 --- a/Zend/tests/halt_compiler2.phpt +++ b/Zend/tests/halt_compiler2.phpt @@ -11,7 +11,6 @@ file_put_contents(__DIR__ . '/test2.php', $text); include __DIR__ . '/test1.php'; include __DIR__ . '/test2.php'; ?> -==DONE== --CLEAN-- -==DONE== --EXPECTF-- Notice: Constant __COMPILER_HALT_OFFSET__ already defined in %s on line %d -==DONE== diff --git a/Zend/tests/lsb_001.phpt b/Zend/tests/lsb_001.phpt index 075109259a2..ca2739d102b 100644 --- a/Zend/tests/lsb_001.phpt +++ b/Zend/tests/lsb_001.phpt @@ -47,7 +47,6 @@ echo ChildClass2::testStaticVar() . "\n"; echo ChildClass2::testClassConst() . "\n"; echo ChildClass2::testStaticFunction() . "\n"; ?> -==DONE== --EXPECT-- TestClassStatic TestClassConst @@ -58,4 +57,3 @@ ChildClassFunction TestClassStatic TestClassConst TestClassFunction -==DONE== diff --git a/Zend/tests/lsb_002.phpt b/Zend/tests/lsb_002.phpt index 1f433c30380..53eacc90ab5 100644 --- a/Zend/tests/lsb_002.phpt +++ b/Zend/tests/lsb_002.phpt @@ -52,7 +52,6 @@ echo $childClass2->testStaticVar() . "\n"; echo $childClass2->testClassConst() . "\n"; echo $childClass2->testStaticFunction() . "\n"; ?> -==DONE== --EXPECT-- TestClassStatic TestClassConst @@ -63,4 +62,3 @@ ChildClassFunction TestClassStatic TestClassConst TestClassFunction -==DONE== diff --git a/Zend/tests/lsb_003.phpt b/Zend/tests/lsb_003.phpt index a7a787e568f..aa10071b5f6 100644 --- a/Zend/tests/lsb_003.phpt +++ b/Zend/tests/lsb_003.phpt @@ -17,8 +17,6 @@ $childClass = ChildClass::createInstance(); echo get_class($testClass) . "\n"; echo get_class($childClass) . "\n"; ?> -==DONE== --EXPECT-- TestClass ChildClass -==DONE== diff --git a/Zend/tests/lsb_004.phpt b/Zend/tests/lsb_004.phpt index 9583ef25470..3f26e339c36 100644 --- a/Zend/tests/lsb_004.phpt +++ b/Zend/tests/lsb_004.phpt @@ -14,8 +14,6 @@ class ChildClass extends TestClass {} echo TestClass::getClassName() . "\n"; echo ChildClass::getClassName() . "\n"; ?> -==DONE== --EXPECT-- TestClass ChildClass -==DONE== diff --git a/Zend/tests/lsb_005.phpt b/Zend/tests/lsb_005.phpt index a01ccd7ca9d..b21d0495490 100644 --- a/Zend/tests/lsb_005.phpt +++ b/Zend/tests/lsb_005.phpt @@ -35,7 +35,6 @@ class TestBB extends TestB { TestA::test(); ?> -==DONE== --EXPECT-- TestA TestB @@ -48,4 +47,3 @@ TestBB TestC TestBB TestA -==DONE== diff --git a/Zend/tests/lsb_015.phpt b/Zend/tests/lsb_015.phpt index 5c40c13160a..10df17686be 100644 --- a/Zend/tests/lsb_015.phpt +++ b/Zend/tests/lsb_015.phpt @@ -67,7 +67,6 @@ A::myCatch(); echo "via B:\n"; B::myCatch(); ?> -==DONE== --EXPECT-- via A: A @@ -89,4 +88,3 @@ B B B B -==DONE== diff --git a/Zend/tests/lsb_016.phpt b/Zend/tests/lsb_016.phpt index 4c5fa3248e1..b585a9fb6cd 100644 --- a/Zend/tests/lsb_016.phpt +++ b/Zend/tests/lsb_016.phpt @@ -33,9 +33,7 @@ $o->test(); $o->a = "b"; echo $o->a; ?> -==DONE== --EXPECT-- TestChild TestChild TestChild -==DONE== diff --git a/Zend/tests/lsb_017.phpt b/Zend/tests/lsb_017.phpt index 5f5ca4351fd..7f9e77b5f35 100644 --- a/Zend/tests/lsb_017.phpt +++ b/Zend/tests/lsb_017.phpt @@ -20,10 +20,8 @@ class D extends A { echo A::test(B::test(C::test(D::test())))."\n"; ?> -==DONE== --EXPECT-- D C B A -==DONE== diff --git a/Zend/tests/lsb_018.phpt b/Zend/tests/lsb_018.phpt index c7877cddf75..9511426d489 100644 --- a/Zend/tests/lsb_018.phpt +++ b/Zend/tests/lsb_018.phpt @@ -54,7 +54,6 @@ $x->identify(); $y->identify(); $z->identify(); ?> -===DONE=== --EXPECTF-- object(Foo)#%d (1) { ["instanceId":"Singleton":private]=> @@ -92,4 +91,3 @@ object(Baz)#%d (1) { ["instanceId":"Singleton":private]=> int(2) } -===DONE=== diff --git a/Zend/tests/multibyte/bug68665.phpt b/Zend/tests/multibyte/bug68665.phpt index 68467765709..e2c5a860f5d 100644 --- a/Zend/tests/multibyte/bug68665.phpt +++ b/Zend/tests/multibyte/bug68665.phpt @@ -17,7 +17,5 @@ internal_encoding=big5 echo '\'hello'; ?> -===DONE=== --EXPECT-- 'hello -===DONE=== diff --git a/Zend/tests/multibyte/multibyte_encoding_001.phpt b/Zend/tests/multibyte/multibyte_encoding_001.phpt index 1a094814ec2..9f3a748e788 100644 --- a/Zend/tests/multibyte/multibyte_encoding_001.phpt +++ b/Zend/tests/multibyte/multibyte_encoding_001.phpt @@ -18,7 +18,5 @@ declare(encoding='Shift_JIS'); $s = "\"; // 0x95+0x5c in script, not somewhere else " printf("%x:%x\n", ord($s[0]), ord($s[1])); ?> -===DONE=== --EXPECT-- 95:5c -===DONE=== diff --git a/Zend/tests/multibyte/multibyte_encoding_002.phpt b/Zend/tests/multibyte/multibyte_encoding_002.phpt index 58ea015a6f2..c4c225c8f73 100644 --- a/Zend/tests/multibyte/multibyte_encoding_002.phpt +++ b/Zend/tests/multibyte/multibyte_encoding_002.phpt @@ -16,7 +16,5 @@ internal_encoding=iso-8859-1  -===DONE=== --EXPECT-- Hello World -===DONE=== diff --git a/Zend/tests/ns_069.phpt b/Zend/tests/ns_069.phpt index cbfb927049f..19b6fe8c2bd 100644 --- a/Zend/tests/ns_069.phpt +++ b/Zend/tests/ns_069.phpt @@ -16,9 +16,7 @@ class Test { Test::f(); ?> -===DONE=== --EXPECT-- string(3) "foo" string(0) "" string(3) "foo" -===DONE=== diff --git a/Zend/tests/objects_015.phpt b/Zend/tests/objects_015.phpt index 714d27ad5b0..e0f5e9a93d9 100644 --- a/Zend/tests/objects_015.phpt +++ b/Zend/tests/objects_015.phpt @@ -14,7 +14,6 @@ var_dump($o != null); var_dump(is_null($o)); ?> -===DONE=== --EXPECT-- bool(false) bool(true) @@ -23,4 +22,3 @@ bool(true) bool(false) bool(true) bool(false) -===DONE=== diff --git a/Zend/tests/objects_032.phpt b/Zend/tests/objects_032.phpt index 52a5e9fed92..b4312ac3f83 100644 --- a/Zend/tests/objects_032.phpt +++ b/Zend/tests/objects_032.phpt @@ -25,7 +25,6 @@ $a['foo']['bar'] = 2; var_dump($a); ?> -==DONE== --EXPECT-- object(A)#1 (1) { ["foo"]=> @@ -37,4 +36,3 @@ object(A)#1 (1) { } } } -==DONE== diff --git a/Zend/tests/runtime_compile_time_binary_operands.phpt b/Zend/tests/runtime_compile_time_binary_operands.phpt index afced7af0c8..2908bc3db19 100644 --- a/Zend/tests/runtime_compile_time_binary_operands.phpt +++ b/Zend/tests/runtime_compile_time_binary_operands.phpt @@ -148,7 +148,6 @@ if($c === 0) { echo "Failed: $f\n"; } ?> -===DONE=== --CLEAN-- --EXPECT-- Failed: 0 -===DONE=== diff --git a/Zend/tests/try/bug70228_7.phpt b/Zend/tests/try/bug70228_7.phpt index 4b8a80351cb..531708f86a0 100644 --- a/Zend/tests/try/bug70228_7.phpt +++ b/Zend/tests/try/bug70228_7.phpt @@ -21,9 +21,7 @@ function foo() { foo(); ?> -===DONE=== --EXPECT-- int(1) int(2) int(3) -===DONE=== diff --git a/Zend/tests/try/bug70228_8.phpt b/Zend/tests/try/bug70228_8.phpt index ad13113c717..93fc09f6a83 100644 --- a/Zend/tests/try/bug70228_8.phpt +++ b/Zend/tests/try/bug70228_8.phpt @@ -22,9 +22,7 @@ function foo() { foo(); ?> -===DONE=== --EXPECT-- int(1) int(2) int(3) -===DONE=== diff --git a/Zend/tests/try/catch_002.phpt b/Zend/tests/try/catch_002.phpt index 11d736abe24..11dbccf7dfa 100644 --- a/Zend/tests/try/catch_002.phpt +++ b/Zend/tests/try/catch_002.phpt @@ -27,7 +27,5 @@ catch(Exception $e) } ?> -===DONE=== --EXPECT-- Caught -===DONE=== diff --git a/Zend/tests/try/catch_003.phpt b/Zend/tests/try/catch_003.phpt index 414d50f8152..579011f867a 100644 --- a/Zend/tests/try/catch_003.phpt +++ b/Zend/tests/try/catch_003.phpt @@ -32,7 +32,5 @@ catch(Exception $e) } ?> -===DONE=== --EXPECT-- Caught -===DONE=== diff --git a/Zend/tests/try/catch_004.phpt b/Zend/tests/try/catch_004.phpt index 7c269cc3362..5ec82998f7b 100644 --- a/Zend/tests/try/catch_004.phpt +++ b/Zend/tests/try/catch_004.phpt @@ -37,7 +37,5 @@ class MyObject MyObject::test(); ?> -===DONE=== --EXPECT-- Caught -===DONE=== diff --git a/Zend/tests/try/try_finally_013.phpt b/Zend/tests/try/try_finally_013.phpt index a37df5147d8..0e82dcbb4cf 100644 --- a/Zend/tests/try/try_finally_013.phpt +++ b/Zend/tests/try/try_finally_013.phpt @@ -18,8 +18,6 @@ function foo() { foo(); ?> -===DONE=== --EXPECT-- try finally -===DONE=== diff --git a/Zend/tests/try/try_finally_014.phpt b/Zend/tests/try/try_finally_014.phpt index 284892a8b5a..a45f63f1f3d 100644 --- a/Zend/tests/try/try_finally_014.phpt +++ b/Zend/tests/try/try_finally_014.phpt @@ -20,8 +20,6 @@ function foo() { foo(); ?> -===DONE=== --EXPECT-- try finally -===DONE=== diff --git a/Zend/tests/try/try_finally_015.phpt b/Zend/tests/try/try_finally_015.phpt index d2580a2e332..f706b9c942a 100644 --- a/Zend/tests/try/try_finally_015.phpt +++ b/Zend/tests/try/try_finally_015.phpt @@ -21,9 +21,7 @@ function foo() { foo(); ?> -===DONE=== --EXPECT-- int(1) int(2) int(3) -===DONE=== diff --git a/Zend/tests/try/try_finally_016.phpt b/Zend/tests/try/try_finally_016.phpt index dc91b42b508..f78a2914af2 100644 --- a/Zend/tests/try/try_finally_016.phpt +++ b/Zend/tests/try/try_finally_016.phpt @@ -32,8 +32,6 @@ try { echo "outer catch\n"; } ?> -===DONE=== --EXPECT-- finally outer catch -===DONE=== diff --git a/Zend/tests/try/try_finally_017.phpt b/Zend/tests/try/try_finally_017.phpt index 5ba58afdeac..b23840c611a 100644 --- a/Zend/tests/try/try_finally_017.phpt +++ b/Zend/tests/try/try_finally_017.phpt @@ -34,9 +34,7 @@ function foo() { foo(); ?> -===DONE=== --EXPECT-- finally1 catch2 finally2 -===DONE=== diff --git a/Zend/tests/type_declarations/variance/class_order_autoload1.phpt b/Zend/tests/type_declarations/variance/class_order_autoload1.phpt index d68d2e8afaf..d5ecfa72007 100644 --- a/Zend/tests/type_declarations/variance/class_order_autoload1.phpt +++ b/Zend/tests/type_declarations/variance/class_order_autoload1.phpt @@ -24,7 +24,6 @@ spl_autoload_register(function($class) { var_dump(new C); ?> -===DONE=== --EXPECT-- object(A)#2 (0) { } @@ -34,4 +33,3 @@ object(C)#2 (0) { } object(C)#2 (0) { } -===DONE=== diff --git a/Zend/tests/type_declarations/variance/class_order_autoload2.phpt b/Zend/tests/type_declarations/variance/class_order_autoload2.phpt index f6229d39958..36414f5fe6b 100644 --- a/Zend/tests/type_declarations/variance/class_order_autoload2.phpt +++ b/Zend/tests/type_declarations/variance/class_order_autoload2.phpt @@ -25,7 +25,6 @@ spl_autoload_register(function($class) { var_dump(new B); ?> -===DONE=== --EXPECT-- object(A)#2 (0) { } @@ -35,4 +34,3 @@ object(B)#2 (0) { } object(B)#2 (0) { } -===DONE=== diff --git a/Zend/tests/type_declarations/variance/class_order_autoload3.phpt b/Zend/tests/type_declarations/variance/class_order_autoload3.phpt index d09f2a9c45b..0f34aa224ed 100644 --- a/Zend/tests/type_declarations/variance/class_order_autoload3.phpt +++ b/Zend/tests/type_declarations/variance/class_order_autoload3.phpt @@ -30,7 +30,6 @@ spl_autoload_register(function($class) { var_dump(new B); ?> -===DONE=== --EXPECT-- object(A)#2 (0) { } @@ -42,4 +41,3 @@ object(B)#2 (0) { } object(B)#2 (0) { } -===DONE=== diff --git a/Zend/tests/type_declarations/variance/class_order_autoload4.phpt b/Zend/tests/type_declarations/variance/class_order_autoload4.phpt index 37070b444c6..f426f8b44d8 100644 --- a/Zend/tests/type_declarations/variance/class_order_autoload4.phpt +++ b/Zend/tests/type_declarations/variance/class_order_autoload4.phpt @@ -31,7 +31,6 @@ spl_autoload_register(function($class) { var_dump(new B); ?> -===DONE=== --EXPECT-- object(A)#2 (0) { } @@ -41,4 +40,3 @@ object(B)#2 (0) { } object(B)#2 (0) { } -===DONE=== diff --git a/Zend/tests/type_declarations/variance/class_order_autoload5.phpt b/Zend/tests/type_declarations/variance/class_order_autoload5.phpt index 77e9a0a9ec5..dcb97852aa4 100644 --- a/Zend/tests/type_declarations/variance/class_order_autoload5.phpt +++ b/Zend/tests/type_declarations/variance/class_order_autoload5.phpt @@ -41,7 +41,6 @@ spl_autoload_register(function($class) { var_dump(new B); ?> -===DONE=== --EXPECT-- object(A)#2 (0) { } @@ -57,4 +56,3 @@ object(B)#2 (0) { } object(B)#2 (0) { } -===DONE=== diff --git a/ext/bcmath/tests/bcpow_error1.phpt b/ext/bcmath/tests/bcpow_error1.phpt index d3189f062aa..2dc2dbd092d 100644 --- a/ext/bcmath/tests/bcpow_error1.phpt +++ b/ext/bcmath/tests/bcpow_error1.phpt @@ -8,8 +8,6 @@ if (!extension_loaded('bcmath')) die('skip bcmath extension is not available'); -===DONE=== --EXPECTF-- Warning: bcpow(): non-zero scale in exponent in %s on line %d string(4) "1.00" -===DONE=== diff --git a/ext/bcmath/tests/bcpow_error2.phpt b/ext/bcmath/tests/bcpow_error2.phpt index 49fd0b88d3d..ca13875ed3c 100644 --- a/ext/bcmath/tests/bcpow_error2.phpt +++ b/ext/bcmath/tests/bcpow_error2.phpt @@ -8,8 +8,6 @@ if (!extension_loaded('bcmath')) die('skip bcmath extension is not available'); -===DONE=== --EXPECTF-- Warning: bcpow(): exponent too large in %s on line %d string(4) "1.00" -===DONE=== diff --git a/ext/bcmath/tests/bug.66364.phpt b/ext/bcmath/tests/bug.66364.phpt index 564f40e6daa..08777c5f590 100644 --- a/ext/bcmath/tests/bug.66364.phpt +++ b/ext/bcmath/tests/bug.66364.phpt @@ -8,7 +8,5 @@ if (!extension_loaded('bcmath')) die('skip bcmath extension not available'); -===DONE=== --EXPECT-- string(6) "0.0600" -===DONE=== diff --git a/ext/bcmath/tests/bug44995.phpt b/ext/bcmath/tests/bug44995.phpt index 6eb591f92b7..9758022225f 100644 --- a/ext/bcmath/tests/bug44995.phpt +++ b/ext/bcmath/tests/bug44995.phpt @@ -9,8 +9,6 @@ if (!extension_loaded('bcmath')) die('skip bcmath extension not available'); var_dump(bcpowmod('4', '4', '3', 1)); var_dump(bcpowmod('3234', '32345', '22345', 1)); ?> -===DONE=== --EXPECT-- string(3) "1.0" string(7) "17334.0" -===DONE=== diff --git a/ext/bcmath/tests/bug46781.phpt b/ext/bcmath/tests/bug46781.phpt index caffe838608..d9e4fe51116 100644 --- a/ext/bcmath/tests/bug46781.phpt +++ b/ext/bcmath/tests/bug46781.phpt @@ -9,8 +9,6 @@ if (!extension_loaded('bcmath')) die('skip bcmath extension is not available'); var_dump(bcadd('-0.0', '-0.0', 1)); var_dump(bccomp('-0.0', '0', 1)); ?> -===DONE=== --EXPECT-- string(3) "0.0" int(0) -===DONE=== diff --git a/ext/bcmath/tests/bug54598.phpt b/ext/bcmath/tests/bug54598.phpt index 6ccd61a2d02..5f3337fadca 100644 --- a/ext/bcmath/tests/bug54598.phpt +++ b/ext/bcmath/tests/bug54598.phpt @@ -9,8 +9,6 @@ if (!extension_loaded('bcmath')) die('skip bcmath extension is not available'); var_dump(bcpowmod(5, 0, 1)); var_dump(bcpowmod(5, 0, 1, 3)); ?> -===DONE=== --EXPECT-- string(1) "0" string(5) "0.000" -===DONE=== diff --git a/ext/bcmath/tests/bug75178.phpt b/ext/bcmath/tests/bug75178.phpt index e7661755ad6..dd811fccb99 100644 --- a/ext/bcmath/tests/bug75178.phpt +++ b/ext/bcmath/tests/bug75178.phpt @@ -9,11 +9,9 @@ if (!extension_loaded('bcmath')) die('skip bcmath extension is not available'); var_dump(bcpowmod('4.1', '4', '3', 3)); var_dump(bcpowmod('4', '4', '3.1', 3)); ?> -===DONE=== --EXPECTF-- Warning: bcpowmod(): non-zero scale in base in %s on line %d string(5) "1.000" Warning: bcpowmod(): non-zero scale in modulus in %s on line %d string(5) "1.000" -===DONE=== diff --git a/ext/bcmath/tests/scale.phpt b/ext/bcmath/tests/scale.phpt index d49e5305119..e2e65cab22d 100644 --- a/ext/bcmath/tests/scale.phpt +++ b/ext/bcmath/tests/scale.phpt @@ -15,7 +15,6 @@ echo 'bcsqrt: ', bcsqrt('4', 5), PHP_EOL, 'bcsub: ', bcsub('2', '1', 5), PHP_EOL; ?> -===DONE=== --EXPECT-- bcadd: 3.00000 bcdiv: 2.00000 @@ -24,4 +23,3 @@ bcpow: 2.00000 bcpowmod: 2.00000 bcsqrt: 2.00000 bcsub: 1.00000 -===DONE=== diff --git a/ext/bcmath/tests/scale_ini.phpt b/ext/bcmath/tests/scale_ini.phpt index 66d9d482bff..c75cf8eddad 100644 --- a/ext/bcmath/tests/scale_ini.phpt +++ b/ext/bcmath/tests/scale_ini.phpt @@ -17,7 +17,6 @@ echo 'bcsqrt: ', bcsqrt('4'), PHP_EOL, 'bcsub: ', bcsub('2', '1'), PHP_EOL; ?> -===DONE=== --EXPECT-- bcadd: 3.00000 bcdiv: 2.00000 @@ -26,4 +25,3 @@ bcpow: 2.00000 bcpowmod: 2.00000 bcsqrt: 2.00000 bcsub: 1.00000 -===DONE=== diff --git a/ext/calendar/tests/jdtojewish_hebrew.phpt b/ext/calendar/tests/jdtojewish_hebrew.phpt index ab5030202a2..f7df0358f7c 100644 --- a/ext/calendar/tests/jdtojewish_hebrew.phpt +++ b/ext/calendar/tests/jdtojewish_hebrew.phpt @@ -18,7 +18,6 @@ for ($year = 5000; $year <= 5001; $year++) { echo "\n"; } ?> -===DONE=== --EXPECT-- normal year 5000 e020faf9f8e920e4 @@ -50,4 +49,3 @@ e020faeee5e620e4e0 e020e0e120e4e0 e020e0ece5ec20e4e0 -===DONE=== diff --git a/ext/com_dotnet/tests/bug39606.phpt b/ext/com_dotnet/tests/bug39606.phpt index 314e9ce8a2c..f646c6a7c3a 100644 --- a/ext/com_dotnet/tests/bug39606.phpt +++ b/ext/com_dotnet/tests/bug39606.phpt @@ -15,8 +15,6 @@ $typelib = $root.'\activeds.tlb'; var_dump(com_load_typelib($typelib)); var_dump(com_load_typelib($typelib)); ?> -===DONE=== --EXPECT-- bool(true) bool(true) -===DONE=== diff --git a/ext/com_dotnet/tests/bug66431_0.phpt b/ext/com_dotnet/tests/bug66431_0.phpt index e022c18e12e..b9759f51c01 100644 --- a/ext/com_dotnet/tests/bug66431_0.phpt +++ b/ext/com_dotnet/tests/bug66431_0.phpt @@ -27,7 +27,6 @@ if (!$result) { } ?> -===DONE=== --CLEAN-- --EXPECT-- bool(true) -===DONE=== diff --git a/ext/com_dotnet/tests/bug66431_1.phpt b/ext/com_dotnet/tests/bug66431_1.phpt index e68e4111253..1dc208f2905 100644 --- a/ext/com_dotnet/tests/bug66431_1.phpt +++ b/ext/com_dotnet/tests/bug66431_1.phpt @@ -45,7 +45,6 @@ if (!$result) { } ?> -===DONE=== --CLEAN-- --EXPECT-- bool(true) -===DONE=== diff --git a/ext/com_dotnet/tests/bug77177.phpt b/ext/com_dotnet/tests/bug77177.phpt index 901358248c3..8fcfd5a378a 100644 --- a/ext/com_dotnet/tests/bug77177.phpt +++ b/ext/com_dotnet/tests/bug77177.phpt @@ -31,7 +31,6 @@ foreach ($strings as $string) { var_dump(unserialize($string)); } ?> -===DONE=== --EXPECTF-- Exception: Serialization of 'com' is not allowed Exception: Serialization of 'dotnet' is not allowed @@ -54,4 +53,3 @@ Warning: Erroneous data format for unserializing 'variant' in %s on line %d Notice: unserialize(): Error at offset 17 of 18 bytes in %s on line %d bool(false) -===DONE=== diff --git a/ext/com_dotnet/tests/bug77578.phpt b/ext/com_dotnet/tests/bug77578.phpt index e68494468eb..910f24909b3 100644 --- a/ext/com_dotnet/tests/bug77578.phpt +++ b/ext/com_dotnet/tests/bug77578.phpt @@ -15,9 +15,7 @@ $command = "$php $iniopt -d com.autoregister_typelib=1 -r \"new COM('WbemScripti exec($command, $output, $status); var_dump($output, $status); ?> -===DONE=== --EXPECT-- array(0) { } int(0) -===DONE=== diff --git a/ext/com_dotnet/tests/bug77621.phpt b/ext/com_dotnet/tests/bug77621.phpt index 5c24494637f..32e879dcd0a 100644 --- a/ext/com_dotnet/tests/bug77621.phpt +++ b/ext/com_dotnet/tests/bug77621.phpt @@ -12,7 +12,5 @@ define('ADSTYPE_INVALID', 0); $root = dirname(array_change_key_case($_SERVER, CASE_UPPER)['COMSPEC']); com_load_typelib("$root\activeds.tlb"); ?> -===DONE=== --EXPECTF-- Warning: com_load_typelib(): Type library constant ADSTYPE_INVALID is already defined in %s on line %d -===DONE=== diff --git a/ext/ctype/tests/ctype_alnum_basic.phpt b/ext/ctype/tests/ctype_alnum_basic.phpt index 0ff710e31e0..0931fe48936 100644 --- a/ext/ctype/tests/ctype_alnum_basic.phpt +++ b/ext/ctype/tests/ctype_alnum_basic.phpt @@ -21,9 +21,7 @@ var_dump(ctype_alnum($c2)); setlocale(LC_CTYPE, $orig); ?> -===DONE=== --EXPECT-- *** Testing ctype_alnum() : basic functionality *** bool(true) bool(false) -===DONE=== diff --git a/ext/ctype/tests/ctype_alnum_variation1.phpt b/ext/ctype/tests/ctype_alnum_variation1.phpt index 3818ec6b895..c86b9262159 100644 --- a/ext/ctype/tests/ctype_alnum_variation1.phpt +++ b/ext/ctype/tests/ctype_alnum_variation1.phpt @@ -98,7 +98,6 @@ fclose($fp); setlocale(LC_CTYPE, $orig); ?> -===DONE=== --EXPECT-- *** Testing ctype_alnum() : usage variations *** @@ -176,4 +175,3 @@ bool(false) -- Iteration 25 -- bool(false) -===DONE=== diff --git a/ext/ctype/tests/ctype_alnum_variation2.phpt b/ext/ctype/tests/ctype_alnum_variation2.phpt index 3e802dea88f..625c5a6d89a 100644 --- a/ext/ctype/tests/ctype_alnum_variation2.phpt +++ b/ext/ctype/tests/ctype_alnum_variation2.phpt @@ -26,7 +26,6 @@ for ($i = 0; $i < 256; $i++) { setlocale(LC_CTYPE, $orig); ?> -===DONE=== --EXPECT-- *** Testing ctype_alnum() : usage variations *** character code 48 is alpha numeric @@ -91,4 +90,3 @@ character code 119 is alpha numeric character code 120 is alpha numeric character code 121 is alpha numeric character code 122 is alpha numeric -===DONE=== diff --git a/ext/ctype/tests/ctype_alnum_variation3.phpt b/ext/ctype/tests/ctype_alnum_variation3.phpt index 1f21f7d3bc6..1fbf5b49f8a 100644 --- a/ext/ctype/tests/ctype_alnum_variation3.phpt +++ b/ext/ctype/tests/ctype_alnum_variation3.phpt @@ -54,7 +54,6 @@ foreach($values as $value) { setlocale(LC_CTYPE, $orig); ?> -===DONE=== --EXPECT-- *** Testing ctype_alnum() : usage variations *** @@ -126,4 +125,3 @@ bool(false) -- Iteration 23 -- bool(false) -===DONE=== diff --git a/ext/ctype/tests/ctype_alnum_variation4.phpt b/ext/ctype/tests/ctype_alnum_variation4.phpt index c4f3a3dd758..1b5bcb93ce9 100644 --- a/ext/ctype/tests/ctype_alnum_variation4.phpt +++ b/ext/ctype/tests/ctype_alnum_variation4.phpt @@ -38,7 +38,6 @@ foreach($hex_values as $c) { setlocale(LC_CTYPE, $orig); ?> -===DONE=== --EXPECT-- *** Testing ctype_alnum() : usage variations *** @@ -61,4 +60,3 @@ bool(true) bool(true) -- Iteration 4 -- bool(true) -===DONE=== diff --git a/ext/ctype/tests/ctype_alpha_basic.phpt b/ext/ctype/tests/ctype_alpha_basic.phpt index bc7283f51a8..28e1ca4e129 100644 --- a/ext/ctype/tests/ctype_alpha_basic.phpt +++ b/ext/ctype/tests/ctype_alpha_basic.phpt @@ -21,9 +21,7 @@ var_dump(ctype_alpha($c2)); setlocale(LC_CTYPE, $orig); ?> -===DONE=== --EXPECT-- *** Testing ctype_alpha() : basic functionality *** bool(true) bool(false) -===DONE=== diff --git a/ext/ctype/tests/ctype_alpha_variation1.phpt b/ext/ctype/tests/ctype_alpha_variation1.phpt index 3e00766cd64..d2124975133 100644 --- a/ext/ctype/tests/ctype_alpha_variation1.phpt +++ b/ext/ctype/tests/ctype_alpha_variation1.phpt @@ -98,7 +98,6 @@ fclose($fp); setlocale(LC_CTYPE, $orig); ?> -===DONE=== --EXPECT-- *** Testing ctype_alpha() : usage variations *** @@ -176,4 +175,3 @@ bool(false) -- Iteration 25 -- bool(false) -===DONE=== diff --git a/ext/ctype/tests/ctype_alpha_variation2.phpt b/ext/ctype/tests/ctype_alpha_variation2.phpt index 170e3f0c744..d9c1fa361a4 100644 --- a/ext/ctype/tests/ctype_alpha_variation2.phpt +++ b/ext/ctype/tests/ctype_alpha_variation2.phpt @@ -26,7 +26,6 @@ for ($i = 0; $i < 256; $i++) { setlocale(LC_CTYPE, $orig); ?> -===DONE=== --EXPECT-- *** Testing ctype_alpha() : usage variations *** character code 65 is alphabetic @@ -81,4 +80,3 @@ character code 119 is alphabetic character code 120 is alphabetic character code 121 is alphabetic character code 122 is alphabetic -===DONE=== diff --git a/ext/ctype/tests/ctype_alpha_variation3.phpt b/ext/ctype/tests/ctype_alpha_variation3.phpt index 388ffe8d112..4eebef4e194 100644 --- a/ext/ctype/tests/ctype_alpha_variation3.phpt +++ b/ext/ctype/tests/ctype_alpha_variation3.phpt @@ -55,7 +55,6 @@ foreach($values as $value) { setlocale(LC_CTYPE, $orig); ?> -===DONE=== --EXPECT-- *** Testing ctype_alpha() : usage variations *** @@ -127,4 +126,3 @@ bool(false) -- Iteration 23 -- bool(false) -===DONE=== diff --git a/ext/ctype/tests/ctype_alpha_variation4.phpt b/ext/ctype/tests/ctype_alpha_variation4.phpt index 480bab79f06..fc3cecd21be 100644 --- a/ext/ctype/tests/ctype_alpha_variation4.phpt +++ b/ext/ctype/tests/ctype_alpha_variation4.phpt @@ -38,7 +38,6 @@ foreach($hex_values as $c) { setlocale(LC_CTYPE, $orig); ?> -===DONE=== --EXPECT-- *** Testing ctype_alpha() : usage variations *** @@ -61,4 +60,3 @@ bool(true) bool(true) -- Iteration 4 -- bool(true) -===DONE=== diff --git a/ext/ctype/tests/ctype_cntrl_basic.phpt b/ext/ctype/tests/ctype_cntrl_basic.phpt index 1c1707eab2a..bb6cd1c2df0 100644 --- a/ext/ctype/tests/ctype_cntrl_basic.phpt +++ b/ext/ctype/tests/ctype_cntrl_basic.phpt @@ -21,9 +21,7 @@ var_dump(ctype_cntrl($c2)); setlocale(LC_CTYPE, $orig); ?> -===DONE=== --EXPECT-- *** Testing ctype_cntrl() : basic functionality *** bool(true) bool(false) -===DONE=== diff --git a/ext/ctype/tests/ctype_cntrl_variation1.phpt b/ext/ctype/tests/ctype_cntrl_variation1.phpt index 72a1f5f7830..9408d720f99 100644 --- a/ext/ctype/tests/ctype_cntrl_variation1.phpt +++ b/ext/ctype/tests/ctype_cntrl_variation1.phpt @@ -99,7 +99,6 @@ fclose($fp); setlocale(LC_CTYPE, $orig); ?> -===DONE=== --EXPECT-- *** Testing ctype_cntrl() : usage variations *** @@ -177,4 +176,3 @@ bool(false) -- Iteration 25 -- bool(false) -===DONE=== diff --git a/ext/ctype/tests/ctype_cntrl_variation2.phpt b/ext/ctype/tests/ctype_cntrl_variation2.phpt index 5a5ada8e363..2a5caecca90 100644 --- a/ext/ctype/tests/ctype_cntrl_variation2.phpt +++ b/ext/ctype/tests/ctype_cntrl_variation2.phpt @@ -26,7 +26,6 @@ for ($i = 0; $i < 256; $i++) { setlocale(LC_CTYPE, $orig); ?> -===DONE=== --EXPECT-- *** Testing ctype_cntrl() : usage variations *** character code 0 is control character @@ -62,4 +61,3 @@ character code 29 is control character character code 30 is control character character code 31 is control character character code 127 is control character -===DONE=== diff --git a/ext/ctype/tests/ctype_cntrl_variation3.phpt b/ext/ctype/tests/ctype_cntrl_variation3.phpt index 31e2ee2ea19..9d21f89da14 100644 --- a/ext/ctype/tests/ctype_cntrl_variation3.phpt +++ b/ext/ctype/tests/ctype_cntrl_variation3.phpt @@ -62,7 +62,6 @@ foreach($values as $value) { setlocale(LC_CTYPE, $orig); ?> -===DONE=== --EXPECT-- *** Testing ctype_cntrl() : usage variations *** @@ -155,4 +154,3 @@ bool(false) -- Iteration 30 -- bool(true) -===DONE=== diff --git a/ext/ctype/tests/ctype_cntrl_variation4.phpt b/ext/ctype/tests/ctype_cntrl_variation4.phpt index dfad6ba2d85..0ec3e8f4f68 100644 --- a/ext/ctype/tests/ctype_cntrl_variation4.phpt +++ b/ext/ctype/tests/ctype_cntrl_variation4.phpt @@ -37,7 +37,6 @@ foreach($hex_values as $c) { } setlocale(LC_CTYPE, $orig); ?> -===DONE=== --EXPECT-- *** Testing ctype_cntrl() : usage variations *** @@ -60,4 +59,3 @@ bool(true) bool(true) -- Iteration 4 -- bool(true) -===DONE=== diff --git a/ext/ctype/tests/ctype_digit_basic.phpt b/ext/ctype/tests/ctype_digit_basic.phpt index faf75251db2..3f60ad6f40e 100644 --- a/ext/ctype/tests/ctype_digit_basic.phpt +++ b/ext/ctype/tests/ctype_digit_basic.phpt @@ -21,9 +21,7 @@ var_dump(ctype_digit($c2)); setlocale(LC_CTYPE, $orig); ?> -===DONE=== --EXPECT-- *** Testing ctype_digit() : basic functionality *** bool(true) bool(false) -===DONE=== diff --git a/ext/ctype/tests/ctype_digit_variation1.phpt b/ext/ctype/tests/ctype_digit_variation1.phpt index 72335951398..8cb85ab5602 100644 --- a/ext/ctype/tests/ctype_digit_variation1.phpt +++ b/ext/ctype/tests/ctype_digit_variation1.phpt @@ -98,7 +98,6 @@ fclose($fp); setlocale(LC_CTYPE, $orig); ?> -===DONE=== --EXPECT-- *** Testing ctype_digit() : usage variations *** @@ -176,4 +175,3 @@ bool(false) -- Iteration 25 -- bool(false) -===DONE=== diff --git a/ext/ctype/tests/ctype_digit_variation2.phpt b/ext/ctype/tests/ctype_digit_variation2.phpt index f4e3514aaf9..cebdcd062fb 100644 --- a/ext/ctype/tests/ctype_digit_variation2.phpt +++ b/ext/ctype/tests/ctype_digit_variation2.phpt @@ -26,7 +26,6 @@ for ($i = 0; $i < 256; $i++) { setlocale(LC_CTYPE, $orig); ?> -===DONE=== --EXPECT-- *** Testing ctype_digit() : usage variations *** character code 48 is a numeric digit @@ -39,4 +38,3 @@ character code 54 is a numeric digit character code 55 is a numeric digit character code 56 is a numeric digit character code 57 is a numeric digit -===DONE=== diff --git a/ext/ctype/tests/ctype_digit_variation3.phpt b/ext/ctype/tests/ctype_digit_variation3.phpt index 5c428f6b304..a042984a994 100644 --- a/ext/ctype/tests/ctype_digit_variation3.phpt +++ b/ext/ctype/tests/ctype_digit_variation3.phpt @@ -61,7 +61,6 @@ foreach($values as $value) { setlocale(LC_CTYPE, $orig); ?> -===DONE=== --EXPECT-- *** Testing ctype_digit() : usage variations *** @@ -157,4 +156,3 @@ bool(false) -- Iteration 31 -- bool(false) -===DONE=== diff --git a/ext/ctype/tests/ctype_digit_variation4.phpt b/ext/ctype/tests/ctype_digit_variation4.phpt index 19e8a0cf4ca..ca89d1641f1 100644 --- a/ext/ctype/tests/ctype_digit_variation4.phpt +++ b/ext/ctype/tests/ctype_digit_variation4.phpt @@ -38,7 +38,6 @@ foreach($hex_values as $c) { setlocale(LC_CTYPE, $orig); ?> -===DONE=== --EXPECT-- *** Testing ctype_digit() : usage variations *** @@ -61,4 +60,3 @@ bool(true) bool(true) -- Iteration 4 -- bool(true) -===DONE=== diff --git a/ext/ctype/tests/ctype_graph_basic.phpt b/ext/ctype/tests/ctype_graph_basic.phpt index d920728ac10..6acf2106722 100644 --- a/ext/ctype/tests/ctype_graph_basic.phpt +++ b/ext/ctype/tests/ctype_graph_basic.phpt @@ -21,9 +21,7 @@ var_dump(ctype_graph($c2)); setlocale(LC_CTYPE, $orig); ?> -===DONE=== --EXPECT-- *** Testing ctype_graph() : basic functionality *** bool(true) bool(false) -===DONE=== diff --git a/ext/ctype/tests/ctype_graph_variation1.phpt b/ext/ctype/tests/ctype_graph_variation1.phpt index 3105922fdc5..097c247a228 100644 --- a/ext/ctype/tests/ctype_graph_variation1.phpt +++ b/ext/ctype/tests/ctype_graph_variation1.phpt @@ -98,7 +98,6 @@ fclose($fp); setlocale(LC_CTYPE, $orig); ?> -===DONE=== --EXPECT-- *** Testing ctype_graph() : usage variations *** @@ -176,4 +175,3 @@ bool(false) -- Iteration 25 -- bool(false) -===DONE=== diff --git a/ext/ctype/tests/ctype_graph_variation2.phpt b/ext/ctype/tests/ctype_graph_variation2.phpt index cd8812d5d5c..731e3ad9ac7 100644 --- a/ext/ctype/tests/ctype_graph_variation2.phpt +++ b/ext/ctype/tests/ctype_graph_variation2.phpt @@ -26,7 +26,6 @@ for ($i = 0; $i < 256; $i++) { setlocale(LC_CTYPE, $orig); ?> -===DONE=== --EXPECT-- *** Testing ctype_graph() : usage variations *** character code 33 is a printable character @@ -123,4 +122,3 @@ character code 123 is a printable character character code 124 is a printable character character code 125 is a printable character character code 126 is a printable character -===DONE=== diff --git a/ext/ctype/tests/ctype_graph_variation3.phpt b/ext/ctype/tests/ctype_graph_variation3.phpt index d28cdec8e15..e6dac7c7752 100644 --- a/ext/ctype/tests/ctype_graph_variation3.phpt +++ b/ext/ctype/tests/ctype_graph_variation3.phpt @@ -58,7 +58,6 @@ foreach($values as $value) { setlocale(LC_CTYPE, $orig); ?> -===DONE=== --EXPECT-- *** Testing ctype_graph() : usage variations *** @@ -145,4 +144,3 @@ bool(false) -- Iteration 28 -- bool(false) -===DONE=== diff --git a/ext/ctype/tests/ctype_graph_variation4.phpt b/ext/ctype/tests/ctype_graph_variation4.phpt index 389f7a47ff5..a60ee0c70d5 100644 --- a/ext/ctype/tests/ctype_graph_variation4.phpt +++ b/ext/ctype/tests/ctype_graph_variation4.phpt @@ -38,7 +38,6 @@ foreach($hex_values as $c) { setlocale(LC_CTYPE, $orig); ?> -===DONE=== --EXPECT-- *** Testing ctype_graph() : usage variations *** @@ -61,4 +60,3 @@ bool(true) bool(true) -- Iteration 4 -- bool(true) -===DONE=== diff --git a/ext/ctype/tests/ctype_lower_basic.phpt b/ext/ctype/tests/ctype_lower_basic.phpt index c9fdf3cc94b..0009460df0f 100644 --- a/ext/ctype/tests/ctype_lower_basic.phpt +++ b/ext/ctype/tests/ctype_lower_basic.phpt @@ -21,9 +21,7 @@ var_dump(ctype_lower($c2)); setlocale(LC_CTYPE, $orig); ?> -===DONE=== --EXPECT-- *** Testing ctype_lower() : basic functionality *** bool(true) bool(false) -===DONE=== diff --git a/ext/ctype/tests/ctype_lower_variation1.phpt b/ext/ctype/tests/ctype_lower_variation1.phpt index e47fb9e1a25..919995dfe4c 100644 --- a/ext/ctype/tests/ctype_lower_variation1.phpt +++ b/ext/ctype/tests/ctype_lower_variation1.phpt @@ -98,7 +98,6 @@ fclose($fp); setlocale(LC_CTYPE, $orig); ?> -===DONE=== --EXPECT-- *** Testing ctype_lower() : usage variations *** @@ -176,4 +175,3 @@ bool(false) -- Iteration 25 -- bool(false) -===DONE=== diff --git a/ext/ctype/tests/ctype_lower_variation2.phpt b/ext/ctype/tests/ctype_lower_variation2.phpt index 12793d180f9..b225eafaff1 100644 --- a/ext/ctype/tests/ctype_lower_variation2.phpt +++ b/ext/ctype/tests/ctype_lower_variation2.phpt @@ -26,7 +26,6 @@ for ($i = 0; $i < 256; $i++) { setlocale(LC_CTYPE, $orig); ?> -===DONE=== --EXPECT-- *** Testing ctype_lower() : usage variations *** character code 97 is a lower case character @@ -55,4 +54,3 @@ character code 119 is a lower case character character code 120 is a lower case character character code 121 is a lower case character character code 122 is a lower case character -===DONE=== diff --git a/ext/ctype/tests/ctype_lower_variation3.phpt b/ext/ctype/tests/ctype_lower_variation3.phpt index 7ba92e47dd3..cdaa61da3e0 100644 --- a/ext/ctype/tests/ctype_lower_variation3.phpt +++ b/ext/ctype/tests/ctype_lower_variation3.phpt @@ -56,7 +56,6 @@ foreach($values as $value) { setlocale(LC_CTYPE, $orig); ?> -===DONE=== --EXPECT-- *** Testing ctype_lower() : usage variations *** @@ -137,4 +136,3 @@ bool(false) -- Iteration 26 -- bool(false) -===DONE=== diff --git a/ext/ctype/tests/ctype_lower_variation4.phpt b/ext/ctype/tests/ctype_lower_variation4.phpt index 835fc011ff5..8571ff033c0 100644 --- a/ext/ctype/tests/ctype_lower_variation4.phpt +++ b/ext/ctype/tests/ctype_lower_variation4.phpt @@ -38,7 +38,6 @@ foreach($hex_values as $c) { setlocale(LC_CTYPE, $orig); ?> -===DONE=== --EXPECT-- *** Testing ctype_lower() : usage variations *** @@ -61,4 +60,3 @@ bool(true) bool(true) -- Iteration 4 -- bool(true) -===DONE=== diff --git a/ext/ctype/tests/ctype_print_basic.phpt b/ext/ctype/tests/ctype_print_basic.phpt index 33a70fe7356..15228391e11 100644 --- a/ext/ctype/tests/ctype_print_basic.phpt +++ b/ext/ctype/tests/ctype_print_basic.phpt @@ -21,9 +21,7 @@ var_dump(ctype_print($c2)); setlocale(LC_CTYPE, $orig); ?> -===DONE=== --EXPECT-- *** Testing ctype_print() : basic functionality *** bool(true) bool(false) -===DONE=== diff --git a/ext/ctype/tests/ctype_print_variation1.phpt b/ext/ctype/tests/ctype_print_variation1.phpt index 7599b259da3..2ce20bea877 100644 --- a/ext/ctype/tests/ctype_print_variation1.phpt +++ b/ext/ctype/tests/ctype_print_variation1.phpt @@ -98,7 +98,6 @@ fclose($fp); setlocale(LC_CTYPE, $orig); ?> -===DONE=== --EXPECT-- *** Testing ctype_print() : usage variations *** @@ -176,4 +175,3 @@ bool(false) -- Iteration 25 -- bool(false) -===DONE=== diff --git a/ext/ctype/tests/ctype_print_variation2.phpt b/ext/ctype/tests/ctype_print_variation2.phpt index 1573bed988f..8f2eb47b211 100644 --- a/ext/ctype/tests/ctype_print_variation2.phpt +++ b/ext/ctype/tests/ctype_print_variation2.phpt @@ -26,7 +26,6 @@ for ($i = 0; $i < 256; $i++) { setlocale(LC_CTYPE, $orig); ?> -===DONE=== --EXPECT-- *** Testing ctype_print() : usage variations *** character code 32 is a printable character @@ -124,4 +123,3 @@ character code 123 is a printable character character code 124 is a printable character character code 125 is a printable character character code 126 is a printable character -===DONE=== diff --git a/ext/ctype/tests/ctype_print_variation3.phpt b/ext/ctype/tests/ctype_print_variation3.phpt index b669150adac..7b110327327 100644 --- a/ext/ctype/tests/ctype_print_variation3.phpt +++ b/ext/ctype/tests/ctype_print_variation3.phpt @@ -53,7 +53,6 @@ foreach($values as $value) { setlocale(LC_CTYPE, $orig); ?> -===DONE=== --EXPECT-- *** Testing ctype_print() : usage variations *** @@ -125,4 +124,3 @@ bool(true) -- Iteration 23 -- bool(false) -===DONE=== diff --git a/ext/ctype/tests/ctype_print_variation4.phpt b/ext/ctype/tests/ctype_print_variation4.phpt index 7d1ed99284c..9a0ae903233 100644 --- a/ext/ctype/tests/ctype_print_variation4.phpt +++ b/ext/ctype/tests/ctype_print_variation4.phpt @@ -37,7 +37,6 @@ foreach($hex_values as $c) { } setlocale(LC_CTYPE, $orig); ?> -===DONE=== --EXPECT-- *** Testing ctype_print() : usage variations *** @@ -60,4 +59,3 @@ bool(true) bool(true) -- Iteration 4 -- bool(true) -===DONE=== diff --git a/ext/ctype/tests/ctype_punct_basic.phpt b/ext/ctype/tests/ctype_punct_basic.phpt index 76a0278c052..93fff217837 100644 --- a/ext/ctype/tests/ctype_punct_basic.phpt +++ b/ext/ctype/tests/ctype_punct_basic.phpt @@ -22,9 +22,7 @@ var_dump(ctype_punct($c2)); setlocale(LC_CTYPE, $orig); ?> -===DONE=== --EXPECT-- *** Testing ctype_punct() : basic functionality *** bool(true) bool(false) -===DONE=== diff --git a/ext/ctype/tests/ctype_punct_variation1.phpt b/ext/ctype/tests/ctype_punct_variation1.phpt index 740f1dae801..67abc10f642 100644 --- a/ext/ctype/tests/ctype_punct_variation1.phpt +++ b/ext/ctype/tests/ctype_punct_variation1.phpt @@ -99,7 +99,6 @@ fclose($fp); setlocale(LC_CTYPE, $orig); ?> -===DONE=== --EXPECT-- *** Testing ctype_punct() : usage variations *** @@ -177,4 +176,3 @@ bool(false) -- Iteration 25 -- bool(false) -===DONE=== diff --git a/ext/ctype/tests/ctype_punct_variation2.phpt b/ext/ctype/tests/ctype_punct_variation2.phpt index 50f4f2c6f04..ce7270c6bd7 100644 --- a/ext/ctype/tests/ctype_punct_variation2.phpt +++ b/ext/ctype/tests/ctype_punct_variation2.phpt @@ -27,7 +27,6 @@ for ($c = 1; $c < 256; $c++) { setlocale(LC_CTYPE, $orig); ?> -===DONE=== --EXPECT-- *** Testing ctype_punct() : usage variations *** character code 33 is punctuation @@ -62,4 +61,3 @@ character code 123 is punctuation character code 124 is punctuation character code 125 is punctuation character code 126 is punctuation -===DONE=== diff --git a/ext/ctype/tests/ctype_punct_variation3.phpt b/ext/ctype/tests/ctype_punct_variation3.phpt index 14bf8affad5..3d6989d173e 100644 --- a/ext/ctype/tests/ctype_punct_variation3.phpt +++ b/ext/ctype/tests/ctype_punct_variation3.phpt @@ -56,7 +56,6 @@ foreach($values as $value) { }; setlocale(LC_CTYPE, $orig); ?> -===DONE=== --EXPECT-- *** Testing ctype_punct() : usage variations *** @@ -137,4 +136,3 @@ bool(true) -- Iteration 26 -- bool(false) -===DONE=== diff --git a/ext/ctype/tests/ctype_punct_variation4.phpt b/ext/ctype/tests/ctype_punct_variation4.phpt index 744d40e7851..c99f82c8495 100644 --- a/ext/ctype/tests/ctype_punct_variation4.phpt +++ b/ext/ctype/tests/ctype_punct_variation4.phpt @@ -39,7 +39,6 @@ foreach($hex_values as $c) { setlocale(LC_CTYPE, $orig); ?> -===DONE=== --EXPECT-- *** Testing ctype_punct() : usage variations *** @@ -62,4 +61,3 @@ bool(true) bool(true) -- Iteration 4 -- bool(true) -===DONE=== diff --git a/ext/ctype/tests/ctype_space_basic.phpt b/ext/ctype/tests/ctype_space_basic.phpt index b66648e7a31..ab0255a5ffe 100644 --- a/ext/ctype/tests/ctype_space_basic.phpt +++ b/ext/ctype/tests/ctype_space_basic.phpt @@ -21,9 +21,7 @@ var_dump(ctype_space($c2)); setlocale(LC_CTYPE, $orig); ?> -===DONE=== --EXPECT-- *** Testing ctype_space() : basic functionality *** bool(true) bool(false) -===DONE=== diff --git a/ext/ctype/tests/ctype_space_variation1.phpt b/ext/ctype/tests/ctype_space_variation1.phpt index 5334b6c63a1..73da03ad3d5 100644 --- a/ext/ctype/tests/ctype_space_variation1.phpt +++ b/ext/ctype/tests/ctype_space_variation1.phpt @@ -98,7 +98,6 @@ fclose($fp); setlocale(LC_CTYPE, $orig); ?> -===DONE=== --EXPECT-- *** Testing ctype_space() : usage variations *** @@ -176,4 +175,3 @@ bool(false) -- Iteration 25 -- bool(false) -===DONE=== diff --git a/ext/ctype/tests/ctype_space_variation2.phpt b/ext/ctype/tests/ctype_space_variation2.phpt index ba706333e86..901a5756117 100644 --- a/ext/ctype/tests/ctype_space_variation2.phpt +++ b/ext/ctype/tests/ctype_space_variation2.phpt @@ -25,7 +25,6 @@ for ($c = 1; $c < 256; $c++) { } setlocale(LC_CTYPE, $orig); ?> -===DONE=== --EXPECT-- *** Testing ctype_space() : usage variations *** character code 9 is a space character @@ -34,4 +33,3 @@ character code 11 is a space character character code 12 is a space character character code 13 is a space character character code 32 is a space character -===DONE=== diff --git a/ext/ctype/tests/ctype_space_variation3.phpt b/ext/ctype/tests/ctype_space_variation3.phpt index 78ad296d276..dce5ff6a98b 100644 --- a/ext/ctype/tests/ctype_space_variation3.phpt +++ b/ext/ctype/tests/ctype_space_variation3.phpt @@ -56,7 +56,6 @@ foreach($values as $value) { setlocale(LC_CTYPE, $orig); ?> -===DONE=== --EXPECT-- *** Testing ctype_space() : usage variations *** @@ -137,4 +136,3 @@ bool(true) -- Iteration 26 -- bool(true) -===DONE=== diff --git a/ext/ctype/tests/ctype_space_variation4.phpt b/ext/ctype/tests/ctype_space_variation4.phpt index 24a662b4cb4..1024bf62338 100644 --- a/ext/ctype/tests/ctype_space_variation4.phpt +++ b/ext/ctype/tests/ctype_space_variation4.phpt @@ -37,7 +37,6 @@ foreach($hex_values as $c) { } setlocale(LC_CTYPE, $orig); ?> -===DONE=== --EXPECT-- *** Testing ctype_space() : usage variations *** @@ -68,4 +67,3 @@ bool(true) bool(true) -- Iteration 6 -- bool(true) -===DONE=== diff --git a/ext/ctype/tests/ctype_upper_basic.phpt b/ext/ctype/tests/ctype_upper_basic.phpt index a528123f94b..3e0ce36eb84 100644 --- a/ext/ctype/tests/ctype_upper_basic.phpt +++ b/ext/ctype/tests/ctype_upper_basic.phpt @@ -21,9 +21,7 @@ var_dump(ctype_upper($c2)); setlocale(LC_CTYPE, $orig); ?> -===DONE=== --EXPECT-- *** Testing ctype_upper() : basic functionality *** bool(true) bool(false) -===DONE=== diff --git a/ext/ctype/tests/ctype_upper_variation1.phpt b/ext/ctype/tests/ctype_upper_variation1.phpt index ac0fb29ad80..d8ea5e25137 100644 --- a/ext/ctype/tests/ctype_upper_variation1.phpt +++ b/ext/ctype/tests/ctype_upper_variation1.phpt @@ -98,7 +98,6 @@ fclose($fp); setlocale(LC_CTYPE, $orig); ?> -===DONE=== --EXPECT-- *** Testing ctype_upper() : usage variations *** @@ -176,4 +175,3 @@ bool(false) -- Iteration 25 -- bool(false) -===DONE=== diff --git a/ext/ctype/tests/ctype_upper_variation2.phpt b/ext/ctype/tests/ctype_upper_variation2.phpt index 5026f7f1a58..ad581ce1a64 100644 --- a/ext/ctype/tests/ctype_upper_variation2.phpt +++ b/ext/ctype/tests/ctype_upper_variation2.phpt @@ -25,7 +25,6 @@ for ($i = 0; $i < 256; $i++) { setlocale(LC_CTYPE, $orig); ?> -===DONE=== --EXPECT-- *** Testing ctype_upper() : usage variations *** character code 65 is a uppercase character @@ -54,4 +53,3 @@ character code 87 is a uppercase character character code 88 is a uppercase character character code 89 is a uppercase character character code 90 is a uppercase character -===DONE=== diff --git a/ext/ctype/tests/ctype_upper_variation3.phpt b/ext/ctype/tests/ctype_upper_variation3.phpt index 23dfe343693..610c92308bb 100644 --- a/ext/ctype/tests/ctype_upper_variation3.phpt +++ b/ext/ctype/tests/ctype_upper_variation3.phpt @@ -55,7 +55,6 @@ foreach($values as $value) { setlocale(LC_CTYPE, $orig); ?> -===DONE=== --EXPECT-- *** Testing ctype_upper() : usage variations *** @@ -136,4 +135,3 @@ bool(false) -- Iteration 26 -- bool(false) -===DONE=== diff --git a/ext/ctype/tests/ctype_upper_variation4.phpt b/ext/ctype/tests/ctype_upper_variation4.phpt index ed001744e1a..6ac42b8674f 100644 --- a/ext/ctype/tests/ctype_upper_variation4.phpt +++ b/ext/ctype/tests/ctype_upper_variation4.phpt @@ -37,7 +37,6 @@ foreach($hex_values as $c) { setlocale(LC_CTYPE, $orig); ?> -===DONE=== --EXPECT-- *** Testing ctype_upper() : usage variations *** @@ -60,4 +59,3 @@ bool(true) bool(true) -- Iteration 4 -- bool(true) -===DONE=== diff --git a/ext/ctype/tests/ctype_xdigit_basic.phpt b/ext/ctype/tests/ctype_xdigit_basic.phpt index 7fa2995b2dd..d47e9290f81 100644 --- a/ext/ctype/tests/ctype_xdigit_basic.phpt +++ b/ext/ctype/tests/ctype_xdigit_basic.phpt @@ -20,9 +20,7 @@ var_dump(ctype_xdigit($c2)); setlocale(LC_CTYPE, $orig); ?> -===DONE=== --EXPECT-- *** Testing ctype_xdigit() : basic functionality *** bool(true) bool(false) -===DONE=== diff --git a/ext/ctype/tests/ctype_xdigit_variation1.phpt b/ext/ctype/tests/ctype_xdigit_variation1.phpt index ddbbd1680a4..aa7281a0e53 100644 --- a/ext/ctype/tests/ctype_xdigit_variation1.phpt +++ b/ext/ctype/tests/ctype_xdigit_variation1.phpt @@ -98,7 +98,6 @@ fclose($fp); setlocale(LC_CTYPE, $orig); ?> -===DONE=== --EXPECT-- *** Testing ctype_xdigit() : usage variations *** @@ -176,4 +175,3 @@ bool(false) -- Iteration 25 -- bool(false) -===DONE=== diff --git a/ext/ctype/tests/ctype_xdigit_variation2.phpt b/ext/ctype/tests/ctype_xdigit_variation2.phpt index 4927e6215a2..7546329d9ba 100644 --- a/ext/ctype/tests/ctype_xdigit_variation2.phpt +++ b/ext/ctype/tests/ctype_xdigit_variation2.phpt @@ -26,7 +26,6 @@ for($c = 1; $c < 256; $c++) { setlocale(LC_CTYPE, $orig); ?> -===DONE=== --EXPECT-- *** Testing ctype_xdigit() : usage variations *** character code 48 is a hexadecimal 'digit' @@ -51,4 +50,3 @@ character code 99 is a hexadecimal 'digit' character code 100 is a hexadecimal 'digit' character code 101 is a hexadecimal 'digit' character code 102 is a hexadecimal 'digit' -===DONE=== diff --git a/ext/ctype/tests/ctype_xdigit_variation3.phpt b/ext/ctype/tests/ctype_xdigit_variation3.phpt index 79f7776b997..bc8ca44d2a7 100644 --- a/ext/ctype/tests/ctype_xdigit_variation3.phpt +++ b/ext/ctype/tests/ctype_xdigit_variation3.phpt @@ -56,7 +56,6 @@ foreach($values as $value) { setlocale(LC_CTYPE, $orig); ?> -===DONE=== --EXPECT-- *** Testing ctype_xdigit() : usage variations *** @@ -137,4 +136,3 @@ bool(false) -- Iteration 26 -- bool(false) -===DONE=== diff --git a/ext/ctype/tests/ctype_xdigit_variation4.phpt b/ext/ctype/tests/ctype_xdigit_variation4.phpt index fe97c3f3c25..e9f99e1f9a9 100644 --- a/ext/ctype/tests/ctype_xdigit_variation4.phpt +++ b/ext/ctype/tests/ctype_xdigit_variation4.phpt @@ -53,7 +53,6 @@ foreach($hex_values2 as $c) { } setlocale(LC_CTYPE, $orig); ?> -===DONE=== --EXPECT-- *** Testing ctype_xdigit() : usage variations *** @@ -80,4 +79,3 @@ bool(true) bool(true) bool(true) bool(true) -===DONE=== diff --git a/ext/curl/tests/bug54798-unix.phpt b/ext/curl/tests/bug54798-unix.phpt index dc5aad7525f..774c1be5e00 100644 --- a/ext/curl/tests/bug54798-unix.phpt +++ b/ext/curl/tests/bug54798-unix.phpt @@ -52,7 +52,6 @@ foreach($options_to_check as $option) { } ?> -===DONE=== --CLEAN-- --EXPECTF-- @@ -61,4 +60,3 @@ foreach($options_to_check as $option) { %aOk for CURLOPT_WRITEHEADER %aOk for CURLOPT_FILE %aOk for CURLOPT_INFILE -===DONE=== diff --git a/ext/curl/tests/bug54798.phpt b/ext/curl/tests/bug54798.phpt index d76674318aa..4a9b25cbdc7 100644 --- a/ext/curl/tests/bug54798.phpt +++ b/ext/curl/tests/bug54798.phpt @@ -49,7 +49,6 @@ foreach($options_to_check as $option) { } ?> -===DONE=== --CLEAN-- --EXPECTF-- @@ -61,4 +60,3 @@ foreach($options_to_check as $option) { Hello World!Ok for CURLOPT_FILE %AOk for CURLOPT_INFILE -===DONE=== diff --git a/ext/curl/tests/bug55767.phpt b/ext/curl/tests/bug55767.phpt index 2231c94bd4c..9a42b8f3e7e 100644 --- a/ext/curl/tests/bug55767.phpt +++ b/ext/curl/tests/bug55767.phpt @@ -32,7 +32,6 @@ include 'skipif.inc'; var_dump( $curl_content ); ?> -===DONE=== --EXPECT-- *** Testing curl sending through GET an POST *** string(203) "array(2) { @@ -50,4 +49,3 @@ array(3) { string(8) "John Doe" } " -===DONE=== diff --git a/ext/curl/tests/bug64267.phpt b/ext/curl/tests/bug64267.phpt index 302a853c257..c3b04b33263 100644 --- a/ext/curl/tests/bug64267.phpt +++ b/ext/curl/tests/bug64267.phpt @@ -29,10 +29,8 @@ var_dump(curl_setopt_array($c, [ curl_exec($c); var_dump(curl_getinfo($c, CURLINFO_RESPONSE_CODE)); ?> -===DONE=== --EXPECTF-- TEST bool(true) bool(true) int(30%d) -===DONE=== diff --git a/ext/curl/tests/bug69316.phpt b/ext/curl/tests/bug69316.phpt index 38ff8bb9b6f..d81175c2be5 100644 --- a/ext/curl/tests/bug69316.phpt +++ b/ext/curl/tests/bug69316.phpt @@ -29,7 +29,6 @@ Bug #69316: Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEA curl_exec($ch); curl_close($ch); ?> -===DONE=== --CLEAN-- -===DONE=== --EXPECTF-- bool(true) string(%d) "АБВ.txt|application/octet-stream" -===DONE=== --CLEAN-- echo "curl_exec returned false"; } ?> -===DONE=== --EXPECT-- *** Testing curl_exec() : basic functionality *** string(25) "Hello World! Hello World!" -===DONE=== diff --git a/ext/curl/tests/curl_basic_002.phpt b/ext/curl/tests/curl_basic_002.phpt index c067406caf1..0e71c368840 100644 --- a/ext/curl/tests/curl_basic_002.phpt +++ b/ext/curl/tests/curl_basic_002.phpt @@ -31,9 +31,7 @@ TestFest 2009 - AFUP - Jean-Marc Fontaine var_dump( $curl_content ); ?> -===DONE=== --EXPECT-- *** Testing curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); *** string(25) "Hello World! Hello World!" -===DONE=== diff --git a/ext/curl/tests/curl_basic_003.phpt b/ext/curl/tests/curl_basic_003.phpt index 57ac6063b9b..d8937302ee0 100644 --- a/ext/curl/tests/curl_basic_003.phpt +++ b/ext/curl/tests/curl_basic_003.phpt @@ -33,7 +33,6 @@ TestFest 2009 - AFUP - Jean-Marc Fontaine var_dump( $curl_content ); ?> -===DONE=== --EXPECT-- *** Testing curl sending through GET an POST *** string(208) "array(2) { @@ -51,4 +50,3 @@ array(3) { string(8) "John Doe" } " -===DONE=== diff --git a/ext/curl/tests/curl_basic_004.phpt b/ext/curl/tests/curl_basic_004.phpt index 27842db1b09..0eb1dbdb68b 100644 --- a/ext/curl/tests/curl_basic_004.phpt +++ b/ext/curl/tests/curl_basic_004.phpt @@ -32,8 +32,6 @@ TestFest 2009 - AFUP - Jean-Marc Fontaine var_dump( $curl_content ); ?> -===DONE=== --EXPECT-- *** Testing curl setting referer *** string(19) "http://www.refer.er" -===DONE=== diff --git a/ext/curl/tests/curl_basic_005.phpt b/ext/curl/tests/curl_basic_005.phpt index 6f9a4f98e13..9d6a62f622a 100644 --- a/ext/curl/tests/curl_basic_005.phpt +++ b/ext/curl/tests/curl_basic_005.phpt @@ -32,8 +32,6 @@ TestFest 2009 - AFUP - Jean-Marc Fontaine var_dump( $curl_content ); ?> -===DONE=== --EXPECT-- *** Testing curl with user agent *** string(9) "cURL phpt" -===DONE=== diff --git a/ext/curl/tests/curl_basic_011.phpt b/ext/curl/tests/curl_basic_011.phpt index e6412c36d9f..2f3cc0b6c3c 100644 --- a/ext/curl/tests/curl_basic_011.phpt +++ b/ext/curl/tests/curl_basic_011.phpt @@ -31,8 +31,6 @@ TestFest 2009 - AFUP - Xavier Gorse var_dump( $curl_content ); ?> -===DONE=== --EXPECT-- *** Testing curl with cookie *** string(3) "bar" -===DONE=== diff --git a/ext/curl/tests/curl_basic_012.phpt b/ext/curl/tests/curl_basic_012.phpt index 812fab789d1..68df85d051c 100644 --- a/ext/curl/tests/curl_basic_012.phpt +++ b/ext/curl/tests/curl_basic_012.phpt @@ -31,9 +31,7 @@ TestFest 2009 - AFUP - Xavier Gorse var_dump( $curl_content ); ?> -===DONE=== --EXPECT-- *** Testing curl with HTTP/1.0 *** string(8) "HTTP/1.0" -===DONE=== diff --git a/ext/curl/tests/curl_basic_013.phpt b/ext/curl/tests/curl_basic_013.phpt index 34ec249ad35..bc78116855d 100644 --- a/ext/curl/tests/curl_basic_013.phpt +++ b/ext/curl/tests/curl_basic_013.phpt @@ -31,9 +31,7 @@ TestFest 2009 - AFUP - Xavier Gorse var_dump( $curl_content ); ?> -===DONE=== --EXPECT-- *** Testing curl with HTTP/1.1 *** string(8) "HTTP/1.1" -===DONE=== diff --git a/ext/curl/tests/curl_basic_014.phpt b/ext/curl/tests/curl_basic_014.phpt index 4037970bd0b..88605e648f6 100644 --- a/ext/curl/tests/curl_basic_014.phpt +++ b/ext/curl/tests/curl_basic_014.phpt @@ -9,7 +9,5 @@ Jean-Marc Fontaine $ch = curl_init(); var_dump($ch); ?> -===DONE=== --EXPECTF-- resource(%d) of type (curl) -===DONE=== diff --git a/ext/curl/tests/curl_basic_015.phpt b/ext/curl/tests/curl_basic_015.phpt index 94af18e9308..1d2563be323 100644 --- a/ext/curl/tests/curl_basic_015.phpt +++ b/ext/curl/tests/curl_basic_015.phpt @@ -10,7 +10,5 @@ Jean-Marc Fontaine $ch = curl_init($url); var_dump($url == curl_getinfo($ch, CURLINFO_EFFECTIVE_URL)); ?> -===DONE=== --EXPECT-- bool(true) -===DONE=== diff --git a/ext/curl/tests/curl_basic_016.phpt b/ext/curl/tests/curl_basic_016.phpt index d1f162b3f29..678ae40af85 100644 --- a/ext/curl/tests/curl_basic_016.phpt +++ b/ext/curl/tests/curl_basic_016.phpt @@ -16,7 +16,6 @@ if ($curl_version['version_number'] > 0x071201) { $info = curl_getinfo($ch); var_dump($info); ?> -===DONE=== --EXPECTF-- array(2%d) { ["url"]=> @@ -60,4 +59,3 @@ array(2%d) { ["redirect_time"]=> float(0) } -===DONE=== diff --git a/ext/curl/tests/curl_basic_018.phpt b/ext/curl/tests/curl_basic_018.phpt index 114cb599199..5aa668b79f6 100644 --- a/ext/curl/tests/curl_basic_018.phpt +++ b/ext/curl/tests/curl_basic_018.phpt @@ -63,11 +63,9 @@ TestFest 2009 - AFUP - Thomas Rabaix var_dump( $curl_content ); ?> -===DONE=== --EXPECT-- *** Testing curl_exec() : basic functionality *** string(75) "Hello World! Hello World!Hello World! Hello World!Hello World! Hello World!" -===DONE=== diff --git a/ext/curl/tests/curl_basic_019.phpt b/ext/curl/tests/curl_basic_019.phpt index 6f896b51e79..93b947c9156 100644 --- a/ext/curl/tests/curl_basic_019.phpt +++ b/ext/curl/tests/curl_basic_019.phpt @@ -18,8 +18,6 @@ Jean-Marc Fontaine var_dump($url == $info); curl_close($ch); ?> -===DONE=== --EXPECT-- Hello World! Hello World!bool(true) -===DONE=== diff --git a/ext/curl/tests/curl_basic_020.phpt b/ext/curl/tests/curl_basic_020.phpt index cf0b708d738..6c4fe8c585c 100644 --- a/ext/curl/tests/curl_basic_020.phpt +++ b/ext/curl/tests/curl_basic_020.phpt @@ -16,8 +16,6 @@ Jean-Marc Fontaine var_dump(curl_getinfo($ch, CURLINFO_HTTP_CODE)); curl_close($ch); ?> -===DONE=== --EXPECT-- Hello World! Hello World!int(200) -===DONE=== diff --git a/ext/curl/tests/curl_basic_021.phpt b/ext/curl/tests/curl_basic_021.phpt index 51660735250..93ec89bdee1 100644 --- a/ext/curl/tests/curl_basic_021.phpt +++ b/ext/curl/tests/curl_basic_021.phpt @@ -16,7 +16,5 @@ Jean-Marc Fontaine var_dump(curl_getinfo($ch, CURLINFO_CONTENT_TYPE)); curl_close($ch); ?> -===DONE=== --EXPECT-- string(24) "text/plain;charset=utf-8" -===DONE=== diff --git a/ext/curl/tests/curl_basic_023.phpt b/ext/curl/tests/curl_basic_023.phpt index 06520207c15..6bcfd72b327 100644 --- a/ext/curl/tests/curl_basic_023.phpt +++ b/ext/curl/tests/curl_basic_023.phpt @@ -24,8 +24,6 @@ curl_exec($ch); var_dump(CURL_HTTP_VERSION_1_1 === curl_getinfo($ch, CURLINFO_HTTP_VERSION)); curl_close($ch); ?> -===DONE=== --EXPECT-- bool(true) bool(true) -===DONE=== diff --git a/ext/curl/tests/curl_basic_024.phpt b/ext/curl/tests/curl_basic_024.phpt index cdd4b5c209d..6875d4f02a2 100644 --- a/ext/curl/tests/curl_basic_024.phpt +++ b/ext/curl/tests/curl_basic_024.phpt @@ -24,9 +24,7 @@ var_dump(0 === curl_getinfo($ch, CURLINFO_PROXY_SSL_VERIFYRESULT)); var_dump(curl_getinfo($ch, CURLINFO_SCHEME)); curl_close($ch); ?> -===DONE=== --EXPECT-- bool(true) bool(true) string(4) "HTTP" -===DONE=== diff --git a/ext/curl/tests/curl_close_basic.phpt b/ext/curl/tests/curl_close_basic.phpt index 9c01b02f76e..5824fdddb80 100644 --- a/ext/curl/tests/curl_close_basic.phpt +++ b/ext/curl/tests/curl_close_basic.phpt @@ -13,7 +13,5 @@ $ch = curl_init(); curl_close($ch); var_dump($ch); ?> -===DONE=== --EXPECTF-- resource(%d) of type (Unknown) -===DONE=== diff --git a/ext/curl/tests/curl_copy_handle_basic.phpt b/ext/curl/tests/curl_copy_handle_basic.phpt index 7801fe56749..0aa58dbcf86 100644 --- a/ext/curl/tests/curl_copy_handle_basic.phpt +++ b/ext/curl/tests/curl_copy_handle_basic.phpt @@ -23,8 +23,6 @@ $ch2 = curl_copy_handle($ch); var_dump(curl_getinfo($ch) === curl_getinfo($ch2)); ?> -===DONE=== --EXPECT-- *** Testing curl_copy_handle(): basic *** bool(true) -===DONE=== diff --git a/ext/curl/tests/curl_copy_handle_basic_001.phpt b/ext/curl/tests/curl_copy_handle_basic_001.phpt index 3b5190d31f6..fbf80878772 100644 --- a/ext/curl/tests/curl_copy_handle_basic_001.phpt +++ b/ext/curl/tests/curl_copy_handle_basic_001.phpt @@ -28,7 +28,6 @@ Rick Buitenman var_dump( $curl_content ); ?> -===DONE=== --EXPECT-- *** Testing curl copy handle with simple GET *** string(106) "array(2) { @@ -40,4 +39,3 @@ string(106) "array(2) { array(0) { } " -===DONE=== diff --git a/ext/curl/tests/curl_copy_handle_basic_002.phpt b/ext/curl/tests/curl_copy_handle_basic_002.phpt index e8ebcce3259..1c3f29f53ec 100644 --- a/ext/curl/tests/curl_copy_handle_basic_002.phpt +++ b/ext/curl/tests/curl_copy_handle_basic_002.phpt @@ -29,7 +29,6 @@ Rick Buitenman var_dump( $curl_content ); ?> -===DONE=== --EXPECT-- *** Testing curl copy handle with simple POST *** string(163) "array(1) { @@ -45,4 +44,3 @@ array(3) { string(8) "John Doe" } " -===DONE=== diff --git a/ext/curl/tests/curl_copy_handle_basic_004.phpt b/ext/curl/tests/curl_copy_handle_basic_004.phpt index c020c3088b7..fe860abfbcb 100644 --- a/ext/curl/tests/curl_copy_handle_basic_004.phpt +++ b/ext/curl/tests/curl_copy_handle_basic_004.phpt @@ -30,7 +30,6 @@ Rick Buitenman var_dump( $curl_content_copy ); ?> -===DONE=== --EXPECT-- *** Test curl_copy_handle() after exec() *** string(106) "array(2) { @@ -42,4 +41,3 @@ string(106) "array(2) { array(0) { } " -===DONE=== diff --git a/ext/curl/tests/curl_copy_handle_basic_005.phpt b/ext/curl/tests/curl_copy_handle_basic_005.phpt index 68df09c21c6..54f9e14a4e3 100644 --- a/ext/curl/tests/curl_copy_handle_basic_005.phpt +++ b/ext/curl/tests/curl_copy_handle_basic_005.phpt @@ -32,7 +32,6 @@ Rick Buitenman var_dump( $curl_content_copy ); ?> -===DONE=== --EXPECT-- *** Test curl_copy_handle() after exec() with POST *** string(163) "array(1) { @@ -48,4 +47,3 @@ array(3) { string(8) "John Doe" } " -===DONE=== diff --git a/ext/curl/tests/curl_copy_handle_basic_006.phpt b/ext/curl/tests/curl_copy_handle_basic_006.phpt index 5d787bdf3c8..e90501466b8 100644 --- a/ext/curl/tests/curl_copy_handle_basic_006.phpt +++ b/ext/curl/tests/curl_copy_handle_basic_006.phpt @@ -30,9 +30,7 @@ Rick Buitenman curl_close($copy); ?> -===DONE=== --EXPECT-- *** Testing curl copy handle with User Agent *** string(9) "cURL phpt" string(9) "cURL phpt" -===DONE=== diff --git a/ext/curl/tests/curl_copy_handle_basic_007.phpt b/ext/curl/tests/curl_copy_handle_basic_007.phpt index a48d40e270b..d0a0b9e8daf 100644 --- a/ext/curl/tests/curl_copy_handle_basic_007.phpt +++ b/ext/curl/tests/curl_copy_handle_basic_007.phpt @@ -27,7 +27,6 @@ Test curl_copy_handle() with simple POST var_dump( $curl_content ); ?> -===DONE=== --EXPECT-- *** Testing curl copy handle with simple POST using array as arguments *** string(163) "array(1) { @@ -43,4 +42,3 @@ array(3) { string(8) "John Doe" } " -===DONE=== diff --git a/ext/curl/tests/curl_copy_handle_variation1.phpt b/ext/curl/tests/curl_copy_handle_variation1.phpt index 2468ab93a31..8dbb3f6987c 100644 --- a/ext/curl/tests/curl_copy_handle_variation1.phpt +++ b/ext/curl/tests/curl_copy_handle_variation1.phpt @@ -25,8 +25,6 @@ curl_setopt($ch2, CURLOPT_URL, 'http://www.bar.com/'); var_dump(curl_getinfo($ch) === curl_getinfo($ch2)); ?> -===DONE=== --EXPECT-- *** Testing curl_copy_handle(): basic *** bool(false) -===DONE=== diff --git a/ext/curl/tests/curl_copy_handle_variation2.phpt b/ext/curl/tests/curl_copy_handle_variation2.phpt index 6358975057e..be036d0ca80 100644 --- a/ext/curl/tests/curl_copy_handle_variation2.phpt +++ b/ext/curl/tests/curl_copy_handle_variation2.phpt @@ -34,11 +34,9 @@ var_dump(curl_getinfo($ch) === curl_getinfo($ch2)); curl_setopt($ch2, CURLOPT_URL, 'http://www.bar.com/'); var_dump(curl_getinfo($ch) === curl_getinfo($ch2)); ?> -===DONE=== --EXPECT-- *** Testing curl_copy_handle(): add options after copy *** bool(true) bool(false) bool(true) bool(false) -===DONE=== diff --git a/ext/curl/tests/curl_copy_handle_variation3.phpt b/ext/curl/tests/curl_copy_handle_variation3.phpt index 18f35f71b15..9a94df8d105 100644 --- a/ext/curl/tests/curl_copy_handle_variation3.phpt +++ b/ext/curl/tests/curl_copy_handle_variation3.phpt @@ -26,12 +26,10 @@ curl_close($ch1); var_dump(curl_exec($ch2)); curl_close($ch2); ?> -===DONE=== --EXPECTF-- bool(true) string(%d) "АБВ.txt|application/octet-stream" string(%d) "АБВ.txt|application/octet-stream" -===DONE=== --CLEAN-- -===DONE=== --EXPECT-- bool(true) string(21) "i-love-php|text/plain" -===DONE=== diff --git a/ext/curl/tests/curl_ftp_pasv.phpt b/ext/curl/tests/curl_ftp_pasv.phpt index f63a710ae9b..39b351dd7b9 100644 --- a/ext/curl/tests/curl_ftp_pasv.phpt +++ b/ext/curl/tests/curl_ftp_pasv.phpt @@ -52,7 +52,5 @@ if (false === getenv('PHP_CURL_FTP_REMOTE_PASSWD')) exit("skip PHP_CURL_FTP_REM curl_close ( $ch ); ?> -===DONE=== --EXPECT-- bool(true) -===DONE=== diff --git a/ext/curl/tests/curl_multi_close_basic.phpt b/ext/curl/tests/curl_multi_close_basic.phpt index 28865bc865c..a9712dcf150 100644 --- a/ext/curl/tests/curl_multi_close_basic.phpt +++ b/ext/curl/tests/curl_multi_close_basic.phpt @@ -13,7 +13,5 @@ $ch = curl_multi_init(); curl_multi_close($ch); var_dump($ch); ?> -===DONE=== --EXPECTF-- resource(%d) of type (Unknown) -===DONE=== diff --git a/ext/curl/tests/curl_multi_close_basic001.phpt b/ext/curl/tests/curl_multi_close_basic001.phpt index cf47668b300..50ed9f4ff3d 100644 --- a/ext/curl/tests/curl_multi_close_basic001.phpt +++ b/ext/curl/tests/curl_multi_close_basic001.phpt @@ -18,10 +18,8 @@ try { echo $e->getMessage(), "\n"; } ?> -===DONE=== --EXPECTF-- resource(%d) of type (curl_multi) NULL resource(%d) of type (Unknown) curl_multi_close(): supplied resource is not a valid cURL Multi Handle resource -===DONE=== diff --git a/ext/curl/tests/curl_multi_init_basic.phpt b/ext/curl/tests/curl_multi_init_basic.phpt index 0fd865df790..452bc42837c 100644 --- a/ext/curl/tests/curl_multi_init_basic.phpt +++ b/ext/curl/tests/curl_multi_init_basic.phpt @@ -23,9 +23,7 @@ var_dump($mh); curl_multi_close($mh); var_dump($mh); ?> -===DONE=== --EXPECTF-- *** Testing curl_multi_init(void); *** resource(%d) of type (curl_multi) resource(%d) of type (Unknown) -===DONE=== diff --git a/ext/curl/tests/curl_multi_segfault.phpt b/ext/curl/tests/curl_multi_segfault.phpt index 8af4dde635c..c1608bf3465 100644 --- a/ext/curl/tests/curl_multi_segfault.phpt +++ b/ext/curl/tests/curl_multi_segfault.phpt @@ -49,7 +49,5 @@ if (false === getenv('PHP_CURL_FTP_REMOTE_PASSWD')) exit("skip PHP_CURL_FTP_REM curl_close($ch); curl_multi_close($cmh); ?> -===DONE=== --EXPECT-- bool(true) -===DONE=== diff --git a/ext/curl/tests/curl_multi_select_basic1.phpt b/ext/curl/tests/curl_multi_select_basic1.phpt index 03bd9263a2b..6acfc654efe 100644 --- a/ext/curl/tests/curl_multi_select_basic1.phpt +++ b/ext/curl/tests/curl_multi_select_basic1.phpt @@ -21,7 +21,5 @@ echo curl_multi_select($mh)."\n"; curl_multi_close($mh); ?> -===DONE=== --EXPECTF-- %r(0|-1)%r -===DONE=== diff --git a/ext/curl/tests/curl_reset.phpt b/ext/curl/tests/curl_reset.phpt index 3572e69543f..59ed2ed6a51 100644 --- a/ext/curl/tests/curl_reset.phpt +++ b/ext/curl/tests/curl_reset.phpt @@ -37,7 +37,5 @@ unlink($log_file); ?> -===DONE=== --EXPECT-- testtest -===DONE=== diff --git a/ext/curl/tests/curl_setopt_CURLOPT_READFUNCTION.phpt b/ext/curl/tests/curl_setopt_CURLOPT_READFUNCTION.phpt index 32af88fb20c..ff634b4a2aa 100644 --- a/ext/curl/tests/curl_setopt_CURLOPT_READFUNCTION.phpt +++ b/ext/curl/tests/curl_setopt_CURLOPT_READFUNCTION.phpt @@ -40,7 +40,6 @@ fclose ($hReadHandle); $sOutput = file_get_contents($sWriteFile); var_dump($sOutput); ?> -===DONE=== --CLEAN-- --EXPECT-- string(27) "custom:contents of tempfile" -===DONE=== diff --git a/ext/curl/tests/curl_version_error_001.phpt b/ext/curl/tests/curl_version_error_001.phpt index 2c56e0a9286..300f9c36d22 100644 --- a/ext/curl/tests/curl_version_error_001.phpt +++ b/ext/curl/tests/curl_version_error_001.phpt @@ -9,9 +9,7 @@ if (!extension_loaded('curl')) die('skip curl extension not available'); curl_version(CURLVERSION_NOW); curl_version(0); ?> -===DONE=== --EXPECTF-- Deprecated: curl_version(): the $version parameter is deprecated in %s on line %d Warning: curl_version(): $version argument ignored in %s on line %d -===DONE=== diff --git a/ext/date/tests/DateTimeZone_clone_basic1.phpt b/ext/date/tests/DateTimeZone_clone_basic1.phpt index 5f527202cd6..3587ca74bf7 100644 --- a/ext/date/tests/DateTimeZone_clone_basic1.phpt +++ b/ext/date/tests/DateTimeZone_clone_basic1.phpt @@ -26,7 +26,6 @@ if ($clone != $orig) { } ?> -===DONE=== --EXPECTF-- *** Testing clone on DateTime objects *** object(DateTimeZone)#%d (2) { @@ -42,4 +41,3 @@ object(DateTimeZone)#%d (2) { string(3) "GMT" } TEST PASSED : Objects equal but not indetical -===DONE=== diff --git a/ext/date/tests/DateTimeZone_clone_basic2.phpt b/ext/date/tests/DateTimeZone_clone_basic2.phpt index 6cd07393e2f..050777d87c3 100644 --- a/ext/date/tests/DateTimeZone_clone_basic2.phpt +++ b/ext/date/tests/DateTimeZone_clone_basic2.phpt @@ -28,7 +28,6 @@ $d2_clone = clone $d2; var_dump($d2_clone); ?> -===DONE=== --EXPECTF-- *** Testing clone on objects whoose class derived from DateTimeZone class *** object(DateTimeZoneExt1)#%d (4) { @@ -79,4 +78,3 @@ object(DateTimeZoneExt2)#%d (6) { ["timezone"]=> string(13) "Europe/London" } -===DONE=== diff --git a/ext/date/tests/DateTimeZone_clone_basic3.phpt b/ext/date/tests/DateTimeZone_clone_basic3.phpt index c573af95716..5f853337898 100644 --- a/ext/date/tests/DateTimeZone_clone_basic3.phpt +++ b/ext/date/tests/DateTimeZone_clone_basic3.phpt @@ -25,7 +25,6 @@ echo "\n-- clone it --\n"; $d2_clone = clone $d1_clone; var_dump($d2_clone); ?> -===DONE=== --EXPECTF-- *** Testing clone on DateTime objects *** @@ -92,4 +91,3 @@ object(DateTimeZone)#%d (6) { ["timezone"]=> string(13) "Europe/London" } -===DONE=== diff --git a/ext/date/tests/DateTimeZone_clone_basic4.phpt b/ext/date/tests/DateTimeZone_clone_basic4.phpt index 70bd7f3bb10..39cea00742c 100644 --- a/ext/date/tests/DateTimeZone_clone_basic4.phpt +++ b/ext/date/tests/DateTimeZone_clone_basic4.phpt @@ -20,9 +20,7 @@ $d1_clone = clone $d1; var_dump( $d1_clone->getName() ); ?> -===DONE=== --EXPECT-- *** Testing clone of objects derived from DateTimeZone class with __clone magic method*** -- DateTimeExt1 __clone magic method called -- string(16) "America/New_York" -===DONE=== diff --git a/ext/date/tests/DateTimeZone_compare_basic1.phpt b/ext/date/tests/DateTimeZone_compare_basic1.phpt index 790bb6cf7f0..1df144840aa 100644 --- a/ext/date/tests/DateTimeZone_compare_basic1.phpt +++ b/ext/date/tests/DateTimeZone_compare_basic1.phpt @@ -37,7 +37,6 @@ var_dump($obj2 == $obj4); var_dump($obj3 == $obj4); ?> -===DONE=== --EXPECT-- Simple test for DateTimeZone compare object handler @@ -51,4 +50,3 @@ bool(false) bool(false) bool(false) bool(false) -===DONE=== diff --git a/ext/date/tests/DateTimeZone_construct_basic.phpt b/ext/date/tests/DateTimeZone_construct_basic.phpt index 737d655b9cb..c2ded654127 100644 --- a/ext/date/tests/DateTimeZone_construct_basic.phpt +++ b/ext/date/tests/DateTimeZone_construct_basic.phpt @@ -18,7 +18,6 @@ var_dump( new DateTimeZone("Europe/London") ); var_dump( new DateTimeZone("America/Los_Angeles") ); ?> -===DONE=== --EXPECTF-- *** Testing new DateTimeZone() : basic functionality *** object(DateTimeZone)#%d (2) { @@ -39,4 +38,3 @@ object(DateTimeZone)#%d (2) { ["timezone"]=> string(19) "America/Los_Angeles" } -===DONE=== diff --git a/ext/date/tests/DateTimeZone_construct_error.phpt b/ext/date/tests/DateTimeZone_construct_error.phpt index 6bde64c4a2b..4ae5d2d228b 100644 --- a/ext/date/tests/DateTimeZone_construct_error.phpt +++ b/ext/date/tests/DateTimeZone_construct_error.phpt @@ -22,10 +22,8 @@ try { } ?> -===DONE=== --EXPECT-- *** Testing DateTimeZone() : error conditions *** -- Testing new DateTimeZone() with more than expected no. of arguments -- DateTimeZone::__construct() expects exactly 1 parameter, 2 given -===DONE=== diff --git a/ext/date/tests/DateTimeZone_extends_basic1.phpt b/ext/date/tests/DateTimeZone_extends_basic1.phpt index 462cb155d23..178970bdb9d 100644 --- a/ext/date/tests/DateTimeZone_extends_basic1.phpt +++ b/ext/date/tests/DateTimeZone_extends_basic1.phpt @@ -23,7 +23,6 @@ echo "\n-- Invoke __toString --\n"; echo $d . "\n"; ?> -===DONE=== --EXPECT-- *** Testing basic DateTimeZone inheritance() *** @@ -31,4 +30,3 @@ echo $d . "\n"; -- Invoke __toString -- America/Los_Angeles -===DONE=== diff --git a/ext/date/tests/DateTimeZone_getName_basic1.phpt b/ext/date/tests/DateTimeZone_getName_basic1.phpt index c226aa39bb6..6d320b5ae04 100644 --- a/ext/date/tests/DateTimeZone_getName_basic1.phpt +++ b/ext/date/tests/DateTimeZone_getName_basic1.phpt @@ -23,10 +23,8 @@ $tz3 = new DateTimeZone("America/Los_Angeles"); var_dump( $tz3->getName() ); ?> -===DONE=== --EXPECT-- *** Testing DateTimeZone::getName() : basic functionality *** string(13) "Europe/London" string(16) "America/New_York" string(19) "America/Los_Angeles" -===DONE=== diff --git a/ext/date/tests/DateTimeZone_getOffset_basic1.phpt b/ext/date/tests/DateTimeZone_getOffset_basic1.phpt index ce1c04336ec..b0617a47a4e 100644 --- a/ext/date/tests/DateTimeZone_getOffset_basic1.phpt +++ b/ext/date/tests/DateTimeZone_getOffset_basic1.phpt @@ -24,10 +24,8 @@ $tz3 = new DateTimeZone("America/Los_Angeles"); var_dump( $tz3->getOffset($date) ); ?> -===DONE=== --EXPECTF-- *** Testing DateTimeZone::getOffset() : basic functionality *** %rint\(0\)|int\(3600\)%r %rint\(-18000\)|int\(-14400\)%r %rint\(-28800\)|int\(-25200\)%r -===DONE=== diff --git a/ext/date/tests/DateTimeZone_getTransitions_basic1.phpt b/ext/date/tests/DateTimeZone_getTransitions_basic1.phpt index ee88321fcae..c67cd419771 100644 --- a/ext/date/tests/DateTimeZone_getTransitions_basic1.phpt +++ b/ext/date/tests/DateTimeZone_getTransitions_basic1.phpt @@ -28,7 +28,6 @@ echo "\n-- Format a sample entry for Spring 1963 --\n"; var_dump( $tran[6] ); ?> -===DONE=== --EXPECT-- *** Testing DateTimeZone::getTransitions() : basic functionality *** @@ -47,4 +46,3 @@ array(5) { ["abbr"]=> string(3) "BST" } -===DONE=== diff --git a/ext/date/tests/DateTimeZone_listAbbreviations_basic1.phpt b/ext/date/tests/DateTimeZone_listAbbreviations_basic1.phpt index 0154839ae43..cb948e9df5c 100644 --- a/ext/date/tests/DateTimeZone_listAbbreviations_basic1.phpt +++ b/ext/date/tests/DateTimeZone_listAbbreviations_basic1.phpt @@ -22,7 +22,6 @@ echo "\n-- Format a sample entry --\n"; var_dump( $abbr["acst"] ); ?> -===DONE=== --EXPECTF-- *** Testing DateTimeZone::listAbbreviations() : basic functionality *** string(5) "array" @@ -85,4 +84,3 @@ array(6) { string(20) "Australia/Yancowinna" } } -===DONE=== diff --git a/ext/date/tests/DateTimeZone_listIdentifiers_basic1.phpt b/ext/date/tests/DateTimeZone_listIdentifiers_basic1.phpt index 26a0c2fca20..05ced8701e0 100644 --- a/ext/date/tests/DateTimeZone_listIdentifiers_basic1.phpt +++ b/ext/date/tests/DateTimeZone_listIdentifiers_basic1.phpt @@ -23,7 +23,6 @@ var_dump(in_array("America/New_York", $zones)); var_dump(in_array("UTC", $zones)); ?> -===DONE=== --EXPECT-- *** Testing DateTimeZone::listIdentifiers() : basic functionality *** Check return tpe is ARRAY @@ -32,5 +31,4 @@ Check array contains some common timezones bool(true) bool(true) bool(true) -===DONE=== diff --git a/ext/date/tests/DateTimeZone_serialize_type_1.phpt b/ext/date/tests/DateTimeZone_serialize_type_1.phpt index e6835f3daf1..f35a133cfb4 100644 --- a/ext/date/tests/DateTimeZone_serialize_type_1.phpt +++ b/ext/date/tests/DateTimeZone_serialize_type_1.phpt @@ -16,7 +16,6 @@ var_dump($tz2); var_dump( $tz2->getName() ); ?> -===DONE=== --EXPECTF-- object(DateTimeZone)#%d (2) { ["timezone_type"]=> @@ -32,4 +31,3 @@ object(DateTimeZone)#%d (2) { string(6) "+01:00" } string(6) "+01:00" -===DONE=== diff --git a/ext/date/tests/DateTimeZone_serialize_type_2.phpt b/ext/date/tests/DateTimeZone_serialize_type_2.phpt index 92f1e70bc4d..a823ee08c02 100644 --- a/ext/date/tests/DateTimeZone_serialize_type_2.phpt +++ b/ext/date/tests/DateTimeZone_serialize_type_2.phpt @@ -16,7 +16,6 @@ var_dump($tz2); var_dump( $tz2->getName() ); ?> -===DONE=== --EXPECTF-- object(DateTimeZone)#%d (2) { ["timezone_type"]=> @@ -32,4 +31,3 @@ object(DateTimeZone)#%d (2) { string(3) "EST" } string(3) "EST" -===DONE=== diff --git a/ext/date/tests/DateTimeZone_serialize_type_3.phpt b/ext/date/tests/DateTimeZone_serialize_type_3.phpt index cffef81b6bc..92ac958dc34 100644 --- a/ext/date/tests/DateTimeZone_serialize_type_3.phpt +++ b/ext/date/tests/DateTimeZone_serialize_type_3.phpt @@ -16,7 +16,6 @@ var_dump($tz2); var_dump( $tz2->getName() ); ?> -===DONE=== --EXPECT-- object(DateTimeZone)#1 (2) { ["timezone_type"]=> @@ -32,4 +31,3 @@ object(DateTimeZone)#2 (2) { string(16) "America/New_York" } string(16) "America/New_York" -===DONE=== diff --git a/ext/date/tests/DateTimeZone_verify.phpt b/ext/date/tests/DateTimeZone_verify.phpt index 2cba7c859ed..0787d11c27e 100644 --- a/ext/date/tests/DateTimeZone_verify.phpt +++ b/ext/date/tests/DateTimeZone_verify.phpt @@ -17,7 +17,6 @@ echo "..and get names of all its class constants\n"; $constants = $class->getConstants(); var_dump($constants); ?> -===DONE=== --EXPECTF-- *** Verify DateTimeZone class *** Verify DateTimeZone class registered OK @@ -122,4 +121,3 @@ array(14) { ["PER_COUNTRY"]=> int(4096) } -===DONE=== diff --git a/ext/date/tests/DateTime_clone_basic1.phpt b/ext/date/tests/DateTime_clone_basic1.phpt index 318d5c3d7fb..714f9a174d8 100644 --- a/ext/date/tests/DateTime_clone_basic1.phpt +++ b/ext/date/tests/DateTime_clone_basic1.phpt @@ -21,9 +21,7 @@ echo "Original: " . $orig->format("H:i:s") . "\n"; echo "Clone: " . $clone->format("H:i:s") . "\n"; ?> -===DONE=== --EXPECT-- *** Testing clone on DateTime objects *** Original: 22:41:50 Clone: 14:25:41 -===DONE=== diff --git a/ext/date/tests/DateTime_clone_basic2.phpt b/ext/date/tests/DateTime_clone_basic2.phpt index e4ca0c1cab8..e0abaa21f5d 100644 --- a/ext/date/tests/DateTime_clone_basic2.phpt +++ b/ext/date/tests/DateTime_clone_basic2.phpt @@ -28,7 +28,6 @@ var_dump($d2); $d2_clone = clone $d2; var_dump($d2_clone); ?> -===DONE=== --EXPECTF-- *** Testing clone on objects whoose class derived from DateTime class *** object(DateTimeExt1)#%d (5) { @@ -87,4 +86,3 @@ object(DateTimeExt2)#%d (7) { ["timezone"]=> string(3) "GMT" } -===DONE=== diff --git a/ext/date/tests/DateTime_clone_basic3.phpt b/ext/date/tests/DateTime_clone_basic3.phpt index ebda6a8428e..dd7220799d3 100644 --- a/ext/date/tests/DateTime_clone_basic3.phpt +++ b/ext/date/tests/DateTime_clone_basic3.phpt @@ -25,7 +25,6 @@ echo "\n-- clone it --\n"; $d2_clone = clone $d1_clone; var_dump($d2_clone); ?> -===DONE=== --EXPECTF-- *** Testing clone on DateTime objects *** @@ -102,4 +101,3 @@ object(DateTime)#%d (7) { ["timezone"]=> string(3) "GMT" } -===DONE=== diff --git a/ext/date/tests/DateTime_clone_basic4.phpt b/ext/date/tests/DateTime_clone_basic4.phpt index e228783a96a..e72f5707112 100644 --- a/ext/date/tests/DateTime_clone_basic4.phpt +++ b/ext/date/tests/DateTime_clone_basic4.phpt @@ -23,9 +23,7 @@ $d1_clone = clone $d1; var_dump( $d1_clone->format( "m.d.y") ); ?> -===DONE=== --EXPECT-- *** Testing clone of objects derived from DateTime class with __clone magic method*** -- DateTimeExt1 __clone magic method called -- string(8) "02.03.09" -===DONE=== diff --git a/ext/date/tests/DateTime_compare_basic1.phpt b/ext/date/tests/DateTime_compare_basic1.phpt index 0d3f15360d8..7786defb6a0 100644 --- a/ext/date/tests/DateTime_compare_basic1.phpt +++ b/ext/date/tests/DateTime_compare_basic1.phpt @@ -49,7 +49,6 @@ var_dump($obj1 == $obj2); var_dump($obj1 == $obj3); var_dump($obj1 == $obj4); ?> -===DONE=== --EXPECT-- Simple test for DateTime compare object handler @@ -74,4 +73,3 @@ bool(false) bool(true) bool(true) bool(true) -===DONE=== diff --git a/ext/date/tests/DateTime_construct_basic1.phpt b/ext/date/tests/DateTime_construct_basic1.phpt index f2a341b0535..37ed61c8d0f 100644 --- a/ext/date/tests/DateTime_construct_basic1.phpt +++ b/ext/date/tests/DateTime_construct_basic1.phpt @@ -20,7 +20,6 @@ var_dump( new DateTime("2005-07-14 22:30:41") ); var_dump( new DateTime("2005-07-14 22:30:41 GMT") ); ?> -===DONE=== --EXPECTF-- *** Testing new DateTime() : basic functionality *** object(DateTime)#%d (3) { @@ -55,4 +54,3 @@ object(DateTime)#%d (3) { ["timezone"]=> string(3) "GMT" } -===DONE=== diff --git a/ext/date/tests/DateTime_construct_error.phpt b/ext/date/tests/DateTime_construct_error.phpt index 7219d2b712c..00b0394ff9a 100644 --- a/ext/date/tests/DateTime_construct_error.phpt +++ b/ext/date/tests/DateTime_construct_error.phpt @@ -23,10 +23,8 @@ try { } ?> -===DONE=== --EXPECT-- *** Testing date_create() : error conditions *** -- Testing new DateTime() with more than expected no. of arguments -- DateTime::__construct() expects at most 2 parameters, 3 given -===DONE=== diff --git a/ext/date/tests/DateTime_extends_basic1.phpt b/ext/date/tests/DateTime_extends_basic1.phpt index 04f4f76accb..d7d236943d4 100644 --- a/ext/date/tests/DateTime_extends_basic1.phpt +++ b/ext/date/tests/DateTime_extends_basic1.phpt @@ -33,7 +33,6 @@ echo "\n-- Invoke __toString again --\n"; echo $d . "\n"; ?> -===DONE=== --EXPECT-- *** Testing basic DateTime inheritance() *** @@ -46,4 +45,3 @@ May 1, 1967, 10:30:41 pm -- Invoke __toString again -- July 2, 1963, 10:45:30 am -===DONE=== diff --git a/ext/date/tests/DateTime_extends_basic2.phpt b/ext/date/tests/DateTime_extends_basic2.phpt index 364fd555146..1bfc2f1e4cd 100644 --- a/ext/date/tests/DateTime_extends_basic2.phpt +++ b/ext/date/tests/DateTime_extends_basic2.phpt @@ -24,8 +24,6 @@ $d = new DateTimeExt("1967-05-01 22:30:41"); echo $d->format("F j, Y, g:i:s a") . "\n"; ?> -===DONE=== --EXPECT-- *** Testing new DateTime() : with user space __construct magic method *** May 1, 1967, 10:30:41 pm -===DONE=== diff --git a/ext/date/tests/DateTime_extends_basic3.phpt b/ext/date/tests/DateTime_extends_basic3.phpt index cc44d726402..95a74631c3f 100644 --- a/ext/date/tests/DateTime_extends_basic3.phpt +++ b/ext/date/tests/DateTime_extends_basic3.phpt @@ -19,8 +19,6 @@ $d = new DateTimeExt("1967-05-01 22:30:41"); echo $d->format() . "\n"; ?> -===DONE=== --EXPECT-- *** Testing new DateTime() : with user format() method *** May 1, 1967, 10:30:41 pm -===DONE=== diff --git a/ext/date/tests/DateTime_fix_createFromFormat.phpt b/ext/date/tests/DateTime_fix_createFromFormat.phpt index dff0a0338ca..ec1ca81c2a1 100644 --- a/ext/date/tests/DateTime_fix_createFromFormat.phpt +++ b/ext/date/tests/DateTime_fix_createFromFormat.phpt @@ -21,9 +21,7 @@ echo "Format method: " . $orig->format("D., M. j, Y g:iA") . "\n"; echo "createFromFormat method: " . $fromFormat->format("D., M. j, Y g:iA") . "\n"; ?> -===DONE=== --EXPECT-- *** Testing clone on DateTime objects *** Format method: Thu., Nov. 29, 2012 5:00PM createFromFormat method: Thu., Nov. 29, 2012 5:00PM -===DONE=== diff --git a/ext/date/tests/DateTime_format_basic1.phpt b/ext/date/tests/DateTime_format_basic1.phpt index 883f9a7a8e0..a7bbd299136 100644 --- a/ext/date/tests/DateTime_format_basic1.phpt +++ b/ext/date/tests/DateTime_format_basic1.phpt @@ -25,7 +25,6 @@ var_dump( $date->format( 'H:m:s \m \i\s\ \m\o\n\t\h') ); var_dump( $date->format( "H:i:s") ); ?> -===DONE=== --EXPECT-- *** Testing DateTime::format() : basic functionality *** string(23) "July 14, 2005, 10:30 pm" @@ -37,4 +36,3 @@ string(19) "it is the 14th day." string(28) "Thu Jul 14 22:30:41 BST 2005" string(19) "22:07:41 m is month" string(8) "22:30:41" -===DONE=== diff --git a/ext/date/tests/DateTime_format_basic2.phpt b/ext/date/tests/DateTime_format_basic2.phpt index 958b702ea4c..fa5c1a24be8 100644 --- a/ext/date/tests/DateTime_format_basic2.phpt +++ b/ext/date/tests/DateTime_format_basic2.phpt @@ -27,7 +27,6 @@ var_dump( $date->format( DateTime::RSS) ) ; var_dump( $date->format( DateTime::W3C) ) ; ?> -===DONE=== --EXPECT-- *** Testing date_format() : basic functionality - formatting coinstants *** string(25) "2005-07-14T22:30:41+01:00" @@ -41,4 +40,3 @@ string(31) "Thu, 14 Jul 2005 22:30:41 +0100" string(25) "2005-07-14T22:30:41+01:00" string(31) "Thu, 14 Jul 2005 22:30:41 +0100" string(25) "2005-07-14T22:30:41+01:00" -===DONE=== diff --git a/ext/date/tests/DateTime_getOffset_basic1.phpt b/ext/date/tests/DateTime_getOffset_basic1.phpt index 9a2d22f4a13..f6c7d8c8aa3 100644 --- a/ext/date/tests/DateTime_getOffset_basic1.phpt +++ b/ext/date/tests/DateTime_getOffset_basic1.phpt @@ -20,9 +20,7 @@ echo "Winter offset: " . $winter->getOffset() / 3600 . " hours\n"; echo "Summer offset: " . $summer->getOffset() / 3600 . " hours\n"; ?> -===DONE=== --EXPECT-- *** Testing DateTime::getOffset() : basic functionality *** Winter offset: 0 hours Summer offset: 1 hours -===DONE=== diff --git a/ext/date/tests/DateTime_getTimeZone_basic1.phpt b/ext/date/tests/DateTime_getTimeZone_basic1.phpt index 3c2f76c6402..d29812ad1c5 100644 --- a/ext/date/tests/DateTime_getTimeZone_basic1.phpt +++ b/ext/date/tests/DateTime_getTimeZone_basic1.phpt @@ -24,10 +24,8 @@ $object->setTimeZone($la_time); var_dump( $object->getTimeZone()->getName() ); ?> -===DONE=== --EXPECT-- *** Testing DateTime::getTimezone() : basic functionality *** string(13) "Europe/London" string(16) "America/New_York" string(19) "America/Los_Angeles" -===DONE=== diff --git a/ext/date/tests/DateTime_modify_basic1.phpt b/ext/date/tests/DateTime_modify_basic1.phpt index 5b0d5bd2a1f..3147ca63cc4 100644 --- a/ext/date/tests/DateTime_modify_basic1.phpt +++ b/ext/date/tests/DateTime_modify_basic1.phpt @@ -29,11 +29,9 @@ $datetime->modify("last Sunday"); echo "After modification 4: " . $datetime->format("D, d M Y") . "\n"; ?> -===DONE=== --EXPECT-- *** Testing DateTime::modify() : basic functionality *** After modification 1: Sun, 01 Feb 2009 After modification 2: Tue, 10 Feb 2009 18:28:43 After modification 3: Thu, 12 Feb 2009 After modification 4: Sun, 08 Feb 2009 -===DONE=== diff --git a/ext/date/tests/DateTime_serialize.phpt b/ext/date/tests/DateTime_serialize.phpt index 48b8b01cf96..8424a3e082e 100644 --- a/ext/date/tests/DateTime_serialize.phpt +++ b/ext/date/tests/DateTime_serialize.phpt @@ -16,7 +16,6 @@ var_dump($date2); var_dump( $date2->format( "F j, Y, g:i a") ); ?> -===DONE=== --EXPECTF-- object(DateTime)#%d (3) { ["date"]=> @@ -36,4 +35,3 @@ object(DateTime)#%d (3) { string(13) "Europe/London" } string(23) "July 14, 2005, 10:30 pm" -===DONE=== diff --git a/ext/date/tests/DateTime_setDate_basic1.phpt b/ext/date/tests/DateTime_setDate_basic1.phpt index e3c9c587acf..d8fe4989e76 100644 --- a/ext/date/tests/DateTime_setDate_basic1.phpt +++ b/ext/date/tests/DateTime_setDate_basic1.phpt @@ -22,9 +22,7 @@ $datetime->setDate(2008, 02, 01); echo $datetime->format(DATE_RFC2822) . "\n"; ?> -===DONE=== --EXPECT-- *** Testing DateTime::setDate() : basic functionality *** Fri, 30 Jan 2009 19:34:10 +0000 Fri, 01 Feb 2008 19:34:10 +0000 -===DONE=== diff --git a/ext/date/tests/DateTime_setISODate_basic1.phpt b/ext/date/tests/DateTime_setISODate_basic1.phpt index bcb7f30694e..d4319bc60f3 100644 --- a/ext/date/tests/DateTime_setISODate_basic1.phpt +++ b/ext/date/tests/DateTime_setISODate_basic1.phpt @@ -29,10 +29,8 @@ $datetime->setISODate(2008, 30, 3); echo "..same day last year was \"" . $datetime->format("D M j") . "\"\n"; ?> -===DONE=== --EXPECT-- *** Testing DateTime::setISODate() : basic functionality *** Week 40 of 2009 is in "September" Week 30 day 3 of 2009 is "Wed Jul 22" ..same day last year was "Wed Jul 23" -===DONE=== diff --git a/ext/date/tests/DateTime_setTime_basic1.phpt b/ext/date/tests/DateTime_setTime_basic1.phpt index e5505a0501c..fff22c5e1a0 100644 --- a/ext/date/tests/DateTime_setTime_basic1.phpt +++ b/ext/date/tests/DateTime_setTime_basic1.phpt @@ -34,7 +34,6 @@ $datetime->setTime(54, 25); echo "After modification5 " . $datetime ->format(DATE_RFC2822) . "\n"; ?> -===DONE=== --EXPECT-- *** Testing DateTime::setTime() : basic functionality *** Initial date: Sat, 31 Jan 2009 15:14:10 +0000 @@ -43,4 +42,3 @@ After modification2 Sat, 31 Jan 2009 19:05:59 +0000 After modification3 Sun, 01 Feb 2009 00:10:00 +0000 After modification4 Mon, 02 Feb 2009 23:35:47 +0000 After modification5 Wed, 04 Feb 2009 06:25:00 +0000 -===DONE=== diff --git a/ext/date/tests/DateTime_setTimezone_basic1.phpt b/ext/date/tests/DateTime_setTimezone_basic1.phpt index 90e799e20c1..88da0ef33aa 100644 --- a/ext/date/tests/DateTime_setTimezone_basic1.phpt +++ b/ext/date/tests/DateTime_setTimezone_basic1.phpt @@ -21,9 +21,7 @@ $datetime->setTimezone($la_time); echo "New timezone: " . date_timezone_get($datetime)->getName() . "\n"; ?> -===DONE=== --EXPECT-- *** Testing DateTime::setTimezone() : basic functionality *** Default timezone: Europe/London New timezone: America/Los_Angeles -===DONE=== diff --git a/ext/date/tests/DateTime_verify.phpt b/ext/date/tests/DateTime_verify.phpt index 16d7ad32756..0cc41a85abd 100644 --- a/ext/date/tests/DateTime_verify.phpt +++ b/ext/date/tests/DateTime_verify.phpt @@ -23,7 +23,6 @@ var_dump($method->getParameters()); var_dump($method->getParameters()[0]->isOptional()); ?> -===DONE=== --EXPECTF-- *** Verify DateTime class *** Verify DateTime class registered OK @@ -205,4 +204,3 @@ array(1) { } } bool(false) -===DONE=== diff --git a/ext/date/tests/bug53437.phpt b/ext/date/tests/bug53437.phpt index cac93a2ef0d..f19f073aa94 100644 --- a/ext/date/tests/bug53437.phpt +++ b/ext/date/tests/bug53437.phpt @@ -22,7 +22,6 @@ foreach($dpu as $dt) { echo $dt->format('Y-m-d H:i:s')."\r\n"; } ?> -==DONE== --EXPECTF-- Original: 2010-01-01 00:00:00 @@ -155,4 +154,3 @@ Unserialized: 2010-01-01 00:00:00 2010-01-02 00:00:00 2010-01-03 00:00:00 -==DONE== diff --git a/ext/date/tests/bug53437_var2.phpt b/ext/date/tests/bug53437_var2.phpt index 51cc28943be..7a87b38421a 100644 --- a/ext/date/tests/bug53437_var2.phpt +++ b/ext/date/tests/bug53437_var2.phpt @@ -11,7 +11,6 @@ $di1 = unserialize($s); var_dump($di0, $di1); ?> -==DONE== --EXPECT-- object(DateInterval)#1 (16) { ["y"]=> @@ -81,4 +80,3 @@ object(DateInterval)#2 (16) { ["have_special_relative"]=> int(0) } -==DONE== diff --git a/ext/date/tests/bug53437_var3.phpt b/ext/date/tests/bug53437_var3.phpt index 6738f14be79..44e6a80c89e 100644 --- a/ext/date/tests/bug53437_var3.phpt +++ b/ext/date/tests/bug53437_var3.phpt @@ -10,7 +10,6 @@ $di = unserialize($s); var_dump($di); ?> -==DONE== --EXPECTF-- object(DateInterval)#%d (16) { ["y"]=> @@ -46,4 +45,3 @@ object(DateInterval)#%d (16) { ["f"]=> float(-1) } -==DONE== diff --git a/ext/date/tests/bug53437_var4.phpt b/ext/date/tests/bug53437_var4.phpt index 189c15cb1b3..753401539a8 100644 --- a/ext/date/tests/bug53437_var4.phpt +++ b/ext/date/tests/bug53437_var4.phpt @@ -20,7 +20,6 @@ var_dump($df, $df->days); ?> -==DONE== --EXPECTF-- object(DateInterval)#%d (16) { ["y"]=> @@ -65,4 +64,3 @@ int(0) float(0) int(0) int(2) -==DONE== diff --git a/ext/date/tests/bug53437_var5.phpt b/ext/date/tests/bug53437_var5.phpt index 38783b15456..baffbb484ad 100644 --- a/ext/date/tests/bug53437_var5.phpt +++ b/ext/date/tests/bug53437_var5.phpt @@ -10,7 +10,6 @@ $di = unserialize($s); var_dump($di); ?> -==DONE== --EXPECTF-- object(DateInterval)#%d (16) { ["y"]=> @@ -46,4 +45,3 @@ object(DateInterval)#%d (16) { ["f"]=> float(-1) } -==DONE== diff --git a/ext/date/tests/bug53437_var6.phpt b/ext/date/tests/bug53437_var6.phpt index 633fcb3f384..f5ff22c4a46 100644 --- a/ext/date/tests/bug53437_var6.phpt +++ b/ext/date/tests/bug53437_var6.phpt @@ -10,7 +10,6 @@ $di = unserialize($s); var_dump($di); ?> -==DONE== --EXPECTF-- object(DateInterval)#%d (16) { ["y"]=> @@ -46,4 +45,3 @@ object(DateInterval)#%d (16) { ["have_special_relative"]=> int(0) } -==DONE== diff --git a/ext/date/tests/bug65184.phpt b/ext/date/tests/bug65184.phpt index 9bb68558aae..62c41652bbf 100644 --- a/ext/date/tests/bug65184.phpt +++ b/ext/date/tests/bug65184.phpt @@ -21,8 +21,6 @@ date.timezone = UTC echo strlen(strftime('%A')), "\n"; ?> -===DONE=== --EXPECT-- 90 85 97 6a 93 fa 6 -===DONE=== diff --git a/ext/date/tests/checkdate_basic1.phpt b/ext/date/tests/checkdate_basic1.phpt index 9be78eb1712..150215b7eb6 100644 --- a/ext/date/tests/checkdate_basic1.phpt +++ b/ext/date/tests/checkdate_basic1.phpt @@ -32,7 +32,6 @@ var_dump( checkdate(7, 2, 32768) ); // >max year var_dump( checkdate(7, 2, 0) ); // -===DONE=== --EXPECT-- *** Testing checkdate() : basic functionality *** -- The following are all valid dates -- @@ -51,4 +50,3 @@ bool(false) bool(false) bool(false) bool(false) -===DONE=== diff --git a/ext/date/tests/date_add_basic.phpt b/ext/date/tests/date_add_basic.phpt index edf84d61f80..6bfc55f8f45 100644 --- a/ext/date/tests/date_add_basic.phpt +++ b/ext/date/tests/date_add_basic.phpt @@ -32,7 +32,6 @@ foreach($intervals as $interval) { } ?> -===DONE=== --EXPECT-- *** Testing date_add() : basic functionality *** string(19) "2008-01-01 12:25:00" @@ -40,4 +39,3 @@ string(19) "2011-07-06 00:55:05" string(19) "2011-07-06 00:55:05" string(19) "2011-07-08 00:56:05" string(19) "2012-09-09 00:41:35" -===DONE=== diff --git a/ext/date/tests/date_basic1.phpt b/ext/date/tests/date_basic1.phpt index 088bdce6d5a..c05208e31e5 100644 --- a/ext/date/tests/date_basic1.phpt +++ b/ext/date/tests/date_basic1.phpt @@ -25,7 +25,6 @@ var_dump( date('H:m:s \m \i\s\ \m\o\n\t\h', $timestamp) ); var_dump( date("H:i:s", $timestamp) ); ?> -===DONE=== --EXPECT-- *** Testing date() : basic functionality *** string(27) "February 27, 2009, 10:44 am" @@ -37,4 +36,3 @@ string(19) "it is the 27th day." string(28) "Fri Feb 27 10:44:30 GMT 2009" string(19) "10:02:30 m is month" string(8) "10:44:30" -===DONE=== diff --git a/ext/date/tests/date_create_basic.phpt b/ext/date/tests/date_create_basic.phpt index b9d1c2fa97d..5c12605023c 100644 --- a/ext/date/tests/date_create_basic.phpt +++ b/ext/date/tests/date_create_basic.phpt @@ -20,7 +20,6 @@ var_dump( date_create("2005-07-14 22:30:41") ); var_dump( date_create("2005-07-14 22:30:41 GMT") ); ?> -===DONE=== --EXPECTF-- *** Testing date_create() : basic functionality *** object(DateTime)#%d (3) { @@ -55,4 +54,3 @@ object(DateTime)#%d (3) { ["timezone"]=> string(3) "GMT" } -===DONE=== diff --git a/ext/date/tests/date_date_set_basic1.phpt b/ext/date/tests/date_date_set_basic1.phpt index d24815f99ce..d701a22543b 100644 --- a/ext/date/tests/date_date_set_basic1.phpt +++ b/ext/date/tests/date_date_set_basic1.phpt @@ -22,9 +22,7 @@ date_date_set($datetime, 2008, 02, 01); echo date_format($datetime, DATE_RFC2822) . "\n"; ?> -===DONE=== --EXPECT-- *** Testing date_date_set() : basic functionality *** Fri, 30 Jan 2009 19:34:10 +0000 Fri, 01 Feb 2008 19:34:10 +0000 -===DONE=== diff --git a/ext/date/tests/date_default_timezone_set_error.phpt b/ext/date/tests/date_default_timezone_set_error.phpt index 24a851ff012..652c0e8d448 100644 --- a/ext/date/tests/date_default_timezone_set_error.phpt +++ b/ext/date/tests/date_default_timezone_set_error.phpt @@ -13,7 +13,6 @@ echo "\n-- Testing date_default_timezone_set() function with invalid timezone id var_dump( date_default_timezone_set("foo") ); ?> -===Done=== --EXPECTF-- *** Testing date_default_timezone_set() : error variations *** @@ -21,4 +20,3 @@ var_dump( date_default_timezone_set("foo") ); Notice: date_default_timezone_set(): Timezone ID 'foo' is invalid in %s on line %d bool(false) -===Done=== diff --git a/ext/date/tests/date_format_basic1.phpt b/ext/date/tests/date_format_basic1.phpt index 317386f3113..42e8acd669c 100644 --- a/ext/date/tests/date_format_basic1.phpt +++ b/ext/date/tests/date_format_basic1.phpt @@ -25,7 +25,6 @@ var_dump( date_format($date, 'H:m:s \m \i\s\ \m\o\n\t\h') ); var_dump( date_format($date, "H:i:s") ); ?> -===DONE=== --EXPECT-- *** Testing date_format() : basic functionality *** string(23) "July 14, 2005, 10:30 pm" @@ -37,4 +36,3 @@ string(19) "it is the 14th day." string(28) "Thu Jul 14 22:30:41 BST 2005" string(19) "22:07:41 m is month" string(8) "22:30:41" -===DONE=== diff --git a/ext/date/tests/date_isodate_set_basic1.phpt b/ext/date/tests/date_isodate_set_basic1.phpt index 80149f4325e..f28c15b8b16 100644 --- a/ext/date/tests/date_isodate_set_basic1.phpt +++ b/ext/date/tests/date_isodate_set_basic1.phpt @@ -29,10 +29,8 @@ date_isodate_set($datetime, 2008, 30, 3); echo "..same day last year was \"" . date_format($datetime, "D M j") . "\"\n"; ?> -===DONE=== --EXPECT-- *** Testing date_isodate_set() : basic functionality *** Week 40 of 2009 is in "September" Week 30 day 3 of 2009 is "Wed Jul 22" ..same day last year was "Wed Jul 23" -===DONE=== diff --git a/ext/date/tests/date_modify_basic1.phpt b/ext/date/tests/date_modify_basic1.phpt index 2d9d828db0a..c448d6f44f4 100644 --- a/ext/date/tests/date_modify_basic1.phpt +++ b/ext/date/tests/date_modify_basic1.phpt @@ -29,11 +29,9 @@ date_modify($datetime, "last Sunday"); echo "After modification 4: " . date_format($datetime, "D, d M Y") . "\n"; ?> -===DONE=== --EXPECT-- *** Testing date_modify() : basic functionality *** After modification 1: Sun, 01 Feb 2009 After modification 2: Tue, 10 Feb 2009 18:28:43 After modification 3: Thu, 12 Feb 2009 After modification 4: Sun, 08 Feb 2009 -===DONE=== diff --git a/ext/date/tests/date_offset_get_basic1.phpt b/ext/date/tests/date_offset_get_basic1.phpt index 4a92eff376c..6b775a99505 100644 --- a/ext/date/tests/date_offset_get_basic1.phpt +++ b/ext/date/tests/date_offset_get_basic1.phpt @@ -20,9 +20,7 @@ echo "Winter offset: " . date_offset_get($winter) / 3600 . " hours\n"; echo "Summer offset: " . date_offset_get($summer) / 3600 . " hours\n"; ?> -===DONE=== --EXPECT-- *** Testing date_offset_get() : basic functionality *** Winter offset: 0 hours Summer offset: 1 hours -===DONE=== diff --git a/ext/date/tests/date_parse_basic1.phpt b/ext/date/tests/date_parse_basic1.phpt index a0801d70644..f8af03f6d99 100644 --- a/ext/date/tests/date_parse_basic1.phpt +++ b/ext/date/tests/date_parse_basic1.phpt @@ -17,7 +17,6 @@ var_dump( date_parse("10:00:00.5") ); var_dump( date_parse("2009-02-27") ); ?> -===DONE=== --EXPECT-- *** Testing date_parse() : basic functionality *** array(12) { @@ -104,4 +103,3 @@ array(12) { ["is_localtime"]=> bool(false) } -===DONE=== diff --git a/ext/date/tests/date_parse_error.phpt b/ext/date/tests/date_parse_error.phpt index dc03944004b..24b0094c9e2 100644 --- a/ext/date/tests/date_parse_error.phpt +++ b/ext/date/tests/date_parse_error.phpt @@ -17,7 +17,6 @@ $invalid_date = "2OO9-02--27 10:00?00.5"; var_dump( date_parse($invalid_date) ); ?> -===DONE=== --EXPECTF-- *** Testing date_parse() : error conditions *** @@ -68,4 +67,3 @@ array(13) { ["zone_type"]=> int(0) } -===DONE=== diff --git a/ext/date/tests/date_sub_basic.phpt b/ext/date/tests/date_sub_basic.phpt index 7246ef6347e..eb8aeb5eb2a 100644 --- a/ext/date/tests/date_sub_basic.phpt +++ b/ext/date/tests/date_sub_basic.phpt @@ -32,7 +32,6 @@ foreach($intervals as $interval) { } ?> -===DONE=== --EXPECT-- *** Testing date_sub() : basic functionality *** string(19) "2008-01-01 12:25:00" @@ -40,4 +39,3 @@ string(19) "2004-06-26 23:54:55" string(19) "2004-06-26 23:54:55" string(19) "2004-06-24 23:53:55" string(19) "2003-04-24 00:08:25" -===DONE=== diff --git a/ext/date/tests/date_sunrise_and_sunset_basic.phpt b/ext/date/tests/date_sunrise_and_sunset_basic.phpt index f7eb30a3abf..b707c3ccb3d 100644 --- a/ext/date/tests/date_sunrise_and_sunset_basic.phpt +++ b/ext/date/tests/date_sunrise_and_sunset_basic.phpt @@ -18,9 +18,7 @@ echo date("D M d Y") . ', sunrise time : ' . date_sunrise(time(), SUNFUNCS_RET_S echo date("D M d Y") . ', sunset time : ' . date_sunset(time(), SUNFUNCS_RET_STRING, 38.4, -9, 90, 1) . "\n"; ?> -===Done=== --EXPECTF-- Basic test for date_sunrise() and date_sunset() %s %s %d %d, sunrise time : %d:%d %s %s %d %d, sunset time : %d:%d -===Done=== diff --git a/ext/date/tests/date_sunrise_variation7.phpt b/ext/date/tests/date_sunrise_variation7.phpt index d31bf3aabac..90d3e283339 100644 --- a/ext/date/tests/date_sunrise_variation7.phpt +++ b/ext/date/tests/date_sunrise_variation7.phpt @@ -33,7 +33,6 @@ foreach($inputs as $timezone => $value) { } ?> -===DONE=== --EXPECT-- *** Testing date_sunrise() : usage variation *** string(5) "06:42" @@ -54,4 +53,3 @@ string(5) "06:23" string(5) "06:22" string(5) "06:03" string(5) "06:02" -===DONE=== diff --git a/ext/date/tests/date_sunrise_variation8.phpt b/ext/date/tests/date_sunrise_variation8.phpt index 8ab10bf1c0a..6b115c32189 100644 --- a/ext/date/tests/date_sunrise_variation8.phpt +++ b/ext/date/tests/date_sunrise_variation8.phpt @@ -35,7 +35,6 @@ foreach( $time_date as $date => $time ){ } ?> -===DONE=== --EXPECT-- *** Testing date_sunrise() : usage variation *** @@ -70,4 +69,3 @@ bool(false) bool(false) bool(false) bool(false) -===DONE=== diff --git a/ext/date/tests/date_sunset_variation7.phpt b/ext/date/tests/date_sunset_variation7.phpt index cb2955702c4..3d51a0ca26d 100644 --- a/ext/date/tests/date_sunset_variation7.phpt +++ b/ext/date/tests/date_sunset_variation7.phpt @@ -33,7 +33,6 @@ foreach($inputs as $timezone => $value) { var_dump( date_sunset($time, SUNFUNCS_RET_STRING, $value["Latitude"], $value["Longitude"], 90, $value["GMT"]) ); } ?> -===DONE=== --EXPECT-- *** Testing date_sunset() : usage variation *** @@ -72,4 +71,3 @@ string(5) "17:21" --Pacific/Wallis-- string(5) "17:36" string(5) "17:36" -===DONE=== diff --git a/ext/date/tests/date_sunset_variation8.phpt b/ext/date/tests/date_sunset_variation8.phpt index 518754bc36d..7470a04c07c 100644 --- a/ext/date/tests/date_sunset_variation8.phpt +++ b/ext/date/tests/date_sunset_variation8.phpt @@ -35,7 +35,6 @@ foreach( $time_date as $date => $time ){ } ?> -===DONE=== --EXPECT-- *** Testing date_sunset() : usage variation *** @@ -70,4 +69,3 @@ bool(false) bool(false) bool(false) bool(false) -===DONE=== diff --git a/ext/date/tests/date_time_set_basic1.phpt b/ext/date/tests/date_time_set_basic1.phpt index 7efdeb62aff..d0b714f72f5 100644 --- a/ext/date/tests/date_time_set_basic1.phpt +++ b/ext/date/tests/date_time_set_basic1.phpt @@ -34,7 +34,6 @@ date_time_set($datetime, 54, 25); echo "After modification5 " . date_format($datetime, DATE_RFC2822) . "\n"; ?> -===DONE=== --EXPECT-- *** Testing date_time_set() : basic functionality *** Initial date: Sat, 31 Jan 2009 15:14:10 +0000 @@ -43,4 +42,3 @@ After modification2 Sat, 31 Jan 2009 19:05:59 +0000 After modification3 Sun, 01 Feb 2009 00:10:00 +0000 After modification4 Mon, 02 Feb 2009 23:35:47 +0000 After modification5 Wed, 04 Feb 2009 06:25:00 +0000 -===DONE=== diff --git a/ext/date/tests/date_timezone_get_basic1.phpt b/ext/date/tests/date_timezone_get_basic1.phpt index 9e8e92cde86..5b2fda596fb 100644 --- a/ext/date/tests/date_timezone_get_basic1.phpt +++ b/ext/date/tests/date_timezone_get_basic1.phpt @@ -26,10 +26,8 @@ $tz = date_timezone_get($object); var_dump( timezone_name_get($tz) ); ?> -===DONE=== --EXPECT-- *** Testing date_timezone_get() : basic functionality *** string(13) "Europe/London" string(16) "America/New_York" string(19) "America/Los_Angeles" -===DONE=== diff --git a/ext/date/tests/date_timezone_set_basic1.phpt b/ext/date/tests/date_timezone_set_basic1.phpt index bfab43eda63..ef66ff9d3b1 100644 --- a/ext/date/tests/date_timezone_set_basic1.phpt +++ b/ext/date/tests/date_timezone_set_basic1.phpt @@ -25,9 +25,7 @@ $tz = date_timezone_get($datetime); echo "New timezone: " . timezone_name_get($tz) . "\n"; ?> -===DONE=== --EXPECT-- *** Testing date_timezone_set() : basic functionality *** Default timezone: Europe/London New timezone: America/Los_Angeles -===DONE=== diff --git a/ext/date/tests/getdate_basic.phpt b/ext/date/tests/getdate_basic.phpt index eed29c6e4b2..730f4096363 100644 --- a/ext/date/tests/getdate_basic.phpt +++ b/ext/date/tests/getdate_basic.phpt @@ -22,7 +22,6 @@ var_dump( getdate($timestamp) ); var_dump( getdate() ); ?> -===DONE=== --EXPECTF-- *** Testing getdate() : basic functionality *** array(11) { @@ -73,4 +72,3 @@ array(11) { [0]=> int(%d) } -===DONE=== diff --git a/ext/date/tests/getdate_variation2.phpt b/ext/date/tests/getdate_variation2.phpt index 1e0d771afe0..0d4cb114cdc 100644 --- a/ext/date/tests/getdate_variation2.phpt +++ b/ext/date/tests/getdate_variation2.phpt @@ -30,7 +30,6 @@ foreach($inputs as $key =>$value) { }; ?> -===DONE=== --EXPECT-- *** Testing getdate() : usage variation *** @@ -111,4 +110,3 @@ array(11) { [0]=> int(-8) } -===DONE=== diff --git a/ext/date/tests/getdate_variation3.phpt b/ext/date/tests/getdate_variation3.phpt index 27c49a71e21..1c4891ee6ba 100644 --- a/ext/date/tests/getdate_variation3.phpt +++ b/ext/date/tests/getdate_variation3.phpt @@ -30,7 +30,6 @@ foreach($inputs as $key =>$value) { }; ?> -===DONE=== --EXPECT-- *** Testing getdate() : usage variation *** @@ -111,4 +110,3 @@ array(11) { [0]=> int(-51966) } -===DONE=== diff --git a/ext/date/tests/getdate_variation4.phpt b/ext/date/tests/getdate_variation4.phpt index 49e2311c2e2..b2b0019204c 100644 --- a/ext/date/tests/getdate_variation4.phpt +++ b/ext/date/tests/getdate_variation4.phpt @@ -31,7 +31,6 @@ foreach($inputs as $key =>$value) { }; ?> -===DONE=== --EXPECT-- *** Testing getdate() : usage variation *** @@ -138,4 +137,3 @@ array(11) { [0]=> int(94694400) } -===DONE=== diff --git a/ext/date/tests/getdate_variation5.phpt b/ext/date/tests/getdate_variation5.phpt index f9c525ab4ba..2bd00ac3a75 100644 --- a/ext/date/tests/getdate_variation5.phpt +++ b/ext/date/tests/getdate_variation5.phpt @@ -35,7 +35,6 @@ foreach($inputs as $timezone) { var_dump( getdate(0) ); }; ?> -===DONE=== --EXPECT-- *** Testing getdate() : usage variation *** @@ -220,4 +219,3 @@ array(11) { [0]=> int(0) } -===DONE=== diff --git a/ext/date/tests/getdate_variation6.phpt b/ext/date/tests/getdate_variation6.phpt index a859afae1b0..cb7ca9a9a39 100644 --- a/ext/date/tests/getdate_variation6.phpt +++ b/ext/date/tests/getdate_variation6.phpt @@ -25,7 +25,6 @@ foreach($inputs as $key => $value) { var_dump( getdate($value) ); }; ?> -===DONE=== --EXPECT-- *** Testing getdate() : usage variation *** @@ -106,4 +105,3 @@ array(11) { [0]=> int(-10) } -===DONE=== diff --git a/ext/date/tests/gettimeofday_basic.phpt b/ext/date/tests/gettimeofday_basic.phpt index f9821307527..16314839b30 100644 --- a/ext/date/tests/gettimeofday_basic.phpt +++ b/ext/date/tests/gettimeofday_basic.phpt @@ -28,7 +28,6 @@ $get_as_float = false; var_dump( gettimeofday($get_as_float) ); ?> -===DONE=== --EXPECTF-- *** Testing gettimeofday() : basic functionality *** float(%f) @@ -52,4 +51,3 @@ array(4) { ["dsttime"]=> int(0) } -===DONE=== diff --git a/ext/date/tests/gmdate_basic.phpt b/ext/date/tests/gmdate_basic.phpt index 3ebde84d62c..118d7f656f3 100644 --- a/ext/date/tests/gmdate_basic.phpt +++ b/ext/date/tests/gmdate_basic.phpt @@ -22,9 +22,7 @@ var_dump( gmdate($format, $timestamp) ); var_dump( gmdate($format) ); ?> -===DONE=== --EXPECTF-- *** Testing gmdate() : basic functionality *** string(24) "2008-08-08T08:08:08+0000" string(%d) "%s" -===DONE=== diff --git a/ext/date/tests/gmdate_variation10.phpt b/ext/date/tests/gmdate_variation10.phpt index fd72d5bf756..1de17d2ab13 100644 --- a/ext/date/tests/gmdate_variation10.phpt +++ b/ext/date/tests/gmdate_variation10.phpt @@ -39,7 +39,6 @@ var_dump( gmdate('T') ); var_dump( gmdate('T', $timestamp) ); ?> -===DONE=== --EXPECTF-- *** Testing gmdate() : usage variation *** @@ -66,4 +65,3 @@ string(3) "GMT" -- Testing gmdate() function with timezone offset format -- string(3) "GMT" string(3) "GMT" -===DONE=== diff --git a/ext/date/tests/gmdate_variation11.phpt b/ext/date/tests/gmdate_variation11.phpt index 601864d8298..cd3fda5c1d8 100644 --- a/ext/date/tests/gmdate_variation11.phpt +++ b/ext/date/tests/gmdate_variation11.phpt @@ -27,7 +27,6 @@ var_dump( gmdate('U') ); var_dump( gmdate('U', $timestamp) ); ?> -===DONE=== --EXPECTF-- *** Testing gmdate() : usage variation *** @@ -42,4 +41,3 @@ string(31) "Fri, 08 Aug 2008 08:08:08 +0000" -- Testing gmdate() function with seconds since Unix Epoch format -- string(%d) "%d" string(10) "1218182888" -===DONE=== diff --git a/ext/date/tests/gmdate_variation12.phpt b/ext/date/tests/gmdate_variation12.phpt index 60bb69a32aa..38af31db3c1 100644 --- a/ext/date/tests/gmdate_variation12.phpt +++ b/ext/date/tests/gmdate_variation12.phpt @@ -30,7 +30,6 @@ $timestamp = mktime(03, 14, 10, 1, 19, 2038); var_dump( gmdate(DATE_ISO8601, $timestamp) ); ?> -===DONE=== --EXPECTREGEX-- \*\*\* Testing gmdate\(\) : usage variation \*\*\* @@ -45,4 +44,3 @@ string\(24\) "2038-01-19T03:14:07\+0000" -- Testing gmdate\(\) function with greater than the range of timestamp -- string\(24\) "(1970-01-01T00:00:00\+0000|2038-01-19T03:14:10\+0000)" -===DONE=== diff --git a/ext/date/tests/gmdate_variation13.phpt b/ext/date/tests/gmdate_variation13.phpt index 58103ec9f42..17b4f43b05d 100644 --- a/ext/date/tests/gmdate_variation13.phpt +++ b/ext/date/tests/gmdate_variation13.phpt @@ -36,7 +36,6 @@ foreach($inputs as $key =>$value) { }; ?> -===DONE=== --EXPECTF-- *** Testing gmdate() : usage variation *** @@ -79,4 +78,3 @@ string(%d) "%s" --DATE_W3C Constant-- string(25) "2008-08-08T08:08:08+00:00" string(%d) "%s" -===DONE=== diff --git a/ext/date/tests/gmdate_variation3.phpt b/ext/date/tests/gmdate_variation3.phpt index 8e13182a64f..bc3ce652be8 100644 --- a/ext/date/tests/gmdate_variation3.phpt +++ b/ext/date/tests/gmdate_variation3.phpt @@ -33,7 +33,6 @@ foreach($inputs as $key =>$value) { }; ?> -===DONE=== --EXPECTF-- *** Testing gmdate() : usage variation *** @@ -56,4 +55,3 @@ string(1) "5" --Day of the year-- string(%d) "%d" string(3) "220" -===DONE=== diff --git a/ext/date/tests/gmdate_variation4.phpt b/ext/date/tests/gmdate_variation4.phpt index a23877923ab..0b4a25fff4c 100644 --- a/ext/date/tests/gmdate_variation4.phpt +++ b/ext/date/tests/gmdate_variation4.phpt @@ -27,7 +27,6 @@ var_dump( gmdate('S') ); var_dump( gmdate('S', $timestamp) ); ?> -===DONE=== --EXPECTF-- *** Testing gmdate() : usage variation *** @@ -42,4 +41,3 @@ string(6) "Friday" -- Testing gmdate() function with English ordinal suffix -- string(%d) "%s" string(2) "th" -===DONE=== diff --git a/ext/date/tests/gmdate_variation5.phpt b/ext/date/tests/gmdate_variation5.phpt index 0127fc5876a..cd8b0d581f7 100644 --- a/ext/date/tests/gmdate_variation5.phpt +++ b/ext/date/tests/gmdate_variation5.phpt @@ -19,11 +19,9 @@ var_dump( gmdate('W') ); var_dump( gmdate('W', $timestamp) ); ?> -===DONE=== --EXPECTF-- *** Testing gmdate() : usage variation *** -- Testing gmdate() function with ISO-8601 week number of year format -- string(%d) "%d" string(2) "32" -===DONE=== diff --git a/ext/date/tests/gmdate_variation6.phpt b/ext/date/tests/gmdate_variation6.phpt index f5d8684ec73..456f85a2f24 100644 --- a/ext/date/tests/gmdate_variation6.phpt +++ b/ext/date/tests/gmdate_variation6.phpt @@ -35,7 +35,6 @@ var_dump( gmdate('t') ); var_dump( gmdate('t', $timestamp) ); ?> -===DONE=== --EXPECTF-- *** Testing gmdate() : usage variation *** @@ -58,4 +57,3 @@ string(1) "8" -- Testing gmdate() function with number of days in a month format -- string(%d) "%d" string(2) "31" -===DONE=== diff --git a/ext/date/tests/gmdate_variation7.phpt b/ext/date/tests/gmdate_variation7.phpt index 1b590ad75b2..8f1698d960d 100644 --- a/ext/date/tests/gmdate_variation7.phpt +++ b/ext/date/tests/gmdate_variation7.phpt @@ -35,7 +35,6 @@ var_dump( gmdate('y') ); var_dump( gmdate('y', $timestamp) ); ?> -===DONE=== --EXPECTF-- *** Testing gmdate() : usage variation *** @@ -57,4 +56,3 @@ string(4) "2008" -- Testing gmdate() function with 2 digit representation year format -- string(2) "%d" string(2) "08" -===DONE=== diff --git a/ext/date/tests/gmdate_variation9.phpt b/ext/date/tests/gmdate_variation9.phpt index 85c4e720426..17eb1df8069 100644 --- a/ext/date/tests/gmdate_variation9.phpt +++ b/ext/date/tests/gmdate_variation9.phpt @@ -35,7 +35,6 @@ foreach($time_formats as $key =>$value) { } ?> -===DONE=== --EXPECTF-- *** Testing gmdate() : usage variation *** @@ -78,4 +77,3 @@ string(2) "08" --Milliseconds-- string(%d) "%d" string(6) "000000" -===DONE=== diff --git a/ext/date/tests/gmmktime_basic.phpt b/ext/date/tests/gmmktime_basic.phpt index dca6675e6c2..303bd9b010e 100644 --- a/ext/date/tests/gmmktime_basic.phpt +++ b/ext/date/tests/gmmktime_basic.phpt @@ -22,8 +22,6 @@ $year = 2008; var_dump( gmmktime($hour, $min, $sec, $mon, $day, $year) ); ?> -===DONE=== --EXPECTF-- *** Testing gmmktime() : basic functionality *** int(1218182888) -===DONE=== diff --git a/ext/date/tests/gmmktime_variation7.phpt b/ext/date/tests/gmmktime_variation7.phpt index 223da1cc718..e943f7db151 100644 --- a/ext/date/tests/gmmktime_variation7.phpt +++ b/ext/date/tests/gmmktime_variation7.phpt @@ -33,7 +33,6 @@ echo "\n-- Testing gmmktime() function with five optional argument --\n"; var_dump( gmmktime($hour, $min, $sec, $mon, $day) ); ?> -===DONE=== --EXPECTF-- *** Testing gmmktime() : usage variation *** @@ -51,4 +50,3 @@ int(%d) -- Testing gmmktime() function with five optional argument -- int(%d) -===DONE=== diff --git a/ext/date/tests/gmmktime_variation8.phpt b/ext/date/tests/gmmktime_variation8.phpt index ab6e45e342e..4bbbe6eb4ec 100644 --- a/ext/date/tests/gmmktime_variation8.phpt +++ b/ext/date/tests/gmmktime_variation8.phpt @@ -32,7 +32,6 @@ $year = 0x7D8; echo "\n-- Testing gmmktime() function with supplying hexa decimal values to arguments --\n"; var_dump( gmmktime($hour, $min, $sec, $mon, $day, $year) ); ?> -===DONE=== --EXPECT-- *** Testing gmmktime() : usage variation *** @@ -41,4 +40,3 @@ int(1218182888) -- Testing gmmktime() function with supplying hexa decimal values to arguments -- int(1218182888) -===DONE=== diff --git a/ext/date/tests/gmmktime_variation9.phpt b/ext/date/tests/gmmktime_variation9.phpt index 1d1750b9b51..549b9d88faf 100644 --- a/ext/date/tests/gmmktime_variation9.phpt +++ b/ext/date/tests/gmmktime_variation9.phpt @@ -35,7 +35,6 @@ foreach($inputs as $key =>$value) { var_dump( gmmktime($hour, $min, $sec, $mon, $value, $value) ); } ?> -===DONE=== --EXPECTREGEX-- \*\*\* Testing gmmktime\(\) : usage variation \*\*\* @@ -59,4 +58,3 @@ int\(1218181808\) int\(1218182870\) int\(1170922088\) (bool|int)\((false|-62465356312)\) -===DONE=== diff --git a/ext/date/tests/gmstrftime_basic.phpt b/ext/date/tests/gmstrftime_basic.phpt index 1accff51276..7c83b147a2a 100644 --- a/ext/date/tests/gmstrftime_basic.phpt +++ b/ext/date/tests/gmstrftime_basic.phpt @@ -21,9 +21,7 @@ var_dump( gmstrftime($format, $timestamp) ); var_dump( gmstrftime($format) ); ?> -===DONE=== --EXPECTF-- *** Testing gmstrftime() : basic functionality *** string(20) "Aug 08 2008 08:08:08" string(%d) "%s %d %d %d:%d:%d" -===DONE=== diff --git a/ext/date/tests/gmstrftime_variation10.phpt b/ext/date/tests/gmstrftime_variation10.phpt index 70cca370ba8..842490ab4f2 100644 --- a/ext/date/tests/gmstrftime_variation10.phpt +++ b/ext/date/tests/gmstrftime_variation10.phpt @@ -36,7 +36,6 @@ foreach($inputs as $key =>$value) { }; ?> -===DONE=== --EXPECTF-- *** Testing gmstrftime() : usage variation *** @@ -47,4 +46,3 @@ string(2) "32" --Weekday as decimal-- string(%d) "%d" string(1) "5" -===DONE=== diff --git a/ext/date/tests/gmstrftime_variation11.phpt b/ext/date/tests/gmstrftime_variation11.phpt index f64c3ea1e24..7e7ac1c8fd6 100644 --- a/ext/date/tests/gmstrftime_variation11.phpt +++ b/ext/date/tests/gmstrftime_variation11.phpt @@ -21,11 +21,9 @@ var_dump( gmstrftime($format) ); var_dump( gmstrftime($format, $timestamp) ); ?> -===DONE=== --EXPECTF-- *** Testing gmstrftime() : usage variation *** -- Testing gmstrftime() function with Abbreviated month name format %h -- string(%d) "%s" string(3) "Aug" -===DONE=== diff --git a/ext/date/tests/gmstrftime_variation12.phpt b/ext/date/tests/gmstrftime_variation12.phpt index 96d034b2d2b..42f100a1f12 100644 --- a/ext/date/tests/gmstrftime_variation12.phpt +++ b/ext/date/tests/gmstrftime_variation12.phpt @@ -27,11 +27,9 @@ var_dump( gmstrftime($format) ); var_dump( gmstrftime($format, $timestamp) ); ?> -===DONE=== --EXPECTF-- *** Testing gmstrftime() : usage variation *** -- Testing gmstrftime() function with Abbreviated month name format %h -- string(%d) "%s" string(3) "Aug" -===DONE=== diff --git a/ext/date/tests/gmstrftime_variation13.phpt b/ext/date/tests/gmstrftime_variation13.phpt index 9a7a9b3c4be..ef2026d5623 100644 --- a/ext/date/tests/gmstrftime_variation13.phpt +++ b/ext/date/tests/gmstrftime_variation13.phpt @@ -32,7 +32,6 @@ foreach($inputs as $key =>$value) { }; ?> -===DONE=== --EXPECTF-- *** Testing gmstrftime() : usage variation *** @@ -51,4 +50,3 @@ string(4) "2008" --Year without century-- string(2) "%d" string(2) "08" -===DONE=== diff --git a/ext/date/tests/gmstrftime_variation14.phpt b/ext/date/tests/gmstrftime_variation14.phpt index fca6829231c..eb774af09bc 100644 --- a/ext/date/tests/gmstrftime_variation14.phpt +++ b/ext/date/tests/gmstrftime_variation14.phpt @@ -38,7 +38,6 @@ foreach($inputs as $key =>$value) { }; ?> -===DONE=== --EXPECTF-- *** Testing gmstrftime() : usage variation *** @@ -57,4 +56,3 @@ string(4) "2008" --Year without century-- string(%d) "%d" string(2) "08" -===DONE=== diff --git a/ext/date/tests/gmstrftime_variation15.phpt b/ext/date/tests/gmstrftime_variation15.phpt index ac91c66a9e9..cc956a9ba1d 100644 --- a/ext/date/tests/gmstrftime_variation15.phpt +++ b/ext/date/tests/gmstrftime_variation15.phpt @@ -31,7 +31,6 @@ foreach($inputs as $key =>$value) { }; ?> -===DONE=== --EXPECTF-- *** Testing gmstrftime() : usage variation *** @@ -46,4 +45,3 @@ string(5) "08:08" --Current time %H:%M:%S format-- string(%d) "%d:%d:%d" string(8) "08:08:08" -===DONE=== diff --git a/ext/date/tests/gmstrftime_variation16.phpt b/ext/date/tests/gmstrftime_variation16.phpt index 762c9541633..2f201857938 100644 --- a/ext/date/tests/gmstrftime_variation16.phpt +++ b/ext/date/tests/gmstrftime_variation16.phpt @@ -37,7 +37,6 @@ foreach($inputs as $key =>$value) { }; ?> -===DONE=== --EXPECTF-- *** Testing gmstrftime() : usage variation *** @@ -52,4 +51,3 @@ string(5) "14:08" --Current time %H:%M:%S format-- string(%d) "%d:%d:%d" string(8) "14:08:08" -===DONE=== diff --git a/ext/date/tests/gmstrftime_variation17.phpt b/ext/date/tests/gmstrftime_variation17.phpt index 9abdb76e0cf..9ff60af2770 100644 --- a/ext/date/tests/gmstrftime_variation17.phpt +++ b/ext/date/tests/gmstrftime_variation17.phpt @@ -21,11 +21,9 @@ var_dump( gmstrftime($format) ); var_dump( gmstrftime($format, $timestamp) ); ?> -===DONE=== --EXPECTF-- *** Testing gmstrftime() : usage variation *** -- Testing gmstrftime() function with Day of the month as decimal single digit format -- string(2) "%A%d" string(2) " 8" -===DONE=== diff --git a/ext/date/tests/gmstrftime_variation18.phpt b/ext/date/tests/gmstrftime_variation18.phpt index f74d82229bd..74912dfa48b 100644 --- a/ext/date/tests/gmstrftime_variation18.phpt +++ b/ext/date/tests/gmstrftime_variation18.phpt @@ -27,11 +27,9 @@ var_dump( gmstrftime($format) ); var_dump( gmstrftime($format, $timestamp) ); ?> -===DONE=== --EXPECTF-- *** Testing gmstrftime() : usage variation *** -- Testing gmstrftime() function with Day of the month as decimal single digit format -- string(%d) "%s" string(2) " 8" -===DONE=== diff --git a/ext/date/tests/gmstrftime_variation19.phpt b/ext/date/tests/gmstrftime_variation19.phpt index 983911fa48c..9c84901acf7 100644 --- a/ext/date/tests/gmstrftime_variation19.phpt +++ b/ext/date/tests/gmstrftime_variation19.phpt @@ -30,7 +30,6 @@ foreach($inputs as $key =>$value) { }; ?> -===DONE=== --EXPECT-- *** Testing gmstrftime() : usage variation *** @@ -43,4 +42,3 @@ string(1) " --Tab character-- string(1) " " string(1) " " -===DONE=== diff --git a/ext/date/tests/gmstrftime_variation20.phpt b/ext/date/tests/gmstrftime_variation20.phpt index 135520e37cd..12be1e8b1fe 100644 --- a/ext/date/tests/gmstrftime_variation20.phpt +++ b/ext/date/tests/gmstrftime_variation20.phpt @@ -36,7 +36,6 @@ foreach($inputs as $key =>$value) { }; ?> -===DONE=== --EXPECTREGEX-- \*\*\* Testing gmstrftime\(\) : usage variation \*\*\* @@ -49,4 +48,3 @@ string\(1\) " --Tab character-- string\(1\) "\s" string\(1\) "\s" -===DONE=== diff --git a/ext/date/tests/gmstrftime_variation21.phpt b/ext/date/tests/gmstrftime_variation21.phpt index 8ff050fc9a4..840e467ea73 100644 --- a/ext/date/tests/gmstrftime_variation21.phpt +++ b/ext/date/tests/gmstrftime_variation21.phpt @@ -31,7 +31,6 @@ foreach($inputs as $key =>$value) { }; ?> -===DONE=== --EXPECTF-- *** Testing gmstrftime() : usage variation *** @@ -46,4 +45,3 @@ string(8) "08/08/08" --Preferred time representation-- string(%d) "%d:%d:%d" string(8) "08:08:08" -===DONE=== diff --git a/ext/date/tests/gmstrftime_variation22.phpt b/ext/date/tests/gmstrftime_variation22.phpt index 1a69726f67b..207a77db98d 100644 --- a/ext/date/tests/gmstrftime_variation22.phpt +++ b/ext/date/tests/gmstrftime_variation22.phpt @@ -41,7 +41,6 @@ foreach($inputs as $key =>$value) { }; ?> -===DONE=== --EXPECT-- *** Testing gmstrftime() : usage variation *** @@ -56,4 +55,3 @@ string(8) "08/08/08" --Preferred time representation-- string(2) "%X" string(8) "08:08:08" -===DONE=== diff --git a/ext/date/tests/gmstrftime_variation3.phpt b/ext/date/tests/gmstrftime_variation3.phpt index aebb938a77d..fc4120c8ec1 100644 --- a/ext/date/tests/gmstrftime_variation3.phpt +++ b/ext/date/tests/gmstrftime_variation3.phpt @@ -30,7 +30,6 @@ foreach($inputs as $key =>$value) { }; ?> -===DONE=== --EXPECTF-- *** Testing gmstrftime() : usage variation *** @@ -49,4 +48,3 @@ string(2) "31" --Week number of the year in decimal number-- string(%d) "%d" string(2) "31" -===DONE=== diff --git a/ext/date/tests/gmstrftime_variation4.phpt b/ext/date/tests/gmstrftime_variation4.phpt index 3ec4e06e176..daf35af5ab8 100644 --- a/ext/date/tests/gmstrftime_variation4.phpt +++ b/ext/date/tests/gmstrftime_variation4.phpt @@ -29,7 +29,6 @@ foreach($inputs as $key =>$value) { }; ?> -===DONE=== --EXPECTF-- *** Testing gmstrftime() : usage variation *** @@ -44,4 +43,3 @@ string(6) "August" --Month as decimal-- string(%d) "%d" string(2) "08" -===DONE=== diff --git a/ext/date/tests/gmstrftime_variation5.phpt b/ext/date/tests/gmstrftime_variation5.phpt index c43c1e37406..7a8f58713f5 100644 --- a/ext/date/tests/gmstrftime_variation5.phpt +++ b/ext/date/tests/gmstrftime_variation5.phpt @@ -33,7 +33,6 @@ foreach($inputs as $key =>$value) { }; ?> -===DONE=== --EXPECTF-- *** Testing gmstrftime() : usage variation *** @@ -48,4 +47,3 @@ string(4) "2008" --Time zone offset-- string(%s) "%s" string(%s) "%s" -===DONE=== diff --git a/ext/date/tests/gmstrftime_variation6.phpt b/ext/date/tests/gmstrftime_variation6.phpt index f09df7847b9..055cf2362c9 100644 --- a/ext/date/tests/gmstrftime_variation6.phpt +++ b/ext/date/tests/gmstrftime_variation6.phpt @@ -33,7 +33,6 @@ foreach($inputs as $key =>$value) { }; ?> -===DONE=== --EXPECTF-- *** Testing gmstrftime() : usage variation *** @@ -56,4 +55,3 @@ string(2) "AM" --Second as decimal number-- string(%d) "%d" string(2) "08" -===DONE=== diff --git a/ext/date/tests/gmstrftime_variation7.phpt b/ext/date/tests/gmstrftime_variation7.phpt index 4cb69e1d2f3..5a1a70024a1 100644 --- a/ext/date/tests/gmstrftime_variation7.phpt +++ b/ext/date/tests/gmstrftime_variation7.phpt @@ -31,7 +31,6 @@ foreach($inputs as $key =>$value) { }; ?> -===DONE=== --EXPECTF-- *** Testing gmstrftime() : usage variation *** @@ -46,4 +45,3 @@ string(3) "221" --Day of the week as a decimal number-- string(%d) "%d" string(1) "5" -===DONE=== diff --git a/ext/date/tests/gmstrftime_variation8.phpt b/ext/date/tests/gmstrftime_variation8.phpt index 311956586a9..c7821835277 100644 --- a/ext/date/tests/gmstrftime_variation8.phpt +++ b/ext/date/tests/gmstrftime_variation8.phpt @@ -29,11 +29,9 @@ foreach($inputs as $key =>$value) { }; ?> -===DONE=== --EXPECT-- *** Testing gmstrftime() : usage variation *** --A literal % character-- string(1) "%" string(1) "%" -===DONE=== diff --git a/ext/date/tests/gmstrftime_variation9.phpt b/ext/date/tests/gmstrftime_variation9.phpt index 560ea2db473..dbc3f47f941 100644 --- a/ext/date/tests/gmstrftime_variation9.phpt +++ b/ext/date/tests/gmstrftime_variation9.phpt @@ -30,7 +30,6 @@ foreach($inputs as $key =>$value) { }; ?> -===DONE=== --EXPECTF-- *** Testing gmstrftime() : usage variation *** @@ -41,4 +40,3 @@ string(2) "32" --Weekday as decimal-- string(1) "%d" string(1) "5" -===DONE=== diff --git a/ext/date/tests/idate_basic.phpt b/ext/date/tests/idate_basic.phpt index 2306a5f64f5..86aace6c4b8 100644 --- a/ext/date/tests/idate_basic.phpt +++ b/ext/date/tests/idate_basic.phpt @@ -17,8 +17,6 @@ $format = 'Y'; date_default_timezone_set("Asia/Calcutta"); var_dump( idate($format) ); ?> -===DONE=== --EXPECTF-- *** Testing idate() : basic functionality *** int(%d) -===DONE=== diff --git a/ext/date/tests/idate_variation4.phpt b/ext/date/tests/idate_variation4.phpt index 15be1807908..4f95e7bd8b5 100644 --- a/ext/date/tests/idate_variation4.phpt +++ b/ext/date/tests/idate_variation4.phpt @@ -33,7 +33,6 @@ foreach($inputs as $key =>$value) { var_dump( idate($value) ); }; ?> -===DONE=== --EXPECTF-- *** Testing idate() : usage variation *** @@ -63,4 +62,3 @@ int(%d) --Day of the year-- int(%d) -===DONE=== diff --git a/ext/date/tests/idate_variation5.phpt b/ext/date/tests/idate_variation5.phpt index 6064a9e989a..b72f7274d79 100644 --- a/ext/date/tests/idate_variation5.phpt +++ b/ext/date/tests/idate_variation5.phpt @@ -32,7 +32,6 @@ foreach($inputs as $key =>$value) { var_dump( idate($value) ); }; ?> -===DONE=== --EXPECTF-- *** Testing idate() : usage variation *** @@ -59,4 +58,3 @@ int(%d) --Time zone offset-- int(%d) -===DONE=== diff --git a/ext/date/tests/idate_variation6.phpt b/ext/date/tests/idate_variation6.phpt index 28afc93c52d..500befb4b79 100644 --- a/ext/date/tests/idate_variation6.phpt +++ b/ext/date/tests/idate_variation6.phpt @@ -22,7 +22,6 @@ echo "\n-- Testing idate() function for 2 digit year having zero as starting num $timestamp = mktime(8, 8, 8, 8, 8, 2001); var_dump( idate($format, $timestamp) ); ?> -===DONE=== --EXPECT-- *** Testing idate() : usage variation *** @@ -31,4 +30,3 @@ int(70) -- Testing idate() function for 2 digit year having zero as starting number -- int(1) -===DONE=== diff --git a/ext/date/tests/localtime_basic.phpt b/ext/date/tests/localtime_basic.phpt index e957e53fc71..709531e4e0d 100644 --- a/ext/date/tests/localtime_basic.phpt +++ b/ext/date/tests/localtime_basic.phpt @@ -27,7 +27,6 @@ var_dump( localtime($timestamp) ); var_dump( localtime() ); ?> -===DONE=== --EXPECTF-- *** Testing localtime() : basic functionality *** array(9) { @@ -90,4 +89,3 @@ array(9) { [8]=> int(%d) } -===DONE=== diff --git a/ext/date/tests/localtime_variation4.phpt b/ext/date/tests/localtime_variation4.phpt index 99015a399ea..d5062ee6a1a 100644 --- a/ext/date/tests/localtime_variation4.phpt +++ b/ext/date/tests/localtime_variation4.phpt @@ -30,7 +30,6 @@ foreach($inputs as $key =>$value) { } ?> -===DONE=== --EXPECT-- *** Testing localtime() : usage variation *** @@ -159,4 +158,3 @@ array(9) { ["tm_isdst"]=> int(0) } -===DONE=== diff --git a/ext/date/tests/localtime_variation5.phpt b/ext/date/tests/localtime_variation5.phpt index 172d3d49421..3e974e2d88b 100644 --- a/ext/date/tests/localtime_variation5.phpt +++ b/ext/date/tests/localtime_variation5.phpt @@ -30,7 +30,6 @@ foreach($inputs as $key =>$value) { } ?> -===DONE=== --EXPECT-- *** Testing localtime() : usage variation *** @@ -159,4 +158,3 @@ array(9) { ["tm_isdst"]=> int(0) } -===DONE=== diff --git a/ext/date/tests/microtime_basic.phpt b/ext/date/tests/microtime_basic.phpt index a9045947cbd..e70809b1fae 100644 --- a/ext/date/tests/microtime_basic.phpt +++ b/ext/date/tests/microtime_basic.phpt @@ -12,9 +12,7 @@ var_dump(microtime(true)); var_dump(microtime(false)); ?> -===DONE=== --EXPECTF-- string(%d) "%s %s" float(%s) string(%d) "%s %s" -===DONE=== diff --git a/ext/date/tests/microtime_error.phpt b/ext/date/tests/microtime_error.phpt index 0e4b5d5a359..151bead6def 100644 --- a/ext/date/tests/microtime_error.phpt +++ b/ext/date/tests/microtime_error.phpt @@ -26,7 +26,6 @@ foreach ($bad_args as $bad_arg) { } ?> -===DONE=== --EXPECTF-- -- Bad Arg types -- @@ -56,4 +55,3 @@ microtime() expects parameter 1 to be bool, object given --> bad arg: int(1) float(%s) -===DONE=== diff --git a/ext/date/tests/mktime-3.phpt b/ext/date/tests/mktime-3.phpt index cc160839650..de60a6eba0c 100644 --- a/ext/date/tests/mktime-3.phpt +++ b/ext/date/tests/mktime-3.phpt @@ -24,7 +24,6 @@ foreach ($tzs as $tz) { echo "\n"; } ?> -===Done=== --EXPECT-- America/Toronto Y: 0 - January 2000-01-01T01:01:01-0500 @@ -56,4 +55,3 @@ Y: 1999 - January 1999-01-01T01:01:01+0100 Y: 2000 - January 2000-01-01T01:01:01+0100 Y: 2001 - January 2001-01-01T01:01:01+0100 -===Done=== diff --git a/ext/date/tests/mktime_basic1.phpt b/ext/date/tests/mktime_basic1.phpt index 955c05f55cf..d0965f2f838 100644 --- a/ext/date/tests/mktime_basic1.phpt +++ b/ext/date/tests/mktime_basic1.phpt @@ -28,7 +28,6 @@ var_dump( mktime($hour, $minute, $sec, $month, $day) ); var_dump( mktime($hour, $minute, $sec, $month, $day, $year) ); ?> -===DONE=== --EXPECTF-- *** Testing DateTime::modify() : basic functionality *** int(%i) @@ -37,4 +36,3 @@ int(%i) int(%i) int(%i) int(%i) -===DONE=== diff --git a/ext/date/tests/mktime_error.phpt b/ext/date/tests/mktime_error.phpt index c507ecf78b1..e40e40f38dd 100644 --- a/ext/date/tests/mktime_error.phpt +++ b/ext/date/tests/mktime_error.phpt @@ -35,7 +35,6 @@ try { } ?> -===DONE=== --EXPECTF-- *** Testing mktime() : error conditions *** @@ -44,4 +43,3 @@ mktime() expects at least 1 parameter, 0 given -- Testing mktime() function with more than expected no. of arguments -- mktime() expects at most 6 parameters, 7 given -===DONE=== diff --git a/ext/date/tests/strftime_basic.phpt b/ext/date/tests/strftime_basic.phpt index 340ac99e229..aa05eb61154 100644 --- a/ext/date/tests/strftime_basic.phpt +++ b/ext/date/tests/strftime_basic.phpt @@ -22,9 +22,7 @@ var_dump( strftime($format, $timestamp) ); var_dump( strftime($format) ); ?> -===DONE=== --EXPECTF-- *** Testing strftime() : basic functionality *** string(20) "Aug 08 2008 08:08:08" string(%d) "%s %d %d %d:%d:%d" -===DONE=== diff --git a/ext/date/tests/strftime_variation10.phpt b/ext/date/tests/strftime_variation10.phpt index 0a4059ee207..79f99370daa 100644 --- a/ext/date/tests/strftime_variation10.phpt +++ b/ext/date/tests/strftime_variation10.phpt @@ -36,7 +36,6 @@ foreach($inputs as $key =>$value) { } ?> -===DONE=== --EXPECTF-- *** Testing strftime() : usage variation *** @@ -47,4 +46,3 @@ string(2) "32" --Weekday as decimal-- string(%d) "%d" string(1) "5" -===DONE=== diff --git a/ext/date/tests/strftime_variation11.phpt b/ext/date/tests/strftime_variation11.phpt index 737f7c96de4..a169dd966ee 100644 --- a/ext/date/tests/strftime_variation11.phpt +++ b/ext/date/tests/strftime_variation11.phpt @@ -21,11 +21,9 @@ var_dump( strftime($format) ); var_dump( strftime($format, $timestamp) ); ?> -===DONE=== --EXPECTF-- *** Testing strftime() : usage variation *** -- Testing strftime() function with Abbreviated month name format %h -- string(%d) "%s" string(3) "Aug" -===DONE=== diff --git a/ext/date/tests/strftime_variation12.phpt b/ext/date/tests/strftime_variation12.phpt index 07b1b3ec1c5..b8f85ff8420 100644 --- a/ext/date/tests/strftime_variation12.phpt +++ b/ext/date/tests/strftime_variation12.phpt @@ -27,11 +27,9 @@ var_dump( strftime($format) ); var_dump( strftime($format, $timestamp) ); ?> -===DONE=== --EXPECTF-- *** Testing strftime() : usage variation *** -- Testing strftime() function with Abbreviated month name format %h -- string(%d) "%s" string(3) "Aug" -===DONE=== diff --git a/ext/date/tests/strftime_variation13.phpt b/ext/date/tests/strftime_variation13.phpt index cce13fbc3bf..59aef31c298 100644 --- a/ext/date/tests/strftime_variation13.phpt +++ b/ext/date/tests/strftime_variation13.phpt @@ -32,7 +32,6 @@ foreach($inputs as $key =>$value) { } ?> -===DONE=== --EXPECTF-- *** Testing strftime() : usage variation *** @@ -51,4 +50,3 @@ string(4) "2008" --Year without century-- string(2) "%d" string(2) "08" -===DONE=== diff --git a/ext/date/tests/strftime_variation14.phpt b/ext/date/tests/strftime_variation14.phpt index 80074acff8e..eff0389174d 100644 --- a/ext/date/tests/strftime_variation14.phpt +++ b/ext/date/tests/strftime_variation14.phpt @@ -38,7 +38,6 @@ foreach($inputs as $key =>$value) { } ?> -===DONE=== --EXPECTF-- *** Testing strftime() : usage variation *** @@ -57,4 +56,3 @@ string(4) "2008" --Year without century-- string(%d) "%d" string(2) "08" -===DONE=== diff --git a/ext/date/tests/strftime_variation15.phpt b/ext/date/tests/strftime_variation15.phpt index f6e8fedf0bc..301cafc0188 100644 --- a/ext/date/tests/strftime_variation15.phpt +++ b/ext/date/tests/strftime_variation15.phpt @@ -31,7 +31,6 @@ foreach($inputs as $key =>$value) { } ?> -===DONE=== --EXPECTF-- *** Testing strftime() : usage variation *** @@ -46,4 +45,3 @@ string(5) "08:08" --Current time %H:%M:%S format-- string(%d) "%d:%d:%d" string(8) "08:08:08" -===DONE=== diff --git a/ext/date/tests/strftime_variation16.phpt b/ext/date/tests/strftime_variation16.phpt index b74a6fe96f6..2d0b40a57ea 100644 --- a/ext/date/tests/strftime_variation16.phpt +++ b/ext/date/tests/strftime_variation16.phpt @@ -37,7 +37,6 @@ foreach($inputs as $key =>$value) { } ?> -===DONE=== --EXPECTF-- *** Testing strftime() : usage variation *** @@ -52,4 +51,3 @@ string(5) "08:08" --Current time %H:%M:%S format-- string(%d) "%d:%d:%d" string(8) "08:08:08" -===DONE=== diff --git a/ext/date/tests/strftime_variation17.phpt b/ext/date/tests/strftime_variation17.phpt index 04e1cadab00..6a698d230c7 100644 --- a/ext/date/tests/strftime_variation17.phpt +++ b/ext/date/tests/strftime_variation17.phpt @@ -20,11 +20,9 @@ $format = "%e"; var_dump( strftime($format) ); var_dump( strftime($format, $timestamp) ); ?> -===DONE=== --EXPECTF-- *** Testing strftime() : usage variation *** -- Testing strftime() function with Day of the month as decimal single digit format -- string(%d) "%A%d" string(2) " 8" -===DONE=== diff --git a/ext/date/tests/strftime_variation18.phpt b/ext/date/tests/strftime_variation18.phpt index b0f21ff010c..310b7729fa1 100644 --- a/ext/date/tests/strftime_variation18.phpt +++ b/ext/date/tests/strftime_variation18.phpt @@ -26,11 +26,9 @@ $format = "%e"; var_dump( strftime($format) ); var_dump( strftime($format, $timestamp) ); ?> -===DONE=== --EXPECTF-- *** Testing strftime() : usage variation *** -- Testing strftime() function with Day of the month as decimal single digit format -- string(%d) "%s" string(2) " 8" -===DONE=== diff --git a/ext/date/tests/strftime_variation19.phpt b/ext/date/tests/strftime_variation19.phpt index 125a47c7899..13575811d20 100644 --- a/ext/date/tests/strftime_variation19.phpt +++ b/ext/date/tests/strftime_variation19.phpt @@ -30,7 +30,6 @@ foreach($inputs as $key =>$value) { } ?> -===DONE=== --EXPECT-- *** Testing strftime() : usage variation *** @@ -43,4 +42,3 @@ string(1) " --Tab character-- string(1) " " string(1) " " -===DONE=== diff --git a/ext/date/tests/strftime_variation20.phpt b/ext/date/tests/strftime_variation20.phpt index 0fb11914d40..d6bbab12ca6 100644 --- a/ext/date/tests/strftime_variation20.phpt +++ b/ext/date/tests/strftime_variation20.phpt @@ -36,7 +36,6 @@ foreach($inputs as $key =>$value) { } ?> -===DONE=== --EXPECTREGEX-- \*\*\* Testing strftime\(\) : usage variation \*\*\* @@ -49,4 +48,3 @@ string\(1\) " --Tab character-- string\(1\) "\s" string\(1\) "\s" -===DONE=== diff --git a/ext/date/tests/strftime_variation21.phpt b/ext/date/tests/strftime_variation21.phpt index 730716c392b..5e0cf423c5d 100644 --- a/ext/date/tests/strftime_variation21.phpt +++ b/ext/date/tests/strftime_variation21.phpt @@ -31,7 +31,6 @@ foreach($inputs as $key =>$value) { } ?> -===DONE=== --EXPECTF-- *** Testing strftime() : usage variation *** @@ -46,4 +45,3 @@ string(8) "08/08/08" --Preferred time representation-- string(%d) "%d:%d:%d" string(8) "08:08:08" -===DONE=== diff --git a/ext/date/tests/strftime_variation22.phpt b/ext/date/tests/strftime_variation22.phpt index 11dcf756947..0148223802f 100644 --- a/ext/date/tests/strftime_variation22.phpt +++ b/ext/date/tests/strftime_variation22.phpt @@ -41,7 +41,6 @@ foreach($inputs as $key =>$value) { } ?> -===DONE=== --EXPECT-- *** Testing strftime() : usage variation *** @@ -56,4 +55,3 @@ string(8) "08/08/08" --Preferred time representation-- string(2) "%X" string(8) "08:08:08" -===DONE=== diff --git a/ext/date/tests/strftime_variation3.phpt b/ext/date/tests/strftime_variation3.phpt index 69f747ca341..a23402be964 100644 --- a/ext/date/tests/strftime_variation3.phpt +++ b/ext/date/tests/strftime_variation3.phpt @@ -30,7 +30,6 @@ foreach($inputs as $key =>$value) { }; ?> -===DONE=== --EXPECTF-- *** Testing strftime() : usage variation *** @@ -49,4 +48,3 @@ string(2) "31" --Week number of the year in decimal number-- string(%d) "%d" string(2) "31" -===DONE=== diff --git a/ext/date/tests/strftime_variation4.phpt b/ext/date/tests/strftime_variation4.phpt index 54df26a1c60..2152ddda40f 100644 --- a/ext/date/tests/strftime_variation4.phpt +++ b/ext/date/tests/strftime_variation4.phpt @@ -30,7 +30,6 @@ foreach($inputs as $key =>$value) { }; ?> -===DONE=== --EXPECTF-- *** Testing strftime() : usage variation *** @@ -45,4 +44,3 @@ string(6) "August" --Month as decimal-- string(%d) "%d" string(2) "08" -===DONE=== diff --git a/ext/date/tests/strftime_variation5.phpt b/ext/date/tests/strftime_variation5.phpt index 15ad8b08eab..7af084b34c3 100644 --- a/ext/date/tests/strftime_variation5.phpt +++ b/ext/date/tests/strftime_variation5.phpt @@ -32,7 +32,6 @@ foreach($inputs as $key =>$value) { }; ?> -===DONE=== --EXPECTF-- *** Testing strftime() : usage variation *** @@ -47,4 +46,3 @@ string(4) "2008" --Time zone offset-- string(%d) "%s" string(%d) "%s" -===DONE=== diff --git a/ext/date/tests/strftime_variation6.phpt b/ext/date/tests/strftime_variation6.phpt index f4413c6c79b..eadf0d05def 100644 --- a/ext/date/tests/strftime_variation6.phpt +++ b/ext/date/tests/strftime_variation6.phpt @@ -34,7 +34,6 @@ foreach($inputs as $key =>$value) { }; ?> -===DONE=== --EXPECTF-- *** Testing strftime() : usage variation *** @@ -57,4 +56,3 @@ string(2) "PM" --Second as decimal number-- string(%d) "%d" string(2) "08" -===DONE=== diff --git a/ext/date/tests/strftime_variation7.phpt b/ext/date/tests/strftime_variation7.phpt index 29a94063819..63a3d10808a 100644 --- a/ext/date/tests/strftime_variation7.phpt +++ b/ext/date/tests/strftime_variation7.phpt @@ -32,7 +32,6 @@ foreach($inputs as $key =>$value) { }; ?> -===DONE=== --EXPECTF-- *** Testing strftime() : usage variation *** @@ -47,4 +46,3 @@ string(3) "221" --Day of the week as a decimal number-- string(%d) "%d" string(1) "5" -===DONE=== diff --git a/ext/date/tests/strftime_variation8.phpt b/ext/date/tests/strftime_variation8.phpt index 75b41c186ae..44b37a9bb86 100644 --- a/ext/date/tests/strftime_variation8.phpt +++ b/ext/date/tests/strftime_variation8.phpt @@ -21,11 +21,9 @@ var_dump( strftime($format) ); var_dump( strftime($format, $timestamp) ); ?> -===DONE=== --EXPECT-- *** Testing strftime() : usage variation *** -- Testing strftime() function with a literal % character to format -- string(1) "%" string(1) "%" -===DONE=== diff --git a/ext/date/tests/strftime_variation9.phpt b/ext/date/tests/strftime_variation9.phpt index 49363ec27b1..0d2502834c7 100644 --- a/ext/date/tests/strftime_variation9.phpt +++ b/ext/date/tests/strftime_variation9.phpt @@ -30,7 +30,6 @@ foreach($inputs as $key =>$value) { } ?> -===DONE=== --EXPECTF-- *** Testing strftime() : usage variation *** @@ -41,4 +40,3 @@ string(2) "32" --Weekday as decimal-- string(1) "%d" string(1) "5" -===DONE=== diff --git a/ext/date/tests/time_basic.phpt b/ext/date/tests/time_basic.phpt index 0ff2f0120c5..d97b73e2167 100644 --- a/ext/date/tests/time_basic.phpt +++ b/ext/date/tests/time_basic.phpt @@ -10,7 +10,5 @@ Test return type and value for expected input time() var_dump(time()); ?> -===DONE=== --EXPECTF-- int(%d) -===DONE=== diff --git a/ext/date/tests/timezone_abbreviations_list_basic1.phpt b/ext/date/tests/timezone_abbreviations_list_basic1.phpt index 5232fe215fd..b3bf7c84a18 100644 --- a/ext/date/tests/timezone_abbreviations_list_basic1.phpt +++ b/ext/date/tests/timezone_abbreviations_list_basic1.phpt @@ -22,7 +22,6 @@ echo "\n-- Format a sample entry --\n"; var_dump( $abbr["acst"] ); ?> -===DONE=== --EXPECTF-- *** Testing timezone_abbreviations_list() : basic functionality *** string(5) "array" @@ -85,4 +84,3 @@ array(6) { string(20) "Australia/Yancowinna" } } -===DONE=== diff --git a/ext/date/tests/timezone_identifiers_list_basic1.phpt b/ext/date/tests/timezone_identifiers_list_basic1.phpt index b6b0ca43b84..c537b9b4c5e 100644 --- a/ext/date/tests/timezone_identifiers_list_basic1.phpt +++ b/ext/date/tests/timezone_identifiers_list_basic1.phpt @@ -23,7 +23,6 @@ var_dump(in_array("America/New_York", $zones)); var_dump(in_array("UTC", $zones)); ?> -===DONE=== --EXPECT-- *** Testing timezone_identifiers_list() : basic functionality *** Check return tpe is ARRAY @@ -32,5 +31,4 @@ Check array contains some common timezones bool(true) bool(true) bool(true) -===DONE=== diff --git a/ext/date/tests/timezone_name_from_abbr_basic1.phpt b/ext/date/tests/timezone_name_from_abbr_basic1.phpt index b181d8fb686..dd2a796cb6c 100644 --- a/ext/date/tests/timezone_name_from_abbr_basic1.phpt +++ b/ext/date/tests/timezone_name_from_abbr_basic1.phpt @@ -35,7 +35,6 @@ echo "-- Tests with invalid offsets --\n"; var_dump( timezone_name_from_abbr("", 5400) ); // offset = 1.5 hrs var_dump( timezone_name_from_abbr("", 62400) ); // offset = 24 hrs ?> -===DONE=== --EXPECT-- *** Testing timezone_name_from_abbr() : basic functionality *** -- Tests with special cases first - no lookup needed -- @@ -55,4 +54,3 @@ string(15) "America/Halifax" -- Tests with invalid offsets -- bool(false) bool(false) -===DONE=== diff --git a/ext/date/tests/timezone_offset_get_basic1.phpt b/ext/date/tests/timezone_offset_get_basic1.phpt index c7e197af85b..e242200d7fd 100644 --- a/ext/date/tests/timezone_offset_get_basic1.phpt +++ b/ext/date/tests/timezone_offset_get_basic1.phpt @@ -25,10 +25,8 @@ $tz = timezone_open("America/Los_Angeles"); var_dump(timezone_offset_get($tz, $date)); ?> -===DONE=== --EXPECTF-- *** Testing timezone_offset_get() : basic functionality *** %rint\(0\)|int\(3600\)%r %rint\(-18000\)|int\(-14400\)%r %rint\(-28800\)|int\(-25200\)%r -===DONE=== diff --git a/ext/date/tests/timezone_offset_get_error.phpt b/ext/date/tests/timezone_offset_get_error.phpt index 89687db4f2f..07bcf895ddf 100644 --- a/ext/date/tests/timezone_offset_get_error.phpt +++ b/ext/date/tests/timezone_offset_get_error.phpt @@ -61,7 +61,6 @@ try { echo "\n"; } ?> -===DONE=== --EXPECT-- *** Testing timezone_offset_get() : error conditions *** @@ -80,4 +79,3 @@ string(76) "timezone_offset_get() expects parameter 2 to be DateTimeInterface, i string(77) "timezone_offset_get() expects parameter 2 to be DateTimeInterface, null given" -===DONE=== diff --git a/ext/date/tests/timezone_open_basic1.phpt b/ext/date/tests/timezone_open_basic1.phpt index ee54b5feb48..306c8e377d4 100644 --- a/ext/date/tests/timezone_open_basic1.phpt +++ b/ext/date/tests/timezone_open_basic1.phpt @@ -15,7 +15,6 @@ var_dump( timezone_open("Europe/London") ); var_dump( timezone_open("America/Los_Angeles") ); ?> -===DONE=== --EXPECTF-- *** Testing timezone_open() : basic functionality *** object(DateTimeZone)#%d (2) { @@ -36,4 +35,3 @@ object(DateTimeZone)#%d (2) { ["timezone"]=> string(19) "America/Los_Angeles" } -===DONE=== diff --git a/ext/date/tests/timezone_transitions_get_basic1.phpt b/ext/date/tests/timezone_transitions_get_basic1.phpt index 2fd44a430d4..92156d77d16 100644 --- a/ext/date/tests/timezone_transitions_get_basic1.phpt +++ b/ext/date/tests/timezone_transitions_get_basic1.phpt @@ -28,7 +28,6 @@ echo "\n-- Format a sample entry pfor Spring 1963 --\n"; var_dump( $tran[6] ); ?> -===DONE=== --EXPECT-- *** Testing timezone_transitions_get() : basic functionality *** @@ -50,4 +49,3 @@ array(5) { ["abbr"]=> string(3) "BST" } -===DONE=== diff --git a/ext/dba/tests/bug36436.phpt b/ext/dba/tests/bug36436.phpt index fa1d6140f64..fe625b62bc6 100644 --- a/ext/dba/tests/bug36436.phpt +++ b/ext/dba/tests/bug36436.phpt @@ -24,7 +24,6 @@ var_dump(dba_nextkey($db)); dba_close($db); ?> -===DONE=== --CLEAN-- -===DONE=== --EXPECT-- string(32) "1f34b74bde3744265acfc21e0f30af95" -===DONE=== diff --git a/ext/dba/tests/bug48240.phpt b/ext/dba/tests/bug48240.phpt index 75e70da9651..c735c9a07d9 100644 --- a/ext/dba/tests/bug48240.phpt +++ b/ext/dba/tests/bug48240.phpt @@ -18,11 +18,9 @@ var_dump(dba_nextkey($db)); dba_close($db); ?> -===DONE=== --CLEAN-- --EXPECT-- bool(false) -===DONE=== diff --git a/ext/dba/tests/bug62490.phpt b/ext/dba/tests/bug62490.phpt index 41a9cdead7e..a0fc64aafae 100644 --- a/ext/dba/tests/bug62490.phpt +++ b/ext/dba/tests/bug62490.phpt @@ -27,7 +27,6 @@ echo "delete:"; var_dump(dba_delete("a", $dba)); ?> -===DONE=== --CLEAN-- -==DONE== --EXPECT-- string(2) "23" string(2) "42" @@ -63,7 +62,6 @@ string(4) "1337" string(2) "23" string(2) "42" string(4) "1337" -==DONE== --CLEAN-- -==DONE== --EXPECT-- string(6) "value2" -==DONE== --CLEAN-- -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- string(23) "The last content string" } -===DONE=== diff --git a/ext/dba/tests/dba_cdb_001.phpt b/ext/dba/tests/dba_cdb_001.phpt index 82a1c0b585a..3e72d54dab0 100644 --- a/ext/dba/tests/dba_cdb_001.phpt +++ b/ext/dba/tests/dba_cdb_001.phpt @@ -61,7 +61,6 @@ else { } ?> -===DONE=== --CLEAN-- -===DONE=== --EXPECT-- database handler: db1 3NYNYY @@ -47,4 +46,3 @@ array(3) { ["key5"]=> string(23) "The last content string" } -===DONE=== diff --git a/ext/dba/tests/dba_db2.phpt b/ext/dba/tests/dba_db2.phpt index 8662189cbd8..ef48664762f 100644 --- a/ext/dba/tests/dba_db2.phpt +++ b/ext/dba/tests/dba_db2.phpt @@ -11,7 +11,6 @@ DBA DB2 handler test require_once __DIR__ .'/test.inc'; require_once __DIR__ .'/dba_handler.inc'; ?> -===DONE=== --EXPECT-- database handler: db2 3NYNYY @@ -47,4 +46,3 @@ array(3) { ["key5"]=> string(23) "The last content string" } -===DONE=== diff --git a/ext/dba/tests/dba_db3.phpt b/ext/dba/tests/dba_db3.phpt index 670680cb8ab..a07780ea347 100644 --- a/ext/dba/tests/dba_db3.phpt +++ b/ext/dba/tests/dba_db3.phpt @@ -11,7 +11,6 @@ DBA DB3 handler test require_once __DIR__ .'/test.inc'; require_once __DIR__ .'/dba_handler.inc'; ?> -===DONE=== --EXPECT-- database handler: db3 3NYNYY @@ -47,4 +46,3 @@ array(3) { ["key5"]=> string(23) "The last content string" } -===DONE=== diff --git a/ext/dba/tests/dba_db4_000.phpt b/ext/dba/tests/dba_db4_000.phpt index afeedff47c9..4453e06284b 100644 --- a/ext/dba/tests/dba_db4_000.phpt +++ b/ext/dba/tests/dba_db4_000.phpt @@ -11,7 +11,6 @@ $handler = 'db4'; require_once(__DIR__ .'/test.inc'); require_once(__DIR__ .'/dba_handler.inc'); ?> -===DONE=== --CLEAN-- string(23) "The last content string" } -===DONE=== diff --git a/ext/dba/tests/dba_db4_018.phpt b/ext/dba/tests/dba_db4_018.phpt index e4b4cfcf277..e69d60489d1 100644 --- a/ext/dba/tests/dba_db4_018.phpt +++ b/ext/dba/tests/dba_db4_018.phpt @@ -48,7 +48,6 @@ echo dba_fetch("key1", $db_file1), "\n"; echo dba_fetch("key2", $db_file1), "\n"; ?> -===DONE=== --CLEAN-- -===DONE=== - --CLEAN-- -===DONE=== - --CLEAN-- -===DONE=== --CLEAN-- string(23) "The last content string" } -===DONE=== diff --git a/ext/dba/tests/dba_flatfile.phpt b/ext/dba/tests/dba_flatfile.phpt index 4fcaafe32de..1119339ca71 100644 --- a/ext/dba/tests/dba_flatfile.phpt +++ b/ext/dba/tests/dba_flatfile.phpt @@ -11,7 +11,6 @@ DBA FlatFile handler test require_once(__DIR__ .'/test.inc'); require_once(__DIR__ .'/dba_handler.inc'); ?> -===DONE=== --CLEAN-- string(23) "The last content string" } -===DONE=== diff --git a/ext/dba/tests/dba_gdbm.phpt b/ext/dba/tests/dba_gdbm.phpt index 8ca2adfe046..3de1cdd682d 100644 --- a/ext/dba/tests/dba_gdbm.phpt +++ b/ext/dba/tests/dba_gdbm.phpt @@ -14,7 +14,6 @@ DBA GDBM handler test // Read during write is system dependent. Important is that there is no deadlock ?> -===DONE=== --EXPECTF-- database handler: gdbm 3NYNYY @@ -33,4 +32,3 @@ array(3) { ["key5"]=> string(23) "The last content string" } -===DONE=== diff --git a/ext/dba/tests/dba_inifile.phpt b/ext/dba/tests/dba_inifile.phpt index c21413f1aca..cbcd6c1e8d9 100644 --- a/ext/dba/tests/dba_inifile.phpt +++ b/ext/dba/tests/dba_inifile.phpt @@ -11,7 +11,6 @@ DBA INIFILE handler test require_once __DIR__ .'/test.inc'; require_once __DIR__ .'/dba_handler.inc'; ?> -===DONE=== --CLEAN-- string(23) "The last content string" } -===DONE=== diff --git a/ext/dba/tests/dba_lmdb.phpt b/ext/dba/tests/dba_lmdb.phpt index 3ca8bfeb07c..7f6d4840409 100644 --- a/ext/dba/tests/dba_lmdb.phpt +++ b/ext/dba/tests/dba_lmdb.phpt @@ -12,7 +12,6 @@ DBA LMDB handler test $lock_flag = ''; // lock in library require_once __DIR__ .'/dba_handler.inc'; ?> -===DONE=== --CLEAN-- string(23) "The last content string" } -===DONE=== diff --git a/ext/dba/tests/dba_ndbm.phpt b/ext/dba/tests/dba_ndbm.phpt index 616bcb2c6b6..6fc8a1ec3b4 100644 --- a/ext/dba/tests/dba_ndbm.phpt +++ b/ext/dba/tests/dba_ndbm.phpt @@ -11,7 +11,6 @@ DBA NDBM handler test require_once __DIR__ .'/test.inc'; require_once __DIR__ .'/dba_handler.inc'; ?> -===DONE=== --EXPECT-- database handler: ndbm 3NYNYY @@ -47,4 +46,3 @@ array(3) { ["key5"]=> string(23) "The last content string" } -===DONE=== diff --git a/ext/dba/tests/dba_optimize.phpt b/ext/dba/tests/dba_optimize.phpt index 9aee57e39f2..fb54531e5a3 100644 --- a/ext/dba/tests/dba_optimize.phpt +++ b/ext/dba/tests/dba_optimize.phpt @@ -30,8 +30,6 @@ if (($db_file=dba_open($db_filename, "n", $handler))!==FALSE) { } ?> -===DONE=== - --CLEAN-- -===DONE=== --CLEAN-- string(23) "The last content string" } -===DONE=== diff --git a/ext/dba/tests/dba_split.phpt b/ext/dba/tests/dba_split.phpt index 77a0f3b5a0e..c320163ec06 100644 --- a/ext/dba/tests/dba_split.phpt +++ b/ext/dba/tests/dba_split.phpt @@ -19,8 +19,6 @@ var_dump(dba_key_split("[key1]name1[key2]name2")); var_dump(dba_key_split("[key1]name1")); ?> -===DONE=== - --EXPECTF-- array(2) { [0]=> @@ -77,4 +75,3 @@ array(2) { [1]=> string(5) "name1" } -===DONE=== diff --git a/ext/dba/tests/dba_sync.phpt b/ext/dba/tests/dba_sync.phpt index 5c123a2647d..8ca76066267 100644 --- a/ext/dba/tests/dba_sync.phpt +++ b/ext/dba/tests/dba_sync.phpt @@ -30,8 +30,6 @@ if (($db_file=dba_open($db_filename, "n", $handler))!==FALSE) { } ?> -===DONE=== - --CLEAN-- -===DONE=== --CLEAN-- string(23) "The last content string" } -===DONE=== diff --git a/ext/dom/tests/DOMCharacterData_length_error_001.phpt b/ext/dom/tests/DOMCharacterData_length_error_001.phpt index dd38ae2c366..34d5273be4c 100644 --- a/ext/dom/tests/DOMCharacterData_length_error_001.phpt +++ b/ext/dom/tests/DOMCharacterData_length_error_001.phpt @@ -10,7 +10,5 @@ Jason Bouffard $character_data = new DOMCharacterData(); print $character_data->length; ?> -===DONE=== --EXPECTF-- Warning: main(): Invalid State Error in %s -===DONE=== diff --git a/ext/dom/tests/DOMNode_issamenode_basic.phpt b/ext/dom/tests/DOMNode_issamenode_basic.phpt index 21feda8a7e0..f0bbff1c04d 100644 --- a/ext/dom/tests/DOMNode_issamenode_basic.phpt +++ b/ext/dom/tests/DOMNode_issamenode_basic.phpt @@ -30,8 +30,6 @@ else echo "EXPECTING NOT SAME NODE, PASSED\n" ; ?> -===DONE=== --EXPECT-- EXPECTING SAME NODE, PASSED EXPECTING NOT SAME NODE, PASSED -===DONE=== diff --git a/ext/dom/tests/DOMText_appendData_basic.phpt b/ext/dom/tests/DOMText_appendData_basic.phpt index 1472a955ea4..bf8e666bbde 100644 --- a/ext/dom/tests/DOMText_appendData_basic.phpt +++ b/ext/dom/tests/DOMText_appendData_basic.phpt @@ -28,7 +28,6 @@ echo "Text Content: " . $textnode->data . "\n"; echo "\n" . $document->saveXML(); ?> -===DONE=== --EXPECT-- Text Length (one append): 4 Text Length (two appends): 8 @@ -36,5 +35,4 @@ Text Content: data><&" data><&" -===DONE=== diff --git a/ext/dom/tests/bug42082.phpt b/ext/dom/tests/bug42082.phpt index 498d8f03464..6c3bf410a05 100644 --- a/ext/dom/tests/bug42082.phpt +++ b/ext/dom/tests/bug42082.phpt @@ -16,7 +16,6 @@ $doc->loadXML(""); var_dump($doc->firstChild->nodeValue, empty($doc->firstChild->nodeValue), isset($doc->firstChild->nodeValue)); var_dump(empty($doc->nodeType), empty($doc->firstChild->nodeType)) ?> -===DONE=== --EXPECT-- DOMNodeList int(0) @@ -27,4 +26,3 @@ bool(true) bool(true) bool(false) bool(false) -===DONE=== diff --git a/ext/dom/tests/bug54601.phpt b/ext/dom/tests/bug54601.phpt index 7e7ddec16eb..c828ea09e0b 100644 --- a/ext/dom/tests/bug54601.phpt +++ b/ext/dom/tests/bug54601.phpt @@ -20,10 +20,7 @@ $doc->removeChild($n); echo get_class($n), "\n"; print $doc->saveXML(); ?> -===DONE=== - --EXPECT-- DOMDocumentType footextbartext -===DONE=== diff --git a/ext/dom/tests/bug65196.phpt b/ext/dom/tests/bug65196.phpt index c77f97222f1..bb70a665bb1 100644 --- a/ext/dom/tests/bug65196.phpt +++ b/ext/dom/tests/bug65196.phpt @@ -19,8 +19,6 @@ $frag2->appendChild($dom->createElement('div')); $frag2->appendChild($dom->createElement('div')); var_dump($dom->saveHTML($frag2)); ?> -===DONE=== --EXPECT-- string(0) "" string(46) "
" -===DONE=== diff --git a/ext/dom/tests/bug67081.phpt b/ext/dom/tests/bug67081.phpt index faf7f42b2c9..e9156f770ea 100644 --- a/ext/dom/tests/bug67081.phpt +++ b/ext/dom/tests/bug67081.phpt @@ -26,7 +26,6 @@ require_once('skipif.inc'); $domDocument->load(__DIR__ . DIRECTORY_SEPARATOR . "dom.xml"); var_dump($domDocument->doctype->internalSubset); ?> -===DONE=== --EXPECT-- string(19) " " @@ -44,4 +43,3 @@ string(277) " " -===DONE=== diff --git a/ext/dom/tests/bug69846.phpt b/ext/dom/tests/bug69846.phpt index fcca4c06d65..8e0243e24d4 100644 --- a/ext/dom/tests/bug69846.phpt +++ b/ext/dom/tests/bug69846.phpt @@ -28,7 +28,6 @@ foreach ($dataNodes AS $node) { } ?> -===DONE=== --EXPECTF-- int(3) object(DOMText)#%d (19) { @@ -165,4 +164,3 @@ object(DOMText)#%d (19) { string(1) " " } -===DONE=== diff --git a/ext/dom/tests/bug74416.phpt b/ext/dom/tests/bug74416.phpt index c96a927c2e8..f6da96656a1 100644 --- a/ext/dom/tests/bug74416.phpt +++ b/ext/dom/tests/bug74416.phpt @@ -12,9 +12,7 @@ foreach ($rm->getParameters() as $param) { printf("Parameter #%d %s OPTIONAL\n", $param->getPosition(), $param->isOptional() ? "IS" : "IS NOT"); } ?> -===DONE=== --EXPECT-- 1 0 Parameter #0 IS OPTIONAL -===DONE=== diff --git a/ext/dom/tests/bug78025.phpt b/ext/dom/tests/bug78025.phpt index 0a12d9f42f0..4c9d481f2c8 100644 --- a/ext/dom/tests/bug78025.phpt +++ b/ext/dom/tests/bug78025.phpt @@ -11,8 +11,6 @@ $dom = new DOMDocument; $dom->loadHTML($htm); var_dump($dom->doctype->name); ?> -===DONE=== --EXPECTF-- Warning: DOMDocument::loadHTML(): htmlParseDocTypeDecl : no DOCTYPE name ! in Entity, line: 1 in %s on line %d string(0) "" -===DONE=== diff --git a/ext/dom/tests/domdocument_createentityreference_001.phpt b/ext/dom/tests/domdocument_createentityreference_001.phpt index 481b47225b4..63a352dad1d 100644 --- a/ext/dom/tests/domdocument_createentityreference_001.phpt +++ b/ext/dom/tests/domdocument_createentityreference_001.phpt @@ -11,8 +11,6 @@ Clint Priest @ PhpTek09 $objRef = $objDoc->createEntityReference('Test'); echo $objRef->nodeName . "\n"; ?> -===DONE=== --EXPECT-- Test -===DONE=== diff --git a/ext/exif/tests/bug34704-mb.phpt b/ext/exif/tests/bug34704-mb.phpt index 4ca5d6af6b9..3087a0f1ba0 100644 --- a/ext/exif/tests/bug34704-mb.phpt +++ b/ext/exif/tests/bug34704-mb.phpt @@ -10,7 +10,6 @@ zlib.output_compression=0 $infile = __DIR__.'/bug34704私はガラスを食べられます.jpg'; var_dump(exif_read_data($infile)); ?> -===DONE=== --EXPECTF-- array(7) { ["FileName"]=> @@ -39,4 +38,3 @@ array(7) { int(0) } } -===DONE=== diff --git a/ext/exif/tests/bug34704.phpt b/ext/exif/tests/bug34704.phpt index 9925840d5a3..373d5ae81b8 100644 --- a/ext/exif/tests/bug34704.phpt +++ b/ext/exif/tests/bug34704.phpt @@ -10,7 +10,6 @@ zlib.output_compression=0 $infile = __DIR__.'/bug34704.jpg'; var_dump(exif_read_data($infile)); ?> -===DONE=== --EXPECTF-- array(7) { ["FileName"]=> @@ -39,4 +38,3 @@ array(7) { int(0) } } -===DONE=== diff --git a/ext/exif/tests/bug50660/bug50660.phpt b/ext/exif/tests/bug50660/bug50660.phpt index 4b502a0a29b..f15f79e7e65 100644 --- a/ext/exif/tests/bug50660/bug50660.phpt +++ b/ext/exif/tests/bug50660/bug50660.phpt @@ -12,8 +12,6 @@ var_dump(exif_read_data($infile) !== false); $infile = __DIR__.'/bug50660-2.jpg'; var_dump(exif_read_data($infile) !== false); ?> -===DONE=== --EXPECT-- bool(true) bool(true) -===DONE=== diff --git a/ext/exif/tests/bug60150.phpt b/ext/exif/tests/bug60150.phpt index cfe86fb3632..5f45828db79 100644 --- a/ext/exif/tests/bug60150.phpt +++ b/ext/exif/tests/bug60150.phpt @@ -10,7 +10,6 @@ zlib.output_compression=0 $infile = __DIR__.'/bug60150.jpg'; var_dump(exif_read_data($infile)); ?> -===DONE=== --EXPECTF-- Warning: exif_read_data(bug60150.jpg): Process tag(x9003=DateTimeOriginal): Illegal pointer offset(%s) in %s on line %d @@ -18,4 +17,3 @@ Warning: exif_read_data(bug60150.jpg): Error reading from file: got=x%x(=%d) != Warning: exif_read_data(bug60150.jpg): Invalid JPEG file in %s on line %d bool(false) -===DONE=== diff --git a/ext/exif/tests/bug68547.phpt b/ext/exif/tests/bug68547.phpt index b1ae86964f3..0fb9e06ccec 100644 --- a/ext/exif/tests/bug68547.phpt +++ b/ext/exif/tests/bug68547.phpt @@ -6,7 +6,6 @@ Bug #68547 (Exif Header component value check error) -===DONE=== --EXPECTF-- array(12) { ["FileName"]=> @@ -48,4 +47,3 @@ Line4" ["Title"]=> string(8) "Title..." } -===DONE=== diff --git a/ext/exif/tests/bug72819/bug72819.phpt b/ext/exif/tests/bug72819/bug72819.phpt index 0813c8a5eb4..42982990bd4 100644 --- a/ext/exif/tests/bug72819/bug72819.phpt +++ b/ext/exif/tests/bug72819/bug72819.phpt @@ -10,7 +10,5 @@ zlib.output_compression=0 $infile = __DIR__.'/bug72819.jpg'; var_dump(strlen(exif_thumbnail($infile))); ?> -===DONE=== --EXPECT-- int(5448) -===DONE=== diff --git a/ext/exif/tests/bug73115/bug73115.phpt b/ext/exif/tests/bug73115/bug73115.phpt index 86c99a63d00..b9fb3e95219 100644 --- a/ext/exif/tests/bug73115/bug73115.phpt +++ b/ext/exif/tests/bug73115/bug73115.phpt @@ -10,7 +10,5 @@ zlib.output_compression=0 $infile = __DIR__.'/bug73115.jpg'; var_dump(count(exif_read_data($infile))); ?> -===DONE=== --EXPECT-- int(80) -===DONE=== diff --git a/ext/exif/tests/bug74428/bug74428.phpt b/ext/exif/tests/bug74428/bug74428.phpt index 881e6987c44..967a1ac4ce7 100644 --- a/ext/exif/tests/bug74428/bug74428.phpt +++ b/ext/exif/tests/bug74428/bug74428.phpt @@ -10,7 +10,6 @@ zlib.output_compression=0 $infile = __DIR__.'/bug74428.jpg'; var_dump(exif_read_data($infile)); ?> -===DONE=== --EXPECTF-- array(11) { ["FileName"]=> @@ -47,4 +46,3 @@ array(11) { ["ExifImageLength"]=> int(28) } -===DONE=== diff --git a/ext/exif/tests/bug76409.phpt b/ext/exif/tests/bug76409.phpt index b409a2bec47..c7d3c1ad2df 100644 --- a/ext/exif/tests/bug76409.phpt +++ b/ext/exif/tests/bug76409.phpt @@ -8,7 +8,5 @@ if (!extension_loaded('exif')) die('skip exif extension not available'); -===DONE=== --EXPECTF-- Warning: exif_read_data(): %s in %s on line %d -===DONE=== diff --git a/ext/exif/tests/bug76423.phpt b/ext/exif/tests/bug76423.phpt index f917074410f..8e2bf457530 100644 --- a/ext/exif/tests/bug76423.phpt +++ b/ext/exif/tests/bug76423.phpt @@ -8,11 +8,9 @@ if (!extension_loaded('exif')) die('skip exif extension not available'); -===DONE=== --EXPECTF-- Warning: exif_read_data(%s.jpg): Thumbnail goes IFD boundary or end of file reached in %s on line %d Warning: exif_read_data(%s.jpg): File structure corrupted in %s on line %d Warning: exif_read_data(%s.jpg): Invalid JPEG file in %s on line %d -===DONE=== diff --git a/ext/exif/tests/bug77184/bug77184.phpt b/ext/exif/tests/bug77184/bug77184.phpt index 54ecedf927e..c75224efdc6 100644 --- a/ext/exif/tests/bug77184/bug77184.phpt +++ b/ext/exif/tests/bug77184/bug77184.phpt @@ -12,8 +12,6 @@ $tags = exif_read_data($infile); echo $tags['GPSLatitude'][2], PHP_EOL; echo $tags['GPSLongitude'][2], PHP_EOL; ?> -===DONE=== --EXPECT-- 156691934/70000000 2672193571/70000000 -===DONE=== diff --git a/ext/exif/tests/exif_encoding_crash.phpt b/ext/exif/tests/exif_encoding_crash.phpt index a1222b15824..8fda8e56685 100644 --- a/ext/exif/tests/exif_encoding_crash.phpt +++ b/ext/exif/tests/exif_encoding_crash.phpt @@ -8,7 +8,5 @@ $infile = __DIR__.'/exif_encoding_crash.jpg'; $exif_data = exif_read_data($infile); echo "*** no core dump ***\n"; ?> -===DONE=== --EXPECT-- *** no core dump *** -===DONE=== diff --git a/ext/exif/tests/exif_imagetype_basic-mb.phpt b/ext/exif/tests/exif_imagetype_basic-mb.phpt index 11a52746156..b4b17657a5f 100644 --- a/ext/exif/tests/exif_imagetype_basic-mb.phpt +++ b/ext/exif/tests/exif_imagetype_basic-mb.phpt @@ -16,8 +16,6 @@ echo "*** Testing exif_imagetype() : basic functionality ***\n"; var_dump(exif_imagetype(__DIR__.'/test2私はガラスを食べられます.jpg')); ?> -===Done=== --EXPECT-- *** Testing exif_imagetype() : basic functionality *** int(2) -===Done=== diff --git a/ext/exif/tests/exif_imagetype_basic.phpt b/ext/exif/tests/exif_imagetype_basic.phpt index dbb0c8a7a90..0b1b09fd4d1 100644 --- a/ext/exif/tests/exif_imagetype_basic.phpt +++ b/ext/exif/tests/exif_imagetype_basic.phpt @@ -16,8 +16,6 @@ echo "*** Testing exif_imagetype() : basic functionality ***\n"; var_dump(exif_imagetype(__DIR__.'/test2.jpg')); ?> -===Done=== --EXPECT-- *** Testing exif_imagetype() : basic functionality *** int(2) -===Done=== diff --git a/ext/exif/tests/exif_imagetype_error.phpt b/ext/exif/tests/exif_imagetype_error.phpt index 765f01d1ea0..26757ed4c3f 100644 --- a/ext/exif/tests/exif_imagetype_error.phpt +++ b/ext/exif/tests/exif_imagetype_error.phpt @@ -17,7 +17,6 @@ var_dump( exif_imagetype(__DIR__.'/foo.jpg') ); ?> -===Done=== --EXPECTF-- *** Testing exif_imagetype() : error conditions *** @@ -25,4 +24,3 @@ var_dump( exif_imagetype(__DIR__.'/foo.jpg') ); Warning: exif_imagetype(%s/foo.jpg): failed to open stream: No such file or directory in %s on line %d bool(false) -===Done=== diff --git a/ext/exif/tests/exif_read_data_0.phpt b/ext/exif/tests/exif_read_data_0.phpt index 5421a14d2e6..172bac5efdf 100644 --- a/ext/exif/tests/exif_read_data_0.phpt +++ b/ext/exif/tests/exif_read_data_0.phpt @@ -7,7 +7,5 @@ Test exif_read_data on unavailable file $infile = __DIR__.'/bug73115.JPG'; exif_read_data($infile); ?> -===DONE=== --EXPECTF-- Warning: exif_read_data(): Unable to open file in %sexif_read_data_0.php on line %d -===DONE=== diff --git a/ext/exif/tests/exif_tagname_basic.phpt b/ext/exif/tests/exif_tagname_basic.phpt index 82bd06ebabc..5706f0fd8f7 100644 --- a/ext/exif/tests/exif_tagname_basic.phpt +++ b/ext/exif/tests/exif_tagname_basic.phpt @@ -20,10 +20,8 @@ var_dump(exif_tagname(0x10F)); var_dump(exif_tagname(0x110)); ?> -===Done=== --EXPECT-- *** Testing exif_tagname() : basic functionality *** string(16) "ImageDescription" string(4) "Make" string(5) "Model" -===Done=== diff --git a/ext/fileinfo/tests/bug57547.phpt b/ext/fileinfo/tests/bug57547.phpt index 512d4c030ab..48115479ec9 100644 --- a/ext/fileinfo/tests/bug57547.phpt +++ b/ext/fileinfo/tests/bug57547.phpt @@ -18,10 +18,8 @@ foreach ($filenames as $filename) { } ?> -===DONE=== --EXPECT-- string(9) "directory" string(9) "directory" string(28) "text/x-php; charset=us-ascii" string(28) "text/x-php; charset=us-ascii" -===DONE=== diff --git a/ext/fileinfo/tests/bug61964-mb.phpt b/ext/fileinfo/tests/bug61964-mb.phpt index 8432a8314ec..0713ac2eb67 100644 --- a/ext/fileinfo/tests/bug61964-mb.phpt +++ b/ext/fileinfo/tests/bug61964-mb.phpt @@ -43,7 +43,6 @@ unlink($magic_file_copy); unlink($magic_file_copy2); rmdir($dir); ?> -===DONE=== --EXPECTF-- bool(false)%A resource(%d) of type (file_info) @@ -61,4 +60,3 @@ Notice: finfo_open(): Warning: offset `b' invalid in %sbug61964-mb.php on line % Warning: finfo_open(): Failed to load magic database at '%sbug61964-mb'. in %sbug61964-mb.php on line %d DONE: testing dir with files -===DONE=== diff --git a/ext/fileinfo/tests/bug61964.phpt b/ext/fileinfo/tests/bug61964.phpt index b2eb6e2f16f..4d891e9731b 100644 --- a/ext/fileinfo/tests/bug61964.phpt +++ b/ext/fileinfo/tests/bug61964.phpt @@ -43,7 +43,6 @@ unlink($magic_file_copy); unlink($magic_file_copy2); rmdir($dir); ?> -===DONE=== --EXPECTF-- bool(false)%A resource(%d) of type (file_info) @@ -61,4 +60,3 @@ Notice: finfo_open(): Warning: offset `b' invalid in %sbug61964.php on line %d Warning: finfo_open(): Failed to load magic database at '%sbug61964'. in %sbug61964.php on line %d DONE: testing dir with files -===DONE=== diff --git a/ext/fileinfo/tests/bug67516.phpt b/ext/fileinfo/tests/bug67516.phpt index d077d2dcbcf..6f4147fb0ea 100644 --- a/ext/fileinfo/tests/bug67516.phpt +++ b/ext/fileinfo/tests/bug67516.phpt @@ -11,8 +11,6 @@ $f = new finfo; var_dump($f->file(__DIR__ . "/bug67516.gif", FILEINFO_MIME_TYPE)); var_dump($f->file(__DIR__ . "/bug67516.gif", FILEINFO_MIME)); ?> -===DONE=== --EXPECT-- string(9) "image/gif" string(25) "image/gif; charset=binary" -===DONE=== diff --git a/ext/fileinfo/tests/bug68735.phpt b/ext/fileinfo/tests/bug68735.phpt index d43ceca40bf..7a27b995edd 100644 --- a/ext/fileinfo/tests/bug68735.phpt +++ b/ext/fileinfo/tests/bug68735.phpt @@ -10,7 +10,5 @@ Bug #68735 fileinfo out-of-bounds memory access var_dump($f->file($test_file)); ?> -===DONE=== --EXPECTF-- string(%d) "JPEG image data, JFIF standard 1.01, resolution (DPI), density 180x52, segment length 16, comment: "%S"" -===DONE=== diff --git a/ext/fileinfo/tests/bug69107.phpt b/ext/fileinfo/tests/bug69107.phpt index 9a7b26b5d19..28a040318ec 100644 --- a/ext/fileinfo/tests/bug69107.phpt +++ b/ext/fileinfo/tests/bug69107.phpt @@ -13,10 +13,8 @@ var_dump($finfo->buffer("buffer("buffer(" -===DONE=== --EXPECT-- string(10) "text/x-php" string(10) "text/x-php" string(10) "text/x-php" string(10) "text/x-php" -===DONE=== diff --git a/ext/fileinfo/tests/finfo_buffer_basic-mb.phpt b/ext/fileinfo/tests/finfo_buffer_basic-mb.phpt index ca9c10cb66b..04eb0e60ded 100644 --- a/ext/fileinfo/tests/finfo_buffer_basic-mb.phpt +++ b/ext/fileinfo/tests/finfo_buffer_basic-mb.phpt @@ -37,7 +37,6 @@ foreach( $options as $option ) { } ?> -===DONE=== --EXPECT-- *** Testing finfo_buffer() : basic functionality *** string(36) "ASCII text, with no line terminators" @@ -52,4 +51,3 @@ string(40) "application/octet-stream; charset=binary" string(28) "text/plain; charset=us-ascii" string(28) "text/plain; charset=us-ascii" string(25) "text/plain; charset=utf-8" -===DONE=== diff --git a/ext/fileinfo/tests/finfo_buffer_basic.phpt b/ext/fileinfo/tests/finfo_buffer_basic.phpt index 07ee1b311ed..24bfbcde50a 100644 --- a/ext/fileinfo/tests/finfo_buffer_basic.phpt +++ b/ext/fileinfo/tests/finfo_buffer_basic.phpt @@ -37,7 +37,6 @@ foreach( $options as $option ) { } ?> -===DONE=== --EXPECT-- *** Testing finfo_buffer() : basic functionality *** string(36) "ASCII text, with no line terminators" @@ -52,4 +51,3 @@ string(40) "application/octet-stream; charset=binary" string(28) "text/plain; charset=us-ascii" string(28) "text/plain; charset=us-ascii" string(25) "text/plain; charset=utf-8" -===DONE=== diff --git a/ext/fileinfo/tests/finfo_buffer_variation1-mb.phpt b/ext/fileinfo/tests/finfo_buffer_variation1-mb.phpt index 2637b15aee8..df9b079f3bf 100644 --- a/ext/fileinfo/tests/finfo_buffer_variation1-mb.phpt +++ b/ext/fileinfo/tests/finfo_buffer_variation1-mb.phpt @@ -36,7 +36,6 @@ foreach( $options as $option ) { } ?> -===DONE=== --EXPECT-- *** Testing finfo_buffer() : variation functionality with oo interface *** string(36) "ASCII text, with no line terminators" @@ -51,4 +50,3 @@ string(40) "application/octet-stream; charset=binary" string(28) "text/plain; charset=us-ascii" string(28) "text/plain; charset=us-ascii" string(25) "text/plain; charset=utf-8" -===DONE=== diff --git a/ext/fileinfo/tests/finfo_buffer_variation1.phpt b/ext/fileinfo/tests/finfo_buffer_variation1.phpt index a42c41d975f..1b4da1edc21 100644 --- a/ext/fileinfo/tests/finfo_buffer_variation1.phpt +++ b/ext/fileinfo/tests/finfo_buffer_variation1.phpt @@ -36,7 +36,6 @@ foreach( $options as $option ) { } ?> -===DONE=== --EXPECT-- *** Testing finfo_buffer() : variation functionality with oo interface *** string(36) "ASCII text, with no line terminators" @@ -51,4 +50,3 @@ string(40) "application/octet-stream; charset=binary" string(28) "text/plain; charset=us-ascii" string(28) "text/plain; charset=us-ascii" string(25) "text/plain; charset=utf-8" -===DONE=== diff --git a/ext/fileinfo/tests/finfo_close_basic.phpt b/ext/fileinfo/tests/finfo_close_basic.phpt index 33d508a7c34..5798e5c9470 100644 --- a/ext/fileinfo/tests/finfo_close_basic.phpt +++ b/ext/fileinfo/tests/finfo_close_basic.phpt @@ -25,11 +25,9 @@ var_dump( $finfo ); unset( $finfo ); ?> -===DONE=== --EXPECTF-- *** Testing finfo_close() : basic functionality *** resource(%d) of type (file_info) bool(true) object(finfo)#%d (%d) { } -===DONE=== diff --git a/ext/fileinfo/tests/finfo_close_error.phpt b/ext/fileinfo/tests/finfo_close_error.phpt index 789fc1014d1..9f7ce8f0d86 100644 --- a/ext/fileinfo/tests/finfo_close_error.phpt +++ b/ext/fileinfo/tests/finfo_close_error.phpt @@ -21,10 +21,8 @@ try { } ?> -===DONE=== --EXPECT-- *** Testing finfo_close() : error conditions *** -- Testing finfo_close() function with wrong resource type -- finfo_close(): supplied resource is not a valid file_info resource -===DONE=== diff --git a/ext/fileinfo/tests/finfo_extension_flag.phpt b/ext/fileinfo/tests/finfo_extension_flag.phpt index 8841fc005d6..5c4079b97a1 100644 --- a/ext/fileinfo/tests/finfo_extension_flag.phpt +++ b/ext/fileinfo/tests/finfo_extension_flag.phpt @@ -11,7 +11,5 @@ $f = new finfo; var_dump($f->file(__DIR__ . "/resources/test.jpg", FILEINFO_EXTENSION)); ?> -===DONE=== --EXPECT-- string(17) "jpeg/jpg/jpe/jfif" -===DONE=== diff --git a/ext/fileinfo/tests/finfo_file_basic.phpt b/ext/fileinfo/tests/finfo_file_basic.phpt index e65d70ec89a..bd781be7768 100644 --- a/ext/fileinfo/tests/finfo_file_basic.phpt +++ b/ext/fileinfo/tests/finfo_file_basic.phpt @@ -22,7 +22,6 @@ var_dump( finfo_file( $finfo, $magicFile ) ); var_dump( finfo_file( $finfo, $magicFile.chr(0).$magicFile) ); ?> -===DONE=== --EXPECTF-- *** Testing finfo_file() : basic functionality *** string(28) "text/x-php; charset=us-ascii" @@ -31,4 +30,3 @@ string(32) "text/plain; charset=unknown-8bit" Warning: finfo_file(): Invalid path in %s%efinfo_file_basic.php on line %d bool(false) -===DONE=== diff --git a/ext/fileinfo/tests/finfo_file_regex.phpt b/ext/fileinfo/tests/finfo_file_regex.phpt index f39bf073f3e..4ce5550b4ea 100644 --- a/ext/fileinfo/tests/finfo_file_regex.phpt +++ b/ext/fileinfo/tests/finfo_file_regex.phpt @@ -21,9 +21,7 @@ var_dump( finfo_file( $finfo, $file ) ); var_dump( finfo_file( $finfo, $file, FILEINFO_CONTINUE ) ); ?> -===DONE=== --EXPECTF-- *** Testing finfo_file() : regex rules *** string(28) "text/plain; charset=us-ascii" string(%d) "awk%sscript, ASCII text%A" -===DONE=== diff --git a/ext/fileinfo/tests/finfo_open_basic.phpt b/ext/fileinfo/tests/finfo_open_basic.phpt index 748f45d4c4d..176ad49c503 100644 --- a/ext/fileinfo/tests/finfo_open_basic.phpt +++ b/ext/fileinfo/tests/finfo_open_basic.phpt @@ -29,7 +29,6 @@ var_dump( new finfo( FILEINFO_MIME, $magicFile ) ); var_dump( new finfo() ); ?> -===DONE=== --EXPECTF-- *** Testing finfo_open() : basic functionality *** resource(%d) of type (file_info) @@ -43,4 +42,3 @@ object(finfo)#%d (%d) { } object(finfo)#%d (%d) { } -===DONE=== diff --git a/ext/fileinfo/tests/finfo_open_error.phpt b/ext/fileinfo/tests/finfo_open_error.phpt index d37591a2c74..fb07ea8064a 100644 --- a/ext/fileinfo/tests/finfo_open_error.phpt +++ b/ext/fileinfo/tests/finfo_open_error.phpt @@ -30,7 +30,6 @@ try { } ?> -===DONE=== --EXPECTF-- *** Testing finfo_open() : error functionality *** @@ -45,4 +44,3 @@ Notice: finfo_open(): Warning: using regular magic file `%smagic' in %sfinfo_ope resource(6) of type (file_info) finfo_open() expects parameter 1 to be int, string given finfo::__construct() expects parameter 1 to be int, string given -===DONE=== diff --git a/ext/fileinfo/tests/finfo_open_variation1.phpt b/ext/fileinfo/tests/finfo_open_variation1.phpt index d788e50b9e0..26356101992 100644 --- a/ext/fileinfo/tests/finfo_open_variation1.phpt +++ b/ext/fileinfo/tests/finfo_open_variation1.phpt @@ -20,9 +20,7 @@ var_dump( finfo_open( FILEINFO_MIME | FILEINFO_SYMLINK, $magicFile ) ); var_dump( finfo_open( FILEINFO_DEVICES | FILEINFO_RAW, $magicFile ) ); ?> -===DONE=== --EXPECTF-- *** Testing finfo_open() : variations in opening *** resource(%d) of type (file_info) resource(%d) of type (file_info) -===DONE=== diff --git a/ext/fileinfo/tests/finfo_phpinfo_basic.phpt b/ext/fileinfo/tests/finfo_phpinfo_basic.phpt index 14746a8f048..5eea4efba7a 100644 --- a/ext/fileinfo/tests/finfo_phpinfo_basic.phpt +++ b/ext/fileinfo/tests/finfo_phpinfo_basic.phpt @@ -14,8 +14,6 @@ $output = ob_get_clean(); var_dump(preg_match("/fileinfo support => enabled/", $output)); ?> -===DONE=== --EXPECT-- *** Testing finfo extension : loading info phpinfo() *** int(1) -===DONE=== diff --git a/ext/fileinfo/tests/finfo_set_flags_basic-mb.phpt b/ext/fileinfo/tests/finfo_set_flags_basic-mb.phpt index 4af914b1eb0..50a1559f581 100644 --- a/ext/fileinfo/tests/finfo_set_flags_basic-mb.phpt +++ b/ext/fileinfo/tests/finfo_set_flags_basic-mb.phpt @@ -25,10 +25,8 @@ $finfo = new finfo( FILEINFO_NONE, $magicFile ); var_dump( $finfo->set_flags( FILEINFO_MIME ) ); ?> -===DONE=== --EXPECTF-- *** Testing finfo_set_flags() : basic functionality *** bool(true) bool(true) bool(true) -===DONE=== diff --git a/ext/fileinfo/tests/finfo_set_flags_basic.phpt b/ext/fileinfo/tests/finfo_set_flags_basic.phpt index b694350e11c..95f2648f518 100644 --- a/ext/fileinfo/tests/finfo_set_flags_basic.phpt +++ b/ext/fileinfo/tests/finfo_set_flags_basic.phpt @@ -25,10 +25,8 @@ $finfo = new finfo( FILEINFO_NONE, $magicFile ); var_dump( $finfo->set_flags( FILEINFO_MIME ) ); ?> -===DONE=== --EXPECTF-- *** Testing finfo_set_flags() : basic functionality *** bool(true) bool(true) bool(true) -===DONE=== diff --git a/ext/filter/tests/bug49510.phpt b/ext/filter/tests/bug49510.phpt index 340c1ccd6b2..907e633db92 100644 --- a/ext/filter/tests/bug49510.phpt +++ b/ext/filter/tests/bug49510.phpt @@ -20,7 +20,6 @@ var_dump(filter_var("yes", FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE)); var_dump(filter_var("invalid", FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE)); ?> -==DONE== --EXPECT-- bool(false) bool(false) @@ -35,4 +34,3 @@ bool(true) bool(true) bool(true) NULL -==DONE== diff --git a/ext/filter/tests/bug51368.phpt b/ext/filter/tests/bug51368.phpt index 7ecb720a1e7..a8ebecb2d50 100644 --- a/ext/filter/tests/bug51368.phpt +++ b/ext/filter/tests/bug51368.phpt @@ -14,11 +14,9 @@ var_dump( $options = ['flags' => FILTER_FLAG_ALLOW_THOUSAND, 'options' => ['thousand' => '']]; var_dump(filter_var('12345', FILTER_VALIDATE_FLOAT, $options)); ?> -===DONE=== --EXPECTF-- float(1000) float(1234.567) Warning: filter_var(): thousand separator must be at least one char in %s on line %d bool(false) -===DONE=== diff --git a/ext/filter/tests/bug73054.phpt b/ext/filter/tests/bug73054.phpt index 77a1a88b334..4dba4f08138 100644 --- a/ext/filter/tests/bug73054.phpt +++ b/ext/filter/tests/bug73054.phpt @@ -16,8 +16,6 @@ var_dump( ]) ); ?> -===DONE=== --EXPECT-- int(2) int(2) -===DONE=== diff --git a/ext/gd/tests/bug47946.phpt b/ext/gd/tests/bug47946.phpt index aeea7fb324f..cb180f5b226 100644 --- a/ext/gd/tests/bug47946.phpt +++ b/ext/gd/tests/bug47946.phpt @@ -45,7 +45,5 @@ makeFilter($im, $edgeMatrix); require_once __DIR__ . '/func.inc'; test_image_equals_file(__DIR__ . '/bug47946_exp.png', $im); ?> -===DONE=== --EXPECT-- The images are equal. -===DONE=== diff --git a/ext/gd/tests/bug50194.phpt b/ext/gd/tests/bug50194.phpt index 0ccab830630..2815ee1609c 100644 --- a/ext/gd/tests/bug50194.phpt +++ b/ext/gd/tests/bug50194.phpt @@ -32,7 +32,5 @@ if (isset($matches[1]) && $matches[1] > 2000) { imagedestroy($im); ?> -===DONE=== --EXPECT-- The images are similar. -===DONE=== diff --git a/ext/gd/tests/bug52070.phpt b/ext/gd/tests/bug52070.phpt index d44a5274799..4ff97c909ce 100644 --- a/ext/gd/tests/bug52070.phpt +++ b/ext/gd/tests/bug52070.phpt @@ -19,7 +19,5 @@ imagedashedline($im, 800, 400, 800, 800, $color); include_once __DIR__ . '/func.inc'; test_image_equals_file(__DIR__ . '/bug52070.png', $im); ?> -===DONE=== --EXPECT-- The images are equal. -===DONE=== diff --git a/ext/gd/tests/bug65148.phpt b/ext/gd/tests/bug65148.phpt index 9effae97149..1ce5480dd6b 100644 --- a/ext/gd/tests/bug65148.phpt +++ b/ext/gd/tests/bug65148.phpt @@ -45,7 +45,6 @@ foreach ($interpolations as $name => $interpolation) { imagedestroy($img); print_r($results); ?> -===DONE=== --EXPECT-- Array ( @@ -176,4 +175,3 @@ Array ) ) -===DONE=== diff --git a/ext/gd/tests/bug66005.phpt b/ext/gd/tests/bug66005.phpt index 307b06855c6..9d63524570d 100644 --- a/ext/gd/tests/bug66005.phpt +++ b/ext/gd/tests/bug66005.phpt @@ -28,7 +28,5 @@ imagecopy($dest, $png_full, 100, 0, 0, 0, 50, 50); include_once __DIR__ . '/func.inc'; test_image_equals_file(__DIR__ . '/bug66005.png', $dest); ?> -==DONE== --EXPECT-- The images are equal. -==DONE== diff --git a/ext/gd/tests/bug67325.phpt b/ext/gd/tests/bug67325.phpt index 8290946c0fc..fe369ee949a 100644 --- a/ext/gd/tests/bug67325.phpt +++ b/ext/gd/tests/bug67325.phpt @@ -26,7 +26,5 @@ var_dump($white); imagedestroy($im); ?> -===DONE=== --EXPECT-- int(0) -===DONE=== diff --git a/ext/gd/tests/bug72482_2.phpt b/ext/gd/tests/bug72482_2.phpt index a8a08faa53d..f9f5833274d 100644 --- a/ext/gd/tests/bug72482_2.phpt +++ b/ext/gd/tests/bug72482_2.phpt @@ -15,7 +15,5 @@ imageline($im, 0, 0, 10, 10, imagecolorallocate($im, 0, 0, 0)); test_image_equals_file(__DIR__ . DIRECTORY_SEPARATOR . 'bug72482_2.png', $im); ?> -===DONE=== --EXPECT-- The images are equal. -===DONE=== diff --git a/ext/gd/tests/bug72913.phpt b/ext/gd/tests/bug72913.phpt index 3ab068a1342..3ec07669825 100644 --- a/ext/gd/tests/bug72913.phpt +++ b/ext/gd/tests/bug72913.phpt @@ -22,7 +22,5 @@ imagecopy($dst, $src, 0,0, 0,0, 50,50); include_once __DIR__ . '/func.inc'; test_image_equals_file(__DIR__ . '/bug72913.png', $dst); ?> -==DONE== --EXPECT-- The images are equal. -==DONE== diff --git a/ext/gd/tests/bug73155.phpt b/ext/gd/tests/bug73155.phpt index dc1791e565f..96ba12a469f 100644 --- a/ext/gd/tests/bug73155.phpt +++ b/ext/gd/tests/bug73155.phpt @@ -19,10 +19,8 @@ printf("x chunk count: %d\n", $header['x_count']); printf("y chunk count: %d\n", $header['y_count']); printf("file size: %d\n", strlen($buffer)); ?> -===DONE=== --EXPECT-- chunk size: 64 x chunk count: 1 y chunk count: 1 file size: 5145 -===DONE=== diff --git a/ext/gd/tests/bug73157.phpt b/ext/gd/tests/bug73157.phpt index b03e91ec9da..f0f19fdf236 100644 --- a/ext/gd/tests/bug73157.phpt +++ b/ext/gd/tests/bug73157.phpt @@ -16,7 +16,5 @@ $buffer = ob_get_clean(); $header = unpack('@10/nchunk_size', $buffer); printf("chunk size: %d\n", $header['chunk_size']); ?> -===DONE=== --EXPECT-- chunk size: 256 -===DONE=== diff --git a/ext/gd/tests/bug73159.phpt b/ext/gd/tests/bug73159.phpt index 4889ffb6fd7..ae11f3012b6 100644 --- a/ext/gd/tests/bug73159.phpt +++ b/ext/gd/tests/bug73159.phpt @@ -15,7 +15,5 @@ $buffer = ob_get_clean(); $header = unpack('@12/nformat', $buffer); printf("format: %d\n", $header['format']); ?> -===DONE=== --EXPECT-- format: 4 -===DONE=== diff --git a/ext/gd/tests/bug73161.phpt b/ext/gd/tests/bug73161.phpt index 42ad7186064..bc386dc9c22 100644 --- a/ext/gd/tests/bug73161.phpt +++ b/ext/gd/tests/bug73161.phpt @@ -11,8 +11,6 @@ if (!extension_loaded('gd')) die('skip gd extension not available'); $im = imagecreatefromgd2(__DIR__ . DIRECTORY_SEPARATOR . 'bug73161.gd2'); var_dump($im); ?> -===DONE=== --EXPECTF-- Warning: imagecreatefromgd2(): '%s' is not a valid GD2 file in %s on line %d bool(false) -===DONE=== diff --git a/ext/gd/tests/bug73213.phpt b/ext/gd/tests/bug73213.phpt index 86c4078fd9f..3c8f33079be 100644 --- a/ext/gd/tests/bug73213.phpt +++ b/ext/gd/tests/bug73213.phpt @@ -16,7 +16,5 @@ imageline($im, 0,0, 32767,0, $black); test_image_equals_file(__DIR__ . DIRECTORY_SEPARATOR . 'bug73213.png', $im); ?> -===DONE=== --EXPECT-- The images are equal. -===DONE=== diff --git a/ext/gd/tests/bug73272.phpt b/ext/gd/tests/bug73272.phpt index ccee8d6e67e..33d7b4155e9 100644 --- a/ext/gd/tests/bug73272.phpt +++ b/ext/gd/tests/bug73272.phpt @@ -18,7 +18,5 @@ $dst = imagerotate($src, 60, 0xFFFFFF); test_image_equals_file(__DIR__ . DIRECTORY_SEPARATOR . 'bug73272.png', $dst); ?> -===DONE=== --EXPECT-- The images are equal. -===DONE=== diff --git a/ext/gd/tests/bug73279.phpt b/ext/gd/tests/bug73279.phpt index aba91f0d3af..886b61c55b8 100644 --- a/ext/gd/tests/bug73279.phpt +++ b/ext/gd/tests/bug73279.phpt @@ -14,7 +14,5 @@ imagecolorallocate($src, 255, 255, 255); $dst = imagescale($src, 200, 200, IMG_BILINEAR_FIXED); printf("color: %x\n", imagecolorat($dst, 99, 99)); ?> -===DONE=== --EXPECT-- color: ffffff -===DONE=== diff --git a/ext/gd/tests/bug73279_old.phpt b/ext/gd/tests/bug73279_old.phpt index 810b15201fa..1db9861b0c4 100644 --- a/ext/gd/tests/bug73279_old.phpt +++ b/ext/gd/tests/bug73279_old.phpt @@ -14,9 +14,7 @@ imagecolorallocate($src, 255, 255, 255); $dst = imagescale($src, 200, 200, IMG_BILINEAR_FIXED); printf("color: %x\n", imagecolorat($dst, 99, 99)); ?> -===DONE=== --XFAIL-- Bug #330 has not yet been fixed --EXPECT-- color: ffffff -===DONE=== diff --git a/ext/gd/tests/bug73281.phpt b/ext/gd/tests/bug73281.phpt index 162ee1b33a8..81bb2d2d284 100644 --- a/ext/gd/tests/bug73281.phpt +++ b/ext/gd/tests/bug73281.phpt @@ -29,7 +29,6 @@ foreach ($coordinates as $coordinate) { printf("%3d, %3d: %x\n", $x, $y, imagecolorat($dst, $x, $y)); } ?> -===DONE=== --EXPECT-- truecolor source 0, 0: ffffff @@ -42,4 +41,3 @@ palette source 0, 199: ffffff 199, 199: ffffff 199, 0: ffffff -===DONE=== diff --git a/ext/gd/tests/bug73291.phpt b/ext/gd/tests/bug73291.phpt index ffa2fe7e4ca..a3fd5b3c101 100644 --- a/ext/gd/tests/bug73291.phpt +++ b/ext/gd/tests/bug73291.phpt @@ -26,10 +26,8 @@ foreach ([0.1, 0.5, 1.0, 10.0] as $threshold) { } ?> -===DONE=== --EXPECT-- size: 247*247 size: 237*237 size: 229*229 size: 175*175 -===DONE=== diff --git a/ext/gd/tests/bug73549.phpt b/ext/gd/tests/bug73549.phpt index e0cc6cf42e5..8194d43e721 100644 --- a/ext/gd/tests/bug73549.phpt +++ b/ext/gd/tests/bug73549.phpt @@ -11,11 +11,9 @@ $im = imagecreatetruecolor(8, 8); var_dump(imagepng($im, $stream)); var_dump($stream); ?> -===DONE=== --EXPECTF-- bool(true) resource(%d) of type (stream) -===DONE=== --CLEAN-- -===DONE=== --EXPECT-- The images are equal. -===DONE=== diff --git a/ext/gd/tests/bug73868.phpt b/ext/gd/tests/bug73868.phpt index 135be7917b3..fd9537c4a01 100644 --- a/ext/gd/tests/bug73868.phpt +++ b/ext/gd/tests/bug73868.phpt @@ -8,11 +8,9 @@ if (!extension_loaded('gd')) die('skip gd extension not available'); -===DONE=== --EXPECTF-- Warning: imagecreatefromgd2(): gd2: EOF while reading in %s on line %d Warning: imagecreatefromgd2(): '%s' is not a valid GD2 file in %s on line %d bool(false) -===DONE=== diff --git a/ext/gd/tests/bug73869.phpt b/ext/gd/tests/bug73869.phpt index 16b2edc7a18..69c7e1b5439 100644 --- a/ext/gd/tests/bug73869.phpt +++ b/ext/gd/tests/bug73869.phpt @@ -9,11 +9,9 @@ if (!extension_loaded('gd')) die('skip gd extension not available'); var_dump(imagecreatefromgd2(__DIR__ . DIRECTORY_SEPARATOR . 'bug73869a.gd2')); var_dump(imagecreatefromgd2(__DIR__ . DIRECTORY_SEPARATOR . 'bug73869b.gd2')); ?> -===DONE=== --EXPECTF-- Warning: imagecreatefromgd2(): '%s' is not a valid GD2 file in %s on line %d bool(false) Warning: imagecreatefromgd2(): '%s' is not a valid GD2 file in %s on line %d bool(false) -===DONE=== diff --git a/ext/gd/tests/bug73957.phpt b/ext/gd/tests/bug73957.phpt index 370956f032b..0ab715b1781 100644 --- a/ext/gd/tests/bug73957.phpt +++ b/ext/gd/tests/bug73957.phpt @@ -14,7 +14,5 @@ if ($im) { // which is not supposed to happen var_dump(imagesx($im)); } ?> -===DONE=== --EXPECT-- bool(false) -===DONE=== diff --git a/ext/gd/tests/bug75111.phpt b/ext/gd/tests/bug75111.phpt index 3950799730b..4ec22c4a3a1 100644 --- a/ext/gd/tests/bug75111.phpt +++ b/ext/gd/tests/bug75111.phpt @@ -16,10 +16,8 @@ $str .= hex2bin("01001800000000000000000000000000000000000000000000000000"); var_dump(imagecreatefromstring($str)); ?> -===DONE=== --EXPECTF-- Warning: imagecreatefromstring(): Passed data is not in 'BMP' format in %s on line %d Warning: imagecreatefromstring(): Couldn't create GD Image Stream out of Data in %s on line %d bool(false) -===DONE=== diff --git a/ext/gd/tests/bug75124.phpt b/ext/gd/tests/bug75124.phpt index 513d4521471..47c313fa84f 100644 --- a/ext/gd/tests/bug75124.phpt +++ b/ext/gd/tests/bug75124.phpt @@ -25,7 +25,5 @@ for ($i = 0, $width = imagesx($im); $i < $width; $i ++) { } } ?> -===DONE=== --EXPECT-- bool(true) -===DONE=== diff --git a/ext/gd/tests/bug75437.phpt b/ext/gd/tests/bug75437.phpt index 1dbbae64786..7da6d2f2361 100644 --- a/ext/gd/tests/bug75437.phpt +++ b/ext/gd/tests/bug75437.phpt @@ -12,8 +12,6 @@ $rf = new ReflectionFunction('imagewebp'); var_dump($rf->getNumberOfParameters()); var_dump($rf->getNumberOfRequiredParameters()); ?> -===DONE=== --EXPECT-- int(3) int(1) -===DONE=== diff --git a/ext/gd/tests/bug75571.phpt b/ext/gd/tests/bug75571.phpt index 5bd26b84ec5..10b459d421f 100644 --- a/ext/gd/tests/bug75571.phpt +++ b/ext/gd/tests/bug75571.phpt @@ -8,8 +8,6 @@ if (!extension_loaded('gd')) die('skip gd extension not available'); -===DONE=== --EXPECTF-- Warning: imagecreatefromgif(): '%s' is not a valid GIF file in %s on line %d bool(false) -===DONE=== diff --git a/ext/gd/tests/bug77195.phpt b/ext/gd/tests/bug77195.phpt index 5aa1f51b02f..f90035b7416 100644 --- a/ext/gd/tests/bug77195.phpt +++ b/ext/gd/tests/bug77195.phpt @@ -11,9 +11,7 @@ $filename = __DIR__ . '/bug77195.jpg'; @imagecreatefromjpeg($filename); imagecreatefromjpeg($filename); ?> -===DONE=== --EXPECTF-- Warning: imagecreatefromjpeg(): gd-jpeg: JPEG library reports unrecoverable error: JPEG datastream contains no image in %s on line %d Warning: imagecreatefromjpeg(): '%s' is not a valid JPEG file in %s on line %d -===DONE=== diff --git a/ext/gd/tests/bug77200.phpt b/ext/gd/tests/bug77200.phpt index 99d8efb5508..b6737606712 100644 --- a/ext/gd/tests/bug77200.phpt +++ b/ext/gd/tests/bug77200.phpt @@ -30,8 +30,6 @@ $cropped = imagecropauto($orig, IMG_CROP_SIDES); var_dump(imagesx($cropped)); ?> -===DONE=== --EXPECT-- int(4) int(4) -===DONE=== diff --git a/ext/gd/tests/bug77269.phpt b/ext/gd/tests/bug77269.phpt index 527f26c3970..6a426a2aa08 100644 --- a/ext/gd/tests/bug77269.phpt +++ b/ext/gd/tests/bug77269.phpt @@ -13,8 +13,6 @@ $im = imagecreate(2**28, 1); imagescale($im, 1, 1, IMG_TRIANGLE); ?> -===DONE=== --EXPECTF-- Warning: imagescale():%S product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully in %s on line %d -===DONE=== diff --git a/ext/gd/tests/bug77272.phpt b/ext/gd/tests/bug77272.phpt index d3bfa24aaa2..f2d1c90a6d7 100644 --- a/ext/gd/tests/bug77272.phpt +++ b/ext/gd/tests/bug77272.phpt @@ -13,9 +13,7 @@ if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); $img = imagecreate(2**28, 1); var_dump(imagescale($img, 1, 1, IMG_TRIANGLE)); ?> -===DONE=== --EXPECTF-- Warning: imagescale():%S product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully in %s on line %d bool(false) -===DONE=== diff --git a/ext/gd/tests/bug77479.phpt b/ext/gd/tests/bug77479.phpt index 063f5d4f8a9..855d511992e 100644 --- a/ext/gd/tests/bug77479.phpt +++ b/ext/gd/tests/bug77479.phpt @@ -13,13 +13,11 @@ $im = imagecreate(40000, 20000); imagecolorallocate($im, 0, 0, 0); imagewbmp($im, __DIR__ . '/77479.wbmp'); ?> -===DONE=== --EXPECTF-- Warning: imagewbmp():%S product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully in %s on line %d Warning: imagewbmp(): Could not create WBMP in %s on line %d -===DONE=== --CLEAN-- -===DONE=== --EXPECT-- int(1) -===DONE=== --CLEAN-- -===DONE=== --EXPECT-- The images are equal. -===DONE=== diff --git a/ext/gd/tests/bug77973.phpt b/ext/gd/tests/bug77973.phpt index 2545dbe1281..6a469a32c2b 100644 --- a/ext/gd/tests/bug77973.phpt +++ b/ext/gd/tests/bug77973.phpt @@ -13,13 +13,11 @@ file_put_contents($filepath, $contents); $im = imagecreatefromxbm($filepath); var_dump($im); ?> -===DONE=== --EXPECTF-- Warning: imagecreatefromxbm(): invalid XBM in %s on line %d Warning: imagecreatefromxbm(): '%s' is not a valid XBM file in %s on line %d bool(false) -===DONE=== --CLEAN-- -===DONE=== --EXPECTF-- *** Testing gd_info() : variation *** array(%d) { @@ -49,4 +48,3 @@ array(%d) { ["JIS-mapped Japanese Font Support"]=> bool(%s) } -===DONE=== diff --git a/ext/gd/tests/imagecolorallocate_basic.phpt b/ext/gd/tests/imagecolorallocate_basic.phpt index e0e9adf852b..64ce2203a01 100644 --- a/ext/gd/tests/imagecolorallocate_basic.phpt +++ b/ext/gd/tests/imagecolorallocate_basic.phpt @@ -25,11 +25,9 @@ var_dump( imagecolorallocate($im, 0, 255, 0) ); var_dump( imagecolorallocate($im, 0, 0, 255) ); var_dump( imagecolorallocate($im, 255, 255, 255) ); ?> -===DONE=== --EXPECT-- *** Testing imagecolorallocate() : basic functionality *** int(16711680) int(65280) int(255) int(16777215) -===DONE=== diff --git a/ext/gd/tests/imagecolorallocate_variation5.phpt b/ext/gd/tests/imagecolorallocate_variation5.phpt index ae6acb18f67..1451af5a83b 100644 --- a/ext/gd/tests/imagecolorallocate_variation5.phpt +++ b/ext/gd/tests/imagecolorallocate_variation5.phpt @@ -49,7 +49,6 @@ foreach($values as $key => $value) { ); }; ?> -===DONE=== --EXPECT-- *** Testing imagecolorallocate() : usage variations *** @@ -92,4 +91,3 @@ int(657930) int(16714250) int(720650) int(658175) -===DONE=== diff --git a/ext/gd/tests/imagecolorallocate_variation6.phpt b/ext/gd/tests/imagecolorallocate_variation6.phpt index 9f21739ff1a..6af26801b82 100644 --- a/ext/gd/tests/imagecolorallocate_variation6.phpt +++ b/ext/gd/tests/imagecolorallocate_variation6.phpt @@ -47,7 +47,6 @@ foreach($values as $key => $value) { ); }; ?> -===DONE=== --EXPECT-- *** Testing imagecolorallocate() : usage variations *** @@ -74,4 +73,3 @@ foreach($values as $key => $value) { !! [ValueError] Green component is out of range, must be between 0 and 255 (inclusive) !! [ValueError] Blue component is out of range, must be between 0 and 255 (inclusive) !! [ValueError] Blue component is out of range, must be between 0 and 255 (inclusive) -===DONE=== diff --git a/ext/gd/tests/imagecolorstotal_basic.phpt b/ext/gd/tests/imagecolorstotal_basic.phpt index 22eb022fc26..0cdc10bcdd2 100644 --- a/ext/gd/tests/imagecolorstotal_basic.phpt +++ b/ext/gd/tests/imagecolorstotal_basic.phpt @@ -29,8 +29,6 @@ echo 'Total colors in image: ' . imagecolorstotal($im); imagedestroy($im); ?> -===DONE=== --EXPECT-- *** Testing imagecolorstotal() : basic functionality *** Total colors in image: 128 -===DONE=== diff --git a/ext/gd/tests/imagecolourstotal_basic.phpt b/ext/gd/tests/imagecolourstotal_basic.phpt index 58405c5c192..e67794b6044 100644 --- a/ext/gd/tests/imagecolourstotal_basic.phpt +++ b/ext/gd/tests/imagecolourstotal_basic.phpt @@ -39,7 +39,6 @@ var_dump( imagecolorstotal( $img ) ); imagedestroy( $img ); ?> -===DONE=== --EXPECT-- *** Testing imagecolorstotal() : basic functionality *** int(0) @@ -47,4 +46,3 @@ int(1) int(3) int(0) int(0) -===DONE=== diff --git a/ext/gd/tests/imagecreatefrombmp_basic.phpt b/ext/gd/tests/imagecreatefrombmp_basic.phpt index 96c90700b85..9cf6bd2ca30 100644 --- a/ext/gd/tests/imagecreatefrombmp_basic.phpt +++ b/ext/gd/tests/imagecreatefrombmp_basic.phpt @@ -13,7 +13,5 @@ $im = imagecreatefrombmp(__DIR__ . '/imagecreatefrombmp_basic.bmp'); include_once __DIR__ . '/func.inc'; test_image_equals_file(__DIR__ . '/imagecreatefrombmp_basic.png', $im); ?> -===DONE=== --EXPECT-- The images are equal. -===DONE=== diff --git a/ext/gd/tests/imagecreatefromstring_bmp.phpt b/ext/gd/tests/imagecreatefromstring_bmp.phpt index a0c8b3e57e1..14d7aabeded 100644 --- a/ext/gd/tests/imagecreatefromstring_bmp.phpt +++ b/ext/gd/tests/imagecreatefromstring_bmp.phpt @@ -22,7 +22,5 @@ $im = imagecreatefromstring($bmp); include_once __DIR__ . '/func.inc'; test_image_equals_file(__DIR__ . '/imagecreatefromstring_bmp.png', $im); ?> -===DONE=== --EXPECT-- The images are equal. -===DONE=== diff --git a/ext/gd/tests/imagecreatefromstring_gif.phpt b/ext/gd/tests/imagecreatefromstring_gif.phpt index c913f4ed139..66f91c1aff2 100644 --- a/ext/gd/tests/imagecreatefromstring_gif.phpt +++ b/ext/gd/tests/imagecreatefromstring_gif.phpt @@ -13,8 +13,6 @@ var_dump(imagesx($im)); var_dump(imagesy($im)); ?> -===DONE=== --EXPECT-- int(10) int(10) -===DONE=== diff --git a/ext/gd/tests/imagecreatefromstring_png.phpt b/ext/gd/tests/imagecreatefromstring_png.phpt index efb8cc3622c..b76f1a181a6 100644 --- a/ext/gd/tests/imagecreatefromstring_png.phpt +++ b/ext/gd/tests/imagecreatefromstring_png.phpt @@ -13,8 +13,6 @@ var_dump(imagesx($im)); var_dump(imagesy($im)); ?> -===DONE=== --EXPECT-- int(10) int(10) -===DONE=== diff --git a/ext/gd/tests/imagecreatefromstring_webp.phpt b/ext/gd/tests/imagecreatefromstring_webp.phpt index fbae919ab48..e60be0499a7 100644 --- a/ext/gd/tests/imagecreatefromstring_webp.phpt +++ b/ext/gd/tests/imagecreatefromstring_webp.phpt @@ -13,8 +13,6 @@ var_dump(imagesx($im)); var_dump(imagesy($im)); ?> -===DONE=== --EXPECT-- int(10) int(10) -===DONE=== diff --git a/ext/gd/tests/imagegammacorrect_variation2.phpt b/ext/gd/tests/imagegammacorrect_variation2.phpt index 6a66147ce93..908be81d429 100644 --- a/ext/gd/tests/imagegammacorrect_variation2.phpt +++ b/ext/gd/tests/imagegammacorrect_variation2.phpt @@ -61,7 +61,6 @@ function cell_color($im, $x, $y) } } ?> -===DONE=== --EXPECT-- palette gamma (1, 2): The images are equal. truecolor gamma (1, 2): The images are equal. @@ -69,4 +68,3 @@ palette gamma (1, 1): The images are equal. truecolor gamma (1, 1): The images are equal. palette gamma (2, 1): The images are equal. truecolor gamma (2, 1): The images are equal. -===DONE=== diff --git a/ext/gd/tests/imagegd_truecolor.phpt b/ext/gd/tests/imagegd_truecolor.phpt index 6787ad30298..5c03f6994b9 100644 --- a/ext/gd/tests/imagegd_truecolor.phpt +++ b/ext/gd/tests/imagegd_truecolor.phpt @@ -25,10 +25,8 @@ printf("size: %d\n", strlen($buffer)); test_image_equals_file(__DIR__ . DIRECTORY_SEPARATOR . 'imagegd_truecolor.png', $im); ?> -===DONE=== --EXPECT-- signature: 65534 truecolor: 1 size: 411 The images are equal. -===DONE=== diff --git a/ext/gd/tests/imageopenpolygon_basic.phpt b/ext/gd/tests/imageopenpolygon_basic.phpt index 0109cf015ec..b6323b4ddc8 100644 --- a/ext/gd/tests/imageopenpolygon_basic.phpt +++ b/ext/gd/tests/imageopenpolygon_basic.phpt @@ -23,7 +23,5 @@ imageopenpolygon($im, [10,50, 25,10, 40,89, 55,10, 80,89, 90,50], 6, $blue); test_image_equals_file(__DIR__ . DIRECTORY_SEPARATOR . 'imageopenpolygon.png', $im); ?> -===DONE=== --EXPECT-- The images are equal. -===DONE=== diff --git a/ext/gd/tests/imagepolygon_aa.phpt b/ext/gd/tests/imagepolygon_aa.phpt index 9725bdabe80..e6a7dafd1d5 100644 --- a/ext/gd/tests/imagepolygon_aa.phpt +++ b/ext/gd/tests/imagepolygon_aa.phpt @@ -18,7 +18,5 @@ imagepolygon($im, [10,10, 49,89, 89,49], 3, $black); test_image_equals_file(__DIR__ . DIRECTORY_SEPARATOR . 'imagepolygon_aa.png', $im); ?> -===DONE=== --EXPECT-- The images are equal. -===DONE=== diff --git a/ext/gd/tests/imageresolution_jpeg.phpt b/ext/gd/tests/imageresolution_jpeg.phpt index a659e2682a4..73b76c1f9d7 100644 --- a/ext/gd/tests/imageresolution_jpeg.phpt +++ b/ext/gd/tests/imageresolution_jpeg.phpt @@ -22,7 +22,6 @@ imagejpeg($exp, $filename); $act = imagecreatefromjpeg($filename); var_dump(imageresolution($act)); ?> -===DONE=== --EXPECT-- array(2) { [0]=> @@ -36,7 +35,6 @@ array(2) { [1]=> int(299) } -===DONE=== --CLEAN-- -===DONE=== --EXPECT-- array(2) { [0]=> @@ -35,7 +34,6 @@ array(2) { [1]=> int(299) } -===DONE=== --CLEAN-- -===DONE=== --EXPECT-- The images differ in 25 pixels. The images are equal. -===DONE=== --CLEAN-- -==DONE== --EXPECTF-- Warning: bindtextdomain(): domain passed too long in %s on line %d bool(false) @@ -81,4 +80,3 @@ bool(false) Warning: textdomain(): domain passed too long in %s on line %d bool(false) -==DONE== diff --git a/ext/gettext/tests/bug66267.phpt b/ext/gettext/tests/bug66267.phpt index e5a20411098..30a839390ba 100644 --- a/ext/gettext/tests/bug66267.phpt +++ b/ext/gettext/tests/bug66267.phpt @@ -41,7 +41,6 @@ foreach ($loc as $l) { } ?> -==DONE== --EXPECT-- LC_ALL=de_DE hello=hallo @@ -52,4 +51,3 @@ hello=salut LC_ALL=en_US hello=hello -==DONE== diff --git a/ext/gettext/tests/bug73730.phpt b/ext/gettext/tests/bug73730.phpt index df6d7b0f11c..6fd63b885da 100644 --- a/ext/gettext/tests/bug73730.phpt +++ b/ext/gettext/tests/bug73730.phpt @@ -10,7 +10,5 @@ declare(strict_types=1); var_dump(textdomain(null)); ?> -===DONE=== --EXPECT-- string(8) "messages" -===DONE=== diff --git a/ext/hash/tests/hash_algos.phpt b/ext/hash/tests/hash_algos.phpt index 87efdc92134..ebcbcf2793f 100644 --- a/ext/hash/tests/hash_algos.phpt +++ b/ext/hash/tests/hash_algos.phpt @@ -13,7 +13,6 @@ echo "*** Testing hash_algos() : basic functionality ***\n"; var_dump(hash_algos()); ?> -===Done=== --EXPECTF-- *** Testing hash_algos() : basic functionality *** array(53) { @@ -124,4 +123,3 @@ array(53) { [%d]=> string(10) "haval256,5" } -===Done=== diff --git a/ext/hash/tests/hash_error.phpt b/ext/hash/tests/hash_error.phpt index f879d491d79..8a54831c1a6 100644 --- a/ext/hash/tests/hash_error.phpt +++ b/ext/hash/tests/hash_error.phpt @@ -14,7 +14,6 @@ echo "\n-- Testing hash() function with invalid hash algorithm --\n"; var_dump(hash('foo', '')); ?> -===Done=== --EXPECTF-- *** Testing hash() : error conditions *** @@ -22,4 +21,3 @@ var_dump(hash('foo', '')); Warning: hash(): Unknown hashing algorithm: foo in %s on line %d bool(false) -===Done=== diff --git a/ext/hash/tests/hash_file_basic.phpt b/ext/hash/tests/hash_file_basic.phpt index 283cc375272..77a110594e4 100644 --- a/ext/hash/tests/hash_file_basic.phpt +++ b/ext/hash/tests/hash_file_basic.phpt @@ -24,7 +24,6 @@ var_dump( hash_file( 'sha512', $filename ) ); var_dump( base64_encode( hash_file( 'md5', $filename, true ) ) ); ?> -===DONE=== --CLEAN-- -===Done=== --EXPECT-- *** Testing hash_file() : basic functionality *** adler32: ff87222e @@ -80,4 +79,3 @@ whirlpool: 4248b149e000477269a4a5f1a84d97cfc3d0199b7aaf505913e6f010a6f83276029d1 adler32(raw): ff87222e md5(raw): 704bf818448f5bbb94061332d2c889aa sha256(raw): a0f5702fa5d3670b80033d668e8732b70550392abb53841355447f8bb0f72245 -===Done=== diff --git a/ext/hash/tests/hash_file_error.phpt b/ext/hash/tests/hash_file_error.phpt index b001001861a..534d6a3f2c6 100644 --- a/ext/hash/tests/hash_file_error.phpt +++ b/ext/hash/tests/hash_file_error.phpt @@ -25,7 +25,6 @@ echo "\n-- Testing hash_file() function with a non-existent file --\n"; var_dump( hash_file( 'md5', 'nonexistent.txt' ) ); ?> -===DONE=== --CLEAN-- hash_hkdf('sha1', $ikm, 20 * 255 + 1) // Length can't be more than 255 times the hash digest size ) ?> -===Done=== --EXPECT-- *** Testing hash_hkdf(): error conditions *** @@ -70,4 +69,3 @@ trycatch_dump( [Error] Input keying material cannot be empty [Error] Length must be greater than or equal to 0: -1 [Error] Length must be less than or equal to 5100: 5101 -===Done=== diff --git a/ext/hash/tests/hash_hkdf_rfc5869.phpt b/ext/hash/tests/hash_hkdf_rfc5869.phpt index 5652bff5ef6..26a0139f89a 100644 --- a/ext/hash/tests/hash_hkdf_rfc5869.phpt +++ b/ext/hash/tests/hash_hkdf_rfc5869.phpt @@ -65,7 +65,6 @@ echo "Test case 7 (SHA-1 with zero-length info, salt not provided): ", '' )), "\n"; ?> -===Done=== --EXPECT-- *** Testing hash_hkdf(): RFC 5869 test vectors *** Test case 1 (SHA-256): 3cb25f25faacd57a90434f64d0362f2a2d2d0a90cf1a5a4c5db02d56ecc4c5bf34007208d5b887185865 @@ -75,4 +74,3 @@ Test case 4 (SHA-1): 085a01ea1b10f36933068b56efa5ad81a4f14b822f5b091568a9cdd4f15 Test case 5 (SHA-1 with longer inputs/outputs): 0bd770a74d1160f7c9f12cd5912a06ebff6adcae899d92191fe4305673ba2ffe8fa3f1a4e5ad79f3f334b3b202b2173c486ea37ce3d397ed034c7f9dfeb15c5e927336d0441f4c4300e2cff0d0900b52d3b4 Test case 6 (SHA-1 with zero-length salt, info): 0ac1af7002b3d761d1e55298da9d0506b9ae52057220a306e07b6b87e8df21d0ea00033de03984d34918 Test case 7 (SHA-1 with zero-length info, salt not provided): 2c91117204d745f3500d636a62f64f0ab3bae548aa53d423b0d1f27ebba6f5e5673a081d70cce7acfc48 -===Done=== diff --git a/ext/hash/tests/hash_hmac_basic.phpt b/ext/hash/tests/hash_hmac_basic.phpt index 1ad27e1cb21..1cc98ae1d4b 100644 --- a/ext/hash/tests/hash_hmac_basic.phpt +++ b/ext/hash/tests/hash_hmac_basic.phpt @@ -34,7 +34,6 @@ echo "md5(raw): " . bin2hex(hash_hmac('md5', $content, $key, TRUE)) . "\n"; echo "sha256(raw): " . bin2hex(hash_hmac('sha256', $content, $key, TRUE)) . "\n"; ?> -===Done=== --EXPECT-- *** Testing hash_hmac() : basic functionality *** gost: a4a3c80bdf3f8665bf07376a34dc9c1b11af7c813f4928f62e39f0c0dc564dad @@ -55,4 +54,3 @@ tiger192,3: 00a0f884f15a9e5549ed0e40ca0190522d369027e16d5b59 whirlpool: 4a0f1582b21b7aff59bfba7f9c29131c69741b2ce80acdc7d314040f3b768cf5a17e30b74cceb86fbc6b34b1692e0addd5bfd7cfc043d40c0621f1b97e26fa49 md5(raw): 2a632783e2812cf23de100d7d6a463ae sha256(raw): 49bde3496b9510a17d0edd8a4b0ac70148e32a1d51e881ec76faa96534125838 -===Done=== diff --git a/ext/hash/tests/hash_hmac_error.phpt b/ext/hash/tests/hash_hmac_error.phpt index fe9ed734d41..cadbf23d1a4 100644 --- a/ext/hash/tests/hash_hmac_error.phpt +++ b/ext/hash/tests/hash_hmac_error.phpt @@ -29,7 +29,6 @@ catch (\Error $e) { } ?> -===Done=== --EXPECT-- *** Testing hash_hmac() : error conditions *** @@ -38,4 +37,3 @@ Unknown hashing algorithm: foo -- Testing hash_hmac() function with non-cryptographic hash algorithm -- Non-cryptographic hashing algorithm: crc32 -===Done=== diff --git a/ext/hash/tests/hash_hmac_file_basic.phpt b/ext/hash/tests/hash_hmac_file_basic.phpt index 7ce5cba7c40..32bc95fdbc5 100644 --- a/ext/hash/tests/hash_hmac_file_basic.phpt +++ b/ext/hash/tests/hash_hmac_file_basic.phpt @@ -57,7 +57,6 @@ echo "sha256(raw): " . bin2hex(hash_hmac_file('sha256', $file, $key, TRUE)). "\n unlink($file); ?> -===Done=== --EXPECTF-- *** Testing hash_hmac_file() : basic functionality *** gost: 94c39a40d5db852a8dc3d24e37eebf2d53e3d711457c59cd02b614f792a9d918 @@ -78,4 +77,3 @@ tiger192,3: ca89badf843ba68e3fae5832635aa848a72a4bc11676edd4 whirlpool: 37a0fbb90547690d5e5e11c046f6654ffdb7bab15e16d9d79c7d85765cc4bdcbfd9df8db7a3ce9558f3f244fead00ca29cf05297f75596555195a0683f15d69f md5(raw): 8bddf39dd1c566c27acc7fa85ec36acf sha256(raw): 9135286ca4c84dec711e4b831f6cd39e672e5ff93d011321274eb76733cc1e40 -===Done=== diff --git a/ext/hash/tests/hash_hmac_file_error.phpt b/ext/hash/tests/hash_hmac_file_error.phpt index 5660b0f40c4..5207b74d9df 100644 --- a/ext/hash/tests/hash_hmac_file_error.phpt +++ b/ext/hash/tests/hash_hmac_file_error.phpt @@ -39,7 +39,6 @@ catch (\Error $e) { } ?> -===Done=== --EXPECT-- *** Testing hash() : error conditions *** @@ -51,4 +50,3 @@ Non-cryptographic hashing algorithm: crc32 -- Testing hash_hmac_file() function with bad path -- Invalid path -===Done=== diff --git a/ext/hash/tests/hash_pbkdf2_basic.phpt b/ext/hash/tests/hash_pbkdf2_basic.phpt index 71187a0fdd9..0ba500a3273 100644 --- a/ext/hash/tests/hash_pbkdf2_basic.phpt +++ b/ext/hash/tests/hash_pbkdf2_basic.phpt @@ -23,7 +23,6 @@ echo "sha256(rounds): " . hash_pbkdf2('sha256', 'passwordPASSWORDpassword', 'sal echo "sha256(rounds)(raw): " . bin2hex(hash_pbkdf2('sha256', 'passwordPASSWORDpassword', 'saltSALTsaltSALTsaltSALTsaltSALTsalt', 4096, 40, TRUE))."\n"; ?> -===Done=== --EXPECT-- *** Testing hash_pbkdf2() : basic functionality *** sha1: 0c60c80f961f0e71f3a9 @@ -36,4 +35,3 @@ sha256(no length): 120fb6cffcf8b32c43e7225256c4f837a86548c92ccc35480805987cb70be sha256(raw): 120fb6cffcf8b32c43e7225256c4f837a86548c9 sha256(rounds): 348c89dbcbd32b2f32d814b8116e84cf2b17347e sha256(rounds)(raw): 348c89dbcbd32b2f32d814b8116e84cf2b17347ebc1800181c4e2a1fb8dd53e1c635518c7dac47e9 -===Done=== diff --git a/ext/hash/tests/hash_pbkdf2_error.phpt b/ext/hash/tests/hash_pbkdf2_error.phpt index 4cb5ede00b1..02d48f1ac6d 100644 --- a/ext/hash/tests/hash_pbkdf2_error.phpt +++ b/ext/hash/tests/hash_pbkdf2_error.phpt @@ -53,7 +53,6 @@ catch (\Error $e) { } ?> -===Done=== --EXPECT-- *** Testing hash_pbkdf2() : error conditions *** @@ -69,4 +68,3 @@ Iterations must be a positive integer: -1 -- Testing hash_pbkdf2() function with invalid length -- Length must be greater than or equal to 0: -1 -===Done=== diff --git a/ext/iconv/tests/bug53891.phpt b/ext/iconv/tests/bug53891.phpt index 342b48e3a22..aa359ef3861 100644 --- a/ext/iconv/tests/bug53891.phpt +++ b/ext/iconv/tests/bug53891.phpt @@ -15,7 +15,5 @@ $preferences = array( ); var_dump(iconv_mime_encode('subject', "d obeybiubrsfqllpdtpge…", $preferences)); ?> -===DONE=== --EXPECT-- string(54) "subject: =?utf-8?Q?d=20obeybiubrsfqllpdtpge=E2=80=A6?=" -===DONE=== diff --git a/ext/iconv/tests/bug55146.phpt b/ext/iconv/tests/bug55146.phpt index b3c2015314c..2583ac75780 100644 --- a/ext/iconv/tests/bug55146.phpt +++ b/ext/iconv/tests/bug55146.phpt @@ -19,7 +19,6 @@ X-Header-Two: XtLePq6GTMn8G68F0 HEADERS; var_dump(iconv_mime_decode_headers($headers, ICONV_MIME_DECODE_STRICT)); ?> -===DONE=== --EXPECT-- array(2) { ["X-Header-One"]=> @@ -33,4 +32,3 @@ array(2) { ["X-Header-Two"]=> string(17) "XtLePq6GTMn8G68F0" } -===DONE=== diff --git a/ext/iconv/tests/bug60494.phpt b/ext/iconv/tests/bug60494.phpt index 5c658af56ba..d3038233884 100644 --- a/ext/iconv/tests/bug60494.phpt +++ b/ext/iconv/tests/bug60494.phpt @@ -10,7 +10,6 @@ var_dump(iconv_mime_decode('ä')); var_dump(iconv_mime_decode('ö')); var_dump(iconv_mime_decode('ß')); ?> -===DONE=== --EXPECTF-- Notice: iconv_mime_decode(): Detected an illegal character in input string in %s on line %d bool(false) @@ -20,4 +19,3 @@ bool(false) Notice: iconv_mime_decode(): Detected an illegal character in input string in %s on line %d bool(false) -===DONE=== diff --git a/ext/iconv/tests/bug63839.phpt b/ext/iconv/tests/bug63839.phpt index 22f601ee59b..99d1a20cc60 100644 --- a/ext/iconv/tests/bug63839.phpt +++ b/ext/iconv/tests/bug63839.phpt @@ -22,7 +22,6 @@ Content-Language: en-us var_dump(iconv_mime_decode_headers($headers, ICONV_MIME_DECODE_CONTINUE_ON_ERROR)); var_dump(iconv_mime_decode_headers($headers, ICONV_MIME_DECODE_STRICT)); ?> -===DONE=== --EXPECT-- array(10) { ["From"]=> @@ -68,4 +67,3 @@ array(10) { ["Content-Language"]=> string(5) "en-us" } -===DONE=== diff --git a/ext/iconv/tests/bug66828.phpt b/ext/iconv/tests/bug66828.phpt index 9914b41b14d..1d6f47dc75c 100644 --- a/ext/iconv/tests/bug66828.phpt +++ b/ext/iconv/tests/bug66828.phpt @@ -15,7 +15,5 @@ $preferences = array( ); var_dump(iconv_mime_encode("Subject", "Test Test Test Test Test Test Test Test", $preferences)); ?> -===DONE=== --EXPECT-- string(74) "Subject: =?UTF-8?Q?Test=20Test=20Test=20Test=20Test=20Test=20Test=20Test?=" -===DONE=== diff --git a/ext/iconv/tests/bug68180.phpt b/ext/iconv/tests/bug68180.phpt index 3442629235a..a6d64f22ce6 100644 --- a/ext/iconv/tests/bug68180.phpt +++ b/ext/iconv/tests/bug68180.phpt @@ -10,7 +10,5 @@ $original = "=?UTF-8?Q?=E3=80=8E=E3=80=90=E5=A4=96=E8=B3=87=E7=B3=BB=E6=88=A6=E7 $decoded = iconv_mime_decode($original, ICONV_MIME_DECODE_STRICT, 'utf-8'); var_dump($decoded); ?> -===DONE=== --EXPECT-- string(183) "『【外資系戦略コンサルが集結】トップコンサルタントと話せるコンサル業界研究セミナー』へのエントリーありがとうございました。" -===DONE=== diff --git a/ext/iconv/tests/bug77147.phpt b/ext/iconv/tests/bug77147.phpt index 839f8972e3a..4f091d3ede2 100644 --- a/ext/iconv/tests/bug77147.phpt +++ b/ext/iconv/tests/bug77147.phpt @@ -12,10 +12,8 @@ EOF; $headers = iconv_mime_decode_headers($string, ICONV_MIME_DECODE_CONTINUE_ON_ERROR); var_dump($headers); ?> -===DONE=== --EXPECT-- array(1) { ["Feedback-ID"]=> string(86) "014a93e3-1f5e-4df6-b347-6b59f0f746b8:b5891053-55d1-45bc-a0b5-47a7a9b59687:email:epslh1" } -===DONE=== diff --git a/ext/iconv/tests/iconv_strlen_basic.phpt b/ext/iconv/tests/iconv_strlen_basic.phpt index 7e1bec9e733..c81dbd3e606 100644 --- a/ext/iconv/tests/iconv_strlen_basic.phpt +++ b/ext/iconv/tests/iconv_strlen_basic.phpt @@ -28,7 +28,6 @@ var_dump(iconv_strlen($string_ascii)); echo "\n-- Multibyte String --\n"; var_dump(iconv_strlen($string_mb, 'UTF-8')); ?> -===DONE=== --EXPECT-- *** Testing iconv_strlen() : basic functionality*** @@ -37,4 +36,3 @@ int(7) -- Multibyte String -- int(21) -===DONE=== diff --git a/ext/iconv/tests/iconv_strlen_error2.phpt b/ext/iconv/tests/iconv_strlen_error2.phpt index 973efecb350..efcca8b79ca 100644 --- a/ext/iconv/tests/iconv_strlen_error2.phpt +++ b/ext/iconv/tests/iconv_strlen_error2.phpt @@ -25,10 +25,8 @@ $encoding = 'unknown-encoding'; var_dump(iconv_strlen($string, $encoding)); ?> -===DONE=== --EXPECTF-- *** Testing iconv_strlen() : error *** Notice: iconv_strlen(): Wrong charset, conversion from `unknown-encoding' to `UCS-4LE' is not allowed in %s on line %d bool(false) -===DONE=== diff --git a/ext/imap/tests/bug75774.phpt b/ext/imap/tests/bug75774.phpt index 0d2aeadf013..b47ef2e4154 100644 --- a/ext/imap/tests/bug75774.phpt +++ b/ext/imap/tests/bug75774.phpt @@ -20,9 +20,7 @@ fclose($var1); unlink($fn); ?> -==DONE== --EXPECTF-- Warning: imap_append(): internal date not correctly formatted in %s on line %d Exception: imap_append(): supplied resource is not a valid imap resource -==DONE== diff --git a/ext/imap/tests/bug77020.phpt b/ext/imap/tests/bug77020.phpt index 357b75333a7..582b132ad86 100644 --- a/ext/imap/tests/bug77020.phpt +++ b/ext/imap/tests/bug77020.phpt @@ -8,8 +8,6 @@ if (!extension_loaded('imap')) die('skip imap extension not available'); -===DONE=== --EXPECTF-- Warning: imap_mail(): No message string in mail command in %s on line %d %A -===DONE=== diff --git a/ext/imap/tests/imap_8bit_basic.phpt b/ext/imap/tests/imap_8bit_basic.phpt index 799889bb3d2..6e81e31d3ea 100644 --- a/ext/imap/tests/imap_8bit_basic.phpt +++ b/ext/imap/tests/imap_8bit_basic.phpt @@ -21,7 +21,6 @@ var_dump(imap_8bit("String with tab at end \t")); var_dump(imap_8bit("\x00\x01\x02\x03\x04\xfe\xff\x0a\x0d")); ?> -===Done=== --EXPECT-- *** Testing imap_8bit() : basic functionality *** string(28) "String with CRLF at end=20 @@ -30,4 +29,3 @@ string(25) "String with space at end " string(33) "String with tabs =09=09 in middle" string(26) "String with tab at end =09" string(27) "=00=01=02=03=04=FE=FF=0A=0D" -===Done=== diff --git a/ext/imap/tests/imap_alerts_error.phpt b/ext/imap/tests/imap_alerts_error.phpt index 546d193c8f2..620d6d1e805 100644 --- a/ext/imap/tests/imap_alerts_error.phpt +++ b/ext/imap/tests/imap_alerts_error.phpt @@ -20,7 +20,6 @@ $extra_arg = 10; var_dump( imap_alerts($extra_arg) ); ?> -===DONE=== --EXPECTF-- *** Testing imap_alerts() : error conditions *** @@ -28,4 +27,3 @@ var_dump( imap_alerts($extra_arg) ); Warning: imap_alerts() expects exactly 0 parameters, 1 given in %s on line %d NULL -===DONE=== diff --git a/ext/imap/tests/imap_append_basic.phpt b/ext/imap/tests/imap_append_basic.phpt index 500d3afb69a..499a05cc4d5 100644 --- a/ext/imap/tests/imap_append_basic.phpt +++ b/ext/imap/tests/imap_append_basic.phpt @@ -47,7 +47,6 @@ var_dump(imap_headers($imap_stream)); imap_close($imap_stream); ?> -===Done=== --CLEAN-- string(%d) "%w%s 2)%s webmaster@something. Another test (%d chars)" } -===Done=== diff --git a/ext/imap/tests/imap_base64_basic.phpt b/ext/imap/tests/imap_base64_basic.phpt index 3557e9f87ee..a01545ceba6 100644 --- a/ext/imap/tests/imap_base64_basic.phpt +++ b/ext/imap/tests/imap_base64_basic.phpt @@ -38,10 +38,8 @@ if (imap_base64($base64) == $hex) { } ?> -===Done=== --EXPECT-- *** Testing imap_base64() : basic functionality *** TEST PASSED TEST PASSED TEST PASSED -===Done=== diff --git a/ext/imap/tests/imap_binary_basic.phpt b/ext/imap/tests/imap_binary_basic.phpt index 04f85386bce..8809e46d949 100644 --- a/ext/imap/tests/imap_binary_basic.phpt +++ b/ext/imap/tests/imap_binary_basic.phpt @@ -34,7 +34,6 @@ $base64 = imap_binary($hex); var_dump(bin2hex($base64)); ?> -===Done=== --EXPECTF-- *** Testing imap_binary() : basic functionality *** Encode as short string @@ -45,4 +44,3 @@ Encode a string with special characters string(60) "5879737450587464573130374f30422b497a3876506934384c413d3d0d0a" Encode some hexadecimal data string(144) "65444177584867774d5678344d444a636544417a584867774e4678344d445663654441325848684751567834526b4a6365455a4458486847524678340d0a526b566365455a470d0a" -===Done=== diff --git a/ext/imap/tests/imap_body_basic.phpt b/ext/imap/tests/imap_body_basic.phpt index bc9f789c6a5..b3dcfa105e1 100644 --- a/ext/imap/tests/imap_body_basic.phpt +++ b/ext/imap/tests/imap_body_basic.phpt @@ -32,7 +32,6 @@ var_dump(imap_body($imap_stream, 1, FT_UID)); imap_close($imap_stream); ?> -===Done=== --CLEAN-- -===Done=== --CLEAN-- -===Done=== --CLEAN-- -===DONE=== --CLEAN-- -===DONE=== --EXPECTF-- *** Testing imap_close() : error conditions *** @@ -42,4 +41,3 @@ NULL Warning: imap_close() expects at most 2 parameters, 3 given in %s on line %d NULL -===DONE=== diff --git a/ext/imap/tests/imap_close_variation4.phpt b/ext/imap/tests/imap_close_variation4.phpt index d71113ca851..9faa21c2d74 100644 --- a/ext/imap/tests/imap_close_variation4.phpt +++ b/ext/imap/tests/imap_close_variation4.phpt @@ -58,7 +58,6 @@ foreach($inputs as $input) { }; ?> -===DONE=== --CLEAN-- -===Done=== --EXPECTF-- *** Testing imap_createmailbox() : basic functionality *** Newname will be 'phpnewbox' @@ -66,4 +65,3 @@ Unseen: 2 UIDnext: %d UIDvalidity: %d Mailbox 'phpnewbox' removed to restore initial state -===Done=== diff --git a/ext/imap/tests/imap_errors_basic.phpt b/ext/imap/tests/imap_errors_basic.phpt index 0a42e95e1f0..cfd8379bec8 100644 --- a/ext/imap/tests/imap_errors_basic.phpt +++ b/ext/imap/tests/imap_errors_basic.phpt @@ -27,7 +27,6 @@ $mbox = imap_open($default_mailbox, $username, $password, OP_READONLY, 1); echo "List any errors\n"; var_dump(imap_errors()); ?> -===Done=== --EXPECTF-- *** Testing imap_errors() : basic functionality *** Issue open with invalid password with normal default number of retries, i.e 3 @@ -52,4 +51,3 @@ array(%d) { [0]=> string(%d) "%a } -===Done=== diff --git a/ext/imap/tests/imap_fetch_overview_basic.phpt b/ext/imap/tests/imap_fetch_overview_basic.phpt index 03aa9ae0a5a..236a1a0ced7 100644 --- a/ext/imap/tests/imap_fetch_overview_basic.phpt +++ b/ext/imap/tests/imap_fetch_overview_basic.phpt @@ -44,7 +44,6 @@ displayOverviewFields($a[1]); imap_close($stream_id); ?> -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- seen ); ?> -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- $option) { echo "\n-- Mandatory arguments --\n"; var_dump( imap_fetchheader($stream_id, $msg_no) ); ?> -===DONE=== --CLEAN-- -===DONE=== --EXPECTF-- *** Testing imap_fetchheader() : error conditions *** @@ -46,4 +45,3 @@ NULL Warning: imap_fetchheader() expects at least 2 parameters, 1 given in %s on line %d NULL -===DONE=== diff --git a/ext/imap/tests/imap_fetchheader_variation3.phpt b/ext/imap/tests/imap_fetchheader_variation3.phpt index 8230fdcf3e4..e07a97b1211 100644 --- a/ext/imap/tests/imap_fetchheader_variation3.phpt +++ b/ext/imap/tests/imap_fetchheader_variation3.phpt @@ -43,7 +43,6 @@ foreach($options as $option) { $iterator++; } ?> -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- -===Done=== --EXPECTF-- Checking with no parameters @@ -51,4 +50,3 @@ NULL Warning: imap_mail_copy() expects at least 3 parameters, 2 given in %s on line %d NULL -===Done=== diff --git a/ext/imap/tests/imap_mail_copy_basic.phpt b/ext/imap/tests/imap_mail_copy_basic.phpt index a05951e8f60..7b8c69f1042 100644 --- a/ext/imap/tests/imap_mail_copy_basic.phpt +++ b/ext/imap/tests/imap_mail_copy_basic.phpt @@ -31,7 +31,6 @@ var_dump(imap_mail_copy($imap_stream, '1', 'INBOX.'.$mailbox_prefix)); imap_close($imap_stream); ?> -===Done=== --CLEAN-- -===Done=== --EXPECTF-- Checking with no parameters @@ -51,4 +50,3 @@ NULL Warning: imap_mail_move() expects at least 3 parameters, 2 given in %s on line %d NULL -===Done=== diff --git a/ext/imap/tests/imap_mail_move_basic.phpt b/ext/imap/tests/imap_mail_move_basic.phpt index 380d288d9b1..390ec710c52 100644 --- a/ext/imap/tests/imap_mail_move_basic.phpt +++ b/ext/imap/tests/imap_mail_move_basic.phpt @@ -31,7 +31,6 @@ var_dump(imap_mail_move($imap_stream, '1', 'INBOX.'.$mailbox_prefix)); imap_close($imap_stream); ?> -===Done=== --CLEAN-- setText($text); print_r(iterator_to_array($codepoint_it)); ?> -==DONE== --EXPECT-- string(26) "IntlCodePointBreakIterator" Array @@ -40,4 +39,3 @@ Array [14] => 42 [15] => 45 ) -==DONE== diff --git a/ext/intl/tests/breakiter_current_basic.phpt b/ext/intl/tests/breakiter_current_basic.phpt index 1f3e679f476..6715d08f554 100644 --- a/ext/intl/tests/breakiter_current_basic.phpt +++ b/ext/intl/tests/breakiter_current_basic.phpt @@ -18,11 +18,9 @@ var_dump($bi->current()); var_dump($bi->next()); var_dump($bi->current()); ?> -==DONE== --EXPECT-- int(0) int(0) int(0) int(3) int(3) -==DONE== diff --git a/ext/intl/tests/breakiter_following_basic.phpt b/ext/intl/tests/breakiter_following_basic.phpt index c139a2c3b42..4b56f03c397 100644 --- a/ext/intl/tests/breakiter_following_basic.phpt +++ b/ext/intl/tests/breakiter_following_basic.phpt @@ -16,9 +16,7 @@ var_dump($bi->following(5)); var_dump($bi->following(50)); var_dump($bi->following(-1)); ?> -==DONE== --EXPECT-- int(7) int(-1) int(0) -==DONE== diff --git a/ext/intl/tests/breakiter_getLocale_basic.phpt b/ext/intl/tests/breakiter_getLocale_basic.phpt index 2f5f586f16b..a661453ff20 100644 --- a/ext/intl/tests/breakiter_getLocale_basic.phpt +++ b/ext/intl/tests/breakiter_getLocale_basic.phpt @@ -13,8 +13,6 @@ $bi = IntlBreakIterator::createSentenceInstance('pt'); var_dump($bi->getLocale(0)); var_dump($bi->getLocale(1)); ?> -==DONE== --EXPECT-- string(4) "root" string(4) "root" -==DONE== diff --git a/ext/intl/tests/breakiter_getLocale_basic2.phpt b/ext/intl/tests/breakiter_getLocale_basic2.phpt index 55c2af3ef14..ea09abe9c08 100644 --- a/ext/intl/tests/breakiter_getLocale_basic2.phpt +++ b/ext/intl/tests/breakiter_getLocale_basic2.phpt @@ -14,8 +14,6 @@ $bi = IntlBreakIterator::createSentenceInstance('pt'); var_dump($bi->getLocale(0)); var_dump($bi->getLocale(1)); ?> -==DONE== --EXPECT-- string(4) "root" string(2) "pt" -==DONE== diff --git a/ext/intl/tests/breakiter_getLocale_basic3.phpt b/ext/intl/tests/breakiter_getLocale_basic3.phpt index c4b02a9f261..c49bbc39cb1 100644 --- a/ext/intl/tests/breakiter_getLocale_basic3.phpt +++ b/ext/intl/tests/breakiter_getLocale_basic3.phpt @@ -13,8 +13,6 @@ $bi = IntlBreakIterator::createSentenceInstance('pt'); var_dump($bi->getLocale(0)); var_dump($bi->getLocale(1)); ?> -==DONE== --EXPECT-- string(0) "" string(2) "pt" -==DONE== diff --git a/ext/intl/tests/breakiter_getPartsIterator_basic.phpt b/ext/intl/tests/breakiter_getPartsIterator_basic.phpt index bbd6a7e07b6..c3210906c7a 100644 --- a/ext/intl/tests/breakiter_getPartsIterator_basic.phpt +++ b/ext/intl/tests/breakiter_getPartsIterator_basic.phpt @@ -22,7 +22,6 @@ var_dump(get_class($pi->getBreakIterator())); print_r(iterator_to_array($pi)); var_dump($pi->getRuleStatus()); ?> -==DONE== --EXPECT-- string(17) "IntlPartsIterator" Array @@ -36,4 +35,3 @@ Array [2] => bar ) int(0) -==DONE== diff --git a/ext/intl/tests/breakiter_getPartsIterator_basic2.phpt b/ext/intl/tests/breakiter_getPartsIterator_basic2.phpt index 2f96fa9aedb..834da13ecea 100644 --- a/ext/intl/tests/breakiter_getPartsIterator_basic2.phpt +++ b/ext/intl/tests/breakiter_getPartsIterator_basic2.phpt @@ -22,7 +22,6 @@ var_dump(get_class($pi->getBreakIterator())); print_r(iterator_to_array($pi)); var_dump($pi->getRuleStatus()); ?> -==DONE== --EXPECTF-- string(17) "IntlPartsIterator" Array @@ -36,4 +35,3 @@ Array [2] => bar ) int(%d) -==DONE== diff --git a/ext/intl/tests/breakiter_getPartsIterator_error.phpt b/ext/intl/tests/breakiter_getPartsIterator_error.phpt index 506b376c190..b2931a000d7 100644 --- a/ext/intl/tests/breakiter_getPartsIterator_error.phpt +++ b/ext/intl/tests/breakiter_getPartsIterator_error.phpt @@ -13,8 +13,6 @@ $it = IntlBreakIterator::createWordInstance(NULL); var_dump($it->getPartsIterator(-1)); ?> -==DONE== --EXPECTF-- Warning: IntlBreakIterator::getPartsIterator(): breakiter_get_parts_iterator: bad key type in %s on line %d bool(false) -==DONE== diff --git a/ext/intl/tests/breakiter_getPartsIterator_var1.phpt b/ext/intl/tests/breakiter_getPartsIterator_var1.phpt index 7bbd27ea451..3ad2c73a992 100644 --- a/ext/intl/tests/breakiter_getPartsIterator_var1.phpt +++ b/ext/intl/tests/breakiter_getPartsIterator_var1.phpt @@ -19,7 +19,6 @@ var_dump(iterator_to_array($it->getPartsIterator(IntlPartsIterator::KEY_LEFT))); var_dump(iterator_to_array($it->getPartsIterator(IntlPartsIterator::KEY_RIGHT))); ?> -==DONE== --EXPECT-- array(5) { [0]=> @@ -57,4 +56,3 @@ array(5) { [12]=> string(3) "tao" } -==DONE== diff --git a/ext/intl/tests/breakiter_isBoundary_basic.phpt b/ext/intl/tests/breakiter_isBoundary_basic.phpt index f0920dca8c6..598d1f9d017 100644 --- a/ext/intl/tests/breakiter_isBoundary_basic.phpt +++ b/ext/intl/tests/breakiter_isBoundary_basic.phpt @@ -18,11 +18,9 @@ var_dump($bi->isBoundary(-1)); var_dump($bi->isBoundary(1)); var_dump($bi->isBoundary(50)); ?> -==DONE== --EXPECT-- bool(true) bool(true) bool(false) bool(false) bool(false) -==DONE== diff --git a/ext/intl/tests/breakiter_next_basic.phpt b/ext/intl/tests/breakiter_next_basic.phpt index 4deb4144e3b..fa40eed4bdf 100644 --- a/ext/intl/tests/breakiter_next_basic.phpt +++ b/ext/intl/tests/breakiter_next_basic.phpt @@ -19,7 +19,6 @@ var_dump($bi->next(-1)); var_dump($bi->next(0)); var_dump($bi->next(NULL)); ?> -==DONE== --EXPECT-- int(0) int(3) @@ -27,4 +26,3 @@ int(7) int(4) int(4) int(7) -==DONE== diff --git a/ext/intl/tests/breakiter_preceding_basic.phpt b/ext/intl/tests/breakiter_preceding_basic.phpt index 9cba9b0831d..31feb5efb2c 100644 --- a/ext/intl/tests/breakiter_preceding_basic.phpt +++ b/ext/intl/tests/breakiter_preceding_basic.phpt @@ -18,9 +18,7 @@ var_dump($bi->preceding(5)); var_dump($bi->preceding(50)); var_dump($bi->preceding(-1)); ?> -==DONE== --EXPECT-- int(4) int(21) int(0) -==DONE== diff --git a/ext/intl/tests/breakiter_preceding_basic2.phpt b/ext/intl/tests/breakiter_preceding_basic2.phpt index e6f4f703878..8c1ee625e45 100644 --- a/ext/intl/tests/breakiter_preceding_basic2.phpt +++ b/ext/intl/tests/breakiter_preceding_basic2.phpt @@ -17,9 +17,7 @@ var_dump($bi->preceding(5)); var_dump($bi->preceding(50)); var_dump($bi->preceding(-1)); ?> -==DONE== --EXPECTF-- int(4) int(21) int(%i) -==DONE== diff --git a/ext/intl/tests/breakiter_previous_basic.phpt b/ext/intl/tests/breakiter_previous_basic.phpt index c844ffcb6c8..b30399365a3 100644 --- a/ext/intl/tests/breakiter_previous_basic.phpt +++ b/ext/intl/tests/breakiter_previous_basic.phpt @@ -15,8 +15,6 @@ $bi->setText('foo bar trans'); var_dump($bi->last()); var_dump($bi->previous()); ?> -==DONE== --EXPECT-- int(13) int(8) -==DONE== diff --git a/ext/intl/tests/bug53735.phpt b/ext/intl/tests/bug53735.phpt index 5fc14e978c3..1deebb22766 100644 --- a/ext/intl/tests/bug53735.phpt +++ b/ext/intl/tests/bug53735.phpt @@ -22,11 +22,9 @@ $f = new NumberFormatter('hu_HU', NumberFormatter::PERCENT, '#,##0%'); var_dump($f->format(0.26)); ?> -==DONE== --EXPECTF-- string(%d) "5,50 kr%A" string(%d) "5,50 kr%A" string(%d) "5,00 kr%A" string(5) "23,25" string(3) "26%" -==DONE== diff --git a/ext/intl/tests/bug58756_MessageFormatter.phpt b/ext/intl/tests/bug58756_MessageFormatter.phpt index 18566b666c9..13b51ec6cea 100644 --- a/ext/intl/tests/bug58756_MessageFormatter.phpt +++ b/ext/intl/tests/bug58756_MessageFormatter.phpt @@ -30,8 +30,6 @@ echo "msgf2: ", $msgf->format(array($time, 'date')), " ", */ ?> -==DONE== --EXPECT-- date: Tuesday, July 7, 2009 8:41:13 PM EDT msgf: Tuesday, July 7, 2009 8:41:13 PM EDT -==DONE== diff --git a/ext/intl/tests/bug58756_MessageFormatter_variant2.phpt b/ext/intl/tests/bug58756_MessageFormatter_variant2.phpt index 4fcfdbc08c0..a6a58906ccc 100644 --- a/ext/intl/tests/bug58756_MessageFormatter_variant2.phpt +++ b/ext/intl/tests/bug58756_MessageFormatter_variant2.phpt @@ -30,8 +30,6 @@ echo "msgf2: ", $msgf->format(array($time, 'date')), " ", */ ?> -==DONE== --EXPECT-- date: Tuesday, July 7, 2009 8:41:13 PM EDT msgf: Tuesday, July 7, 2009 8:41:13 PM usnyc -==DONE== diff --git a/ext/intl/tests/bug65732.phpt b/ext/intl/tests/bug65732.phpt index b49f884ee42..4bbdb0f4c13 100644 --- a/ext/intl/tests/bug65732.phpt +++ b/ext/intl/tests/bug65732.phpt @@ -10,10 +10,8 @@ var_dump(grapheme_strlen("\r\n")); var_dump(grapheme_substr(implode("\r\n", ['abc', 'def', 'ghi']), 5)); var_dump(grapheme_strrpos("a\r\nb", 'b')); ?> -==DONE== --EXPECT-- int(1) string(7) "ef ghi" int(2) -==DONE== diff --git a/ext/intl/tests/bug69374.phpt b/ext/intl/tests/bug69374.phpt index ee7c49547ef..612bf936df3 100644 --- a/ext/intl/tests/bug69374.phpt +++ b/ext/intl/tests/bug69374.phpt @@ -14,8 +14,6 @@ $date->setTime($millitimestamp); echo IntlDateFormatter::formatObject($date, $pattern1, 'vi_VN'), "\n"; echo IntlDateFormatter::formatObject ($date, $pattern2, 'ko_KR'), "\n"; ?> -==DONE== --EXPECT-- tháng 04, 2015 2015년 4월 -==DONE== diff --git a/ext/intl/tests/bug69398.phpt b/ext/intl/tests/bug69398.phpt index 3c95eeeaac6..dc7dec94aa6 100644 --- a/ext/intl/tests/bug69398.phpt +++ b/ext/intl/tests/bug69398.phpt @@ -12,8 +12,6 @@ $date->setTime($millitimestamp); echo IntlDateFormatter::formatObject($date, array(IntlDateFormatter::SHORT, IntlDateFormatter::NONE), 'vi_VN'), "\n"; echo IntlDateFormatter::formatObject ($date, array(IntlDateFormatter::SHORT, IntlDateFormatter::NONE), 'ko_KR'), "\n"; ?> -==DONE== --EXPECT-- 04/04/2015 15. 4. 4. -==DONE== diff --git a/ext/intl/tests/bug74433.phpt b/ext/intl/tests/bug74433.phpt index 7919c875404..44f7807b246 100644 --- a/ext/intl/tests/bug74433.phpt +++ b/ext/intl/tests/bug74433.phpt @@ -11,10 +11,8 @@ $rm = new ReflectionMethod(Normalizer::class, 'normalize'); var_dump($rm->getNumberOfParameters()); var_dump($rm->getNumberOfRequiredParameters()); ?> -===DONE=== --EXPECT-- int(2) int(1) int(2) int(1) -===DONE=== diff --git a/ext/intl/tests/bug74468.phpt b/ext/intl/tests/bug74468.phpt index 63d469efb40..62814d28a79 100644 --- a/ext/intl/tests/bug74468.phpt +++ b/ext/intl/tests/bug74468.phpt @@ -13,10 +13,8 @@ $rf = new ReflectionFunction('collator_sort_with_sort_keys'); var_dump($rf->getNumberOfParameters()); var_dump($rf->getNumberOfRequiredParameters()); ?> -===DONE=== --EXPECT-- int(1) int(1) int(2) int(2) -===DONE=== diff --git a/ext/intl/tests/bug74484_MessageFormatter.phpt b/ext/intl/tests/bug74484_MessageFormatter.phpt index b48de335259..da2fe6acdab 100644 --- a/ext/intl/tests/bug74484_MessageFormatter.phpt +++ b/ext/intl/tests/bug74484_MessageFormatter.phpt @@ -27,7 +27,5 @@ $vars = array( var_dump(MessageFormatter::formatMessage('en_US', $text, $vars)); ?> -==DONE== --EXPECT-- string(26) "1 2 3 4 5 6 7 8 9 10 11 12" -==DONE== diff --git a/ext/intl/tests/bug74705.phpt b/ext/intl/tests/bug74705.phpt index 63a85845a0a..c911ee3e0de 100644 --- a/ext/intl/tests/bug74705.phpt +++ b/ext/intl/tests/bug74705.phpt @@ -12,10 +12,8 @@ $rf = new ReflectionFunction('collator_get_sort_key'); var_dump($rf->getNumberOfParameters()); var_dump($rf->getNumberOfRequiredParameters()); ?> -===DONE=== --EXPECT-- int(1) int(1) int(2) int(2) -===DONE=== diff --git a/ext/intl/tests/bug75090.phpt b/ext/intl/tests/bug75090.phpt index ff5e0bd5844..5936e34bc83 100644 --- a/ext/intl/tests/bug75090.phpt +++ b/ext/intl/tests/bug75090.phpt @@ -15,8 +15,6 @@ var_dump( count($intlGregorianCalendarRef->getConstants()) === count($intlCalendarRef->getConstants()) ); ?> -===DONE=== --EXPECT-- bool(true) bool(true) -===DONE=== diff --git a/ext/intl/tests/bug75193.phpt b/ext/intl/tests/bug75193.phpt index d6c32dbe260..731d83908ba 100644 --- a/ext/intl/tests/bug75193.phpt +++ b/ext/intl/tests/bug75193.phpt @@ -8,7 +8,5 @@ $a = new \Collator('en_US'); $b = [new stdclass, new stdclass]; var_dump($a->sort($b)); ?> -===DONE=== --EXPECT-- bool(true) -===DONE=== diff --git a/ext/intl/tests/bug75318.phpt b/ext/intl/tests/bug75318.phpt index 1328851f9eb..aa46cd2d40f 100644 --- a/ext/intl/tests/bug75318.phpt +++ b/ext/intl/tests/bug75318.phpt @@ -9,7 +9,5 @@ if (!extension_loaded('intl')) die('skip intl extension is not available'); $rm = new ReflectionMethod('UConverter', 'getAliases'); var_dump($rm->getNumberOfRequiredParameters()); ?> -===DONE=== --EXPECT-- int(1) -===DONE=== diff --git a/ext/intl/tests/bug76556.phpt b/ext/intl/tests/bug76556.phpt index 9e4e1ed9730..962467701eb 100644 --- a/ext/intl/tests/bug76556.phpt +++ b/ext/intl/tests/bug76556.phpt @@ -10,7 +10,6 @@ $it = IntlBreakIterator::createCharacterInstance(); $it->setText('foo'); var_dump($it); ?> -===DONE=== --EXPECTF-- object(IntlRuleBasedBreakIterator)#%d (3) { ["valid"]=> @@ -20,4 +19,3 @@ object(IntlRuleBasedBreakIterator)#%d (3) { ["type"]=> string(%d) "%SRuleBasedBreakIterator%S" } -===DONE=== diff --git a/ext/intl/tests/calendar_add_basic.phpt b/ext/intl/tests/calendar_add_basic.phpt index b0e44d58950..4d333594a10 100644 --- a/ext/intl/tests/calendar_add_basic.phpt +++ b/ext/intl/tests/calendar_add_basic.phpt @@ -26,8 +26,6 @@ var_dump( $intlcal->getTime()); ?> -==DONE== --EXPECT-- float(1330578367000) -float(1330578367000) -==DONE== \ No newline at end of file +float(1330578367000) \ No newline at end of file diff --git a/ext/intl/tests/calendar_clear_basic.phpt b/ext/intl/tests/calendar_clear_basic.phpt index f7e4371d920..221eec9ff03 100644 --- a/ext/intl/tests/calendar_clear_basic.phpt +++ b/ext/intl/tests/calendar_clear_basic.phpt @@ -26,7 +26,6 @@ intlcal_clear($intlcal2, null); var_dump($intlcal2->getTime()); ?> -==DONE== --EXPECT-- bool(true) int(1970) @@ -36,5 +35,4 @@ int(0) int(0) int(0) int(0) -float(-3600000) -==DONE== \ No newline at end of file +float(-3600000) \ No newline at end of file diff --git a/ext/intl/tests/calendar_clear_variation1.phpt b/ext/intl/tests/calendar_clear_variation1.phpt index 6adbcaa3536..7b5033167f5 100644 --- a/ext/intl/tests/calendar_clear_variation1.phpt +++ b/ext/intl/tests/calendar_clear_variation1.phpt @@ -23,11 +23,9 @@ var_dump( strtotime('2012-01-29 05:06:07 +0000') * 1000. ); ?> -==DONE== --EXPECT-- bool(true) bool(true) bool(false) float(1327813567000) -float(1327813567000) -==DONE== \ No newline at end of file +float(1327813567000) \ No newline at end of file diff --git a/ext/intl/tests/calendar_createInstance_basic.phpt b/ext/intl/tests/calendar_createInstance_basic.phpt index 00a68e620b1..1dcb8f892f0 100644 --- a/ext/intl/tests/calendar_createInstance_basic.phpt +++ b/ext/intl/tests/calendar_createInstance_basic.phpt @@ -24,7 +24,6 @@ $time = time(); var_dump(abs($timeMillis - $time * 1000) < 2000); ?> -==DONE== --EXPECTF-- IntlTimeZone Object ( @@ -36,4 +35,3 @@ IntlTimeZone Object nl gregorian bool(true) -==DONE== diff --git a/ext/intl/tests/calendar_createInstance_variation1.phpt b/ext/intl/tests/calendar_createInstance_variation1.phpt index 74ec9105874..3bd0084c780 100644 --- a/ext/intl/tests/calendar_createInstance_variation1.phpt +++ b/ext/intl/tests/calendar_createInstance_variation1.phpt @@ -37,7 +37,6 @@ print_R($cal->getLocale(Locale::ACTUAL_LOCALE)); echo "\n"; ?> -==DONE== --EXPECTF-- IntlTimeZone Object ( @@ -79,4 +78,3 @@ IntlTimeZone Object [currentOffset] => %d ) pt -==DONE== diff --git a/ext/intl/tests/calendar_equals_before_after_basic.phpt b/ext/intl/tests/calendar_equals_before_after_basic.phpt index 50543ad0b42..49604a47d6f 100644 --- a/ext/intl/tests/calendar_equals_before_after_basic.phpt +++ b/ext/intl/tests/calendar_equals_before_after_basic.phpt @@ -33,7 +33,6 @@ var_dump("3 before 2", intlcal_before($intlcal3, $intlcal2)); var_dump("3 after 2", intlcal_after($intlcal3, $intlcal2)); ?> -==DONE== --EXPECT-- string(8) "japanese" string(6) "1 eq 1" @@ -55,5 +54,4 @@ bool(false) string(10) "3 before 2" bool(false) string(9) "3 after 2" -bool(true) -==DONE== \ No newline at end of file +bool(true) \ No newline at end of file diff --git a/ext/intl/tests/calendar_fieldDifference_basic.phpt b/ext/intl/tests/calendar_fieldDifference_basic.phpt index 0287e259c14..a7202e9bee3 100644 --- a/ext/intl/tests/calendar_fieldDifference_basic.phpt +++ b/ext/intl/tests/calendar_fieldDifference_basic.phpt @@ -27,9 +27,7 @@ var_dump( strtotime('2012-02-29 06:07:08 +0000') * 1000, IntlCalendar::FIELD_MINUTE)); ?> -==DONE== --EXPECT-- int(3601) int(6) -int(61) -==DONE== \ No newline at end of file +int(61) \ No newline at end of file diff --git a/ext/intl/tests/calendar_getAvailableLocales_basic.phpt b/ext/intl/tests/calendar_getAvailableLocales_basic.phpt index 5d5b79c020a..a5071545e26 100644 --- a/ext/intl/tests/calendar_getAvailableLocales_basic.phpt +++ b/ext/intl/tests/calendar_getAvailableLocales_basic.phpt @@ -16,8 +16,6 @@ $locales = intlcal_get_available_locales(); var_dump(in_array('pt', $locales)); ?> -==DONE== --EXPECT-- bool(true) -bool(true) -==DONE== \ No newline at end of file +bool(true) \ No newline at end of file diff --git a/ext/intl/tests/calendar_getDayOfWeekType_basic.phpt b/ext/intl/tests/calendar_getDayOfWeekType_basic.phpt index 527c0ff140f..7a9c8afa945 100644 --- a/ext/intl/tests/calendar_getDayOfWeekType_basic.phpt +++ b/ext/intl/tests/calendar_getDayOfWeekType_basic.phpt @@ -24,11 +24,9 @@ var_dump( ); ?> -==DONE== --EXPECT-- int(3) int(0) int(0) int(0) int(1) -==DONE== diff --git a/ext/intl/tests/calendar_getDayOfWeekType_basic2.phpt b/ext/intl/tests/calendar_getDayOfWeekType_basic2.phpt index 9bf99670805..1dc4bb90a64 100644 --- a/ext/intl/tests/calendar_getDayOfWeekType_basic2.phpt +++ b/ext/intl/tests/calendar_getDayOfWeekType_basic2.phpt @@ -24,11 +24,9 @@ var_dump( ); ?> -==DONE== --EXPECT-- int(1) int(0) int(0) int(0) int(1) -==DONE== diff --git a/ext/intl/tests/calendar_getErrorCode_getErrorMessage_basic.phpt b/ext/intl/tests/calendar_getErrorCode_getErrorMessage_basic.phpt index 71c053492f1..233ca30b260 100644 --- a/ext/intl/tests/calendar_getErrorCode_getErrorMessage_basic.phpt +++ b/ext/intl/tests/calendar_getErrorCode_getErrorMessage_basic.phpt @@ -28,7 +28,6 @@ var_dump( intlcal_get_error_message($intlcal) ); ?> -==DONE== --EXPECTF-- int(0) int(0) @@ -40,4 +39,3 @@ int(1) int(1) string(81) "intlcal_field_difference: Call to ICU method has failed: U_ILLEGAL_ARGUMENT_ERROR" string(81) "intlcal_field_difference: Call to ICU method has failed: U_ILLEGAL_ARGUMENT_ERROR" -==DONE== diff --git a/ext/intl/tests/calendar_getFirstDayOfWeek_basic.phpt b/ext/intl/tests/calendar_getFirstDayOfWeek_basic.phpt index 82a0bc85cc2..3858b8a9371 100644 --- a/ext/intl/tests/calendar_getFirstDayOfWeek_basic.phpt +++ b/ext/intl/tests/calendar_getFirstDayOfWeek_basic.phpt @@ -13,8 +13,6 @@ $intlcal = IntlCalendar::createInstance('UTC'); var_dump($intlcal->getFirstDayOfWeek()); var_dump(intlcal_get_first_day_of_week($intlcal)); ?> -==DONE== --EXPECT-- int(2) -int(2) -==DONE== \ No newline at end of file +int(2) \ No newline at end of file diff --git a/ext/intl/tests/calendar_getKeywordValuesForLocale_basic.phpt b/ext/intl/tests/calendar_getKeywordValuesForLocale_basic.phpt index e44185b433b..fbfe8515b98 100644 --- a/ext/intl/tests/calendar_getKeywordValuesForLocale_basic.phpt +++ b/ext/intl/tests/calendar_getKeywordValuesForLocale_basic.phpt @@ -22,7 +22,6 @@ var_dump(count($var) > 8); var_dump(in_array('japanese', $var)); ?> -==DONE== --EXPECT-- Array ( @@ -31,4 +30,3 @@ Array bool(true) bool(true) -==DONE== diff --git a/ext/intl/tests/calendar_getLocale_basic.phpt b/ext/intl/tests/calendar_getLocale_basic.phpt index 1692c2d20b4..92b61d35d53 100644 --- a/ext/intl/tests/calendar_getLocale_basic.phpt +++ b/ext/intl/tests/calendar_getLocale_basic.phpt @@ -13,8 +13,6 @@ $intlcal = IntlCalendar::createInstance('UTC'); var_dump($intlcal->getLocale(Locale::ACTUAL_LOCALE)); var_dump(intlcal_get_locale($intlcal, Locale::VALID_LOCALE)); ?> -==DONE== --EXPECT-- string(2) "nl" string(5) "nl_NL" -==DONE== diff --git a/ext/intl/tests/calendar_getMinimalDaysInFirstWeek_basic.phpt b/ext/intl/tests/calendar_getMinimalDaysInFirstWeek_basic.phpt index 6082830a8b8..2206c6e0be6 100644 --- a/ext/intl/tests/calendar_getMinimalDaysInFirstWeek_basic.phpt +++ b/ext/intl/tests/calendar_getMinimalDaysInFirstWeek_basic.phpt @@ -13,8 +13,6 @@ $intlcal = IntlCalendar::createInstance('UTC'); var_dump($intlcal->getMinimalDaysInFirstWeek()); var_dump(intlcal_get_minimal_days_in_first_week($intlcal)); ?> -==DONE== --EXPECT-- int(4) int(4) -==DONE== diff --git a/ext/intl/tests/calendar_getNow_basic.phpt b/ext/intl/tests/calendar_getNow_basic.phpt index 3f1c2488b37..bc103420c4c 100644 --- a/ext/intl/tests/calendar_getNow_basic.phpt +++ b/ext/intl/tests/calendar_getNow_basic.phpt @@ -16,8 +16,6 @@ var_dump(abs($now - $proc_now) < 500); var_dump(abs($time * 1000 - $proc_now) < 2000); ?> -==DONE== --EXPECT-- bool(true) bool(true) -==DONE== diff --git a/ext/intl/tests/calendar_getTimeZone_basic.phpt b/ext/intl/tests/calendar_getTimeZone_basic.phpt index 612796be0b7..acd3effb20b 100644 --- a/ext/intl/tests/calendar_getTimeZone_basic.phpt +++ b/ext/intl/tests/calendar_getTimeZone_basic.phpt @@ -13,7 +13,6 @@ $intlcal = IntlCalendar::createInstance('GMT+00:01'); print_r($intlcal->getTimeZone()); print_r(intlcal_get_time_zone($intlcal)); ?> -==DONE== --EXPECT-- IntlTimeZone Object ( @@ -29,4 +28,3 @@ IntlTimeZone Object [rawOffset] => 60000 [currentOffset] => 60000 ) -==DONE== diff --git a/ext/intl/tests/calendar_getTime_basic.phpt b/ext/intl/tests/calendar_getTime_basic.phpt index 659c71c961c..b644bc0737a 100644 --- a/ext/intl/tests/calendar_getTime_basic.phpt +++ b/ext/intl/tests/calendar_getTime_basic.phpt @@ -22,8 +22,6 @@ $time = strtotime('2012-02-29 00:00:00 +0000'); var_dump((float)$time*1000, $intlcal->getTime()); ?> -==DONE== --EXPECT-- float(1330473600000) -float(1330473600000) -==DONE== \ No newline at end of file +float(1330473600000) \ No newline at end of file diff --git a/ext/intl/tests/calendar_getType_basic.phpt b/ext/intl/tests/calendar_getType_basic.phpt index ba32dd05265..495caa390e9 100644 --- a/ext/intl/tests/calendar_getType_basic.phpt +++ b/ext/intl/tests/calendar_getType_basic.phpt @@ -16,8 +16,6 @@ VAR_DUMP($intlcal->getType()); $intlcal = IntlCalendar::createInstance(null, "nl_NL@calendar=hebrew"); VAR_DUMP(intlcal_get_type($intlcal)); ?> -==DONE== --EXPECT-- string(9) "gregorian" -string(6) "hebrew" -==DONE== \ No newline at end of file +string(6) "hebrew" \ No newline at end of file diff --git a/ext/intl/tests/calendar_getWeekendTransition_basic.phpt b/ext/intl/tests/calendar_getWeekendTransition_basic.phpt index 3afbdd4ba3d..616f40b5266 100644 --- a/ext/intl/tests/calendar_getWeekendTransition_basic.phpt +++ b/ext/intl/tests/calendar_getWeekendTransition_basic.phpt @@ -15,8 +15,6 @@ $intlcal = IntlCalendar::createInstance(); var_dump($intlcal->getWeekendTransition(IntlCalendar::DOW_SUNDAY)); var_dump(intlcal_get_weekend_transition($intlcal, IntlCalendar::DOW_SUNDAY)); ?> -==DONE== --EXPECT-- int(86400000) int(86400000) -==DONE== diff --git a/ext/intl/tests/calendar_getXMaximum_basic.phpt b/ext/intl/tests/calendar_getXMaximum_basic.phpt index 2e6d1a3fa92..d9591c632aa 100644 --- a/ext/intl/tests/calendar_getXMaximum_basic.phpt +++ b/ext/intl/tests/calendar_getXMaximum_basic.phpt @@ -23,12 +23,10 @@ var_dump( ); ?> -==DONE== --EXPECT-- int(28) int(28) int(29) int(29) int(31) -int(31) -==DONE== \ No newline at end of file +int(31) \ No newline at end of file diff --git a/ext/intl/tests/calendar_getXMinimum_basic.phpt b/ext/intl/tests/calendar_getXMinimum_basic.phpt index ff0518d8822..f8f951ed9d5 100644 --- a/ext/intl/tests/calendar_getXMinimum_basic.phpt +++ b/ext/intl/tests/calendar_getXMinimum_basic.phpt @@ -23,12 +23,10 @@ var_dump( ); ?> -==DONE== --EXPECT-- int(1) int(1) int(1) int(1) int(1) -int(1) -==DONE== \ No newline at end of file +int(1) \ No newline at end of file diff --git a/ext/intl/tests/calendar_get_basic.phpt b/ext/intl/tests/calendar_get_basic.phpt index c617639610f..dc008ce9599 100644 --- a/ext/intl/tests/calendar_get_basic.phpt +++ b/ext/intl/tests/calendar_get_basic.phpt @@ -16,8 +16,6 @@ var_dump($intlcal->get(IntlCalendar::FIELD_DAY_OF_MONTH)); var_dump(intlcal_get($intlcal, IntlCalendar::FIELD_DAY_OF_MONTH)); ?> -==DONE== --EXPECT-- int(4) -int(4) -==DONE== \ No newline at end of file +int(4) \ No newline at end of file diff --git a/ext/intl/tests/calendar_get_setRepeatedWallTimeOption_basic.phpt b/ext/intl/tests/calendar_get_setRepeatedWallTimeOption_basic.phpt index 59ad43647cd..e789840e007 100644 --- a/ext/intl/tests/calendar_get_setRepeatedWallTimeOption_basic.phpt +++ b/ext/intl/tests/calendar_get_setRepeatedWallTimeOption_basic.phpt @@ -32,7 +32,6 @@ var_dump( ); ?> -==DONE== --EXPECT-- bool(true) int(0) @@ -42,4 +41,3 @@ bool(true) int(1) int(1351384200) int(1351384200) -==DONE== diff --git a/ext/intl/tests/calendar_get_setSkippedWallTimeOption_basic.phpt b/ext/intl/tests/calendar_get_setSkippedWallTimeOption_basic.phpt index 94f540abb1f..4cefc4126ca 100644 --- a/ext/intl/tests/calendar_get_setSkippedWallTimeOption_basic.phpt +++ b/ext/intl/tests/calendar_get_setSkippedWallTimeOption_basic.phpt @@ -44,7 +44,6 @@ var_dump( ?> -==DONE== --EXPECT-- int(0) Should be 3h30 @@ -60,4 +59,3 @@ int(2) Should be 3h00 int(3) int(0) -==DONE== diff --git a/ext/intl/tests/calendar_inDaylightTime_basic.phpt b/ext/intl/tests/calendar_inDaylightTime_basic.phpt index dff8ef50d3c..6bbf833be79 100644 --- a/ext/intl/tests/calendar_inDaylightTime_basic.phpt +++ b/ext/intl/tests/calendar_inDaylightTime_basic.phpt @@ -17,8 +17,6 @@ var_dump($intlcal->inDaylightTime()); $intlcal->setTime(strtotime('2012-04-01') * 1000); var_dump(intlcal_in_daylight_time($intlcal)); ?> -==DONE== --EXPECT-- bool(false) -bool(true) -==DONE== \ No newline at end of file +bool(true) \ No newline at end of file diff --git a/ext/intl/tests/calendar_isEquivalentTo_basic.phpt b/ext/intl/tests/calendar_isEquivalentTo_basic.phpt index f71fd8ad5b4..f856f6a2ad7 100644 --- a/ext/intl/tests/calendar_isEquivalentTo_basic.phpt +++ b/ext/intl/tests/calendar_isEquivalentTo_basic.phpt @@ -27,7 +27,6 @@ var_dump( ); ?> -==DONE== --EXPECT-- string(5) "1 - 1" bool(true) @@ -36,5 +35,4 @@ bool(false) string(5) "1 - 3" bool(false) string(5) "1 - 4" -bool(true) -==DONE== \ No newline at end of file +bool(true) \ No newline at end of file diff --git a/ext/intl/tests/calendar_isSet_basic.phpt b/ext/intl/tests/calendar_isSet_basic.phpt index 8ef01448d5d..39f0026e639 100644 --- a/ext/intl/tests/calendar_isSet_basic.phpt +++ b/ext/intl/tests/calendar_isSet_basic.phpt @@ -16,9 +16,7 @@ var_dump($intlcal->isSet(IntlCalendar::FIELD_MINUTE)); $intlcal->set(IntlCalendar::FIELD_MINUTE, 0); var_dump(intlcal_is_set($intlcal, IntlCalendar::FIELD_MINUTE)); ?> -==DONE== --EXPECT-- bool(true) bool(false) -bool(true) -==DONE== \ No newline at end of file +bool(true) \ No newline at end of file diff --git a/ext/intl/tests/calendar_isWeekend_basic.phpt b/ext/intl/tests/calendar_isWeekend_basic.phpt index ba9bbefb2c1..943bd9a29ae 100644 --- a/ext/intl/tests/calendar_isWeekend_basic.phpt +++ b/ext/intl/tests/calendar_isWeekend_basic.phpt @@ -16,9 +16,7 @@ var_dump($intlcal->isWeekend(strtotime('2012-02-29 12:00:00 +0000') * 1000)); var_dump(intlcal_is_weekend($intlcal, strtotime('2012-02-29 12:00:00 +0000') * 1000)); var_dump($intlcal->isWeekend(strtotime('2012-03-11 12:00:00 +0000') * 1000)); ?> -==DONE== --EXPECT-- bool(false) bool(false) bool(true) -==DONE== diff --git a/ext/intl/tests/calendar_is_set_lenient_basic.phpt b/ext/intl/tests/calendar_is_set_lenient_basic.phpt index 64f537f9bc4..b7e2be42931 100644 --- a/ext/intl/tests/calendar_is_set_lenient_basic.phpt +++ b/ext/intl/tests/calendar_is_set_lenient_basic.phpt @@ -17,12 +17,10 @@ var_dump($intlcal1->isLenient()); var_dump(intlcal_set_lenient($intlcal1, true)); var_dump($intlcal1->isLenient()); ?> -==DONE== --EXPECT-- bool(true) bool(true) bool(true) bool(false) bool(true) -bool(true) -==DONE== \ No newline at end of file +bool(true) \ No newline at end of file diff --git a/ext/intl/tests/calendar_roll_basic.phpt b/ext/intl/tests/calendar_roll_basic.phpt index 971c36217bd..14db357c00e 100644 --- a/ext/intl/tests/calendar_roll_basic.phpt +++ b/ext/intl/tests/calendar_roll_basic.phpt @@ -23,12 +23,10 @@ var_dump($intlcal->get(IntlCalendar::FIELD_DAY_OF_MONTH)); //1 ?> -==DONE== --EXPECT-- bool(true) int(1) int(1) bool(true) int(1) -int(1) -==DONE== \ No newline at end of file +int(1) \ No newline at end of file diff --git a/ext/intl/tests/calendar_roll_variation1.phpt b/ext/intl/tests/calendar_roll_variation1.phpt index 9fb8d75e5ab..54f584d3eb7 100644 --- a/ext/intl/tests/calendar_roll_variation1.phpt +++ b/ext/intl/tests/calendar_roll_variation1.phpt @@ -21,12 +21,10 @@ var_dump($intlcal->get(IntlCalendar::FIELD_MONTH)); //1 (Feb) var_dump($intlcal->get(IntlCalendar::FIELD_DAY_OF_MONTH)); //28 ?> -==DONE== --EXPECT-- bool(true) int(1) int(29) bool(true) int(1) -int(28) -==DONE== \ No newline at end of file +int(28) \ No newline at end of file diff --git a/ext/intl/tests/calendar_setFirstDayOfWeek_basic.phpt b/ext/intl/tests/calendar_setFirstDayOfWeek_basic.phpt index 79b38104e4c..d2e0867c29c 100644 --- a/ext/intl/tests/calendar_setFirstDayOfWeek_basic.phpt +++ b/ext/intl/tests/calendar_setFirstDayOfWeek_basic.phpt @@ -18,11 +18,9 @@ var_dump( $intlcal->getFirstDayOfWeek() ); ?> -==DONE== --EXPECT-- int(3) bool(true) int(3) bool(true) -int(4) -==DONE== \ No newline at end of file +int(4) \ No newline at end of file diff --git a/ext/intl/tests/calendar_setMinimalDaysInFirstWeek_basic.phpt b/ext/intl/tests/calendar_setMinimalDaysInFirstWeek_basic.phpt index ac437f962b9..455bd843689 100644 --- a/ext/intl/tests/calendar_setMinimalDaysInFirstWeek_basic.phpt +++ b/ext/intl/tests/calendar_setMinimalDaysInFirstWeek_basic.phpt @@ -17,10 +17,8 @@ var_dump( $intlcal->getMinimalDaysInFirstWeek() ); ?> -==DONE== --EXPECT-- bool(true) int(6) bool(true) int(5) -==DONE== diff --git a/ext/intl/tests/calendar_setTimeZone_basic.phpt b/ext/intl/tests/calendar_setTimeZone_basic.phpt index 006df2b468f..bfd4f43a42f 100644 --- a/ext/intl/tests/calendar_setTimeZone_basic.phpt +++ b/ext/intl/tests/calendar_setTimeZone_basic.phpt @@ -26,7 +26,6 @@ echo "\n"; var_dump($intlcal->get(IntlCalendar::FIELD_ZONE_OFFSET)); ?> -==DONE== --EXPECT-- Europe/Amsterdam int(3600000) @@ -34,4 +33,3 @@ GMT int(0) GMT+05:30 int(19800000) -==DONE== diff --git a/ext/intl/tests/calendar_setTimeZone_variation1.phpt b/ext/intl/tests/calendar_setTimeZone_variation1.phpt index b1cbb74edf3..3c3dd3bdd86 100644 --- a/ext/intl/tests/calendar_setTimeZone_variation1.phpt +++ b/ext/intl/tests/calendar_setTimeZone_variation1.phpt @@ -21,10 +21,8 @@ echo "\n"; var_dump($intlcal->get(IntlCalendar::FIELD_ZONE_OFFSET)); ?> -==DONE== --EXPECT-- Europe/Amsterdam int(3600000) Europe/Amsterdam -int(3600000) -==DONE== \ No newline at end of file +int(3600000) \ No newline at end of file diff --git a/ext/intl/tests/calendar_setTime_basic.phpt b/ext/intl/tests/calendar_setTime_basic.phpt index c4d57be4b97..91ccc10fad7 100644 --- a/ext/intl/tests/calendar_setTime_basic.phpt +++ b/ext/intl/tests/calendar_setTime_basic.phpt @@ -25,9 +25,7 @@ intlcal_set_time($intlcal,$time * 1000); var_dump(intlcal_get_time($intlcal)); ?> -==DONE== --EXPECT-- float(1330473600000) float(1330473600000) -float(1330473600000) -==DONE== \ No newline at end of file +float(1330473600000) \ No newline at end of file diff --git a/ext/intl/tests/calendar_set_basic.phpt b/ext/intl/tests/calendar_set_basic.phpt index 8eccb32da65..93378a7b3fc 100644 --- a/ext/intl/tests/calendar_set_basic.phpt +++ b/ext/intl/tests/calendar_set_basic.phpt @@ -18,10 +18,8 @@ var_dump(intlcal_set($intlcal, IntlCalendar::FIELD_DAY_OF_MONTH, 3)); var_dump($intlcal->get(IntlCalendar::FIELD_DAY_OF_MONTH)); ?> -==DONE== --EXPECT-- bool(true) int(2) bool(true) -int(3) -==DONE== \ No newline at end of file +int(3) \ No newline at end of file diff --git a/ext/intl/tests/calendar_set_variation1.phpt b/ext/intl/tests/calendar_set_variation1.phpt index 20dfa53eb65..8738d30711a 100644 --- a/ext/intl/tests/calendar_set_variation1.phpt +++ b/ext/intl/tests/calendar_set_variation1.phpt @@ -27,7 +27,6 @@ var_dump($intlcal->getTime(), strtotime('2012-02-29 23:58:31 +0000') * 1000.); ?> -==DONE== --EXPECT-- bool(true) float(1330473600000) @@ -37,5 +36,4 @@ float(1330559880000) float(1330559880000) bool(true) float(1330559911000) -float(1330559911000) -==DONE== \ No newline at end of file +float(1330559911000) \ No newline at end of file diff --git a/ext/intl/tests/calendar_toDateTime_basic.phpt b/ext/intl/tests/calendar_toDateTime_basic.phpt index b7ffd313217..ad9b7c9eb6e 100644 --- a/ext/intl/tests/calendar_toDateTime_basic.phpt +++ b/ext/intl/tests/calendar_toDateTime_basic.phpt @@ -16,8 +16,6 @@ $dt = $cal->toDateTime(); var_dump($dt->format("c"), $dt->getTimeZone()->getName()); ?> -==DONE== --EXPECT-- string(25) "2012-05-17T17:35:36+01:00" string(13) "Europe/Lisbon" -==DONE== diff --git a/ext/intl/tests/cpbi_clone_equality.phpt b/ext/intl/tests/cpbi_clone_equality.phpt index c62b4527473..66cd96bbb93 100644 --- a/ext/intl/tests/cpbi_clone_equality.phpt +++ b/ext/intl/tests/cpbi_clone_equality.phpt @@ -25,9 +25,7 @@ $it_clone->setText($text2); var_dump($it == $it_clone); ?> -==DONE== --EXPECT-- bool(true) bool(false) bool(true) -==DONE== diff --git a/ext/intl/tests/cpbi_getLastCodePoint_basic.phpt b/ext/intl/tests/cpbi_getLastCodePoint_basic.phpt index 74a07a62922..08aa01e90bd 100644 --- a/ext/intl/tests/cpbi_getLastCodePoint_basic.phpt +++ b/ext/intl/tests/cpbi_getLastCodePoint_basic.phpt @@ -43,7 +43,6 @@ while ($p != IntlBreakIterator::DONE) { ?> -==DONE== --EXPECT-- int(-1) int(-1) @@ -79,4 +78,3 @@ string(6) "U+0E2D" string(6) "U+0E27" string(6) "U+0E31" string(6) "U+0E15" -==DONE== diff --git a/ext/intl/tests/cpbi_parts_iterator.phpt b/ext/intl/tests/cpbi_parts_iterator.phpt index 4754c123710..82fea6f6e1e 100644 --- a/ext/intl/tests/cpbi_parts_iterator.phpt +++ b/ext/intl/tests/cpbi_parts_iterator.phpt @@ -20,7 +20,6 @@ foreach ($it as $k => $v) { } ?> -==DONE== --EXPECT-- 0. ต (U+0E15) at 3 1. ั (U+0E31) at 6 @@ -37,4 +36,3 @@ foreach ($it as $k => $v) { 12. ว (U+0E27) at 39 13. า (U+0E32) at 42 14. ม (U+0E21) at 45 -==DONE== diff --git a/ext/intl/tests/dateformat___construct_bad_tz_cal.phpt b/ext/intl/tests/dateformat___construct_bad_tz_cal.phpt index 255a1f484de..91e5cd531de 100644 --- a/ext/intl/tests/dateformat___construct_bad_tz_cal.phpt +++ b/ext/intl/tests/dateformat___construct_bad_tz_cal.phpt @@ -30,11 +30,9 @@ try { print_exception($e); } ?> -==DONE== --EXPECTF-- Exception: IntlDateFormatter::__construct(): datefmt_create: no such time zone: 'bad timezone' in %s on line %d Exception: IntlDateFormatter::__construct(): datefmt_create: invalid value for calendar type; it must be one of IntlDateFormatter::TRADITIONAL (locale's default calendar) or IntlDateFormatter::GREGORIAN. Alternatively, it can be an IntlCalendar object in %s on line %d Exception: IntlDateFormatter::__construct(): datefmt_create: Invalid calendar argument; should be an integer or an IntlCalendar instance in %s on line %d -==DONE== diff --git a/ext/intl/tests/dateformat_bug65683.phpt b/ext/intl/tests/dateformat_bug65683.phpt index d18cb4c3da6..4d6cac9afa8 100644 --- a/ext/intl/tests/dateformat_bug65683.phpt +++ b/ext/intl/tests/dateformat_bug65683.phpt @@ -10,7 +10,5 @@ $formatter = new IntlDateFormatter('en-US', IntlDateFormatter::FULL, IntlDateFor var_dump($formatter->format(new DateTimeImmutable('2017-03-27 00:00:00 UTC'))) . "\n"; ?> -==DONE== --EXPECTF-- string(%s) "Monday, March %d, 2017" -==DONE== diff --git a/ext/intl/tests/dateformat_bug71516.phpt b/ext/intl/tests/dateformat_bug71516.phpt index 88ba9bf8400..437e51d8ccb 100644 --- a/ext/intl/tests/dateformat_bug71516.phpt +++ b/ext/intl/tests/dateformat_bug71516.phpt @@ -17,9 +17,7 @@ echo "Formatter with pattern: " . $badFormatter->getLocale() . PHP_EOL; echo "Formatter with pattern set later: " . $badFormatter2->getLocale() . PHP_EOL; ?> -==DONE== --EXPECT-- Formatter without pattern: ru Formatter with pattern: ru Formatter with pattern set later: ru -==DONE== diff --git a/ext/intl/tests/dateformat_create_cal_arg.phpt b/ext/intl/tests/dateformat_create_cal_arg.phpt index 182ac9a3a08..be7ae38cab4 100644 --- a/ext/intl/tests/dateformat_create_cal_arg.phpt +++ b/ext/intl/tests/dateformat_create_cal_arg.phpt @@ -41,7 +41,6 @@ $df = new IntlDateFormatter('es_ES', 0, 0, 'UTC', 0); echo $df->format($ts), "\n"; ?> -==DONE== --EXPECTF-- domingo%S 1 de enero de 2012 00:00:00 GMT domingo%S 8 de Safar de 1433 00:00:00 GMT @@ -50,4 +49,3 @@ sábado%S 31 de diciembre de 2011 d.C. 23:00:00 Hora %Sde las Azores sábado%S 7 de Safar de 1433 AH 23:00:00 Hora %Sde las Azores domingo%S 8 de Safar de 1433 AH 00:00:00 GMT domingo%S 1 de enero de 2012 00:00:00 GMT -==DONE== diff --git a/ext/intl/tests/dateformat_create_cal_arg_variant2.phpt b/ext/intl/tests/dateformat_create_cal_arg_variant2.phpt index 77ec53047bb..df6dc9014d1 100644 --- a/ext/intl/tests/dateformat_create_cal_arg_variant2.phpt +++ b/ext/intl/tests/dateformat_create_cal_arg_variant2.phpt @@ -41,7 +41,6 @@ $df = new IntlDateFormatter('es_ES', 0, 0, 'UTC', 0); echo $df->format($ts), "\n"; ?> -==DONE== --EXPECTF-- domingo%S 1 de enero de 2012 00:00:00 GMT domingo%S 8 de Safar de 1433 00:00:00 GMT @@ -50,4 +49,3 @@ sábado%S 31 de diciembre de 2011 d.C. 23:00:00 Hora %Sde las Azores sábado%S 7 de Safar de 1433 AH 23:00:00 Hora %Sde las Azores domingo%S 8 de Safar de 1433 AH 00:00:00 GMT domingo%S 1 de enero de 2012 00:00:00 GMT -==DONE== diff --git a/ext/intl/tests/dateformat_create_cal_arg_variant3.phpt b/ext/intl/tests/dateformat_create_cal_arg_variant3.phpt index 1beff145deb..4b7f80b25da 100644 --- a/ext/intl/tests/dateformat_create_cal_arg_variant3.phpt +++ b/ext/intl/tests/dateformat_create_cal_arg_variant3.phpt @@ -42,7 +42,6 @@ $df = new IntlDateFormatter('es_ES', 0, 0, 'UTC', 0); echo $df->format($ts), "\n"; ?> -==DONE== --EXPECTF-- domingo%S 1 de enero de 2012, 0:00:00 (GMT) domingo%S 8 de Safar de 1433, 0:00:00 (GMT) @@ -51,4 +50,3 @@ sábado%S 31 de diciembre de 2011 d. C., 23:00:00 (Hora estándar %Sde las Azore sábado%S 7 de Safar de 1433 AH, 23:00:00 (Hora estándar %Sde las Azores) domingo%S 8 de Safar de 1433 AH, 0:00:00 (GMT) domingo%S 1 de enero de 2012, 0:00:00 (GMT) -==DONE== diff --git a/ext/intl/tests/dateformat_create_cal_arg_variant4.phpt b/ext/intl/tests/dateformat_create_cal_arg_variant4.phpt index 861ee519652..a60d77363b3 100644 --- a/ext/intl/tests/dateformat_create_cal_arg_variant4.phpt +++ b/ext/intl/tests/dateformat_create_cal_arg_variant4.phpt @@ -42,7 +42,6 @@ $df = new IntlDateFormatter('es_ES', 0, 0, 'UTC', 0); echo $df->format($ts), "\n"; ?> -==DONE== --EXPECTF-- domingo%S 1 de enero de 2012, 0:00:00 (GMT) domingo%S 8 de Safar de 1433, 0:00:00 (GMT) @@ -51,4 +50,3 @@ sábado, 31 de diciembre de 2011 d. C., 23:00:00 (hora estándar de las Azores) sábado, 7 de Safar de 1433 AH, 23:00:00 (hora estándar de las Azores) domingo%S 8 de Safar de 1433 AH, 0:00:00 (GMT) domingo%S 1 de enero de 2012, 0:00:00 (GMT) -==DONE== diff --git a/ext/intl/tests/dateformat_create_cal_arg_variant5.phpt b/ext/intl/tests/dateformat_create_cal_arg_variant5.phpt index 8e94d428673..372a3178a12 100644 --- a/ext/intl/tests/dateformat_create_cal_arg_variant5.phpt +++ b/ext/intl/tests/dateformat_create_cal_arg_variant5.phpt @@ -41,7 +41,6 @@ $df = new IntlDateFormatter('es_ES', 0, 0, 'UTC', 0); echo $df->format($ts), "\n"; ?> -==DONE== --EXPECTF-- domingo%S 1 de enero de 2012, 0:00:00 (%siempo %sniversal %sordinado) domingo%S 8 de %safar de 1433, 0:00:00 (%siempo %sniversal %sordinado) @@ -50,4 +49,3 @@ sábado, 31 de diciembre de 2011 d. C., 23:00:00 (hora estándar de las Azores) sábado, 7 de %safar de 1433 AH, 23:00:00 (hora estándar de las Azores) domingo%S 8 de %safar de 1433 AH, 0:00:00 (%siempo %sniversal %sordinado) domingo%S 1 de enero de 2012, 0:00:00 (%siempo %sniversal %sordinado) -==DONE== diff --git a/ext/intl/tests/dateformat_formatObject_calendar.phpt b/ext/intl/tests/dateformat_formatObject_calendar.phpt index 11f0fe0137a..7d0b96ff7ae 100644 --- a/ext/intl/tests/dateformat_formatObject_calendar.phpt +++ b/ext/intl/tests/dateformat_formatObject_calendar.phpt @@ -26,7 +26,6 @@ echo IntlDateFormatter::formatObject($cal), "\n"; echo IntlDateFormatter::formatObject($cal, IntlDateFormatter::FULL, "en-US"), "\n"; ?> -==DONE== --EXPECTF-- 01/01/2012 00:00:00 Domingo, 1 de Janeiro de 2012 0:00:00 Hora %Sda Europa Ocidental @@ -36,4 +35,3 @@ Sun 2012-01-1 00,00,00.000 Portugal Time (Lisbon) Domingo, 1 de Janeiro de 2012 5:00:00 GMT+03:00 06/02/1433 00:00:00 Sunday, Safar 6, 1433 12:00:00 AM Western European %STime -==DONE== diff --git a/ext/intl/tests/dateformat_formatObject_calendar_variant2.phpt b/ext/intl/tests/dateformat_formatObject_calendar_variant2.phpt index 7d308df6b01..88a7133753c 100644 --- a/ext/intl/tests/dateformat_formatObject_calendar_variant2.phpt +++ b/ext/intl/tests/dateformat_formatObject_calendar_variant2.phpt @@ -26,7 +26,6 @@ echo IntlDateFormatter::formatObject($cal), "\n"; echo IntlDateFormatter::formatObject($cal, IntlDateFormatter::FULL, "en-US"), "\n"; ?> -==DONE== --EXPECTF-- 01/01/2012, 00:00:00 Domingo, 1 de Janeiro de 2012 às 00:00:00 Hora %Sda Europa Ocidental @@ -36,4 +35,3 @@ Sun 2012-01-1 00,00,00.000 Portugal Time Domingo, 1 de Janeiro de 2012 às 05:00:00 GMT+03:00 06/02/1433, 00:00:00 Sunday, Safar 6, 1433 at 12:00:00 AM Western European Standard Time -==DONE== diff --git a/ext/intl/tests/dateformat_formatObject_calendar_variant3.phpt b/ext/intl/tests/dateformat_formatObject_calendar_variant3.phpt index 33d2c8bfbf1..ea24386a89a 100644 --- a/ext/intl/tests/dateformat_formatObject_calendar_variant3.phpt +++ b/ext/intl/tests/dateformat_formatObject_calendar_variant3.phpt @@ -27,7 +27,6 @@ echo IntlDateFormatter::formatObject($cal), "\n"; echo IntlDateFormatter::formatObject($cal, IntlDateFormatter::FULL, "en-US"), "\n"; ?> -==DONE== --EXPECTF-- 01/01/2012, 00:00:00 domingo, 1 de Janeiro de 2012 às 00:00:00 Hora Padrão %Sda Europa Ocidental @@ -37,4 +36,3 @@ Sun 2012-01-1 00,00,00.000 Portugal Time domingo, 1 de Janeiro de 2012 às 05:00:00 GMT+03:00 06/02/1433, 00:00:00 Sunday, Safar 6, 1433 at 12:00:00 AM Western European Standard Time -==DONE== diff --git a/ext/intl/tests/dateformat_formatObject_calendar_variant4.phpt b/ext/intl/tests/dateformat_formatObject_calendar_variant4.phpt index 141ea9c806c..3637f9c80e2 100644 --- a/ext/intl/tests/dateformat_formatObject_calendar_variant4.phpt +++ b/ext/intl/tests/dateformat_formatObject_calendar_variant4.phpt @@ -27,7 +27,6 @@ echo IntlDateFormatter::formatObject($cal), "\n"; echo IntlDateFormatter::formatObject($cal, IntlDateFormatter::FULL, "en-US"), "\n"; ?> -==DONE== --EXPECTF-- 01/01/2012, 00:00:00 domingo, 1 de janeiro de 2012 às 00:00:00 Hora Padrão %Sda Europa Ocidental @@ -37,4 +36,3 @@ Sun 2012-01-1 00,00,00.000 Portugal Time domingo, 1 de janeiro de 2012 às 05:00:00 GMT+03:00 06/02/1433, 00:00:00 Sunday, Safar 6, 1433 at 12:00:00 AM Western European Standard Time -==DONE== diff --git a/ext/intl/tests/dateformat_formatObject_calendar_variant5.phpt b/ext/intl/tests/dateformat_formatObject_calendar_variant5.phpt index c8fd0535d80..a6757105f95 100644 --- a/ext/intl/tests/dateformat_formatObject_calendar_variant5.phpt +++ b/ext/intl/tests/dateformat_formatObject_calendar_variant5.phpt @@ -26,7 +26,6 @@ echo IntlDateFormatter::formatObject($cal), "\n"; echo IntlDateFormatter::formatObject($cal, IntlDateFormatter::FULL, "en-US"), "\n"; ?> -==DONE== --EXPECTF-- 01/01/2012, 00:00:00 domingo, 1 de janeiro de 2012 às 00:00:00 Hora padrão %Sda Europa Ocidental @@ -36,4 +35,3 @@ Sun 2012-01-1 00,00,00.000 Portugal Time domingo, 1 de janeiro de 2012 às 05:00:00 GMT+03:00 06/02/1433, 00:00:00 Sunday, Safar 6, 1433 at 12:00:00 AM Western European Standard Time -==DONE== diff --git a/ext/intl/tests/dateformat_formatObject_datetime.phpt b/ext/intl/tests/dateformat_formatObject_datetime.phpt index 279a132478a..25048e18f81 100644 --- a/ext/intl/tests/dateformat_formatObject_datetime.phpt +++ b/ext/intl/tests/dateformat_formatObject_datetime.phpt @@ -21,7 +21,6 @@ $dt = new DateTime('2012-01-01 05:00:00+03:00'); echo IntlDateFormatter::formatObject($dt, IntlDateFormatter::FULL), "\n"; ?> -==DONE== --EXPECTF-- 01/01/2012 00:00:00 Domingo, 1 de Janeiro de 2012 0:00:00 Hora %Sda Europa Ocidental @@ -29,4 +28,3 @@ Jan 1, 2012 12:00:00 AM 1/1/12 12:00:00 AM Western European %STime Sun 2012-01-1 00,00,00.000 Portugal Time (Lisbon) Domingo, 1 de Janeiro de 2012 5:00:00 GMT+03:00 -==DONE== diff --git a/ext/intl/tests/dateformat_formatObject_datetime_variant2.phpt b/ext/intl/tests/dateformat_formatObject_datetime_variant2.phpt index 67aee949476..3ff695e7524 100644 --- a/ext/intl/tests/dateformat_formatObject_datetime_variant2.phpt +++ b/ext/intl/tests/dateformat_formatObject_datetime_variant2.phpt @@ -21,7 +21,6 @@ $dt = new DateTime('2012-01-01 05:00:00+03:00'); echo IntlDateFormatter::formatObject($dt, IntlDateFormatter::FULL), "\n"; ?> -==DONE== --EXPECTF-- 01/01/2012, 00:00:00 Domingo, 1 de Janeiro de 2012 às 00:00:00 Hora %Sda Europa Ocidental @@ -29,4 +28,3 @@ Jan 1, 2012, 12:00:00 AM 1/1/12, 12:00:00 AM Western European Standard %STime Sun 2012-01-1 00,00,00.000 Portugal Time Domingo, 1 de Janeiro de 2012 às 05:00:00 GMT+03:00 -==DONE== diff --git a/ext/intl/tests/dateformat_formatObject_datetime_variant3.phpt b/ext/intl/tests/dateformat_formatObject_datetime_variant3.phpt index 7ddacfa25a9..a64efad8ae1 100644 --- a/ext/intl/tests/dateformat_formatObject_datetime_variant3.phpt +++ b/ext/intl/tests/dateformat_formatObject_datetime_variant3.phpt @@ -22,7 +22,6 @@ $dt = new DateTime('2012-01-01 05:00:00+03:00'); echo IntlDateFormatter::formatObject($dt, IntlDateFormatter::FULL), "\n"; ?> -==DONE== --EXPECTF-- 01/01/2012, 00:00:00 domingo, 1 de Janeiro de 2012 às 00:00:00 Hora Padrão %Sda Europa Ocidental @@ -30,4 +29,3 @@ Jan 1, 2012, 12:00:00 AM 1/1/12, 12:00:00 AM Western European Standard %STime Sun 2012-01-1 00,00,00.000 Portugal Time domingo, 1 de Janeiro de 2012 às 05:00:00 GMT+03:00 -==DONE== diff --git a/ext/intl/tests/dateformat_formatObject_datetime_variant4.phpt b/ext/intl/tests/dateformat_formatObject_datetime_variant4.phpt index 3c233eeb95c..10089f7464e 100644 --- a/ext/intl/tests/dateformat_formatObject_datetime_variant4.phpt +++ b/ext/intl/tests/dateformat_formatObject_datetime_variant4.phpt @@ -22,7 +22,6 @@ $dt = new DateTime('2012-01-01 05:00:00+03:00'); echo IntlDateFormatter::formatObject($dt, IntlDateFormatter::FULL), "\n"; ?> -==DONE== --EXPECTF-- 01/01/2012, 00:00:00 domingo, 1 de janeiro de 2012 às 00:00:00 Hora Padrão %Sda Europa Ocidental @@ -30,4 +29,3 @@ Jan 1, 2012, 12:00:00 AM 1/1/12, 12:00:00 AM Western European Standard %STime Sun 2012-01-1 00,00,00.000 Portugal Time domingo, 1 de janeiro de 2012 às 05:00:00 GMT+03:00 -==DONE== diff --git a/ext/intl/tests/dateformat_formatObject_datetime_variant5.phpt b/ext/intl/tests/dateformat_formatObject_datetime_variant5.phpt index d3b671f3243..c037869541f 100644 --- a/ext/intl/tests/dateformat_formatObject_datetime_variant5.phpt +++ b/ext/intl/tests/dateformat_formatObject_datetime_variant5.phpt @@ -21,7 +21,6 @@ $dt = new DateTime('2012-01-01 05:00:00+03:00'); echo IntlDateFormatter::formatObject($dt, IntlDateFormatter::FULL), "\n"; ?> -==DONE== --EXPECTF-- 01/01/2012, 00:00:00 domingo, 1 de janeiro de 2012 às 00:00:00 Hora padrão %Sda Europa Ocidental @@ -29,4 +28,3 @@ Jan 1, 2012, 12:00:00 AM 1/1/12, 12:00:00 AM Western European Standard %STime Sun 2012-01-1 00,00,00.000 Portugal Time domingo, 1 de janeiro de 2012 às 05:00:00 GMT+03:00 -==DONE== diff --git a/ext/intl/tests/dateformat_formatObject_error.phpt b/ext/intl/tests/dateformat_formatObject_error.phpt index 7c1140c09d5..69788fb96ef 100644 --- a/ext/intl/tests/dateformat_formatObject_error.phpt +++ b/ext/intl/tests/dateformat_formatObject_error.phpt @@ -30,7 +30,6 @@ var_dump(IntlDateFormatter::formatObject($cal, array(1, -2))); var_dump(IntlDateFormatter::formatObject($cal, "")); ?> -==DONE== --EXPECTF-- Warning: IntlDateFormatter::formatObject(): datefmt_format_object: the passed object must be an instance of either IntlCalendar or DateTime in %s on line %d bool(false) @@ -58,4 +57,3 @@ bool(false) Warning: IntlDateFormatter::formatObject(): datefmt_format_object: the format is empty in %s on line %d bool(false) -==DONE== diff --git a/ext/intl/tests/dateformat_get_set_calendar.phpt b/ext/intl/tests/dateformat_get_set_calendar.phpt index 73a26d0166d..4b150c579fa 100644 --- a/ext/intl/tests/dateformat_get_set_calendar.phpt +++ b/ext/intl/tests/dateformat_get_set_calendar.phpt @@ -35,7 +35,6 @@ $df->setCalendar($cal); d($df); ?> -==DONE== --EXPECT-- dimanche 1 janvier 2012 ap. J.-C. 03:00:00 UTC+03:00 int(1) @@ -52,4 +51,3 @@ bool(false) string(9) "gregorian" string(3) "UTC" -==DONE== diff --git a/ext/intl/tests/dateformat_get_set_calendar_variant2.phpt b/ext/intl/tests/dateformat_get_set_calendar_variant2.phpt index 9e8d76c1bb7..496754e7414 100644 --- a/ext/intl/tests/dateformat_get_set_calendar_variant2.phpt +++ b/ext/intl/tests/dateformat_get_set_calendar_variant2.phpt @@ -35,7 +35,6 @@ $df->setCalendar($cal); d($df); ?> -==DONE== --EXPECT-- dimanche 1 janvier 2012 ap. J.-C. 03:00:00 UTC+03:00 int(1) @@ -52,4 +51,3 @@ bool(false) string(9) "gregorian" string(3) "UTC" -==DONE== diff --git a/ext/intl/tests/dateformat_get_set_calendar_variant3.phpt b/ext/intl/tests/dateformat_get_set_calendar_variant3.phpt index 97f2911cfe4..dc6f75ec04d 100644 --- a/ext/intl/tests/dateformat_get_set_calendar_variant3.phpt +++ b/ext/intl/tests/dateformat_get_set_calendar_variant3.phpt @@ -36,7 +36,6 @@ $df->setCalendar($cal); d($df); ?> -==DONE== --EXPECT-- dimanche 1 janvier 2012 ap. J.-C. à 03:00:00 UTC+03:00 int(1) @@ -53,4 +52,3 @@ bool(false) string(9) "gregorian" string(3) "UTC" -==DONE== diff --git a/ext/intl/tests/dateformat_get_set_calendar_variant4.phpt b/ext/intl/tests/dateformat_get_set_calendar_variant4.phpt index 1d9ab7ecf5a..43ec99e61fe 100644 --- a/ext/intl/tests/dateformat_get_set_calendar_variant4.phpt +++ b/ext/intl/tests/dateformat_get_set_calendar_variant4.phpt @@ -36,7 +36,6 @@ $df->setCalendar($cal); d($df); ?> -==DONE== --EXPECT-- dimanche 1 janvier 2012 ap. J.-C. à 03:00:00 heure de Kaliningrad int(1) @@ -53,4 +52,3 @@ bool(false) string(9) "gregorian" string(3) "UTC" -==DONE== diff --git a/ext/intl/tests/dateformat_get_set_calendar_variant5.phpt b/ext/intl/tests/dateformat_get_set_calendar_variant5.phpt index 43e9a8516b0..57e5b80ea73 100644 --- a/ext/intl/tests/dateformat_get_set_calendar_variant5.phpt +++ b/ext/intl/tests/dateformat_get_set_calendar_variant5.phpt @@ -35,7 +35,6 @@ $df->setCalendar($cal); d($df); ?> -==DONE== --EXPECT-- dimanche 1 janvier 2012 ap. J.-C. à 03:00:00 heure de Kaliningrad int(1) @@ -52,4 +51,3 @@ bool(false) string(9) "gregorian" string(3) "UTC" -==DONE== diff --git a/ext/intl/tests/dateformat_get_set_timezone.phpt b/ext/intl/tests/dateformat_get_set_timezone.phpt index 7973aee2e7c..a621f64a850 100644 --- a/ext/intl/tests/dateformat_get_set_timezone.phpt +++ b/ext/intl/tests/dateformat_get_set_timezone.phpt @@ -37,7 +37,6 @@ $df->setTimeZone(new DateTimeZone('Europe/Amsterdam')); d($df); ?> -==DONE== --EXPECTF-- Domingo, 1 de Janeiro de 2012 3:00:00 GMT+03:00 string(12) "Europe/Minsk" @@ -59,4 +58,3 @@ Domingo, 1 de Janeiro de 2012 1:00:00 Hor%s %Sda Europa Central string(16) "Europe/Amsterdam" string(16) "Europe/Amsterdam" -==DONE== diff --git a/ext/intl/tests/dateformat_get_set_timezone_variant2.phpt b/ext/intl/tests/dateformat_get_set_timezone_variant2.phpt index f19f0ffd5bc..f87734db630 100644 --- a/ext/intl/tests/dateformat_get_set_timezone_variant2.phpt +++ b/ext/intl/tests/dateformat_get_set_timezone_variant2.phpt @@ -37,7 +37,6 @@ $df->setTimeZone(new DateTimeZone('Europe/Amsterdam')); d($df); ?> -==DONE== --EXPECTF-- Domingo, 1 de Janeiro de 2012 às 03:00:00 GMT+03:00 string(12) "Europe/Minsk" @@ -59,4 +58,3 @@ Domingo, 1 de Janeiro de 2012 às 01:00:00 Hor%s %Sda Europa Central string(16) "Europe/Amsterdam" string(16) "Europe/Amsterdam" -==DONE== diff --git a/ext/intl/tests/dateformat_get_set_timezone_variant3.phpt b/ext/intl/tests/dateformat_get_set_timezone_variant3.phpt index a06bbc1eaac..6de2ddb101c 100644 --- a/ext/intl/tests/dateformat_get_set_timezone_variant3.phpt +++ b/ext/intl/tests/dateformat_get_set_timezone_variant3.phpt @@ -38,7 +38,6 @@ $df->setTimeZone(new DateTimeZone('Europe/Amsterdam')); d($df); ?> -==DONE== --EXPECTF-- domingo, 1 de Janeiro de 2012 às 03:00:00 GMT+03:00 string(12) "Europe/Minsk" @@ -60,4 +59,3 @@ domingo, 1 de Janeiro de 2012 às 01:00:00 Hor%s Padrão %Sda Europa Central string(16) "Europe/Amsterdam" string(16) "Europe/Amsterdam" -==DONE== diff --git a/ext/intl/tests/dateformat_get_set_timezone_variant4.phpt b/ext/intl/tests/dateformat_get_set_timezone_variant4.phpt index 8a563d8a906..3d6dd8fb57c 100644 --- a/ext/intl/tests/dateformat_get_set_timezone_variant4.phpt +++ b/ext/intl/tests/dateformat_get_set_timezone_variant4.phpt @@ -38,7 +38,6 @@ $df->setTimeZone(new DateTimeZone('Europe/Amsterdam')); d($df); ?> -==DONE== --EXPECTF-- domingo, 1 de janeiro de 2012 às 03:00:00 Hor%s do Extremo Leste da Europa string(12) "Europe/Minsk" @@ -60,4 +59,3 @@ domingo, 1 de janeiro de 2012 às 01:00:00 Hor%s Padrão %Sda Europa Central string(16) "Europe/Amsterdam" string(16) "Europe/Amsterdam" -==DONE== diff --git a/ext/intl/tests/dateformat_get_set_timezone_variant5.phpt b/ext/intl/tests/dateformat_get_set_timezone_variant5.phpt index 1487751bd66..1b63a82b267 100644 --- a/ext/intl/tests/dateformat_get_set_timezone_variant5.phpt +++ b/ext/intl/tests/dateformat_get_set_timezone_variant5.phpt @@ -37,7 +37,6 @@ $df->setTimeZone(new DateTimeZone('Europe/Amsterdam')); d($df); ?> -==DONE== --EXPECTF-- domingo, 1 de janeiro de 2012 às 03:00:00 Hor%s do Extremo Leste da Europa string(12) "Europe/Minsk" @@ -59,4 +58,3 @@ domingo, 1 de janeiro de 2012 às 01:00:00 Hor%s padrão %Sda Europa Central string(16) "Europe/Amsterdam" string(16) "Europe/Amsterdam" -==DONE== diff --git a/ext/intl/tests/dateformat_setTimeZone_error.phpt b/ext/intl/tests/dateformat_setTimeZone_error.phpt index a3aabf1427c..2426c4ccf49 100644 --- a/ext/intl/tests/dateformat_setTimeZone_error.phpt +++ b/ext/intl/tests/dateformat_setTimeZone_error.phpt @@ -16,7 +16,6 @@ var_dump($df->setTimeZone(array())); var_dump($df->setTimeZone('non existing timezone')); ?> -==DONE== --EXPECTF-- Warning: Array to string conversion in %s on line %d @@ -25,4 +24,3 @@ bool(false) Warning: IntlDateFormatter::setTimeZone(): datefmt_set_timezone: no such time zone: 'non existing timezone' in %s on line %d bool(false) -==DONE== diff --git a/ext/intl/tests/gregoriancalendar___construct_basic.phpt b/ext/intl/tests/gregoriancalendar___construct_basic.phpt index bb059c2edd3..dc8eedc4354 100644 --- a/ext/intl/tests/gregoriancalendar___construct_basic.phpt +++ b/ext/intl/tests/gregoriancalendar___construct_basic.phpt @@ -33,7 +33,6 @@ var_dump($intlcal->getLocale(1)); var_dump($intlcal->getType()); ?> -==DONE== --EXPECT-- string(16) "Europe/Amsterdam" string(5) "nl_NL" @@ -46,4 +45,3 @@ string(5) "pt_PT" string(12) "Europe/Paris" string(5) "fr_CA" string(9) "gregorian" -==DONE== diff --git a/ext/intl/tests/gregoriancalendar___construct_variant1.phpt b/ext/intl/tests/gregoriancalendar___construct_variant1.phpt index 63266b792e5..86274c34bfd 100644 --- a/ext/intl/tests/gregoriancalendar___construct_variant1.phpt +++ b/ext/intl/tests/gregoriancalendar___construct_variant1.phpt @@ -19,7 +19,6 @@ var_dump($intlcal->getTime(), (float)strtotime('2012-02-29 16:07:08') * 1000); var_dump($intlcal->getType()); ?> -==DONE== --EXPECT-- string(16) "Europe/Amsterdam" float(1330527600000) @@ -27,4 +26,3 @@ float(1330527600000) float(1330528028000) float(1330528028000) string(9) "gregorian" -==DONE== diff --git a/ext/intl/tests/gregoriancalendar_get_setGregorianChange_basic.phpt b/ext/intl/tests/gregoriancalendar_get_setGregorianChange_basic.phpt index b08ad7981f0..98c11e41b1f 100644 --- a/ext/intl/tests/gregoriancalendar_get_setGregorianChange_basic.phpt +++ b/ext/intl/tests/gregoriancalendar_get_setGregorianChange_basic.phpt @@ -22,11 +22,9 @@ var_dump(intlgregcal_set_gregorian_change($intlcal, 1)); var_dump($intlcal->getGregorianChange()); ?> -==DONE== --EXPECT-- float(-12219292800000) bool(true) float(0) bool(true) -float(1) -==DONE== \ No newline at end of file +float(1) \ No newline at end of file diff --git a/ext/intl/tests/gregoriancalendar_isLeapYear_basic.phpt b/ext/intl/tests/gregoriancalendar_isLeapYear_basic.phpt index b37452fcba8..31c80247860 100644 --- a/ext/intl/tests/gregoriancalendar_isLeapYear_basic.phpt +++ b/ext/intl/tests/gregoriancalendar_isLeapYear_basic.phpt @@ -19,10 +19,8 @@ var_dump($intlcal->isLeapYear(1900)); var_dump(intlgregcal_is_leap_year($intlcal, 2012)); var_dump(intlgregcal_is_leap_year($intlcal, 1900)); ?> -==DONE== --EXPECT-- bool(true) bool(false) bool(true) -bool(false) -==DONE== \ No newline at end of file +bool(false) \ No newline at end of file diff --git a/ext/intl/tests/locale_bug66289.phpt b/ext/intl/tests/locale_bug66289.phpt index 6afd821b5a8..94c3398970d 100644 --- a/ext/intl/tests/locale_bug66289.phpt +++ b/ext/intl/tests/locale_bug66289.phpt @@ -18,10 +18,8 @@ $availableLocales = array(Locale::getDefault()); var_dump(locale_lookup($availableLocales, false, true)); ?> -==DONE== --EXPECT-- string(5) "fr_fr" string(5) "en_us" string(5) "fr_fr" string(5) "de_de" -==DONE== diff --git a/ext/intl/tests/locale_bug72658.phpt b/ext/intl/tests/locale_bug72658.phpt index 877f0b25f4f..4a68e2681b3 100644 --- a/ext/intl/tests/locale_bug72658.phpt +++ b/ext/intl/tests/locale_bug72658.phpt @@ -11,8 +11,6 @@ var_dump( ); ?> -==DONE== --EXPECT-- string(5) "de-DE" string(5) "de-DE" -==DONE== diff --git a/ext/intl/tests/locale_bug74439.phpt b/ext/intl/tests/locale_bug74439.phpt index 24407ada82a..de85db3121f 100644 --- a/ext/intl/tests/locale_bug74439.phpt +++ b/ext/intl/tests/locale_bug74439.phpt @@ -31,7 +31,6 @@ foreach ($methods as $method) { printf("%s: %d, %d\n", $method, $rm->getNumberOfParameters(), $rm->getNumberOfRequiredParameters()); } ?> -===DONE=== --EXPECT-- getDefault: 0, 0 acceptFromHttp: 1, 1 @@ -51,4 +50,3 @@ getDisplayScript: 2, 1 getDisplayVariant: 2, 1 filterMatches: 3, 2 lookup: 4, 2 -===DONE=== diff --git a/ext/intl/tests/msgfmt_bug70484.phpt b/ext/intl/tests/msgfmt_bug70484.phpt index 55c516eacdc..f317be30dbc 100644 --- a/ext/intl/tests/msgfmt_bug70484.phpt +++ b/ext/intl/tests/msgfmt_bug70484.phpt @@ -34,7 +34,6 @@ foreach ($locale as $lc) { } ?> -==DONE== --EXPECTF-- de string key string(8) "42-other" @@ -92,4 +91,3 @@ string(22) "2 147 483 643-other" string(26) "2 147 483 643,123-other" string(4) "five" -==DONE== diff --git a/ext/intl/tests/msgfmt_format_datetime.phpt b/ext/intl/tests/msgfmt_format_datetime.phpt index bf0d24ba6a3..e110ff0e96f 100644 --- a/ext/intl/tests/msgfmt_format_datetime.phpt +++ b/ext/intl/tests/msgfmt_format_datetime.phpt @@ -24,8 +24,6 @@ var_dump($mf->format(array($dt))); var_dump($mf->format(array($dti))); ?> -==DONE== --EXPECTF-- string(%s) "May %d, 2012 %d:%d:42 %s" string(%s) "May %d, 2012 %d:%d:42 %s" -==DONE== diff --git a/ext/intl/tests/msgfmt_format_intlcalendar.phpt b/ext/intl/tests/msgfmt_format_intlcalendar.phpt index 029f89ab9c4..69f32e95f30 100644 --- a/ext/intl/tests/msgfmt_format_intlcalendar.phpt +++ b/ext/intl/tests/msgfmt_format_intlcalendar.phpt @@ -24,7 +24,5 @@ echo "msgf2: ", $msgf->format(array($time, 'date')), " ", */ ?> -==DONE== --EXPECT-- Quinta-feira, 17 de Maio de 2012 5:35:36 p.m. WEST -==DONE== diff --git a/ext/intl/tests/msgfmt_format_intlcalendar_variant2.phpt b/ext/intl/tests/msgfmt_format_intlcalendar_variant2.phpt index 55dd0e40574..105792bff59 100644 --- a/ext/intl/tests/msgfmt_format_intlcalendar_variant2.phpt +++ b/ext/intl/tests/msgfmt_format_intlcalendar_variant2.phpt @@ -24,7 +24,5 @@ echo "msgf2: ", $msgf->format(array($time, 'date')), " ", */ ?> -==DONE== --EXPECT-- Quinta-feira, 17 de Maio de 2012 5:35:36 PM ptlis -==DONE== diff --git a/ext/intl/tests/msgfmt_format_intlcalendar_variant3.phpt b/ext/intl/tests/msgfmt_format_intlcalendar_variant3.phpt index 766c508d310..505a2fdafd7 100644 --- a/ext/intl/tests/msgfmt_format_intlcalendar_variant3.phpt +++ b/ext/intl/tests/msgfmt_format_intlcalendar_variant3.phpt @@ -25,7 +25,5 @@ echo "msgf2: ", $msgf->format(array($time, 'date')), " ", */ ?> -==DONE== --EXPECT-- quinta-feira, 17 de Maio de 2012 5:35:36 da tarde ptlis -==DONE== diff --git a/ext/intl/tests/msgfmt_format_intlcalendar_variant4.phpt b/ext/intl/tests/msgfmt_format_intlcalendar_variant4.phpt index 8f778b9029a..e10a51c7b80 100644 --- a/ext/intl/tests/msgfmt_format_intlcalendar_variant4.phpt +++ b/ext/intl/tests/msgfmt_format_intlcalendar_variant4.phpt @@ -24,7 +24,5 @@ echo "msgf2: ", $msgf->format(array($time, 'date')), " ", */ ?> -==DONE== --EXPECT-- quinta-feira, 17 de maio de 2012 5:35:36 da tarde ptlis -==DONE== diff --git a/ext/intl/tests/msgfmt_format_mixed_params.phpt b/ext/intl/tests/msgfmt_format_mixed_params.phpt index 36ccf0b147f..a9e403a7998 100644 --- a/ext/intl/tests/msgfmt_format_mixed_params.phpt +++ b/ext/intl/tests/msgfmt_format_mixed_params.phpt @@ -16,8 +16,6 @@ var_dump($mf->format(array(2.3, "foo" => 1.3))); var_dump($mf->format(array("foo" => 1.3, 0 => 2.3))); ?> -==DONE== --EXPECT-- string(10) "2.3 -- 1st" string(10) "2.3 -- 1st" -==DONE== diff --git a/ext/intl/tests/msgfmt_format_simple_types_numeric_strings.phpt b/ext/intl/tests/msgfmt_format_simple_types_numeric_strings.phpt index 34d45776b6d..2c3e3ef8e7e 100644 --- a/ext/intl/tests/msgfmt_format_simple_types_numeric_strings.phpt +++ b/ext/intl/tests/msgfmt_format_simple_types_numeric_strings.phpt @@ -39,7 +39,6 @@ var_dump($mf->format(array( ))); ?> -==DONE== --EXPECTF-- string(%d) " none 1336317965.5 str @@ -53,4 +52,3 @@ string(%d) " ordinal 1,336,317,966th duration 371,199:26:06 " -==DONE== diff --git a/ext/intl/tests/msgfmt_millisecond_dates.phpt b/ext/intl/tests/msgfmt_millisecond_dates.phpt index 7dd051426b2..8fc2f04e84f 100644 --- a/ext/intl/tests/msgfmt_millisecond_dates.phpt +++ b/ext/intl/tests/msgfmt_millisecond_dates.phpt @@ -19,11 +19,9 @@ $p = 'On 2012-05-06 AD at 15:22:49.123 GMT+02:00 something odd happened'; var_dump($mf->parse($p)); ?> -==DONE== --EXPECTF-- string(%d) "On 2012-05-0%d AD at %d:%d:49.123 %s something odd happened" array(1) { [0]=> float(1336310569.123) } -==DONE== diff --git a/ext/intl/tests/msgfmt_setPattern_cache.phpt b/ext/intl/tests/msgfmt_setPattern_cache.phpt index 90d057c50d3..7afbcbd93b5 100644 --- a/ext/intl/tests/msgfmt_setPattern_cache.phpt +++ b/ext/intl/tests/msgfmt_setPattern_cache.phpt @@ -18,9 +18,7 @@ $mf->setPattern("{0,ordinal} -- {1,number}"); var_dump($mf->format(array(1.3, 1.3))); ?> -==DONE== --EXPECT-- string(10) "1.3 -- 1st" string(10) "1.3 -- 1st" string(10) "1st -- 1.3" -==DONE== diff --git a/ext/intl/tests/rbbiter___construct_basic.phpt b/ext/intl/tests/rbbiter___construct_basic.phpt index 31edcd2c83d..2281bb26e04 100644 --- a/ext/intl/tests/rbbiter___construct_basic.phpt +++ b/ext/intl/tests/rbbiter___construct_basic.phpt @@ -32,9 +32,7 @@ try { } ?> -==DONE== --EXPECT-- string(26) "IntlRuleBasedBreakIterator" int(1) string(93) "rbbi_create_instance: unable to create instance from compiled rules: U_ILLEGAL_ARGUMENT_ERROR" -==DONE== diff --git a/ext/intl/tests/rbbiter_getBinaryRules_basic.phpt b/ext/intl/tests/rbbiter_getBinaryRules_basic.phpt index 4a8c68a8de8..b98f26a72f3 100644 --- a/ext/intl/tests/rbbiter_getBinaryRules_basic.phpt +++ b/ext/intl/tests/rbbiter_getBinaryRules_basic.phpt @@ -31,9 +31,7 @@ $rbbi2 = new IntlRuleBasedBreakIterator($br, true); var_dump($rbbi->getRules(), $rbbi2->getRules()); var_dump($rbbi->getRules() == $rbbi2->getRules()); ?> -==DONE== --EXPECT-- string(128) "$LN = [[:letter:] [:number:]];$S = [.;,:];!!forward;$LN+ {1};$S+ {42};!!reverse;$LN+ {1};$S+ {42};!!safe_forward;!!safe_reverse;" string(128) "$LN = [[:letter:] [:number:]];$S = [.;,:];!!forward;$LN+ {1};$S+ {42};!!reverse;$LN+ {1};$S+ {42};!!safe_forward;!!safe_reverse;" bool(true) -==DONE== diff --git a/ext/intl/tests/rbbiter_getBinaryRules_basic2.phpt b/ext/intl/tests/rbbiter_getBinaryRules_basic2.phpt index f3b6c6cb34c..6a3f65e3ea6 100644 --- a/ext/intl/tests/rbbiter_getBinaryRules_basic2.phpt +++ b/ext/intl/tests/rbbiter_getBinaryRules_basic2.phpt @@ -31,7 +31,6 @@ $rbbi2 = new IntlRuleBasedBreakIterator($br, true); var_dump($rbbi->getRules(), $rbbi2->getRules()); var_dump($rbbi->getRules() == $rbbi2->getRules()); ?> -==DONE== --EXPECT-- string(137) "$LN = [[:letter:] [:number:]]; $S = [.;,:]; @@ -54,4 +53,3 @@ $S+ {42}; !!safe_forward; !!safe_reverse;" bool(true) -==DONE== diff --git a/ext/intl/tests/rbbiter_getRuleStatusVec_basic.phpt b/ext/intl/tests/rbbiter_getRuleStatusVec_basic.phpt index 4a654508cc1..8d689d50033 100644 --- a/ext/intl/tests/rbbiter_getRuleStatusVec_basic.phpt +++ b/ext/intl/tests/rbbiter_getRuleStatusVec_basic.phpt @@ -32,7 +32,6 @@ do { } while ($rbbi->next() != IntlBreakIterator::DONE); ?> -==DONE== --EXPECT-- int(0) array(1) { @@ -56,4 +55,3 @@ array(1) { [0]=> int(4) } -==DONE== diff --git a/ext/intl/tests/rbbiter_getRuleStatus_basic.phpt b/ext/intl/tests/rbbiter_getRuleStatus_basic.phpt index a9c4d32ee45..2cc71f4555f 100644 --- a/ext/intl/tests/rbbiter_getRuleStatus_basic.phpt +++ b/ext/intl/tests/rbbiter_getRuleStatus_basic.phpt @@ -31,7 +31,6 @@ do { } while ($rbbi->next() != IntlBreakIterator::DONE); ?> -==DONE== --EXPECT-- pos : 0 rule status: 0 @@ -43,4 +42,3 @@ pos : 17 rule status: 0 pos : 19 rule status: 42 -==DONE== diff --git a/ext/intl/tests/rbbiter_getRules_basic.phpt b/ext/intl/tests/rbbiter_getRules_basic.phpt index 3ad1a923115..918b1eeff0f 100644 --- a/ext/intl/tests/rbbiter_getRules_basic.phpt +++ b/ext/intl/tests/rbbiter_getRules_basic.phpt @@ -25,7 +25,5 @@ $rbbi = new IntlRuleBasedBreakIterator($rules); var_dump($rbbi->getRules()); ?> -==DONE== --EXPECT-- string(128) "$LN = [[:letter:] [:number:]];$S = [.;,:];!!forward;$LN+ {1};$S+ {42};!!reverse;$LN+ {1};$S+ {42};!!safe_forward;!!safe_reverse;" -==DONE== diff --git a/ext/intl/tests/rbbiter_getRules_basic2.phpt b/ext/intl/tests/rbbiter_getRules_basic2.phpt index 67b3831aa2f..97cea02d281 100644 --- a/ext/intl/tests/rbbiter_getRules_basic2.phpt +++ b/ext/intl/tests/rbbiter_getRules_basic2.phpt @@ -25,7 +25,6 @@ $rbbi = new IntlRuleBasedBreakIterator($rules); var_dump($rbbi->getRules()); ?> -==DONE== --EXPECT-- string(137) "$LN = [[:letter:] [:number:]]; $S = [.;,:]; @@ -37,4 +36,3 @@ $LN+ {1}; $S+ {42}; !!safe_forward; !!safe_reverse;" -==DONE== diff --git a/ext/intl/tests/resourcebundle_null_mandatory_args.phpt b/ext/intl/tests/resourcebundle_null_mandatory_args.phpt index ae6effef6e3..6eb325f5755 100644 --- a/ext/intl/tests/resourcebundle_null_mandatory_args.phpt +++ b/ext/intl/tests/resourcebundle_null_mandatory_args.phpt @@ -18,8 +18,6 @@ $r = new ResourceBundle(NULL, NULL); $c = $r->get('calendar')->get('gregorian')->get('DateTimePatterns')->get(0); var_dump($c); ?> -==DONE== --EXPECT-- string(14) "h:mm:ss a zzzz" string(12) "H:mm:ss zzzz" -==DONE== diff --git a/ext/intl/tests/resourcebundle_null_mandatory_args_variant2.phpt b/ext/intl/tests/resourcebundle_null_mandatory_args_variant2.phpt index cf721c8ef25..0b0bf967ad4 100644 --- a/ext/intl/tests/resourcebundle_null_mandatory_args_variant2.phpt +++ b/ext/intl/tests/resourcebundle_null_mandatory_args_variant2.phpt @@ -19,8 +19,6 @@ $r = new ResourceBundle(NULL, NULL); $c = $r->get('calendar')->get('gregorian')->get('DateTimePatterns')->get(0); var_dump($c); ?> -==DONE== --EXPECT-- string(14) "h:mm:ss a zzzz" string(13) "HH:mm:ss zzzz" -==DONE== diff --git a/ext/intl/tests/timezone_clone_basic.phpt b/ext/intl/tests/timezone_clone_basic.phpt index a8ef83f8641..4a5a58f7182 100644 --- a/ext/intl/tests/timezone_clone_basic.phpt +++ b/ext/intl/tests/timezone_clone_basic.phpt @@ -18,7 +18,6 @@ print_r($gmt); print_r(clone $gmt); ?> -==DONE== --EXPECTF-- IntlTimeZone Object ( @@ -47,5 +46,4 @@ IntlTimeZone Object [id] => GMT [rawOffset] => 0 [currentOffset] => 0 -) -==DONE== \ No newline at end of file +) \ No newline at end of file diff --git a/ext/intl/tests/timezone_clone_error.phpt b/ext/intl/tests/timezone_clone_error.phpt index df501be3b4c..40527767758 100644 --- a/ext/intl/tests/timezone_clone_error.phpt +++ b/ext/intl/tests/timezone_clone_error.phpt @@ -21,12 +21,10 @@ var_dump(clone $tz); } ?> -==DONE== --EXPECT-- object(A)#1 (1) { ["valid"]=> bool(false) } string(9) "Exception" -string(39) "Cannot clone unconstructed IntlTimeZone" -==DONE== \ No newline at end of file +string(39) "Cannot clone unconstructed IntlTimeZone" \ No newline at end of file diff --git a/ext/intl/tests/timezone_countEquivalentIDs_basic.phpt b/ext/intl/tests/timezone_countEquivalentIDs_basic.phpt index ec3e4050ab5..7a7eef0a72f 100644 --- a/ext/intl/tests/timezone_countEquivalentIDs_basic.phpt +++ b/ext/intl/tests/timezone_countEquivalentIDs_basic.phpt @@ -13,8 +13,6 @@ var_dump($count >= 2); $count2 = intltz_count_equivalent_ids('Europe/Lisbon'); var_dump($count2 == $count); ?> -==DONE== --EXPECT-- bool(true) -bool(true) -==DONE== \ No newline at end of file +bool(true) \ No newline at end of file diff --git a/ext/intl/tests/timezone_createDefault_basic.phpt b/ext/intl/tests/timezone_createDefault_basic.phpt index f8e3158cec8..0a188df11ef 100644 --- a/ext/intl/tests/timezone_createDefault_basic.phpt +++ b/ext/intl/tests/timezone_createDefault_basic.phpt @@ -12,7 +12,6 @@ print_r($tz); $tz = intltz_create_default(); print_r($tz); ?> -==DONE== --EXPECTF-- IntlTimeZone Object ( @@ -28,4 +27,3 @@ IntlTimeZone Object [rawOffset] => %i [currentOffset] => %i ) -==DONE== diff --git a/ext/intl/tests/timezone_createEnumeration_basic.phpt b/ext/intl/tests/timezone_createEnumeration_basic.phpt index 2df32562b19..4500aef9761 100644 --- a/ext/intl/tests/timezone_createEnumeration_basic.phpt +++ b/ext/intl/tests/timezone_createEnumeration_basic.phpt @@ -17,10 +17,8 @@ var_dump(get_class($tz)); $count2 = count(iterator_to_array($tz)); var_dump($count == $count2); ?> -==DONE== --EXPECT-- string(12) "IntlIterator" bool(true) string(12) "IntlIterator" -bool(true) -==DONE== \ No newline at end of file +bool(true) \ No newline at end of file diff --git a/ext/intl/tests/timezone_createEnumeration_variation1.phpt b/ext/intl/tests/timezone_createEnumeration_variation1.phpt index 30fc43660e5..19a5521a68e 100644 --- a/ext/intl/tests/timezone_createEnumeration_variation1.phpt +++ b/ext/intl/tests/timezone_createEnumeration_variation1.phpt @@ -16,9 +16,7 @@ $tz->rewind(); var_dump(in_array('Europe/Amsterdam', iterator_to_array($tz))); ?> -==DONE== --EXPECT-- string(12) "IntlIterator" bool(true) -bool(true) -==DONE== \ No newline at end of file +bool(true) \ No newline at end of file diff --git a/ext/intl/tests/timezone_createEnumeration_variation2.phpt b/ext/intl/tests/timezone_createEnumeration_variation2.phpt index ddf1a6ece1b..c0355213223 100644 --- a/ext/intl/tests/timezone_createEnumeration_variation2.phpt +++ b/ext/intl/tests/timezone_createEnumeration_variation2.phpt @@ -16,9 +16,7 @@ $tz->rewind(); var_dump(in_array('Europe/Amsterdam', iterator_to_array($tz))); ?> -==DONE== --EXPECT-- string(12) "IntlIterator" bool(true) -bool(true) -==DONE== \ No newline at end of file +bool(true) \ No newline at end of file diff --git a/ext/intl/tests/timezone_createTimeZoneIDEnumeration_basic.phpt b/ext/intl/tests/timezone_createTimeZoneIDEnumeration_basic.phpt index 4bcc12f26ca..348478e3961 100644 --- a/ext/intl/tests/timezone_createTimeZoneIDEnumeration_basic.phpt +++ b/ext/intl/tests/timezone_createTimeZoneIDEnumeration_basic.phpt @@ -19,7 +19,6 @@ $enum = intltz_create_time_zone_id_enumeration( -3600000); print_r(iterator_to_array($enum)); ?> -==DONE== --EXPECT-- Array ( @@ -29,4 +28,3 @@ Array ( [0] => Atlantic/Azores ) -==DONE== diff --git a/ext/intl/tests/timezone_createTimeZoneIDEnumeration_variant1.phpt b/ext/intl/tests/timezone_createTimeZoneIDEnumeration_variant1.phpt index 05fc4044427..37edd7e9c77 100644 --- a/ext/intl/tests/timezone_createTimeZoneIDEnumeration_variant1.phpt +++ b/ext/intl/tests/timezone_createTimeZoneIDEnumeration_variant1.phpt @@ -22,9 +22,7 @@ $values2 = iterator_to_array($enum); var_dump($values2 == $values); ?> -==DONE== --EXPECT-- bool(true) bool(true) bool(true) -==DONE== diff --git a/ext/intl/tests/timezone_createTimeZoneIDEnumeration_variant2.phpt b/ext/intl/tests/timezone_createTimeZoneIDEnumeration_variant2.phpt index a21b9a703d6..e7ae961a4a9 100644 --- a/ext/intl/tests/timezone_createTimeZoneIDEnumeration_variant2.phpt +++ b/ext/intl/tests/timezone_createTimeZoneIDEnumeration_variant2.phpt @@ -37,7 +37,6 @@ array('Etc/GMT+1', 'Atlantic/Azores')) ?> -==DONE== --EXPECT-- bool(true) bool(true) @@ -47,4 +46,3 @@ Array [0] => Atlantic/Azores [1] => Etc/GMT+1 ) -==DONE== diff --git a/ext/intl/tests/timezone_createTimeZone_basic.phpt b/ext/intl/tests/timezone_createTimeZone_basic.phpt index 88b83150d95..e58d7749d97 100644 --- a/ext/intl/tests/timezone_createTimeZone_basic.phpt +++ b/ext/intl/tests/timezone_createTimeZone_basic.phpt @@ -12,7 +12,6 @@ print_r($tz); $tz = intltz_create_time_zone('GMT+01:00'); print_r($tz); ?> -==DONE== --EXPECT-- IntlTimeZone Object ( @@ -28,4 +27,3 @@ IntlTimeZone Object [rawOffset] => 3600000 [currentOffset] => 3600000 ) -==DONE== diff --git a/ext/intl/tests/timezone_equals_basic.phpt b/ext/intl/tests/timezone_equals_basic.phpt index 105ae8582f5..20703f5494b 100644 --- a/ext/intl/tests/timezone_equals_basic.phpt +++ b/ext/intl/tests/timezone_equals_basic.phpt @@ -20,7 +20,6 @@ echo "Comparison to GMT:\n"; var_dump($tz1 == intltz_get_gmt()); ?> -==DONE== --EXPECT-- Comparison to self: bool(true) @@ -29,5 +28,4 @@ bool(true) Comparison to equivalent instance: bool(false) Comparison to GMT: -bool(false) -==DONE== \ No newline at end of file +bool(false) \ No newline at end of file diff --git a/ext/intl/tests/timezone_equals_error.phpt b/ext/intl/tests/timezone_equals_error.phpt index d8d027a761a..d5eeedb2d9a 100644 --- a/ext/intl/tests/timezone_equals_error.phpt +++ b/ext/intl/tests/timezone_equals_error.phpt @@ -22,7 +22,6 @@ var_dump($tz == $tz2); } ?> -==DONE== --EXPECT-- object(A)#1 (1) { ["valid"]=> @@ -39,5 +38,4 @@ object(IntlTimeZone)#2 (4) { int(0) } string(9) "Exception" -string(63) "Comparison with at least one unconstructed IntlTimeZone operand" -==DONE== \ No newline at end of file +string(63) "Comparison with at least one unconstructed IntlTimeZone operand" \ No newline at end of file diff --git a/ext/intl/tests/timezone_getCanonicalID_basic.phpt b/ext/intl/tests/timezone_getCanonicalID_basic.phpt index 897e9a9edc9..1ed775ac52a 100644 --- a/ext/intl/tests/timezone_getCanonicalID_basic.phpt +++ b/ext/intl/tests/timezone_getCanonicalID_basic.phpt @@ -12,8 +12,6 @@ echo "\n"; print_R(intltz_get_canonical_id('Portugal')); echo "\n"; ?> -==DONE== --EXPECT-- Europe/Lisbon -Europe/Lisbon -==DONE== \ No newline at end of file +Europe/Lisbon \ No newline at end of file diff --git a/ext/intl/tests/timezone_getCanonicalID_variant1.phpt b/ext/intl/tests/timezone_getCanonicalID_variant1.phpt index 182fe15b608..8ad31d18ada 100644 --- a/ext/intl/tests/timezone_getCanonicalID_variant1.phpt +++ b/ext/intl/tests/timezone_getCanonicalID_variant1.phpt @@ -14,10 +14,8 @@ var_dump(IntlTimeZone::getCanonicalID('GMT +01:25', $isSystemId)); var_dump($isSystemId); ?> -==DONE== --EXPECT-- string(13) "Europe/Lisbon" bool(true) string(0) "" bool(false) -==DONE== diff --git a/ext/intl/tests/timezone_getCanonicalID_variant1_2.phpt b/ext/intl/tests/timezone_getCanonicalID_variant1_2.phpt index b60924332a2..f41902c5804 100644 --- a/ext/intl/tests/timezone_getCanonicalID_variant1_2.phpt +++ b/ext/intl/tests/timezone_getCanonicalID_variant1_2.phpt @@ -15,7 +15,6 @@ var_dump(IntlTimeZone::getCanonicalID('GMT +01:25', $isSystemId)); var_dump($isSystemId); ?> -==DONE== --EXPECTF-- string(13) "Europe/Lisbon" bool(true) @@ -23,4 +22,3 @@ bool(true) Warning: IntlTimeZone::getCanonicalID(): intltz_get_canonical_id: error obtaining canonical ID in %stimezone_getCanonicalID_variant1_2.php on line %d bool(false) bool(true) -==DONE== diff --git a/ext/intl/tests/timezone_getDSTSavings_basic.phpt b/ext/intl/tests/timezone_getDSTSavings_basic.phpt index 8dee5b8e940..6828d9bc083 100644 --- a/ext/intl/tests/timezone_getDSTSavings_basic.phpt +++ b/ext/intl/tests/timezone_getDSTSavings_basic.phpt @@ -14,8 +14,6 @@ var_dump($lsb->getDSTSavings()); var_dump(intltz_get_dst_savings($lsb)); ?> -==DONE== --EXPECT-- int(3600000) -int(3600000) -==DONE== \ No newline at end of file +int(3600000) \ No newline at end of file diff --git a/ext/intl/tests/timezone_getDisplayName_basic.phpt b/ext/intl/tests/timezone_getDisplayName_basic.phpt index e4fc2f37cea..57fab259663 100644 --- a/ext/intl/tests/timezone_getDisplayName_basic.phpt +++ b/ext/intl/tests/timezone_getDisplayName_basic.phpt @@ -17,8 +17,6 @@ ini_set('intl.default_locale', 'pt_PT'); var_dump($lsb->getDisplayName()); ?> -==DONE== --EXPECTF-- string(%d) "Western European%sTime" -string(%d) "Hora%sda Europa Ocidental" -==DONE== \ No newline at end of file +string(%d) "Hora%sda Europa Ocidental" \ No newline at end of file diff --git a/ext/intl/tests/timezone_getDisplayName_variant1.phpt b/ext/intl/tests/timezone_getDisplayName_variant1.phpt index 83922dd1706..ebfb32cee4f 100644 --- a/ext/intl/tests/timezone_getDisplayName_variant1.phpt +++ b/ext/intl/tests/timezone_getDisplayName_variant1.phpt @@ -18,9 +18,7 @@ var_dump($lsb->getDisplayName(false)); var_dump($lsb->getDisplayName(true)); ?> -==DONE== --EXPECTF-- string(%d) "Western European%sTime" string(%d) "Western European%sTime" -string(28) "Western European Summer Time" -==DONE== \ No newline at end of file +string(28) "Western European Summer Time" \ No newline at end of file diff --git a/ext/intl/tests/timezone_getDisplayName_variant2-49+.phpt b/ext/intl/tests/timezone_getDisplayName_variant2-49+.phpt index 353b4ec8d6f..41431950d37 100644 --- a/ext/intl/tests/timezone_getDisplayName_variant2-49+.phpt +++ b/ext/intl/tests/timezone_getDisplayName_variant2-49+.phpt @@ -22,7 +22,6 @@ var_dump($lsb->getDisplayName(false, IntlTimeZone::DISPLAY_SHORT_COMMONLY_USED)) var_dump($lsb->getDisplayName(false, IntlTimeZone::DISPLAY_GENERIC_LOCATION)); ?> -==DONE== --EXPECT-- string(3) "GMT" string(30) "Western European Standard Time" @@ -32,4 +31,3 @@ string(5) "+0000" string(3) "GMT" string(3) "GMT" string(22) "Portugal Time (Lisbon)" -==DONE== diff --git a/ext/intl/tests/timezone_getDisplayName_variant3-49+.phpt b/ext/intl/tests/timezone_getDisplayName_variant3-49+.phpt index 74e6ed9b4d2..7c5683639da 100644 --- a/ext/intl/tests/timezone_getDisplayName_variant3-49+.phpt +++ b/ext/intl/tests/timezone_getDisplayName_variant3-49+.phpt @@ -17,9 +17,7 @@ var_dump($lsb->getDisplayName(false, IntlTimeZone::DISPLAY_LONG, NULL)); var_dump($lsb->getDisplayName(false, IntlTimeZone::DISPLAY_LONG, 'pt_PT')); ?> -==DONE== --EXPECTF-- string(30) "Western European Standard Time" string(30) "Western European Standard Time" string(32) "Hora %cadrão da Europa Ocidental" -==DONE== diff --git a/ext/intl/tests/timezone_getDisplayName_variant4.phpt b/ext/intl/tests/timezone_getDisplayName_variant4.phpt index c8379d34a03..a0ca6864db0 100644 --- a/ext/intl/tests/timezone_getDisplayName_variant4.phpt +++ b/ext/intl/tests/timezone_getDisplayName_variant4.phpt @@ -22,7 +22,6 @@ var_dump($lsb->getDisplayName(false, IntlTimeZone::DISPLAY_SHORT_COMMONLY_USED)) var_dump($lsb->getDisplayName(false, IntlTimeZone::DISPLAY_GENERIC_LOCATION)); ?> -==DONE== --EXPECT-- string(3) "GMT" string(30) "Western European Standard Time" @@ -32,4 +31,3 @@ string(5) "+0000" string(3) "GMT" string(3) "GMT" string(13) "Portugal Time" -==DONE== diff --git a/ext/intl/tests/timezone_getEquivalentID_basic.phpt b/ext/intl/tests/timezone_getEquivalentID_basic.phpt index 8af1e20897d..45e0783a063 100644 --- a/ext/intl/tests/timezone_getEquivalentID_basic.phpt +++ b/ext/intl/tests/timezone_getEquivalentID_basic.phpt @@ -12,8 +12,6 @@ echo "\n"; print_R(intltz_get_equivalent_id('Europe/Lisbon', 1)); echo "\n"; ?> -==DONE== --EXPECT-- Portugal -Portugal -==DONE== \ No newline at end of file +Portugal \ No newline at end of file diff --git a/ext/intl/tests/timezone_getErrorCodeMessage_basic.phpt b/ext/intl/tests/timezone_getErrorCodeMessage_basic.phpt index 18ffbe71bea..f7f7a473112 100644 --- a/ext/intl/tests/timezone_getErrorCodeMessage_basic.phpt +++ b/ext/intl/tests/timezone_getErrorCodeMessage_basic.phpt @@ -24,7 +24,6 @@ var_dump($lsb->getErrorCode()); var_dump($lsb->getErrorMessage()); ?> -==DONE== --EXPECTF-- int(0) string(12) "U_ZERO_ERROR" @@ -33,4 +32,3 @@ Warning: IntlTimeZone::getOffset(): intltz_get_offset: error obtaining offset in bool(false) int(1) string(67) "intltz_get_offset: error obtaining offset: U_ILLEGAL_ARGUMENT_ERROR" -==DONE== diff --git a/ext/intl/tests/timezone_getGMT_basic.phpt b/ext/intl/tests/timezone_getGMT_basic.phpt index 99b3fa22ca2..7004b2dd604 100644 --- a/ext/intl/tests/timezone_getGMT_basic.phpt +++ b/ext/intl/tests/timezone_getGMT_basic.phpt @@ -12,7 +12,6 @@ print_r($tz); $tz = intltz_get_gmt(); print_r($tz); ?> -==DONE== --EXPECT-- IntlTimeZone Object ( @@ -27,5 +26,4 @@ IntlTimeZone Object [id] => GMT [rawOffset] => 0 [currentOffset] => 0 -) -==DONE== \ No newline at end of file +) \ No newline at end of file diff --git a/ext/intl/tests/timezone_getOffset_basic.phpt b/ext/intl/tests/timezone_getOffset_basic.phpt index 403bf8fc35d..7efb1967ca7 100644 --- a/ext/intl/tests/timezone_getOffset_basic.phpt +++ b/ext/intl/tests/timezone_getOffset_basic.phpt @@ -22,12 +22,10 @@ var_dump(intltz_get_offset($lsb, $date *1000., true, $rawOffset, $dstOffset), $rawOffset, $dstOffset); ?> -==DONE== --EXPECT-- bool(true) int(3600000) int(3600000) bool(true) int(0) -int(3600000) -==DONE== \ No newline at end of file +int(3600000) \ No newline at end of file diff --git a/ext/intl/tests/timezone_getRawOffset_basic.phpt b/ext/intl/tests/timezone_getRawOffset_basic.phpt index a2b4debf2b0..bfbf2710cac 100644 --- a/ext/intl/tests/timezone_getRawOffset_basic.phpt +++ b/ext/intl/tests/timezone_getRawOffset_basic.phpt @@ -14,8 +14,6 @@ $lsb = IntlTimeZone::createTimeZone('Europe/Lisbon'); var_dump(intltz_get_raw_offset($lsb)); ?> -==DONE== --EXPECT-- int(3600000) -int(0) -==DONE== \ No newline at end of file +int(0) \ No newline at end of file diff --git a/ext/intl/tests/timezone_getRegion_basic.phpt b/ext/intl/tests/timezone_getRegion_basic.phpt index 3d020e77a34..7d23b7f96db 100644 --- a/ext/intl/tests/timezone_getRegion_basic.phpt +++ b/ext/intl/tests/timezone_getRegion_basic.phpt @@ -12,8 +12,6 @@ echo "\n"; print_R(intltz_get_region('Europe/Amsterdam')); echo "\n"; ?> -==DONE== --EXPECT-- NL NL -==DONE== diff --git a/ext/intl/tests/timezone_getTZData_basic.phpt b/ext/intl/tests/timezone_getTZData_basic.phpt index dea5b7c4b30..e3b8e711222 100644 --- a/ext/intl/tests/timezone_getTZData_basic.phpt +++ b/ext/intl/tests/timezone_getTZData_basic.phpt @@ -12,8 +12,6 @@ echo "\n"; print_R(intltz_get_tz_data_version()); echo "\n"; ?> -==DONE== --EXPECTF-- 20%d%s -20%d%s -==DONE== \ No newline at end of file +20%d%s \ No newline at end of file diff --git a/ext/intl/tests/timezone_getUnknown_basic.phpt b/ext/intl/tests/timezone_getUnknown_basic.phpt index 7d5f50206a4..9277f39911d 100644 --- a/ext/intl/tests/timezone_getUnknown_basic.phpt +++ b/ext/intl/tests/timezone_getUnknown_basic.phpt @@ -14,7 +14,6 @@ print_r($tz); $tz = intltz_get_unknown(); print_r($tz); ?> -==DONE== --EXPECT-- IntlTimeZone Object ( @@ -30,4 +29,3 @@ IntlTimeZone Object [rawOffset] => 0 [currentOffset] => 0 ) -==DONE== diff --git a/ext/intl/tests/timezone_hasSameRules_basic.phpt b/ext/intl/tests/timezone_hasSameRules_basic.phpt index 55faaf760b7..89650245543 100644 --- a/ext/intl/tests/timezone_hasSameRules_basic.phpt +++ b/ext/intl/tests/timezone_hasSameRules_basic.phpt @@ -22,7 +22,6 @@ echo "\nEurope/Lisbon has same rules as Atlantic/Azores:\n"; var_dump(intltz_has_same_rules($lsb, $azo)); ?> -==DONE== --EXPECT-- Europe/Lisbon has same rules as itself: bool(true) @@ -31,5 +30,4 @@ Europe/Lisbon has same rules as Portugal: bool(true) Europe/Lisbon has same rules as Atlantic/Azores: -bool(false) -==DONE== \ No newline at end of file +bool(false) \ No newline at end of file diff --git a/ext/intl/tests/timezone_useDaylightTime_basic.phpt b/ext/intl/tests/timezone_useDaylightTime_basic.phpt index 15baf108b3d..7db7f80fdee 100644 --- a/ext/intl/tests/timezone_useDaylightTime_basic.phpt +++ b/ext/intl/tests/timezone_useDaylightTime_basic.phpt @@ -16,10 +16,8 @@ var_dump($gmt->useDaylightTime()); var_dump(intltz_use_daylight_time($lsb)); var_dump(intltz_use_daylight_time($gmt)); ?> -==DONE== --EXPECT-- bool(true) bool(false) bool(true) -bool(false) -==DONE== \ No newline at end of file +bool(false) \ No newline at end of file diff --git a/ext/json/tests/001.phpt b/ext/json/tests/001.phpt index 63a303998ac..b429aef0dcf 100644 --- a/ext/json/tests/001.phpt +++ b/ext/json/tests/001.phpt @@ -23,7 +23,6 @@ var_dump(json_decode('{ "": { "": "" }')); var_dump(json_decode('{ "": "": "" } }')); ?> -===DONE=== --EXPECTF-- NULL NULL @@ -65,4 +64,3 @@ object(stdClass)#%d (1) { } NULL NULL -===DONE=== diff --git a/ext/json/tests/bug68567.phpt b/ext/json/tests/bug68567.phpt index 064efa76ae5..4dbd83e1702 100644 --- a/ext/json/tests/bug68567.phpt +++ b/ext/json/tests/bug68567.phpt @@ -8,7 +8,5 @@ Bug #68567 JSON_PARTIAL_OUTPUT_ON_ERROR can result in JSON with null key var_dump(json_encode(array("\x80" => 1), JSON_PARTIAL_OUTPUT_ON_ERROR)); ?> -===DONE=== --EXPECT-- string(6) "{"":1}" -===DONE=== diff --git a/ext/json/tests/bug68817.phpt b/ext/json/tests/bug68817.phpt index 99fc5f79548..33d0c84b295 100644 --- a/ext/json/tests/bug68817.phpt +++ b/ext/json/tests/bug68817.phpt @@ -8,10 +8,8 @@ Bug #68817 (Null pointer deference) var_dump(json_decode('[""]')); ?> -===DONE=== --EXPECT-- array(1) { [0]=> string(0) "" } -===DONE=== diff --git a/ext/json/tests/json_decode_basic.phpt b/ext/json/tests/json_decode_basic.phpt index d1169eb7777..d9125ed7ad2 100644 --- a/ext/json/tests/json_decode_basic.phpt +++ b/ext/json/tests/json_decode_basic.phpt @@ -39,7 +39,6 @@ foreach($inputs as $input) { } ?> -===Done=== --EXPECTF-- *** Testing json_decode() : basic functionality *** -- Iteration 1 -- @@ -175,4 +174,3 @@ object(stdClass)#%d (0) { } array(0) { } -===Done=== diff --git a/ext/json/tests/json_decode_error.phpt b/ext/json/tests/json_decode_error.phpt index 4089a7897f5..4584b7fa5c4 100644 --- a/ext/json/tests/json_decode_error.phpt +++ b/ext/json/tests/json_decode_error.phpt @@ -10,7 +10,6 @@ echo "\n-- Testing json_decode() function with depth below 0 --\n"; var_dump(json_decode('"abc"', true, -1)); ?> -===Done=== --EXPECTF-- *** Testing json_decode() : error conditions *** @@ -18,4 +17,3 @@ var_dump(json_decode('"abc"', true, -1)); Warning: json_decode(): Depth must be greater than zero in %s on line %d NULL -===Done=== diff --git a/ext/json/tests/json_encode_basic.phpt b/ext/json/tests/json_encode_basic.phpt index 119c04f106f..de65600f389 100644 --- a/ext/json/tests/json_encode_basic.phpt +++ b/ext/json/tests/json_encode_basic.phpt @@ -86,7 +86,6 @@ foreach($inputs as $input) { } ?> -===Done=== --EXPECT-- *** Testing json_encode() : basic functionality *** -- Iteration 1 -- @@ -143,4 +142,3 @@ string(4) "null" bool(false) -- Iteration 27 -- string(82) "{"MyInt":99,"MyFloat":123.45,"MyBool":true,"MyNull":null,"MyString":"Hello World"}" -===Done=== diff --git a/ext/json/tests/json_encode_basic_utf8.phpt b/ext/json/tests/json_encode_basic_utf8.phpt index ac5000d9fd7..76fd268b734 100644 --- a/ext/json/tests/json_encode_basic_utf8.phpt +++ b/ext/json/tests/json_encode_basic_utf8.phpt @@ -10,8 +10,6 @@ $utf8_string = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJ var_dump(json_encode($utf8_string)); ?> -===Done=== --EXPECT-- *** Testing json_encode() : basic functionality with UTF-8 input*** string(103) ""\u65e5\u672c\u8a9e\u30c6\u30ad\u30b9\u30c8\u3067\u3059\u300201234\uff15\uff16\uff17\uff18\uff19\u3002"" -===Done=== diff --git a/ext/ldap/tests/bug48441.phpt b/ext/ldap/tests/bug48441.phpt index 4f212e7402a..fa2f2ee023a 100644 --- a/ext/ldap/tests/bug48441.phpt +++ b/ext/ldap/tests/bug48441.phpt @@ -30,7 +30,6 @@ var_dump( ldap_get_entries($link, $result) ); ?> -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- int(2) } -===DONE=== diff --git a/ext/ldap/tests/ldap_add_basic.phpt b/ext/ldap/tests/ldap_add_basic.phpt index 46fd6578db6..7e7a255c915 100644 --- a/ext/ldap/tests/ldap_add_basic.phpt +++ b/ext/ldap/tests/ldap_add_basic.phpt @@ -27,7 +27,6 @@ var_dump( ) ); ?> -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- -===DONE=== --EXPECT-- bool(true) -===DONE=== diff --git a/ext/ldap/tests/ldap_bind_error.phpt b/ext/ldap/tests/ldap_bind_error.phpt index ee16908b576..3970bbdf85f 100644 --- a/ext/ldap/tests/ldap_bind_error.phpt +++ b/ext/ldap/tests/ldap_bind_error.phpt @@ -19,11 +19,9 @@ var_dump(ldap_bind($link, $user, "ThisIsNotCorrect$passwd")); // Invalid DN syntax var_dump(ldap_bind($link, "unexistingProperty=weirdValue,$user", $passwd)); ?> -===DONE=== --EXPECTF-- Warning: ldap_bind(): Unable to bind to server: Invalid credentials in %s on line %d bool(false) Warning: ldap_bind(): Unable to bind to server: Invalid DN syntax in %s on line %d bool(false) -===DONE=== diff --git a/ext/ldap/tests/ldap_bind_ext.phpt b/ext/ldap/tests/ldap_bind_ext.phpt index 3dd5903d806..0e8fb52d025 100644 --- a/ext/ldap/tests/ldap_bind_ext.phpt +++ b/ext/ldap/tests/ldap_bind_ext.phpt @@ -43,7 +43,6 @@ var_dump( $ctrls ); ?> -===DONE=== --EXPECTF-- resource(%d) of type (ldap result) bool(true) @@ -69,4 +68,3 @@ int(34) string(10) "invalid DN" array(0) { } -===DONE=== diff --git a/ext/ldap/tests/ldap_bind_variation.phpt b/ext/ldap/tests/ldap_bind_variation.phpt index 4aed3180ee1..6fa4c202f92 100644 --- a/ext/ldap/tests/ldap_bind_variation.phpt +++ b/ext/ldap/tests/ldap_bind_variation.phpt @@ -14,7 +14,5 @@ $link = ldap_connect($host, $port); ldap_set_option($link, LDAP_OPT_PROTOCOL_VERSION, $protocol_version); var_dump(ldap_bind($link, $user, $passwd)); ?> -===DONE=== --EXPECT-- bool(true) -===DONE=== diff --git a/ext/ldap/tests/ldap_compare_basic.phpt b/ext/ldap/tests/ldap_compare_basic.phpt index a8bb37f0040..a8b8c2b7b18 100644 --- a/ext/ldap/tests/ldap_compare_basic.phpt +++ b/ext/ldap/tests/ldap_compare_basic.phpt @@ -17,7 +17,6 @@ var_dump( ldap_compare($link, "cn=userA,$base", "telephoneNumber", "yy-yy-yy-yy-yy") ); ?> -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- -===DONE=== --EXPECTF-- resource(%d) of type (ldap link) -===DONE=== diff --git a/ext/ldap/tests/ldap_connect_error.phpt b/ext/ldap/tests/ldap_connect_error.phpt index 24561e15768..b8adcf1ded1 100644 --- a/ext/ldap/tests/ldap_connect_error.phpt +++ b/ext/ldap/tests/ldap_connect_error.phpt @@ -18,10 +18,8 @@ $links = array(); $links[0] = ldap_connect($host, $port); $links[1] = ldap_connect($host, $port); ?> -===DONE=== --EXPECTF-- Warning: ldap_connect(): Could not create session handle: %s in %s on line %d bool(false) Warning: ldap_connect(): Too many open links (1) in %s on line %d -===DONE=== diff --git a/ext/ldap/tests/ldap_connect_ldap_conf.phpt b/ext/ldap/tests/ldap_connect_ldap_conf.phpt index 86b17b56130..3c3c906f361 100644 --- a/ext/ldap/tests/ldap_connect_ldap_conf.phpt +++ b/ext/ldap/tests/ldap_connect_ldap_conf.phpt @@ -20,7 +20,5 @@ ldap_get_option($link, LDAP_OPT_HOST_NAME, $host); var_dump($host); unlink($conf); ?> -===DONE=== --EXPECT-- string(16) "example.com:3141" -===DONE=== diff --git a/ext/ldap/tests/ldap_connect_variation.phpt b/ext/ldap/tests/ldap_connect_variation.phpt index 09b07e77863..1405e0706f9 100644 --- a/ext/ldap/tests/ldap_connect_variation.phpt +++ b/ext/ldap/tests/ldap_connect_variation.phpt @@ -29,11 +29,9 @@ var_dump($link); $link = ldap_connect("nonexistent" . $host); var_dump($link); ?> -===DONE=== --EXPECTF-- resource(%d) of type (ldap link) resource(%d) of type (ldap link) resource(%d) of type (ldap link) resource(%d) of type (ldap link) resource(%d) of type (ldap link) -===DONE=== diff --git a/ext/ldap/tests/ldap_control_paged_results_variation1.phpt b/ext/ldap/tests/ldap_control_paged_results_variation1.phpt index 76084cfb4b7..fa5af01bd66 100644 --- a/ext/ldap/tests/ldap_control_paged_results_variation1.phpt +++ b/ext/ldap/tests/ldap_control_paged_results_variation1.phpt @@ -22,7 +22,6 @@ var_dump( ldap_get_entries($link, $result) ); ?> -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- string(5) "there" } -===DONE=== diff --git a/ext/ldap/tests/ldap_count_entries_basic.phpt b/ext/ldap/tests/ldap_count_entries_basic.phpt index 7eef9606146..01847f1b038 100644 --- a/ext/ldap/tests/ldap_count_entries_basic.phpt +++ b/ext/ldap/tests/ldap_count_entries_basic.phpt @@ -15,7 +15,6 @@ insert_dummy_data($link, $base); $result = ldap_search($link, "$base", "(objectclass=person)"); var_dump(ldap_count_entries($link, $result)); ?> -===DONE=== --CLEAN-- --EXPECT-- int(3) -===DONE=== diff --git a/ext/ldap/tests/ldap_delete_basic.phpt b/ext/ldap/tests/ldap_delete_basic.phpt index 84499f2a06a..65331771fb8 100644 --- a/ext/ldap/tests/ldap_delete_basic.phpt +++ b/ext/ldap/tests/ldap_delete_basic.phpt @@ -25,7 +25,6 @@ var_dump( @ldap_search($link, "dc=my-domain,$base", "(o=my-domain)") ); ?> -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- -===DONE=== --EXPECT-- string(14) "Protocol error" -===DONE=== diff --git a/ext/ldap/tests/ldap_errno_basic.phpt b/ext/ldap/tests/ldap_errno_basic.phpt index 58fa9387c05..9d2099c6e3f 100644 --- a/ext/ldap/tests/ldap_errno_basic.phpt +++ b/ext/ldap/tests/ldap_errno_basic.phpt @@ -24,7 +24,5 @@ var_dump( ldap_errno($link) ); ?> -===DONE=== --EXPECT-- int(34) -===DONE=== diff --git a/ext/ldap/tests/ldap_error_basic.phpt b/ext/ldap/tests/ldap_error_basic.phpt index ba42d1d32e2..4d866d5a445 100644 --- a/ext/ldap/tests/ldap_error_basic.phpt +++ b/ext/ldap/tests/ldap_error_basic.phpt @@ -24,7 +24,5 @@ var_dump( ldap_error($link) ); ?> -===DONE=== --EXPECT-- string(17) "Invalid DN syntax" -===DONE=== diff --git a/ext/ldap/tests/ldap_exop.phpt b/ext/ldap/tests/ldap_exop.phpt index f5543c0e4ed..7d47a9812c1 100644 --- a/ext/ldap/tests/ldap_exop.phpt +++ b/ext/ldap/tests/ldap_exop.phpt @@ -55,7 +55,6 @@ var_dump( test_bind($host, $port, "cn=userA,$base", $genpw, $protocol_version) ); ?> -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- --EXPECT-- int(1234) -===DONE=== diff --git a/ext/ldap/tests/ldap_exop_whoami.phpt b/ext/ldap/tests/ldap_exop_whoami.phpt index 368038f3bd8..2c71848b002 100644 --- a/ext/ldap/tests/ldap_exop_whoami.phpt +++ b/ext/ldap/tests/ldap_exop_whoami.phpt @@ -17,7 +17,6 @@ var_dump( ldap_exop_whoami($link) ); ?> -===DONE=== --CLEAN-- --EXPECTF-- string(%d) "dn:%s" -===DONE=== diff --git a/ext/ldap/tests/ldap_first_attribute_basic.phpt b/ext/ldap/tests/ldap_first_attribute_basic.phpt index eec67c5f900..e87b70c474e 100644 --- a/ext/ldap/tests/ldap_first_attribute_basic.phpt +++ b/ext/ldap/tests/ldap_first_attribute_basic.phpt @@ -18,7 +18,6 @@ var_dump( ldap_first_attribute($link, $entry) ); ?> -===DONE=== --CLEAN-- --EXPECT-- string(11) "objectClass" -===DONE=== diff --git a/ext/ldap/tests/ldap_first_attribute_error.phpt b/ext/ldap/tests/ldap_first_attribute_error.phpt index 9737df96c65..79138669bc9 100644 --- a/ext/ldap/tests/ldap_first_attribute_error.phpt +++ b/ext/ldap/tests/ldap_first_attribute_error.phpt @@ -16,7 +16,5 @@ try { echo $e->getMessage(), "\n"; } ?> -===DONE=== --EXPECT-- ldap_first_attribute(): supplied resource is not a valid ldap result entry resource -===DONE=== diff --git a/ext/ldap/tests/ldap_first_entry_basic.phpt b/ext/ldap/tests/ldap_first_entry_basic.phpt index 5ba6ac42a42..99b79e4d290 100644 --- a/ext/ldap/tests/ldap_first_entry_basic.phpt +++ b/ext/ldap/tests/ldap_first_entry_basic.phpt @@ -18,7 +18,6 @@ var_dump( ldap_get_values($link, $entry, 'sn') ); ?> -===DONE=== --CLEAN-- int(1) } -===DONE=== diff --git a/ext/ldap/tests/ldap_first_reference_basic.phpt b/ext/ldap/tests/ldap_first_reference_basic.phpt index 9c83c9127d3..0e41ee24586 100644 --- a/ext/ldap/tests/ldap_first_reference_basic.phpt +++ b/ext/ldap/tests/ldap_first_reference_basic.phpt @@ -23,7 +23,6 @@ $refs = null; ldap_parse_reference($link, $ref, $refs); var_dump($refs); ?> -===DONE=== --CLEAN-- string(%d) "cn=userA,%s" } -===DONE=== diff --git a/ext/ldap/tests/ldap_free_result_basic.phpt b/ext/ldap/tests/ldap_free_result_basic.phpt index ff2f5402c31..dead9a62d3b 100644 --- a/ext/ldap/tests/ldap_free_result_basic.phpt +++ b/ext/ldap/tests/ldap_free_result_basic.phpt @@ -15,7 +15,6 @@ insert_dummy_data($link, $base); $result = ldap_search($link, "$base", "(objectclass=person)"); var_dump(ldap_free_result($result)); ?> -===DONE=== --CLEAN-- --EXPECT-- bool(true) -===DONE=== diff --git a/ext/ldap/tests/ldap_get_attributes_basic.phpt b/ext/ldap/tests/ldap_get_attributes_basic.phpt index b831a7f1643..8cb374b27fa 100644 --- a/ext/ldap/tests/ldap_get_attributes_basic.phpt +++ b/ext/ldap/tests/ldap_get_attributes_basic.phpt @@ -18,7 +18,6 @@ var_dump( ldap_get_attributes($link, $entry) ); ?> -===DONE=== --CLEAN-- int(2) } -===DONE=== diff --git a/ext/ldap/tests/ldap_get_dn_basic.phpt b/ext/ldap/tests/ldap_get_dn_basic.phpt index 38c252c5bb7..0cb6c833a6f 100644 --- a/ext/ldap/tests/ldap_get_dn_basic.phpt +++ b/ext/ldap/tests/ldap_get_dn_basic.phpt @@ -18,7 +18,6 @@ var_dump( ldap_get_dn($link, $entry) ); ?> -===DONE=== --CLEAN-- --EXPECTF-- string(%d) "%s" -===DONE=== diff --git a/ext/ldap/tests/ldap_get_entries_basic.phpt b/ext/ldap/tests/ldap_get_entries_basic.phpt index 3efa818ee20..e1806fca690 100644 --- a/ext/ldap/tests/ldap_get_entries_basic.phpt +++ b/ext/ldap/tests/ldap_get_entries_basic.phpt @@ -20,7 +20,6 @@ var_dump( ) ); ?> -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- int(0) } -===DONE=== diff --git a/ext/ldap/tests/ldap_get_option_basic.phpt b/ext/ldap/tests/ldap_get_option_basic.phpt index 3136a5acb8d..9bbaf3e41db 100644 --- a/ext/ldap/tests/ldap_get_option_basic.phpt +++ b/ext/ldap/tests/ldap_get_option_basic.phpt @@ -18,8 +18,6 @@ var_dump( $option ); ?> -===DONE=== --EXPECT-- bool(true) int(3) -===DONE=== diff --git a/ext/ldap/tests/ldap_get_option_controls.phpt b/ext/ldap/tests/ldap_get_option_controls.phpt index abe35497d6e..1a6e18c4c4c 100644 --- a/ext/ldap/tests/ldap_get_option_controls.phpt +++ b/ext/ldap/tests/ldap_get_option_controls.phpt @@ -58,7 +58,6 @@ var_dump( ldap_get_option($link, LDAP_OPT_SERVER_CONTROLS, $controls_get) ); ?> -===DONE=== --CLEAN-- -===DONE=== --EXPECT-- bool(true) bool(false) -===DONE=== diff --git a/ext/ldap/tests/ldap_get_option_variation.phpt b/ext/ldap/tests/ldap_get_option_variation.phpt index a18318849fc..6852af3b3d1 100644 --- a/ext/ldap/tests/ldap_get_option_variation.phpt +++ b/ext/ldap/tests/ldap_get_option_variation.phpt @@ -48,7 +48,6 @@ var_dump( $option ); ?> -===DONE=== --EXPECT-- bool(true) int(0) @@ -106,4 +105,3 @@ array(2) { string(5) "magic" } } -===DONE=== diff --git a/ext/ldap/tests/ldap_get_values_len_basic.phpt b/ext/ldap/tests/ldap_get_values_len_basic.phpt index 33084f48ab1..af3fcd60ced 100644 --- a/ext/ldap/tests/ldap_get_values_len_basic.phpt +++ b/ext/ldap/tests/ldap_get_values_len_basic.phpt @@ -18,7 +18,6 @@ var_dump( ldap_get_values_len($link, $entry, "o") ); ?> -===DONE=== --CLEAN-- int(1) } -===DONE=== diff --git a/ext/ldap/tests/ldap_get_values_len_error.phpt b/ext/ldap/tests/ldap_get_values_len_error.phpt index 8040dd6dab2..df1a3800826 100644 --- a/ext/ldap/tests/ldap_get_values_len_error.phpt +++ b/ext/ldap/tests/ldap_get_values_len_error.phpt @@ -17,7 +17,6 @@ $entry = ldap_first_entry($link, $result); var_dump(ldap_get_values_len($link, $entry, "inexistentAttribute")); ?> -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- int(0) } -===DONE=== diff --git a/ext/ldap/tests/ldap_mod_del_error.phpt b/ext/ldap/tests/ldap_mod_del_error.phpt index 1cdf18a0c57..6df125c1b78 100644 --- a/ext/ldap/tests/ldap_mod_del_error.phpt +++ b/ext/ldap/tests/ldap_mod_del_error.phpt @@ -21,7 +21,6 @@ var_dump(ldap_mod_del($link, "weirdAttribute=val", array())); // Invalid attributes var_dump(ldap_mod_del($link, "$base", array('dc'))); ?> -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- int(0) } -===DONE=== diff --git a/ext/ldap/tests/ldap_mod_replace_basic.phpt b/ext/ldap/tests/ldap_mod_replace_basic.phpt index 8e9fd4dcad5..6e47158db13 100644 --- a/ext/ldap/tests/ldap_mod_replace_basic.phpt +++ b/ext/ldap/tests/ldap_mod_replace_basic.phpt @@ -25,7 +25,6 @@ var_dump( ) ); ?> -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- string(%d) "cn=userB,%s" } -===DONE=== diff --git a/ext/ldap/tests/ldap_option_reqcert_basic.phpt b/ext/ldap/tests/ldap_option_reqcert_basic.phpt index 04ced6ecbec..e774a0e03f8 100644 --- a/ext/ldap/tests/ldap_option_reqcert_basic.phpt +++ b/ext/ldap/tests/ldap_option_reqcert_basic.phpt @@ -18,7 +18,5 @@ ldap_set_option($link, LDAP_OPT_PROTOCOL_VERSION, $protocol_version); var_dump(@ldap_bind($link, $user, $passwd)); ?> -===DONE=== --EXPECT-- bool(true) -===DONE=== diff --git a/ext/ldap/tests/ldap_option_reqcert_error.phpt b/ext/ldap/tests/ldap_option_reqcert_error.phpt index 477c4aba399..9f45e7f6042 100644 --- a/ext/ldap/tests/ldap_option_reqcert_error.phpt +++ b/ext/ldap/tests/ldap_option_reqcert_error.phpt @@ -18,7 +18,5 @@ ldap_set_option($link, LDAP_OPT_PROTOCOL_VERSION, $protocol_version); var_dump(@ldap_bind($link, $user, $passwd)); ?> -===DONE=== --EXPECT-- bool(true) -===DONE=== diff --git a/ext/ldap/tests/ldap_parse_reference_basic.phpt b/ext/ldap/tests/ldap_parse_reference_basic.phpt index 249f2959f3c..27b43cc084b 100644 --- a/ext/ldap/tests/ldap_parse_reference_basic.phpt +++ b/ext/ldap/tests/ldap_parse_reference_basic.phpt @@ -25,7 +25,6 @@ var_dump( $refs ); ?> -===DONE=== --CLEAN-- string(%d) "cn=userA,%s" } -===DONE=== diff --git a/ext/ldap/tests/ldap_parse_result_basic.phpt b/ext/ldap/tests/ldap_parse_result_basic.phpt index e2a975d5b19..c9bdc6cbcaf 100644 --- a/ext/ldap/tests/ldap_parse_result_basic.phpt +++ b/ext/ldap/tests/ldap_parse_result_basic.phpt @@ -24,7 +24,6 @@ var_dump( $errcode, $dn, $errmsg, $refs ); ?> -===DONE=== --CLEAN-- string(%d) "cn=userA,%s" } -===DONE=== diff --git a/ext/ldap/tests/ldap_parse_result_controls.phpt b/ext/ldap/tests/ldap_parse_result_controls.phpt index 8ce2328d2fe..76dc2fcb157 100644 --- a/ext/ldap/tests/ldap_parse_result_controls.phpt +++ b/ext/ldap/tests/ldap_parse_result_controls.phpt @@ -28,7 +28,6 @@ var_dump( ldap_get_entries($link, $result)['count'] ); ?> -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- -===DONE=== --EXPECT-- bool(true) -===DONE=== diff --git a/ext/ldap/tests/ldap_sasl_bind_error.phpt b/ext/ldap/tests/ldap_sasl_bind_error.phpt index 9feb912c7ee..eb68370ff68 100644 --- a/ext/ldap/tests/ldap_sasl_bind_error.phpt +++ b/ext/ldap/tests/ldap_sasl_bind_error.phpt @@ -28,7 +28,6 @@ var_dump(ldap_sasl_bind($link, null, $passwd, 'DIGEST-MD5', "realm", "Manager", // Invalid DN syntax var_dump(ldap_sasl_bind($link, "unexistingProperty=weirdValue,$user", $passwd)); ?> -===DONE=== --EXPECTF-- Warning: ldap_sasl_bind(): Unable to bind to server: Invalid DN syntax in %s on line %d bool(false) @@ -44,4 +43,3 @@ bool(false) Warning: ldap_sasl_bind(): Unable to bind to server: Invalid DN syntax in %s on line %d bool(false) -===DONE=== diff --git a/ext/ldap/tests/ldap_search_basic.phpt b/ext/ldap/tests/ldap_search_basic.phpt index 618366b1a18..8c77a63e8a3 100644 --- a/ext/ldap/tests/ldap_search_basic.phpt +++ b/ext/ldap/tests/ldap_search_basic.phpt @@ -21,7 +21,6 @@ var_dump( ldap_get_entries($link, $result) ); ?> -===DONE=== --CLEAN-- -===DONE=== --EXPECTF-- Warning: ldap_search(): Search: No such object in %s on line %d bool(false) @@ -46,4 +45,3 @@ bool(false) Warning: ldap_search(): Filter must either be a string, or an array with the same number of elements as the links array in %s on line %d bool(false) -===DONE=== diff --git a/ext/ldap/tests/ldap_search_overrides.phpt b/ext/ldap/tests/ldap_search_overrides.phpt index 2434fe5db24..e2d51079f4f 100644 --- a/ext/ldap/tests/ldap_search_overrides.phpt +++ b/ext/ldap/tests/ldap_search_overrides.phpt @@ -34,7 +34,6 @@ var_dump( $option ); ?> -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- int(0) } -===DONE=== diff --git a/ext/ldap/tests/ldap_set_option_basic.phpt b/ext/ldap/tests/ldap_set_option_basic.phpt index de25e59c21f..161f2b5d430 100644 --- a/ext/ldap/tests/ldap_set_option_basic.phpt +++ b/ext/ldap/tests/ldap_set_option_basic.phpt @@ -16,8 +16,6 @@ var_dump(ldap_set_option($link, LDAP_OPT_PROTOCOL_VERSION, $protocol_version)); ldap_get_option($link, LDAP_OPT_PROTOCOL_VERSION, $option); var_dump($option); ?> -===DONE=== --EXPECT-- bool(true) int(3) -===DONE=== diff --git a/ext/ldap/tests/ldap_set_option_cafiles_basic.phpt b/ext/ldap/tests/ldap_set_option_cafiles_basic.phpt index ff93c9de009..492df3bc8b1 100644 --- a/ext/ldap/tests/ldap_set_option_cafiles_basic.phpt +++ b/ext/ldap/tests/ldap_set_option_cafiles_basic.phpt @@ -24,7 +24,6 @@ foreach([ var_dump($optionval); } ?> -===DONE=== --EXPECT-- bool(true) string(8) "/foo/bar" @@ -38,4 +37,3 @@ bool(true) string(8) "/foo/bar" bool(true) string(8) "/foo/bar" -===DONE=== diff --git a/ext/ldap/tests/ldap_set_option_ciphersuite_basic.phpt b/ext/ldap/tests/ldap_set_option_ciphersuite_basic.phpt index 9b47a826e5f..f80da7c2dd3 100644 --- a/ext/ldap/tests/ldap_set_option_ciphersuite_basic.phpt +++ b/ext/ldap/tests/ldap_set_option_ciphersuite_basic.phpt @@ -15,8 +15,6 @@ var_dump($result); ldap_get_option($link, LDAP_OPT_X_TLS_CIPHER_SUITE, $optionval); var_dump($optionval); ?> -===DONE=== --EXPECT-- bool(true) string(4) "3DES" -===DONE=== diff --git a/ext/ldap/tests/ldap_set_option_crlcheck_basic.phpt b/ext/ldap/tests/ldap_set_option_crlcheck_basic.phpt index a9aeec0a7bd..f8e3c8cf406 100644 --- a/ext/ldap/tests/ldap_set_option_crlcheck_basic.phpt +++ b/ext/ldap/tests/ldap_set_option_crlcheck_basic.phpt @@ -29,7 +29,6 @@ foreach([ var_dump($optionval); } ?> -===DONE=== --EXPECT-- bool(true) int(0) @@ -37,4 +36,3 @@ bool(true) int(1) bool(true) int(2) -===DONE=== diff --git a/ext/ldap/tests/ldap_set_option_crlcheck_error.phpt b/ext/ldap/tests/ldap_set_option_crlcheck_error.phpt index ea5318344ae..053ba41c617 100644 --- a/ext/ldap/tests/ldap_set_option_crlcheck_error.phpt +++ b/ext/ldap/tests/ldap_set_option_crlcheck_error.phpt @@ -11,7 +11,5 @@ $link = ldap_connect($host, $port); $result = ldap_set_option($link, LDAP_OPT_X_TLS_CRLCHECK, 9001); var_dump($result); ?> -===DONE=== --EXPECT-- bool(false) -===DONE=== diff --git a/ext/ldap/tests/ldap_set_option_error.phpt b/ext/ldap/tests/ldap_set_option_error.phpt index a67f972293c..e7ef6bac6bd 100644 --- a/ext/ldap/tests/ldap_set_option_error.phpt +++ b/ext/ldap/tests/ldap_set_option_error.phpt @@ -30,7 +30,6 @@ foreach ($controls as $control) var_dump(ldap_set_option($link, 999999, 999999)); ?> -===DONE=== --EXPECTF-- bool(false) @@ -43,4 +42,3 @@ bool(false) Warning: ldap_set_option(): Expected array value for this option in %s on line %d bool(false) bool(false) -===DONE=== diff --git a/ext/ldap/tests/ldap_set_option_keepalive_basic.phpt b/ext/ldap/tests/ldap_set_option_keepalive_basic.phpt index 211644b4440..865345dc4dd 100644 --- a/ext/ldap/tests/ldap_set_option_keepalive_basic.phpt +++ b/ext/ldap/tests/ldap_set_option_keepalive_basic.phpt @@ -21,7 +21,6 @@ foreach([ var_dump($optionval); } ?> -===DONE=== --EXPECT-- bool(true) int(5) @@ -29,4 +28,3 @@ bool(true) int(5) bool(true) int(5) -===DONE=== diff --git a/ext/ldap/tests/ldap_set_option_reqcert_basic.phpt b/ext/ldap/tests/ldap_set_option_reqcert_basic.phpt index a8d23b95921..220bb2ff31e 100644 --- a/ext/ldap/tests/ldap_set_option_reqcert_basic.phpt +++ b/ext/ldap/tests/ldap_set_option_reqcert_basic.phpt @@ -23,7 +23,6 @@ foreach([ var_dump($optionval); } ?> -===DONE=== --EXPECT-- bool(true) int(0) @@ -35,4 +34,3 @@ bool(true) int(3) bool(true) int(4) -===DONE=== diff --git a/ext/ldap/tests/ldap_set_option_reqcert_error.phpt b/ext/ldap/tests/ldap_set_option_reqcert_error.phpt index b59879b97a0..b23d445955e 100644 --- a/ext/ldap/tests/ldap_set_option_reqcert_error.phpt +++ b/ext/ldap/tests/ldap_set_option_reqcert_error.phpt @@ -11,7 +11,5 @@ $link = ldap_connect($host, $port); $result = ldap_set_option($link, LDAP_OPT_X_TLS_REQUIRE_CERT, 9001); var_dump($result); ?> -===DONE=== --EXPECT-- bool(false) -===DONE=== diff --git a/ext/ldap/tests/ldap_set_option_tls_protocol_min_basic.phpt b/ext/ldap/tests/ldap_set_option_tls_protocol_min_basic.phpt index 81360d0759a..796cb8c7e18 100644 --- a/ext/ldap/tests/ldap_set_option_tls_protocol_min_basic.phpt +++ b/ext/ldap/tests/ldap_set_option_tls_protocol_min_basic.phpt @@ -23,7 +23,6 @@ foreach([ var_dump($optionval); } ?> -===DONE=== --EXPECT-- bool(true) int(512) @@ -35,4 +34,3 @@ bool(true) int(770) bool(true) int(771) -===DONE=== diff --git a/ext/ldap/tests/ldap_set_option_variation.phpt b/ext/ldap/tests/ldap_set_option_variation.phpt index 4c0a1385525..f31473ef7a8 100644 --- a/ext/ldap/tests/ldap_set_option_variation.phpt +++ b/ext/ldap/tests/ldap_set_option_variation.phpt @@ -61,7 +61,6 @@ var_dump( ldap_get_option($link, LDAP_OPT_MATCHED_DN, $option); var_dump($option); ?> -===DONE=== --EXPECT-- bool(true) bool(true) @@ -119,4 +118,3 @@ array(2) { } bool(true) string(14) "dc=test,dc=com" -===DONE=== diff --git a/ext/ldap/tests/ldap_set_rebind_proc_basic.phpt b/ext/ldap/tests/ldap_set_rebind_proc_basic.phpt index 428b8d8f02f..cc1fc0c313a 100644 --- a/ext/ldap/tests/ldap_set_rebind_proc_basic.phpt +++ b/ext/ldap/tests/ldap_set_rebind_proc_basic.phpt @@ -27,8 +27,6 @@ $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version); var_dump(ldap_set_rebind_proc($link, "rebind_proc")); var_dump(ldap_set_rebind_proc($link, "")); ?> -===DONE=== --EXPECT-- bool(true) bool(true) -===DONE=== diff --git a/ext/ldap/tests/ldap_set_rebind_proc_error.phpt b/ext/ldap/tests/ldap_set_rebind_proc_error.phpt index c00891b9087..6bede460a49 100644 --- a/ext/ldap/tests/ldap_set_rebind_proc_error.phpt +++ b/ext/ldap/tests/ldap_set_rebind_proc_error.phpt @@ -35,8 +35,6 @@ function rebind_proc ($ds, $ldap_url) { $link = ldap_connect($host, $port); var_dump(ldap_set_rebind_proc($link, "rebind_proc_inexistent")); ?> -===DONE=== --EXPECTF-- Warning: ldap_set_rebind_proc(): Two arguments expected for 'rebind_proc_inexistent' to be a valid callback in %s on line %d bool(false) -===DONE=== diff --git a/ext/ldap/tests/ldap_start_tls_basic.phpt b/ext/ldap/tests/ldap_start_tls_basic.phpt index cdb50fd6c9e..a9e3c6c97ce 100644 --- a/ext/ldap/tests/ldap_start_tls_basic.phpt +++ b/ext/ldap/tests/ldap_start_tls_basic.phpt @@ -14,7 +14,5 @@ $link = ldap_connect($host, $port); ldap_set_option($link, LDAP_OPT_PROTOCOL_VERSION, $protocol_version); var_dump(ldap_start_tls($link)); ?> -===DONE=== --EXPECT-- bool(true) -===DONE=== diff --git a/ext/ldap/tests/ldap_unbind_basic.phpt b/ext/ldap/tests/ldap_unbind_basic.phpt index addfac5597f..622d2155462 100644 --- a/ext/ldap/tests/ldap_unbind_basic.phpt +++ b/ext/ldap/tests/ldap_unbind_basic.phpt @@ -14,7 +14,5 @@ $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version); var_dump(ldap_unbind($link)); ?> -===DONE=== --EXPECT-- bool(true) -===DONE=== diff --git a/ext/ldap/tests/ldap_unbind_variation.phpt b/ext/ldap/tests/ldap_unbind_variation.phpt index 60edb03b68b..3233e90b6fa 100644 --- a/ext/ldap/tests/ldap_unbind_variation.phpt +++ b/ext/ldap/tests/ldap_unbind_variation.phpt @@ -28,7 +28,5 @@ ldap_set_rebind_proc($link, "rebind_proc"); var_dump(ldap_unbind($link)); ?> -===DONE=== --EXPECT-- bool(true) -===DONE=== diff --git a/ext/mbstring/tests/bug62545.phpt b/ext/mbstring/tests/bug62545.phpt index 6a68d0dee87..49ecc559d81 100644 --- a/ext/mbstring/tests/bug62545.phpt +++ b/ext/mbstring/tests/bug62545.phpt @@ -11,8 +11,6 @@ var_dump( bin2hex(mb_convert_encoding("\x81\x8d\x8f\x90\x9d", 'UTF-8', 'Windows-1252')) ); ?> -===DONE=== --EXPECT-- string(6) "efbfbd" string(30) "efbfbdefbfbdefbfbdefbfbdefbfbd" -===DONE=== diff --git a/ext/mbstring/tests/bug66797.phpt b/ext/mbstring/tests/bug66797.phpt index 3709dc2bb27..47e8c3a1a4e 100644 --- a/ext/mbstring/tests/bug66797.phpt +++ b/ext/mbstring/tests/bug66797.phpt @@ -14,10 +14,8 @@ var_dump( mb_substr('bar', 0x100000000, 1) ); ?> -==DONE== --EXPECT-- string(3) "bar" string(3) "bar" string(0) "" string(0) "" -==DONE== diff --git a/ext/mbstring/tests/bug76704.phpt b/ext/mbstring/tests/bug76704.phpt index 502f7e3ef6c..0b644609433 100644 --- a/ext/mbstring/tests/bug76704.phpt +++ b/ext/mbstring/tests/bug76704.phpt @@ -9,8 +9,6 @@ if (!extension_loaded('mbstring')) die('skip mbstring extension not available'); var_dump(mb_detect_order('Foo, UTF-8')); var_dump(mb_detect_order(['Foo', 'UTF-8'])) ?> -===DONE=== --EXPECT-- bool(false) bool(false) -===DONE=== diff --git a/ext/mbstring/tests/htmlent.phpt b/ext/mbstring/tests/htmlent.phpt index 50235b2fedf..23ac68ba98f 100644 --- a/ext/mbstring/tests/htmlent.phpt +++ b/ext/mbstring/tests/htmlent.phpt @@ -31,11 +31,9 @@ filter.default=unsafe_raw -===DONE=== --EXPECT-- HTML-ENTITIES>UTF-8>HTML-ENTITIES Array ( [test] => &@AB€‚äöü€⟨⟩ ) -===DONE=== diff --git a/ext/mbstring/tests/mb_decode_mimeheader_basic.phpt b/ext/mbstring/tests/mb_decode_mimeheader_basic.phpt index 39bea621fe5..fb5cdefc78e 100644 --- a/ext/mbstring/tests/mb_decode_mimeheader_basic.phpt +++ b/ext/mbstring/tests/mb_decode_mimeheader_basic.phpt @@ -27,9 +27,7 @@ $b = mb_decode_mimeheader($a); var_dump(bin2hex($b)); ?> -===DONE=== --EXPECT-- *** Testing mb_decode_mimeheader() : basic functionality *** string(60) "e697a5e69cace8aa9ee38386e382ade382b9e38388e381a7e38199e38082" string(60) "e697a5e69cace8aa9ee38386e382ade382b9e38388e381a7e38199e38082" -===DONE=== diff --git a/ext/mbstring/tests/mb_decode_mimeheader_variation2.phpt b/ext/mbstring/tests/mb_decode_mimeheader_variation2.phpt index 33c022b0871..b7518b21501 100644 --- a/ext/mbstring/tests/mb_decode_mimeheader_variation2.phpt +++ b/ext/mbstring/tests/mb_decode_mimeheader_variation2.phpt @@ -39,7 +39,6 @@ $encoded_words = array( } ?> -===DONE=== --EXPECT-- *** Testing mb_decode_mimeheader() : variation *** string(106) "e697a5e69cace8aa9ee38386e382ade382b9e38388e381a7e38199e380823031323334efbc95efbc96efbc97efbc98efbc99e38082" @@ -48,4 +47,3 @@ string(106) "e697a5e69cace8aa9ee38386e382ade382b9e38388e381a7e38199e380823031323 string(106) "e697a5e69cace8aa9ee38386e382ade382b9e38388e381a7e38199e380823031323334efbc95efbc96efbc97efbc98efbc99e38082" string(106) "e697a5e69cace8aa9ee38386e382ade382b9e38388e381a7e38199e380823031323334efbc95efbc96efbc97efbc98efbc99e38082" string(106) "e697a5e69cace8aa9ee38386e382ade382b9e38388e381a7e38199e380823031323334efbc95efbc96efbc97efbc98efbc99e38082" -===DONE=== diff --git a/ext/mbstring/tests/mb_decode_mimeheader_variation3.phpt b/ext/mbstring/tests/mb_decode_mimeheader_variation3.phpt index 6f5c8b9c534..8836463a396 100644 --- a/ext/mbstring/tests/mb_decode_mimeheader_variation3.phpt +++ b/ext/mbstring/tests/mb_decode_mimeheader_variation3.phpt @@ -22,8 +22,6 @@ var_dump(bin2hex(mb_decode_mimeheader($encoded_word))); ?> -===DONE=== --EXPECT-- *** Testing mb_decode_mimeheader() : variation *** string(48) "e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f3f4f5f6f7f8f9" -===DONE=== diff --git a/ext/mbstring/tests/mb_ereg1.phpt b/ext/mbstring/tests/mb_ereg1.phpt index 05b34865450..0170e796a3f 100644 --- a/ext/mbstring/tests/mb_ereg1.phpt +++ b/ext/mbstring/tests/mb_ereg1.phpt @@ -22,7 +22,6 @@ foreach ($a as $args) { var_dump($args); } ?> -===DONE=== --EXPECTF-- bool(false) array(3) { @@ -76,4 +75,3 @@ array(3) { array(0) { } } -===DONE=== diff --git a/ext/mbstring/tests/mb_ereg_search_setpos.phpt b/ext/mbstring/tests/mb_ereg_search_setpos.phpt index 5b76ad0d281..bd7d3ea060b 100644 --- a/ext/mbstring/tests/mb_ereg_search_setpos.phpt +++ b/ext/mbstring/tests/mb_ereg_search_setpos.phpt @@ -22,7 +22,6 @@ foreach($positions as $pos) { var_dump(mb_ereg_search_getpos()); } ?> -==DONE== --EXPECTF-- bool(true) @@ -66,4 +65,3 @@ int(0) Warning: mb_ereg_search_setpos(): Position is out of range in %s on line %d bool(false) int(0) -==DONE== diff --git a/ext/mbstring/tests/mb_internal_encoding_ini_basic2.phpt b/ext/mbstring/tests/mb_internal_encoding_ini_basic2.phpt index 241e1a69294..af9322c8af5 100644 --- a/ext/mbstring/tests/mb_internal_encoding_ini_basic2.phpt +++ b/ext/mbstring/tests/mb_internal_encoding_ini_basic2.phpt @@ -19,11 +19,9 @@ echo mb_internal_encoding()."\n"; echo ini_get('mbstring.internal_encoding')."\n"; ?> -===DONE=== --EXPECT-- *** Testing INI mbstring.internal_encoding : basic functionality *** ISO-8859-7 ISO-8859-7 UTF-8 ISO-8859-7 -===DONE=== diff --git a/ext/mbstring/tests/mb_str_functions_opt-parameter.phpt b/ext/mbstring/tests/mb_str_functions_opt-parameter.phpt index 6219e585eb7..fc99a487472 100644 --- a/ext/mbstring/tests/mb_str_functions_opt-parameter.phpt +++ b/ext/mbstring/tests/mb_str_functions_opt-parameter.phpt @@ -16,7 +16,6 @@ echo mb_substr('foobarbaz', 6, null, 'UTF-8') . "\n"; echo mb_strcut('foobarbaz', 6, null, 'UTF-8') . "\n"; echo mb_strimwidth('foobar', 0, 3, null, 'UTF-8') . "\n"; ?> -==DONE== --EXPECT-- 1 2 @@ -29,4 +28,3 @@ baz baz baz foo -==DONE== diff --git a/ext/mbstring/tests/mb_stripos.phpt b/ext/mbstring/tests/mb_stripos.phpt index 067c3f28263..d80169edd3d 100644 --- a/ext/mbstring/tests/mb_stripos.phpt +++ b/ext/mbstring/tests/mb_stripos.phpt @@ -126,7 +126,6 @@ $r = mb_stripos($euc_jp, "\n"); ($r === FALSE) ? print "OK_NEWLINE\n" : print "NG_NEWLINE\n"; ?> -==DONE== --EXPECTF-- String len: 43 == POSITIVE OFFSET == @@ -201,4 +200,3 @@ OK_NEWLINE 0 OK_STR OK_NEWLINE -==DONE== diff --git a/ext/mbstring/tests/mb_stristr_basic.phpt b/ext/mbstring/tests/mb_stristr_basic.phpt index 22fc5b12785..e9ecd8c1d6d 100644 --- a/ext/mbstring/tests/mb_stristr_basic.phpt +++ b/ext/mbstring/tests/mb_stristr_basic.phpt @@ -48,7 +48,6 @@ $needle2 = base64_decode("zrzOvs6/"); var_dump(mb_stristr($string_mb, $needle2)); ?> -===DONE=== --EXPECT-- *** Testing mb_stristr() : basic functionality *** @@ -67,4 +66,3 @@ string(44) "ceb1ceb2ceb3ceb4ceb5ceb6ceb7ceb8ceb9cebacebb" -- Multibyte string: needle doesn't exist -- bool(false) -===DONE=== diff --git a/ext/mbstring/tests/mb_stristr_error2.phpt b/ext/mbstring/tests/mb_stristr_error2.phpt index d5abd115de3..1555f438c53 100644 --- a/ext/mbstring/tests/mb_stristr_error2.phpt +++ b/ext/mbstring/tests/mb_stristr_error2.phpt @@ -24,7 +24,6 @@ $part = true; var_dump( mb_stristr($haystack, $needle, $part, $encoding) ); ?> -===DONE=== --EXPECTF-- *** Testing mb_stristr() : error conditions *** @@ -32,4 +31,3 @@ var_dump( mb_stristr($haystack, $needle, $part, $encoding) ); Warning: mb_stristr(): Unknown encoding "unknown-encoding" in %s on line %d bool(false) -===DONE=== diff --git a/ext/mbstring/tests/mb_stristr_variation5.phpt b/ext/mbstring/tests/mb_stristr_variation5.phpt index 2fca14ff95f..b8161bd3e7e 100644 --- a/ext/mbstring/tests/mb_stristr_variation5.phpt +++ b/ext/mbstring/tests/mb_stristr_variation5.phpt @@ -47,7 +47,6 @@ var_dump(bin2hex(mb_stristr($string_mb, $needle_mb_mixed, false))); var_dump(bin2hex(mb_stristr($string_mb, $needle_mb_mixed, true))); ?> -===DONE=== --EXPECT-- *** Testing mb_stristr() : basic functionality *** @@ -66,4 +65,3 @@ string(54) "cebccebdcebece9fcea0cea120cebacebbce9cce9dcebecebfcea0" string(8) "cebacebb" string(54) "cebccebdcebece9fcea0cea120cebacebbce9cce9dcebecebfcea0" string(8) "cebacebb" -===DONE=== diff --git a/ext/mbstring/tests/mb_strpos.phpt b/ext/mbstring/tests/mb_strpos.phpt index c86b77e7de6..3b46a9b08f5 100644 --- a/ext/mbstring/tests/mb_strpos.phpt +++ b/ext/mbstring/tests/mb_strpos.phpt @@ -126,7 +126,6 @@ $r = mb_strpos($euc_jp, "\n"); ($r === FALSE) ? print "OK_NEWLINE\n" : print "NG_NEWLINE\n"; ?> -==DONE== --EXPECTF-- String len: 43 == POSITIVE OFFSET == @@ -201,4 +200,3 @@ OK_NEWLINE 0 OK_STR OK_NEWLINE -==DONE== diff --git a/ext/mbstring/tests/mb_strrchr_basic.phpt b/ext/mbstring/tests/mb_strrchr_basic.phpt index f13780cf3b1..faab33f8752 100644 --- a/ext/mbstring/tests/mb_strrchr_basic.phpt +++ b/ext/mbstring/tests/mb_strrchr_basic.phpt @@ -42,7 +42,6 @@ $needle2 = base64_decode('44GT44KT44Gr44Gh44Gv44CB5LiW55WM'); var_dump(mb_strrchr($string_mb, $needle2)); ?> -===DONE=== --EXPECT-- *** Testing mb_strrchr() : basic functionality *** @@ -61,4 +60,3 @@ string(0) "" -- Multibyte string: needle doesn't exist -- bool(false) -===DONE=== diff --git a/ext/mbstring/tests/mb_strrchr_error2.phpt b/ext/mbstring/tests/mb_strrchr_error2.phpt index e81e1befde9..35ca2c811f9 100644 --- a/ext/mbstring/tests/mb_strrchr_error2.phpt +++ b/ext/mbstring/tests/mb_strrchr_error2.phpt @@ -24,7 +24,6 @@ $part = true; var_dump( mb_strrchr($haystack, $needle, $part, $encoding) ); ?> -===DONE=== --EXPECTF-- *** Testing mb_strrchr() : error conditions *** @@ -32,4 +31,3 @@ var_dump( mb_strrchr($haystack, $needle, $part, $encoding) ); Warning: mb_strrchr(): Unknown encoding "unknown-encoding" in %s on line %d bool(false) -===DONE=== diff --git a/ext/mbstring/tests/mb_strrchr_variation5.phpt b/ext/mbstring/tests/mb_strrchr_variation5.phpt index 869fdde76f0..890e15a0808 100644 --- a/ext/mbstring/tests/mb_strrchr_variation5.phpt +++ b/ext/mbstring/tests/mb_strrchr_variation5.phpt @@ -47,7 +47,6 @@ else { ?> -===DONE=== --EXPECT-- *** Testing mb_strrchr() : variation *** -- Ascii data -- @@ -56,4 +55,3 @@ string(16) "616263646566207a" -- mb data in utf-8 -- string(30) "e8aa9ee38386e382ade382b9e38388" string(70) "e697a5e69cace8aa9ee38386e382ade382b9e383883334efbc95efbc96e697a5e69cac" -===DONE=== diff --git a/ext/mbstring/tests/mb_strrchr_variation6.phpt b/ext/mbstring/tests/mb_strrchr_variation6.phpt index 8b3108bf698..1003628fd1d 100644 --- a/ext/mbstring/tests/mb_strrchr_variation6.phpt +++ b/ext/mbstring/tests/mb_strrchr_variation6.phpt @@ -51,7 +51,6 @@ var_dump(mb_strrchr($string_mb, $needle_mb_mixed)); ?> -===DONE=== --EXPECT-- *** Testing mb_strrchr() : variation *** -- Ascii data -- @@ -62,4 +61,3 @@ bool(false) string(52) "cebccebdcebecebfcf80cf81cf83cf84cf85cf86cf87cf88cf89" bool(false) bool(false) -===DONE=== diff --git a/ext/mbstring/tests/mb_strrichr_basic.phpt b/ext/mbstring/tests/mb_strrichr_basic.phpt index 4f82f224749..e08b0e2b008 100644 --- a/ext/mbstring/tests/mb_strrichr_basic.phpt +++ b/ext/mbstring/tests/mb_strrichr_basic.phpt @@ -48,7 +48,6 @@ $needle2 = base64_decode('zrzOvs6/'); var_dump(mb_strrichr($string_mb, $needle2)); ?> -===DONE=== --EXPECT-- *** Testing mb_strrichr() : basic functionality *** @@ -67,4 +66,3 @@ string(44) "ceb1ceb2ceb3ceb4ceb5ceb6ceb7ceb8ceb9cebacebb" -- Multibyte string: needle doesn't exist -- bool(false) -===DONE=== diff --git a/ext/mbstring/tests/mb_strrichr_error2.phpt b/ext/mbstring/tests/mb_strrichr_error2.phpt index fec201e99a6..f21b9d8b4f4 100644 --- a/ext/mbstring/tests/mb_strrichr_error2.phpt +++ b/ext/mbstring/tests/mb_strrichr_error2.phpt @@ -24,7 +24,6 @@ $part = true; var_dump( mb_strrichr($haystack, $needle, $part, $encoding) ); ?> -===DONE=== --EXPECTF-- *** Testing mb_strrichr() : error conditions *** @@ -32,4 +31,3 @@ var_dump( mb_strrichr($haystack, $needle, $part, $encoding) ); Warning: mb_strrichr(): Unknown encoding "unknown-encoding" in %s on line %d bool(false) -===DONE=== diff --git a/ext/mbstring/tests/mb_strrichr_variation5.phpt b/ext/mbstring/tests/mb_strrichr_variation5.phpt index a6846cd1248..493603f86e9 100644 --- a/ext/mbstring/tests/mb_strrichr_variation5.phpt +++ b/ext/mbstring/tests/mb_strrichr_variation5.phpt @@ -47,7 +47,6 @@ var_dump(bin2hex(mb_strrichr($string_mb, $needle_mb_mixed, false))); var_dump(bin2hex(mb_strrichr($string_mb, $needle_mb_mixed, true))); ?> -===DONE=== --EXPECT-- *** Testing mb_strrichr() : basic functionality *** @@ -66,4 +65,3 @@ string(20) "ce9cce9dcebecebfcea0" string(42) "cebacebbcebccebdcebece9fcea0cea120cebacebb" string(20) "ce9cce9dcebecebfcea0" string(42) "cebacebbcebccebdcebece9fcea0cea120cebacebb" -===DONE=== diff --git a/ext/mbstring/tests/mb_strstr_basic.phpt b/ext/mbstring/tests/mb_strstr_basic.phpt index b7632020c5f..d887eb2e94c 100644 --- a/ext/mbstring/tests/mb_strstr_basic.phpt +++ b/ext/mbstring/tests/mb_strstr_basic.phpt @@ -42,7 +42,6 @@ $needle2 = base64_decode('44GT44KT44Gr44Gh44Gv44CB5LiW55WM'); var_dump(mb_strstr($string_mb, $needle2)); ?> -===DONE=== --EXPECT-- *** Testing mb_strstr() : basic functionality *** @@ -61,4 +60,3 @@ string(0) "" -- Multibyte string: needle doesn't exist -- bool(false) -===DONE=== diff --git a/ext/mbstring/tests/mb_strstr_error2.phpt b/ext/mbstring/tests/mb_strstr_error2.phpt index 81daccb432c..73a02377837 100644 --- a/ext/mbstring/tests/mb_strstr_error2.phpt +++ b/ext/mbstring/tests/mb_strstr_error2.phpt @@ -24,7 +24,6 @@ $part = true; var_dump( mb_strstr($haystack, $needle, $part, $encoding) ); ?> -===DONE=== --EXPECTF-- *** Testing mb_strstr() : error conditions *** @@ -32,4 +31,3 @@ var_dump( mb_strstr($haystack, $needle, $part, $encoding) ); Warning: mb_strstr(): Unknown encoding "unknown-encoding" in %s on line %d bool(false) -===DONE=== diff --git a/ext/mbstring/tests/mb_strstr_variation5.phpt b/ext/mbstring/tests/mb_strstr_variation5.phpt index 2b6fd238b85..6bfe954814b 100644 --- a/ext/mbstring/tests/mb_strstr_variation5.phpt +++ b/ext/mbstring/tests/mb_strstr_variation5.phpt @@ -47,7 +47,6 @@ else { ?> -===DONE=== --EXPECT-- *** Testing mb_strstr() : variation *** -- Ascii data -- @@ -56,4 +55,3 @@ string(2) "61" -- mb data in utf-8 -- string(88) "e8aa9ee38386e382ade382b9e383883334efbc95efbc96e697a5e69cace8aa9ee38386e382ade382b9e38388" string(12) "e697a5e69cac" -===DONE=== diff --git a/ext/mbstring/tests/mb_strstr_variation6.phpt b/ext/mbstring/tests/mb_strstr_variation6.phpt index c2438b771e9..97831ecb1b4 100644 --- a/ext/mbstring/tests/mb_strstr_variation6.phpt +++ b/ext/mbstring/tests/mb_strstr_variation6.phpt @@ -51,7 +51,6 @@ var_dump(mb_strstr($string_mb, $needle_mb_mixed)); ?> -===DONE=== --EXPECT-- *** Testing mb_strstr() : variation *** -- Ascii data -- @@ -62,4 +61,3 @@ bool(false) string(52) "cebccebdcebecebfcf80cf81cf83cf84cf85cf86cf87cf88cf89" bool(false) bool(false) -===DONE=== diff --git a/ext/mbstring/tests/mb_strtolower_error2.phpt b/ext/mbstring/tests/mb_strtolower_error2.phpt index 9a0aed0f01f..7da402ad6d7 100644 --- a/ext/mbstring/tests/mb_strtolower_error2.phpt +++ b/ext/mbstring/tests/mb_strtolower_error2.phpt @@ -23,10 +23,8 @@ $encoding = 'unknown-encoding'; var_dump( mb_strtolower($sourcestring, $encoding) ); ?> -===DONE=== --EXPECTF-- *** Testing mb_strtolower() : error conditions*** Warning: mb_strtolower(): Unknown encoding "unknown-encoding" in %s on line %d bool(false) -===DONE=== diff --git a/ext/mbstring/tests/mb_substitute_character_basic.phpt b/ext/mbstring/tests/mb_substitute_character_basic.phpt index 9fa3a5b1aca..63ae10f76c1 100644 --- a/ext/mbstring/tests/mb_substitute_character_basic.phpt +++ b/ext/mbstring/tests/mb_substitute_character_basic.phpt @@ -27,7 +27,6 @@ var_dump( mb_substitute_character() ); var_dump( mb_substitute_character("b") ); ?> -===DONE=== --EXPECTF-- *** Testing mb_substitute_character() : basic functionality *** int(63) @@ -40,4 +39,3 @@ string(4) "none" Warning: mb_substitute_character(): Unknown character in %s on line %d bool(false) -===DONE=== diff --git a/ext/mbstring/tests/mb_substitute_character_variation1.phpt b/ext/mbstring/tests/mb_substitute_character_variation1.phpt index 69912eca508..094b9b5818e 100644 --- a/ext/mbstring/tests/mb_substitute_character_variation1.phpt +++ b/ext/mbstring/tests/mb_substitute_character_variation1.phpt @@ -118,7 +118,6 @@ foreach($inputs as $key =>$value) { fclose($fp); ?> -===DONE=== --EXPECTF-- *** Testing mb_substitute_character() : usage variation *** @@ -227,4 +226,3 @@ bool(false) --unset var-- Error: 2 - mb_substitute_character(): Unknown character, %s(%d) bool(false) -===DONE=== diff --git a/ext/mbstring/tests/mb_substitute_character_variation2.phpt b/ext/mbstring/tests/mb_substitute_character_variation2.phpt index d447dc87d71..84b1d569c26 100644 --- a/ext/mbstring/tests/mb_substitute_character_variation2.phpt +++ b/ext/mbstring/tests/mb_substitute_character_variation2.phpt @@ -29,11 +29,9 @@ var_dump(bin2hex(mb_convert_encoding($string_mb, "ISO-8859-1", "UTF-8"))); ?> -===DONE=== --EXPECT-- *** Testing mb_substitute_character() : variation *** string(14) "3f3f3f3f3f3f3f" string(14) "42424242424242" string(0) "" string(14) "3f3f3f3f3f3f3f" -===DONE=== diff --git a/ext/mysqli/tests/bug72701.phpt b/ext/mysqli/tests/bug72701.phpt index f0eb1741722..8e6873aa33c 100644 --- a/ext/mysqli/tests/bug72701.phpt +++ b/ext/mysqli/tests/bug72701.phpt @@ -26,7 +26,5 @@ var_dump(preg_match(",(127.0.0.1|localhost) via .*,i", mysqli_get_host_info($con mysqli_close($con); ?> -==DONE== --EXPECT-- int(1) -==DONE== diff --git a/ext/mysqli/tests/bug74547.phpt b/ext/mysqli/tests/bug74547.phpt index 940357ad04f..c7075f07aaf 100644 --- a/ext/mysqli/tests/bug74547.phpt +++ b/ext/mysqli/tests/bug74547.phpt @@ -19,7 +19,5 @@ Bug #74547 mysqli::change_user() doesn't accept null as $database argument w/str mysqli_close($link); ?> -===DONE=== --EXPECT-- bool(true) -===DONE=== diff --git a/ext/mysqli/tests/bug75018.phpt b/ext/mysqli/tests/bug75018.phpt index 20d836166b6..3f719acd867 100644 --- a/ext/mysqli/tests/bug75018.phpt +++ b/ext/mysqli/tests/bug75018.phpt @@ -31,8 +31,6 @@ while ($row = $result->fetch_assoc()) { } ?> -==DONE== --EXPECT-- string(1) "0" string(4) "1365" -==DONE== diff --git a/ext/mysqli/tests/bug75434.phpt b/ext/mysqli/tests/bug75434.phpt index 751ad4eb8f4..1bc325e29f2 100644 --- a/ext/mysqli/tests/bug75434.phpt +++ b/ext/mysqli/tests/bug75434.phpt @@ -15,10 +15,8 @@ $rm = new ReflectionMethod('mysqli_result', 'fetch_all'); var_dump($rm->getNumberOfParameters()); var_dump($rm->getNumberOfRequiredParameters()); ?> -===DONE=== --EXPECT-- int(2) int(1) int(1) int(0) -===DONE=== diff --git a/ext/mysqli/tests/gracefull_fail_on_empty_result_set.phpt b/ext/mysqli/tests/gracefull_fail_on_empty_result_set.phpt index e37e22887a8..b075df94d34 100644 --- a/ext/mysqli/tests/gracefull_fail_on_empty_result_set.phpt +++ b/ext/mysqli/tests/gracefull_fail_on_empty_result_set.phpt @@ -24,7 +24,6 @@ require_once('skipifconnectfailure.inc'); $link->close(); ?> -=== DONE === --CLEAN-- int(1) } -=== DONE === diff --git a/ext/oci8/tests/b47243_1.phpt b/ext/oci8/tests/b47243_1.phpt index 8e0b0435185..826404021be 100644 --- a/ext/oci8/tests/b47243_1.phpt +++ b/ext/oci8/tests/b47243_1.phpt @@ -20,6 +20,5 @@ oci_fetch_all($s, $r); ?> ===DONE=== - --EXPECT-- ===DONE=== diff --git a/ext/oci8/tests/b47243_2.phpt b/ext/oci8/tests/b47243_2.phpt index faf61e6c791..f7a9978978c 100644 --- a/ext/oci8/tests/b47243_2.phpt +++ b/ext/oci8/tests/b47243_2.phpt @@ -21,6 +21,5 @@ oci_free_statement($s); ?> ===DONE=== - --EXPECT-- ===DONE=== diff --git a/ext/oci8/tests/b47243_3.phpt b/ext/oci8/tests/b47243_3.phpt index 74eadc8df90..c9d9936c214 100644 --- a/ext/oci8/tests/b47243_3.phpt +++ b/ext/oci8/tests/b47243_3.phpt @@ -22,6 +22,5 @@ oci_close($c); ?> ===DONE=== - --EXPECT-- ===DONE=== diff --git a/ext/oci8/tests/bind_boolean_1.phpt b/ext/oci8/tests/bind_boolean_1.phpt index 7c77187056d..bd4ba356ecd 100644 --- a/ext/oci8/tests/bind_boolean_1.phpt +++ b/ext/oci8/tests/bind_boolean_1.phpt @@ -100,8 +100,6 @@ oci_execute($s); var_dump($b1, $b2); ?> -===DONE=== - --EXPECT-- Test 1 bool(true) @@ -135,4 +133,3 @@ bool(true) bool(false) bool(false) bool(true) -===DONE=== diff --git a/ext/oci8/tests/bind_empty.phpt b/ext/oci8/tests/bind_empty.phpt index ae8cbbca2da..62ec898abbb 100644 --- a/ext/oci8/tests/bind_empty.phpt +++ b/ext/oci8/tests/bind_empty.phpt @@ -89,8 +89,6 @@ $statement = oci_parse($c, $drop); @oci_execute($statement); ?> -===DONE=== - --EXPECT-- Test 1 bool(true) @@ -124,4 +122,3 @@ NULL Test 6 NULL NULL -===DONE=== diff --git a/ext/oci8/tests/bind_misccoltypes.phpt b/ext/oci8/tests/bind_misccoltypes.phpt index 0cc307b4d4d..69854976851 100644 --- a/ext/oci8/tests/bind_misccoltypes.phpt +++ b/ext/oci8/tests/bind_misccoltypes.phpt @@ -268,8 +268,6 @@ oci8_test_sql_execute($c, $stmtarray); oci_close($c); ?> -===DONE=== - --EXPECT-- TEST86 insert all ORATYPE values @@ -363,4 +361,3 @@ array(1) { string(9) "09-APR-10" } } -===DONE=== diff --git a/ext/oci8/tests/bind_misccoltypes_errs.phpt b/ext/oci8/tests/bind_misccoltypes_errs.phpt index 5c443d0f690..84bdba3d8dd 100644 --- a/ext/oci8/tests/bind_misccoltypes_errs.phpt +++ b/ext/oci8/tests/bind_misccoltypes_errs.phpt @@ -116,8 +116,6 @@ oci8_test_sql_execute($c, $stmtarray); oci_close($c); ?> -===DONE=== - --EXPECTF-- Test 1 insert numbers @@ -166,4 +164,3 @@ array(1) { array(0) { } } -===DONE=== diff --git a/ext/oci8/tests/bind_number.phpt b/ext/oci8/tests/bind_number.phpt index 429bbe0ef75..298f487f855 100644 --- a/ext/oci8/tests/bind_number.phpt +++ b/ext/oci8/tests/bind_number.phpt @@ -129,8 +129,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== - --EXPECTF-- Test 1 - invalid number @@ -212,4 +210,3 @@ array(1) { string(2) "42" } } -===DONE=== diff --git a/ext/oci8/tests/bind_query.phpt b/ext/oci8/tests/bind_query.phpt index 12e58d3e338..f9566627c53 100644 --- a/ext/oci8/tests/bind_query.phpt +++ b/ext/oci8/tests/bind_query.phpt @@ -62,8 +62,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== - --EXPECT-- Test 1 array(1) { @@ -75,4 +73,3 @@ string(4) "FORD" string(6) "MILLER" Test 3 string(4) "FORD" -===DONE=== diff --git a/ext/oci8/tests/bind_sqltafc.phpt b/ext/oci8/tests/bind_sqltafc.phpt index 90bd38f4450..a858ed5398d 100644 --- a/ext/oci8/tests/bind_sqltafc.phpt +++ b/ext/oci8/tests/bind_sqltafc.phpt @@ -87,8 +87,6 @@ oci8_test_sql_execute($c, $stmtarray); oci_close($c); ?> -===DONE=== - --EXPECT-- Test 0 - base table creation without binds array(5) { @@ -205,4 +203,3 @@ array(5) { NULL } } -===DONE=== diff --git a/ext/oci8/tests/bind_sqltchr_1.phpt b/ext/oci8/tests/bind_sqltchr_1.phpt index b8c460ca79e..0ef72744984 100644 --- a/ext/oci8/tests/bind_sqltchr_1.phpt +++ b/ext/oci8/tests/bind_sqltchr_1.phpt @@ -133,8 +133,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== - --EXPECT-- TEST241 bind SQLT_CHR array(1) { @@ -225,4 +223,3 @@ array(1) { NULL } } -===DONE=== diff --git a/ext/oci8/tests/bind_sqltchr_2.phpt b/ext/oci8/tests/bind_sqltchr_2.phpt index fae96d89256..d054d21f57e 100644 --- a/ext/oci8/tests/bind_sqltchr_2.phpt +++ b/ext/oci8/tests/bind_sqltchr_2.phpt @@ -41,10 +41,7 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== - --EXPECT-- Test 1 - PL/SQL IN and OUT variables string(22) "Cat got your keyboard?" string(22) "CAT GOT YOUR KEYBOARD?" -===DONE=== diff --git a/ext/oci8/tests/bind_sqltint.phpt b/ext/oci8/tests/bind_sqltint.phpt index 09246521551..a9d7d954fbf 100644 --- a/ext/oci8/tests/bind_sqltint.phpt +++ b/ext/oci8/tests/bind_sqltint.phpt @@ -214,8 +214,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== - --EXPECT-- TEST141 wrong bind type SQLT_INT array(1) { @@ -333,4 +331,3 @@ int(4444) TEST159 int(5555) -===DONE=== diff --git a/ext/oci8/tests/bind_sqltnum.phpt b/ext/oci8/tests/bind_sqltnum.phpt index b8742ee8a83..7a13cd45ce8 100644 --- a/ext/oci8/tests/bind_sqltnum.phpt +++ b/ext/oci8/tests/bind_sqltnum.phpt @@ -171,8 +171,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== - --EXPECTF-- Test 1 - baseline test array(2) { @@ -276,4 +274,3 @@ array(1) { array(0) { } } -===DONE=== diff --git a/ext/oci8/tests/bind_sqltnum_11g.phpt b/ext/oci8/tests/bind_sqltnum_11g.phpt index 7ef15491203..76b2a553f49 100644 --- a/ext/oci8/tests/bind_sqltnum_11g.phpt +++ b/ext/oci8/tests/bind_sqltnum_11g.phpt @@ -171,8 +171,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== - --EXPECTF-- Test 1 - baseline test array(2) { @@ -276,4 +274,3 @@ array(1) { array(0) { } } -===DONE=== diff --git a/ext/oci8/tests/bind_unsupported_1.phpt b/ext/oci8/tests/bind_unsupported_1.phpt index f8ae599c42a..84ff5ca7db7 100644 --- a/ext/oci8/tests/bind_unsupported_1.phpt +++ b/ext/oci8/tests/bind_unsupported_1.phpt @@ -31,8 +31,6 @@ foreach ($types as $t => $v) { } ?> -===DONE=== - --EXPECTF-- Test - SQLT_AVC @@ -55,4 +53,3 @@ Warning: oci_bind_by_name(): Unknown or unsupported datatype given: 68 in %sbind Test - SQLT_ODT Warning: oci_bind_by_name(): Unknown or unsupported datatype given: 156 in %sbind_unsupported_1.php on line %d -===DONE=== diff --git a/ext/oci8/tests/bind_unsupported_2.phpt b/ext/oci8/tests/bind_unsupported_2.phpt index fefd57d148f..e82154a6ad4 100644 --- a/ext/oci8/tests/bind_unsupported_2.phpt +++ b/ext/oci8/tests/bind_unsupported_2.phpt @@ -24,8 +24,6 @@ foreach ($types as $t => $v) { } ?> -===DONE=== - --EXPECTF-- Test - SQLT_BDOUBLE @@ -33,4 +31,3 @@ Warning: oci_bind_by_name(): Unknown or unsupported datatype given: 22 in %sbind Test - SQLT_BFLOAT Warning: oci_bind_by_name(): Unknown or unsupported datatype given: 21 in %sbind_unsupported_2.php on line %d -===DONE=== diff --git a/ext/oci8/tests/bind_unsupported_3.phpt b/ext/oci8/tests/bind_unsupported_3.phpt index 4fe9e0819ca..27d1b209496 100644 --- a/ext/oci8/tests/bind_unsupported_3.phpt +++ b/ext/oci8/tests/bind_unsupported_3.phpt @@ -27,8 +27,6 @@ foreach ($types as $t => $v) { } ?> -===DONE=== - --EXPECTF-- Test - SQLT_CLOB @@ -42,4 +40,3 @@ Warning: oci_bind_by_name(): Unable to find descriptor property in %sbind_unsupp Test - OCI_B_BLOB Warning: oci_bind_by_name(): Unable to find descriptor property in %sbind_unsupported_3.php on line %d -===DONE=== diff --git a/ext/oci8/tests/bug36403.phpt b/ext/oci8/tests/bug36403.phpt index 0f3b53b9238..ed7fad889a4 100644 --- a/ext/oci8/tests/bug36403.phpt +++ b/ext/oci8/tests/bug36403.phpt @@ -43,8 +43,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== - --EXPECTF-- Test 1 COL4 @@ -54,4 +52,3 @@ C1 Test 2 Warning: oci_fetch_array(): ORA-%r(24338|01002)%r: %sbug36403.php on line %d -===DONE=== diff --git a/ext/oci8/tests/bug45458.phpt b/ext/oci8/tests/bug45458.phpt index 3a4b514857b..3e2652642cc 100644 --- a/ext/oci8/tests/bug45458.phpt +++ b/ext/oci8/tests/bug45458.phpt @@ -37,8 +37,6 @@ oci_free_statement($s); oci_close($c); ?> -===DONE=== - --EXPECT-- Test 1 array(1) { @@ -81,4 +79,3 @@ array(1) { } string(1) "X" string(1) "X" -===DONE=== diff --git a/ext/oci8/tests/bug46994.phpt b/ext/oci8/tests/bug46994.phpt index 079f5df6c49..e7208904f85 100644 --- a/ext/oci8/tests/bug46994.phpt +++ b/ext/oci8/tests/bug46994.phpt @@ -69,8 +69,6 @@ oci8_test_sql_execute($c, $stmtarray); oci_close($c); ?> -===DONE=== - --EXPECT-- Test 1 string(26) "This should be the output." @@ -80,4 +78,3 @@ Test 3 string(26) "This should be the output." Test 4 string(26) "This should be the output." -===DONE=== diff --git a/ext/oci8/tests/bug47189.phpt b/ext/oci8/tests/bug47189.phpt index a5b5217ac5e..96aec547222 100644 --- a/ext/oci8/tests/bug47189.phpt +++ b/ext/oci8/tests/bug47189.phpt @@ -29,8 +29,6 @@ oci_fetch_all($s, $rs1, 0, 1, OCI_FETCHSTATEMENT_BY_ROW); var_dump($rs1); ?> -===DONE=== - --EXPECTF-- Test 1 array(1) { @@ -54,4 +52,3 @@ array(1) { Warning: oci_fetch_all(): ORA-01002: %s in %s on line %d array(0) { } -===DONE=== diff --git a/ext/oci8/tests/bug47281.phpt b/ext/oci8/tests/bug47281.phpt index 01b273129ce..377141e3cc9 100644 --- a/ext/oci8/tests/bug47281.phpt +++ b/ext/oci8/tests/bug47281.phpt @@ -57,11 +57,8 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== - --EXPECT-- Test 1 ORA-20000: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaBcccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccDeeeeeeeeeeee Test 2 oci_execute(): ORA-20000: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaBcccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccDeeeeeeeeeeee -===DONE=== diff --git a/ext/oci8/tests/bug47281_tt.phpt b/ext/oci8/tests/bug47281_tt.phpt index acb1eef55ec..f0e6d0200d6 100644 --- a/ext/oci8/tests/bug47281_tt.phpt +++ b/ext/oci8/tests/bug47281_tt.phpt @@ -49,11 +49,8 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== - --EXPECT-- Test 1 ORA-57000: TT8507: ORA-20000: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa Test 2 oci_execute(): ORA-57000: TT8507: ORA-20000: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -===DONE=== diff --git a/ext/oci8/tests/bug51291_1.phpt b/ext/oci8/tests/bug51291_1.phpt index 406d9b5dcd9..5d46a370f53 100644 --- a/ext/oci8/tests/bug51291_1.phpt +++ b/ext/oci8/tests/bug51291_1.phpt @@ -139,8 +139,6 @@ if (!$r) { } ?> -===DONE=== - --EXPECTF-- Test 1 - Parse array(4) { @@ -391,4 +389,3 @@ array(4) { ["sqltext"]=> string(30) "select reallynothere from dual" } -===DONE=== diff --git a/ext/oci8/tests/bug51291_2.phpt b/ext/oci8/tests/bug51291_2.phpt index c39eefbbdca..56655283fa2 100644 --- a/ext/oci8/tests/bug51291_2.phpt +++ b/ext/oci8/tests/bug51291_2.phpt @@ -31,8 +31,6 @@ if (!$r) { } ?> -===DONE=== - --EXPECTF-- Test 1 - Execute - after successful 2nd query with same statement bool(false) @@ -53,4 +51,3 @@ Execute status is true bool(false) bool(false) bool(false) -===DONE=== diff --git a/ext/oci8/tests/bug68298.phpt b/ext/oci8/tests/bug68298.phpt index ed15b849977..fae4a4f2feb 100644 --- a/ext/oci8/tests/bug68298.phpt +++ b/ext/oci8/tests/bug68298.phpt @@ -36,8 +36,6 @@ var_dump($r); $stmtarray = array("DROP TABLE BUG68298"); oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== - --EXPECT-- array(1) { ["COL1"]=> @@ -48,4 +46,3 @@ array(1) { string(20) "-1152921504606846975" } } -===DONE=== diff --git a/ext/oci8/tests/bug71148.phpt b/ext/oci8/tests/bug71148.phpt index 838dbc4fbb0..60fac0d3ae2 100644 --- a/ext/oci8/tests/bug71148.phpt +++ b/ext/oci8/tests/bug71148.phpt @@ -157,8 +157,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== - --EXPECT-- Test 1: Bind input parameter in a local function array(2) { @@ -188,4 +186,3 @@ Test 6: Bind IN OUT parameter within the same scope of execute string(4) "STR1" string(4) "STR2" string(9) "STR1 STR2" -===DONE=== diff --git a/ext/oci8/tests/bug71422.phpt b/ext/oci8/tests/bug71422.phpt index 6896c5de0df..48341a4ccb1 100644 --- a/ext/oci8/tests/bug71422.phpt +++ b/ext/oci8/tests/bug71422.phpt @@ -47,8 +47,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== - --EXPECT-- array(1) { ["RAW_QUERY"]=> @@ -62,4 +60,3 @@ array(1) { ["STRING_BIND_PARAMETER"]=> string(3) "Foo" } -===DONE=== diff --git a/ext/oci8/tests/bug71600.phpt b/ext/oci8/tests/bug71600.phpt index 9cf9f2e9713..718d6534452 100644 --- a/ext/oci8/tests/bug71600.phpt +++ b/ext/oci8/tests/bug71600.phpt @@ -78,8 +78,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== - --EXPECT-- Test 1 Executing SELECT statament... @@ -93,4 +91,3 @@ Fetching data by rows... 2 Records Found 0|1|9 1|11|19 -===DONE=== diff --git a/ext/oci8/tests/bug72524.phpt b/ext/oci8/tests/bug72524.phpt index f696277f860..9159c75cac4 100644 --- a/ext/oci8/tests/bug72524.phpt +++ b/ext/oci8/tests/bug72524.phpt @@ -75,8 +75,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== - --EXPECTF-- Test 1 - P1 Value: NULL P1 Length: Default P1 Type: Default P2 Value: NULL P2 Length: Default P2 Type: Default bool(true) @@ -92,4 +90,3 @@ Test 5 - P1 Value: NULL P1 Length: 0 P1 Type: SQLT_LNG P2 Value: NULL P2 Warning: oci_execute(): ORA-24816: %s in %s on line %d bool(false) -===DONE=== diff --git a/ext/oci8/tests/bug74625.phpt b/ext/oci8/tests/bug74625.phpt index 9bcaf29788a..7effbb7f769 100644 --- a/ext/oci8/tests/bug74625.phpt +++ b/ext/oci8/tests/bug74625.phpt @@ -47,8 +47,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== - --EXPECT-- array(5) { [0]=> @@ -62,4 +60,3 @@ array(5) { [4]=> int(-10) } -===DONE=== diff --git a/ext/oci8/tests/calltimeout1.phpt b/ext/oci8/tests/calltimeout1.phpt index 123e51561a6..865fd62b681 100644 --- a/ext/oci8/tests/calltimeout1.phpt +++ b/ext/oci8/tests/calltimeout1.phpt @@ -43,9 +43,6 @@ oci_set_call_timeout($c, 4000); // milliseconds $r = mysleep($c, 8); // seconds ?> -===DONE=== - --EXPECTF-- Test 1 Execute error was ORA-03136: %s -===DONE=== diff --git a/ext/oci8/tests/clientversion.phpt b/ext/oci8/tests/clientversion.phpt index 262ded462f9..e31ccc1ac80 100644 --- a/ext/oci8/tests/clientversion.phpt +++ b/ext/oci8/tests/clientversion.phpt @@ -10,8 +10,5 @@ if (!extension_loaded('oci8')) die("skip no oci8 extension"); echo oci_client_version(), "\n"; ?> -===DONE=== - --EXPECTF-- %d.%d.%d.%d.%d -===DONE=== diff --git a/ext/oci8/tests/commit_002.phpt b/ext/oci8/tests/commit_002.phpt index b38d9aaa2dd..143b0077fe3 100644 --- a/ext/oci8/tests/commit_002.phpt +++ b/ext/oci8/tests/commit_002.phpt @@ -60,8 +60,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== - --EXPECTF-- First Insert Could not execute: ORA-02290: %s (%s.COMMIT_002_TAB_CHECK_X) %s @@ -71,4 +69,3 @@ Warning: oci_commit(): ORA-02091: %s ORA-02290: %s (%s.COMMIT_002_TAB_CHECK_Y) %s in %scommit_002.php on line %d Could not commit: ORA-02091: %s ORA-02290: %s (%s.COMMIT_002_TAB_CHECK_Y) %s -===DONE=== diff --git a/ext/oci8/tests/connect_without_oracle_home.phpt b/ext/oci8/tests/connect_without_oracle_home.phpt index d83f30e0e90..b6fc0087b1c 100644 --- a/ext/oci8/tests/connect_without_oracle_home.phpt +++ b/ext/oci8/tests/connect_without_oracle_home.phpt @@ -30,9 +30,6 @@ else { } ?> -===DONE=== - --EXPECTF-- Warning: oci_connect(): OCIEnvNlsCreate() failed. There is something wrong with your system - please check that ORACLE_HOME and %s are set and point to the right directories in %s on line %d bool(false) -===DONE=== diff --git a/ext/oci8/tests/connect_without_oracle_home_11.phpt b/ext/oci8/tests/connect_without_oracle_home_11.phpt index a7c3fbba833..f40675c9c13 100644 --- a/ext/oci8/tests/connect_without_oracle_home_11.phpt +++ b/ext/oci8/tests/connect_without_oracle_home_11.phpt @@ -33,12 +33,9 @@ else { } ?> -===DONE=== - --EXPECTF-- Warning: oci_connect(): OCIEnvNlsCreate() failed. There is something wrong with your system - please check that ORACLE_HOME and %s are set and point to the right directories in %s on line %d Warning: oci_connect(): Error while trying to retrieve text for error ORA-01804 in %s on line %d bool(false) -===DONE=== diff --git a/ext/oci8/tests/connect_without_oracle_home_old.phpt b/ext/oci8/tests/connect_without_oracle_home_old.phpt index d77b3e3699f..d311ffaab16 100644 --- a/ext/oci8/tests/connect_without_oracle_home_old.phpt +++ b/ext/oci8/tests/connect_without_oracle_home_old.phpt @@ -26,12 +26,9 @@ else { } ?> -===DONE=== - --EXPECTF-- Warning: ocilogon(): OCIEnvNlsCreate() failed. There is something wrong with your system - please check that ORACLE_HOME and %s are set and point to the right directories in %s on line %d Warning: ocilogon(): %s ORA-01804 in %s on line %d bool(false) -===DONE=== diff --git a/ext/oci8/tests/connect_without_oracle_home_old_11.phpt b/ext/oci8/tests/connect_without_oracle_home_old_11.phpt index c3c21f9d4c1..1c10fd6e1c8 100644 --- a/ext/oci8/tests/connect_without_oracle_home_old_11.phpt +++ b/ext/oci8/tests/connect_without_oracle_home_old_11.phpt @@ -33,12 +33,9 @@ else { } ?> -===DONE=== - --EXPECTF-- Warning: ocilogon(): OCIEnvNlsCreate() failed. There is something wrong with your system - please check that ORACLE_HOME and %s are set and point to the right directories in %s on line %d Warning: ocilogon(): Error while trying to retrieve text for error ORA-01804 in %sconnect_without_oracle_home_old_11.php on line %d bool(false) -===DONE=== diff --git a/ext/oci8/tests/cursor_bind.phpt b/ext/oci8/tests/cursor_bind.phpt index d0f862b0d65..17b4b0d91ac 100644 --- a/ext/oci8/tests/cursor_bind.phpt +++ b/ext/oci8/tests/cursor_bind.phpt @@ -54,8 +54,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== - --EXPECT-- array(2) { [0]=> @@ -76,4 +74,3 @@ array(2) { string(1) "1" } bool(false) -===DONE=== diff --git a/ext/oci8/tests/db_op_1.phpt b/ext/oci8/tests/db_op_1.phpt index 7ca97952d79..70941839f77 100644 --- a/ext/oci8/tests/db_op_1.phpt +++ b/ext/oci8/tests/db_op_1.phpt @@ -41,8 +41,6 @@ dq($c, 'select /*+ MONITOR */ * from dual'); dq($c, 'select dbop_name from v$sql_monitor where dbop_name is not null order by dbop_exec_id desc'); ?> -===DONE=== - --EXPECT-- Test 1 array(1) { @@ -53,4 +51,3 @@ array(1) { ["DBOP_NAME"]=> string(7) "db_op_1" } -===DONE=== diff --git a/ext/oci8/tests/db_op_2.phpt b/ext/oci8/tests/db_op_2.phpt index 26c5d308658..4d4624b7375 100644 --- a/ext/oci8/tests/db_op_2.phpt +++ b/ext/oci8/tests/db_op_2.phpt @@ -49,8 +49,6 @@ dq($c, 'select /*+ MONITOR */ \'dboptest\' from dual'); dq($c, 'select sql_text, dbop_name from v$sql_monitor where sql_text like \'%dboptest%\' order by dbop_exec_id desc'); ?> -===DONE=== - --EXPECT-- Test 1 array(1) { @@ -76,4 +74,3 @@ array(2) { ["DBOP_NAME"]=> NULL } -===DONE=== diff --git a/ext/oci8/tests/dbmsoutput.phpt b/ext/oci8/tests/dbmsoutput.phpt index 40da29654d0..ff40df1a388 100644 --- a/ext/oci8/tests/dbmsoutput.phpt +++ b/ext/oci8/tests/dbmsoutput.phpt @@ -130,8 +130,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== - --EXPECT-- Test 1 array(1) { @@ -747,4 +745,3 @@ array(100) { [99]=> string(53) "99 test 4 Hello, world! Lots and lots and ... of text" } -===DONE=== diff --git a/ext/oci8/tests/define0.phpt b/ext/oci8/tests/define0.phpt index b783ec647c3..c59b24ee76c 100644 --- a/ext/oci8/tests/define0.phpt +++ b/ext/oci8/tests/define0.phpt @@ -51,11 +51,8 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== - --EXPECTF-- Test 1 string(%d) "some" Test 2 string(%d) "some" -===DONE=== diff --git a/ext/oci8/tests/define6.phpt b/ext/oci8/tests/define6.phpt index c23cd452c66..a59ba30a600 100644 --- a/ext/oci8/tests/define6.phpt +++ b/ext/oci8/tests/define6.phpt @@ -119,8 +119,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== - --EXPECTF-- Test 1 - define last NULL @@ -135,4 +133,3 @@ string(1) "1" Test 6 - fetch on wrong handle Warning: oci_fetch_row(): ORA-24374: %s in %sdefine6.php on line %d -===DONE=== diff --git a/ext/oci8/tests/dupcolnames.phpt b/ext/oci8/tests/dupcolnames.phpt index 40d2c99b136..1fddc6cf237 100644 --- a/ext/oci8/tests/dupcolnames.phpt +++ b/ext/oci8/tests/dupcolnames.phpt @@ -57,8 +57,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== - --EXPECT-- Test 1 - OCI_ASSOC array(3) { @@ -99,4 +97,3 @@ array(7) { [3]=> string(5) "jones" } -===DONE=== diff --git a/ext/oci8/tests/error3.phpt b/ext/oci8/tests/error3.phpt index c993a97b5d7..0da7a43d386 100644 --- a/ext/oci8/tests/error3.phpt +++ b/ext/oci8/tests/error3.phpt @@ -31,10 +31,7 @@ end;"); oci_execute($s); ?> -===DONE=== - --EXPECTF-- Test 1 Warning: oci_execute(): ORA-20333: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBab in %serror3.php on line %d -===DONE=== diff --git a/ext/oci8/tests/error_set.phpt b/ext/oci8/tests/error_set.phpt index 95673f554aa..ed04407098e 100644 --- a/ext/oci8/tests/error_set.phpt +++ b/ext/oci8/tests/error_set.phpt @@ -51,8 +51,6 @@ $r = oci_set_client_info($c, $s); var_dump($r); ?> -===DONE=== - --EXPECT-- Test 1 bool(false) @@ -69,4 +67,3 @@ bool(true) bool(true) bool(true) bool(true) -===DONE=== diff --git a/ext/oci8/tests/extauth_01.phpt b/ext/oci8/tests/extauth_01.phpt index ba48b0eb581..f90562d1186 100644 --- a/ext/oci8/tests/extauth_01.phpt +++ b/ext/oci8/tests/extauth_01.phpt @@ -106,8 +106,6 @@ var_dump($c); ?> -===DONE=== - --EXPECTF-- Test 1 @@ -195,4 +193,3 @@ array(4) { string(0) "" } bool(false) -===DONE=== diff --git a/ext/oci8/tests/extauth_02.phpt b/ext/oci8/tests/extauth_02.phpt index ea665eb9187..11b522e4d76 100644 --- a/ext/oci8/tests/extauth_02.phpt +++ b/ext/oci8/tests/extauth_02.phpt @@ -105,8 +105,6 @@ var_dump($c); ?> -===DONE=== - --EXPECTF-- Test 1 @@ -194,4 +192,3 @@ array(4) { string(0) "" } bool(false) -===DONE=== diff --git a/ext/oci8/tests/extauth_03.phpt b/ext/oci8/tests/extauth_03.phpt index 3ced42fc23a..7cb80e261e9 100644 --- a/ext/oci8/tests/extauth_03.phpt +++ b/ext/oci8/tests/extauth_03.phpt @@ -105,8 +105,6 @@ var_dump($c); ?> -===DONE=== - --EXPECTF-- Test 1 @@ -194,4 +192,3 @@ array(4) { string(0) "" } bool(false) -===DONE=== diff --git a/ext/oci8/tests/extauth_04.phpt b/ext/oci8/tests/extauth_04.phpt index 1597c2a942d..edb2fbd9123 100644 --- a/ext/oci8/tests/extauth_04.phpt +++ b/ext/oci8/tests/extauth_04.phpt @@ -38,8 +38,6 @@ if (!$c) { var_dump($c); ?> -===DONE=== - --EXPECTF-- Test 1 @@ -56,4 +54,3 @@ Test 3 Warning: oci_pconnect(): External Authentication is not supported on Windows in %s on line %d bool(false) bool(false) -===DONE=== diff --git a/ext/oci8/tests/fetch_all4.phpt b/ext/oci8/tests/fetch_all4.phpt index ff4f7c400e2..4edc8206981 100644 --- a/ext/oci8/tests/fetch_all4.phpt +++ b/ext/oci8/tests/fetch_all4.phpt @@ -45,8 +45,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== - --EXPECT-- Test 1 int(0) @@ -60,4 +58,3 @@ array(2) { } Test 2 bool(false) -===DONE=== diff --git a/ext/oci8/tests/fetch_all5.phpt b/ext/oci8/tests/fetch_all5.phpt index 26c7447c2c1..e8e1ba47573 100644 --- a/ext/oci8/tests/fetch_all5.phpt +++ b/ext/oci8/tests/fetch_all5.phpt @@ -56,8 +56,6 @@ oci8_test_sql_execute($c, $stmtarray); oci_close($c); ?> -===DONE=== - --EXPECT-- Test 1 int(3) @@ -107,4 +105,3 @@ Test 3 int(0) array(0) { } -===DONE=== diff --git a/ext/oci8/tests/fetch_object.phpt b/ext/oci8/tests/fetch_object.phpt index 053b3136f38..1e270b6000f 100644 --- a/ext/oci8/tests/fetch_object.phpt +++ b/ext/oci8/tests/fetch_object.phpt @@ -77,8 +77,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== - --EXPECTF-- Test 1 object(stdClass)#1 (3) { @@ -120,4 +118,3 @@ Test 3 Notice: Undefined property: stdClass::$CASESENSITIVE in %sfetch_object.php on line %d -===DONE=== diff --git a/ext/oci8/tests/fetch_object_1.phpt b/ext/oci8/tests/fetch_object_1.phpt index 3480aa25b11..586daebca8d 100644 --- a/ext/oci8/tests/fetch_object_1.phpt +++ b/ext/oci8/tests/fetch_object_1.phpt @@ -77,8 +77,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== - --EXPECTF-- Test 1 object(stdClass)#%d (3) { @@ -120,4 +118,3 @@ Test 3 Notice: Undefined property: stdClass::$CASESENSITIVE in %sfetch_object_1.php on line %d -===DONE=== diff --git a/ext/oci8/tests/fetch_object_2.phpt b/ext/oci8/tests/fetch_object_2.phpt index 648d1dd073a..8d8c3341827 100644 --- a/ext/oci8/tests/fetch_object_2.phpt +++ b/ext/oci8/tests/fetch_object_2.phpt @@ -63,8 +63,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== - --EXPECTF-- Test 1 object(stdClass)#%d (3) { @@ -110,4 +108,3 @@ Test 2 789 3rd row col2 string 3 more text -===DONE=== diff --git a/ext/oci8/tests/field_funcs3.phpt b/ext/oci8/tests/field_funcs3.phpt index 23f4b5ea61c..965b2249739 100644 --- a/ext/oci8/tests/field_funcs3.phpt +++ b/ext/oci8/tests/field_funcs3.phpt @@ -55,8 +55,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== - --EXPECTF-- array(4) { [0]=> @@ -96,4 +94,3 @@ int(12) int(0) int(0) int(7) -===DONE=== diff --git a/ext/oci8/tests/imp_res_1.phpt b/ext/oci8/tests/imp_res_1.phpt index 7379b606f29..28725fdd178 100644 --- a/ext/oci8/tests/imp_res_1.phpt +++ b/ext/oci8/tests/imp_res_1.phpt @@ -117,8 +117,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== - --EXPECTF-- Test 1 - oci_fetch_assoc array(2) { @@ -627,4 +625,3 @@ array(4) { ["C2"]=> string(5) "klmno" } -===DONE=== diff --git a/ext/oci8/tests/imp_res_2.phpt b/ext/oci8/tests/imp_res_2.phpt index b246e2ed77d..8f7abdadd82 100644 --- a/ext/oci8/tests/imp_res_2.phpt +++ b/ext/oci8/tests/imp_res_2.phpt @@ -82,8 +82,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== - --EXPECT-- Test 1 Test 2 @@ -96,4 +94,3 @@ array(1) { [0]=> string(1) "X" } -===DONE=== diff --git a/ext/oci8/tests/imp_res_3.phpt b/ext/oci8/tests/imp_res_3.phpt index bd48267e964..d7f4debef98 100644 --- a/ext/oci8/tests/imp_res_3.phpt +++ b/ext/oci8/tests/imp_res_3.phpt @@ -80,8 +80,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== - --EXPECT-- Test 1 1 a 1 a 1 a 1 a 1 a @@ -1254,4 +1252,3 @@ Test 1 v w X -===DONE=== diff --git a/ext/oci8/tests/imp_res_4.phpt b/ext/oci8/tests/imp_res_4.phpt index 79e9b39dd37..b4bff4ae363 100644 --- a/ext/oci8/tests/imp_res_4.phpt +++ b/ext/oci8/tests/imp_res_4.phpt @@ -59,8 +59,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== - --EXPECTF-- Test 1 @@ -79,4 +77,3 @@ array(1) { [0]=> string(1) "2" } -===DONE=== diff --git a/ext/oci8/tests/imp_res_5.phpt b/ext/oci8/tests/imp_res_5.phpt index 26107eda94c..ca611acaebc 100644 --- a/ext/oci8/tests/imp_res_5.phpt +++ b/ext/oci8/tests/imp_res_5.phpt @@ -59,8 +59,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== - --EXPECTF-- Test 1 @@ -81,4 +79,3 @@ array(1) { [0]=> string(1) "2" } -===DONE=== diff --git a/ext/oci8/tests/imp_res_6.phpt b/ext/oci8/tests/imp_res_6.phpt index c1ea7d34f32..d1734b9e59a 100644 --- a/ext/oci8/tests/imp_res_6.phpt +++ b/ext/oci8/tests/imp_res_6.phpt @@ -71,8 +71,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== - --EXPECTF-- Test 1 array(2) { @@ -115,4 +113,3 @@ array(2) { ["C2"]=> string(1) "f" } -===DONE=== diff --git a/ext/oci8/tests/imp_res_7.phpt b/ext/oci8/tests/imp_res_7.phpt index 6ba9d5fc144..a4b86ceb468 100644 --- a/ext/oci8/tests/imp_res_7.phpt +++ b/ext/oci8/tests/imp_res_7.phpt @@ -591,8 +591,6 @@ while (($row = oci_fetch_row($s)) != false) { } ?> -===DONE=== - --EXPECT-- Test 1 1 @@ -870,4 +868,3 @@ Test 1 273 274 275 -===DONE=== diff --git a/ext/oci8/tests/imp_res_call_error.phpt b/ext/oci8/tests/imp_res_call_error.phpt index 5c2ab9988a7..503bef67280 100644 --- a/ext/oci8/tests/imp_res_call_error.phpt +++ b/ext/oci8/tests/imp_res_call_error.phpt @@ -49,8 +49,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== - --EXPECTF-- Test 1 @@ -58,4 +56,3 @@ Warning: oci_execute(): ORA-29478: %s ORA-06512: at "SYS.DBMS_SQL", line %d ORA-06512: at "SYS.DBMS_SQL", line %d ORA-06512: at "%s.IMP_RES_CALL_ERR_PROC", line %d in %simp_res_call_error.php on line %d -===DONE=== diff --git a/ext/oci8/tests/imp_res_cancel.phpt b/ext/oci8/tests/imp_res_cancel.phpt index e3caa866726..54c6784ea8a 100644 --- a/ext/oci8/tests/imp_res_cancel.phpt +++ b/ext/oci8/tests/imp_res_cancel.phpt @@ -55,8 +55,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== - --EXPECT-- Test 1 1 @@ -65,4 +63,3 @@ bool(true) bool(true) 3 bool(true) -===DONE=== diff --git a/ext/oci8/tests/imp_res_close.phpt b/ext/oci8/tests/imp_res_close.phpt index 3e719b9ee23..4bd7fcb68a2 100644 --- a/ext/oci8/tests/imp_res_close.phpt +++ b/ext/oci8/tests/imp_res_close.phpt @@ -58,11 +58,8 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== - --EXPECTF-- Test 1 1 Warning: oci_fetch_array(): supplied resource is not a valid oci8 statement resource in %simp_res_close.php on line %d -===DONE=== diff --git a/ext/oci8/tests/imp_res_cursor.phpt b/ext/oci8/tests/imp_res_cursor.phpt index 221ef80d47a..4aba076bb23 100644 --- a/ext/oci8/tests/imp_res_cursor.phpt +++ b/ext/oci8/tests/imp_res_cursor.phpt @@ -85,8 +85,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== - --EXPECT-- Test 1 X @@ -96,4 +94,3 @@ Test 1 t u -===DONE=== diff --git a/ext/oci8/tests/imp_res_dbmsoutput.phpt b/ext/oci8/tests/imp_res_dbmsoutput.phpt index b84ef8c556e..186c522f417 100644 --- a/ext/oci8/tests/imp_res_dbmsoutput.phpt +++ b/ext/oci8/tests/imp_res_dbmsoutput.phpt @@ -103,8 +103,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== - --EXPECT-- Test 1 array(2) { @@ -133,4 +131,3 @@ array(2) { [1]=> string(18) "dbms_output Line 2" } -===DONE=== diff --git a/ext/oci8/tests/imp_res_field.phpt b/ext/oci8/tests/imp_res_field.phpt index c96e7c3ef59..9280e4f7c0a 100644 --- a/ext/oci8/tests/imp_res_field.phpt +++ b/ext/oci8/tests/imp_res_field.phpt @@ -124,8 +124,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== - --EXPECT-- Test 1 - can't get IRS fields from parent num fields : 0 @@ -224,4 +222,3 @@ array(1) { } num fields : 1 C4_NUMBER52 : is_null T, precision 5, scale 2, size 22, typeraw 2, type NUMBER -===DONE=== diff --git a/ext/oci8/tests/imp_res_func_error.phpt b/ext/oci8/tests/imp_res_func_error.phpt index 424ae47bb8c..705d3ca89c2 100644 --- a/ext/oci8/tests/imp_res_func_error.phpt +++ b/ext/oci8/tests/imp_res_func_error.phpt @@ -55,8 +55,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== - --EXPECTF-- Test 1 @@ -64,4 +62,3 @@ Warning: oci_execute(): ORA-29478: %s ORA-06512: %s ORA-06512: %s ORA-06512: %s -===DONE=== diff --git a/ext/oci8/tests/imp_res_get_1.phpt b/ext/oci8/tests/imp_res_get_1.phpt index 7eac1033f4a..5b7cad4036d 100644 --- a/ext/oci8/tests/imp_res_get_1.phpt +++ b/ext/oci8/tests/imp_res_get_1.phpt @@ -88,8 +88,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== - --EXPECT-- Test 1 1 abcde @@ -106,4 +104,3 @@ Test 2 - with execute t u X -===DONE=== diff --git a/ext/oci8/tests/imp_res_get_2.phpt b/ext/oci8/tests/imp_res_get_2.phpt index b8c2a08af53..2966412e16d 100644 --- a/ext/oci8/tests/imp_res_get_2.phpt +++ b/ext/oci8/tests/imp_res_get_2.phpt @@ -94,8 +94,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== - --EXPECT-- Test 1 1 abcde @@ -104,4 +102,3 @@ Test 1 t u X -===DONE=== diff --git a/ext/oci8/tests/imp_res_get_3.phpt b/ext/oci8/tests/imp_res_get_3.phpt index 4b39dd1117f..f12d740aacb 100644 --- a/ext/oci8/tests/imp_res_get_3.phpt +++ b/ext/oci8/tests/imp_res_get_3.phpt @@ -80,8 +80,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== - --EXPECT-- Test 1 1 abcde @@ -264,4 +262,3 @@ Test 1 t u X -===DONE=== diff --git a/ext/oci8/tests/imp_res_get_4.phpt b/ext/oci8/tests/imp_res_get_4.phpt index 193e2f623e7..03125029ed1 100644 --- a/ext/oci8/tests/imp_res_get_4.phpt +++ b/ext/oci8/tests/imp_res_get_4.phpt @@ -118,8 +118,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== - --EXPECTF-- Test 1 1 abcde @@ -143,4 +141,3 @@ Return is false Warning: oci_fetch_array(): ORA-01002: %s in %simp_res_get_4.php on line %d Return is false -===DONE=== diff --git a/ext/oci8/tests/imp_res_get_5.phpt b/ext/oci8/tests/imp_res_get_5.phpt index 79bb170a595..dca564b4f05 100644 --- a/ext/oci8/tests/imp_res_get_5.phpt +++ b/ext/oci8/tests/imp_res_get_5.phpt @@ -93,8 +93,6 @@ while (($row = oci_fetch_row($s)) != false) { // parent oci_free_statement($s); ?> -===DONE=== - --EXPECT-- Test 1 3 @@ -121,4 +119,3 @@ Test 3 - fetch part of IRS explicitly Test 4 - skip IRSs 5 6 -===DONE=== diff --git a/ext/oci8/tests/imp_res_get_all.phpt b/ext/oci8/tests/imp_res_get_all.phpt index a1d99eeebfe..cfc883e9d35 100644 --- a/ext/oci8/tests/imp_res_get_all.phpt +++ b/ext/oci8/tests/imp_res_get_all.phpt @@ -57,8 +57,6 @@ while (($s1 = oci_get_implicit_resultset($s))) { } ?> -===DONE=== - --EXPECT-- Test 1 array(1) { @@ -117,4 +115,3 @@ array(1) { string(1) "6" } } -===DONE=== diff --git a/ext/oci8/tests/imp_res_get_cancel.phpt b/ext/oci8/tests/imp_res_get_cancel.phpt index 5bc36f08cd7..dee56255020 100644 --- a/ext/oci8/tests/imp_res_get_cancel.phpt +++ b/ext/oci8/tests/imp_res_get_cancel.phpt @@ -46,10 +46,7 @@ while (($s1 = oci_get_implicit_resultset($s))) { } ?> -===DONE=== - --EXPECT-- Test 1 1 3 -===DONE=== diff --git a/ext/oci8/tests/imp_res_get_close_1.phpt b/ext/oci8/tests/imp_res_get_close_1.phpt index a9c2fc455c0..0aef8577c2d 100644 --- a/ext/oci8/tests/imp_res_get_close_1.phpt +++ b/ext/oci8/tests/imp_res_get_close_1.phpt @@ -52,8 +52,6 @@ while (($s1 = oci_get_implicit_resultset($s))) { oci_free_statement($s); ?> -===DONE=== - --EXPECTF-- Test 1 1 @@ -65,4 +63,3 @@ Warning: oci_fetch_array(): supplied resource is not a valid oci8 statement reso 5 Warning: oci_fetch_array(): supplied resource is not a valid oci8 statement resource in %s on line %d -===DONE=== diff --git a/ext/oci8/tests/imp_res_get_close_2.phpt b/ext/oci8/tests/imp_res_get_close_2.phpt index d435b8968db..9a0693105c8 100644 --- a/ext/oci8/tests/imp_res_get_close_2.phpt +++ b/ext/oci8/tests/imp_res_get_close_2.phpt @@ -51,8 +51,6 @@ while (($s1 = oci_get_implicit_resultset($s))) { } ?> -===DONE=== - --EXPECTF-- Test 1 1 @@ -60,4 +58,3 @@ Test 1 Warning: oci_fetch_array(): OCI_INVALID_HANDLE in %s on line %d Warning: oci_get_implicit_resultset(): supplied resource is not a valid oci8 statement resource in %s on line %d -===DONE=== diff --git a/ext/oci8/tests/imp_res_get_close_3.phpt b/ext/oci8/tests/imp_res_get_close_3.phpt index 268c353801f..36d8c50d06e 100644 --- a/ext/oci8/tests/imp_res_get_close_3.phpt +++ b/ext/oci8/tests/imp_res_get_close_3.phpt @@ -52,8 +52,6 @@ while (($s1 = oci_get_implicit_resultset($s))) { oci_free_statement($s); ?> -===DONE=== - --EXPECT-- Test 1 1 @@ -62,4 +60,3 @@ Test 1 4 5 6 -===DONE=== diff --git a/ext/oci8/tests/imp_res_get_cursor.phpt b/ext/oci8/tests/imp_res_get_cursor.phpt index 1694fc830a4..29742e465ed 100644 --- a/ext/oci8/tests/imp_res_get_cursor.phpt +++ b/ext/oci8/tests/imp_res_get_cursor.phpt @@ -87,8 +87,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== - --EXPECT-- Test 1 1 abcde @@ -98,4 +96,3 @@ Test 1 t u X -===DONE=== diff --git a/ext/oci8/tests/imp_res_get_dbmsoutput.phpt b/ext/oci8/tests/imp_res_get_dbmsoutput.phpt index 95bb50cd51b..52e289ca7d6 100644 --- a/ext/oci8/tests/imp_res_get_dbmsoutput.phpt +++ b/ext/oci8/tests/imp_res_get_dbmsoutput.phpt @@ -117,8 +117,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== - --EXPECT-- Test 1 array(3) { @@ -152,4 +150,3 @@ array(3) { [2]=> string(6) "Line 3" } -===DONE=== diff --git a/ext/oci8/tests/imp_res_get_exec.phpt b/ext/oci8/tests/imp_res_get_exec.phpt index f9391cc122e..d0b9028a03a 100644 --- a/ext/oci8/tests/imp_res_get_exec.phpt +++ b/ext/oci8/tests/imp_res_get_exec.phpt @@ -46,10 +46,7 @@ oci_free_statement($s); ?> -===DONE=== - --EXPECT-- Test 1 1 2 -===DONE=== diff --git a/ext/oci8/tests/imp_res_get_none.phpt b/ext/oci8/tests/imp_res_get_none.phpt index 87d86c2f9ff..a8d92d73269 100644 --- a/ext/oci8/tests/imp_res_get_none.phpt +++ b/ext/oci8/tests/imp_res_get_none.phpt @@ -38,9 +38,6 @@ while (($s1 = oci_get_implicit_resultset($s))) { var_dump($s1); ?> -===DONE=== - --EXPECT-- Test 1 bool(false) -===DONE=== diff --git a/ext/oci8/tests/imp_res_insert.phpt b/ext/oci8/tests/imp_res_insert.phpt index 074f5ee8797..21c7820506b 100644 --- a/ext/oci8/tests/imp_res_insert.phpt +++ b/ext/oci8/tests/imp_res_insert.phpt @@ -103,8 +103,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== - --EXPECT-- Test 1 - No commit in procedure, OCI_COMMIT_ON_SUCCESS mode 111 @@ -149,4 +147,3 @@ array(4) { [3]=> string(3) "444" } -===DONE=== diff --git a/ext/oci8/tests/imp_res_lob.phpt b/ext/oci8/tests/imp_res_lob.phpt index 48185b63559..66737616880 100644 --- a/ext/oci8/tests/imp_res_lob.phpt +++ b/ext/oci8/tests/imp_res_lob.phpt @@ -82,8 +82,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== - --EXPECT-- Test 1 1 aaaaa a @@ -98,4 +96,3 @@ Test 1 Test 2 - don't fetch all rows 1 aaaaa a -===DONE=== diff --git a/ext/oci8/tests/imp_res_prefetch.phpt b/ext/oci8/tests/imp_res_prefetch.phpt index 849874bd003..6425697f7b7 100644 --- a/ext/oci8/tests/imp_res_prefetch.phpt +++ b/ext/oci8/tests/imp_res_prefetch.phpt @@ -81,8 +81,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== - --EXPECT-- Test 1 - prefetch 0 bool(true) @@ -182,4 +180,3 @@ array(1) { [0]=> string(1) "v" } -===DONE=== diff --git a/ext/oci8/tests/ini_1.phpt b/ext/oci8/tests/ini_1.phpt index 9c9b378e7bb..3c306a65d30 100644 --- a/ext/oci8/tests/ini_1.phpt +++ b/ext/oci8/tests/ini_1.phpt @@ -53,8 +53,6 @@ var_dump(ini_set('oci8.old_oci_close_semantics', 'Off')); echo 'oci8.old_oci_close_semantics = ' . ini_get('oci8.old_oci_close_semantics') . "\n"; ?> -===DONE=== - --EXPECT-- Test 1 - check initialization oci8.privileged_connect = 1 @@ -85,4 +83,3 @@ bool(false) oci8.default_prefetch = 555 bool(false) oci8.old_oci_close_semantics = 1 -===DONE=== diff --git a/ext/oci8/tests/lob_001.phpt b/ext/oci8/tests/lob_001.phpt index 3a3a48dee06..72352ef2cfa 100644 Binary files a/ext/oci8/tests/lob_001.phpt and b/ext/oci8/tests/lob_001.phpt differ diff --git a/ext/oci8/tests/lob_002.phpt b/ext/oci8/tests/lob_002.phpt index e83ae21187c..d9142852284 100644 --- a/ext/oci8/tests/lob_002.phpt +++ b/ext/oci8/tests/lob_002.phpt @@ -53,8 +53,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== - --EXPECTF-- object(OCI-Lob)#%d (1) { ["descriptor"]=> @@ -72,4 +70,3 @@ Warning: OCI-Lob::seek() expects parameter 1 to be int%s string given in %slob_0 NULL bool(false) int(40004) -===DONE=== diff --git a/ext/oci8/tests/lob_018.phpt b/ext/oci8/tests/lob_018.phpt index be678728f06..e6187907265 100644 --- a/ext/oci8/tests/lob_018.phpt +++ b/ext/oci8/tests/lob_018.phpt @@ -89,8 +89,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== - --EXPECT-- Test 1 string(4) "data" @@ -100,4 +98,3 @@ string(9) "long data" string(4) "data" Test 3 - bind with SQLT_CLOB (an alias for OCI_B_CLOB) string(10) "more stuff" -===DONE=== diff --git a/ext/oci8/tests/lob_043.phpt b/ext/oci8/tests/lob_043.phpt index 25e68708322..32b4ccdbdc9 100644 --- a/ext/oci8/tests/lob_043.phpt +++ b/ext/oci8/tests/lob_043.phpt @@ -78,11 +78,8 @@ oci8_test_sql_execute($c, $stmtarray); oci_close($c); ?> -===DONE=== - --EXPECT-- Test 1 f1 ended Test 2 f2 ended -===DONE=== diff --git a/ext/oci8/tests/lob_044.phpt b/ext/oci8/tests/lob_044.phpt index a2007c9c4b0..cec6b126ffd 100644 --- a/ext/oci8/tests/lob_044.phpt +++ b/ext/oci8/tests/lob_044.phpt @@ -57,8 +57,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== - --EXPECT-- Test 1 - truncate on insert int(72) @@ -70,4 +68,3 @@ string(0) "" Test 2 - read it back string(0) "" -===DONE=== diff --git a/ext/oci8/tests/lob_temp2.phpt b/ext/oci8/tests/lob_temp2.phpt index e789014d361..1861f3021d3 100644 --- a/ext/oci8/tests/lob_temp2.phpt +++ b/ext/oci8/tests/lob_temp2.phpt @@ -27,7 +27,6 @@ oci_fetch_all($s, $res); var_dump($res); ?> -===DONE=== --EXPECT-- bool(true) array(1) { @@ -37,4 +36,3 @@ array(1) { string(4) "test" } } -===DONE=== diff --git a/ext/oci8/tests/null_byte_1.phpt b/ext/oci8/tests/null_byte_1.phpt index 61b5ecc2feb..5c8075cc815 100644 --- a/ext/oci8/tests/null_byte_1.phpt +++ b/ext/oci8/tests/null_byte_1.phpt @@ -32,8 +32,6 @@ $r = $lob->export("/tmp/abc\0def"); var_dump($r); ?> -===DONE=== - --EXPECTF-- Test 1: Import @@ -43,4 +41,3 @@ Test 2: Export Warning: OCI-Lob::export() expects parameter 1 to be a valid path, string given in %snull_byte_1.php on line %d NULL -===DONE=== diff --git a/ext/oci8/tests/null_byte_2.phpt b/ext/oci8/tests/null_byte_2.phpt index e95564e3226..132fda5e1d4 100644 --- a/ext/oci8/tests/null_byte_2.phpt +++ b/ext/oci8/tests/null_byte_2.phpt @@ -31,8 +31,6 @@ oci_execute($s); ?> -===DONE=== - --EXPECTF-- Test 1: Valid use of a null byte array(1) { @@ -47,4 +45,3 @@ Test 3: Using a null byte in a bind variable name Warning: oci_bind_by_name(): ORA-01036: %s in %snull_byte_2.php on line %d Warning: oci_execute(): ORA-01008: %s in %snull_byte_2.php on line %d -===DONE=== diff --git a/ext/oci8/tests/null_byte_3.phpt b/ext/oci8/tests/null_byte_3.phpt index f44d218aa09..d739cf179b5 100644 --- a/ext/oci8/tests/null_byte_3.phpt +++ b/ext/oci8/tests/null_byte_3.phpt @@ -27,8 +27,6 @@ oci_fetch_all($s, $res); var_dump($res); ?> -===DONE=== - --EXPECTF-- Test 1: Invalid use of a null byte @@ -39,4 +37,3 @@ array(1) { array(0) { } } -===DONE=== diff --git a/ext/oci8/tests/pecl_bug16035.phpt b/ext/oci8/tests/pecl_bug16035.phpt index d557e0a5c03..2fdef268317 100644 --- a/ext/oci8/tests/pecl_bug16035.phpt +++ b/ext/oci8/tests/pecl_bug16035.phpt @@ -19,11 +19,8 @@ ORACLE_HOME="" oci_connect('abc', 'def', 'ghi', 'jkl'); ?> -===DONE=== - --EXPECTF-- Warning: oci_connect(): OCIEnvNlsCreate() failed. There is something wrong with your system - please check that ORACLE_HOME and %s are set and point to the right directories in %s on line %d Warning: oci_connect(): Error while trying to retrieve text for error ORA-01804 in %specl_bug16035.php on line %d -===DONE=== diff --git a/ext/oci8/tests/pecl_bug16842.phpt b/ext/oci8/tests/pecl_bug16842.phpt index c4a3fc26509..302b81d68cc 100644 --- a/ext/oci8/tests/pecl_bug16842.phpt +++ b/ext/oci8/tests/pecl_bug16842.phpt @@ -33,8 +33,6 @@ var_dump(oci_error($s)); oci_close($c); ?> -===DONE=== - --EXPECTF-- Test 1 Raises NO_DATA_FOUND @@ -70,4 +68,3 @@ ORA-06512: at line 1" ["sqltext"]=> string(29) "begin raise ZERO_DIVIDE; end;" } -===DONE=== diff --git a/ext/oci8/tests/reflection1.phpt b/ext/oci8/tests/reflection1.phpt index 2cf3e4055bb..43c3205337e 100644 --- a/ext/oci8/tests/reflection1.phpt +++ b/ext/oci8/tests/reflection1.phpt @@ -129,8 +129,6 @@ reflection::export(new reflectionfunction('oci_set_client_identifier')); reflection::export(new reflectionfunction('oci_get_implicit_resultset')); ?> -===DONE=== - --EXPECTF-- Function [ function oci_define_by_name ] { @@ -1101,4 +1099,3 @@ Function [ function oci_get_implicit_resultset ] { } } -===DONE=== diff --git a/ext/oci8/tests/reflection2.phpt b/ext/oci8/tests/reflection2.phpt index 9e63db1d636..38ee637b275 100644 --- a/ext/oci8/tests/reflection2.phpt +++ b/ext/oci8/tests/reflection2.phpt @@ -9,8 +9,6 @@ reflection::export(new reflectionclass('OCI-Lob')); reflection::export(new reflectionclass('OCI-Collection')); ?> -===DONE=== - --EXPECTF-- Class [ class OCI-Lob ] { @@ -255,4 +253,3 @@ Class [ class OCI-Collection ] { } } -===DONE=== diff --git a/ext/oci8/tests/xmltype_02.phpt b/ext/oci8/tests/xmltype_02.phpt index 35f8750255b..7e11654b4db 100644 --- a/ext/oci8/tests/xmltype_02.phpt +++ b/ext/oci8/tests/xmltype_02.phpt @@ -107,8 +107,6 @@ $stmtarray = array( oci8_test_sql_execute($c, $stmtarray); ?> -===DONE=== - --EXPECTF-- Test 1 Insert new XML data using a temporary CLOB array(1) { @@ -178,4 +176,3 @@ string(%d) " %sVClearance>10 " -===DONE=== diff --git a/ext/odbc/tests/bug47803.phpt b/ext/odbc/tests/bug47803.phpt index e80b0de38b8..8069d5141f3 100644 --- a/ext/odbc/tests/bug47803.phpt +++ b/ext/odbc/tests/bug47803.phpt @@ -88,7 +88,6 @@ if ($result) odbc_free_result($result); odbc_close($link); ?> -==DONE== --EXPECT-- array(3) { ["PAR_ID"]=> @@ -170,7 +169,6 @@ array(3) { ["PAR_CHR"]=> string(6) "test 7" } -==DONE== --CLEAN-- -==DONE== --EXPECT-- 100 a a -==DONE== --CLEAN-- -==DONE== --EXPECT-- array(1) { ["ID"]=> string(1) "1" } -==DONE== --CLEAN-- $sql) { odbc_close($conn); ?> -==DONE== --EXPECTF-- string(42) "/* non existent procedure xy */ execute xy" string(5) "37000" @@ -47,4 +46,3 @@ string(58) "/* another erroneous query */ SELECT * FROM zwiebelfleisch" string(5) "S0002" string(%d) "[Microsoft][%s][SQL Server]Invalid object name 'zwiebelfleisch'." -==DONE== diff --git a/ext/odbc/tests/bug73725.phpt b/ext/odbc/tests/bug73725.phpt index 1ab2ba0eaab..c48a9112e71 100644 --- a/ext/odbc/tests/bug73725.phpt +++ b/ext/odbc/tests/bug73725.phpt @@ -23,7 +23,6 @@ $r = odbc_fetch_array($rc); var_dump($r); ?> -==DONE== --EXPECT-- array(3) { ["i"]=> @@ -41,7 +40,6 @@ array(3) { ["k"]=> string(2) "34" } -==DONE== --CLEAN-- -===DONE=== --EXPECTF-- Warning: Can't preload unlinked class H: Unknown type dependencies in %s on line %d Warning: Can't preload unlinked class B: Unknown type dependencies in %s on line %d Warning: Can't preload unlinked class A: Unknown type dependencies in %s on line %d -===DONE=== diff --git a/ext/opcache/tests/preload_012.phpt b/ext/opcache/tests/preload_012.phpt index 0883064ff45..4758296dcb5 100644 --- a/ext/opcache/tests/preload_012.phpt +++ b/ext/opcache/tests/preload_012.phpt @@ -8,7 +8,5 @@ opcache.preload={PWD}/preload_const_autoload.inc --SKIPIF-- --FILE-- -===DONE=== --EXPECTF-- Warning: Can't preload class Test with unresolved initializer for constant C in %s on line %d -===DONE=== diff --git a/ext/openssl/tests/bug72165.phpt b/ext/openssl/tests/bug72165.phpt index 93b3c3d4a88..50e8b541003 100644 --- a/ext/openssl/tests/bug72165.phpt +++ b/ext/openssl/tests/bug72165.phpt @@ -9,9 +9,7 @@ if (!extension_loaded("openssl")) die("skip"); $var0 = array(0 => "hello", 1 => "world"); $var2 = openssl_csr_new(array(0),$var0,null,array(0)); ?> -==DONE== --EXPECTF-- Warning: openssl_csr_new(): dn: numeric fild names are not supported in %sbug72165.php on line %d Warning: openssl_csr_new(): add1_attr_by_txt challengePassword_min -> 4 (failed; check error queue and value of string_mask OpenSSL option if illegal characters are reported) in %sbug72165.php on line %d -==DONE== diff --git a/ext/openssl/tests/bug74022.phpt b/ext/openssl/tests/bug74022.phpt index 1bd21162411..77ae6c83cb6 100644 --- a/ext/openssl/tests/bug74022.phpt +++ b/ext/openssl/tests/bug74022.phpt @@ -12,8 +12,6 @@ $cert_store = file_get_contents($pfx); var_dump(openssl_pkcs12_read($cert_store, $cert_info, "csos")); var_dump(openssl_error_string()); ?> -===DONE=== --EXPECT-- bool(true) bool(false) -===DONE=== diff --git a/ext/openssl/tests/bug74022_2.phpt b/ext/openssl/tests/bug74022_2.phpt index 07cb683274d..5df37fb3c97 100644 --- a/ext/openssl/tests/bug74022_2.phpt +++ b/ext/openssl/tests/bug74022_2.phpt @@ -18,7 +18,5 @@ $p12 = base64_decode($p12_base64); test($p12, 'qwerty'); ?> -===DONE=== --EXPECT-- int(2) -===DONE=== diff --git a/ext/openssl/tests/bug74720_0.phpt b/ext/openssl/tests/bug74720_0.phpt index f85d83860c4..12579831100 100644 --- a/ext/openssl/tests/bug74720_0.phpt +++ b/ext/openssl/tests/bug74720_0.phpt @@ -82,11 +82,9 @@ unlink($tmpFileOut); unlink($tmpFileOut2); ?> -==DONE== --EXPECT-- bool(true) bool(true) int(39) int(39) int(39) -==DONE== diff --git a/ext/openssl/tests/bug74720_1.phpt b/ext/openssl/tests/bug74720_1.phpt index 231a083b762..24398684952 100644 --- a/ext/openssl/tests/bug74720_1.phpt +++ b/ext/openssl/tests/bug74720_1.phpt @@ -79,7 +79,5 @@ unlink($tmpPath); unlink($outPath); ?> -==DONE== --EXPECT-- bool(true) -==DONE== diff --git a/ext/openssl/tests/bug74798.phpt b/ext/openssl/tests/bug74798.phpt index 93f6ded44d6..a262895a6f5 100644 --- a/ext/openssl/tests/bug74798.phpt +++ b/ext/openssl/tests/bug74798.phpt @@ -82,7 +82,6 @@ unlink($tmpFileOut); unlink($tmpFileOut2); ?> -===DONE=== --EXPECT-- bool(true) bool(true) @@ -91,4 +90,3 @@ int(40) int(40) string(80) "537472696e672077697468200a2077696c6c20656e6420696e206f6e652062797465206d6f72652e" string(80) "537472696e672077697468200a2077696c6c20656e6420696e206f6e652062797465206d6f72652e" -===DONE=== diff --git a/ext/openssl/tests/bug74903.phpt b/ext/openssl/tests/bug74903.phpt index 41f0416fee8..2befa090278 100644 --- a/ext/openssl/tests/bug74903.phpt +++ b/ext/openssl/tests/bug74903.phpt @@ -75,8 +75,6 @@ unlink($tmpFileIn); unlink($tmpFileOut); ?> -==DONE== --EXPECT-- bool(true) bool(true) -==DONE== diff --git a/ext/openssl/tests/bug75307.phpt b/ext/openssl/tests/bug75307.phpt index 2b0cae3a97f..0b1f4ac2107 100644 --- a/ext/openssl/tests/bug75307.phpt +++ b/ext/openssl/tests/bug75307.phpt @@ -10,8 +10,6 @@ $rf = new ReflectionFunction('openssl_open'); var_dump($rf->getNumberOfParameters()); var_dump($rf->getNumberOfRequiredParameters()); ?> -===DONE=== --EXPECT-- int(6) int(4) -===DONE=== diff --git a/ext/pcre/tests/bug75207.phpt b/ext/pcre/tests/bug75207.phpt index 82b2cc9bd97..ea25c547c19 100644 --- a/ext/pcre/tests/bug75207.phpt +++ b/ext/pcre/tests/bug75207.phpt @@ -4,7 +4,5 @@ CVE-2016-1283, see bug #75207 -==DONE== --EXPECTF-- Warning: preg_match(): Compilation failed: unmatched closing parenthesis at offset %d in %s on line %d -==DONE== diff --git a/ext/pcre/tests/bug76512.phpt b/ext/pcre/tests/bug76512.phpt index cb8a9fa95f8..3090291736d 100644 --- a/ext/pcre/tests/bug76512.phpt +++ b/ext/pcre/tests/bug76512.phpt @@ -4,7 +4,5 @@ Bug #76512 (\w no longer includes unicode characters) -===DONE=== --EXPECT-- int(1) -===DONE=== diff --git a/ext/pcre/tests/bug76850.phpt b/ext/pcre/tests/bug76850.phpt index 3e07ab7aa85..50c62ad1b33 100644 --- a/ext/pcre/tests/bug76850.phpt +++ b/ext/pcre/tests/bug76850.phpt @@ -21,7 +21,5 @@ foo(); var_dump(preg_match('/./', "a")); ?> -==DONE== --EXPECT-- int(1) -==DONE== diff --git a/ext/pcre/tests/bug77193.phpt b/ext/pcre/tests/bug77193.phpt index 5dc7913db26..e143841e832 100644 --- a/ext/pcre/tests/bug77193.phpt +++ b/ext/pcre/tests/bug77193.phpt @@ -21,7 +21,5 @@ preg_replace_callback( ); echo '3', "\n"; ?> -===DONE=== --EXPECT-- 123 -===DONE=== diff --git a/ext/pcre/tests/bug77827.phpt b/ext/pcre/tests/bug77827.phpt index c8f8c7a16a3..ebb5d8b2282 100644 --- a/ext/pcre/tests/bug77827.phpt +++ b/ext/pcre/tests/bug77827.phpt @@ -7,8 +7,6 @@ var_dump( preg_last_error() ); ?> -===DONE=== --EXPECT-- int(1) int(0) -===DONE=== diff --git a/ext/pcre/tests/no_jit_bug70110.phpt b/ext/pcre/tests/no_jit_bug70110.phpt index fa673ac935e..aece1552579 100644 --- a/ext/pcre/tests/no_jit_bug70110.phpt +++ b/ext/pcre/tests/no_jit_bug70110.phpt @@ -9,8 +9,6 @@ var_dump(preg_match('/(*NO_JIT)^(A{1,2}B)+$$/',str_repeat('AB',8192))); var_dump(preg_match('~(*NO_JIT)(a)*~', str_repeat('a', 5431), $match)) ?> -==DONE== --EXPECT-- int(1) int(1) -==DONE== diff --git a/ext/pcre/tests/pcre.constants.phpt b/ext/pcre/tests/pcre.constants.phpt index 5abc6c72c2c..d58454c2258 100644 --- a/ext/pcre/tests/pcre.constants.phpt +++ b/ext/pcre/tests/pcre.constants.phpt @@ -18,7 +18,6 @@ echo "PREG_RECURSION_LIMIT_ERROR= ", PREG_RECURSION_LIMIT_ERROR, "\n"; echo "PREG_BAD_UTF8_ERROR= ", PREG_BAD_UTF8_ERROR, "\n"; ?> -===Done=== --EXPECT-- PCRE constants test PREG_PATTERN_ORDER= 1 @@ -32,4 +31,3 @@ PREG_INTERNAL_ERROR= 1 PREG_BACKTRACK_LIMIT_ERROR= 2 PREG_RECURSION_LIMIT_ERROR= 3 PREG_BAD_UTF8_ERROR= 4 -===Done=== diff --git a/ext/pcre/tests/preg_filter.phpt b/ext/pcre/tests/preg_filter.phpt index 6cd9802575a..1625fc8450c 100644 --- a/ext/pcre/tests/preg_filter.phpt +++ b/ext/pcre/tests/preg_filter.phpt @@ -10,7 +10,6 @@ $replace = array('A:$0', 'B:$0', 'C:$0'); var_dump(preg_filter($pattern, $replace, $subject)); ?> -===DONE=== --EXPECT-- array(6) { [0]=> @@ -26,4 +25,3 @@ array(6) { [7]=> string(3) "A:4" } -===DONE=== diff --git a/ext/pcre/tests/preg_match_basic_002.phpt b/ext/pcre/tests/preg_match_basic_002.phpt index bca8f3e3c5b..7aa125bda09 100644 --- a/ext/pcre/tests/preg_match_basic_002.phpt +++ b/ext/pcre/tests/preg_match_basic_002.phpt @@ -12,7 +12,6 @@ preg_match("/M(.*)/", $string, $matches); var_dump($matches); ?> -===Done=== --EXPECT-- array(2) { [0]=> @@ -20,4 +19,3 @@ array(2) { [1]=> string(1) "y" } -===Done=== diff --git a/ext/pcre/tests/preg_match_error4.phpt b/ext/pcre/tests/preg_match_error4.phpt index 06aa82b4692..361ea81ab98 100644 --- a/ext/pcre/tests/preg_match_error4.phpt +++ b/ext/pcre/tests/preg_match_error4.phpt @@ -929,7 +929,5 @@ if($count === false) { var_dump("Done, $count matches."); } ?> -==DONE== --EXPECT-- string(16) "Done, 1 matches." -==DONE== diff --git a/ext/pcre/tests/preg_match_variation1.phpt b/ext/pcre/tests/preg_match_variation1.phpt index 5fa50ce49c9..91c7841ff7a 100644 --- a/ext/pcre/tests/preg_match_variation1.phpt +++ b/ext/pcre/tests/preg_match_variation1.phpt @@ -13,10 +13,8 @@ $string = "-1"; preg_match('/[\-\+]?[0-9\.]*/', $string, $string); var_dump($string); ?> -===Done=== --EXPECT-- array(1) { [0]=> string(2) "-1" } -===Done=== diff --git a/ext/pcre/tests/preg_replace2.phpt b/ext/pcre/tests/preg_replace2.phpt index 13696827fb5..ac88e876e69 100644 --- a/ext/pcre/tests/preg_replace2.phpt +++ b/ext/pcre/tests/preg_replace2.phpt @@ -16,8 +16,6 @@ var_dump(preg_replace(array('/\da(.)/ui', '@(.)@'), '$1', array('x','a2aA', '1av var_dump(preg_replace(array('/[\w]+/'), array('$'), array('xyz', 'bdbd'))); var_dump(preg_replace(array('/\s+/', '~[b-d]~'), array('$'), array('x y', 'bd bc'))); -echo "==done==\n"; - ?> --EXPECT-- string(1) "c" @@ -41,4 +39,3 @@ array(2) { [1]=> string(1) "$" } -==done== diff --git a/ext/pcre/tests/preg_replace_callback_error1.phpt b/ext/pcre/tests/preg_replace_callback_error1.phpt index cf069692e8a..120944b33b3 100644 --- a/ext/pcre/tests/preg_replace_callback_error1.phpt +++ b/ext/pcre/tests/preg_replace_callback_error1.phpt @@ -26,7 +26,6 @@ foreach($regex_array as $regex_value) { var_dump(preg_replace_callback($regex_value, 'integer_word', $subject)); } ?> -===Done=== --EXPECTF-- *** Testing preg_replace_callback() : error conditions *** @@ -55,4 +54,3 @@ string(9) "number 1." Arg value is /[0-9]/ string(11) "number one." -===Done=== diff --git a/ext/pdo/tests/bug_36428.phpt b/ext/pdo/tests/bug_36428.phpt index 3cb32d47e81..981a4bb98ec 100644 --- a/ext/pdo/tests/bug_36428.phpt +++ b/ext/pdo/tests/bug_36428.phpt @@ -21,7 +21,6 @@ $res = $db->query("SELECT a FROM test"); var_dump($res->fetchAll(PDO::FETCH_CLASS|PDO::FETCH_PROPS_LATE, 'SimpleXMLElement', array(''))); ?> -===DONE=== --EXPECTF-- array(1) { [0]=> @@ -30,4 +29,3 @@ array(1) { string(3) "xyz" } } -===DONE=== diff --git a/ext/pdo/tests/bug_38394.phpt b/ext/pdo/tests/bug_38394.phpt index 6ec897fed78..e3c2a17fdae 100644 --- a/ext/pdo/tests/bug_38394.phpt +++ b/ext/pdo/tests/bug_38394.phpt @@ -26,7 +26,6 @@ $s->execute(array('a' => 9, 'b' => 10, 'c' => 11)); var_dump($db->query("SELECT * FROM test")->fetchAll(PDO::FETCH_ASSOC)); ?> -===DONE=== --EXPECT-- array(2) { [0]=> @@ -48,4 +47,3 @@ array(2) { string(2) "11" } } -===DONE=== diff --git a/ext/pdo/tests/bug_39398.phpt b/ext/pdo/tests/bug_39398.phpt index 7d76adca551..e0c78f824d2 100644 --- a/ext/pdo/tests/bug_39398.phpt +++ b/ext/pdo/tests/bug_39398.phpt @@ -23,7 +23,6 @@ $stmt->execute(); var_dump($db->query("SELECT * FROM test")->fetchAll(PDO::FETCH_ASSOC)); ?> -===DONE=== --EXPECT-- array(1) { [0]=> @@ -32,4 +31,3 @@ array(1) { string(1) "1" } } -===DONE=== diff --git a/ext/pdo/tests/bug_50458.phpt b/ext/pdo/tests/bug_50458.phpt index f248f5f387b..f5a25f0a14c 100644 --- a/ext/pdo/tests/bug_50458.phpt +++ b/ext/pdo/tests/bug_50458.phpt @@ -20,10 +20,8 @@ $res = $db->query("SELECT a FROM test"); var_dump($res->fetchAll(PDO::FETCH_FUNC, function($a) { return strtoupper($a); })); ?> -===DONE=== --EXPECT-- array(1) { [0]=> string(3) "XYZ" } -===DONE=== diff --git a/ext/pdo/tests/bug_52098.phpt b/ext/pdo/tests/bug_52098.phpt index 681af4c594a..68df06ccc4f 100644 --- a/ext/pdo/tests/bug_52098.phpt +++ b/ext/pdo/tests/bug_52098.phpt @@ -51,9 +51,7 @@ echo $obj->lucky(); $db->exec("DROP TABLE test"); ?> -===DONE=== --EXPECT-- Calling object method 'foo' Calling object method 'bar' Calling object method 'lucky' -===DONE=== diff --git a/ext/pdo/tests/bug_60665.phpt b/ext/pdo/tests/bug_60665.phpt index 99cc07171a3..fef212ae95d 100644 --- a/ext/pdo/tests/bug_60665.phpt +++ b/ext/pdo/tests/bug_60665.phpt @@ -32,7 +32,6 @@ var_dump( !isset($row->missing) ); ?> -===DONE=== --EXPECT-- bool(true) bool(true) @@ -42,4 +41,3 @@ bool(true) bool(true) bool(true) bool(true) -===DONE=== diff --git a/ext/pdo/tests/bug_64172.phpt b/ext/pdo/tests/bug_64172.phpt index 9a729c90c12..636bbc798b0 100644 --- a/ext/pdo/tests/bug_64172.phpt +++ b/ext/pdo/tests/bug_64172.phpt @@ -45,7 +45,6 @@ var_dump($db->errorInfo()); $db->exec("DROP TABLE test"); ?> -===DONE=== --EXPECTF-- ===FAIL=== @@ -81,4 +80,3 @@ array(3) { [2]=> NULL } -===DONE=== diff --git a/ext/pdo/tests/bug_71885.phpt b/ext/pdo/tests/bug_71885.phpt index 64e92608be2..25ddbdd90f8 100644 --- a/ext/pdo/tests/bug_71885.phpt +++ b/ext/pdo/tests/bug_71885.phpt @@ -46,9 +46,7 @@ try { } ?> -===DONE=== --EXPECT-- bool(true) bool(true) bool(true) -===DONE=== diff --git a/ext/pdo_mysql/tests/bug75177.phpt b/ext/pdo_mysql/tests/bug75177.phpt index 3a9127cb1e6..4f2adaf7784 100644 --- a/ext/pdo_mysql/tests/bug75177.phpt +++ b/ext/pdo_mysql/tests/bug75177.phpt @@ -25,9 +25,7 @@ foreach ($ret as $i) { } ?> -==DONE== --EXPECT-- string(1) "1" string(1) "3" string(2) "12" -==DONE== diff --git a/ext/pgsql/tests/02connection.phpt b/ext/pgsql/tests/02connection.phpt index 8db5e2071a6..16a44e5dd91 100644 --- a/ext/pgsql/tests/02connection.phpt +++ b/ext/pgsql/tests/02connection.phpt @@ -53,7 +53,5 @@ if (pg_options($db)) pg_close($db); ?> -===DONE=== --EXPECTF-- resource(%d) of type (pgsql link%s) -===DONE=== diff --git a/ext/pgsql/tests/80_bug27597.phpt b/ext/pgsql/tests/80_bug27597.phpt index 6411d9ba367..5e28258570b 100644 --- a/ext/pgsql/tests/80_bug27597.phpt +++ b/ext/pgsql/tests/80_bug27597.phpt @@ -39,7 +39,6 @@ while($row = xi_fetch_array($res)) { pg_close($dbh); ?> -===DONE=== --EXPECT-- Array ( @@ -57,4 +56,3 @@ Array ( [id] => 3 ) -===DONE=== diff --git a/ext/pgsql/tests/80_bug32223.phpt b/ext/pgsql/tests/80_bug32223.phpt index fbe0d5ff97e..36dd3a803f4 100644 --- a/ext/pgsql/tests/80_bug32223.phpt +++ b/ext/pgsql/tests/80_bug32223.phpt @@ -52,7 +52,6 @@ if ($row[0] == 'f') pg_close($dbh); ?> -===DONE=== --EXPECTF-- resource(%d) of type (pgsql result) resource(%d) of type (pgsql result) @@ -61,4 +60,3 @@ array(1) { string(1) "f" } string(14) "NOTICE: 11111" -===DONE=== diff --git a/ext/pgsql/tests/80_bug32223b.phpt b/ext/pgsql/tests/80_bug32223b.phpt index 9e0e0f71329..05846043536 100644 --- a/ext/pgsql/tests/80_bug32223b.phpt +++ b/ext/pgsql/tests/80_bug32223b.phpt @@ -55,7 +55,6 @@ tester(); pg_close(dbh); ?> -===DONE=== --EXPECTF-- resource(%d) of type (pgsql result) array(1) { @@ -63,4 +62,3 @@ array(1) { string(1) "f" } string(14) "NOTICE: 11111" -===DONE=== diff --git a/ext/pgsql/tests/80_bug36625.phpt b/ext/pgsql/tests/80_bug36625.phpt index b36ff4e8901..5d83024681a 100644 --- a/ext/pgsql/tests/80_bug36625.phpt +++ b/ext/pgsql/tests/80_bug36625.phpt @@ -40,7 +40,6 @@ var_dump(file_exists($tracefile)); @unlink($tracefile); ?> -===DONE=== --CLEAN-- -===DONE=== --EXPECTF-- array(2) { ["id"]=> @@ -31,4 +30,3 @@ array(2) { ["time"]=> string(%d) "%s" } -===DONE=== diff --git a/ext/pgsql/tests/bug71998.phpt b/ext/pgsql/tests/bug71998.phpt index f69261c1c07..0aed3afa0ec 100644 --- a/ext/pgsql/tests/bug71998.phpt +++ b/ext/pgsql/tests/bug71998.phpt @@ -76,7 +76,6 @@ pg_query($db, "DROP TABLE tmp_statistics"); pg_close($db); ?> -==DONE== --EXPECT-- array(2) { [0]=> @@ -193,4 +192,3 @@ array(2) { string(19) "2001:4f8:3:ba::/112" } 7 errors catched -==DONE== diff --git a/ext/pgsql/tests/bug72028.phpt b/ext/pgsql/tests/bug72028.phpt index 217a03abc74..a16f8e72f74 100644 --- a/ext/pgsql/tests/bug72028.phpt +++ b/ext/pgsql/tests/bug72028.phpt @@ -35,7 +35,6 @@ while (false !== ($i = pg_fetch_assoc($r))) { pg_query("DROP TABLE $table"); ?> -==DONE== --EXPECT-- array(2) { ["value"]=> @@ -49,4 +48,3 @@ array(2) { ["details"]=> string(37) "insert after looping with a reference" } -==DONE== diff --git a/ext/pgsql/tests/bug72197.phpt b/ext/pgsql/tests/bug72197.phpt index 7732bfddfcc..796d4c713cd 100644 --- a/ext/pgsql/tests/bug72197.phpt +++ b/ext/pgsql/tests/bug72197.phpt @@ -30,9 +30,7 @@ var_dump($oid); pg_query($conn, "ROLLBACK"); pg_close($conn); ?> -==DONE== --EXPECTF-- pg_lo_create(): supplied resource is not a valid PostgreSQL link resource%w int(%d) int(%d) -==DONE== diff --git a/ext/pgsql/tests/bug76548.phpt b/ext/pgsql/tests/bug76548.phpt index 00940dcec0e..9087b234a2f 100644 --- a/ext/pgsql/tests/bug76548.phpt +++ b/ext/pgsql/tests/bug76548.phpt @@ -15,9 +15,7 @@ while ($value = pg_fetch_result($result, 0)) { } ?> -==DONE== --EXPECT-- string(1) "1" string(1) "2" string(1) "3" -==DONE== diff --git a/ext/phar/tests/001.phpt b/ext/phar/tests/001.phpt index 1205e4e1aaf..b370bef746c 100644 --- a/ext/phar/tests/001.phpt +++ b/ext/phar/tests/001.phpt @@ -6,7 +6,5 @@ Phar::apiVersion -===DONE=== --EXPECT-- string(5) "1.1.1" -===DONE=== diff --git a/ext/phar/tests/003a.phpt b/ext/phar/tests/003a.phpt index 37e31072d49..20f178972a9 100644 --- a/ext/phar/tests/003a.phpt +++ b/ext/phar/tests/003a.phpt @@ -7,8 +7,6 @@ Phar::canCompress, specific var_dump(Phar::canCompress(Phar::GZ) == extension_loaded("zlib")); var_dump(Phar::canCompress(Phar::BZ2) == extension_loaded("bz2")); ?> -===DONE=== --EXPECT-- bool(true) bool(true) -===DONE=== diff --git a/ext/phar/tests/023.phpt b/ext/phar/tests/023.phpt index f6920a48e07..e16e870b59d 100644 --- a/ext/phar/tests/023.phpt +++ b/ext/phar/tests/023.phpt @@ -22,11 +22,9 @@ var_dump(file_get_contents($pname . '/b.php')); var_dump(file_get_contents($pname . '/b/c.php')); ?> -===DONE=== --CLEAN-- --EXPECT-- string(28) "" string(28) "" string(30) "" -===DONE=== diff --git a/ext/phar/tests/024-opcache-win32.phpt b/ext/phar/tests/024-opcache-win32.phpt index 81eedd9668e..afcd93e5f5b 100644 --- a/ext/phar/tests/024-opcache-win32.phpt +++ b/ext/phar/tests/024-opcache-win32.phpt @@ -51,11 +51,9 @@ if (is_dir($cache_dir)) { } ?> -===DONE=== --CLEAN-- --EXPECT-- This is a This is b This is b/c -===DONE=== diff --git a/ext/phar/tests/024.phpt b/ext/phar/tests/024.phpt index 8ec0911e741..f0477dee426 100644 --- a/ext/phar/tests/024.phpt +++ b/ext/phar/tests/024.phpt @@ -22,11 +22,9 @@ include $pname . '/b.php'; include $pname . '/b/c.php'; ?> -===DONE=== --CLEAN-- --EXPECT-- This is a This is b This is b/c -===DONE=== diff --git a/ext/phar/tests/025.phpt b/ext/phar/tests/025.phpt index 76f2b1eb774..de2030448e0 100644 --- a/ext/phar/tests/025.phpt +++ b/ext/phar/tests/025.phpt @@ -22,11 +22,9 @@ include $pname . '/b'; include $pname . '/b/b'; ?> -===DONE=== --CLEAN-- --EXPECT-- This is a This is b This is b/b -===DONE=== diff --git a/ext/phar/tests/026.phpt b/ext/phar/tests/026.phpt index d58555343f5..05e11f6a586 100644 --- a/ext/phar/tests/026.phpt +++ b/ext/phar/tests/026.phpt @@ -22,7 +22,6 @@ include 'files/phar_test.inc'; require $pname . '/a.php'; ?> -===DONE=== --CLEAN-- --EXPECT-- @@ -31,4 +30,3 @@ This is b This is b/c This is b/d This is e -===DONE=== diff --git a/ext/phar/tests/027.phpt b/ext/phar/tests/027.phpt index 89b72527272..1d7ab5eae6d 100644 --- a/ext/phar/tests/027.phpt +++ b/ext/phar/tests/027.phpt @@ -56,7 +56,6 @@ echo "opendir edge cases\n"; var_dump(opendir("phar://")); var_dump(opendir("phar://foo.phar/hi")); ?> -===DONE=== --CLEAN-- --EXPECTF-- @@ -93,4 +92,3 @@ bool(false) Warning: opendir(phar://foo.phar/hi): failed to open dir: phar error: invalid url or non-existent phar "phar://foo.phar/hi" phar url "phar://foo.phar/hi" is unknown in %s027.php on line %d bool(false) -===DONE=== diff --git a/ext/phar/tests/028.phpt b/ext/phar/tests/028.phpt index 19f1d988a3b..89789381e02 100644 --- a/ext/phar/tests/028.phpt +++ b/ext/phar/tests/028.phpt @@ -29,7 +29,6 @@ echo "======\n"; include $pname . '/a.php'; ?> -===DONE=== --CLEAN-- --EXPECT-- @@ -44,4 +43,3 @@ This is b This is b/c This is b/d This is e -===DONE=== diff --git a/ext/phar/tests/029.phpt b/ext/phar/tests/029.phpt index dc7f3acb63e..d87064685ce 100644 --- a/ext/phar/tests/029.phpt +++ b/ext/phar/tests/029.phpt @@ -37,7 +37,6 @@ catch (Exception $e) } ?> -===DONE=== --CLEAN-- getMessage(),"\n"; } ?> -===DONE=== --CLEAN-- isReadable()); $a['dir']->chmod(0666); var_dump($a['dir']->isReadable()); ?> -===DONE=== --CLEAN-- getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- addFromString('.phar/stub.php', 'hi'); echo $e->getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- --EXPECTF-- @@ -50,4 +49,3 @@ Entry a does not exist and cannot be created: phar error: file "a" in phar "%sad phar error: unable to open file "%s/does/not/exist" to add to phar archive Cannot create any files in magic ".phar" directory Cannot create any files in magic ".phar" directory -===DONE=== diff --git a/ext/phar/tests/alias_acrobatics.phpt b/ext/phar/tests/alias_acrobatics.phpt index 56391def63b..c30b2a3b075 100644 --- a/ext/phar/tests/alias_acrobatics.phpt +++ b/ext/phar/tests/alias_acrobatics.phpt @@ -32,7 +32,6 @@ $b = new Phar($fname, 0, 'another'); echo $e->getMessage(),"\n"; } ?> -===DONE=== --CLEAN-- getMessage() . "\n"; } ?> -===DONE=== --EXPECTF-- Phar::mungServer() expects parameter 1 to be array, string given Phar::createDefaultStub() expects parameter 1 to be a valid path, array given @@ -267,4 +266,3 @@ Phar::addFromString() expects exactly 2 parameters, 1 given Write operations disabled by the php.ini setting phar.readonly Phar::setMetadata() expects exactly 1 parameter, 2 given Write operations disabled by the php.ini setting phar.readonly -===DONE=== diff --git a/ext/phar/tests/bug13727.phpt b/ext/phar/tests/bug13727.phpt index 2db6637efc9..345968cdbbc 100644 --- a/ext/phar/tests/bug13727.phpt +++ b/ext/phar/tests/bug13727.phpt @@ -22,7 +22,6 @@ for ($i = 0; $i < 4*1024; $i++){ } echo("\n Written Files($i)\n"); ?> -===DONE=== --CLEAN-- getMessage() . "\n"; } ?> -===DONE=== --EXPECTF-- string(26) "file 0 in DataArchive.phar" unable to seek to start of file "0" while creating new phar "%sDataArchive.phar" -===DONE=== diff --git a/ext/phar/tests/bug45218_SLOWTEST.phpt b/ext/phar/tests/bug45218_SLOWTEST.phpt index c71a2be6189..1282ac22e96 100644 --- a/ext/phar/tests/bug45218_SLOWTEST.phpt +++ b/ext/phar/tests/bug45218_SLOWTEST.phpt @@ -51,7 +51,6 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- string(22) "*bug45218_SLOWTEST.txt" } -===DONE=== diff --git a/ext/phar/tests/bug46060.phpt b/ext/phar/tests/bug46060.phpt index 02a4a7e8675..f2df7ab60b1 100644 --- a/ext/phar/tests/bug46060.phpt +++ b/ext/phar/tests/bug46060.phpt @@ -19,7 +19,6 @@ $phar = new PharData($fname2); var_dump($phar['blah']->isDir(), $phar['test']->isDir()); ?> -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- --EXPECTF-- Warning: rename(): phar error: cannot rename "phar://a.phar/x" to "phar://a.phar/y" from extracted phar archive, source does not exist in %sbug47085.php on line %d bool(false) -===DONE=== diff --git a/ext/phar/tests/bug48377.2.phpt b/ext/phar/tests/bug48377.2.phpt index 130aaa8646b..04df8940f23 100644 --- a/ext/phar/tests/bug48377.2.phpt +++ b/ext/phar/tests/bug48377.2.phpt @@ -17,9 +17,7 @@ try { echo $e->getMessage(),"\n"; } ?> -===DONE=== --CLEAN-- --EXPECTF-- data phar "%sbug48377.2.phar.zip" has invalid extension phar.zip -===DONE=== diff --git a/ext/phar/tests/bug48377.phpt b/ext/phar/tests/bug48377.phpt index 6c16654ef19..ec52c1a0f52 100644 --- a/ext/phar/tests/bug48377.phpt +++ b/ext/phar/tests/bug48377.phpt @@ -20,10 +20,8 @@ try { echo $e->getMessage(),"\n"; } ?> -===DONE=== --CLEAN-- --EXPECTF-- phar "%sbug48377.zip" exists and must be unlinked prior to conversion -===DONE=== diff --git a/ext/phar/tests/bug60164.phpt b/ext/phar/tests/bug60164.phpt index 83883b6ee51..8cc2eceaa0c 100644 --- a/ext/phar/tests/bug60164.phpt +++ b/ext/phar/tests/bug60164.phpt @@ -14,8 +14,6 @@ foreach (new RecursiveIteratorIterator(new Phar($phar, null, 'stuboflength1041.p var_dump($item->getFileName()); } ?> -===DONE=== --EXPECT-- string(5) "a.php" string(5) "b.php" -===DONE=== diff --git a/ext/phar/tests/bug64931/bug64931.phpt b/ext/phar/tests/bug64931/bug64931.phpt index aa2d17182cb..0de8d43e786 100644 --- a/ext/phar/tests/bug64931/bug64931.phpt +++ b/ext/phar/tests/bug64931/bug64931.phpt @@ -43,7 +43,6 @@ try { } ?> -===DONE=== --CLEAN-- -==DONE== --EXPECTF-- UnexpectedValueException: phar error: corrupted central directory entry, no magic signature in zip-based phar "%sbug69441.phar" in %sbug69441.php:%d Stack trace: #0 %s%ebug69441.php(%d): Phar->__construct('%s', 0) #1 {main} -==DONE== diff --git a/ext/phar/tests/bug69453.phpt b/ext/phar/tests/bug69453.phpt index 3309d367c63..eb7d5f248fc 100644 --- a/ext/phar/tests/bug69453.phpt +++ b/ext/phar/tests/bug69453.phpt @@ -12,10 +12,8 @@ $r = new Phar($fname, 0); } ?> -==DONE== --EXPECTF-- UnexpectedValueException: phar error: "%s%ebug69453.tar.phar" is a corrupted tar file (checksum mismatch of file "") in %s:%d Stack trace: #0 %s%ebug69453.php(%d): Phar->__construct('%s', 0) #1 {main} -==DONE== diff --git a/ext/phar/tests/bug70019.phpt b/ext/phar/tests/bug70019.phpt index edd77125e15..cc1fa3083d1 100644 --- a/ext/phar/tests/bug70019.phpt +++ b/ext/phar/tests/bug70019.phpt @@ -12,7 +12,6 @@ if(!is_dir($dir)) { $phar->extractTo($dir); var_dump(file_exists("$dir/ThisIsATestFile.txt")); ?> -===DONE=== --CLEAN-- --EXPECT-- bool(true) -===DONE=== diff --git a/ext/phar/tests/bug74386.phpt b/ext/phar/tests/bug74386.phpt index 0e60e000099..f5ff2d3cca0 100644 --- a/ext/phar/tests/bug74386.phpt +++ b/ext/phar/tests/bug74386.phpt @@ -12,10 +12,8 @@ $r = new ReflectionMethod(PharData::class, '__construct'); var_dump($r->getNumberOfRequiredParameters()); var_dump($r->getNumberOfParameters()); ?> -===DONE=== --EXPECT-- int(1) int(3) int(1) int(4) -===DONE=== diff --git a/ext/phar/tests/cache_list/copyonwrite4a.phpt b/ext/phar/tests/cache_list/copyonwrite4a.phpt index 948edced47b..e0da5e7b8a7 100644 --- a/ext/phar/tests/cache_list/copyonwrite4a.phpt +++ b/ext/phar/tests/cache_list/copyonwrite4a.phpt @@ -12,9 +12,7 @@ var_dump(file_exists('phar://' . __DIR__ . '/files/write4.phar/testit.txt')); Phar::mount('phar://' . __DIR__ . '/files/write4.phar/testit.txt', 'phar://' . __DIR__ . '/files/write4.phar/tobemounted'); var_dump(file_exists('phar://' . __DIR__ . '/files/write4.phar/testit.txt'), file_get_contents('phar://' . __DIR__ . '/files/write4.phar/testit.txt')); ?> -===DONE=== --EXPECT-- bool(false) bool(true) string(2) "hi" -===DONE=== diff --git a/ext/phar/tests/cached_manifest_1.phpt b/ext/phar/tests/cached_manifest_1.phpt index d9c40723aec..55669b6956f 100644 --- a/ext/phar/tests/cached_manifest_1.phpt +++ b/ext/phar/tests/cached_manifest_1.phpt @@ -21,7 +21,6 @@ var_dump(is_dir($pname . '/b')); var_dump(is_dir($pname . '/d')); var_dump(is_dir($pname . '/b/c.php')); ?> -===DONE=== --EXPECTF-- string(131) " -===DONE=== --CLEAN-- --EXPECTF-- @@ -54,4 +53,3 @@ string(40) "%s" bool(true) modified! another! -===DONE=== diff --git a/ext/phar/tests/create_new_phar.phpt b/ext/phar/tests/create_new_phar.phpt index 79724b9b746..078d75491a0 100644 --- a/ext/phar/tests/create_new_phar.phpt +++ b/ext/phar/tests/create_new_phar.phpt @@ -18,10 +18,8 @@ file_put_contents('phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.pha include 'phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php/$fileName.php'; ?> -===DONE=== --CLEAN-- --EXPECT-- brand new! Text in utf8 file. -===DONE=== diff --git a/ext/phar/tests/create_new_phar_b.phpt b/ext/phar/tests/create_new_phar_b.phpt index 8b0d6e26dc2..374d4ae8216 100644 --- a/ext/phar/tests/create_new_phar_b.phpt +++ b/ext/phar/tests/create_new_phar_b.phpt @@ -13,7 +13,6 @@ file_put_contents('phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.pha include 'phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php/a.php'; ?> -===DONE=== --CLEAN-- --EXPECTF-- @@ -23,4 +22,3 @@ Warning: include(phar://%screate_new_phar_b.phar.php/a.php): failed to open stre Warning: include(): Failed opening 'phar://%screate_new_phar_b.phar.php/a.php' for inclusion (include_path='%s') in %screate_new_phar_b.php on line %d -===DONE=== diff --git a/ext/phar/tests/create_new_phar_c.phpt b/ext/phar/tests/create_new_phar_c.phpt index 19a4c817512..dc52dbf45b1 100644 --- a/ext/phar/tests/create_new_phar_c.phpt +++ b/ext/phar/tests/create_new_phar_c.phpt @@ -15,7 +15,6 @@ $phar = new Phar(__DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php'); var_dump($phar->getSignature()); ?> -===DONE=== --CLEAN-- --EXPECTF-- @@ -25,4 +24,3 @@ array(2) { ["hash_type"]=> string(5) "SHA-1" } -===DONE=== diff --git a/ext/phar/tests/create_path_error.phpt b/ext/phar/tests/create_path_error.phpt index 4987c19b179..9fad268065c 100644 --- a/ext/phar/tests/create_path_error.phpt +++ b/ext/phar/tests/create_path_error.phpt @@ -60,7 +60,6 @@ foreach($checks as $check) } ?> -===DONE=== --CLEAN-- --EXPECTF-- @@ -80,4 +79,3 @@ string(5) "query" 12:Error: file_put_contents(phar://%s): failed to open stream: phar error: invalid path "%s" contains illegal character 13:Error: file_put_contents(phar://%s): failed to open stream: phar error: invalid path "%s" contains illegal character Exception: Phar::offsetSet() expects parameter 1 to be a valid path, string given -===DONE=== diff --git a/ext/phar/tests/delete_in_phar.phpt b/ext/phar/tests/delete_in_phar.phpt index 0d904d57bb5..8f6efd4efd1 100644 --- a/ext/phar/tests/delete_in_phar.phpt +++ b/ext/phar/tests/delete_in_phar.phpt @@ -30,7 +30,6 @@ include $pname . '/b.php'; include $pname . '/b/c.php'; ?> -===DONE=== --CLEAN-- --EXPECTF-- @@ -45,4 +44,3 @@ Warning: include(%sdelete_in_phar.phar.php/b/c.php): failed to open stream: phar Warning: include(): Failed opening 'phar://%sdelete_in_phar.phar.php/b/c.php' for inclusion (include_path='%s') in %sdelete_in_phar.php on line %d -===DONE=== diff --git a/ext/phar/tests/delete_in_phar_b.phpt b/ext/phar/tests/delete_in_phar_b.phpt index 8d5d78debc3..ce45b03c840 100644 --- a/ext/phar/tests/delete_in_phar_b.phpt +++ b/ext/phar/tests/delete_in_phar_b.phpt @@ -29,7 +29,6 @@ include $pname . '/b.php'; include $pname . '/b/c.php'; ?> -===DONE=== --CLEAN-- --EXPECTF-- @@ -43,4 +42,3 @@ This is a This is b This is b/c -===DONE=== diff --git a/ext/phar/tests/delete_in_phar_confirm.phpt b/ext/phar/tests/delete_in_phar_confirm.phpt index 1f8015f0cbc..066938e29c0 100644 --- a/ext/phar/tests/delete_in_phar_confirm.phpt +++ b/ext/phar/tests/delete_in_phar_confirm.phpt @@ -34,7 +34,6 @@ include 'phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php/b.ph include 'phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php/b/c.php'; ?> -===DONE=== --CLEAN-- --EXPECTF-- @@ -49,4 +48,3 @@ Warning: include(%sdelete_in_phar_confirm.phar.php/b/c.php): failed to open stre Warning: include(): Failed opening 'phar://%sdelete_in_phar_confirm.phar.php/b/c.php' for inclusion (include_path='%s') in %sdelete_in_phar_confirm.php on line %d -===DONE=== diff --git a/ext/phar/tests/dir.phpt b/ext/phar/tests/dir.phpt index c34f01a7f11..964c4372984 100644 --- a/ext/phar/tests/dir.phpt +++ b/ext/phar/tests/dir.phpt @@ -50,7 +50,6 @@ rmdir($pname); rmdir($pname . '/'); mkdir($pname . '/'); ?> -===DONE=== --CLEAN-- @@ -89,4 +88,3 @@ Warning: rmdir(): phar error: cannot remove directory "" in phar "%sdir.phar.php Warning: rmdir(): phar error: cannot remove directory "" in phar "%sdir.phar.php", directory does not exist in %sdir.php on line %d Warning: mkdir(): phar error: cannot create directory "" in phar "%sdir.phar.php", phar error: invalid path "" must not be empty in %sdir.php on line %d -===DONE=== diff --git a/ext/phar/tests/fgc_edgecases.phpt b/ext/phar/tests/fgc_edgecases.phpt index 4a6b367aab1..118a5ff550f 100644 --- a/ext/phar/tests/fgc_edgecases.phpt +++ b/ext/phar/tests/fgc_edgecases.phpt @@ -44,7 +44,6 @@ echo file_get_contents("./hi", 0, $context, 0, 0); include $pname . '/foo/hi'; ?> -===DONE=== --CLEAN-- @@ -99,4 +98,3 @@ echo file_get_contents("./hi", 0, $context, 50000); echo file_get_contents("./hi"); echo file_get_contents("./hi", 0, $context, 0, 0); ?> -===DONE=== diff --git a/ext/phar/tests/fopen.phpt b/ext/phar/tests/fopen.phpt index 42175bc037c..5af0737530b 100644 --- a/ext/phar/tests/fopen.phpt +++ b/ext/phar/tests/fopen.phpt @@ -31,10 +31,8 @@ include "index.php"; __HALT_COMPILER();'); include $fname; ?> -===DONE=== --CLEAN-- --EXPECTF-- hihi Warning: fopen(notfound.txt): failed to open stream: No such file or directory in phar://%sfopen.phar.php/index.php on line %d -===DONE=== diff --git a/ext/phar/tests/fopen_edgecases.phpt b/ext/phar/tests/fopen_edgecases.phpt index 5dce0384ff2..52e8f476c10 100644 --- a/ext/phar/tests/fopen_edgecases.phpt +++ b/ext/phar/tests/fopen_edgecases.phpt @@ -66,7 +66,6 @@ $a = fopen("./notfound.php", "r"); include $pname . '/test.php'; ?> -===DONE=== --CLEAN-- @@ -121,4 +120,3 @@ Warning: rename(): phar error: cannot rename "phar://%sfopen_edgecases.phar.php/ Warning: fopen(./notfound.php): failed to open stream: No such file or directory in phar://%sfopen_edgecases.phar.php/test.php on line %d -===DONE=== diff --git a/ext/phar/tests/fopen_edgecases2.phpt b/ext/phar/tests/fopen_edgecases2.phpt index 840c039d9e2..586e9ba20ed 100644 --- a/ext/phar/tests/fopen_edgecases2.phpt +++ b/ext/phar/tests/fopen_edgecases2.phpt @@ -33,7 +33,6 @@ fopen("../oops", "r"); '); include $pname . '/foo/hi'; ?> -===DONE=== --CLEAN-- @@ -44,4 +43,3 @@ blah test Warning: fopen(phar://%sfopen_edgecases2.phar.php/oops): failed to open stream: phar error: path "oops" is a directory in phar://%sfopen_edgecases2.phar.php/foo/hi on line %d -===DONE=== diff --git a/ext/phar/tests/include_path.phpt b/ext/phar/tests/include_path.phpt index 7831fc72e35..38486c47480 100644 --- a/ext/phar/tests/include_path.phpt +++ b/ext/phar/tests/include_path.phpt @@ -21,7 +21,6 @@ set_include_path('.' . PATH_SEPARATOR . 'phar://' . $fname . '/test'); include 'file1.php'; include 'file2.php'; ?> -===DONE=== --CLEAN-- -===DONE=== --EXPECT-- string(1) "0" string(1) "0" @@ -84,4 +83,3 @@ string(4) "true" bool(true) string(1) "0" string(1) "0" -===DONE=== diff --git a/ext/phar/tests/invalid_alias.phpt b/ext/phar/tests/invalid_alias.phpt index 7a3cb315757..255bef52d7c 100644 --- a/ext/phar/tests/invalid_alias.phpt +++ b/ext/phar/tests/invalid_alias.phpt @@ -32,7 +32,6 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- $cont) { var_dump(file_get_contents($pname.'/'.$name)); } ?> -===DONE=== --CLEAN-- --EXPECT-- @@ -60,4 +59,3 @@ string(1) "a" string(1) "b" string(1) "c" string(1) "d" -===DONE=== diff --git a/ext/phar/tests/metadata_write.phpt b/ext/phar/tests/metadata_write.phpt index 1dea6dfac26..fefa2bc0c0a 100644 --- a/ext/phar/tests/metadata_write.phpt +++ b/ext/phar/tests/metadata_write.phpt @@ -40,7 +40,6 @@ foreach($files as $name => $cont) { var_dump(file_get_contents($pname.'/'.$name)); } ?> -===DONE=== --CLEAN-- --EXPECT-- @@ -61,4 +60,3 @@ string(1) "a" string(1) "b" string(1) "c" string(1) "d" -===DONE=== diff --git a/ext/phar/tests/metadata_write_commit.phpt b/ext/phar/tests/metadata_write_commit.phpt index def84b06f9d..02fceee29dd 100644 --- a/ext/phar/tests/metadata_write_commit.phpt +++ b/ext/phar/tests/metadata_write_commit.phpt @@ -48,7 +48,6 @@ foreach($files as $name => $cont) { var_dump($phar[$name]->getMetadata()); } ?> -===DONE=== --CLEAN-- --EXPECT-- @@ -78,4 +77,3 @@ array(2) { string(3) "bar" } bool(true) -===DONE=== diff --git a/ext/phar/tests/mkdir.phpt b/ext/phar/tests/mkdir.phpt index 32081b145d7..3a5782f3ef7 100644 --- a/ext/phar/tests/mkdir.phpt +++ b/ext/phar/tests/mkdir.phpt @@ -25,7 +25,6 @@ $a->addEmptyDir('.phar'); echo $e->getMessage(),"\n"; } ?> -===DONE=== --CLEAN-- getMessage(), "\n"; } ?> -===DONE=== --CLEAN-- -===DONE=== --EXPECT-- in b -===DONE=== --CLEAN-- --EXPECT-- extra -===DONE=== diff --git a/ext/phar/tests/open_for_write_existing_b.phpt b/ext/phar/tests/open_for_write_existing_b.phpt index 16b9d0cbbec..ddd1e904ef1 100644 --- a/ext/phar/tests/open_for_write_existing_b.phpt +++ b/ext/phar/tests/open_for_write_existing_b.phpt @@ -22,11 +22,9 @@ include 'files/phar_test.inc'; var_dump(fopen($pname . '/b/c.php', 'wb')); include $pname . '/b/c.php'; ?> -===DONE=== --CLEAN-- --EXPECTF-- Warning: fopen(phar://%sopen_for_write_existing_b.phar.php/b/c.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_existing_b.php on line %d bool(false) This is b/c -===DONE=== diff --git a/ext/phar/tests/open_for_write_existing_c.phpt b/ext/phar/tests/open_for_write_existing_c.phpt index 4eee2ea25f5..d46f8b23b12 100644 --- a/ext/phar/tests/open_for_write_existing_c.phpt +++ b/ext/phar/tests/open_for_write_existing_c.phpt @@ -22,11 +22,9 @@ include 'files/phar_test.inc'; var_dump(fopen($pname . '/b/c.php', 'wb')); include $pname . '/b/c.php'; ?> -===DONE=== --CLEAN-- --EXPECTF-- Warning: fopen(phar://%sopen_for_write_existing_c.phar.php/b/c.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_existing_c.php on line %d bool(false) This is b/c -===DONE=== diff --git a/ext/phar/tests/open_for_write_newfile.phpt b/ext/phar/tests/open_for_write_newfile.phpt index bd54a133970..57b7be090d7 100644 --- a/ext/phar/tests/open_for_write_newfile.phpt +++ b/ext/phar/tests/open_for_write_newfile.phpt @@ -24,10 +24,8 @@ include $pname . '/b/c.php'; include $pname . '/b/new.php'; ?> -===DONE=== --CLEAN-- --EXPECT-- This is b/c extra -===DONE=== diff --git a/ext/phar/tests/open_for_write_newfile_b.phpt b/ext/phar/tests/open_for_write_newfile_b.phpt index 576388eb2d6..99538325af3 100644 --- a/ext/phar/tests/open_for_write_newfile_b.phpt +++ b/ext/phar/tests/open_for_write_newfile_b.phpt @@ -24,7 +24,6 @@ include $pname . '/b/c.php'; include $pname . '/b/new.php'; ?> -===DONE=== --CLEAN-- --EXPECTF-- @@ -36,4 +35,3 @@ Warning: include(phar://%sopen_for_write_newfile_b.phar.php/b/new.php): failed t Warning: include(): Failed opening 'phar://%sopen_for_write_newfile_b.phar.php/b/new.php' for inclusion (include_path='%s') in %sopen_for_write_newfile_b.php on line %d -===DONE=== diff --git a/ext/phar/tests/open_for_write_newfile_c.phpt b/ext/phar/tests/open_for_write_newfile_c.phpt index 0eb70d63e5b..470aefede0b 100644 --- a/ext/phar/tests/open_for_write_newfile_c.phpt +++ b/ext/phar/tests/open_for_write_newfile_c.phpt @@ -24,7 +24,6 @@ include $pname . '/b/c.php'; include $pname . '/b/new.php'; ?> -===DONE=== --CLEAN-- --EXPECTF-- @@ -36,4 +35,3 @@ Warning: include(phar://%sopen_for_write_newfile_c.phar.php/b/new.php): failed t Warning: include(): Failed opening 'phar://%sopen_for_write_newfile_c.phar.php/b/new.php' for inclusion (include_path='%s') in %sopen_for_write_newfile_c.php on line %d -===DONE=== diff --git a/ext/phar/tests/opendir.phpt b/ext/phar/tests/opendir.phpt index 2f5f6635d7f..ee964910611 100644 --- a/ext/phar/tests/opendir.phpt +++ b/ext/phar/tests/opendir.phpt @@ -30,7 +30,6 @@ echo "\n"; opendir('phar://'); opendir('phar://hi.phar'); ?> -===DONE=== --CLEAN-- --EXPECTF-- @@ -41,4 +40,3 @@ phar url "phar://" is unknown in %sopendir.php on line %d Warning: opendir(phar://hi.phar): failed to open dir: phar error: invalid url or non-existent phar "phar://hi.phar" phar url "phar://hi.phar" is unknown in %sopendir.php on line %d -===DONE=== diff --git a/ext/phar/tests/opendir_edgecases.phpt b/ext/phar/tests/opendir_edgecases.phpt index 6270eac224e..594cc823f88 100644 --- a/ext/phar/tests/opendir_edgecases.phpt +++ b/ext/phar/tests/opendir_edgecases.phpt @@ -51,7 +51,6 @@ opendir("oops"); include $pname . '/foo'; ?> -===DONE=== --CLEAN-- getStub()); ?> -===DONE=== --CLEAN-- " -===DONE=== diff --git a/ext/phar/tests/phar_buildfromdirectory1.phpt b/ext/phar/tests/phar_buildfromdirectory1.phpt index b7f7338e23d..71afd1647b4 100644 --- a/ext/phar/tests/phar_buildfromdirectory1.phpt +++ b/ext/phar/tests/phar_buildfromdirectory1.phpt @@ -16,7 +16,6 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- string(%d) "%szip%ccorrupt_010.phpt" } -===DONE=== diff --git a/ext/phar/tests/phar_buildfromiterator4.phpt b/ext/phar/tests/phar_buildfromiterator4.phpt index fc42d77d4ee..14266bab54b 100644 --- a/ext/phar/tests/phar_buildfromiterator4.phpt +++ b/ext/phar/tests/phar_buildfromiterator4.phpt @@ -51,7 +51,6 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- string(%d) "%sphar_buildfromiterator4.phpt" } -===DONE=== diff --git a/ext/phar/tests/phar_buildfromiterator5.phpt b/ext/phar/tests/phar_buildfromiterator5.phpt index a83e1c0d38a..9417f9a84c4 100644 --- a/ext/phar/tests/phar_buildfromiterator5.phpt +++ b/ext/phar/tests/phar_buildfromiterator5.phpt @@ -44,7 +44,6 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- string(%d) "%s033.phpt" } -===DONE=== diff --git a/ext/phar/tests/phar_buildfromiterator9.phpt b/ext/phar/tests/phar_buildfromiterator9.phpt index 28febccf81a..9dd091eee5c 100644 --- a/ext/phar/tests/phar_buildfromiterator9.phpt +++ b/ext/phar/tests/phar_buildfromiterator9.phpt @@ -45,7 +45,6 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- string(%d) "[stream]" } -===DONE=== diff --git a/ext/phar/tests/phar_bz2.phpt b/ext/phar/tests/phar_bz2.phpt index cb8f07ef0b4..f70e2ae9eb7 100644 --- a/ext/phar/tests/phar_bz2.phpt +++ b/ext/phar/tests/phar_bz2.phpt @@ -46,7 +46,6 @@ $b->isFileFormat(25); echo $e->getMessage(),"\n"; } ?> -===DONE=== --CLEAN-- "); var_dump($p->getStub()); ?> -===DONE=== --CLEAN-- " -===DONE=== diff --git a/ext/phar/tests/phar_construct_invalidurl.phpt b/ext/phar/tests/phar_construct_invalidurl.phpt index 30a4687289e..295159fd0b9 100644 --- a/ext/phar/tests/phar_construct_invalidurl.phpt +++ b/ext/phar/tests/phar_construct_invalidurl.phpt @@ -22,9 +22,7 @@ try { echo $e->getMessage(),"\n"; } ?> -===DONE=== --EXPECT-- Cannot create a phar archive from a URL like "http://should.fail.com". Phar objects can only be created from local files Cannot create a phar archive from a URL like "http://". Phar objects can only be created from local files Cannot create phar 'http:/', file extension (or combination) not recognised or the directory does not exist -===DONE=== diff --git a/ext/phar/tests/phar_convert_again.phpt b/ext/phar/tests/phar_convert_again.phpt index 126e6a64b3d..82dc739efba 100644 --- a/ext/phar/tests/phar_convert_again.phpt +++ b/ext/phar/tests/phar_convert_again.phpt @@ -152,7 +152,6 @@ $tgz->convertToData(Phar::TAR, Phar::GZ, '.phar/.tgz.oops'); echo $e->getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- getStub()); var_dump($phar->getAlias()); ?> -===DONE=== --CLEAN-- getMessage()."\n"; } ?> -===DONE=== --CLEAN-- isFileFormat(Phar::TAR)); var_dump($phar->getStub()); ?> -===DONE=== --CLEAN-- isCompressed() == Phar::GZ); var_dump($phar->getStub()); ?> -===DONE=== --CLEAN-- isCompressed() == Phar::BZ2); var_dump($phar->getStub()); ?> -===DONE=== --CLEAN-- isFileFormat(Phar::ZIP)); var_dump($phar->getStub()); ?> -===DONE=== --CLEAN-- copy('.phar/stub.php', 'd'); echo $e->getMessage(),"\n"; } ?> -===DONE=== --CLEAN-- @@ -80,4 +79,3 @@ file "a" cannot be copied to file "b", file must not already exist in phar %spha hi file "d" cannot be copied to file ".phar/stub.php", cannot copy to Phar meta-file in %sphar_copy2.phar.php file ".phar/stub.php" cannot be copied to file "d", cannot copy Phar meta-file in %sphar_copy2.phar.php -===DONE=== diff --git a/ext/phar/tests/phar_create_in_cwd.phpt b/ext/phar/tests/phar_create_in_cwd.phpt index f0910555962..3a7b38f6985 100644 --- a/ext/phar/tests/phar_create_in_cwd.phpt +++ b/ext/phar/tests/phar_create_in_cwd.phpt @@ -25,7 +25,6 @@ __HALT_COMPILER(); echo $e->getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- " -===DONE=== diff --git a/ext/phar/tests/phar_createdefaultstub.phpt b/ext/phar/tests/phar_createdefaultstub.phpt index e074d649bd6..0ed5abfb69e 100644 --- a/ext/phar/tests/phar_createdefaultstub.phpt +++ b/ext/phar/tests/phar_createdefaultstub.phpt @@ -32,7 +32,6 @@ var_dump(Phar::createDefaultStub('hio', str_repeat('a', 401))); echo $e->getMessage() . "\n"; } ?> -===DONE=== --EXPECT-- string(6641) "" ============================================================================ int(7032) Illegal web filename passed in for stub creation, was 401 characters long, and only 400 or less is allowed -===DONE=== diff --git a/ext/phar/tests/phar_ctx_001.phpt b/ext/phar/tests/phar_ctx_001.phpt index 8aba1259a10..96402333a77 100644 --- a/ext/phar/tests/phar_ctx_001.phpt +++ b/ext/phar/tests/phar_ctx_001.phpt @@ -58,7 +58,6 @@ var_dump(file_get_contents($pname . '/b')); var_dump($phar['b']->isCompressed()); var_dump($phar['b']->getMetaData()); ?> -===DONE=== --CLEAN-- int(4) } -===DONE=== diff --git a/ext/phar/tests/phar_decompress.phpt b/ext/phar/tests/phar_decompress.phpt index 3b16b78f640..6f5e33452b0 100644 --- a/ext/phar/tests/phar_decompress.phpt +++ b/ext/phar/tests/phar_decompress.phpt @@ -45,7 +45,6 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- $obj) { var_dump($obj->getPathName()); } ?> -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- -===DONE=== -?> --EXPECT-- array(4) { [0]=> @@ -26,4 +24,3 @@ array(4) { [3]=> string(7) "SHA-512" } -===DONE=== diff --git a/ext/phar/tests/phar_get_supported_signatures_002a.phpt b/ext/phar/tests/phar_get_supported_signatures_002a.phpt index 391ee600cc4..c8e4989dd13 100644 --- a/ext/phar/tests/phar_get_supported_signatures_002a.phpt +++ b/ext/phar/tests/phar_get_supported_signatures_002a.phpt @@ -13,7 +13,6 @@ phar.readonly=0 -===DONE=== --EXPECT-- array(5) { [0]=> @@ -27,4 +26,3 @@ array(5) { [4]=> string(7) "OpenSSL" } -===DONE=== diff --git a/ext/phar/tests/phar_get_supportedcomp1.phpt b/ext/phar/tests/phar_get_supportedcomp1.phpt index fecb806f2ee..2dcbd72df21 100644 --- a/ext/phar/tests/phar_get_supportedcomp1.phpt +++ b/ext/phar/tests/phar_get_supportedcomp1.phpt @@ -10,7 +10,6 @@ phar.require_hash=0 -===DONE=== --EXPECT-- array(2) { [0]=> @@ -18,4 +17,3 @@ array(2) { [1]=> string(5) "BZIP2" } -===DONE=== diff --git a/ext/phar/tests/phar_get_supportedcomp2.phpt b/ext/phar/tests/phar_get_supportedcomp2.phpt index aa941d0e4b3..c08a55ed52d 100644 --- a/ext/phar/tests/phar_get_supportedcomp2.phpt +++ b/ext/phar/tests/phar_get_supportedcomp2.phpt @@ -10,10 +10,8 @@ phar.require_hash=0 -===DONE=== --EXPECT-- array(1) { [0]=> string(5) "BZIP2" } -===DONE=== diff --git a/ext/phar/tests/phar_get_supportedcomp3.phpt b/ext/phar/tests/phar_get_supportedcomp3.phpt index fadb482042b..4fbc442215e 100644 --- a/ext/phar/tests/phar_get_supportedcomp3.phpt +++ b/ext/phar/tests/phar_get_supportedcomp3.phpt @@ -10,10 +10,8 @@ phar.require_hash=0 -===DONE=== --EXPECT-- array(1) { [0]=> string(2) "GZ" } -===DONE=== diff --git a/ext/phar/tests/phar_get_supportedcomp4.phpt b/ext/phar/tests/phar_get_supportedcomp4.phpt index 1d953e2e38f..91137989ba3 100644 --- a/ext/phar/tests/phar_get_supportedcomp4.phpt +++ b/ext/phar/tests/phar_get_supportedcomp4.phpt @@ -8,8 +8,6 @@ Phar::getSupportedCompression() (none) -===DONE=== --EXPECT-- array(0) { } -===DONE=== diff --git a/ext/phar/tests/phar_gobyebye-win32.phpt b/ext/phar/tests/phar_gobyebye-win32.phpt index ff7b685aac9..7b1b683fa4c 100644 --- a/ext/phar/tests/phar_gobyebye-win32.phpt +++ b/ext/phar/tests/phar_gobyebye-win32.phpt @@ -24,7 +24,6 @@ opendir("foo/hi"); '); include $pname . '/foo/hi'; ?> -===DONE=== --CLEAN-- @@ -45,4 +44,3 @@ bool(false) Warning: opendir(foo/hi,foo/hi): %s (code: 3) in phar://%sphar_gobyebye-win32.phar.php/foo/hi on line %d Warning: opendir(foo/hi): failed to open dir: No such file or directory in phar://%sphar_gobyebye-win32.phar.php/foo/hi on line %d -===DONE=== diff --git a/ext/phar/tests/phar_gobyebye.phpt b/ext/phar/tests/phar_gobyebye.phpt index 753562571de..fd779ff549f 100644 --- a/ext/phar/tests/phar_gobyebye.phpt +++ b/ext/phar/tests/phar_gobyebye.phpt @@ -25,7 +25,6 @@ opendir("foo/hi"); '); include $pname . '/foo/hi'; ?> -===DONE=== --CLEAN-- @@ -44,4 +43,3 @@ bool(false) bool(false) Warning: opendir(foo/hi): failed to open dir: No such file or directory in phar://%sphar_gobyebye.phar.php/foo/hi on line %d -===DONE=== diff --git a/ext/phar/tests/phar_gzip.phpt b/ext/phar/tests/phar_gzip.phpt index 16821caab62..f31bf03e736 100644 --- a/ext/phar/tests/phar_gzip.phpt +++ b/ext/phar/tests/phar_gzip.phpt @@ -40,7 +40,6 @@ $b = new Phar($fname2); var_dump($b->isFileFormat(Phar::PHAR)); var_dump($b->isCompressed() == Phar::GZ); ?> -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- $cont) { var_dump(file_get_contents($pname.'/'.$name)); } ?> -===DONE=== --CLEAN-- --EXPECT-- @@ -94,4 +93,3 @@ string(1) "a" string(1) "b" string(1) "c" string(1) "d" -===DONE=== diff --git a/ext/phar/tests/phar_metadata_write.phpt b/ext/phar/tests/phar_metadata_write.phpt index a15d23d4c6e..7a70491f499 100644 --- a/ext/phar/tests/phar_metadata_write.phpt +++ b/ext/phar/tests/phar_metadata_write.phpt @@ -44,7 +44,6 @@ foreach($files as $name => $cont) { var_dump(file_get_contents($pname.'/'.$name)); } ?> -===DONE=== --CLEAN-- --EXPECT-- @@ -70,4 +69,3 @@ string(1) "a" string(1) "b" string(1) "c" string(1) "d" -===DONE=== diff --git a/ext/phar/tests/phar_mount.phpt b/ext/phar/tests/phar_mount.phpt index 73bd489a2dd..bffdf764709 100644 --- a/ext/phar/tests/phar_mount.phpt +++ b/ext/phar/tests/phar_mount.phpt @@ -49,7 +49,6 @@ echo $e->getMessage(),"\n"; Phar::mount($pname . '/testit2', $pname . '/testit1'); echo substr($a['testit2']->getContent(),0, 50),"\n"; ?> -===DONE=== --CLEAN-- @@ -60,4 +59,3 @@ Mounting of testit to %sphar_mount.php within phar %sphar_mount.phar.tar failed Mounting of /oops to /home/oops/../../etc/passwd: within phar %sphar_mount.phar.php failed getAlias()); ?> -===DONE=== --CLEAN-- --EXPECTF-- @@ -74,4 +73,3 @@ int(6643) Cannot set alias ".phar/alias.txt" directly in phar "%sphar_offset_check.phar.php", use setAlias string(5) "susan" string(5) "susan" -===DONE=== diff --git a/ext/phar/tests/phar_offset_get_error.phpt b/ext/phar/tests/phar_offset_get_error.phpt index 54dec470c26..b49035fd666 100644 --- a/ext/phar/tests/phar_offset_get_error.phpt +++ b/ext/phar/tests/phar_offset_get_error.phpt @@ -39,7 +39,6 @@ $a = $p['.phar/stub.php']; echo $e->getMessage(),"\n"; } ?> -===DONE=== --CLEAN-- --EXPECT-- @@ -47,4 +46,3 @@ Entry /error/.. does not exist and cannot be created: phar error: invalid path " foobar Cannot set any files or directories in magic ".phar" directory Entry .phar/stub.php does not exist -===DONE=== diff --git a/ext/phar/tests/phar_oo_001.phpt b/ext/phar/tests/phar_oo_001.phpt index 83d52eeabfe..ba93c881073 100644 --- a/ext/phar/tests/phar_oo_001.phpt +++ b/ext/phar/tests/phar_oo_001.phpt @@ -41,7 +41,6 @@ try { } ?> -===DONE=== --CLEAN-- $ent) } ?> -===DONE=== --CLEAN-- $ent) } ?> -===DONE=== --CLEAN-- " This is e.php -===DONE=== diff --git a/ext/phar/tests/phar_oo_004.phpt b/ext/phar/tests/phar_oo_004.phpt index 2191e0082b5..5130f816d4a 100644 --- a/ext/phar/tests/phar_oo_004.phpt +++ b/ext/phar/tests/phar_oo_004.phpt @@ -73,7 +73,6 @@ foreach($it as $name => $ent) } ?> -===DONE=== --CLEAN-- $ent) } ?> -===DONE=== --CLEAN-- getFilename() . "\n"; echo $phar['b.php']->getFilename() . "\n"; ?> -===DONE=== --CLEAN-- eof()); //unset($f); without unset we check for working refcounting ?> -===DONE=== --CLEAN-- " bool(true) -===DONE=== diff --git a/ext/phar/tests/phar_oo_008.phpt b/ext/phar/tests/phar_oo_008.phpt index e1107df4ef7..7ae68c034d1 100644 --- a/ext/phar/tests/phar_oo_008.phpt +++ b/ext/phar/tests/phar_oo_008.phpt @@ -79,7 +79,6 @@ foreach($v as $k => $d) } ?> -===DONE=== --CLEAN-- 2|a|b MyCSVFile2::getCurrentLine 5=>3|c|'e' -===DONE=== diff --git a/ext/phar/tests/phar_oo_009.phpt b/ext/phar/tests/phar_oo_009.phpt index c6898d456d7..a630ceb7a36 100644 --- a/ext/phar/tests/phar_oo_009.phpt +++ b/ext/phar/tests/phar_oo_009.phpt @@ -33,7 +33,6 @@ foreach($f as $k => $v) } ?> -===DONE=== --CLEAN-- 4 4=>5|5 6=>7|777 -===DONE=== diff --git a/ext/phar/tests/phar_oo_010.phpt b/ext/phar/tests/phar_oo_010.phpt index 243a11e92f6..2bd22973103 100644 --- a/ext/phar/tests/phar_oo_010.phpt +++ b/ext/phar/tests/phar_oo_010.phpt @@ -32,7 +32,6 @@ var_dump(isset($phar[12])); var_dump(isset($phar['b'])); ?> -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- --EXPECT-- Exception: Write operations disabled by the php.ini setting phar.readonly -===DONE=== diff --git a/ext/phar/tests/phar_oo_012.phpt b/ext/phar/tests/phar_oo_012.phpt index 44e0eecdfad..4142b2e291e 100644 --- a/ext/phar/tests/phar_oo_012.phpt +++ b/ext/phar/tests/phar_oo_012.phpt @@ -23,7 +23,6 @@ unset($phar['f.php']); var_dump(isset($phar['f.php'])); ?> -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- --EXPECT-- Exception: Write operations disabled by the php.ini setting phar.readonly -===DONE=== diff --git a/ext/phar/tests/phar_oo_compressallbz2.phpt b/ext/phar/tests/phar_oo_compressallbz2.phpt index 8a1c5f21b20..6c04052f1d9 100644 --- a/ext/phar/tests/phar_oo_compressallbz2.phpt +++ b/ext/phar/tests/phar_oo_compressallbz2.phpt @@ -41,7 +41,6 @@ var_dump($phar['c']->isCompressed(Phar::GZ)); var_dump($phar['b']->isCompressed(Phar::BZ2)); ?> -===DONE=== --CLEAN-- compressFiles(25); echo $e->getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- isCompressed()); ?> -===DONE=== --CLEAN-- isCompressed()); ?> -===DONE=== --CLEAN-- isCompressed()); ?> -===DONE=== --CLEAN-- isCompressed()); ?> -===DONE=== --CLEAN-- getContent(), "\n"; echo $e->getMessage(), "\n"; } ?> -===DONE=== --CLEAN-- isCompressed()); echo $phar2['a']->getContent() . "\n"; ?> -===DONE=== --CLEAN-- getModified()); $phar->compressFiles(Phar::GZ); var_dump($phar->getModified()); ?> -===DONE=== --CLEAN-- isWritable()); var_dump($b->isWritable()); chmod($fname2, 0666); ?> -===DONE=== --CLEAN-- getSignature()); ?> -===DONE=== --CLEAN-- --EXPECT-- bool(false) -===DONE=== diff --git a/ext/phar/tests/phar_oo_uncompressall.phpt b/ext/phar/tests/phar_oo_uncompressall.phpt index f669f5e8ca5..c3e38a649ae 100644 --- a/ext/phar/tests/phar_oo_uncompressall.phpt +++ b/ext/phar/tests/phar_oo_uncompressall.phpt @@ -49,7 +49,6 @@ var_dump(file_get_contents($pname . '/c')); var_dump($phar['a']->isCompressed()); ?> -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- --EXPECTF-- string(%d) "phar://%sphar_running.phar.php" string(%d) "%sphar_running.phar.php" string(0) "" -===DONE=== diff --git a/ext/phar/tests/phar_setalias.phpt b/ext/phar/tests/phar_setalias.phpt index 7d67d787c5f..e193f5f37f3 100644 --- a/ext/phar/tests/phar_setalias.phpt +++ b/ext/phar/tests/phar_setalias.phpt @@ -23,7 +23,6 @@ echo $phar->getAlias() . "\n"; $phar->setAlias('test'); echo $phar->getAlias() . "\n"; ?> -===DONE=== --CLEAN-- getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- ============================================================================ int(7034) Illegal filename passed in for stub creation, was 401 characters long, and only 400 or less is allowed -===DONE=== diff --git a/ext/phar/tests/phar_setsignaturealgo2.phpt b/ext/phar/tests/phar_setsignaturealgo2.phpt index 726e756a656..a0d2e03f735 100644 --- a/ext/phar/tests/phar_setsignaturealgo2.phpt +++ b/ext/phar/tests/phar_setsignaturealgo2.phpt @@ -43,7 +43,6 @@ var_dump($p->getSignature()); echo $e->getMessage(); } ?> -===DONE=== --CLEAN-- string(7) "OpenSSL" } -===DONE=== diff --git a/ext/phar/tests/phar_stub.phpt b/ext/phar/tests/phar_stub.phpt index e5b2f27f1d1..e2fec8054ce 100644 --- a/ext/phar/tests/phar_stub.phpt +++ b/ext/phar/tests/phar_stub.phpt @@ -75,7 +75,6 @@ if (fread($fp, strlen('booya')) == 'booya') { fclose($fp); ?> -===DONE=== --CLEAN-- booya -===DONE=== diff --git a/ext/phar/tests/phar_stub_error.phpt b/ext/phar/tests/phar_stub_error.phpt index 065078d296e..0a95e290de7 100644 --- a/ext/phar/tests/phar_stub_error.phpt +++ b/ext/phar/tests/phar_stub_error.phpt @@ -38,7 +38,6 @@ var_dump($phar->getStub()); var_dump($phar->getStub() == $stub); ?> -===DONE=== --CLEAN-- " bool(true) string(48) "" bool(true) -===DONE=== diff --git a/ext/phar/tests/phar_stub_write.phpt b/ext/phar/tests/phar_stub_write.phpt index 67bea0ddfe4..21853ee3bdd 100644 --- a/ext/phar/tests/phar_stub_write.phpt +++ b/ext/phar/tests/phar_stub_write.phpt @@ -41,7 +41,6 @@ var_dump($phar->getStub() == $stub); var_dump($phar->getStub() == $sexp); ?> -===DONE=== --CLEAN-- getStub() == $stub); var_dump($phar->getStub() == $sexp); ?> -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- getMessage(), "\n"; lstat($pname . '/a/b'); // sets BG(CurrentLStatFile) $b->chmod(0666); ?> -===DONE=== --CLEAN-- --EXPECTF-- Phar entry "a" is a temporary directory (not an actual entry in the archive), cannot chmod -===DONE=== diff --git a/ext/phar/tests/pharfileinfo_compression.phpt b/ext/phar/tests/pharfileinfo_compression.phpt index c8f236d1663..8abd5a9b2d4 100644 --- a/ext/phar/tests/pharfileinfo_compression.phpt +++ b/ext/phar/tests/pharfileinfo_compression.phpt @@ -70,7 +70,6 @@ var_dump($b->decompress()); var_dump($b->decompress()); ?> -===DONE=== --CLEAN-- @@ -89,4 +88,3 @@ Phar is readonly, cannot decompress Phar entry is a directory, cannot set compression bool(true) bool(true) -===DONE=== diff --git a/ext/phar/tests/pharfileinfo_construct.phpt b/ext/phar/tests/pharfileinfo_construct.phpt index 4802e0fb400..4597660d80d 100644 --- a/ext/phar/tests/pharfileinfo_construct.phpt +++ b/ext/phar/tests/pharfileinfo_construct.phpt @@ -45,7 +45,6 @@ $a = new PharFileInfo(__FILE__); echo $e->getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- --EXPECTF-- @@ -54,4 +53,3 @@ PharFileInfo::__construct() expects parameter 1 to be a valid path, array given Cannot access phar file entry '%s' in archive '%s' Cannot call constructor twice '%s' is not a valid phar archive URL (must have at least phar://filename.phar) -===DONE=== diff --git a/ext/phar/tests/pharfileinfo_getcrc32.phpt b/ext/phar/tests/pharfileinfo_getcrc32.phpt index 277d96804a1..b8061280f7d 100644 --- a/ext/phar/tests/pharfileinfo_getcrc32.phpt +++ b/ext/phar/tests/pharfileinfo_getcrc32.phpt @@ -39,11 +39,9 @@ var_dump($b->getCRC32()); echo $e->getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- --EXPECTF-- Phar entry is a directory, does not have a CRC Phar entry was not CRC checked int(%s) -===DONE=== diff --git a/ext/phar/tests/pharfileinfo_setmetadata.phpt b/ext/phar/tests/pharfileinfo_setmetadata.phpt index 97f3b15ed10..38e23f706db 100644 --- a/ext/phar/tests/pharfileinfo_setmetadata.phpt +++ b/ext/phar/tests/pharfileinfo_setmetadata.phpt @@ -37,7 +37,6 @@ $b->delMetadata(); echo $e->getMessage(), "\n"; } ?> -===DONE=== --CLEAN-- @@ -46,4 +45,3 @@ Phar entry is a temporary directory (not an actual entry in the archive), cannot Phar entry is a temporary directory (not an actual entry in the archive), cannot delete metadata Write operations disabled by the php.ini setting phar.readonly Write operations disabled by the php.ini setting phar.readonly -===DONE=== diff --git a/ext/phar/tests/phpinfo_001.phpt b/ext/phar/tests/phpinfo_001.phpt index be726647a06..dde85f969f0 100644 --- a/ext/phar/tests/phpinfo_001.phpt +++ b/ext/phar/tests/phpinfo_001.phpt @@ -19,7 +19,6 @@ ini_set('phar.readonly',1); ini_set('phar.require_hash',1); phpinfo(INFO_MODULES); ?> -===DONE=== --EXPECTF-- %aPhar @@ -61,4 +60,3 @@ phar.cache_list => no value => no value phar.readonly => On => Off phar.require_hash => On => Off %a -===DONE=== diff --git a/ext/phar/tests/phpinfo_002.phpt b/ext/phar/tests/phpinfo_002.phpt index 10303e52801..0d12fe938cf 100644 --- a/ext/phar/tests/phpinfo_002.phpt +++ b/ext/phar/tests/phpinfo_002.phpt @@ -16,7 +16,6 @@ phar.cache_list= -===DONE=== --EXPECTF-- %a Phar @@ -39,4 +38,3 @@ phar.cache_list => no value => no value phar.readonly => On => On phar.require_hash => On => On %a -===DONE=== diff --git a/ext/phar/tests/phpinfo_003.phpt b/ext/phar/tests/phpinfo_003.phpt index fb27fb6fb97..0636e932ff8 100644 --- a/ext/phar/tests/phpinfo_003.phpt +++ b/ext/phar/tests/phpinfo_003.phpt @@ -16,7 +16,6 @@ phar.cache_list= -===DONE=== --EXPECTF-- %a Phar @@ -39,4 +38,3 @@ phar.cache_list => no value => no value phar.readonly => On => On phar.require_hash => On => On %a -===DONE=== diff --git a/ext/phar/tests/readfile_edgecases.phpt b/ext/phar/tests/readfile_edgecases.phpt index b4b533e3608..3dc863f1322 100644 --- a/ext/phar/tests/readfile_edgecases.phpt +++ b/ext/phar/tests/readfile_edgecases.phpt @@ -28,7 +28,6 @@ readfile("../oops"); '); include $pname . '/foo/hi'; ?> -===DONE=== --CLEAN-- @@ -57,4 +56,3 @@ readfile("../oops"); ?> Warning: readfile(phar://%sreadfile_edgecases.phar.php/oops): failed to open stream: phar error: path "oops" is a directory in phar://%sreadfile_edgecases.phar.php/foo/hi on line %d -===DONE=== diff --git a/ext/phar/tests/refcount1.phpt b/ext/phar/tests/refcount1.phpt index 8aefc54245b..13d776f8449 100644 --- a/ext/phar/tests/refcount1.phpt +++ b/ext/phar/tests/refcount1.phpt @@ -34,7 +34,6 @@ var_dump(fread($b, 20)); include $pname . '/b/c.php'; ?> -===DONE=== --CLEAN-- --EXPECTF-- @@ -57,4 +56,3 @@ object(PharFileInfo)#%d (2) { } string(5) "extra" extra -===DONE=== diff --git a/ext/phar/tests/security.phpt b/ext/phar/tests/security.phpt index 76af2a0e744..81408ae1031 100644 --- a/ext/phar/tests/security.phpt +++ b/ext/phar/tests/security.phpt @@ -27,10 +27,8 @@ Phar::unlinkArchive($fname); ini_set('phar.readonly', 1); include $fname2; ?> -===DONE=== --CLEAN-- --EXPECT-- bool(false) Write operations disabled by the php.ini setting phar.readonly -===DONE=== diff --git a/ext/phar/tests/stat.phpt b/ext/phar/tests/stat.phpt index e8649da2356..7b258263ae0 100644 --- a/ext/phar/tests/stat.phpt +++ b/ext/phar/tests/stat.phpt @@ -68,7 +68,6 @@ include "my/index.php"; __HALT_COMPILER();'); include $fname; ?> -===DONE=== --CLEAN-- --EXPECTF-- @@ -223,4 +222,3 @@ not found 2 Warning: fileperms(): stat failed for not/found in phar://%sstat.phar.php/my/index.php on line %d bool(false) -===DONE=== diff --git a/ext/phar/tests/stat2_5.3.phpt b/ext/phar/tests/stat2_5.3.phpt index d145cdd21d8..19acc3ba990 100644 --- a/ext/phar/tests/stat2_5.3.phpt +++ b/ext/phar/tests/stat2_5.3.phpt @@ -32,7 +32,6 @@ include "phar://" . __FILE__ . "/foo/stat.php"; __HALT_COMPILER();'); include $fname3; ?> -===DONE=== --CLEAN-- @@ -52,4 +51,3 @@ bool(false) dir bool(true) bool(false) -===DONE=== diff --git a/ext/phar/tests/tar/033.phpt b/ext/phar/tests/tar/033.phpt index f07dd7f48ad..d881ea125b0 100644 --- a/ext/phar/tests/tar/033.phpt +++ b/ext/phar/tests/tar/033.phpt @@ -34,7 +34,6 @@ try { } ?> -===DONE=== --CLEAN-- getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- getMessage(),"\n"; } ?> -===DONE=== --CLEAN-- getAlias()); var_dump($phar->getMetadata()); var_dump($phar['a']->getMetadata()); ?> -===DONE=== --CLEAN-- --EXPECT-- @@ -54,4 +53,3 @@ string(32) " string(4) "hime" string(8) "hi there" string(6) "a meta" -===DONE=== diff --git a/ext/phar/tests/tar/badalias.phpt b/ext/phar/tests/tar/badalias.phpt index 532aba8c3c8..b3ad7accd09 100644 --- a/ext/phar/tests/tar/badalias.phpt +++ b/ext/phar/tests/tar/badalias.phpt @@ -15,11 +15,9 @@ echo $ee->getMessage(), "\n"; } } ?> -===DONE=== --EXPECTF-- phar error: invalid alias "hi/thereaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa..." in tar-based phar "%sbadalias1.phar.tar" phar error: invalid alias "hi\there" in tar-based phar "%sbadalias2.phar.tar" phar error: invalid alias "hi;there" in tar-based phar "%sbadalias3.phar.tar" phar error: invalid alias "hi:there" in tar-based phar "%sbadalias4.phar.tar" phar error: tar-based phar "%sbadalias5.phar.tar" has alias that is larger than 511 bytes, cannot process -===DONE=== diff --git a/ext/phar/tests/tar/badchecksum.phpt b/ext/phar/tests/tar/badchecksum.phpt index 35b5fc58369..b6b40472634 100644 --- a/ext/phar/tests/tar/badchecksum.phpt +++ b/ext/phar/tests/tar/badchecksum.phpt @@ -20,11 +20,9 @@ try { } ?> -===DONE=== --CLEAN-- --EXPECTF-- phar error: "%sbadchecksum.tar" is a corrupted tar file (checksum mismatch of file "hithere") -===DONE=== diff --git a/ext/phar/tests/tar/bignames.phpt b/ext/phar/tests/tar/bignames.phpt index 3a10ac7547d..a22d5bd40d5 100644 --- a/ext/phar/tests/tar/bignames.phpt +++ b/ext/phar/tests/tar/bignames.phpt @@ -40,7 +40,6 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- getContent() . "\n"; echo $p1[str_repeat('a', 155) . '/' . str_repeat('a', 100)]->getContent() . "\n"; ?> -===DONE=== --CLEAN-- -===DONE=== --EXPECT-- Array ( @@ -47,4 +46,3 @@ Array [27] => phar://*/Structures_Graph-1.0.3/tests/testCase/BasicGraph.php [28] => phar://*/package.xml ) -===DONE=== diff --git a/ext/phar/tests/tar/bug64343.phpt b/ext/phar/tests/tar/bug64343.phpt index ed4501dd6a0..01fca83900e 100644 --- a/ext/phar/tests/tar/bug64343.phpt +++ b/ext/phar/tests/tar/bug64343.phpt @@ -10,7 +10,5 @@ echo "Test\n"; $phar = new PharData(__DIR__."/files/bug64343.tar"); ?> -===DONE=== --EXPECT-- Test -===DONE=== diff --git a/ext/phar/tests/tar/bug67761.phpt b/ext/phar/tests/tar/bug67761.phpt index 0686881118e..c8d013cab16 100644 --- a/ext/phar/tests/tar/bug67761.phpt +++ b/ext/phar/tests/tar/bug67761.phpt @@ -11,9 +11,7 @@ include __DIR__."/files/bug67761.tar/bug67761.phar"; ?> -===DONE=== --EXPECT-- Test #!/usr/bin/env php Test -===DONE=== diff --git a/ext/phar/tests/tar/create_new_and_modify.phpt b/ext/phar/tests/tar/create_new_and_modify.phpt index d0a954a9817..355b69399ed 100644 --- a/ext/phar/tests/tar/create_new_and_modify.phpt +++ b/ext/phar/tests/tar/create_new_and_modify.phpt @@ -42,7 +42,6 @@ include $pname . '/a.php'; include $pname . '/b.php'; ?> -===DONE=== --CLEAN-- --EXPECT-- @@ -51,4 +50,3 @@ brand new! bool(true) modified! another! -===DONE=== diff --git a/ext/phar/tests/tar/create_new_phar_b.phpt b/ext/phar/tests/tar/create_new_phar_b.phpt index 1b41db61345..570d20678fa 100644 --- a/ext/phar/tests/tar/create_new_phar_b.phpt +++ b/ext/phar/tests/tar/create_new_phar_b.phpt @@ -13,7 +13,6 @@ file_put_contents('phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.pha include 'phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.tar/a.php'; ?> -===DONE=== --CLEAN-- --EXPECTF-- @@ -23,4 +22,3 @@ Warning: include(phar://%screate_new_phar_b.phar.tar/a.php): failed to open stre Warning: include(): Failed opening 'phar://%screate_new_phar_b.phar.tar/a.php' for inclusion (include_path='%s') in %screate_new_phar_b.php on line %d -===DONE=== diff --git a/ext/phar/tests/tar/delete_in_phar.phpt b/ext/phar/tests/tar/delete_in_phar.phpt index 0b4362aa915..87e1fb53ddc 100644 --- a/ext/phar/tests/tar/delete_in_phar.phpt +++ b/ext/phar/tests/tar/delete_in_phar.phpt @@ -31,7 +31,6 @@ include $alias . '/b.php'; include $alias . '/b/c.php'; ?> -===DONE=== --CLEAN-- --EXPECTF-- @@ -46,4 +45,3 @@ Warning: include(%sdelete_in_phar.phar.tar/b/c.php): failed to open stream: phar Warning: include(): Failed opening 'phar://%sdelete_in_phar.phar.tar/b/c.php' for inclusion (include_path='%s') in %sdelete_in_phar.php on line %d -===DONE=== diff --git a/ext/phar/tests/tar/delete_in_phar_b.phpt b/ext/phar/tests/tar/delete_in_phar_b.phpt index 466ffcdf07b..cb9b832e9f5 100644 --- a/ext/phar/tests/tar/delete_in_phar_b.phpt +++ b/ext/phar/tests/tar/delete_in_phar_b.phpt @@ -32,7 +32,6 @@ include $alias . '/b.php'; include $alias . '/b/c.php'; ?> -===DONE=== --CLEAN-- --EXPECTF-- @@ -46,4 +45,3 @@ This is a This is b This is b/c -===DONE=== diff --git a/ext/phar/tests/tar/delete_in_phar_confirm.phpt b/ext/phar/tests/tar/delete_in_phar_confirm.phpt index ec4eec68b10..0ee0d00c59b 100644 --- a/ext/phar/tests/tar/delete_in_phar_confirm.phpt +++ b/ext/phar/tests/tar/delete_in_phar_confirm.phpt @@ -34,7 +34,6 @@ include 'phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.tar/b.ph include 'phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.tar/b/c.php'; ?> -===DONE=== --CLEAN-- --EXPECTF-- @@ -49,4 +48,3 @@ Warning: include(%sdelete_in_phar_confirm.phar.tar/b/c.php): failed to open stre Warning: include(): Failed opening 'phar://%sdelete_in_phar_confirm.phar.tar/b/c.php' for inclusion (include_path='%s') in %sdelete_in_phar_confirm.php on line %d -===DONE=== diff --git a/ext/phar/tests/tar/exists_as_phar.phpt b/ext/phar/tests/tar/exists_as_phar.phpt index 66842cbd331..2a87dc7327e 100644 --- a/ext/phar/tests/tar/exists_as_phar.phpt +++ b/ext/phar/tests/tar/exists_as_phar.phpt @@ -27,7 +27,6 @@ try { } ?> -===DONE=== --CLEAN-- --EXPECTF-- phar tar error: "%sexists_as_phar.phar.tar" already exists as a regular phar and must be deleted from disk prior to creating as a tar-based phar -===DONE=== diff --git a/ext/phar/tests/tar/links.phpt b/ext/phar/tests/tar/links.phpt index 0964cd7faba..2d1c76b85e3 100644 --- a/ext/phar/tests/tar/links.phpt +++ b/ext/phar/tests/tar/links.phpt @@ -19,7 +19,6 @@ var_dump($p['testit/file']->getContent()); $p['testit/link'] = 'overwriting'; var_dump($p['testit/link']->getContent()); ?> -===DONE=== --CLEAN-- getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- --EXPECTF-- phar error: "%slinks2.tar" is a corrupted tar file - hard link to non-existent file "internal/file.txt" -===DONE=== diff --git a/ext/phar/tests/tar/links3.phpt b/ext/phar/tests/tar/links3.phpt index 5c41a00ace5..b771da12605 100644 --- a/ext/phar/tests/tar/links3.phpt +++ b/ext/phar/tests/tar/links3.phpt @@ -14,8 +14,6 @@ try { echo $p['file.txt']->getContent(); echo $p['my/file']->getContent(); ?> -===DONE=== --EXPECT-- my file my file -===DONE=== diff --git a/ext/phar/tests/tar/links4.phpt b/ext/phar/tests/tar/links4.phpt index 638c47f69c5..941197c67b7 100644 --- a/ext/phar/tests/tar/links4.phpt +++ b/ext/phar/tests/tar/links4.phpt @@ -14,8 +14,6 @@ try { echo $p['file.txt']->getContent(); echo $p['link.txt']->getContent(); ?> -===DONE=== --EXPECT-- hi hi -===DONE=== diff --git a/ext/phar/tests/tar/links5.phpt b/ext/phar/tests/tar/links5.phpt index 0639b9b415e..17892370f77 100644 --- a/ext/phar/tests/tar/links5.phpt +++ b/ext/phar/tests/tar/links5.phpt @@ -14,8 +14,6 @@ try { echo $p['hi/test.txt']->getContent(); echo $p['hi/link.txt']->getContent(); ?> -===DONE=== --EXPECT-- hi hi -===DONE=== diff --git a/ext/phar/tests/tar/links6.phpt b/ext/phar/tests/tar/links6.phpt index 811272c57ac..9958c64da2c 100644 --- a/ext/phar/tests/tar/links6.phpt +++ b/ext/phar/tests/tar/links6.phpt @@ -16,7 +16,6 @@ $a = fopen('phar://' . __DIR__ . '/files/links.phar.tar/link2', 'r'); fseek($a, 3); echo fread($a, 10); ?> -===DONE=== --EXPECT-- hi there @@ -26,4 +25,3 @@ hi there there -===DONE=== diff --git a/ext/phar/tests/tar/open_for_write_existing.phpt b/ext/phar/tests/tar/open_for_write_existing.phpt index 67b59d4ad7a..05ab333bfd2 100644 --- a/ext/phar/tests/tar/open_for_write_existing.phpt +++ b/ext/phar/tests/tar/open_for_write_existing.phpt @@ -34,9 +34,7 @@ include $alias . '/b/c.php'; ?> -===DONE=== --CLEAN-- --EXPECT-- extra -===DONE=== diff --git a/ext/phar/tests/tar/open_for_write_existing_b.phpt b/ext/phar/tests/tar/open_for_write_existing_b.phpt index 93d40845db0..dc8dfeb8bec 100644 --- a/ext/phar/tests/tar/open_for_write_existing_b.phpt +++ b/ext/phar/tests/tar/open_for_write_existing_b.phpt @@ -35,7 +35,6 @@ include $alias . '/b/c.php'; ?> -===DONE=== --CLEAN-- --EXPECTF-- @@ -43,4 +42,3 @@ Warning: fopen(phar://%sopen_for_write_existing_b.phar.tar/b/c.php): failed to o bool(false) This is b/c -===DONE=== diff --git a/ext/phar/tests/tar/open_for_write_existing_c.phpt b/ext/phar/tests/tar/open_for_write_existing_c.phpt index 976c7358b05..fe457b1f065 100644 --- a/ext/phar/tests/tar/open_for_write_existing_c.phpt +++ b/ext/phar/tests/tar/open_for_write_existing_c.phpt @@ -35,7 +35,6 @@ include $alias . '/b/c.php'; ?> -===DONE=== --CLEAN-- --EXPECTF-- @@ -43,4 +42,3 @@ Warning: fopen(phar://%sopen_for_write_existing_c.phar.tar/b/c.php): failed to o bool(false) This is b/c -===DONE=== diff --git a/ext/phar/tests/tar/open_for_write_newfile.phpt b/ext/phar/tests/tar/open_for_write_newfile.phpt index f2f5d945d79..f5485eac183 100644 --- a/ext/phar/tests/tar/open_for_write_newfile.phpt +++ b/ext/phar/tests/tar/open_for_write_newfile.phpt @@ -35,10 +35,8 @@ include $alias . '/b/new.php'; ?> -===DONE=== --CLEAN-- --EXPECT-- This is b/c extra -===DONE=== diff --git a/ext/phar/tests/tar/open_for_write_newfile_b.phpt b/ext/phar/tests/tar/open_for_write_newfile_b.phpt index dd28ff747ad..1a11debae86 100644 --- a/ext/phar/tests/tar/open_for_write_newfile_b.phpt +++ b/ext/phar/tests/tar/open_for_write_newfile_b.phpt @@ -36,7 +36,6 @@ include $alias . '/b/new.php'; ?> -===DONE=== --CLEAN-- --EXPECTF-- @@ -48,4 +47,3 @@ Warning: include(phar://%sopen_for_write_newfile_b.phar.tar/b/new.php): failed t Warning: include(): Failed opening 'phar://%sopen_for_write_newfile_b.phar.tar/b/new.php' for inclusion (include_path='%s') in %sopen_for_write_newfile_b.php on line %d -===DONE=== diff --git a/ext/phar/tests/tar/open_for_write_newfile_c.phpt b/ext/phar/tests/tar/open_for_write_newfile_c.phpt index aae6e424d10..6793de14f48 100644 --- a/ext/phar/tests/tar/open_for_write_newfile_c.phpt +++ b/ext/phar/tests/tar/open_for_write_newfile_c.phpt @@ -35,7 +35,6 @@ include $alias . '/b/new.php'; ?> -===DONE=== --CLEAN-- --EXPECTF-- @@ -47,4 +46,3 @@ Warning: include(phar://%sopen_for_write_newfile_c.phar.tar/b/new.php): failed t Warning: include(): Failed opening 'phar://%sopen_for_write_newfile_c.phar.tar/b/new.php' for inclusion (include_path='%s') in %sopen_for_write_newfile_c.php on line %d -===DONE=== diff --git a/ext/phar/tests/tar/phar_begin_setstub_commit.phpt b/ext/phar/tests/tar/phar_begin_setstub_commit.phpt index 9be6f2cf7ba..59f66ed697b 100644 --- a/ext/phar/tests/tar/phar_begin_setstub_commit.phpt +++ b/ext/phar/tests/tar/phar_begin_setstub_commit.phpt @@ -29,7 +29,6 @@ include 'phar://phar_begin_setstub_commit.phar/a.php'; include 'phar://phar_begin_setstub_commit.phar/b.php'; var_dump($p->getStub()); ?> -===DONE=== --CLEAN-- " -===DONE=== diff --git a/ext/phar/tests/tar/phar_buildfromiterator4.phpt b/ext/phar/tests/tar/phar_buildfromiterator4.phpt index 5e82d885504..bffc21b36c1 100644 --- a/ext/phar/tests/tar/phar_buildfromiterator4.phpt +++ b/ext/phar/tests/tar/phar_buildfromiterator4.phpt @@ -45,7 +45,6 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- string(%d) "[stream]" } -===DONE=== diff --git a/ext/phar/tests/tar/phar_commitwrite.phpt b/ext/phar/tests/tar/phar_commitwrite.phpt index ec36a60583e..a99eff7f469 100644 --- a/ext/phar/tests/tar/phar_commitwrite.phpt +++ b/ext/phar/tests/tar/phar_commitwrite.phpt @@ -22,7 +22,6 @@ __HALT_COMPILER(); var_dump($p->getStub()); var_dump($p->isFileFormat(Phar::TAR)); ?> -===DONE=== --CLEAN-- " bool(true) -===DONE=== diff --git a/ext/phar/tests/tar/phar_convert_phar.phpt b/ext/phar/tests/tar/phar_convert_phar.phpt index e121cf6f7b1..609feda8dad 100644 --- a/ext/phar/tests/tar/phar_convert_phar.phpt +++ b/ext/phar/tests/tar/phar_convert_phar.phpt @@ -35,7 +35,6 @@ var_dump($phar->isFileFormat(Phar::PHAR)); var_dump(strlen($phar->getStub())); ?> -===DONE=== --CLEAN-- isCompressed() == Phar::GZ); var_dump(strlen($phar->getStub())); ?> -===DONE=== --CLEAN-- isCompressed() == Phar::BZ2); var_dump(strlen($phar->getStub())); ?> -===DONE=== --CLEAN-- getStub())); var_dump($phar->getMetadata()); ?> -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- getAlias() . "\n"; ?> -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- getStub()); ?> -===DONE=== --CLEAN-- getSignature()); echo $e->getMessage(); } ?> -===DONE=== --CLEAN-- string(7) "OpenSSL" } -===DONE=== diff --git a/ext/phar/tests/tar/phar_stub.phpt b/ext/phar/tests/tar/phar_stub.phpt index f6709280bd9..1b9f6ecd601 100644 --- a/ext/phar/tests/tar/phar_stub.phpt +++ b/ext/phar/tests/tar/phar_stub.phpt @@ -57,7 +57,6 @@ $phar['testing'] = 'hi'; echo $phar->getStub(); ?> -===DONE=== --CLEAN-- booya -===DONE=== diff --git a/ext/phar/tests/tar/phar_stub_error.phpt b/ext/phar/tests/tar/phar_stub_error.phpt index b1dc49f9276..82c0cbf59ff 100644 --- a/ext/phar/tests/tar/phar_stub_error.phpt +++ b/ext/phar/tests/tar/phar_stub_error.phpt @@ -35,7 +35,6 @@ var_dump($phar->getStub()); var_dump($phar->getStub() == $stub); ?> -===DONE=== --CLEAN-- " bool(true) -===DONE=== diff --git a/ext/phar/tests/tar/refcount1.phpt b/ext/phar/tests/tar/refcount1.phpt index 9351b566a6a..df33e3a0d4d 100644 --- a/ext/phar/tests/tar/refcount1.phpt +++ b/ext/phar/tests/tar/refcount1.phpt @@ -46,7 +46,6 @@ include $alias . '/b/c.php'; ?> -===DONE=== --CLEAN-- --EXPECTF-- @@ -69,4 +68,3 @@ object(PharFileInfo)#%d (2) { } string(5) "extra" extra -===DONE=== diff --git a/ext/phar/tests/tar/require_hash.phpt b/ext/phar/tests/tar/require_hash.phpt index a8bf6eb575d..1fd44e18a5c 100644 --- a/ext/phar/tests/tar/require_hash.phpt +++ b/ext/phar/tests/tar/require_hash.phpt @@ -38,7 +38,6 @@ try { } ?> -===DONE=== --CLEAN-- string(3) "MD5" } -===DONE=== diff --git a/ext/phar/tests/tar/tar_001.phpt b/ext/phar/tests/tar/tar_001.phpt index 5eabc301a98..6add59ac0ee 100644 --- a/ext/phar/tests/tar/tar_001.phpt +++ b/ext/phar/tests/tar/tar_001.phpt @@ -19,7 +19,6 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- close(); include $fname; ?> -===DONE=== --CLEAN-- isFileFormat(Phar::TAR)); var_dump($phar2->isCompressed() == Phar::BZ2); ?> -===DONE=== --CLEAN-- isFileFormat(Phar::TAR)); var_dump($b->isCompressed() == Phar::GZ); ?> -===DONE=== --CLEAN-- isFileFormat(Phar::TAR)); var_dump($phar2->isCompressed() == Phar::BZ2); ?> -===DONE=== --CLEAN-- isCompressed() == Phar::BZ2); bool(true) bool(true) bool(true) -===DONE=== diff --git a/ext/phar/tests/tar/tar_makegz.phpt b/ext/phar/tests/tar/tar_makegz.phpt index 244e465722f..f128e2b512b 100644 --- a/ext/phar/tests/tar/tar_makegz.phpt +++ b/ext/phar/tests/tar/tar_makegz.phpt @@ -25,7 +25,6 @@ var_dump($phar2->isFileFormat(Phar::TAR)); var_dump($phar2->isCompressed() == Phar::GZ); ?> -===DONE=== --CLEAN-- isCompressed() == Phar::GZ); bool(true) bool(true) bool(true) -===DONE=== diff --git a/ext/phar/tests/tar/tar_nohash.phpt b/ext/phar/tests/tar/tar_nohash.phpt index a97f347b3c7..e24fea16bf8 100644 --- a/ext/phar/tests/tar/tar_nohash.phpt +++ b/ext/phar/tests/tar/tar_nohash.phpt @@ -16,7 +16,5 @@ try { } ?> -===DONE=== --EXPECT-- string(0) "" -===DONE=== diff --git a/ext/phar/tests/tar/tar_nostub.phpt b/ext/phar/tests/tar/tar_nostub.phpt index d71f834280d..4bef6dc7474 100644 --- a/ext/phar/tests/tar/tar_nostub.phpt +++ b/ext/phar/tests/tar/tar_nostub.phpt @@ -35,7 +35,6 @@ try { } ?> -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- --EXPECTF-- phar error: "%strunc.tar" is a corrupted tar file (truncated) -===DONE=== diff --git a/ext/phar/tests/test_alias_unset.phpt b/ext/phar/tests/test_alias_unset.phpt index fe0ffa970f9..9d852850362 100644 --- a/ext/phar/tests/test_alias_unset.phpt +++ b/ext/phar/tests/test_alias_unset.phpt @@ -33,7 +33,6 @@ var_dump($phar2->getAlias()); $a = file_get_contents($pname . '/file1.txt'); // this fails because $fname2 ref exists ?> -===DONE=== --CLEAN-- @@ -42,4 +41,3 @@ Cannot open archive "%stest_alias_unset.2.phar.php", alias is already in use by string(5) "first" Warning: file_get_contents(phar://%sfile1.txt): failed to open stream: Cannot open archive "%stest_alias_unset.phar.php", alias is already in use by existing archive in %stest_alias_unset.php on line %d -===DONE=== diff --git a/ext/phar/tests/test_signaturealgos.phpt b/ext/phar/tests/test_signaturealgos.phpt index 69fafdb08ba..a7e1e8fa470 100644 --- a/ext/phar/tests/test_signaturealgos.phpt +++ b/ext/phar/tests/test_signaturealgos.phpt @@ -27,11 +27,9 @@ $a = new Phar(__DIR__ . '/files/openssl.phar'); $r = $a->getSignature(); var_dump($r['hash_type']); ?> -===DONE=== --EXPECT-- string(5) "SHA-1" string(7) "SHA-512" string(7) "SHA-256" string(3) "MD5" string(7) "OpenSSL" -===DONE=== diff --git a/ext/phar/tests/test_unset.phpt b/ext/phar/tests/test_unset.phpt index a512d71469a..d2952b27b56 100644 --- a/ext/phar/tests/test_unset.phpt +++ b/ext/phar/tests/test_unset.phpt @@ -31,7 +31,6 @@ var_dump($phar->getAlias()); var_dump(file_exists($fname)); ?> -===DONE=== --CLEAN-- @@ -39,4 +38,3 @@ var_dump(file_exists($fname)); NULL string(%d) "%stest_unset.phar.php" bool(false) -===DONE=== diff --git a/ext/phar/tests/withphar.phpt b/ext/phar/tests/withphar.phpt index 51cfbce01fe..6f1c96951d9 100644 --- a/ext/phar/tests/withphar.phpt +++ b/ext/phar/tests/withphar.phpt @@ -6,9 +6,7 @@ Phar: phar run with ext/phar with default stub -===DONE=== --EXPECT-- in b -===DONE=== --CLEAN-- getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- getMessage(),"\n"; } ?> -===DONE=== --CLEAN-- getAlias()); var_dump($phar->getMetadata()); var_dump($phar['a']->getMetadata()); ?> -===DONE=== --CLEAN-- @@ -61,4 +60,3 @@ string(32) " string(4) "hime" string(8) "hi there" string(6) "a meta" -===DONE=== diff --git a/ext/phar/tests/zip/badalias.phpt b/ext/phar/tests/zip/badalias.phpt index 1ca964d1d65..9e7fdf80914 100644 --- a/ext/phar/tests/zip/badalias.phpt +++ b/ext/phar/tests/zip/badalias.phpt @@ -15,11 +15,9 @@ echo $ee->getMessage(), "\n"; } } ?> -===DONE=== --EXPECTF-- phar error: invalid alias "hi/there" in zip-based phar "%sbadalias1.phar.zip" phar error: invalid alias "hi\there" in zip-based phar "%sbadalias2.phar.zip" phar error: invalid alias "hi\there" in zip-based phar "%sbadalias3.phar.zip" phar error: invalid alias "hi;there" in zip-based phar "%sbadalias4.phar.zip" phar error: invalid alias "hi:there" in zip-based phar "%sbadalias5.phar.zip" -===DONE=== diff --git a/ext/phar/tests/zip/bug48791.phpt b/ext/phar/tests/zip/bug48791.phpt index b888838fe46..6b1726f2305 100644 --- a/ext/phar/tests/zip/bug48791.phpt +++ b/ext/phar/tests/zip/bug48791.phpt @@ -7,8 +7,6 @@ Phar: Bug #48791: open office documents always reported as corrupted by phar ext -===DONE=== --EXPECT-- ÜberschriftName:$$n_fn$$Firma:$$org_name$$Menge:$$#menge$$ -===DONE=== diff --git a/ext/phar/tests/zip/bzip2.phpt b/ext/phar/tests/zip/bzip2.phpt index 551e419b875..0b1fb31081e 100644 --- a/ext/phar/tests/zip/bzip2.phpt +++ b/ext/phar/tests/zip/bzip2.phpt @@ -16,7 +16,6 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --EXPECT-- addFile('hi', null, 'hii', null, null, 'compress', 'compress', 11); $a->writeZip(dirname(__FILE__) . '/compress_unsupunknown.zip'); ?> string(175) "hitheresuperlongzipistoostupidtodowhatIsaysoIhavetousethisridiculouslylongaliasbecauseitisstupiddidImentionthatalreadythemadnessdoesnotstopIhateinfozipIhateinfozipIhateinfozip" -===DONE=== diff --git a/ext/phar/tests/zip/corrupt_001.phpt b/ext/phar/tests/zip/corrupt_001.phpt index 66d1d62ec96..188d9719f75 100644 --- a/ext/phar/tests/zip/corrupt_001.phpt +++ b/ext/phar/tests/zip/corrupt_001.phpt @@ -15,8 +15,6 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --EXPECTF-- phar error: corrupt zip archive, conflicting file count in end of central directory record in zip-based phar "%scount1.zip" phar error: corrupt zip archive, conflicting file count in end of central directory record in zip-based phar "%scount2.zip" -===DONE=== diff --git a/ext/phar/tests/zip/corrupt_002.phpt b/ext/phar/tests/zip/corrupt_002.phpt index 7aad946fa8e..15058fcb227 100644 --- a/ext/phar/tests/zip/corrupt_002.phpt +++ b/ext/phar/tests/zip/corrupt_002.phpt @@ -10,7 +10,5 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --EXPECTF-- phar error: end of central directory not found in zip-based phar "%snozipend.zip" -===DONE=== diff --git a/ext/phar/tests/zip/corrupt_003.phpt b/ext/phar/tests/zip/corrupt_003.phpt index e076a4eb8ff..02fc99e59b7 100644 --- a/ext/phar/tests/zip/corrupt_003.phpt +++ b/ext/phar/tests/zip/corrupt_003.phpt @@ -10,7 +10,5 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --EXPECTF-- phar error: corrupt zip archive, zip file comment truncated in zip-based phar "%sfilecomment.zip" -===DONE=== diff --git a/ext/phar/tests/zip/corrupt_004.phpt b/ext/phar/tests/zip/corrupt_004.phpt index 516fe31e5a3..bfef6cba5da 100644 --- a/ext/phar/tests/zip/corrupt_004.phpt +++ b/ext/phar/tests/zip/corrupt_004.phpt @@ -10,7 +10,5 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --EXPECTF-- phar error: corrupted central directory entry, no magic signature in zip-based phar "%scdir_offset.zip" -===DONE=== diff --git a/ext/phar/tests/zip/corrupt_005.phpt b/ext/phar/tests/zip/corrupt_005.phpt index 00ac1f6b4e4..795f3f17b22 100644 --- a/ext/phar/tests/zip/corrupt_005.phpt +++ b/ext/phar/tests/zip/corrupt_005.phpt @@ -10,7 +10,5 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --EXPECTF-- phar error: Cannot process encrypted zip files in zip-based phar "%sencrypted.zip" -===DONE=== diff --git a/ext/phar/tests/zip/corrupt_006.phpt b/ext/phar/tests/zip/corrupt_006.phpt index aca7bc572bf..8c36cd98b83 100644 --- a/ext/phar/tests/zip/corrupt_006.phpt +++ b/ext/phar/tests/zip/corrupt_006.phpt @@ -10,7 +10,5 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --EXPECTF-- phar error: Cannot process zips created from stdin (zero-length filename) in zip-based phar "%sstdin.zip" -===DONE=== diff --git a/ext/phar/tests/zip/corrupt_007.phpt b/ext/phar/tests/zip/corrupt_007.phpt index 35efd5b4897..21dcee826a6 100644 --- a/ext/phar/tests/zip/corrupt_007.phpt +++ b/ext/phar/tests/zip/corrupt_007.phpt @@ -10,7 +10,5 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --EXPECTF-- phar error: corrupted central directory entry, no magic signature in zip-based phar "%struncfilename.zip" -===DONE=== diff --git a/ext/phar/tests/zip/corrupt_008.phpt b/ext/phar/tests/zip/corrupt_008.phpt index 7385b031831..5fcde01c941 100644 --- a/ext/phar/tests/zip/corrupt_008.phpt +++ b/ext/phar/tests/zip/corrupt_008.phpt @@ -80,7 +80,6 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --EXPECTF-- phar error: unsupported compression method (Shrunk) used in this zip in zip-based phar "%scompress_unsup1.zip" phar error: unsupported compression method (Reduce) used in this zip in zip-based phar "%scompress_unsup2.zip" @@ -97,4 +96,3 @@ phar error: unsupported compression method (IBM LZ77) used in this zip in zip-ba phar error: unsupported compression method (WavPack) used in this zip in zip-based phar "%scompress_unsup97.zip" phar error: unsupported compression method (PPMd) used in this zip in zip-based phar "%scompress_unsup98.zip" phar error: unsupported compression method (unknown) used in this zip in zip-based phar "%scompress_unsupunknown.zip" -===DONE=== diff --git a/ext/phar/tests/zip/corrupt_009.phpt b/ext/phar/tests/zip/corrupt_009.phpt index ab7594ac30b..9a86a933e65 100644 --- a/ext/phar/tests/zip/corrupt_009.phpt +++ b/ext/phar/tests/zip/corrupt_009.phpt @@ -10,7 +10,5 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --EXPECTF-- phar error: Unable to process extra field header for file in central directory in zip-based phar "%sextralen_toolong.zip" -===DONE=== diff --git a/ext/phar/tests/zip/corrupt_010.phpt b/ext/phar/tests/zip/corrupt_010.phpt index 4643cae0704..0106d308ae4 100644 --- a/ext/phar/tests/zip/corrupt_010.phpt +++ b/ext/phar/tests/zip/corrupt_010.phpt @@ -10,7 +10,5 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --EXPECTF-- phar error: split archives spanning multiple zips cannot be processed in zip-based phar "%sdisknumber.zip" -===DONE=== diff --git a/ext/phar/tests/zip/create_new_and_modify.phpt b/ext/phar/tests/zip/create_new_and_modify.phpt index 2a52e8a5ca9..38cf305525c 100644 --- a/ext/phar/tests/zip/create_new_and_modify.phpt +++ b/ext/phar/tests/zip/create_new_and_modify.phpt @@ -42,7 +42,6 @@ include $pname . '/a.php'; include $pname . '/b.php'; ?> -===DONE=== --CLEAN-- --EXPECT-- @@ -51,4 +50,3 @@ brand new! bool(true) modified! another! -===DONE=== diff --git a/ext/phar/tests/zip/create_new_phar_b.phpt b/ext/phar/tests/zip/create_new_phar_b.phpt index d8a72c9d42c..1db8f6ecdb1 100644 --- a/ext/phar/tests/zip/create_new_phar_b.phpt +++ b/ext/phar/tests/zip/create_new_phar_b.phpt @@ -13,7 +13,6 @@ file_put_contents('phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.pha include 'phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.zip/a.php'; ?> -===DONE=== --CLEAN-- --EXPECTF-- @@ -23,4 +22,3 @@ Warning: include(phar://%screate_new_phar_b.phar.zip/a.php): failed to open stre Warning: include(): Failed opening 'phar://%screate_new_phar_b.phar.zip/a.php' for inclusion (include_path='%s') in %screate_new_phar_b.php on line %d -===DONE=== diff --git a/ext/phar/tests/zip/delete_in_phar.phpt b/ext/phar/tests/zip/delete_in_phar.phpt index 86a6d4dbd4f..e1c541e7e27 100644 --- a/ext/phar/tests/zip/delete_in_phar.phpt +++ b/ext/phar/tests/zip/delete_in_phar.phpt @@ -30,7 +30,6 @@ include $alias . '/b.php'; include $alias . '/b/c.php'; ?> -===DONE=== --CLEAN-- --EXPECTF-- @@ -45,4 +44,3 @@ Warning: include(%sdelete_in_phar.phar.zip/b/c.php): failed to open stream: phar Warning: include(): Failed opening 'phar://%sdelete_in_phar.phar.zip/b/c.php' for inclusion (include_path='%s') in %sdelete_in_phar.php on line %d -===DONE=== diff --git a/ext/phar/tests/zip/delete_in_phar_b.phpt b/ext/phar/tests/zip/delete_in_phar_b.phpt index 65f47e55ba8..ac8a0db4ddb 100644 --- a/ext/phar/tests/zip/delete_in_phar_b.phpt +++ b/ext/phar/tests/zip/delete_in_phar_b.phpt @@ -31,7 +31,6 @@ include $alias . '/b.php'; include $alias . '/b/c.php'; ?> -===DONE=== --CLEAN-- --EXPECTF-- @@ -45,4 +44,3 @@ This is a This is b This is b/c -===DONE=== diff --git a/ext/phar/tests/zip/delete_in_phar_confirm.phpt b/ext/phar/tests/zip/delete_in_phar_confirm.phpt index 26ff9b34568..84d337af06e 100644 --- a/ext/phar/tests/zip/delete_in_phar_confirm.phpt +++ b/ext/phar/tests/zip/delete_in_phar_confirm.phpt @@ -35,7 +35,6 @@ include 'phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.zip/b.ph include 'phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.zip/b/c.php'; ?> -===DONE=== --CLEAN-- --EXPECTF-- @@ -50,4 +49,3 @@ Warning: include(%sdelete_in_phar_confirm.phar.zip/b/c.php): failed to open stre Warning: include(): Failed opening 'phar://%sdelete_in_phar_confirm.phar.zip/b/c.php' for inclusion (include_path='%s') in %sdelete_in_phar_confirm.php on line %d -===DONE=== diff --git a/ext/phar/tests/zip/exists_as_phar.phpt b/ext/phar/tests/zip/exists_as_phar.phpt index 2499e82312d..e439eae0153 100644 --- a/ext/phar/tests/zip/exists_as_phar.phpt +++ b/ext/phar/tests/zip/exists_as_phar.phpt @@ -27,7 +27,6 @@ try { } ?> -===DONE=== --CLEAN-- --EXPECTF-- phar zip error: phar "%sexists_as_phar.phar.zip" already exists as a regular phar and must be deleted from disk prior to creating as a zip-based phar -===DONE=== diff --git a/ext/phar/tests/zip/getalias.phpt b/ext/phar/tests/zip/getalias.phpt index 2a2f5c19e6a..e8ab8494cfb 100644 --- a/ext/phar/tests/zip/getalias.phpt +++ b/ext/phar/tests/zip/getalias.phpt @@ -42,7 +42,6 @@ $phar->setAlias('pinocchio'); var_dump($phar->getAlias()); ?> -===DONE=== --CLEAN-- getContent())); ?> -===DONE=== --CLEAN-- --EXPECT-- int(200000) -===DONE=== diff --git a/ext/phar/tests/zip/metadata_write_commit.phpt b/ext/phar/tests/zip/metadata_write_commit.phpt index d179b17a5c5..522ddd10e7d 100644 --- a/ext/phar/tests/zip/metadata_write_commit.phpt +++ b/ext/phar/tests/zip/metadata_write_commit.phpt @@ -53,7 +53,6 @@ foreach($files as $name => $cont) { } var_dump($phar->getMetadata()); ?> -===DONE=== --CLEAN-- --EXPECT-- @@ -84,4 +83,3 @@ array(2) { } bool(true) string(2) "hi" -===DONE=== diff --git a/ext/phar/tests/zip/odt.phpt b/ext/phar/tests/zip/odt.phpt index 5ca6ac8df0c..6f229440f37 100644 --- a/ext/phar/tests/zip/odt.phpt +++ b/ext/phar/tests/zip/odt.phpt @@ -20,7 +20,6 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --EXPECTF-- phar://%sodt.odt/Configurations2/accelerator%ccurrent.xml phar://%sodt.odt/META-INF%cmanifest.xml @@ -31,4 +30,3 @@ phar://%sodt.odt%cmimetype phar://%sodt.odt%csettings.xml phar://%sodt.odt%cstyles.xml Cannot create phar '%sodt.odt', file extension (or combination) not recognised or the directory does not exist -===DONE=== diff --git a/ext/phar/tests/zip/open_for_write_existing.phpt b/ext/phar/tests/zip/open_for_write_existing.phpt index fd76d4174e5..c878f5cb1dd 100644 --- a/ext/phar/tests/zip/open_for_write_existing.phpt +++ b/ext/phar/tests/zip/open_for_write_existing.phpt @@ -31,9 +31,7 @@ fclose($fp); include $alias . '/b/c.php'; ?> -===DONE=== --CLEAN-- --EXPECT-- extra -===DONE=== diff --git a/ext/phar/tests/zip/open_for_write_existing_b.phpt b/ext/phar/tests/zip/open_for_write_existing_b.phpt index 9559b1740d5..a15a7897e59 100644 --- a/ext/phar/tests/zip/open_for_write_existing_b.phpt +++ b/ext/phar/tests/zip/open_for_write_existing_b.phpt @@ -32,11 +32,9 @@ ini_set('phar.readonly', 1); var_dump(fopen($alias . '/b/c.php', 'wb')); include $alias . '/b/c.php'; ?> -===DONE=== --CLEAN-- --EXPECTF-- Warning: fopen(phar://%sopen_for_write_existing_b.phar.zip/b/c.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_existing_b.php on line %d bool(false) This is b/c -===DONE=== diff --git a/ext/phar/tests/zip/open_for_write_existing_c.phpt b/ext/phar/tests/zip/open_for_write_existing_c.phpt index 2071aaeeef6..6e6a1b9edf3 100644 --- a/ext/phar/tests/zip/open_for_write_existing_c.phpt +++ b/ext/phar/tests/zip/open_for_write_existing_c.phpt @@ -32,11 +32,9 @@ ini_set('phar.readonly', 1); var_dump(fopen($alias . '/b/c.php', 'wb')); include $alias . '/b/c.php'; ?> -===DONE=== --CLEAN-- --EXPECTF-- Warning: fopen(phar://%sopen_for_write_existing_c.phar.zip/b/c.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_existing_c.php on line %d bool(false) This is b/c -===DONE=== diff --git a/ext/phar/tests/zip/open_for_write_newfile.phpt b/ext/phar/tests/zip/open_for_write_newfile.phpt index 10a69f0dde8..a3db9558b88 100644 --- a/ext/phar/tests/zip/open_for_write_newfile.phpt +++ b/ext/phar/tests/zip/open_for_write_newfile.phpt @@ -33,10 +33,8 @@ include $alias . '/b/c.php'; include $alias . '/b/new.php'; ?> -===DONE=== --CLEAN-- --EXPECT-- This is b/c extra -===DONE=== diff --git a/ext/phar/tests/zip/open_for_write_newfile_b.phpt b/ext/phar/tests/zip/open_for_write_newfile_b.phpt index 9e851be30a3..e25bade0850 100644 --- a/ext/phar/tests/zip/open_for_write_newfile_b.phpt +++ b/ext/phar/tests/zip/open_for_write_newfile_b.phpt @@ -35,7 +35,6 @@ include $alias . '/b/c.php'; include $alias . '/b/new.php'; ?> -===DONE=== --CLEAN-- --EXPECTF-- @@ -47,4 +46,3 @@ Warning: include(phar://%sopen_for_write_newfile_b.phar.zip/b/new.php): failed t Warning: include(): Failed opening 'phar://%sopen_for_write_newfile_b.phar.zip/b/new.php' for inclusion (include_path='%s') in %sopen_for_write_newfile_b.php on line %d -===DONE=== diff --git a/ext/phar/tests/zip/open_for_write_newfile_c.phpt b/ext/phar/tests/zip/open_for_write_newfile_c.phpt index bb46affc075..e2074d7003c 100644 --- a/ext/phar/tests/zip/open_for_write_newfile_c.phpt +++ b/ext/phar/tests/zip/open_for_write_newfile_c.phpt @@ -35,7 +35,6 @@ include $alias . '/b/c.php'; include $alias . '/b/new.php'; ?> -===DONE=== --CLEAN-- --EXPECTF-- @@ -47,4 +46,3 @@ Warning: include(phar://%sopen_for_write_newfile_c.phar.zip/b/new.php): failed t Warning: include(): Failed opening 'phar://%sopen_for_write_newfile_c.phar.zip/b/new.php' for inclusion (include_path='%s') in %sopen_for_write_newfile_c.php on line %d -===DONE=== diff --git a/ext/phar/tests/zip/phar_begin_setstub_commit.phpt b/ext/phar/tests/zip/phar_begin_setstub_commit.phpt index 3adcc9c2343..a7c8d76375d 100644 --- a/ext/phar/tests/zip/phar_begin_setstub_commit.phpt +++ b/ext/phar/tests/zip/phar_begin_setstub_commit.phpt @@ -41,7 +41,6 @@ $p->setStub($a, $c); var_dump($p->getStub()); fclose($a); ?> -===DONE=== --CLEAN-- " -===DONE=== diff --git a/ext/phar/tests/zip/phar_buildfromiterator4.phpt b/ext/phar/tests/zip/phar_buildfromiterator4.phpt index 3f2b9f8355e..8e6f3993c32 100644 --- a/ext/phar/tests/zip/phar_buildfromiterator4.phpt +++ b/ext/phar/tests/zip/phar_buildfromiterator4.phpt @@ -45,7 +45,6 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- string(%d) "[stream]" } -===DONE=== diff --git a/ext/phar/tests/zip/phar_commitwrite.phpt b/ext/phar/tests/zip/phar_commitwrite.phpt index 04fe2558696..0d42723e38d 100644 --- a/ext/phar/tests/zip/phar_commitwrite.phpt +++ b/ext/phar/tests/zip/phar_commitwrite.phpt @@ -22,7 +22,6 @@ __HALT_COMPILER(); var_dump($p->getStub()); var_dump($p->isFileFormat(Phar::ZIP)); ?> -===DONE=== --CLEAN-- " bool(true) -===DONE=== diff --git a/ext/phar/tests/zip/phar_convert_phar.phpt b/ext/phar/tests/zip/phar_convert_phar.phpt index 494afd95836..ef9d9b35fc4 100644 --- a/ext/phar/tests/zip/phar_convert_phar.phpt +++ b/ext/phar/tests/zip/phar_convert_phar.phpt @@ -35,7 +35,6 @@ var_dump($phar->isFileFormat(Phar::PHAR)); var_dump(strlen($phar->getStub())); ?> -===DONE=== --CLEAN-- -===DONE=== --CLEAN-- isCompressed(Phar::GZ)); var_dump($c['a']->isCompressed(Phar::BZ2)); ?> -===DONE=== --CLEAN-- isCompressed(Phar::BZ2)); var_dump($phar['c']->isCompressed(Phar::GZ)); ?> -===DONE=== --CLEAN-- setAlias('unused2'); $p3 = new Phar($fname3); echo $p3->getAlias(), "\n"; ?> -===DONE=== --CLEAN-- getMessage() . "\n"; } ?> -===DONE=== --CLEAN-- getStub()); ?> -===DONE=== --CLEAN-- getSignature()); echo $e->getMessage(); } ?> -===DONE=== --CLEAN-- string(7) "OpenSSL" } -===DONE=== diff --git a/ext/phar/tests/zip/phar_stub.phpt b/ext/phar/tests/zip/phar_stub.phpt index 197cf409a91..c2c41dc4f18 100644 --- a/ext/phar/tests/zip/phar_stub.phpt +++ b/ext/phar/tests/zip/phar_stub.phpt @@ -57,7 +57,6 @@ $phar['testing'] = 'hi'; echo $phar->getStub(); ?> -===DONE=== --CLEAN-- booya -===DONE=== diff --git a/ext/phar/tests/zip/phar_stub_error.phpt b/ext/phar/tests/zip/phar_stub_error.phpt index 4bab4c28706..0d2cedebc30 100644 --- a/ext/phar/tests/zip/phar_stub_error.phpt +++ b/ext/phar/tests/zip/phar_stub_error.phpt @@ -35,7 +35,6 @@ var_dump($phar->getStub()); var_dump($phar->getStub() == $stub); ?> -===DONE=== --CLEAN-- " bool(true) -===DONE=== diff --git a/ext/phar/tests/zip/refcount1.phpt b/ext/phar/tests/zip/refcount1.phpt index 14fb3b228a3..e5db8285e18 100644 --- a/ext/phar/tests/zip/refcount1.phpt +++ b/ext/phar/tests/zip/refcount1.phpt @@ -42,7 +42,6 @@ var_dump(fread($b, 20)); include $alias . '/b/c.php'; ?> -===DONE=== --CLEAN-- --EXPECTF-- @@ -65,4 +64,3 @@ object(PharFileInfo)#%d (2) { } string(5) "extra" extra -===DONE=== diff --git a/ext/phar/tests/zip/unixzip.phpt b/ext/phar/tests/zip/unixzip.phpt index 371c34e0c75..e281a18f0b7 100644 --- a/ext/phar/tests/zip/unixzip.phpt +++ b/ext/phar/tests/zip/unixzip.phpt @@ -17,7 +17,6 @@ if (isset($a['notempty/hi.txt'])) { echo $a['notempty/hi.txt']->getPathName() . "\n"; } ?> -===DONE=== --EXPECTF-- dir phar://%s/zip.zip%cempty phar://%s/zip.zip%chi.txt @@ -25,4 +24,3 @@ hi there dir phar://%s/zip.zip%cnotempty phar://%s/zip.zip/notempty%chi.txt -===DONE=== diff --git a/ext/phar/tests/zip/zlib.phpt b/ext/phar/tests/zip/zlib.phpt index 1e66e999376..5cd59fcac42 100644 --- a/ext/phar/tests/zip/zlib.phpt +++ b/ext/phar/tests/zip/zlib.phpt @@ -12,7 +12,5 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --EXPECT-- string(175) "hitheresuperlongzipistoostupidtodowhatIsaysoIhavetousethisridiculouslylongaliasbecauseitisstupiddidImentionthatalreadythemadnessdoesnotstopIhateinfozipIhateinfozipIhateinfozip" -===DONE=== diff --git a/ext/posix/tests/bug75696.phpt b/ext/posix/tests/bug75696.phpt index e37f8077ce4..022e781b4e7 100644 --- a/ext/posix/tests/bug75696.phpt +++ b/ext/posix/tests/bug75696.phpt @@ -11,7 +11,5 @@ $name = posix_getgrgid($gid)['name']; $info = posix_getgrnam($name); var_dump(is_array($info)); ?> -===DONE=== --EXPECT-- bool(true) -===DONE=== diff --git a/ext/posix/tests/posix_ctermid.phpt b/ext/posix/tests/posix_ctermid.phpt index ccf850d776c..1d277659c49 100644 --- a/ext/posix/tests/posix_ctermid.phpt +++ b/ext/posix/tests/posix_ctermid.phpt @@ -20,7 +20,5 @@ PHP Testfest Berlin 2009-05-10 -===DONE=== --EXPECTF-- string(%d) "%s" -===DONE=== diff --git a/ext/posix/tests/posix_getgrgid.phpt b/ext/posix/tests/posix_getgrgid.phpt index 0209d09732c..b10c77a6934 100644 --- a/ext/posix/tests/posix_getgrgid.phpt +++ b/ext/posix/tests/posix_getgrgid.phpt @@ -39,7 +39,5 @@ if (!isset($grp['gid'])) { } var_dump($grp['gid']); ?> -===DONE=== --EXPECT-- int(0) -===DONE=== diff --git a/ext/posix/tests/posix_getgrgid_basic.phpt b/ext/posix/tests/posix_getgrgid_basic.phpt index 61ec8ab0fcb..6327a750675 100644 --- a/ext/posix/tests/posix_getgrgid_basic.phpt +++ b/ext/posix/tests/posix_getgrgid_basic.phpt @@ -14,7 +14,6 @@ Test posix_getgrgid() function : basic functionality print_r($groupinfo); ?> -===DONE=== --EXPECTF-- Basic test of POSIX getgid and getgrid fucntions Array @@ -26,4 +25,3 @@ Array [gid] => %d ) -===DONE=== diff --git a/ext/posix/tests/posix_getgrgid_macosx.phpt b/ext/posix/tests/posix_getgrgid_macosx.phpt index f9e6cc1d538..ff1858f7bfd 100644 --- a/ext/posix/tests/posix_getgrgid_macosx.phpt +++ b/ext/posix/tests/posix_getgrgid_macosx.phpt @@ -17,7 +17,5 @@ if (strtolower(PHP_OS) != 'darwin') { $grp = posix_getgrgid(-1); var_dump($grp['name']); ?> -===DONE=== --EXPECT-- string(7) "nogroup" -===DONE=== diff --git a/ext/posix/tests/posix_getgroups_basic.phpt b/ext/posix/tests/posix_getgroups_basic.phpt index dd17fd447fb..fd8b3af3053 100644 --- a/ext/posix/tests/posix_getgroups_basic.phpt +++ b/ext/posix/tests/posix_getgroups_basic.phpt @@ -17,8 +17,6 @@ Test posix_getgroups() function : basic functionality } ?> -===DONE=== --EXPECT-- Basic test of POSIX getgroups TEST PASSED -===DONE=== diff --git a/ext/posix/tests/posix_getsid.phpt b/ext/posix/tests/posix_getsid.phpt index 6f707d067ff..c538f61d7e3 100644 --- a/ext/posix/tests/posix_getsid.phpt +++ b/ext/posix/tests/posix_getsid.phpt @@ -19,10 +19,8 @@ echo "\n-- Testing posix_getsid() function with current process pid --\n"; var_dump( is_long(posix_getsid($pid)) ); ?> -===DONE=== --EXPECT-- *** Testing posix_getsid() : function test *** -- Testing posix_getsid() function with current process pid -- bool(true) -===DONE=== diff --git a/ext/posix/tests/posix_getsid_error.phpt b/ext/posix/tests/posix_getsid_error.phpt index 833ae9a0dbc..8e05a234967 100644 --- a/ext/posix/tests/posix_getsid_error.phpt +++ b/ext/posix/tests/posix_getsid_error.phpt @@ -15,7 +15,5 @@ PHP Testfest Berlin 2009-05-10 -===DONE=== --EXPECTF-- bool(false) -===DONE=== diff --git a/ext/posix/tests/posix_setgid_basic.phpt b/ext/posix/tests/posix_setgid_basic.phpt index d6194766770..5984caa58b0 100644 --- a/ext/posix/tests/posix_setgid_basic.phpt +++ b/ext/posix/tests/posix_setgid_basic.phpt @@ -19,9 +19,7 @@ var_dump(posix_setgid( $gid ) ); ?> -===DONE=== --EXPECT-- *** Test by calling method or function with its expected arguments *** bool(true) -===DONE=== diff --git a/ext/posix/tests/posix_setgid_variation2.phpt b/ext/posix/tests/posix_setgid_variation2.phpt index 5a1b5a13a1d..eac869e7e10 100644 --- a/ext/posix/tests/posix_setgid_variation2.phpt +++ b/ext/posix/tests/posix_setgid_variation2.phpt @@ -29,11 +29,9 @@ foreach ( $variation_array as $var ) { var_dump(posix_setgid( $var ) ); } ?> -===DONE=== --EXPECT-- *** Test substituting argument 1 with boolean values *** bool(false) bool(false) bool(false) bool(false) -===DONE=== diff --git a/ext/posix/tests/posix_setgid_variation5.phpt b/ext/posix/tests/posix_setgid_variation5.phpt index ad9c79bd2ba..35187d44a5d 100644 --- a/ext/posix/tests/posix_setgid_variation5.phpt +++ b/ext/posix/tests/posix_setgid_variation5.phpt @@ -28,10 +28,8 @@ foreach ( $variation_array as $var ) { var_dump(posix_setgid( $var ) ); } ?> -===DONE=== --EXPECT-- *** Test substituting argument 1 with int values *** bool(false) bool(false) bool(false) -===DONE=== diff --git a/ext/posix/tests/posix_times.phpt b/ext/posix/tests/posix_times.phpt index f75caa7920f..4f069b2d8d5 100644 --- a/ext/posix/tests/posix_times.phpt +++ b/ext/posix/tests/posix_times.phpt @@ -16,7 +16,6 @@ PHP Testfest Berlin 2009-05-10 -===DONE=== --EXPECTF-- array(5) { ["ticks"]=> @@ -30,4 +29,3 @@ array(5) { ["cstime"]=> int(%d) } -===DONE=== diff --git a/ext/posix/tests/posix_ttyname.phpt b/ext/posix/tests/posix_ttyname.phpt index a1f806bd502..c63fe27ec97 100644 --- a/ext/posix/tests/posix_ttyname.phpt +++ b/ext/posix/tests/posix_ttyname.phpt @@ -18,9 +18,7 @@ PHP Testfest Berlin 2009-05-10 var_dump(posix_ttyname(STDERR)); var_dump(posix_ttyname(STDOUT)); ?> -===DONE=== --EXPECT-- bool(false) bool(false) bool(false) -===DONE=== diff --git a/ext/posix/tests/posix_ttyname_error_wrongparams.phpt b/ext/posix/tests/posix_ttyname_error_wrongparams.phpt index 4ff7aaf3fe2..66a6cd9bd98 100644 --- a/ext/posix/tests/posix_ttyname_error_wrongparams.phpt +++ b/ext/posix/tests/posix_ttyname_error_wrongparams.phpt @@ -26,8 +26,6 @@ try { echo $e->getMessage(), "\n"; } ?> -===DONE=== --EXPECT-- bool(false) posix_ttyname(): supplied resource is not a valid stream resource -===DONE=== diff --git a/ext/reflection/tests/001.phpt b/ext/reflection/tests/001.phpt index f68afc950e3..266a1ef5ffb 100644 --- a/ext/reflection/tests/001.phpt +++ b/ext/reflection/tests/001.phpt @@ -75,7 +75,6 @@ sort($props); var_dump($props); var_dump($r->name); ?> -===DONE=== --EXPECT-- array(0) { } @@ -86,4 +85,3 @@ array(2) { string(4) "name" } string(17) "ReflectionClassEx" -===DONE=== diff --git a/ext/reflection/tests/002.phpt b/ext/reflection/tests/002.phpt index d0fcb32bea5..6df97f0daac 100644 --- a/ext/reflection/tests/002.phpt +++ b/ext/reflection/tests/002.phpt @@ -47,7 +47,6 @@ var_dump($r->foo); var_dump($r->bar); ?> -===DONE=== --EXPECT-- ReflectionMethodEx::__construct string(26) "ReflectionFunctionAbstract" @@ -60,4 +59,3 @@ string(26) "ReflectionFunctionAbstract" string(7) "getName" string(3) "bar" string(3) "baz" -===DONE=== diff --git a/ext/reflection/tests/003.phpt b/ext/reflection/tests/003.phpt index 80bf0a65130..8c37d539ac2 100644 --- a/ext/reflection/tests/003.phpt +++ b/ext/reflection/tests/003.phpt @@ -25,7 +25,5 @@ $r = new ReflectionMethod('Foo','Test'); $r->invoke($o); ?> -===DONE=== --EXPECT-- Foo::Test -===DONE=== diff --git a/ext/reflection/tests/005.phpt b/ext/reflection/tests/005.phpt index e40fcc30992..cb099129e7a 100644 --- a/ext/reflection/tests/005.phpt +++ b/ext/reflection/tests/005.phpt @@ -46,11 +46,9 @@ foreach($r->getMethods() as $m) } ?> -===DONE=== --EXPECT-- string(19) "Comment for class A" string(15) "Method A::bla()" bool(false) bool(false) string(22) "* Comment for A::baz()" -===DONE=== diff --git a/ext/reflection/tests/006.phpt b/ext/reflection/tests/006.phpt index ab22f5c5c97..28d4cc592b9 100644 --- a/ext/reflection/tests/006.phpt +++ b/ext/reflection/tests/006.phpt @@ -82,8 +82,6 @@ Test::testing(); TestDerived::testing(); ?> -===DONE=== - --EXPECT-- string(3) "pub" string(3) "pub" @@ -100,4 +98,3 @@ string(7) "updated" string(7) "updated" EXCEPTION EXCEPTION -===DONE=== diff --git a/ext/reflection/tests/007.phpt b/ext/reflection/tests/007.phpt index 8babf242825..57e3ee47fe4 100644 --- a/ext/reflection/tests/007.phpt +++ b/ext/reflection/tests/007.phpt @@ -88,8 +88,6 @@ Class WithCtorWithArgs test('WithCtorWithArgs'); ?> -===DONE=== - --EXPECTF-- ====>Class_does_not_exist {closure}(Class_does_not_exist) @@ -151,4 +149,3 @@ array(2) { object(WithCtorWithArgs)#%d (0) { } -===DONE=== diff --git a/ext/reflection/tests/ReflectionClass_getModifierNames_basic.phpt b/ext/reflection/tests/ReflectionClass_getModifierNames_basic.phpt index 91a0a18f1aa..ba7fa6880bc 100644 --- a/ext/reflection/tests/ReflectionClass_getModifierNames_basic.phpt +++ b/ext/reflection/tests/ReflectionClass_getModifierNames_basic.phpt @@ -49,7 +49,6 @@ dump_methodModifierNames('x'); dump_methodModifierNames('y'); ?> -==DONE== --EXPECT-- string(1) "a" array(0) { @@ -136,4 +135,3 @@ array(2) { [1]=> string(9) "protected" } -==DONE== diff --git a/ext/reflection/tests/ReflectionExtension_constructor_basic.phpt b/ext/reflection/tests/ReflectionExtension_constructor_basic.phpt index 72c8ac6bd8e..25a4bbf4b8a 100644 --- a/ext/reflection/tests/ReflectionExtension_constructor_basic.phpt +++ b/ext/reflection/tests/ReflectionExtension_constructor_basic.phpt @@ -9,7 +9,5 @@ $obj = new ReflectionExtension('reflection'); $test = $obj instanceof ReflectionExtension; var_dump($test); ?> -==DONE== --EXPECT-- bool(true) -==DONE== diff --git a/ext/reflection/tests/ReflectionExtension_constructor_error.phpt b/ext/reflection/tests/ReflectionExtension_constructor_error.phpt index 94071de5ab1..a0b920ac084 100644 --- a/ext/reflection/tests/ReflectionExtension_constructor_error.phpt +++ b/ext/reflection/tests/ReflectionExtension_constructor_error.phpt @@ -25,9 +25,7 @@ try { ?> -==DONE== --EXPECTF-- Ok - ReflectionExtension::__construct() expects exactly %d parameter, %d given Ok - ReflectionExtension::__construct() expects exactly %d parameter, %d given Ok - ReflectionExtension::__construct() expects parameter 1 to be string, array given -==DONE== diff --git a/ext/reflection/tests/ReflectionExtension_export_basic.phpt b/ext/reflection/tests/ReflectionExtension_export_basic.phpt index 4652a409a1b..42972f15745 100644 --- a/ext/reflection/tests/ReflectionExtension_export_basic.phpt +++ b/ext/reflection/tests/ReflectionExtension_export_basic.phpt @@ -11,8 +11,6 @@ ReflectionExtension::export("reflection", false); $test = ob_get_clean(); var_dump(empty($test)); ?> -==DONE== --EXPECTF-- Deprecated: Function ReflectionExtension::export() is deprecated in %s on line %d bool(false) -==DONE== diff --git a/ext/reflection/tests/ReflectionExtension_getClassNames_basic.phpt b/ext/reflection/tests/ReflectionExtension_getClassNames_basic.phpt index 3fea08c43f1..e90209ee672 100644 --- a/ext/reflection/tests/ReflectionExtension_getClassNames_basic.phpt +++ b/ext/reflection/tests/ReflectionExtension_getClassNames_basic.phpt @@ -7,7 +7,6 @@ Felix De Vliegher $standard = new ReflectionExtension('standard'); var_dump($standard->getClassNames()); ?> -==DONE== --EXPECTF-- array(4) { [0]=> @@ -19,4 +18,3 @@ array(4) { [3]=> %s(14) "AssertionError" } -==DONE== diff --git a/ext/reflection/tests/ReflectionExtension_getClassNames_variation1.phpt b/ext/reflection/tests/ReflectionExtension_getClassNames_variation1.phpt index 91912b92207..34f6112d98e 100644 --- a/ext/reflection/tests/ReflectionExtension_getClassNames_variation1.phpt +++ b/ext/reflection/tests/ReflectionExtension_getClassNames_variation1.phpt @@ -11,8 +11,6 @@ extension_loaded('ctype') or die("skip Requires 'ctype' extension"); $extension = new ReflectionExtension('ctype'); var_dump($extension->getClassNames()); ?> -==DONE== --EXPECT-- array(0) { } -==DONE== diff --git a/ext/reflection/tests/ReflectionExtension_getClasses_basic.phpt b/ext/reflection/tests/ReflectionExtension_getClasses_basic.phpt index 5877f88e270..d05c381a82b 100644 --- a/ext/reflection/tests/ReflectionExtension_getClasses_basic.phpt +++ b/ext/reflection/tests/ReflectionExtension_getClasses_basic.phpt @@ -7,7 +7,6 @@ Thijs Lensselink $ext = new ReflectionExtension('reflection'); var_dump($ext->getClasses()); ?> -==DONE== --EXPECT-- array(17) { ["ReflectionException"]=> @@ -96,4 +95,3 @@ array(17) { string(19) "ReflectionReference" } } -==DONE== diff --git a/ext/reflection/tests/ReflectionExtension_getDependencies_basic.phpt b/ext/reflection/tests/ReflectionExtension_getDependencies_basic.phpt index 8b5293a48f5..306380c9d1d 100644 --- a/ext/reflection/tests/ReflectionExtension_getDependencies_basic.phpt +++ b/ext/reflection/tests/ReflectionExtension_getDependencies_basic.phpt @@ -11,7 +11,6 @@ if (!extension_loaded("dom")) die("skip no dom extension"); $dom = new ReflectionExtension('dom'); var_dump($dom->getDependencies()); ?> -==DONE== --EXPECTF-- array(2) { ["libxml"]=> @@ -19,4 +18,3 @@ array(2) { ["domxml"]=> %s(9) "Conflicts" } -==DONE== diff --git a/ext/reflection/tests/ReflectionExtension_getDependencies_variation2.phpt b/ext/reflection/tests/ReflectionExtension_getDependencies_variation2.phpt index 5b0ade5da28..be13fe27a82 100644 --- a/ext/reflection/tests/ReflectionExtension_getDependencies_variation2.phpt +++ b/ext/reflection/tests/ReflectionExtension_getDependencies_variation2.phpt @@ -7,10 +7,8 @@ Felix De Vliegher $standard = new ReflectionExtension('standard'); var_dump($standard->getDependencies()); ?> -==DONE== --EXPECTF-- array(1) { ["session"]=> %s(8) "Optional" } -==DONE== diff --git a/ext/reflection/tests/ReflectionExtension_getName_basic.phpt b/ext/reflection/tests/ReflectionExtension_getName_basic.phpt index 9dae1f3a6b3..c26044f710c 100644 --- a/ext/reflection/tests/ReflectionExtension_getName_basic.phpt +++ b/ext/reflection/tests/ReflectionExtension_getName_basic.phpt @@ -8,7 +8,5 @@ Leon Luijkx $obj = new ReflectionExtension('reflection'); var_dump($obj->getName()); ?> -==DONE== --EXPECT-- string(10) "Reflection" -==DONE== diff --git a/ext/reflection/tests/ReflectionExtension_getVersion_basic.phpt b/ext/reflection/tests/ReflectionExtension_getVersion_basic.phpt index 19dee82710a..0139a1c4ae8 100644 --- a/ext/reflection/tests/ReflectionExtension_getVersion_basic.phpt +++ b/ext/reflection/tests/ReflectionExtension_getVersion_basic.phpt @@ -10,7 +10,5 @@ $var = $obj->getVersion() ? $obj->getVersion() : null; $test = floatval($var) == $var ? true : false; var_dump($test); ?> -==DONE== --EXPECT-- bool(true) -==DONE== diff --git a/ext/reflection/tests/ReflectionExtension_info_basic.phpt b/ext/reflection/tests/ReflectionExtension_info_basic.phpt index 48f6a650997..6eac5a56e70 100644 --- a/ext/reflection/tests/ReflectionExtension_info_basic.phpt +++ b/ext/reflection/tests/ReflectionExtension_info_basic.phpt @@ -12,8 +12,6 @@ $testb = ob_get_clean(); var_dump($testa); var_dump(strlen($testb) > 24); ?> -==DONE== --EXPECT-- NULL bool(true) -==DONE== diff --git a/ext/reflection/tests/ReflectionExtension_isPersistant.phpt b/ext/reflection/tests/ReflectionExtension_isPersistant.phpt index a78a8bbc3dd..642a79bd3b5 100644 --- a/ext/reflection/tests/ReflectionExtension_isPersistant.phpt +++ b/ext/reflection/tests/ReflectionExtension_isPersistant.phpt @@ -5,7 +5,5 @@ ReflectionExtension::isPersistent() $obj = new ReflectionExtension('reflection'); var_dump($obj->isPersistent()); ?> -==DONE== --EXPECT-- bool(true) -==DONE== diff --git a/ext/reflection/tests/ReflectionExtension_isTemporary.phpt b/ext/reflection/tests/ReflectionExtension_isTemporary.phpt index be97641be1a..791662ff13c 100644 --- a/ext/reflection/tests/ReflectionExtension_isTemporary.phpt +++ b/ext/reflection/tests/ReflectionExtension_isTemporary.phpt @@ -5,7 +5,5 @@ ReflectionExtension::isTemporary() $obj = new ReflectionExtension('reflection'); var_dump($obj->isTemporary()); ?> -==DONE== --EXPECT-- bool(false) -==DONE== diff --git a/ext/reflection/tests/ReflectionFunction_getClosure_basic.phpt b/ext/reflection/tests/ReflectionFunction_getClosure_basic.phpt index 4c76959aecb..bb72137f698 100644 --- a/ext/reflection/tests/ReflectionFunction_getClosure_basic.phpt +++ b/ext/reflection/tests/ReflectionFunction_getClosure_basic.phpt @@ -29,9 +29,7 @@ $closure = $func->getClosure(); $closure( 'succeeded' ); ?> -===DONE=== --EXPECT-- *** Testing ReflectionFunction::getClosure() : basic functionality *** string(19) "Inside foo function" string(16) "Arg is succeeded" -===DONE=== diff --git a/ext/reflection/tests/ReflectionMethod_getClosure_basic.phpt b/ext/reflection/tests/ReflectionMethod_getClosure_basic.phpt index bf1bcf3603e..105df87e73d 100644 --- a/ext/reflection/tests/ReflectionMethod_getClosure_basic.phpt +++ b/ext/reflection/tests/ReflectionMethod_getClosure_basic.phpt @@ -46,10 +46,8 @@ $object->bar = 34; $closure(); ?> -===DONE=== --EXPECT-- *** Testing ReflectionMethod::getClosure() : basic functionality *** string(34) "Static Example class, Hello World!" string(22) "Example class, bar: 42" string(22) "Example class, bar: 34" -===DONE=== diff --git a/ext/reflection/tests/ReflectionMethod_getClosure_error.phpt b/ext/reflection/tests/ReflectionMethod_getClosure_error.phpt index d1e7ee68fbd..70c77895d0e 100644 --- a/ext/reflection/tests/ReflectionMethod_getClosure_error.phpt +++ b/ext/reflection/tests/ReflectionMethod_getClosure_error.phpt @@ -43,10 +43,8 @@ try { } ?> -===DONE=== --EXPECTF-- *** Testing ReflectionMethod::getClosure() : error conditions *** -- Testing ReflectionMethod::getClosure() function with invalid object -- string(72) "Given object is not an instance of the class this method was declared in" -===DONE=== diff --git a/ext/reflection/tests/ReflectionParameter_DefaultValueConstant_basic1.phpt b/ext/reflection/tests/ReflectionParameter_DefaultValueConstant_basic1.phpt index 20f4c95dc7a..7a92edc4cc4 100644 --- a/ext/reflection/tests/ReflectionParameter_DefaultValueConstant_basic1.phpt +++ b/ext/reflection/tests/ReflectionParameter_DefaultValueConstant_basic1.phpt @@ -41,7 +41,6 @@ foreach ($params as $param) { } } ?> -==DONE== --EXPECT-- bool(false) bool(true) @@ -50,4 +49,3 @@ string(10) "CASE_LOWER" string(9) "self::bar" string(9) "Foo2::bar" string(12) "CONST_TEST_1" -==DONE== diff --git a/ext/reflection/tests/ReflectionParameter_export_basic.phpt b/ext/reflection/tests/ReflectionParameter_export_basic.phpt index 6f3d16a5ff7..8286078135e 100644 --- a/ext/reflection/tests/ReflectionParameter_export_basic.phpt +++ b/ext/reflection/tests/ReflectionParameter_export_basic.phpt @@ -12,8 +12,6 @@ foreach($reflect->getParameters() as $key => $value) { echo new ReflectionParameter('ReflectionParameterTest', $key), "\n"; } ?> -==DONE== --EXPECTF-- Parameter #0 [ $test ] Parameter #1 [ $test2 = NULL ] -==DONE== diff --git a/ext/reflection/tests/ReflectionParameter_getDeclaringFunction_basic.phpt b/ext/reflection/tests/ReflectionParameter_getDeclaringFunction_basic.phpt index 59e15a70542..18d4eb69a40 100644 --- a/ext/reflection/tests/ReflectionParameter_getDeclaringFunction_basic.phpt +++ b/ext/reflection/tests/ReflectionParameter_getDeclaringFunction_basic.phpt @@ -14,7 +14,6 @@ foreach($params as $key => $value) { echo $value->getDeclaringFunction() . "\n"; } ?> -==DONE== --EXPECTF-- Function [ function ReflectionParameterTest ] { @@ %s.php %d - %d @@ -34,4 +33,3 @@ Function [ function ReflectionParameterTest ] { } } -==DONE== diff --git a/ext/reflection/tests/ReflectionParameter_getPosition_basic.phpt b/ext/reflection/tests/ReflectionParameter_getPosition_basic.phpt index 2807bdf66df..c5df520c420 100644 --- a/ext/reflection/tests/ReflectionParameter_getPosition_basic.phpt +++ b/ext/reflection/tests/ReflectionParameter_getPosition_basic.phpt @@ -14,8 +14,6 @@ foreach($params as $key => $value) { var_dump($value->getPosition()); } ?> -==DONE== --EXPECT-- int(0) int(1) -==DONE== diff --git a/ext/reflection/tests/ReflectionParameter_isDefault.phpt b/ext/reflection/tests/ReflectionParameter_isDefault.phpt index d8b4f0edc0c..ea958781709 100644 --- a/ext/reflection/tests/ReflectionParameter_isDefault.phpt +++ b/ext/reflection/tests/ReflectionParameter_isDefault.phpt @@ -23,7 +23,6 @@ $prop2 = new ReflectionProperty($a, 'myprop'); var_dump($prop1->isDefault()); var_dump($prop2->isDefault()); ?> -==DONE== --EXPECT-- bool(true) bool(false) @@ -31,4 +30,3 @@ bool(true) bool(false) bool(true) bool(false) -==DONE== diff --git a/ext/reflection/tests/ReflectionParameter_toString_basic.phpt b/ext/reflection/tests/ReflectionParameter_toString_basic.phpt index d1a23c758d3..35134b7e2d2 100644 --- a/ext/reflection/tests/ReflectionParameter_toString_basic.phpt +++ b/ext/reflection/tests/ReflectionParameter_toString_basic.phpt @@ -13,9 +13,7 @@ foreach($params as $key => $value) { echo $value->__toString() . "\n"; } ?> -==DONE== --EXPECT-- Parameter #0 [ $test ] Parameter #1 [ $test2 = NULL ] Parameter #2 [ ...$test3 ] -==DONE== diff --git a/ext/reflection/tests/bug26695.phpt b/ext/reflection/tests/bug26695.phpt index e429f766e9e..ab61ee929fd 100644 --- a/ext/reflection/tests/bug26695.phpt +++ b/ext/reflection/tests/bug26695.phpt @@ -19,7 +19,5 @@ $class = $params[0]->getClass(); var_dump($class->getName()); ?> -===DONE=== --EXPECT-- string(3) "Foo" -===DONE=== diff --git a/ext/reflection/tests/bug29828.phpt b/ext/reflection/tests/bug29828.phpt index 43e32d2116e..a5f3e30c6f6 100644 --- a/ext/reflection/tests/bug29828.phpt +++ b/ext/reflection/tests/bug29828.phpt @@ -26,10 +26,8 @@ $o=new BlaMore; $o->bla(); ?> -===DONE=== --EXPECT-- int(1) bool(false) bool(false) Hello -===DONE=== diff --git a/ext/reflection/tests/bug30146.phpt b/ext/reflection/tests/bug30146.phpt index 3f621414f15..d2e54324a72 100644 --- a/ext/reflection/tests/bug30146.phpt +++ b/ext/reflection/tests/bug30146.phpt @@ -15,9 +15,7 @@ var_dump($r->getValue()); $r->setValue(3); var_dump($r->getValue()); ?> -===DONE=== --EXPECT-- int(1) int(2) int(3) -===DONE=== diff --git a/ext/reflection/tests/bug30209.phpt b/ext/reflection/tests/bug30209.phpt index bc1f6c7e864..27b546d1cdb 100644 --- a/ext/reflection/tests/bug30209.phpt +++ b/ext/reflection/tests/bug30209.phpt @@ -24,8 +24,6 @@ class Foo $foo = new Foo; $foo->testBAR(); ?> -===DONE=== --EXPECT-- string(7) "testBAR" string(7) "testBAR" -===DONE=== diff --git a/ext/reflection/tests/bug30856.phpt b/ext/reflection/tests/bug30856.phpt index 39fc1104abb..23d50b17a7e 100644 --- a/ext/reflection/tests/bug30856.phpt +++ b/ext/reflection/tests/bug30856.phpt @@ -11,10 +11,8 @@ $class = new ReflectionClass('bogus'); var_dump($class->getStaticProperties()); ?> -===DONE=== --EXPECT-- array(1) { ["a"]=> string(4) "test" } -===DONE=== diff --git a/ext/reflection/tests/bug32981.phpt b/ext/reflection/tests/bug32981.phpt index 57356745854..0e3b721a64f 100644 --- a/ext/reflection/tests/bug32981.phpt +++ b/ext/reflection/tests/bug32981.phpt @@ -21,7 +21,6 @@ foreach ($class->getMethods() as $method) var_dump($arr_static_vars); ?> -===DONE=== --EXPECT-- string(4) "test" array(1) { @@ -31,4 +30,3 @@ array(1) { bool(true) } } -===DONE=== diff --git a/ext/reflection/tests/bug37816.phpt b/ext/reflection/tests/bug37816.phpt index 89ca3238b69..3942265a0e2 100644 --- a/ext/reflection/tests/bug37816.phpt +++ b/ext/reflection/tests/bug37816.phpt @@ -22,7 +22,5 @@ catch (Exception $e) } ?> -===DONE=== --EXPECT-- Caught: Cannot access non-public member TestClass::$p -===DONE=== diff --git a/ext/reflection/tests/bug41061.phpt b/ext/reflection/tests/bug41061.phpt index 027b872be96..df807566dbb 100644 --- a/ext/reflection/tests/bug41061.phpt +++ b/ext/reflection/tests/bug41061.phpt @@ -14,8 +14,6 @@ class bar { echo new ReflectionFunction('foo'), "\n"; echo new ReflectionMethod('bar', 'foo'), "\n"; ?> -===DONE=== - --EXPECTF-- Function [ function foo ] { @@ %sbug41061.php 3 - 4 @@ -25,4 +23,3 @@ Method [ private method foo ] { @@ %sbug41061.php 7 - 8 } -===DONE=== diff --git a/ext/reflection/tests/bug46064.phpt b/ext/reflection/tests/bug46064.phpt index d8ee411905a..f11de987332 100644 --- a/ext/reflection/tests/bug46064.phpt +++ b/ext/reflection/tests/bug46064.phpt @@ -45,7 +45,6 @@ class bar extends test { new bar; ?> -===DONE=== --EXPECTF-- object(ReflectionProperty)#%d (2) { ["name"]=> @@ -73,4 +72,3 @@ object(ReflectionProperty)#%d (2) { int(2) bool(false) bool(true) -===DONE=== diff --git a/ext/reflection/tests/bug46064_2.phpt b/ext/reflection/tests/bug46064_2.phpt index 65afa836b7e..9e10167d301 100644 --- a/ext/reflection/tests/bug46064_2.phpt +++ b/ext/reflection/tests/bug46064_2.phpt @@ -36,7 +36,6 @@ class test extends bar { new test; ?> -===DONE=== --EXPECTF-- object(ReflectionProperty)#%d (2) { ["name"]=> @@ -71,4 +70,3 @@ array(2) { string(4) "test" } } -===DONE=== diff --git a/ext/reflection/tests/bug64936.phpt b/ext/reflection/tests/bug64936.phpt index c3e781805ee..71be47f65bb 100644 --- a/ext/reflection/tests/bug64936.phpt +++ b/ext/reflection/tests/bug64936.phpt @@ -28,8 +28,6 @@ $rb = new ReflectionClass('B'); var_dump(strip_doc_comment($rb->getDocComment())); ?> -===DONE=== --EXPECT-- bool(false) bool(false) -===DONE=== diff --git a/ext/reflection/tests/bug74454.phpt b/ext/reflection/tests/bug74454.phpt index 9e0332d8938..0c85baa7c33 100644 --- a/ext/reflection/tests/bug74454.phpt +++ b/ext/reflection/tests/bug74454.phpt @@ -13,7 +13,5 @@ function load_file() { require __DIR__ . '/bug74454.inc'; } ?> -===DONE=== --EXPECT-- ParseError: syntax error, unexpected 'if' (T_IF), expecting function (T_FUNCTION) or const (T_CONST) -===DONE=== diff --git a/ext/reflection/tests/closures_001.phpt b/ext/reflection/tests/closures_001.phpt index 57c1b4e3f6b..926951eef22 100644 --- a/ext/reflection/tests/closures_001.phpt +++ b/ext/reflection/tests/closures_001.phpt @@ -47,7 +47,6 @@ $rp = new ReflectionParameter($closure, 'b'); var_dump($rp->isOptional()); ?> -===DONE=== --EXPECT-- int(2) int(1) @@ -67,4 +66,3 @@ bool(false) bool(true) bool(false) bool(true) -===DONE=== diff --git a/ext/reflection/tests/closures_002.phpt b/ext/reflection/tests/closures_002.phpt index ed973b56c10..27683bcf2b8 100644 --- a/ext/reflection/tests/closures_002.phpt +++ b/ext/reflection/tests/closures_002.phpt @@ -19,11 +19,9 @@ $rp = new ReflectionParameter(array(new Test, '__invoke'), 1); var_dump($rp->isOptional()); ?> -===DONE=== --EXPECT-- string(8) "__invoke" int(2) int(1) bool(false) bool(true) -===DONE=== diff --git a/ext/reflection/tests/closures_003.phpt b/ext/reflection/tests/closures_003.phpt index 57245cacde1..e50d9c466f2 100644 --- a/ext/reflection/tests/closures_003.phpt +++ b/ext/reflection/tests/closures_003.phpt @@ -18,8 +18,6 @@ unset ($parameter); echo $method->getName ()."\n"; ?> -===DONE=== --EXPECT-- __invoke __invoke -===DONE=== diff --git a/ext/reflection/tests/closures_003_v1.phpt b/ext/reflection/tests/closures_003_v1.phpt index cf853a00fd8..1ae5502a396 100644 --- a/ext/reflection/tests/closures_003_v1.phpt +++ b/ext/reflection/tests/closures_003_v1.phpt @@ -18,8 +18,6 @@ unset ($parameter); echo $method->getName ()."\n"; ?> -===DONE=== --EXPECT-- {closure} {closure} -===DONE=== diff --git a/ext/reflection/tests/closures_004.phpt b/ext/reflection/tests/closures_004.phpt index e2b52c5429f..479c7c3e67e 100644 --- a/ext/reflection/tests/closures_004.phpt +++ b/ext/reflection/tests/closures_004.phpt @@ -30,7 +30,6 @@ $closure2 (); $closure2->__invoke (); ?> -===DONE=== --EXPECT-- Invoked! Invoked! @@ -40,4 +39,3 @@ Invoked! Invoked! Invoked! Invoked! -===DONE=== diff --git a/ext/reflection/tests/parameters_001.phpt b/ext/reflection/tests/parameters_001.phpt index 972b97c1c73..92869a2faf2 100644 --- a/ext/reflection/tests/parameters_001.phpt +++ b/ext/reflection/tests/parameters_001.phpt @@ -28,11 +28,9 @@ catch (Exception $e) { } ?> -===DONE=== --EXPECT-- int(2) int(1) bool(false) bool(true) string(54) "The parameter specified by its name could not be found" -===DONE=== diff --git a/ext/reflection/tests/parameters_002.phpt b/ext/reflection/tests/parameters_002.phpt index ae924323a0d..aed8d7afa07 100644 --- a/ext/reflection/tests/parameters_002.phpt +++ b/ext/reflection/tests/parameters_002.phpt @@ -72,8 +72,6 @@ check_params(new ReflectionFunction('test')); check_params(new ReflectionMethod('test::method')); ?> -===DONE=== - --EXPECT-- #####test()##### ===0=== @@ -207,4 +205,3 @@ allowsNull: bool(true) isOptional: bool(true) isDefaultValueAvailable: bool(true) getDefaultValue: string(6) "FooBar" -===DONE=== diff --git a/ext/reflection/tests/property_exists.phpt b/ext/reflection/tests/property_exists.phpt index d7ecefb775f..002ece12b31 100644 --- a/ext/reflection/tests/property_exists.phpt +++ b/ext/reflection/tests/property_exists.phpt @@ -90,8 +90,6 @@ var_dump(property_exists(new A, '123')); var_dump(property_exists(new A, 'init')); var_dump(property_exists(new A, 'empty')); ?> -===DONE=== - --EXPECTF-- ===A=== obj(A)::$a @@ -219,4 +217,3 @@ bool(false) bool(false) bool(true) bool(true) -===DONE=== diff --git a/ext/session/tests/bug74514.phpt b/ext/session/tests/bug74514.phpt index f7c8d46998c..5ff86c1bfb2 100644 --- a/ext/session/tests/bug74514.phpt +++ b/ext/session/tests/bug74514.phpt @@ -23,7 +23,6 @@ var_dump(session_save_path()); var_dump(session_cache_limiter()); var_dump(session_cache_expire()); ?> -===DONE=== --EXPECT-- string(9) "PHPSESSID" string(3) "foo" @@ -31,4 +30,3 @@ string(5) "files" string(0) "" string(7) "nocache" int(180) -===DONE=== diff --git a/ext/session/tests/bug74541.phpt b/ext/session/tests/bug74541.phpt index dec2f25b5d4..ccdfdbffdec 100644 --- a/ext/session/tests/bug74541.phpt +++ b/ext/session/tests/bug74541.phpt @@ -10,8 +10,6 @@ $r = new ReflectionFunction('session_start'); var_dump($r->getNumberOfParameters()); var_dump($r->getNumberOfRequiredParameters()); ?> -===DONE=== --EXPECT-- int(1) int(0) -===DONE=== diff --git a/ext/session/tests/bug74833.phpt b/ext/session/tests/bug74833.phpt index fa167a1f3a1..d299f4ee96d 100644 --- a/ext/session/tests/bug74833.phpt +++ b/ext/session/tests/bug74833.phpt @@ -15,7 +15,5 @@ var_dump(isset($c['session']['SID'])); ob_end_flush(); ?> -==DONE== --EXPECT-- bool(true) -==DONE== diff --git a/ext/session/tests/bug74892.phpt b/ext/session/tests/bug74892.phpt index 0947df7761d..3b11ec20a75 100644 --- a/ext/session/tests/bug74892.phpt +++ b/ext/session/tests/bug74892.phpt @@ -16,10 +16,8 @@ session_start();

External link with anchor

External link with anchor 2

Internal link

-===DONE=== --EXPECT--

Click This Anchor Tag!

External link with anchor

External link with anchor 2

Internal link

-===DONE=== diff --git a/ext/session/tests/bug74936.phpt b/ext/session/tests/bug74936.phpt index aee7493c6cd..7b502c85b5b 100644 --- a/ext/session/tests/bug74936.phpt +++ b/ext/session/tests/bug74936.phpt @@ -12,9 +12,7 @@ var_dump(session_cache_expire()); var_dump(session_cache_limiter()); var_dump(session_save_path()); ?> -===DONE=== --EXPECT-- int(180) string(7) "nocache" string(0) "" -===DONE=== diff --git a/ext/session/tests/bug74941.phpt b/ext/session/tests/bug74941.phpt index 953d642b103..59b57e1b4de 100644 --- a/ext/session/tests/bug74941.phpt +++ b/ext/session/tests/bug74941.phpt @@ -15,8 +15,6 @@ echo ".\n"; session_id('BUG74941'); var_dump(session_start()); ?> -===DONE=== --EXPECT-- . bool(true) -===DONE=== diff --git a/ext/simplexml/tests/000.phpt b/ext/simplexml/tests/000.phpt index d70a038ffab..f777c672758 100644 --- a/ext/simplexml/tests/000.phpt +++ b/ext/simplexml/tests/000.phpt @@ -35,8 +35,6 @@ test('sxe->elem22->attr22'); test('sxe->elem22["attr22"]'); ?> -===DONE=== - --EXPECTF-- ===sxe bool(true) @@ -244,4 +242,3 @@ NULL bool(false) bool(false) NULL -===DONE=== diff --git a/ext/simplexml/tests/001-mb.phpt b/ext/simplexml/tests/001-mb.phpt index ada0f7d3523..860f5e09745 100644 --- a/ext/simplexml/tests/001-mb.phpt +++ b/ext/simplexml/tests/001-mb.phpt @@ -8,7 +8,6 @@ SimpleXML: Simple document var_dump(simplexml_load_file(__DIR__.'/sxe私はガラスを食べられます.xml')); ?> -===DONE=== --EXPECTF-- object(SimpleXMLElement)#%d (2) { ["@attributes"]=> @@ -40,4 +39,3 @@ object(SimpleXMLElement)#%d (2) { } } } -===DONE=== diff --git a/ext/simplexml/tests/001.phpt b/ext/simplexml/tests/001.phpt index 5820c55325c..37f94363c55 100644 --- a/ext/simplexml/tests/001.phpt +++ b/ext/simplexml/tests/001.phpt @@ -8,7 +8,6 @@ SimpleXML: Simple document var_dump(simplexml_load_file(__DIR__.'/sxe.xml')); ?> -===DONE=== --EXPECTF-- object(SimpleXMLElement)#%d (2) { ["@attributes"]=> @@ -40,4 +39,3 @@ object(SimpleXMLElement)#%d (2) { } } } -===DONE=== diff --git a/ext/simplexml/tests/002.phpt b/ext/simplexml/tests/002.phpt index 1d8ba4032ac..108ddb64242 100644 --- a/ext/simplexml/tests/002.phpt +++ b/ext/simplexml/tests/002.phpt @@ -29,7 +29,6 @@ $copy = clone $sxe; var_dump($copy); ?> -===DONE=== --EXPECTF-- object(SimpleXMLElement)#%d (2) { ["@attributes"]=> @@ -61,4 +60,3 @@ object(SimpleXMLElement)#%d (2) { } } } -===DONE=== diff --git a/ext/simplexml/tests/003.phpt b/ext/simplexml/tests/003.phpt index 5b989b85d4b..55a74a55baf 100644 --- a/ext/simplexml/tests/003.phpt +++ b/ext/simplexml/tests/003.phpt @@ -29,7 +29,6 @@ EOF; var_dump(simplexml_load_string($xml)); ?> -===DONE=== --EXPECTF-- object(SimpleXMLElement)#%d (2) { ["@attributes"]=> @@ -66,4 +65,3 @@ object(SimpleXMLElement)#%d (2) { } } } -===DONE=== diff --git a/ext/simplexml/tests/004.phpt b/ext/simplexml/tests/004.phpt index ffb4db0db6f..b4493a3c5d5 100644 --- a/ext/simplexml/tests/004.phpt +++ b/ext/simplexml/tests/004.phpt @@ -32,7 +32,6 @@ $elem2 = $elem1->elem2; var_dump(trim((string)$elem2)); ?> -===DONE=== --EXPECTF-- object(SimpleXMLElement)#%d (2) { ["@attributes"]=> @@ -65,4 +64,3 @@ object(SimpleXMLElement)#%d (2) { } } string(11) "CDATA block" -===DONE=== diff --git a/ext/simplexml/tests/006.phpt b/ext/simplexml/tests/006.phpt index bf4270f4495..19df52c4507 100644 --- a/ext/simplexml/tests/006.phpt +++ b/ext/simplexml/tests/006.phpt @@ -60,7 +60,6 @@ foreach($sxe->elem1 as $name => $data) { } ?> -===DONE=== --EXPECT-- string(5) "elem1" string(10) "Bla bla 1." @@ -77,4 +76,3 @@ string(10) "Bla bla 2." ===COMMENT=== string(5) "elem1" string(10) "Bla bla 1." -===DONE=== diff --git a/ext/simplexml/tests/007.phpt b/ext/simplexml/tests/007.phpt index 065e794c481..fbd9439dca8 100644 --- a/ext/simplexml/tests/007.phpt +++ b/ext/simplexml/tests/007.phpt @@ -45,7 +45,6 @@ var_dump($a); $dummy = $sxe->elem1[$a]; var_dump($a); ?> -===Done=== --EXPECTF-- ===Property=== object(SimpleXMLElement)#%d (3) { @@ -94,4 +93,3 @@ NULL ===Misc.=== int(4) int(4) -===Done=== diff --git a/ext/simplexml/tests/009.phpt b/ext/simplexml/tests/009.phpt index 2800f3add95..696580d49e7 100644 --- a/ext/simplexml/tests/009.phpt +++ b/ext/simplexml/tests/009.phpt @@ -34,7 +34,6 @@ foreach($sxe->children() as $name=>$val) { var_dump(trim($val)); } ?> -===DONE=== --EXPECT-- string(5) "elem1" string(16) "SimpleXMLElement" @@ -42,4 +41,3 @@ string(10) "Bla bla 1." string(6) "elem11" string(16) "SimpleXMLElement" string(10) "Bla bla 2." -===DONE=== diff --git a/ext/simplexml/tests/009b.phpt b/ext/simplexml/tests/009b.phpt index fd920e2e265..bc651fe7447 100644 --- a/ext/simplexml/tests/009b.phpt +++ b/ext/simplexml/tests/009b.phpt @@ -18,8 +18,6 @@ EOF ); var_dump($sxe->children()); ?> -===DONE=== - --EXPECTF-- object(SimpleXMLElement)#%d (3) { ["@attributes"]=> @@ -32,4 +30,3 @@ object(SimpleXMLElement)#%d (3) { ["elem11"]=> string(10) "Bla bla 2." } -===DONE=== diff --git a/ext/simplexml/tests/010.phpt b/ext/simplexml/tests/010.phpt index 63daf800d18..e251472d15c 100644 --- a/ext/simplexml/tests/010.phpt +++ b/ext/simplexml/tests/010.phpt @@ -29,7 +29,6 @@ EOF; var_dump(simplexml_load_string($xml, 'simplexml_inherited')); ?> -===DONE=== --EXPECTF-- object(simplexml_inherited)#%d (2) { ["@attributes"]=> @@ -61,4 +60,3 @@ object(simplexml_inherited)#%d (2) { } } } -===DONE=== diff --git a/ext/simplexml/tests/011.phpt b/ext/simplexml/tests/011.phpt index 1d5c193f3b4..06f3e791c3c 100644 --- a/ext/simplexml/tests/011.phpt +++ b/ext/simplexml/tests/011.phpt @@ -34,7 +34,6 @@ echo "===BAZ1===\n"; print $sxe->baz[1]; echo "\n"; ?> -===DONE=== --EXPECT-- ===BAR=== bar @@ -44,4 +43,3 @@ baz1 baz1 ===BAZ1=== baz2 -===DONE=== diff --git a/ext/simplexml/tests/013.phpt b/ext/simplexml/tests/013.phpt index cf584614516..59e6672a1f9 100644 --- a/ext/simplexml/tests/013.phpt +++ b/ext/simplexml/tests/013.phpt @@ -17,7 +17,5 @@ $sxe = simplexml_load_string($xml); var_dump((string)$sxe); ?> -===DONE=== --EXPECT-- string(6) "barbar" -===DONE=== diff --git a/ext/simplexml/tests/014.phpt b/ext/simplexml/tests/014.phpt index b0c1dd952f9..b1681582f92 100644 --- a/ext/simplexml/tests/014.phpt +++ b/ext/simplexml/tests/014.phpt @@ -29,7 +29,6 @@ var_dump($people->person['age']); $people->person['age'] += 5; var_dump($people->person['age']); ?> -===DONE=== --EXPECTF-- object(SimpleXMLElement)#%d (1) { [0]=> @@ -57,4 +56,3 @@ object(SimpleXMLElement)#%d (1) { [0]=> string(2) "35" } -===DONE=== diff --git a/ext/simplexml/tests/014a.phpt b/ext/simplexml/tests/014a.phpt index f778c25f128..98fda260c8f 100644 --- a/ext/simplexml/tests/014a.phpt +++ b/ext/simplexml/tests/014a.phpt @@ -28,7 +28,6 @@ var_dump($people->person[0]['age']); $people->person['age'] += 5; var_dump($people->person[0]['age']); ?> -===DONE=== --EXPECTF-- object(SimpleXMLElement)#%d (1) { [0]=> @@ -53,4 +52,3 @@ object(SimpleXMLElement)#%d (1) { [0]=> string(1) "5" } -===DONE=== diff --git a/ext/simplexml/tests/014b.phpt b/ext/simplexml/tests/014b.phpt index 0daa9c5c976..14d45491df7 100644 --- a/ext/simplexml/tests/014b.phpt +++ b/ext/simplexml/tests/014b.phpt @@ -28,7 +28,6 @@ echo "---Unsupported---\n"; $people->person[1]['age'] += 5; var_dump($people->person[1]['age']); ?> -===DONE=== --EXPECTF-- object(SimpleXMLElement)#%d (1) { [0]=> @@ -52,4 +51,3 @@ object(SimpleXMLElement)#%d (1) { [0]=> string(1) "5" } -===DONE=== diff --git a/ext/simplexml/tests/015.phpt b/ext/simplexml/tests/015.phpt index d80d4d114c8..977eab756ab 100644 --- a/ext/simplexml/tests/015.phpt +++ b/ext/simplexml/tests/015.phpt @@ -35,7 +35,6 @@ $people = simplexml_load_string($xml2); var_dump($people->person[0]['name']); var_dump($people->person[1]['name']); ?> -===DONE=== --EXPECTF-- object(SimpleXMLElement)#%d (1) { [0]=> @@ -53,4 +52,3 @@ object(SimpleXMLElement)#%d (1) { [0]=> string(3) "Boe" } -===DONE=== diff --git a/ext/simplexml/tests/016.phpt b/ext/simplexml/tests/016.phpt index 97981214dbe..59b64e0b48e 100644 --- a/ext/simplexml/tests/016.phpt +++ b/ext/simplexml/tests/016.phpt @@ -27,7 +27,6 @@ $people->person[0]['name'] .= 'Bar'; var_dump($people->person[0]['name']); ?> -===DONE=== --EXPECTF-- object(SimpleXMLElement)#%d (1) { [0]=> @@ -54,4 +53,3 @@ object(SimpleXMLElement)#%d (1) { [0]=> string(9) "JoeFooBar" } -===DONE=== diff --git a/ext/simplexml/tests/016a.phpt b/ext/simplexml/tests/016a.phpt index 7cc8b33123d..06dbfeb3036 100644 --- a/ext/simplexml/tests/016a.phpt +++ b/ext/simplexml/tests/016a.phpt @@ -16,7 +16,6 @@ $people->person['name'] .= 'Bar'; var_dump($people->person['name']); ?> -===DONE=== --EXPECTF-- object(SimpleXMLElement)#%d (1) { [0]=> @@ -26,4 +25,3 @@ object(SimpleXMLElement)#%d (1) { [0]=> string(6) "FooBar" } -===DONE=== diff --git a/ext/simplexml/tests/017.phpt b/ext/simplexml/tests/017.phpt index 42d6e3eccc1..3b399149cd1 100644 --- a/ext/simplexml/tests/017.phpt +++ b/ext/simplexml/tests/017.phpt @@ -52,7 +52,6 @@ print_xml2(simplexml_load_string($xml)); echo "---22---\n"; print_xml2(simplexml_load_string($xml1)); ?> -===DONE=== --EXPECT-- ---11--- person: Joe @@ -74,4 +73,3 @@ person: Boe ---22--- person: Joe child: Ann -===DONE=== diff --git a/ext/simplexml/tests/019.phpt b/ext/simplexml/tests/019.phpt index db15a69ff7d..b2406e09912 100644 --- a/ext/simplexml/tests/019.phpt +++ b/ext/simplexml/tests/019.phpt @@ -60,7 +60,6 @@ foreach($sxe->elem1->children() as $name => $data) { } ?> -===DONE=== --EXPECT-- string(5) "elem1" string(10) "Bla bla 1." @@ -77,4 +76,3 @@ string(7) "Foo Bar" ===COMMENT=== string(5) "elem2" string(28) "Here we have some text data." -===DONE=== diff --git a/ext/simplexml/tests/020.phpt b/ext/simplexml/tests/020.phpt index 40d04a7927a..028b917f047 100644 --- a/ext/simplexml/tests/020.phpt +++ b/ext/simplexml/tests/020.phpt @@ -14,8 +14,6 @@ if ($doc->name["attr"] == "foo") { print "Error\n"; } ?> -===DONE=== --EXPECT-- foo Works -===DONE=== diff --git a/ext/simplexml/tests/021.phpt b/ext/simplexml/tests/021.phpt index c2b38d30ae8..e1355fd5ed5 100644 --- a/ext/simplexml/tests/021.phpt +++ b/ext/simplexml/tests/021.phpt @@ -19,7 +19,5 @@ if ($ok) { print "Error\n"; } ?> -===DONE=== --EXPECT-- Works -===DONE=== diff --git a/ext/simplexml/tests/022.phpt b/ext/simplexml/tests/022.phpt index 338b61d0ed4..58222e8a682 100644 --- a/ext/simplexml/tests/022.phpt +++ b/ext/simplexml/tests/022.phpt @@ -26,7 +26,6 @@ foreach($sxe->content->file as $file) } ?> -===DONE=== --EXPECTF-- ===CONTENT=== object(SimpleXMLElement)#%d (1) { @@ -59,4 +58,3 @@ object(SimpleXMLElement)#%d (1) { [0]=> string(11) "slide_*.xml" } -===DONE=== diff --git a/ext/simplexml/tests/023.phpt b/ext/simplexml/tests/023.phpt index 9ae6ec8813b..59ea90dc02e 100644 --- a/ext/simplexml/tests/023.phpt +++ b/ext/simplexml/tests/023.phpt @@ -20,7 +20,6 @@ $sxe = simplexml_load_string($xml); var_dump($sxe); var_dump($sxe['attr']); ?> -===DONE=== --EXPECTF-- object(SimpleXMLElement)#%d (1) { ["@attributes"]=> @@ -33,4 +32,3 @@ object(SimpleXMLElement)#%d (1) { [0]=> string(%d) "foo%sbar%sbaz" } -===DONE=== diff --git a/ext/simplexml/tests/024.phpt b/ext/simplexml/tests/024.phpt index 9f31fd5e93f..789b99a648f 100644 --- a/ext/simplexml/tests/024.phpt +++ b/ext/simplexml/tests/024.phpt @@ -30,7 +30,6 @@ test('//@*'); test('elem[2]/@attr2'); ?> -===DONE=== --EXPECTF-- ===elem/@attr2=== array(3) { @@ -172,4 +171,3 @@ array(1) { } } } -===DONE=== diff --git a/ext/simplexml/tests/025.phpt b/ext/simplexml/tests/025.phpt index 955410a5eeb..a4acdc7331b 100644 --- a/ext/simplexml/tests/025.phpt +++ b/ext/simplexml/tests/025.phpt @@ -46,8 +46,6 @@ var_dump($sxe->getNamespaces()); var_dump($sxe->getDocNamespaces()); ?> -===DONE=== - --EXPECT-- array(1) { ["xhtml"]=> @@ -89,4 +87,3 @@ array(0) { } array(0) { } -===DONE=== diff --git a/ext/simplexml/tests/026.phpt b/ext/simplexml/tests/026.phpt index cf17c7d5136..d93cd1fe791 100644 --- a/ext/simplexml/tests/026.phpt +++ b/ext/simplexml/tests/026.phpt @@ -31,10 +31,8 @@ $people = simplexml_load_string($xml); traverse_xml($people); ?> -===DONE=== --EXPECT-- Jane -===DONE=== diff --git a/ext/simplexml/tests/027.phpt b/ext/simplexml/tests/027.phpt index 193456aacec..4cb60d7793d 100644 --- a/ext/simplexml/tests/027.phpt +++ b/ext/simplexml/tests/027.phpt @@ -42,7 +42,6 @@ traverse_xml($people); $people->person[3]['gender'] = 'error'; traverse_xml($people); ?> -===DONE=== --EXPECTF-- @@ -80,4 +79,3 @@ Warning: main(): Cannot add element person number 3 when only 2 such elements ex -===DONE=== diff --git a/ext/simplexml/tests/028.phpt b/ext/simplexml/tests/028.phpt index c68cfd21b98..4199d368047 100644 --- a/ext/simplexml/tests/028.phpt +++ b/ext/simplexml/tests/028.phpt @@ -31,7 +31,6 @@ $people->person['name'] = 'John'; traverse_xml($people); ?> -===DONE=== --EXPECT-- @@ -39,4 +38,3 @@ traverse_xml($people); -===DONE=== diff --git a/ext/simplexml/tests/029.phpt b/ext/simplexml/tests/029.phpt index 5a31c7d1971..41d00d80d3c 100644 --- a/ext/simplexml/tests/029.phpt +++ b/ext/simplexml/tests/029.phpt @@ -26,7 +26,6 @@ foreach($people as $person) } ?> -===DONE=== --EXPECT-- string(3) "Joe" int(3) @@ -37,4 +36,3 @@ int(1) string(4) "Jane" int(3) int(0) -===DONE=== diff --git a/ext/simplexml/tests/030.phpt b/ext/simplexml/tests/030.phpt index 4d27f40ed1e..417c5a7f11c 100644 --- a/ext/simplexml/tests/030.phpt +++ b/ext/simplexml/tests/030.phpt @@ -30,7 +30,6 @@ var_dump(isset($atts[0])); var_dump(isset($atts[TRUE])); ?> -===DONE=== --EXPECT-- test test 2 @@ -41,4 +40,3 @@ bool(false) bool(true) bool(false) bool(false) -===DONE=== diff --git a/ext/simplexml/tests/031.phpt b/ext/simplexml/tests/031.phpt index 143e57f59e8..c26cad06377 100644 --- a/ext/simplexml/tests/031.phpt +++ b/ext/simplexml/tests/031.phpt @@ -43,7 +43,6 @@ $sxe->addChild('s:test5', 'myval'); echo $sxe->asXML(); ?> -===DONE=== --EXPECTF-- Warning: SimpleXMLElement::addAttribute(): Attribute already exists in %s031.php on line %d @@ -54,4 +53,3 @@ Warning: SimpleXMLElement::addChild(): Cannot add element to attributes in %s031 test 2 myvalmyvalmyvalmyvalmyval -===DONE=== diff --git a/ext/simplexml/tests/032.phpt b/ext/simplexml/tests/032.phpt index c1d0b88b628..d09281d057c 100644 --- a/ext/simplexml/tests/032.phpt +++ b/ext/simplexml/tests/032.phpt @@ -37,9 +37,7 @@ var_dump($people2 == $people); var_dump($people2 == $people1); ?> -===DONE=== --EXPECT-- bool(false) bool(false) bool(false) -===DONE=== diff --git a/ext/simplexml/tests/033.phpt b/ext/simplexml/tests/033.phpt index ba01b21555b..437af7d41fd 100644 --- a/ext/simplexml/tests/033.phpt +++ b/ext/simplexml/tests/033.phpt @@ -35,7 +35,6 @@ var_dump((object)$foo); var_dump((object)$people); ?> -===DONE=== --EXPECTF-- bool(false) bool(true) @@ -134,4 +133,3 @@ object(SimpleXMLElement)#%d (1) { } } } -===DONE=== diff --git a/ext/simplexml/tests/035.phpt b/ext/simplexml/tests/035.phpt index 2162c865f3b..f6e911962c4 100644 --- a/ext/simplexml/tests/035.phpt +++ b/ext/simplexml/tests/035.phpt @@ -18,9 +18,7 @@ echo $p."\n"; echo $p->__toString()."\n"; echo $p."\n"; ?> -==Done== --EXPECT-- Blah 1 Blah 1 Blah 1 -==Done== diff --git a/ext/simplexml/tests/036.phpt b/ext/simplexml/tests/036.phpt index 24bfe60e7dc..5c2d688defd 100644 --- a/ext/simplexml/tests/036.phpt +++ b/ext/simplexml/tests/036.phpt @@ -15,8 +15,6 @@ $str = 'asdfghjk'; $sxe = new SXE($str); var_dump(count($sxe)); ?> -==Done== --EXPECT-- Called Count! int(2) -==Done== diff --git a/ext/simplexml/tests/037.phpt b/ext/simplexml/tests/037.phpt index 7a141658c7e..b18b7fec412 100644 --- a/ext/simplexml/tests/037.phpt +++ b/ext/simplexml/tests/037.phpt @@ -9,7 +9,5 @@ $str = ''; $sxe = new SimpleXmlElement($str); var_dump($sxe instanceof Countable); ?> -==Done== --EXPECT-- bool(true) -==Done== diff --git a/ext/simplexml/tests/bug27010.phpt b/ext/simplexml/tests/bug27010.phpt index 364ca4675fe..e512fbd7b2f 100644 --- a/ext/simplexml/tests/bug27010.phpt +++ b/ext/simplexml/tests/bug27010.phpt @@ -25,10 +25,8 @@ foreach ($sxe->children('http://www.example.com/hot') as $element_name => $eleme } ?> -===DONE=== --EXPECT-- drink is Cola drink is Juice drink is Coffee drink is Tea -===DONE=== diff --git a/ext/simplexml/tests/bug35785.phpt b/ext/simplexml/tests/bug35785.phpt index 10bae9ca104..420515bb030 100644 --- a/ext/simplexml/tests/bug35785.phpt +++ b/ext/simplexml/tests/bug35785.phpt @@ -16,8 +16,6 @@ $xml = simplexml_load_string(""); $xml->bla->posts[]->name = "FooBar"; echo $xml->asXML(); ?> -===DONE=== - --EXPECT-- FooBar @@ -26,4 +24,3 @@ bool(false) FooBar FooBar -===DONE=== diff --git a/ext/simplexml/tests/bug36611.phpt b/ext/simplexml/tests/bug36611.phpt index 34c92ce0bca..672e11c750c 100644 --- a/ext/simplexml/tests/bug36611.phpt +++ b/ext/simplexml/tests/bug36611.phpt @@ -23,8 +23,6 @@ $xml->pos["act_idx"] = $val; var_dump($val); ?> -===DONE=== --EXPECT-- int(1) int(1) -===DONE=== diff --git a/ext/simplexml/tests/bug37076.phpt b/ext/simplexml/tests/bug37076.phpt index c7f19b3cc2a..41e2f9a4c29 100644 --- a/ext/simplexml/tests/bug37076.phpt +++ b/ext/simplexml/tests/bug37076.phpt @@ -9,8 +9,6 @@ $xml->foo = "foo"; $xml->foo .= "bar"; print $xml->asXML(); ?> -===DONE=== --EXPECT-- foobar -===DONE=== diff --git a/ext/simplexml/tests/bug37076_1.phpt b/ext/simplexml/tests/bug37076_1.phpt index d4f4e03337b..019915a1b4e 100644 --- a/ext/simplexml/tests/bug37076_1.phpt +++ b/ext/simplexml/tests/bug37076_1.phpt @@ -8,11 +8,9 @@ $xml = simplexml_load_string(""); $xml->{""} .= "bar"; print $xml->asXML(); ?> -===DONE=== --EXPECTF-- Warning: main(): Cannot write or create unnamed element in %s on line %d Warning: main(): Cannot write or create unnamed element in %s on line %d -===DONE=== diff --git a/ext/simplexml/tests/bug37565.phpt b/ext/simplexml/tests/bug37565.phpt index d20fbd5aca7..41ecbd3e27e 100644 --- a/ext/simplexml/tests/bug37565.phpt +++ b/ext/simplexml/tests/bug37565.phpt @@ -28,8 +28,6 @@ try { } ?> -===DONE=== --EXPECT-- Error: simplexml_load_string() expects parameter 2 to be a class name derived from SimpleXMLElement, 'Setting' given Error: simplexml_load_file() expects parameter 2 to be a class name derived from SimpleXMLElement, 'Setting' given -===DONE=== diff --git a/ext/simplexml/tests/bug40451.phpt b/ext/simplexml/tests/bug40451.phpt index cf44926a5eb..dfecc25d1fa 100644 --- a/ext/simplexml/tests/bug40451.phpt +++ b/ext/simplexml/tests/bug40451.phpt @@ -18,7 +18,5 @@ $add = $xml->addChild('Host'); $add->Host->addAttribute('enable', 'true'); ?> -===DONE=== --EXPECTF-- Warning: SimpleXMLElement::addAttribute(): Unable to locate parent Element in %s on line %d -===DONE=== diff --git a/ext/simplexml/tests/bug41175.phpt b/ext/simplexml/tests/bug41175.phpt index ae0204e05a8..587eecd2650 100644 --- a/ext/simplexml/tests/bug41175.phpt +++ b/ext/simplexml/tests/bug41175.phpt @@ -11,8 +11,6 @@ $xml->addAttribute("alt", ""); echo $xml->asXML(); ?> -===DONE=== --EXPECT-- -===DONE=== diff --git a/ext/simplexml/tests/bug41582.phpt b/ext/simplexml/tests/bug41582.phpt index 8733810d71a..b270f3b6399 100644 --- a/ext/simplexml/tests/bug41582.phpt +++ b/ext/simplexml/tests/bug41582.phpt @@ -13,8 +13,6 @@ $xml->movie[]->characters->character[0]->name = 'Miss Coder'; echo($xml->asXml()); ?> -===DONE=== --EXPECT-- Miss Coder -===DONE=== diff --git a/ext/simplexml/tests/bug41861.phpt b/ext/simplexml/tests/bug41861.phpt index 607d301f7b4..50c780f9ab8 100644 --- a/ext/simplexml/tests/bug41861.phpt +++ b/ext/simplexml/tests/bug41861.phpt @@ -30,7 +30,6 @@ foreach (array(null, '#ns1', '#ns2', '#ns3') as $ns) } } ?> -===DONE=== --EXPECT-- root(recursive): 'root' -- namespaces: #ns1, #ns2, #ns3 root(non-recursive): 'root' -- namespaces: @@ -39,4 +38,3 @@ children(): 'last_node_no_ns' -- namespaces: children(#ns1): 'node1' -- namespaces: #ns1 children(#ns2): 'node2' -- namespaces: #ns2 children(#ns3): 'node3' -- namespaces: #ns3 -===DONE=== diff --git a/ext/simplexml/tests/bug41867.phpt b/ext/simplexml/tests/bug41867.phpt index 33e2de9e22a..4c0b3ac1b52 100644 --- a/ext/simplexml/tests/bug41867.phpt +++ b/ext/simplexml/tests/bug41867.phpt @@ -10,9 +10,7 @@ echo $a->getName()."\n"; echo $a->b->getName()."\n"; echo $a->b->c->getName()."\n"; ?> -===DONE=== --EXPECT-- a b c -===DONE=== diff --git a/ext/simplexml/tests/bug41947.phpt b/ext/simplexml/tests/bug41947.phpt index 0b974ce4f5a..69e1ed0283c 100644 --- a/ext/simplexml/tests/bug41947.phpt +++ b/ext/simplexml/tests/bug41947.phpt @@ -12,7 +12,5 @@ if (count($gchild) > 0) { echo $gchild[0]."\n"; } ?> -===DONE=== --EXPECT-- hello -===DONE=== diff --git a/ext/simplexml/tests/bug42259.phpt b/ext/simplexml/tests/bug42259.phpt index 19c02a577aa..f817291cdd5 100644 --- a/ext/simplexml/tests/bug42259.phpt +++ b/ext/simplexml/tests/bug42259.phpt @@ -37,7 +37,6 @@ foreach ($rit as $child) { echo count($ancestry) . ' steps: ' . $path . PHP_EOL; } ?> -===DONE=== --EXPECT-- 3 steps: xml/fieldset1/field1 3 steps: xml/fieldset1/field2 @@ -46,4 +45,3 @@ foreach ($rit as $child) { 4 steps: xml/fieldset2/options/option3 3 steps: xml/fieldset2/field1 3 steps: xml/fieldset2/field2 -===DONE=== diff --git a/ext/simplexml/tests/bug42369.phpt b/ext/simplexml/tests/bug42369.phpt index f8e030526c7..44781b76d38 100644 --- a/ext/simplexml/tests/bug42369.phpt +++ b/ext/simplexml/tests/bug42369.phpt @@ -18,8 +18,6 @@ Bug #42369 (Implicit conversion to string leaks memory) } ?> -===DONE=== --EXPECT-- explicit conversion no conversion -===DONE=== diff --git a/ext/simplexml/tests/bug43221.phpt b/ext/simplexml/tests/bug43221.phpt index bac22775970..a0ef582ec0d 100644 --- a/ext/simplexml/tests/bug43221.phpt +++ b/ext/simplexml/tests/bug43221.phpt @@ -11,10 +11,8 @@ $n->addAttribute("c", "d", "http://bar.com"); $n->addAttribute("foo:e", "f", "http://bar.com"); print_r($xml->asXml()); ?> -===DONE=== --EXPECTF-- Warning: SimpleXMLElement::addAttribute(): Attribute requires prefix for namespace in %sbug43221.php on line %d value -===DONE=== diff --git a/ext/simplexml/tests/bug44478.phpt b/ext/simplexml/tests/bug44478.phpt index 34630593f81..013fceb2359 100644 --- a/ext/simplexml/tests/bug44478.phpt +++ b/ext/simplexml/tests/bug44478.phpt @@ -17,7 +17,6 @@ print $xml_element->node2."\n"; print $xml_element->asXML(); ?> -===DONE=== --EXPECT-- a & b a & b @@ -25,5 +24,4 @@ a & b a & b a &#38; ba & b -===DONE=== diff --git a/ext/simplexml/tests/bug45553.phpt b/ext/simplexml/tests/bug45553.phpt index 9147fdaba17..f4737bdc86c 100644 --- a/ext/simplexml/tests/bug45553.phpt +++ b/ext/simplexml/tests/bug45553.phpt @@ -25,12 +25,10 @@ echo $atts[0] . "\n"; $atts = $x->xpath("/xml/data/@label"); echo $atts[0] . "\n"; ?> -===DONE=== --EXPECT-- I am A I am a:Nothing I am a:A I am a:Nothing I am Nothing -===DONE=== diff --git a/ext/simplexml/tests/bug46003.phpt b/ext/simplexml/tests/bug46003.phpt index 1a67c6e9eed..619148e1084 100644 --- a/ext/simplexml/tests/bug46003.phpt +++ b/ext/simplexml/tests/bug46003.phpt @@ -23,7 +23,6 @@ var_dump(isset($x->o->zz)); var_dump(isset($x->o->text)); var_dump(isset($x->o->xx)); ?> -===DONE=== --EXPECT-- bool(true) bool(false) @@ -31,5 +30,4 @@ bool(true) bool(false) bool(false) bool(true) -===DONE=== diff --git a/ext/simplexml/tests/bug46047.phpt b/ext/simplexml/tests/bug46047.phpt index 921da30bd19..b8899a4312e 100644 --- a/ext/simplexml/tests/bug46047.phpt +++ b/ext/simplexml/tests/bug46047.phpt @@ -14,7 +14,6 @@ print_r($xml); $xml = new SimpleXMLElement(''); print_r($xml); ?> -===DONE=== --EXPECT-- SimpleXMLElement Object ( @@ -49,5 +48,4 @@ SimpleXMLElement Object ) ) -===DONE=== diff --git a/ext/simplexml/tests/bug46048.phpt b/ext/simplexml/tests/bug46048.phpt index 3a3e7d54ef3..35a9a566256 100644 --- a/ext/simplexml/tests/bug46048.phpt +++ b/ext/simplexml/tests/bug46048.phpt @@ -12,7 +12,6 @@ $xml = ' $obj = simplexml_load_string($xml); print_r(get_object_vars($obj)); ?> -===DONE=== --EXPECT-- Array ( @@ -23,4 +22,3 @@ Array [key] => value ) -===DONE=== diff --git a/ext/simplexml/tests/bug75245.phpt b/ext/simplexml/tests/bug75245.phpt index 4a7a7caf0bc..fa795ff6857 100644 --- a/ext/simplexml/tests/bug75245.phpt +++ b/ext/simplexml/tests/bug75245.phpt @@ -8,7 +8,6 @@ if (!extension_loaded('simplexml')) die('skip simplexml not available'); ')); ?> -===DONE=== --EXPECT-- object(SimpleXMLElement)#1 (2) { ["test2"]=> @@ -18,4 +17,3 @@ object(SimpleXMLElement)#1 (2) { object(SimpleXMLElement)#3 (0) { } } -===DONE=== diff --git a/ext/simplexml/tests/bug76712.phpt b/ext/simplexml/tests/bug76712.phpt index efd34b56e2e..44bc0be0688 100644 --- a/ext/simplexml/tests/bug76712.phpt +++ b/ext/simplexml/tests/bug76712.phpt @@ -15,10 +15,8 @@ $sxe->addChild('bar'); $sxe->bar = ''; echo $sxe->asXML(); ?> -===DONE=== --EXPECT-- -===DONE=== diff --git a/ext/simplexml/tests/feature55218.phpt b/ext/simplexml/tests/feature55218.phpt index 5aac70ea2ad..bef8e2a9b89 100644 --- a/ext/simplexml/tests/feature55218.phpt +++ b/ext/simplexml/tests/feature55218.phpt @@ -48,7 +48,6 @@ var_dump( $x->person[0]->getDocNamespaces(false, false) ); var_dump( $x->person[1]->getDocNamespaces(false, false) ); ?> -===DONE=== --EXPECT-- getDocNamespaces @@ -114,4 +113,3 @@ array(1) { } array(0) { } -===DONE=== diff --git a/ext/simplexml/tests/profile11.phpt b/ext/simplexml/tests/profile11.phpt index 54c31bf7101..7d95f44a091 100644 --- a/ext/simplexml/tests/profile11.phpt +++ b/ext/simplexml/tests/profile11.phpt @@ -18,7 +18,6 @@ var_dump((string)$root->children('reserved-ns')->child); var_dump((string)$root->children('special-ns')->child); var_dump($root->child); ?> -===DONE=== --EXPECTF-- object(SimpleXMLElement)#%d (1) { [0]=> @@ -32,4 +31,3 @@ string(5) "Hello" string(5) "World" object(SimpleXMLElement)#%d (0) { } -===DONE=== diff --git a/ext/simplexml/tests/profile12.phpt b/ext/simplexml/tests/profile12.phpt index 51a0d355312..e52dc5f3d16 100644 --- a/ext/simplexml/tests/profile12.phpt +++ b/ext/simplexml/tests/profile12.phpt @@ -30,7 +30,6 @@ var_dump($sxe->Body->children('')); var_dump($sxe->Body->children('')->businessList); ?> -===DONE=== --EXPECTF-- array(1) { ["soap"]=> @@ -71,4 +70,3 @@ object(SimpleXMLElement)#%s (2) { } } } -===DONE=== diff --git a/ext/simplexml/tests/profile13.phpt b/ext/simplexml/tests/profile13.phpt index 2ae89e74493..2e692fbcd3f 100644 --- a/ext/simplexml/tests/profile13.phpt +++ b/ext/simplexml/tests/profile13.phpt @@ -29,8 +29,6 @@ var_dump($sxe->Body->children('')); var_dump($sxe->Body->children('')->businessList); ?> -===DONE=== - --EXPECTF-- object(SimpleXMLElement)#%d (1) { ["Body"]=> @@ -72,4 +70,3 @@ object(SimpleXMLElement)#%d (2) { } } } -===DONE=== diff --git a/ext/simplexml/tests/sxe_001.phpt b/ext/simplexml/tests/sxe_001.phpt index fdc0335bd5f..2c1edd01008 100644 --- a/ext/simplexml/tests/sxe_001.phpt +++ b/ext/simplexml/tests/sxe_001.phpt @@ -28,7 +28,6 @@ EOF; var_dump(simplexml_load_string($xml, 'SimpleXMLIterator')); ?> -===DONE=== --EXPECTF-- object(SimpleXMLIterator)#%d (2) { ["@attributes"]=> @@ -60,4 +59,3 @@ object(SimpleXMLIterator)#%d (2) { } } } -===DONE=== diff --git a/ext/simplexml/tests/sxe_002.phpt b/ext/simplexml/tests/sxe_002.phpt index 73db5967899..eeff0ee2155 100644 --- a/ext/simplexml/tests/sxe_002.phpt +++ b/ext/simplexml/tests/sxe_002.phpt @@ -49,7 +49,6 @@ var_dump(get_class($sxe)); var_dump(trim($sxe->elem1)); ?> -===DONE=== --EXPECT-- string(5) "elem1" string(17) "SimpleXMLIterator" @@ -72,4 +71,3 @@ string(7) "Foo Bar" ===DUMP=== string(17) "SimpleXMLIterator" string(10) "Bla bla 1." -===DONE=== diff --git a/ext/simplexml/tests/sxe_003.phpt b/ext/simplexml/tests/sxe_003.phpt index f3a2e5c5bcf..36ad9b6dcbd 100644 --- a/ext/simplexml/tests/sxe_003.phpt +++ b/ext/simplexml/tests/sxe_003.phpt @@ -57,7 +57,6 @@ for ($sxe->rewind(); $sxe->valid(); $sxe->next()) { } ?> -===DONE=== --EXPECTF-- Warning: Invalid argument supplied for foreach() in %ssxe_003.php on line %d ===RESET=== @@ -73,4 +72,3 @@ string(10) "Bla bla 2." string(7) "elem111" string(17) "SimpleXMLIterator" string(7) "Foo Bar" -===DONE=== diff --git a/ext/simplexml/tests/sxe_004.phpt b/ext/simplexml/tests/sxe_004.phpt index 8b86eff375b..7f06b1918f2 100644 --- a/ext/simplexml/tests/sxe_004.phpt +++ b/ext/simplexml/tests/sxe_004.phpt @@ -83,7 +83,6 @@ foreach($rit as $data) { } ?> -===DONE=== --EXPECT-- SXETest::rewind SXETest::valid @@ -142,4 +141,3 @@ SXETest::valid SXETest::next SXETest::valid SXETest::valid -===DONE=== diff --git a/ext/simplexml/tests/sxe_005.phpt b/ext/simplexml/tests/sxe_005.phpt index d13d3d73d41..2c7aedf4d16 100644 --- a/ext/simplexml/tests/sxe_005.phpt +++ b/ext/simplexml/tests/sxe_005.phpt @@ -33,7 +33,6 @@ var_dump(count($sxe->elem1)); var_dump(count($sxe->elem2)); ?> -===DONE=== --EXPECT-- SXETest::count int(3) @@ -41,4 +40,3 @@ SXETest::count int(1) SXETest::count int(2) -===DONE=== diff --git a/ext/snmp/tests/reflection.phpt b/ext/snmp/tests/reflection.phpt index d2823d83775..53fc063be6c 100644 --- a/ext/snmp/tests/reflection.phpt +++ b/ext/snmp/tests/reflection.phpt @@ -19,8 +19,6 @@ echo new reflectionmethod('snmp', 'getError'); ?> -===DONE=== - --EXPECT-- Method [ public method __construct ] { @@ -89,4 +87,3 @@ Method [ public method getError ] { - Parameters [0] { } } -===DONE=== diff --git a/ext/soap/tests/bug73037.phpt b/ext/soap/tests/bug73037.phpt index 897aec89d05..dd5b5aa13b4 100644 --- a/ext/soap/tests/bug73037.phpt +++ b/ext/soap/tests/bug73037.phpt @@ -132,7 +132,6 @@ cleanup: } ?> -==DONE== --CLEAN-- call(1.1); echo $soap->__getLastRequest(); ?> -===DONE=== --EXPECT-- 1.1 -===DONE=== diff --git a/ext/soap/tests/custom_content_type.phpt b/ext/soap/tests/custom_content_type.phpt index ef95be4ffc5..7a92a766079 100644 --- a/ext/soap/tests/custom_content_type.phpt +++ b/ext/soap/tests/custom_content_type.phpt @@ -73,8 +73,6 @@ if (strpos($headers, 'Content-Type: application/soap+xml; charset=utf-8; action= else printf("Content-Type Default OK" . PHP_EOL); ?> -==DONE== --EXPECT-- Content-Type OK Content-Type Default OK -==DONE== diff --git a/ext/spl/tests/SplFileObject_fgetcsv_escape_empty.phpt b/ext/spl/tests/SplFileObject_fgetcsv_escape_empty.phpt index cbc539c3234..0498b6c9129 100644 --- a/ext/spl/tests/SplFileObject_fgetcsv_escape_empty.phpt +++ b/ext/spl/tests/SplFileObject_fgetcsv_escape_empty.phpt @@ -14,7 +14,6 @@ while (($data = $file->fgetcsv(',', '"', ''))) { print_r($data); } ?> -===DONE=== --EXPECT-- Array ( @@ -28,4 +27,3 @@ Array [0] => \\\line1 line2\\\ ) -===DONE=== diff --git a/ext/spl/tests/SplFileObject_fputcsv.phpt b/ext/spl/tests/SplFileObject_fputcsv.phpt index 66fdbfd1b9b..a007946a46f 100644 --- a/ext/spl/tests/SplFileObject_fputcsv.phpt +++ b/ext/spl/tests/SplFileObject_fputcsv.phpt @@ -51,8 +51,6 @@ fclose($fp); echo '$list = ';var_export($res);echo ";\n"; ?> -===DONE=== - --CLEAN-- '"\\"","aaa"', 19 => '"\\""",aaa', ); -===DONE=== diff --git a/ext/spl/tests/SplFileObject_fputcsv_variation15.phpt b/ext/spl/tests/SplFileObject_fputcsv_variation15.phpt index 1cde292e28d..0762af9f214 100644 --- a/ext/spl/tests/SplFileObject_fputcsv_variation15.phpt +++ b/ext/spl/tests/SplFileObject_fputcsv_variation15.phpt @@ -15,8 +15,6 @@ foreach ($file as $line) { echo $line; } ?> -===DONE=== --EXPECT-- \ "\""" -===DONE=== diff --git a/ext/spl/tests/SplFileObject_setCsvControl_variation002.phpt b/ext/spl/tests/SplFileObject_setCsvControl_variation002.phpt index 6d3a76ce945..39b526a86ab 100644 --- a/ext/spl/tests/SplFileObject_setCsvControl_variation002.phpt +++ b/ext/spl/tests/SplFileObject_setCsvControl_variation002.phpt @@ -6,7 +6,6 @@ $file = new SplTempFileObject; $file->setCsvControl(',', '"', ''); var_dump($file->getCsvControl()); ?> -===DONE=== --EXPECT-- array(3) { [0]=> @@ -16,4 +15,3 @@ array(3) { [2]=> string(0) "" } -===DONE=== diff --git a/ext/spl/tests/SplObjectStorage_getHash.phpt b/ext/spl/tests/SplObjectStorage_getHash.phpt index f309b3d84f9..85cdcb4e7a0 100644 --- a/ext/spl/tests/SplObjectStorage_getHash.phpt +++ b/ext/spl/tests/SplObjectStorage_getHash.phpt @@ -49,7 +49,6 @@ $s3[$o2] = $o2; var_dump($s3[$o1] === $s3[$o2]); ?> -===DONE=== --EXPECT-- some_value caught @@ -57,4 +56,3 @@ caught object(stdClass)#2 (0) { } bool(true) -===DONE=== diff --git a/ext/spl/tests/arrayObject_asort_basic1.phpt b/ext/spl/tests/arrayObject_asort_basic1.phpt index 094d825bb62..0ec52696920 100644 --- a/ext/spl/tests/arrayObject_asort_basic1.phpt +++ b/ext/spl/tests/arrayObject_asort_basic1.phpt @@ -24,7 +24,6 @@ var_dump($ao2); var_dump($ao2->asort(SORT_NUMERIC)); var_dump($ao2); ?> -===DONE=== --EXPECTF-- *** Testing ArrayObject::asort() : basic functionality *** bool(true) @@ -63,4 +62,3 @@ object(ArrayObject)#%d (1) { int(4) } } -===DONE=== diff --git a/ext/spl/tests/arrayObject_asort_basic2.phpt b/ext/spl/tests/arrayObject_asort_basic2.phpt index a736365dbd5..34afc83a5ec 100644 --- a/ext/spl/tests/arrayObject_asort_basic2.phpt +++ b/ext/spl/tests/arrayObject_asort_basic2.phpt @@ -22,7 +22,6 @@ $ao1 = new ArrayObject($c); var_dump($ao1->asort()); var_dump($ao1, $c); ?> -===DONE=== --EXPECT-- *** Testing ArrayObject::asort() : basic functionality *** bool(true) @@ -49,4 +48,3 @@ object(C)#1 (4) { ["prop2"]=> string(1) "z" } -===DONE=== diff --git a/ext/spl/tests/arrayObject_ksort_basic1.phpt b/ext/spl/tests/arrayObject_ksort_basic1.phpt index aa1abbf239a..01375b72772 100644 --- a/ext/spl/tests/arrayObject_ksort_basic1.phpt +++ b/ext/spl/tests/arrayObject_ksort_basic1.phpt @@ -23,7 +23,6 @@ var_dump($ao2); var_dump($ao2->ksort(SORT_STRING)); var_dump($ao2); ?> -===DONE=== --EXPECTF-- *** Testing ArrayObject::ksort() : basic functionality *** bool(true) @@ -66,4 +65,3 @@ object(ArrayObject)#%d (1) { int(3) } } -===DONE=== diff --git a/ext/spl/tests/arrayObject_ksort_basic2.phpt b/ext/spl/tests/arrayObject_ksort_basic2.phpt index 21cb74cf391..fa0485aff8e 100644 --- a/ext/spl/tests/arrayObject_ksort_basic2.phpt +++ b/ext/spl/tests/arrayObject_ksort_basic2.phpt @@ -22,7 +22,6 @@ $ao1 = new ArrayObject($c); var_dump($ao1->ksort()); var_dump($ao1, $c); ?> -===DONE=== --EXPECT-- *** Testing ArrayObject::ksort() : basic functionality *** bool(true) @@ -49,4 +48,3 @@ object(C)#1 (4) { ["z"]=> string(5) "prop2" } -===DONE=== diff --git a/ext/spl/tests/arrayObject_natcasesort_basic1.phpt b/ext/spl/tests/arrayObject_natcasesort_basic1.phpt index 7e7095fe385..bbd47ae199c 100644 --- a/ext/spl/tests/arrayObject_natcasesort_basic1.phpt +++ b/ext/spl/tests/arrayObject_natcasesort_basic1.phpt @@ -18,7 +18,6 @@ var_dump($ao1); var_dump($ao2->natcasesort('blah')); var_dump($ao2); ?> -===DONE=== --EXPECT-- *** Testing ArrayObject::natcasesort() : basic functionality *** bool(true) @@ -53,4 +52,3 @@ object(ArrayObject)#2 (1) { string(5) "boo22" } } -===DONE=== diff --git a/ext/spl/tests/arrayObject_natsort_basic1.phpt b/ext/spl/tests/arrayObject_natsort_basic1.phpt index 1bd1d0b6e88..8c4f5b8aec2 100644 --- a/ext/spl/tests/arrayObject_natsort_basic1.phpt +++ b/ext/spl/tests/arrayObject_natsort_basic1.phpt @@ -18,7 +18,6 @@ var_dump($ao1); var_dump($ao2->natsort('blah')); var_dump($ao2); ?> -===DONE=== --EXPECT-- *** Testing ArrayObject::natsort() : basic functionality *** bool(true) @@ -53,4 +52,3 @@ object(ArrayObject)#2 (1) { string(5) "boo22" } } -===DONE=== diff --git a/ext/spl/tests/arrayObject_uasort_basic1.phpt b/ext/spl/tests/arrayObject_uasort_basic1.phpt index b07aec206ba..06f6d43ef59 100644 --- a/ext/spl/tests/arrayObject_uasort_basic1.phpt +++ b/ext/spl/tests/arrayObject_uasort_basic1.phpt @@ -27,7 +27,6 @@ $ao = new ArrayObject(array(2,3,1)); $ao->uasort('cmp'); var_dump($ao); ?> -===DONE=== --EXPECT-- *** Testing ArrayObject::uasort() : basic functionality *** object(ArrayObject)#1 (1) { @@ -41,4 +40,3 @@ object(ArrayObject)#1 (1) { int(1) } } -===DONE=== diff --git a/ext/spl/tests/arrayObject_uasort_error1.phpt b/ext/spl/tests/arrayObject_uasort_error1.phpt index e8b52f9e59b..55c5e200e6d 100644 --- a/ext/spl/tests/arrayObject_uasort_error1.phpt +++ b/ext/spl/tests/arrayObject_uasort_error1.phpt @@ -23,8 +23,6 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --EXPECT-- Function expects exactly one argument Function expects exactly one argument -===DONE=== diff --git a/ext/spl/tests/arrayObject_uksort_basic1.phpt b/ext/spl/tests/arrayObject_uksort_basic1.phpt index b770f1fe1db..5a0f8d0bd33 100644 --- a/ext/spl/tests/arrayObject_uksort_basic1.phpt +++ b/ext/spl/tests/arrayObject_uksort_basic1.phpt @@ -26,7 +26,6 @@ $ao = new ArrayObject(array(3=>0, 2=>1, 5=>2, 6=>3, 1=>4)); $ao->uksort('cmp'); var_dump($ao); ?> -===DONE=== --EXPECT-- *** Testing ArrayObject::uksort() : basic functionality *** object(ArrayObject)#1 (1) { @@ -44,4 +43,3 @@ object(ArrayObject)#1 (1) { int(4) } } -===DONE=== diff --git a/ext/spl/tests/arrayObject_uksort_error1.phpt b/ext/spl/tests/arrayObject_uksort_error1.phpt index e72eec0bf9a..3332839b8b0 100644 --- a/ext/spl/tests/arrayObject_uksort_error1.phpt +++ b/ext/spl/tests/arrayObject_uksort_error1.phpt @@ -23,8 +23,6 @@ try { echo $e->getMessage() . "\n"; } ?> -===DONE=== --EXPECT-- Function expects exactly one argument Function expects exactly one argument -===DONE=== diff --git a/ext/spl/tests/array_001.phpt b/ext/spl/tests/array_001.phpt index b55fcba1fdc..14543f472fd 100644 --- a/ext/spl/tests/array_001.phpt +++ b/ext/spl/tests/array_001.phpt @@ -33,8 +33,6 @@ $ar[] = 4; var_dump($ar); ?> -===DONE=== - --EXPECTF-- object(ArrayObject)#%d (1) { ["storage":"ArrayObject":private]=> @@ -110,4 +108,3 @@ object(ArrayObject)#%d (1) { int(4) } } -===DONE=== diff --git a/ext/spl/tests/array_002.phpt b/ext/spl/tests/array_002.phpt index 55935882f84..94559f5bf75 100644 --- a/ext/spl/tests/array_002.phpt +++ b/ext/spl/tests/array_002.phpt @@ -17,8 +17,6 @@ $arrayObject[] = 'five'; var_dump($arrayObject); ?> -===DONE=== - --EXPECTF-- object(ArrayObject)#%d (1) { ["storage":"ArrayObject":private]=> @@ -38,4 +36,3 @@ object(ArrayObject)#%d (1) { } } } -===DONE=== diff --git a/ext/spl/tests/array_003.phpt b/ext/spl/tests/array_003.phpt index e82953be705..f77b7862d1e 100644 --- a/ext/spl/tests/array_003.phpt +++ b/ext/spl/tests/array_003.phpt @@ -34,8 +34,6 @@ foreach($test as $key => $val) } ?> -===DONE=== - --EXPECT-- test Object ( @@ -60,4 +58,3 @@ ArrayObject Object pub => public imp => implicit dyn => dynamic -===DONE=== diff --git a/ext/spl/tests/array_005.phpt b/ext/spl/tests/array_005.phpt index b0175e7e7a4..00cc313f2a2 100644 --- a/ext/spl/tests/array_005.phpt +++ b/ext/spl/tests/array_005.phpt @@ -83,9 +83,6 @@ foreach ($students as $student) { echo $student, "\n"; } ?> -===DONE=== - --EXPECT-- 01234123, Joe 00000014, Bob -===DONE=== diff --git a/ext/spl/tests/array_006.phpt b/ext/spl/tests/array_006.phpt index 2735432e267..1a21cec1aa1 100644 --- a/ext/spl/tests/array_006.phpt +++ b/ext/spl/tests/array_006.phpt @@ -20,11 +20,8 @@ foreach($obj as $ak=>$av) { } ?> -===DONE=== - --EXPECT-- ==Normal== 0=>0 - 0=>0 0=>0 - 1=>1 0=>0 - 2=>2 -===DONE=== diff --git a/ext/spl/tests/array_007.phpt b/ext/spl/tests/array_007.phpt index 5b7d89068d8..e32f1389400 100644 --- a/ext/spl/tests/array_007.phpt +++ b/ext/spl/tests/array_007.phpt @@ -38,8 +38,6 @@ foreach($test as $key => $val) } ?> -===DONE=== - --EXPECT-- test Object ( @@ -68,4 +66,3 @@ ArrayIterator Object pub => public imp => implicit dyn => dynamic -===DONE=== diff --git a/ext/spl/tests/array_008.phpt b/ext/spl/tests/array_008.phpt index 01b2290e506..1165647d7bf 100644 --- a/ext/spl/tests/array_008.phpt +++ b/ext/spl/tests/array_008.phpt @@ -16,8 +16,6 @@ foreach($obj as $ak=>&$av) { } ?> -===DONE=== - --EXPECT-- 0=>modify - 0=>modify 0=>modify - 1=>1 @@ -28,4 +26,3 @@ foreach($obj as $ak=>&$av) { 2=>2 - 0=>modify 2=>2 - 1=>1 2=>2 - 2=>2 -===DONE=== diff --git a/ext/spl/tests/array_009.phpt b/ext/spl/tests/array_009.phpt index fc0d60baa9d..91875639e26 100644 --- a/ext/spl/tests/array_009.phpt +++ b/ext/spl/tests/array_009.phpt @@ -12,8 +12,6 @@ foreach ($dir as $file) { } ?> -===DONE=== - --EXPECT-- 1 21 @@ -21,4 +19,3 @@ foreach ($dir as $file) { 222 231 3 -===DONE=== diff --git a/ext/spl/tests/array_009a.phpt b/ext/spl/tests/array_009a.phpt index f2078bcd417..a642f291561 100644 --- a/ext/spl/tests/array_009a.phpt +++ b/ext/spl/tests/array_009a.phpt @@ -25,8 +25,6 @@ foreach ($dir as $file) { } ?> -===DONE=== - --EXPECT-- 1 21 @@ -34,4 +32,3 @@ foreach ($dir as $file) { 222 231 3 -===DONE=== diff --git a/ext/spl/tests/array_010.phpt b/ext/spl/tests/array_010.phpt index d2f3de7f6dc..1df3be5acb1 100644 --- a/ext/spl/tests/array_010.phpt +++ b/ext/spl/tests/array_010.phpt @@ -61,8 +61,6 @@ unset($obj['8th']); var_dump($obj->getArrayCopy()); ?> -===DONE=== - --EXPECTF-- array(4) { [0]=> @@ -141,4 +139,3 @@ array(4) { [6]=> string(9) "changed 6" } -===DONE=== diff --git a/ext/spl/tests/array_011.phpt b/ext/spl/tests/array_011.phpt index 0c5ad55d689..0ba0bd8769d 100644 --- a/ext/spl/tests/array_011.phpt +++ b/ext/spl/tests/array_011.phpt @@ -11,8 +11,6 @@ foreach (new LimitIterator(new ArrayIterator($a), 1, 3) as $k => $v) } ?> -===DONE=== - --EXPECT-- array(2) { [0]=> @@ -32,4 +30,3 @@ array(2) { [1]=> int(3) } -===DONE=== diff --git a/ext/spl/tests/array_012.phpt b/ext/spl/tests/array_012.phpt index 2ee9724d285..3b2eb1f3f29 100644 --- a/ext/spl/tests/array_012.phpt +++ b/ext/spl/tests/array_012.phpt @@ -39,8 +39,6 @@ foreach($it as $key => $val) var_dump($it->count()); ?> -===DONE=== - --EXPECT-- ===Array=== int(3) @@ -60,4 +58,3 @@ int(3) two=>2 int(3) int(3) -===DONE=== diff --git a/ext/spl/tests/array_013.phpt b/ext/spl/tests/array_013.phpt index 1f0c631c020..54a798d80d2 100644 --- a/ext/spl/tests/array_013.phpt +++ b/ext/spl/tests/array_013.phpt @@ -61,7 +61,6 @@ var_dump($o->{0}); /* doesn't wotk anyway */ ?> ===DONE=== - --EXPECTF-- ===Array=== 0=>zero diff --git a/ext/spl/tests/array_014.phpt b/ext/spl/tests/array_014.phpt index 4bf0b83c9c0..4793de34d69 100644 --- a/ext/spl/tests/array_014.phpt +++ b/ext/spl/tests/array_014.phpt @@ -37,8 +37,6 @@ foreach($it as $v) } ?> -===DONE=== - --EXPECT-- int(11) int(5) @@ -56,4 +54,3 @@ int(7) int(8) int(9) int(10) -===DONE=== diff --git a/ext/spl/tests/array_015.phpt b/ext/spl/tests/array_015.phpt index cd3ce5f45af..8571e930d55 100644 --- a/ext/spl/tests/array_015.phpt +++ b/ext/spl/tests/array_015.phpt @@ -38,8 +38,6 @@ foreach($it as $k => $v) var_dump($ar); ?> -===DONE=== - --EXPECTF-- object(ArrayObject)#%d (1) { %s"storage"%s"ArrayObject":private]=> @@ -89,4 +87,3 @@ object(ArrayObject)#%d (1) { int(4) } } -===DONE=== diff --git a/ext/spl/tests/array_016.phpt b/ext/spl/tests/array_016.phpt index 0a6edea01cf..576ab6c8036 100644 --- a/ext/spl/tests/array_016.phpt +++ b/ext/spl/tests/array_016.phpt @@ -18,8 +18,6 @@ foreach(new IteratorIterator($it) as $v) } ?> -===DONE=== - --EXPECT-- int(0) int(1) @@ -29,4 +27,3 @@ int(0) int(1) int(2) int(3) -===DONE=== diff --git a/ext/spl/tests/array_017.phpt b/ext/spl/tests/array_017.phpt index 3074a76417d..ef739eb7e12 100644 --- a/ext/spl/tests/array_017.phpt +++ b/ext/spl/tests/array_017.phpt @@ -128,8 +128,6 @@ check($obj, 0); check($obj, 1); ?> -===DONE=== - --EXPECTF-- ArrayObjectEx::__construct() ===CHECK=== @@ -836,4 +834,3 @@ bool(false) ArrayIteratorEx::setFlags(3) int(1) bool(true) -===DONE=== diff --git a/ext/spl/tests/array_018.phpt b/ext/spl/tests/array_018.phpt index 9d20ae47a9e..2fe18daa596 100644 Binary files a/ext/spl/tests/array_018.phpt and b/ext/spl/tests/array_018.phpt differ diff --git a/ext/spl/tests/array_019.phpt b/ext/spl/tests/array_019.phpt index 30cc9972af7..9a10a2e3652 100644 --- a/ext/spl/tests/array_019.phpt +++ b/ext/spl/tests/array_019.phpt @@ -20,7 +20,6 @@ $ar = new ArrayIteratorEx(array(5)); foreach($ar as &$v) var_dump($v); ?> ===DONE=== - --EXPECTF-- int(1) int(2) diff --git a/ext/spl/tests/array_020.phpt b/ext/spl/tests/array_020.phpt index 3258c7f16c0..3a218bdabc1 100644 --- a/ext/spl/tests/array_020.phpt +++ b/ext/spl/tests/array_020.phpt @@ -44,8 +44,6 @@ foreach($ar as $k => $v) } ?> -===DONE=== - --EXPECT-- ArrayIteratorEx::rewind ArrayIteratorEx::valid @@ -61,4 +59,3 @@ int(1) int(2) ArrayIteratorEx::next ArrayIteratorEx::valid -===DONE=== diff --git a/ext/spl/tests/array_021.phpt b/ext/spl/tests/array_021.phpt index cfe2bcb77d5..f2f0fd3d73c 100644 --- a/ext/spl/tests/array_021.phpt +++ b/ext/spl/tests/array_021.phpt @@ -24,8 +24,6 @@ catch (Exception $e) } ?> -===DONE=== --EXPECT-- foo::seek(bar) got exception -===DONE=== diff --git a/ext/spl/tests/array_022.phpt b/ext/spl/tests/array_022.phpt index 75eeb8884f5..ffb75ec3d43 100644 --- a/ext/spl/tests/array_022.phpt +++ b/ext/spl/tests/array_022.phpt @@ -43,7 +43,6 @@ var_dump($a); var_dump($b); ?> -===DONE=== --EXPECTF-- ==ArrayObject=== object(MyArrayObject)#%d (1) { @@ -67,4 +66,3 @@ object(MyArrayIterator)#%d (2) { ["baz"]=> string(3) "Foo" } -===DONE=== diff --git a/ext/spl/tests/bug28822.phpt b/ext/spl/tests/bug28822.phpt index 7114edac9fa..327681416e0 100644 --- a/ext/spl/tests/bug28822.phpt +++ b/ext/spl/tests/bug28822.phpt @@ -9,8 +9,6 @@ var_dump($array->offsetExists('key')); var_dump($array->offsetExists('nokey')); ?> -===DONE=== --EXPECT-- bool(true) bool(false) -===DONE=== diff --git a/ext/spl/tests/bug31185.phpt b/ext/spl/tests/bug31185.phpt index aa410ebaae2..0086c64a345 100644 --- a/ext/spl/tests/bug31185.phpt +++ b/ext/spl/tests/bug31185.phpt @@ -42,7 +42,6 @@ catch (Exception $e) print_R($foo); ?> -===DONE=== --EXPECT-- FooBar::offsetSet(0, 0) FooBar::offsetSet(1, 1) @@ -58,4 +57,3 @@ FooBar Object ) ) -===DONE=== diff --git a/ext/spl/tests/bug32134.phpt b/ext/spl/tests/bug32134.phpt index 7c3f810401a..7a6012b7f89 100644 --- a/ext/spl/tests/bug32134.phpt +++ b/ext/spl/tests/bug32134.phpt @@ -36,8 +36,6 @@ $myArray['two'] = 'two'; var_dump($myArray['two']); ?> -===DONE=== - --EXPECT-- myArray::offsetSet(one,one) myArray::offsetGet(one) @@ -45,4 +43,3 @@ string(3) "one" myArray::offsetSet(two,two) myArray::offsetGet(two) string(3) "two" -===DONE=== diff --git a/ext/spl/tests/bug33136.phpt b/ext/spl/tests/bug33136.phpt index 4d9a1506ca4..1e1e3a18dcb 100644 --- a/ext/spl/tests/bug33136.phpt +++ b/ext/spl/tests/bug33136.phpt @@ -46,8 +46,6 @@ print_r($arrayObj); var_dump(count($arrayObj)); ?> -===DONE=== - --EXPECT-- Initiate Obj Assign values @@ -77,4 +75,3 @@ Collection Object ) int(3) -===DONE=== diff --git a/ext/spl/tests/bug36258.phpt b/ext/spl/tests/bug36258.phpt index 428158c858c..db7bfa7c70f 100644 --- a/ext/spl/tests/bug36258.phpt +++ b/ext/spl/tests/bug36258.phpt @@ -12,8 +12,6 @@ foreach ($diriter as $key => $file) { } ?> -===DONE=== --EXPECTF-- string(%d) "%s" string(%d) "%s" -===DONE=== diff --git a/ext/spl/tests/bug36287.phpt b/ext/spl/tests/bug36287.phpt index 0c3f287d4f1..e4970cbf3b5 100644 --- a/ext/spl/tests/bug36287.phpt +++ b/ext/spl/tests/bug36287.phpt @@ -19,7 +19,6 @@ foreach($it as $file) } ?> -===DONE=== --EXPECTF-- First string(%d) "%s" @@ -29,4 +28,3 @@ First string(%d) "%s" Second string(%d) "%s" -===DONE=== diff --git a/ext/spl/tests/bug36825.phpt b/ext/spl/tests/bug36825.phpt index 3b681672047..4aa6cf4d13b 100644 --- a/ext/spl/tests/bug36825.phpt +++ b/ext/spl/tests/bug36825.phpt @@ -24,8 +24,6 @@ catch (Exception $e) } ?> -===DONE=== --EXPECT-- foo::offsetGet(bar) got exception -===DONE=== diff --git a/ext/spl/tests/bug36941.phpt b/ext/spl/tests/bug36941.phpt index 528ba4a4622..a21381da0aa 100644 --- a/ext/spl/tests/bug36941.phpt +++ b/ext/spl/tests/bug36941.phpt @@ -27,7 +27,6 @@ var_dump($a[0], $b[0]); $b[0] = 3; var_dump($a[0], $b[0]); ?> -===DONE=== --EXPECT-- ===ArrayObject=== int(1) @@ -43,4 +42,3 @@ int(2) int(2) int(3) int(3) -===DONE=== diff --git a/ext/spl/tests/bug37457.phpt b/ext/spl/tests/bug37457.phpt index 4c92bbc3571..9f723c94fbf 100644 --- a/ext/spl/tests/bug37457.phpt +++ b/ext/spl/tests/bug37457.phpt @@ -68,7 +68,6 @@ catch (Exception $e) } ?> -===DONE=== --EXPECT-- Collection::__construct Collection::rewind @@ -77,4 +76,3 @@ Collection::current Collection::key TestFilter::accept string(17) "Failure in Accept" -===DONE=== diff --git a/ext/spl/tests/bug38618.phpt b/ext/spl/tests/bug38618.phpt index 097d169a985..71a09111a4b 100644 --- a/ext/spl/tests/bug38618.phpt +++ b/ext/spl/tests/bug38618.phpt @@ -84,10 +84,6 @@ test_array($array, 'Protected Property'); test_array($array, 'Public Property New', RecursiveArrayIterator::CHILD_ARRAYS_ONLY); test_array($array, 'Protected Property New', RecursiveArrayIterator::CHILD_ARRAYS_ONLY); ?> -===DONE=== - -?> -===DONE=== --EXPECT-- ===Default with array=== 1 => apple @@ -102,4 +98,3 @@ title => grape ===Protected Property New=== 1 => apple 1 => grape -===DONE=== diff --git a/ext/spl/tests/bug40036.phpt b/ext/spl/tests/bug40036.phpt index 8180c038ce3..27757092bde 100644 --- a/ext/spl/tests/bug40036.phpt +++ b/ext/spl/tests/bug40036.phpt @@ -24,9 +24,7 @@ if (empty($view['baz']) || empty($view->baz)) { echo "View::baz empty\n"; } ?> -===DONE=== --EXPECT-- View::foo empty View::bar empty View::baz empty -===DONE=== diff --git a/ext/spl/tests/bug40091.phpt b/ext/spl/tests/bug40091.phpt index eb157e72ae4..f5719751e4b 100644 --- a/ext/spl/tests/bug40091.phpt +++ b/ext/spl/tests/bug40091.phpt @@ -17,7 +17,6 @@ spl_autoload_register(array($autloader2, 'autoload')); print_r(spl_autoload_functions()); ?> -===DONE=== --EXPECT-- Array ( @@ -40,4 +39,3 @@ Array ) ) -===DONE=== diff --git a/ext/spl/tests/bug40442.phpt b/ext/spl/tests/bug40442.phpt index fbeb22d2b32..d5968119e64 100644 --- a/ext/spl/tests/bug40442.phpt +++ b/ext/spl/tests/bug40442.phpt @@ -6,7 +6,5 @@ $a = new ArrayObject(); $a->offsetSet('property', 0); var_dump($a->offsetExists('property')); ?> -===DONE=== --EXPECT-- bool(true) -===DONE=== diff --git a/ext/spl/tests/bug40872.phpt b/ext/spl/tests/bug40872.phpt index a48fe74feb4..909951f3d38 100644 --- a/ext/spl/tests/bug40872.phpt +++ b/ext/spl/tests/bug40872.phpt @@ -23,8 +23,6 @@ Bug #40872 (inconsistency in offsetSet, offsetExists treatment of string enclose var_dump($projects->offsetExists(1)); var_dump($projects->offsetExists('2')); ?> -===DONE=== --EXPECT-- bool(true) bool(true) -===DONE=== diff --git a/ext/spl/tests/bug42364.phpt b/ext/spl/tests/bug42364.phpt index 4d00a18222c..96afb22a028 100644 --- a/ext/spl/tests/bug42364.phpt +++ b/ext/spl/tests/bug42364.phpt @@ -20,7 +20,6 @@ if ($count > 0) { echo "Found $count entries!\n"; } ?> -===DONE=== --CLEAN-- --EXPECTF-- Found %i entries! -===DONE=== diff --git a/ext/spl/tests/bug48361.phpt b/ext/spl/tests/bug48361.phpt index 61c62c7b3f0..3414c3b2291 100644 --- a/ext/spl/tests/bug48361.phpt +++ b/ext/spl/tests/bug48361.phpt @@ -6,8 +6,6 @@ $info = new SplFileInfo(__FILE__); var_dump($info->getRealPath()); var_dump($info->getPathInfo()->getRealPath()); ?> -===DONE=== --EXPECTF-- string(%d) "%stests%sbug48361.php" string(%d) "%stests" -===DONE=== diff --git a/ext/spl/tests/bug49263.phpt b/ext/spl/tests/bug49263.phpt index 4d9e8e1d60a..5a6c63178f7 100644 --- a/ext/spl/tests/bug49263.phpt +++ b/ext/spl/tests/bug49263.phpt @@ -15,7 +15,6 @@ unset($s,$o1,$o2); echo $ss."\n"; var_dump(unserialize($ss)); ?> -===DONE=== --EXPECTF-- O:16:"SplObjectStorage":2:{i:0;a:4:{i:0;O:8:"stdClass":0:{}i:1;a:2:{s:4:"prev";i:2;s:4:"next";O:8:"stdClass":0:{}}i:2;r:6;i:3;a:1:{s:4:"prev";r:3;}}i:1;a:0:{}} object(SplObjectStorage)#2 (1) { @@ -49,4 +48,3 @@ object(SplObjectStorage)#2 (1) { } } } -===DONE=== diff --git a/ext/spl/tests/bug51119.phpt b/ext/spl/tests/bug51119.phpt index 441aa1280a0..aba523dc629 100644 --- a/ext/spl/tests/bug51119.phpt +++ b/ext/spl/tests/bug51119.phpt @@ -25,10 +25,8 @@ try { } ?> -===DONE=== --EXPECT-- a b c Parameter offset must be >= 0 -===DONE=== diff --git a/ext/spl/tests/bug51374.phpt b/ext/spl/tests/bug51374.phpt index a4d285322d3..0ce95e9c219 100644 --- a/ext/spl/tests/bug51374.phpt +++ b/ext/spl/tests/bug51374.phpt @@ -12,8 +12,6 @@ $file = $fileInfo->openFile('r'); print var_dump($file->bam); // is null or UNKNOWN:0 ?> -===DONE=== --EXPECT-- array(0) { } -===DONE=== diff --git a/ext/spl/tests/bug60201.phpt b/ext/spl/tests/bug60201.phpt index 351b0b08a52..4087efcbc90 100644 --- a/ext/spl/tests/bug60201.phpt +++ b/ext/spl/tests/bug60201.phpt @@ -8,7 +8,6 @@ $params = $method->getParameters(); var_dump($params); ?> -===DONE=== --EXPECTF-- array(3) { [0]=> @@ -27,4 +26,3 @@ array(3) { string(6) "escape" } } -===DONE=== diff --git a/ext/spl/tests/bug65213.phpt b/ext/spl/tests/bug65213.phpt index 5e34d9549ce..d190941a0e5 100644 --- a/ext/spl/tests/bug65213.phpt +++ b/ext/spl/tests/bug65213.phpt @@ -7,7 +7,5 @@ $o = new SplFileInfo('.'); var_dump((bool) $o); ?> -===DONE=== --EXPECT-- bool(true) -===DONE=== diff --git a/ext/spl/tests/bug68175.phpt b/ext/spl/tests/bug68175.phpt index bba769b23b8..109a2cee26f 100644 --- a/ext/spl/tests/bug68175.phpt +++ b/ext/spl/tests/bug68175.phpt @@ -10,9 +10,7 @@ var_dump( $regex->getPregFlags() ); ?> -===DONE=== --EXPECT-- int(0) int(0) int(0) -===DONE=== diff --git a/ext/spl/tests/bug68479.phpt b/ext/spl/tests/bug68479.phpt index 5d2aacb346f..0ce7c96968c 100644 --- a/ext/spl/tests/bug68479.phpt +++ b/ext/spl/tests/bug68479.phpt @@ -8,7 +8,6 @@ $params = $method->getParameters(); var_dump($params); ?> -===DONE=== --EXPECT-- array(4) { [0]=> @@ -32,4 +31,3 @@ array(4) { string(6) "escape" } } -===DONE=== diff --git a/ext/spl/tests/bug68825.phpt b/ext/spl/tests/bug68825.phpt index e6625036119..4cd3af2fba3 100644 --- a/ext/spl/tests/bug68825.phpt +++ b/ext/spl/tests/bug68825.phpt @@ -17,10 +17,8 @@ foreach ($di as $entry) { } } ?> -===DONE=== --EXPECTF-- string(%d) "%s%eext%espl%etests%ebug68825.php" -===DONE=== --CLEAN-- -===DONE=== --EXPECTF-- array(2) { [0]=> @@ -26,4 +25,3 @@ array(2) { array(0) { } } -===DONE=== diff --git a/ext/spl/tests/bug70168.phpt b/ext/spl/tests/bug70168.phpt index e1f7e9f820e..d0cfc50e20c 100644 --- a/ext/spl/tests/bug70168.phpt +++ b/ext/spl/tests/bug70168.phpt @@ -13,7 +13,6 @@ for($i = 0; $i < 5; $i++) { var_dump($data); ?> -===DONE=== --EXPECTF-- array(2) { [0]=> @@ -33,4 +32,3 @@ array(2) { [1]=> int(1) } -===DONE=== diff --git a/ext/spl/tests/bug70169.phpt b/ext/spl/tests/bug70169.phpt index 9d814be5fad..418b4f4d0a0 100644 --- a/ext/spl/tests/bug70169.phpt +++ b/ext/spl/tests/bug70169.phpt @@ -13,7 +13,6 @@ for($i = 0; $i < 5; $i++) { var_dump($data); ?> -===DONE=== --EXPECTF-- array(2) { [0]=> @@ -27,4 +26,3 @@ array(2) { [1]=> int(1) } -===DONE=== diff --git a/ext/spl/tests/bug70852.phpt b/ext/spl/tests/bug70852.phpt index 2b23ce4e094..463f9d1b438 100644 --- a/ext/spl/tests/bug70852.phpt +++ b/ext/spl/tests/bug70852.phpt @@ -7,11 +7,9 @@ $y = new ArrayObject(); var_dump($y[NULL]); var_dump($y[NULL]++); ?> -===DONE=== --EXPECTF-- Notice: Undefined index: in %s on line %d NULL Notice: Undefined index: in %s on line %d NULL -===DONE=== diff --git a/ext/spl/tests/bug71735.phpt b/ext/spl/tests/bug71735.phpt index 1134b5d6ddd..ea6cf347ea1 100644 --- a/ext/spl/tests/bug71735.phpt +++ b/ext/spl/tests/bug71735.phpt @@ -9,7 +9,5 @@ $var_1->offsetSet(100,new DateTime('2000-01-01')); print $e->getMessage()."\n"; } ?> -===DONE=== --EXPECT-- Offset invalid or out of range -===DONE=== diff --git a/ext/spl/tests/bug73629.phpt b/ext/spl/tests/bug73629.phpt index 9ad0cec60fc..f66c319ca18 100644 --- a/ext/spl/tests/bug73629.phpt +++ b/ext/spl/tests/bug73629.phpt @@ -14,7 +14,5 @@ try { echo 'expected exception: ' . $e->getMessage() . "\n"; } ?> -===DONE=== --EXPECT-- expected exception: Iterators' LIFO/FIFO modes for SplStack/SplQueue objects are frozen -===DONE=== diff --git a/ext/spl/tests/bug74519.phpt b/ext/spl/tests/bug74519.phpt index 6492997b1ac..537366d498b 100644 --- a/ext/spl/tests/bug74519.phpt +++ b/ext/spl/tests/bug74519.phpt @@ -14,10 +14,8 @@ while($iterator->valid()) { $iterator->next(); } ?> -===DONE=== --EXPECT-- 2 3 4 5 -===DONE=== diff --git a/ext/spl/tests/class_implements_basic.phpt b/ext/spl/tests/class_implements_basic.phpt index 986b81e8bc0..1d8801899bd 100644 --- a/ext/spl/tests/class_implements_basic.phpt +++ b/ext/spl/tests/class_implements_basic.phpt @@ -19,7 +19,6 @@ var_dump(class_implements('bar')); ?> -===DONE=== --EXPECT-- *** Testing class_implements() : basic *** array(1) { @@ -30,4 +29,3 @@ array(1) { ["foo"]=> string(3) "foo" } -===DONE=== diff --git a/ext/spl/tests/class_implements_basic2.phpt b/ext/spl/tests/class_implements_basic2.phpt index 6eb3af4556b..4c8a2bf03e5 100644 --- a/ext/spl/tests/class_implements_basic2.phpt +++ b/ext/spl/tests/class_implements_basic2.phpt @@ -36,7 +36,6 @@ function s_var_dump($arr) { var_dump($arr); } ?> -===DONE=== --EXPECT-- *** Testing class_implements() : basic *** array(2) { @@ -71,4 +70,3 @@ array(1) { ["foo"]=> string(3) "foo" } -===DONE=== diff --git a/ext/spl/tests/class_implements_variation.phpt b/ext/spl/tests/class_implements_variation.phpt index 7498a14559b..f0e510c0568 100644 --- a/ext/spl/tests/class_implements_variation.phpt +++ b/ext/spl/tests/class_implements_variation.phpt @@ -24,7 +24,6 @@ var_dump(class_implements('non_existent')); var_dump(class_implements('non_existent2', false)); ?> -===DONE=== --EXPECTF-- *** Testing class_implements() : variation *** --- testing no interfaces --- @@ -41,4 +40,3 @@ bool(false) Warning: class_implements(): Class non_existent2 does not exist in %s on line %d bool(false) -===DONE=== diff --git a/ext/spl/tests/class_implements_variation1.phpt b/ext/spl/tests/class_implements_variation1.phpt index 4c70f2b412f..392666a4c8e 100644 --- a/ext/spl/tests/class_implements_variation1.phpt +++ b/ext/spl/tests/class_implements_variation1.phpt @@ -111,7 +111,6 @@ foreach($inputs as $key =>$value) { fclose($res); ?> -===DONE=== --EXPECTF-- *** Testing class_implements() : variation *** @@ -218,4 +217,3 @@ bool(false) --resource-- Error: 2 - class_implements(): object or string expected, %s(%d) bool(false) -===DONE=== diff --git a/ext/spl/tests/class_uses_basic.phpt b/ext/spl/tests/class_uses_basic.phpt index 8cad9cab07c..9ebbe7b0f27 100644 --- a/ext/spl/tests/class_uses_basic.phpt +++ b/ext/spl/tests/class_uses_basic.phpt @@ -19,7 +19,6 @@ var_dump(class_uses('bar')); ?> -===DONE=== --EXPECT-- *** Testing class_uses() : basic *** array(1) { @@ -30,4 +29,3 @@ array(1) { ["foo"]=> string(3) "foo" } -===DONE=== diff --git a/ext/spl/tests/class_uses_basic2.phpt b/ext/spl/tests/class_uses_basic2.phpt index be4bfa08d00..c358ecccab1 100644 --- a/ext/spl/tests/class_uses_basic2.phpt +++ b/ext/spl/tests/class_uses_basic2.phpt @@ -39,7 +39,6 @@ function s_var_dump($arr) { var_dump($arr); } ?> -===DONE=== --EXPECT-- *** Testing class_uses() : basic *** array(2) { @@ -66,4 +65,3 @@ array(0) { } array(0) { } -===DONE=== diff --git a/ext/spl/tests/class_uses_variation.phpt b/ext/spl/tests/class_uses_variation.phpt index 5df38cc2a42..8e0d716f6cf 100644 --- a/ext/spl/tests/class_uses_variation.phpt +++ b/ext/spl/tests/class_uses_variation.phpt @@ -24,7 +24,6 @@ var_dump(class_uses('non_existent')); var_dump(class_uses('non_existent2', false)); ?> -===DONE=== --EXPECTF-- *** Testing class_uses() : variation *** --- testing no traits --- @@ -41,4 +40,3 @@ bool(false) Warning: class_uses(): Class non_existent2 does not exist in %s on line %d bool(false) -===DONE=== diff --git a/ext/spl/tests/class_uses_variation1.phpt b/ext/spl/tests/class_uses_variation1.phpt index 538c9257e7b..fa12d3f913d 100644 --- a/ext/spl/tests/class_uses_variation1.phpt +++ b/ext/spl/tests/class_uses_variation1.phpt @@ -111,7 +111,6 @@ foreach($inputs as $key =>$value) { fclose($res); ?> -===DONE=== --EXPECTF-- *** Testing class_uses() : variation *** @@ -218,4 +217,3 @@ bool(false) --resource-- Error: 2 - class_uses(): object or string expected, %s(%d) bool(false) -===DONE=== diff --git a/ext/spl/tests/dit_001.phpt b/ext/spl/tests/dit_001.phpt index a56166def08..6d21abbf493 100644 --- a/ext/spl/tests/dit_001.phpt +++ b/ext/spl/tests/dit_001.phpt @@ -11,7 +11,6 @@ var_dump(is_string($d)); preg_match('/x/', $d); var_dump(is_string($d)); ?> -===DONE=== --EXPECTF-- object(DirectoryIterator)#%d (4) { %s"pathName"%s"SplFileInfo":private]=> @@ -25,4 +24,3 @@ object(DirectoryIterator)#%d (4) { } bool(false) bool(false) -===DONE=== diff --git a/ext/spl/tests/dit_001_noglob.phpt b/ext/spl/tests/dit_001_noglob.phpt index 00deac36b8b..a1996ef85e7 100644 --- a/ext/spl/tests/dit_001_noglob.phpt +++ b/ext/spl/tests/dit_001_noglob.phpt @@ -11,7 +11,6 @@ var_dump(is_string($d)); preg_match('/x/', $d); var_dump(is_string($d)); ?> -===DONE=== --EXPECTF-- object(DirectoryIterator)#%d (3) { %s"pathName"%s"SplFileInfo":private]=> @@ -23,4 +22,3 @@ object(DirectoryIterator)#%d (3) { } bool(false) bool(false) -===DONE=== diff --git a/ext/spl/tests/dit_002.phpt b/ext/spl/tests/dit_002.phpt index f4cd3ab058a..17f8d01346e 100644 --- a/ext/spl/tests/dit_002.phpt +++ b/ext/spl/tests/dit_002.phpt @@ -43,7 +43,6 @@ foreach ($classes as $class => $flags) { } } ?> -===DONE=== --EXPECTF-- ===DirectoryIterator=== DirectoryIterator @@ -74,4 +73,3 @@ int(16) GlobIterator int(32) bool(true) -===DONE=== diff --git a/ext/spl/tests/dit_003.phpt b/ext/spl/tests/dit_003.phpt index 507ed49f0ed..0d44a3e8b2e 100644 --- a/ext/spl/tests/dit_003.phpt +++ b/ext/spl/tests/dit_003.phpt @@ -9,7 +9,5 @@ foreach(new FilesystemIterator(__DIR__) as $ent) } var_dump($count > 0); ?> -===DONE=== --EXPECT-- bool(true) -===DONE=== diff --git a/ext/spl/tests/dit_004.phpt b/ext/spl/tests/dit_004.phpt index d9f19122839..9d7069e5251 100644 --- a/ext/spl/tests/dit_004.phpt +++ b/ext/spl/tests/dit_004.phpt @@ -13,7 +13,6 @@ $c = clone $a; var_dump((string)$c == (string)$a); var_dump($a->key(), $c->key()); ?> -===DONE=== --EXPECT-- bool(true) int(0) @@ -21,4 +20,3 @@ int(0) bool(true) int(3) int(3) -===DONE=== diff --git a/ext/spl/tests/dit_005.phpt b/ext/spl/tests/dit_005.phpt index 942a58d4ae6..ebdc56e0317 100644 --- a/ext/spl/tests/dit_005.phpt +++ b/ext/spl/tests/dit_005.phpt @@ -14,10 +14,8 @@ $c = clone $a; var_dump((string)$c == (string)$a); var_dump($a->key() == $c->key()); ?> -===DONE=== --EXPECT-- bool(true) bool(true) bool(true) bool(true) -===DONE=== diff --git a/ext/spl/tests/dit_006.phpt b/ext/spl/tests/dit_006.phpt index ed1ceffc05e..42a2309c992 100644 --- a/ext/spl/tests/dit_006.phpt +++ b/ext/spl/tests/dit_006.phpt @@ -40,7 +40,6 @@ try { var_dump($n !== $m, $m === $o, $p === 0); ?> -===DONE=== --EXPECTF-- With seek(2) we get %d With seek(0) we get %d @@ -49,4 +48,3 @@ Seek position %d is out of range bool(true) bool(true) bool(true) -===DONE=== diff --git a/ext/spl/tests/dllist_001.phpt b/ext/spl/tests/dllist_001.phpt index 4a18cf2322e..e6ac2468afd 100644 --- a/ext/spl/tests/dllist_001.phpt +++ b/ext/spl/tests/dllist_001.phpt @@ -46,8 +46,6 @@ $dll_clone = clone $dll; $dll_clone->pop(); echo count($dll)."\n"; ?> -===DONE=== - --EXPECT-- Exception: Can't pop from an empty datastructure Exception: Can't shift from an empty datastructure @@ -60,4 +58,3 @@ Exception: Can't shift from an empty datastructure NULL NULL 1 -===DONE=== diff --git a/ext/spl/tests/dllist_002.phpt b/ext/spl/tests/dllist_002.phpt index e1287718ded..61836ac8895 100644 --- a/ext/spl/tests/dllist_002.phpt +++ b/ext/spl/tests/dllist_002.phpt @@ -33,8 +33,6 @@ foreach($dll2 as $k=>$v) { } ?> -===DONE=== - --EXPECT-- 0=>2 ->0=>2 @@ -57,4 +55,3 @@ foreach($dll2 as $k=>$v) { popped 4 1=>3 popped 3 -===DONE=== diff --git a/ext/spl/tests/dllist_003.phpt b/ext/spl/tests/dllist_003.phpt index 53dd7cb7524..0eff4aa0362 100644 --- a/ext/spl/tests/dllist_003.phpt +++ b/ext/spl/tests/dllist_003.phpt @@ -26,8 +26,6 @@ foreach ($dll as $k => $v) { var_dump($dll->count()); ?> -===DONE=== - --EXPECT-- 2=>4 1=>3 @@ -40,4 +38,3 @@ int(3) 0=>3 0=>4 int(0) -===DONE=== diff --git a/ext/spl/tests/dllist_004.phpt b/ext/spl/tests/dllist_004.phpt index 0a74d598921..8ac028ebf86 100644 --- a/ext/spl/tests/dllist_004.phpt +++ b/ext/spl/tests/dllist_004.phpt @@ -44,8 +44,6 @@ $stack_clone = clone $stack; $stack_clone->pop(); echo count($stack)."\n"; ?> -===DONE=== - --EXPECT-- Exception: Can't pop from an empty datastructure Exception: Can't shift from an empty datastructure @@ -58,4 +56,3 @@ Exception: Can't shift from an empty datastructure NULL NULL 3 -===DONE=== diff --git a/ext/spl/tests/dllist_005.phpt b/ext/spl/tests/dllist_005.phpt index 2e2058f76a5..805f81a68a7 100644 --- a/ext/spl/tests/dllist_005.phpt +++ b/ext/spl/tests/dllist_005.phpt @@ -44,8 +44,6 @@ $queue_clone = clone $queue; $queue_clone->dequeue(); echo count($queue)."\n"; ?> -===DONE=== - --EXPECT-- Exception: Can't shift from an empty datastructure Exception: Can't shift from an empty datastructure @@ -58,4 +56,3 @@ Exception: Can't shift from an empty datastructure int(1) int(2) 3 -===DONE=== diff --git a/ext/spl/tests/dllist_006.phpt b/ext/spl/tests/dllist_006.phpt index d5590642ea6..88190573e48 100644 --- a/ext/spl/tests/dllist_006.phpt +++ b/ext/spl/tests/dllist_006.phpt @@ -45,8 +45,6 @@ try { echo "Exception: ".$e->getMessage()."\n"; } ?> -===DONE=== - --EXPECT-- int(1) int(2) @@ -59,4 +57,3 @@ int(2) Exception: Offset invalid or out of range int(1) Exception: Offset invalid or out of range -===DONE=== diff --git a/ext/spl/tests/dllist_007.phpt b/ext/spl/tests/dllist_007.phpt index d15e064ac4e..2ccadf99ca9 100644 --- a/ext/spl/tests/dllist_007.phpt +++ b/ext/spl/tests/dllist_007.phpt @@ -12,8 +12,6 @@ while ($a->valid()) { var_dump($a->current(), $a->next()); } ?> -===DONE=== - --EXPECT-- int(1) NULL @@ -21,4 +19,3 @@ int(2) NULL int(3) NULL -===DONE=== diff --git a/ext/spl/tests/dllist_010.phpt b/ext/spl/tests/dllist_010.phpt index 7e389559e2d..7fd7e8993fc 100644 --- a/ext/spl/tests/dllist_010.phpt +++ b/ext/spl/tests/dllist_010.phpt @@ -23,11 +23,9 @@ $dll->prev(); var_dump($dll->current()); ?> -===DONE=== --EXPECT-- NULL int(1) int(2) int(4) int(3) -===DONE=== diff --git a/ext/spl/tests/dllist_011.phpt b/ext/spl/tests/dllist_011.phpt index b9be872555f..bd1b0d3161f 100644 --- a/ext/spl/tests/dllist_011.phpt +++ b/ext/spl/tests/dllist_011.phpt @@ -7,7 +7,5 @@ $dll->rewind(); $dll->prev(); var_dump($dll->current()); ?> -===DONE=== --EXPECT-- NULL -===DONE=== diff --git a/ext/spl/tests/dllist_012.phpt b/ext/spl/tests/dllist_012.phpt index 4eec9bda3ba..c9b9f2cf259 100644 --- a/ext/spl/tests/dllist_012.phpt +++ b/ext/spl/tests/dllist_012.phpt @@ -7,7 +7,6 @@ $a[] = $a; var_dump($a); ?> -===DONE=== --EXPECTF-- object(SplDoublyLinkedList)#%d (2) { ["flags":"SplDoublyLinkedList":private]=> @@ -18,4 +17,3 @@ object(SplDoublyLinkedList)#%d (2) { *RECURSION* } } -===DONE=== diff --git a/ext/spl/tests/dllist_013.phpt b/ext/spl/tests/dllist_013.phpt index b9a4ef7648f..edab2b3056a 100644 --- a/ext/spl/tests/dllist_013.phpt +++ b/ext/spl/tests/dllist_013.phpt @@ -30,8 +30,6 @@ echo $dll->pop()."\n"; echo $dll->pop()."\n"; echo $dll->pop()."\n"; ?> -===DONE=== - --EXPECT-- Exception: Offset invalid or out of range 7 @@ -42,4 +40,3 @@ Exception: Offset invalid or out of range 3 2 1 -===DONE=== diff --git a/ext/spl/tests/dllist_memleak.phpt b/ext/spl/tests/dllist_memleak.phpt index a52d2887d01..142206f0a72 100644 --- a/ext/spl/tests/dllist_memleak.phpt +++ b/ext/spl/tests/dllist_memleak.phpt @@ -16,9 +16,6 @@ $dll->next(); echo $dll->current()."\n"; ?> -===DONE=== - --EXPECT-- 1 3 -===DONE=== diff --git a/ext/spl/tests/dualiterator_001.phpt b/ext/spl/tests/dualiterator_001.phpt index 934f28abee9..2a8358ae9cd 100644 --- a/ext/spl/tests/dualiterator_001.phpt +++ b/ext/spl/tests/dualiterator_001.phpt @@ -30,8 +30,6 @@ test(array(1,array(21,22),3), array(1,array(21,"22"),3), false); test(array(1,array(21,22),3), array(1,array(21,"22"),3), true); ?> -===DONE=== - --EXPECT-- bool(true) bool(false) @@ -43,4 +41,3 @@ bool(true) bool(false) bool(true) bool(false) -===DONE=== diff --git a/ext/spl/tests/fileobject_001.phpt b/ext/spl/tests/fileobject_001.phpt index 4059310bbac..7bd3e0c8bdd 100644 --- a/ext/spl/tests/fileobject_001.phpt +++ b/ext/spl/tests/fileobject_001.phpt @@ -39,7 +39,6 @@ foreach($o as $n => $l) } ?> -===DONE=== --EXPECTF-- int(0) string(%d) "0 @@ -85,4 +84,3 @@ int(4) string(1) "4" int(5) string(1) "5" -===DONE=== diff --git a/ext/spl/tests/fileobject_002.phpt b/ext/spl/tests/fileobject_002.phpt index 2f439499662..e8ecad609eb 100644 --- a/ext/spl/tests/fileobject_002.phpt +++ b/ext/spl/tests/fileobject_002.phpt @@ -28,8 +28,6 @@ test('fileobject_001a.txt'); test('fileobject_001b.txt'); ?> -===DONE=== - --EXPECT-- ===fileobject_001a.txt=== int(0) @@ -123,4 +121,3 @@ bool(false) bool(true) int(5) bool(true) -===DONE=== diff --git a/ext/spl/tests/fileobject_003.phpt b/ext/spl/tests/fileobject_003.phpt index c3452bc93fc..6c2751c89b5 100644 --- a/ext/spl/tests/fileobject_003.phpt +++ b/ext/spl/tests/fileobject_003.phpt @@ -46,8 +46,6 @@ test(__DIR__ . '/', substr(__DIR__,-1), 'l'); test(__DIR__, substr(__DIR__,-1), 'l'); ?> -===DONE=== - --EXPECTF-- ===0=== object(SplFileInfo)#%d (2) { @@ -111,4 +109,3 @@ bool(true) bool(true) LogicException: Cannot use SplFileObject with directories LogicException: Cannot use SplFileObject with directories -===DONE=== diff --git a/ext/spl/tests/fileobject_004.phpt b/ext/spl/tests/fileobject_004.phpt index fad87298ca7..f446674dd88 100644 --- a/ext/spl/tests/fileobject_004.phpt +++ b/ext/spl/tests/fileobject_004.phpt @@ -14,9 +14,7 @@ var_dump($fo->getPath()); var_dump($fo->getFilename()); var_dump($fo->getRealPath()); ?> -==DONE== --EXPECTF-- string(%d) "%sspl%stests" string(19) "fileobject_004.phpt" string(%d) "%sspl%stests%sfileobject_004.phpt" -==DONE== diff --git a/ext/spl/tests/fileobject_005.phpt b/ext/spl/tests/fileobject_005.phpt index 3bfd41c8ccd..e26a8d7aea0 100644 --- a/ext/spl/tests/fileobject_005.phpt +++ b/ext/spl/tests/fileobject_005.phpt @@ -22,7 +22,6 @@ $fo->rewind(); $fo->fwrite("blahlubba"); ?> -==DONE== --CLEAN-- -===DONE=== --EXPECT-- Exception: Index invalid or out of range Exception: Index invalid or out of range @@ -57,4 +56,3 @@ int(10) int(10) bool(true) string(6) "value0" -===DONE=== diff --git a/ext/spl/tests/fixedarray_002.phpt b/ext/spl/tests/fixedarray_002.phpt index ade6b7decf2..27d25c0273a 100644 --- a/ext/spl/tests/fixedarray_002.phpt +++ b/ext/spl/tests/fixedarray_002.phpt @@ -67,7 +67,6 @@ var_dump($a[0], $a[2], $a[3], $a[4]); var_dump(count($a), $a->getSize(), count($a) == $a->getSize()); ?> -===DONE=== --EXPECT-- A::offsetSet Exception: Index invalid or out of range @@ -100,4 +99,3 @@ string(6) "value4" int(2) int(10) bool(false) -===DONE=== diff --git a/ext/spl/tests/fixedarray_003.phpt b/ext/spl/tests/fixedarray_003.phpt index 33043a80e3a..a4c313cd84c 100644 --- a/ext/spl/tests/fixedarray_003.phpt +++ b/ext/spl/tests/fixedarray_003.phpt @@ -49,7 +49,6 @@ foreach ($a as $k => $v) { echo "$k => $v\n"; } ?> -===DONE=== --EXPECT-- ==Direct instance== 0 => a @@ -85,4 +84,3 @@ A::key 4 => f A::next A::valid -===DONE=== diff --git a/ext/spl/tests/fixedarray_004.phpt b/ext/spl/tests/fixedarray_004.phpt index fb32c2fd52a..c7c37426b56 100644 --- a/ext/spl/tests/fixedarray_004.phpt +++ b/ext/spl/tests/fixedarray_004.phpt @@ -12,7 +12,5 @@ try { } ?> -===DONE=== --EXPECT-- string(29) "Index invalid or out of range" -===DONE=== diff --git a/ext/spl/tests/fixedarray_005.phpt b/ext/spl/tests/fixedarray_005.phpt index 7240c0abc6d..274fc34245a 100644 --- a/ext/spl/tests/fixedarray_005.phpt +++ b/ext/spl/tests/fixedarray_005.phpt @@ -22,9 +22,7 @@ try { } ?> -===DONE=== --EXPECT-- Ok - SplFixedArray::__construct() expects parameter 1 to be int, object given Ok - SplFixedArray::__construct() expects parameter 1 to be int, string given Ok - SplFixedArray::__construct() expects parameter 1 to be int, string given -===DONE=== diff --git a/ext/spl/tests/fixedarray_021.phpt b/ext/spl/tests/fixedarray_021.phpt index 97b0a70f13a..813de176c8f 100644 --- a/ext/spl/tests/fixedarray_021.phpt +++ b/ext/spl/tests/fixedarray_021.phpt @@ -60,7 +60,6 @@ var_dump(isset($a["0"], $a[-1]), $a["1"]); var_dump(empty($a["3"])); ?> -==DONE== --EXPECTF-- int(0) int(0) @@ -75,4 +74,3 @@ string(52) "An iterator cannot be used with foreach by reference" bool(false) string(3) "foo" bool(true) -==DONE== diff --git a/ext/spl/tests/heap_001.phpt b/ext/spl/tests/heap_001.phpt index f9cfd68710c..33f091838b0 100644 --- a/ext/spl/tests/heap_001.phpt +++ b/ext/spl/tests/heap_001.phpt @@ -36,8 +36,6 @@ $h2 = clone $h; echo $h->extract()."\n"; echo $h2->extract()."\n"; ?> -===DONE=== - --EXPECT-- Exception: Can't extract from an empty heap 5 @@ -50,4 +48,3 @@ Exception: Can't extract from an empty heap -- 4 4 -===DONE=== diff --git a/ext/spl/tests/heap_002.phpt b/ext/spl/tests/heap_002.phpt index 578d15b21c0..452fdf189a7 100644 --- a/ext/spl/tests/heap_002.phpt +++ b/ext/spl/tests/heap_002.phpt @@ -34,8 +34,6 @@ $b = 5; echo $h->extract()."\n"; ?> -===DONE=== - --EXPECT-- Exception: Can't extract from an empty heap 5 @@ -47,4 +45,3 @@ Exception: Can't extract from an empty heap 0 -- 4 -===DONE=== diff --git a/ext/spl/tests/heap_003.phpt b/ext/spl/tests/heap_003.phpt index 4a4bcff5ff8..69620af8efb 100644 --- a/ext/spl/tests/heap_003.phpt +++ b/ext/spl/tests/heap_003.phpt @@ -27,8 +27,6 @@ foreach ($h as $out) { echo $out."\n"; } ?> -===DONE=== - --EXPECT-- 10 9 @@ -41,4 +39,3 @@ foreach ($h as $out) { 2 1 0 -===DONE=== diff --git a/ext/spl/tests/heap_004.phpt b/ext/spl/tests/heap_004.phpt index e493d20fac9..892da20fb70 100644 --- a/ext/spl/tests/heap_004.phpt +++ b/ext/spl/tests/heap_004.phpt @@ -53,8 +53,6 @@ try { echo "Exception: ".$e->getMessage()."\n"; } ?> -===DONE=== - --EXPECT-- inserted 1 Exception: foo @@ -64,4 +62,3 @@ Exception: Heap is corrupted, heap properties are no longer ensured. Recovering.. int(1) int(2) -===DONE=== diff --git a/ext/spl/tests/heap_005.phpt b/ext/spl/tests/heap_005.phpt index 8621f09aa45..39a9e81ebb7 100644 --- a/ext/spl/tests/heap_005.phpt +++ b/ext/spl/tests/heap_005.phpt @@ -15,8 +15,6 @@ foreach ($h as $k => $o) { echo "$k => $o\n"; } ?> -===DONE=== - --EXPECT-- 99 => 1 98 => 2 @@ -118,4 +116,3 @@ foreach ($h as $k => $o) { 2 => 98 1 => 99 0 => 100 -===DONE=== diff --git a/ext/spl/tests/heap_006.phpt b/ext/spl/tests/heap_006.phpt index 41c7b846387..998c07c91ee 100644 --- a/ext/spl/tests/heap_006.phpt +++ b/ext/spl/tests/heap_006.phpt @@ -15,8 +15,6 @@ foreach ($h as $k => $o) { echo "$k => $o\n"; } ?> -===DONE=== - --EXPECT-- 99 => 100 98 => 99 @@ -118,4 +116,3 @@ foreach ($h as $k => $o) { 2 => 3 1 => 2 0 => 1 -===DONE=== diff --git a/ext/spl/tests/heap_007.phpt b/ext/spl/tests/heap_007.phpt index 27bd66edf1d..291f27d69f3 100644 --- a/ext/spl/tests/heap_007.phpt +++ b/ext/spl/tests/heap_007.phpt @@ -20,8 +20,6 @@ while ($h->valid()) { $h->next(); } ?> -===DONE=== - --EXPECT-- count($h) = 4 $h->count() = 4 @@ -29,4 +27,3 @@ $h->count() = 4 2=>4 1=>1 0=>0 -===DONE=== diff --git a/ext/spl/tests/heap_008.phpt b/ext/spl/tests/heap_008.phpt index 3a746b2e6f5..419726e6ff8 100644 --- a/ext/spl/tests/heap_008.phpt +++ b/ext/spl/tests/heap_008.phpt @@ -11,8 +11,6 @@ $h->insert(4); var_dump($h); ?> -===DONE=== - --EXPECT-- object(SplMaxHeap)#1 (3) { ["flags":"SplHeap":private]=> @@ -31,4 +29,3 @@ object(SplMaxHeap)#1 (3) { int(1) } } -===DONE=== diff --git a/ext/spl/tests/heap_009.phpt b/ext/spl/tests/heap_009.phpt index f660b24d892..c77ce07ff8e 100644 --- a/ext/spl/tests/heap_009.phpt +++ b/ext/spl/tests/heap_009.phpt @@ -45,7 +45,6 @@ $heap->insert( 1, 2 ); testForException( $heap ); ?> -==DONE== --EXPECT-- An iterator cannot be used with foreach by reference An iterator cannot be used with foreach by reference @@ -53,4 +52,3 @@ An iterator cannot be used with foreach by reference An iterator cannot be used with foreach by reference An iterator cannot be used with foreach by reference An iterator cannot be used with foreach by reference -==DONE== diff --git a/ext/spl/tests/heap_012.phpt b/ext/spl/tests/heap_012.phpt index f86f14f4d09..69f3708868a 100644 --- a/ext/spl/tests/heap_012.phpt +++ b/ext/spl/tests/heap_012.phpt @@ -6,7 +6,6 @@ $a = new SplMaxHeap; $a->insert($a); var_dump($a) ?> -===DONE=== --EXPECTF-- object(SplMaxHeap)#%d (3) { ["flags":"SplHeap":private]=> @@ -19,4 +18,3 @@ object(SplMaxHeap)#%d (3) { *RECURSION* } } -===DONE=== diff --git a/ext/spl/tests/iterator_001.phpt b/ext/spl/tests/iterator_001.phpt index f5bb6974d9c..e87d49f140d 100644 --- a/ext/spl/tests/iterator_001.phpt +++ b/ext/spl/tests/iterator_001.phpt @@ -88,8 +88,6 @@ foreach($it as $v) } ?> -===DONE=== - --EXPECT-- NumericArrayIterator::__construct NumericArrayIterator::rewind @@ -168,4 +166,3 @@ NumericArrayIterator::next SeekableNumericArrayIterator::greaterThan(2) NumericArrayIterator::current 4 is greater than 2 -===DONE=== diff --git a/ext/spl/tests/iterator_002.phpt b/ext/spl/tests/iterator_002.phpt index 61765421f17..44943d64387 100644 --- a/ext/spl/tests/iterator_002.phpt +++ b/ext/spl/tests/iterator_002.phpt @@ -43,8 +43,6 @@ foreach ($dir as $file) { } ?> -===DONE=== - --EXPECT-- 1 21 @@ -52,4 +50,3 @@ foreach ($dir as $file) { 222 231 3 -===DONE=== diff --git a/ext/spl/tests/iterator_003.phpt b/ext/spl/tests/iterator_003.phpt index f119661f579..e2a4246075e 100644 --- a/ext/spl/tests/iterator_003.phpt +++ b/ext/spl/tests/iterator_003.phpt @@ -87,9 +87,6 @@ foreach ($it as $student) { echo $it->__toString(), "\n"; } ?> -===DONE=== - --EXPECT-- 01234123, Joe 00000014, Bob -===DONE=== diff --git a/ext/spl/tests/iterator_004.phpt b/ext/spl/tests/iterator_004.phpt index e07cd32c394..17c03c86503 100644 --- a/ext/spl/tests/iterator_004.phpt +++ b/ext/spl/tests/iterator_004.phpt @@ -80,8 +80,6 @@ for($i = 1; $i < 4; $i++) } ?> -===DONE=== - --EXPECT-- NumericArrayIterator::__construct NumericArrayIterator::rewind @@ -139,4 +137,3 @@ NumericArrayIterator::valid(true) NumericArrayIterator::current NumericArrayIterator::key 4 -===DONE=== diff --git a/ext/spl/tests/iterator_005.phpt b/ext/spl/tests/iterator_005.phpt index cacf006c5a4..8f8d11e3118 100644 --- a/ext/spl/tests/iterator_005.phpt +++ b/ext/spl/tests/iterator_005.phpt @@ -36,8 +36,6 @@ foreach(new IteratorIterator($it) as $v) } ?> -===DONE=== - --EXPECT-- ArrayIteratorEx::rewind int(0) @@ -49,4 +47,3 @@ int(0) int(1) int(2) int(3) -===DONE=== diff --git a/ext/spl/tests/iterator_006.phpt b/ext/spl/tests/iterator_006.phpt index 794eca0da99..667c3cee124 100644 --- a/ext/spl/tests/iterator_006.phpt +++ b/ext/spl/tests/iterator_006.phpt @@ -16,9 +16,6 @@ foreach (new IteratorIterator($root->child) as $child) { echo $child."\n"; } ?> -===DONE=== - --EXPECT-- Hello World -===DONE=== diff --git a/ext/spl/tests/iterator_007.phpt b/ext/spl/tests/iterator_007.phpt index d26c01ef793..4f63585d706 100644 --- a/ext/spl/tests/iterator_007.phpt +++ b/ext/spl/tests/iterator_007.phpt @@ -95,8 +95,6 @@ foreach ($it as $v) { var_dump($v); } ?> -===DONE=== - --EXPECT-- ===0=== ArrayIteratorEx::rewind @@ -163,4 +161,3 @@ ArrayIteratorEx::valid NoRewindIteratorEx::rewind NoRewindIteratorEx::valid ArrayIteratorEx::valid -===DONE=== diff --git a/ext/spl/tests/iterator_008.phpt b/ext/spl/tests/iterator_008.phpt index 04f8c003480..0d6290f504f 100644 --- a/ext/spl/tests/iterator_008.phpt +++ b/ext/spl/tests/iterator_008.phpt @@ -44,8 +44,6 @@ foreach ($it as $v) { } ?> -===DONE=== - --EXPECT-- ArrayIteratorEx::rewind ArrayIteratorEx::valid @@ -86,4 +84,3 @@ ArrayIteratorEx::valid ArrayIteratorEx::current ArrayIteratorEx::key int(0) -===DONE=== diff --git a/ext/spl/tests/iterator_009.phpt b/ext/spl/tests/iterator_009.phpt index 0bfe74ef7fe..78213b6224d 100644 --- a/ext/spl/tests/iterator_009.phpt +++ b/ext/spl/tests/iterator_009.phpt @@ -37,9 +37,6 @@ foreach (new EmptyIteratorEx() as $v) { } ?> -===DONE=== - --EXPECT-- EmptyIteratorEx::rewind EmptyIteratorEx::valid -===DONE=== diff --git a/ext/spl/tests/iterator_010.phpt b/ext/spl/tests/iterator_010.phpt index b8013d7311e..15c79f8d401 100644 --- a/ext/spl/tests/iterator_010.phpt +++ b/ext/spl/tests/iterator_010.phpt @@ -11,8 +11,5 @@ foreach(new LimitIterator(new EmptyIterator(), 0, 3) as $key => $val) } ?> -===DONE=== -$key) } ?> -===DONE=== - --EXPECT-- ===EmptyIterator=== ===InfiniteIterator=== @@ -48,4 +46,3 @@ foreach($it as $val=>$key) 1=>B 2=>C 1=>B -===DONE=== diff --git a/ext/spl/tests/iterator_012.phpt b/ext/spl/tests/iterator_012.phpt index 63a3fce8bf4..f00cac697eb 100644 --- a/ext/spl/tests/iterator_012.phpt +++ b/ext/spl/tests/iterator_012.phpt @@ -21,8 +21,6 @@ foreach($it as $key=>$val) } ?> -===DONE=== - --EXPECT-- ===Current=== 0=>A @@ -30,4 +28,3 @@ foreach($it as $key=>$val) ===Foreach=== 1=>B 2=>C -===DONE=== diff --git a/ext/spl/tests/iterator_013.phpt b/ext/spl/tests/iterator_013.phpt index 6da31e391d9..edc8ea75ed9 100644 --- a/ext/spl/tests/iterator_013.phpt +++ b/ext/spl/tests/iterator_013.phpt @@ -45,8 +45,6 @@ foreach($it as $key=>$val) } ?> -===DONE=== - --EXPECT-- ===Empty=== ===Append=== @@ -63,4 +61,3 @@ foreach($it as $key=>$val) 1=>B 2=>C 3=>D -===DONE=== diff --git a/ext/spl/tests/iterator_014.phpt b/ext/spl/tests/iterator_014.phpt index 119fad05fba..bbcacba51f0 100644 --- a/ext/spl/tests/iterator_014.phpt +++ b/ext/spl/tests/iterator_014.phpt @@ -73,8 +73,6 @@ foreach(new RecursiveArrayIteratorIterator(new MyRecursiveArrayIterator(array("a echo "$k=>$v\n"; } ?> -===DONE=== - --EXPECT-- RecursiveArrayIteratorIterator::rewind RecursiveArrayIteratorIterator::valid @@ -135,4 +133,3 @@ RecursiveArrayIteratorIterator::next MyRecursiveArrayIterator::valid = false RecursiveArrayIteratorIterator::valid MyRecursiveArrayIterator::valid = false -===DONE=== diff --git a/ext/spl/tests/iterator_015.phpt b/ext/spl/tests/iterator_015.phpt index bce00ae4d56..ea507143f86 100644 --- a/ext/spl/tests/iterator_015.phpt +++ b/ext/spl/tests/iterator_015.phpt @@ -37,8 +37,6 @@ foreach($rit as $k=>$v) echo str_repeat(' ',$rit->getDepth()+1)."$k=>$v\n"; } ?> -===DONE=== - --EXPECT--
    0=>a @@ -59,4 +57,3 @@ foreach($rit as $k=>$v)
3=>d