Clean DONE tags from tests

Remove most of the `===DONE===` tags and its variations.
Keep `===DONE===` if the test output otherwise becomes empty.

Closes GH-4872.

38 files changed, 4 insertions, 73 deletions

diff --git a/tests/classes/__call_006.phpt b/tests/classes/__call_006.phpt
index e6efdefe9e..807735401c 100644
--- a/tests/classes/__call_006.phpt
+++ b/tests/classes/__call_006.phpt
@@ -50,7 +50,6 @@ try {
 	echo "Exception caught OK; continuing.\n";
 }
 ?>
-==DONE==
 --EXPECTF--
 ---> Invoke __call via simple method call.
 object(A)#%d (0) {
@@ -74,4 +73,3 @@ Exception caught OK; continuing.
 object(B)#%d (0) {
 }
 Exception caught OK; continuing.
-==DONE==
diff --git a/tests/classes/__call_007.phpt b/tests/classes/__call_007.phpt
index a1dd4594e9..a1e911d52b 100644
--- a/tests/classes/__call_007.phpt
+++ b/tests/classes/__call_007.phpt
@@ -50,7 +50,6 @@ try {
 	echo "Exception caught OK; continuing.\n";
 }
 ?>
-==DONE==
 --EXPECTF--
 Warning: The magic method __call() must have public visibility and cannot be static in %s on line 3
 ---> Invoke __call via simple method call.
@@ -75,4 +74,3 @@ Exception caught OK; continuing.
 object(B)#2 (0) {
 }
 Exception caught OK; continuing.
-==DONE==
diff --git a/tests/classes/__set__get_004.phpt b/tests/classes/__set__get_004.phpt
index 004edc973a..f825cdf971 100644
--- a/tests/classes/__set__get_004.phpt
+++ b/tests/classes/__set__get_004.phpt
@@ -30,8 +30,6 @@ var_dump($bar->baz);
 var_dump($foo->bar->baz);
 
 ?>
-===DONE===
 --EXPECT--
 string(5) "Check"
 string(5) "Check"
-===DONE===
diff --git a/tests/classes/__set__get_005.phpt b/tests/classes/__set__get_005.phpt
index 68cfb39df3..767e54ab0c 100644
--- a/tests/classes/__set__get_005.phpt
+++ b/tests/classes/__set__get_005.phpt
@@ -48,7 +48,6 @@ var_dump($foo->bar);
 var_dump($foo->bar->baz);
 
 ?>
-===DONE===
 --EXPECTF--
 AutoGen::__get
 Test::__set
@@ -63,4 +62,3 @@ object(Test)#%d (1) {
 AutoGen::__get
 Test::__get
 string(5) "Check"
-===DONE===
diff --git a/tests/classes/abstract_derived.phpt b/tests/classes/abstract_derived.phpt
index a23205f9a5..5948692653 100644
--- a/tests/classes/abstract_derived.phpt
+++ b/tests/classes/abstract_derived.phpt
@@ -12,6 +12,5 @@ class derived extends base {
 
 ?>
 ===DONE===
-<?php exit(0); ?>
 --EXPECTF--
 Fatal error: Class derived contains 1 abstract method and must therefore be declared abstract or implement the remaining methods (derived::show) in %sabstract_derived.php on line %d
diff --git a/tests/classes/abstract_user_call.phpt b/tests/classes/abstract_user_call.phpt
index c69eaa458c..224461a3bd 100644
--- a/tests/classes/abstract_user_call.phpt
+++ b/tests/classes/abstract_user_call.phpt
@@ -27,8 +27,6 @@ try {
 }
 
 ?>
-===DONE===
 --EXPECT--
 test::func()
 call_user_func() expects parameter 1 to be a valid callback, cannot call abstract method test_base::func()
-===DONE===
diff --git a/tests/classes/array_access_001.phpt b/tests/classes/array_access_001.phpt
index 784a886126..a2ba09e88b 100644
--- a/tests/classes/array_access_001.phpt
+++ b/tests/classes/array_access_001.phpt
@@ -82,7 +82,6 @@ unset($obj['8th']);
 var_dump($obj->a);
 
 ?>
-===DONE===
 --EXPECTF--
 array(4) {
   [0]=>
@@ -195,4 +194,3 @@ array(4) {
   [6]=>
   string(9) "changed 6"
 }
-===DONE===
diff --git a/tests/classes/array_access_002.phpt b/tests/classes/array_access_002.phpt
index 5e101914c0..730ad0952b 100644
--- a/tests/classes/array_access_002.phpt
+++ b/tests/classes/array_access_002.phpt
@@ -82,7 +82,6 @@ unset($obj['8th']);
 var_dump($obj->a);
 
 ?>
-===DONE===
 --EXPECTF--
 array(4) {
   [0]=>
@@ -195,4 +194,3 @@ array(4) {
   [6]=>
   string(9) "changed 6"
 }
-===DONE===
diff --git a/tests/classes/array_access_003.phpt b/tests/classes/array_access_003.phpt
index 8924d1575f..9fa2ee73e6 100644
--- a/tests/classes/array_access_003.phpt
+++ b/tests/classes/array_access_003.phpt
@@ -45,7 +45,6 @@ $obj[2]++;
 var_dump($obj[2]);
 
 ?>
-===DONE===
 --EXPECTF--
 ObjectOne::offsetGet(1)
 string(6) "fooBar"
@@ -56,4 +55,3 @@ ObjectOne::offsetGet(2)
 Notice: Indirect modification of overloaded element of ObjectOne has no effect in %sarray_access_003.php on line 39
 ObjectOne::offsetGet(2)
 int(1)
-===DONE===
diff --git a/tests/classes/array_access_004.phpt b/tests/classes/array_access_004.phpt
index 22566937f2..72e1322aba 100644
--- a/tests/classes/array_access_004.phpt
+++ b/tests/classes/array_access_004.phpt
@@ -43,7 +43,6 @@ $obj[2]++;
 var_dump($obj[2]);
 
 ?>
-===DONE===
 --EXPECTF--
 ObjectOne::offsetGet(1)
 string(6) "fooBar"
@@ -54,4 +53,3 @@ ObjectOne::offsetGet(2)
 Notice: Indirect modification of overloaded element of ObjectOne has no effect in %sarray_access_004.php on line 39
 ObjectOne::offsetGet(2)
 int(1)
-===DONE===
diff --git a/tests/classes/array_access_005.phpt b/tests/classes/array_access_005.phpt
index 92ddeccaf2..91d4a7ca22 100644
--- a/tests/classes/array_access_005.phpt
+++ b/tests/classes/array_access_005.phpt
@@ -52,7 +52,6 @@ $people[0]['name'] = 'JoeFooBar';
 var_dump($people[0]['name']);
 
 ?>
-===DONE===
 --EXPECTF--
 string(3) "Joe"
 string(6) "JoeFoo"
@@ -74,4 +73,3 @@ string(6) "JoeFoo"
 
 Notice: Indirect modification of overloaded element of Peoples has no effect in %sarray_access_005.php on line 48
 string(6) "JoeFoo"
-===DONE===
diff --git a/tests/classes/array_access_007.phpt b/tests/classes/array_access_007.phpt
index 801c8e846c..f0dce8a3ad 100644
--- a/tests/classes/array_access_007.phpt
+++ b/tests/classes/array_access_007.phpt
@@ -42,7 +42,6 @@ $a[2] = 3;
 $a[] = 4;
 $a->dump();
 ?>
-===DONE===
 --EXPECT--
 array(4) {
   [0]=>
@@ -54,4 +53,3 @@ array(4) {
   [3]=>
   int(4)
 }
-===DONE===
diff --git a/tests/classes/array_access_008.phpt b/tests/classes/array_access_008.phpt
index 0bb793b2b3..5185478403 100644
--- a/tests/classes/array_access_008.phpt
+++ b/tests/classes/array_access_008.phpt
@@ -48,7 +48,6 @@ $people[0]['name'] .= 'Baz';
 var_dump($people[0]['name']);
 
 ?>
-===DONE===
 --EXPECTF--
 string(3) "Foo"
 string(6) "FooBar"
@@ -64,4 +63,3 @@ string(3) "Foo"
 
 Notice: Indirect modification of overloaded element of Peoples has no effect in %sarray_access_008.php on line 44
 string(3) "Foo"
-===DONE===
diff --git a/tests/classes/array_access_009.phpt b/tests/classes/array_access_009.phpt
index 7da9084d24..e9f9ec0a24 100644
--- a/tests/classes/array_access_009.phpt
+++ b/tests/classes/array_access_009.phpt
@@ -122,7 +122,6 @@ $people[0]['name'] = 'BlaBla';
 var_dump($people[0]['name']);
 
 ?>
-===DONE===
 --EXPECTF--
 string(3) "Foo"
 string(6) "FooBar"
@@ -187,4 +186,3 @@ ArrayProxy::offsetSet(0, name, BlaBla)
 ArrayProxy::__construct(0)
 ArrayProxy::offsetGet(0, name)
 string(6) "BlaBla"
-===DONE===
diff --git a/tests/classes/array_access_010.phpt b/tests/classes/array_access_010.phpt
index 3df64fcc7e..24a0c251f6 100644
--- a/tests/classes/array_access_010.phpt
+++ b/tests/classes/array_access_010.phpt
@@ -95,8 +95,6 @@ $people[0]['name'] = 'BlaBla';
 var_dump($people[0]['name']);
 
 ?>
-===DONE===
-<?php exit(0); ?>
 --EXPECTF--
 string(3) "Foo"
 string(6) "FooBar"
@@ -165,4 +163,3 @@ ArrayReferenceProxy::offsetSet(Array, name, BlaBla)
 ArrayReferenceProxy::__construct(Array)
 ArrayReferenceProxy::offsetGet(Array, name)
 string(6) "BlaBla"
-===DONE===
diff --git a/tests/classes/array_access_011.phpt b/tests/classes/array_access_011.phpt
index 36269c0b41..13c69a7974 100644
--- a/tests/classes/array_access_011.phpt
+++ b/tests/classes/array_access_011.phpt
@@ -104,8 +104,6 @@ $people[0]['name'] = 'BlaBla';
 var_dump($people[0]['name']);
 
 ?>
-===DONE===
-<?php exit(0); ?>
 --EXPECTF--
 string(3) "Foo"
 string(6) "FooBar"
@@ -184,4 +182,3 @@ ArrayAccessReferenceProxy::offsetSet(0, name, BlaBla)
 ArrayAccessReferenceProxy::__construct(0)
 ArrayAccessReferenceProxy::offsetGet(0, name)
 string(6) "BlaBla"
-===DONE===
diff --git a/tests/classes/array_access_012.phpt b/tests/classes/array_access_012.phpt
index 3cd3dceb8a..f10a67a6c7 100644
--- a/tests/classes/array_access_012.phpt
+++ b/tests/classes/array_access_012.phpt
@@ -28,7 +28,6 @@ $data['element'] = &$test;
 
 ?>
 ===DONE===
-<?php exit(0); ?>
 --EXPECTF--
 Notice: Indirect modification of overloaded element of ArrayAccessImpl has no effect in %sarray_access_012.php on line 24
 
diff --git a/tests/classes/array_access_013.phpt b/tests/classes/array_access_013.phpt
index 206d9d5403..8b24ca9017 100644
--- a/tests/classes/array_access_013.phpt
+++ b/tests/classes/array_access_013.phpt
@@ -49,10 +49,8 @@ catch(Exception $e)
     echo "Caught in " . $e->getMessage() . "()\n";
 }
 ?>
-===DONE===
 --EXPECT--
 Caught in Test::offsetExists()
 Caught in Test::offsetGet()
 Caught in Test::offsetSet()
 Caught in Test::offsetUnset()
-===DONE===
diff --git a/tests/classes/autoload_001.phpt b/tests/classes/autoload_001.phpt
index 350e1e0f12..bf3307d234 100644
--- a/tests/classes/autoload_001.phpt
+++ b/tests/classes/autoload_001.phpt
@@ -15,8 +15,6 @@ spl_autoload_register(function ($class_name) {
 var_dump(class_exists('autoload_root'));
 
 ?>
-===DONE===
 --EXPECT--
 autoload(autoload_root)
 bool(true)
-===DONE===
diff --git a/tests/classes/autoload_002.phpt b/tests/classes/autoload_002.phpt
index 1b049c3414..63364c2082 100644
--- a/tests/classes/autoload_002.phpt
+++ b/tests/classes/autoload_002.phpt
@@ -15,11 +15,9 @@ spl_autoload_register(function ($class_name) {
 var_dump(get_class_methods('autoload_root'));
 
 ?>
-===DONE===
 --EXPECT--
 autoload(autoload_root)
 array(1) {
   [0]=>
   string(12) "testFunction"
 }
-===DONE===
diff --git a/tests/classes/autoload_003.phpt b/tests/classes/autoload_003.phpt
index 52fd264d46..7680509b3f 100644
--- a/tests/classes/autoload_003.phpt
+++ b/tests/classes/autoload_003.phpt
@@ -15,9 +15,7 @@ spl_autoload_register(function ($class_name) {
 var_dump(class_exists('autoload_derived'));
 
 ?>
-===DONE===
 --EXPECT--
 autoload(autoload_root)
 autoload(autoload_derived)
 bool(true)
-===DONE===
diff --git a/tests/classes/autoload_004.phpt b/tests/classes/autoload_004.phpt
index 6f24f157d2..4fc61a1846 100644
--- a/tests/classes/autoload_004.phpt
+++ b/tests/classes/autoload_004.phpt
@@ -16,11 +16,9 @@ spl_autoload_register(function ($class_name) {
 var_dump(class_exists('autoload_derived'));
 
 ?>
-===DONE===
 --EXPECT--
 bool(false)
 bool(false)
 autoload(autoload_root)
 autoload(autoload_derived)
 bool(true)
-===DONE===
diff --git a/tests/classes/autoload_005.phpt b/tests/classes/autoload_005.phpt
index 67dd23daf7..408fad259e 100644
--- a/tests/classes/autoload_005.phpt
+++ b/tests/classes/autoload_005.phpt
@@ -29,7 +29,6 @@ $o = new Test;
 unset($o);
 
 ?>
-===DONE===
 --EXPECTF--
 bool(false)
 bool(false)
@@ -40,4 +39,3 @@ autoload(autoload_root)
 autoload(autoload_derived)
 object(autoload_derived)#%d (0) {
 }
-===DONE===
diff --git a/tests/classes/autoload_006.phpt b/tests/classes/autoload_006.phpt
index 746cbee3f6..fca24441b5 100644
--- a/tests/classes/autoload_006.phpt
+++ b/tests/classes/autoload_006.phpt
@@ -24,7 +24,6 @@ var_dump(interface_exists('autoload_interface', false));
 var_dump(class_exists('autoload_implements', false));
 
 ?>
-===DONE===
 --EXPECTF--
 bool(false)
 bool(false)
@@ -35,4 +34,3 @@ object(autoload_implements)#%d (0) {
 bool(true)
 bool(true)
 bool(true)
-===DONE===
diff --git a/tests/classes/ctor_failure.phpt b/tests/classes/ctor_failure.phpt
index f86b0cc5f8..9497482892 100644
--- a/tests/classes/ctor_failure.phpt
+++ b/tests/classes/ctor_failure.phpt
@@ -26,8 +26,6 @@ catch (Exception $e)
 }
 
 ?>
-===DONE===
 --EXPECT--
 Test::__construct(Hello)
 Caught Exception(Hello)
-===DONE===
diff --git a/tests/classes/destructor_and_exceptions.phpt b/tests/classes/destructor_and_exceptions.phpt
index 0da6e642af..f58bb8de7f 100644
--- a/tests/classes/destructor_and_exceptions.phpt
+++ b/tests/classes/destructor_and_exceptions.phpt
@@ -50,11 +50,9 @@ catch(FatalException $e)
 }
 
 ?>
-===DONE===
 --EXPECT--
 FailClass::__destruct
 Caught: FailClass
 FatalException::__construct
 FailClass::__destruct
 Caught Exception: FailClass
-===DONE===
diff --git a/tests/classes/destructor_visibility_003.phpt b/tests/classes/destructor_visibility_003.phpt
index c0235cd1e3..2af03d7441 100644
--- a/tests/classes/destructor_visibility_003.phpt
+++ b/tests/classes/destructor_visibility_003.phpt
@@ -20,7 +20,5 @@ $obj = new Derived;
 unset($obj); // Derived::__destruct is being called not Base::__destruct
 
 ?>
-===DONE===
 --EXPECT--
 Derived::__destruct
-===DONE===
diff --git a/tests/classes/interface_doubled.phpt b/tests/classes/interface_doubled.phpt
index 8fbfcba7ff..30ecbf650e 100644
--- a/tests/classes/interface_doubled.phpt
+++ b/tests/classes/interface_doubled.phpt
@@ -152,7 +152,6 @@ echo $t->test('if_d');
 echo $t->test('if_e');
 
 ?>
-===DONE===
 --EXPECT--
 class_a
 is_a(class_a, if_a) yes
@@ -196,4 +195,3 @@ is_a(class_g, if_b) yes
 is_a(class_g, if_c) yes
 is_a(class_g, if_d) yes
 is_a(class_g, if_e) no
-===DONE===
diff --git a/tests/classes/iterators_006.phpt b/tests/classes/iterators_006.phpt
index 7baa077f2b..0a2d7827e0 100644
--- a/tests/classes/iterators_006.phpt
+++ b/tests/classes/iterators_006.phpt
@@ -68,7 +68,6 @@ foreach ($array as $property => $value) {
 }
 
 ?>
-===DONE===
 --EXPECT--
 0: foo
 1: bar
@@ -81,4 +80,3 @@ foreach ($array as $property => $value) {
 0: foo
 1: bar
 2: baz
-===DONE===
diff --git a/tests/classes/iterators_007.phpt b/tests/classes/iterators_007.phpt
index 87b7e5318b..6e76e2d52a 100644
--- a/tests/classes/iterators_007.phpt
+++ b/tests/classes/iterators_007.phpt
@@ -32,7 +32,6 @@ while($t->x < 5)
 	$t->x++;
 }
 ?>
-===DONE===
 --EXPECT--
 Caught in Test::rewind()
 Caught in Test::current()
@@ -40,4 +39,3 @@ Caught in Test::key()
 Current
 Caught in Test::next()
 Caught in Test::valid()
-===DONE===
diff --git a/tests/classes/property_recreate_private.phpt b/tests/classes/property_recreate_private.phpt
index 6d25d71912..35724d4b4d 100644
--- a/tests/classes/property_recreate_private.phpt
+++ b/tests/classes/property_recreate_private.phpt
@@ -49,7 +49,7 @@ $c->unsetPrivate();
 $c->p = 'this will fail';
 var_dump($c);
 ?>
-==Done==
+===DONE===
 --EXPECTF--
 Unset and recreate a superclass's private property:
 object(D)#%d (1) {
diff --git a/tests/classes/serialize_001.phpt b/tests/classes/serialize_001.phpt
index c228e714e9..25a22821e2 100644
--- a/tests/classes/serialize_001.phpt
+++ b/tests/classes/serialize_001.phpt
@@ -45,8 +45,6 @@ foreach($tests as $data)
 }
 
 ?>
-===DONE===
-<?php exit(0); ?>
 --EXPECTF--
 ==========
 string(6) "String"
@@ -76,4 +74,3 @@ bool(false)
 Test::__construct()
 Test::serialize()
 Exception: Test::serialize() must return a string or NULL
-===DONE===
diff --git a/tests/classes/static_properties_003.phpt b/tests/classes/static_properties_003.phpt
index 64641c47c5..30a6e2a510 100644
--- a/tests/classes/static_properties_003.phpt
+++ b/tests/classes/static_properties_003.phpt
@@ -25,7 +25,6 @@ var_dump(isset($c->y));
 //$c->y = 1;		// Fatal error, tested in static_properties_003_error3.phpt
 //$c->y =& $ref;	// Fatal error, tested in static_properties_003_error4.phpt
 ?>
-==Done==
 --EXPECTF--
 --> Access visible static prop like instance prop:
 bool(false)
@@ -46,4 +45,3 @@ string(5) "C::$x"
 
 --> Access non-visible static prop like instance prop:
 bool(false)
-==Done==
diff --git a/tests/classes/static_properties_003_error1.phpt b/tests/classes/static_properties_003_error1.phpt
index 08a89568e4..fdb91b3e0c 100644
--- a/tests/classes/static_properties_003_error1.phpt
+++ b/tests/classes/static_properties_003_error1.phpt
@@ -10,7 +10,7 @@ $c = new C;
 echo "\n--> Access non-visible static prop like instance prop:\n";
 unset($c->y);
 ?>
-==Done==
+===DONE===
 --EXPECTF--
 --> Access non-visible static prop like instance prop:
 
diff --git a/tests/classes/static_properties_003_error2.phpt b/tests/classes/static_properties_003_error2.phpt
index 45ccff11b6..80e9c0d0c9 100644
--- a/tests/classes/static_properties_003_error2.phpt
+++ b/tests/classes/static_properties_003_error2.phpt
@@ -10,7 +10,7 @@ $c = new C;
 echo "\n--> Access non-visible static prop like instance prop:\n";
 echo $c->y;
 ?>
-==Done==
+===DONE===
 --EXPECTF--
 --> Access non-visible static prop like instance prop:
 
diff --git a/tests/classes/static_properties_003_error3.phpt b/tests/classes/static_properties_003_error3.phpt
index e8588a1160..b35307d814 100644
--- a/tests/classes/static_properties_003_error3.phpt
+++ b/tests/classes/static_properties_003_error3.phpt
@@ -10,7 +10,7 @@ $c = new C;
 echo "\n--> Access non-visible static prop like instance prop:\n";
 $c->y = 1;
 ?>
-==Done==
+===DONE===
 --EXPECTF--
 --> Access non-visible static prop like instance prop:
 
diff --git a/tests/classes/static_properties_003_error4.phpt b/tests/classes/static_properties_003_error4.phpt
index a96ffb2977..ab7c316239 100644
--- a/tests/classes/static_properties_003_error4.phpt
+++ b/tests/classes/static_properties_003_error4.phpt
@@ -14,10 +14,8 @@ try {
     echo $e, "\n";
 }
 ?>
-==Done==
 --EXPECTF--
 --> Access non-visible static prop like instance prop:
 Error: Cannot access protected property C::$y in %s:%d
 Stack trace:
 #0 {main}
-==Done==
diff --git a/tests/classes/static_properties_004.phpt b/tests/classes/static_properties_004.phpt
index 42860c3301..956b49885d 100644
--- a/tests/classes/static_properties_004.phpt
+++ b/tests/classes/static_properties_004.phpt
@@ -18,7 +18,6 @@ $ref = 'changed.one';
 D::$p =& $ref;
 var_dump(C::$p, D::$p, E::$p);
 ?>
-==Done==
 --EXPECT--
 Inherited static properties refer to the same value across classes:
 string(8) "original"
@@ -34,4 +33,3 @@ References cannot be used to split the properties:
 string(11) "changed.one"
 string(11) "changed.one"
 string(11) "changed.one"
-==Done==