Cleanup some tests - remove unnecessary sections

Also unify credits - all are under --CREDITS-- now.

35 files changed, 26 insertions, 46 deletions

diff --git a/ext/curl/tests/curl_copy_handle_variation2.phpt b/ext/curl/tests/curl_copy_handle_variation2.phpt
index 924bf6a470..01e6af9e8c 100644
--- a/ext/curl/tests/curl_copy_handle_variation2.phpt
+++ b/ext/curl/tests/curl_copy_handle_variation2.phpt
@@ -7,7 +7,7 @@ Francesco Fullone ff@ideato.it
 <?php 
 	if (!extension_loaded("curl")) exit("skip curl extension not loaded");
 ?>
---COMMENT--
+--DESCRIPTION--
 the only way to test if a option is setten on a curl handle is using the curl_getinfo() function.
 but this can only check on a limited amount of options...
 --FILE--
diff --git a/ext/exif/tests/exif007.phpt b/ext/exif/tests/exif007.phpt
index 8e82fe5ab1..0e37ad0a18 100644
--- a/ext/exif/tests/exif007.phpt
+++ b/ext/exif/tests/exif007.phpt
@@ -35,5 +35,5 @@ array(7) {
     int(1)
   }
 }
---CREDIT--
+--CREDITS--
 Eric Stewart <ericleestewart@gmail.com>
diff --git a/ext/exif/tests/exif008.phpt b/ext/exif/tests/exif008.phpt
index 01da06e01f..1936739b18 100644
--- a/ext/exif/tests/exif008.phpt
+++ b/ext/exif/tests/exif008.phpt
@@ -61,5 +61,5 @@ array(16) {
   ["Copyright"]=>
   string(12) "Eric Stewart"
 }
---CREDIT--
+--CREDITS--
 Eric Stewart <ericleestewart@gmail.com>
diff --git a/ext/exif/tests/exif009.phpt b/ext/exif/tests/exif009.phpt
index e2025e4f87..1ce3658136 100644
--- a/ext/exif/tests/exif009.phpt
+++ b/ext/exif/tests/exif009.phpt
@@ -61,5 +61,5 @@ array(16) {
   ["Copyright"]=>
   string(12) "Eric Stewart"
 }
---CREDIT--
+--CREDITS--
 Eric Stewart <ericleestewart@gmail.com>
diff --git a/ext/exif/tests/exif010.phpt b/ext/exif/tests/exif010.phpt
index 45a2617b83..1e69610eb6 100644
--- a/ext/exif/tests/exif010.phpt
+++ b/ext/exif/tests/exif010.phpt
@@ -87,5 +87,5 @@ array(28) {
   ["ExifImageLength"]=>
   int(1)
 }
---CREDIT--
+--CREDITS--
 Eric Stewart <ericleestewart@gmail.com>
diff --git a/ext/exif/tests/exif011.phpt b/ext/exif/tests/exif011.phpt
index adaf24640b..0dac68842b 100644
--- a/ext/exif/tests/exif011.phpt
+++ b/ext/exif/tests/exif011.phpt
@@ -87,5 +87,5 @@ array(28) {
   ["ExifImageLength"]=>
   int(1)
 }
---CREDIT--
+--CREDITS--
 Eric Stewart <ericleestewart@gmail.com>
diff --git a/ext/exif/tests/exif012.phpt b/ext/exif/tests/exif012.phpt
index 8e8b01aef7..177bab8f43 100644
--- a/ext/exif/tests/exif012.phpt
+++ b/ext/exif/tests/exif012.phpt
diff --git a/ext/exif/tests/exif013.phpt b/ext/exif/tests/exif013.phpt
index 88dc881752..e1f67aa3b3 100644
--- a/ext/exif/tests/exif013.phpt
+++ b/ext/exif/tests/exif013.phpt
diff --git a/ext/exif/tests/exif014.phpt b/ext/exif/tests/exif014.phpt
index 4a4df12d9a..716a7bab1d 100644
--- a/ext/exif/tests/exif014.phpt
+++ b/ext/exif/tests/exif014.phpt
diff --git a/ext/exif/tests/exif015.phpt b/ext/exif/tests/exif015.phpt
index c38ef4ee95..f5b38cb657 100644
--- a/ext/exif/tests/exif015.phpt
+++ b/ext/exif/tests/exif015.phpt
diff --git a/ext/exif/tests/exif016.phpt b/ext/exif/tests/exif016.phpt
index 266801bf0f..cd5ab2d6be 100644
--- a/ext/exif/tests/exif016.phpt
+++ b/ext/exif/tests/exif016.phpt
@@ -1618,5 +1618,5 @@ array(26) {
   ["Copyright"]=>
   string(12) "Eric Stewart"
 }
---CREDIT--
+--CREDITS--
 Eric Stewart <ericleestewart@gmail.com>
diff --git a/ext/exif/tests/exif017.phpt b/ext/exif/tests/exif017.phpt
index 36c3965ee0..3f1e1b7a59 100644
--- a/ext/exif/tests/exif017.phpt
+++ b/ext/exif/tests/exif017.phpt
@@ -1618,5 +1618,5 @@ array(26) {
   ["Copyright"]=>
   string(12) "Eric Stewart"
 }
---CREDIT--
+--CREDITS--
 Eric Stewart <ericleestewart@gmail.com>
diff --git a/ext/exif/tests/exif018.phpt b/ext/exif/tests/exif018.phpt
index a4ca53cb9b..516f409c04 100644
--- a/ext/exif/tests/exif018.phpt
+++ b/ext/exif/tests/exif018.phpt
@@ -1642,5 +1642,5 @@ array(37) {
   ["ExifImageLength"]=>
   int(1)
 }
---CREDIT--
+--CREDITS--
 Eric Stewart <ericleestewart@gmail.com>
diff --git a/ext/exif/tests/exif020.phpt b/ext/exif/tests/exif020.phpt
index c6bb13c325..1e5e216582 100644
--- a/ext/exif/tests/exif020.phpt
+++ b/ext/exif/tests/exif020.phpt
@@ -1655,5 +1655,5 @@ array(34) {
     string(4) "53/1"
   }
 }
---CREDIT--
+--CREDITS--
 Eric Stewart <ericleestewart@gmail.com>
diff --git a/ext/exif/tests/exif021.phpt b/ext/exif/tests/exif021.phpt
index 2cf446b00c..e8dd93c04f 100644
--- a/ext/exif/tests/exif021.phpt
+++ b/ext/exif/tests/exif021.phpt
@@ -1655,5 +1655,5 @@ array(34) {
     string(4) "53/1"
   }
 }
---CREDIT--
+--CREDITS--
 Eric Stewart <ericleestewart@gmail.com>
diff --git a/ext/exif/tests/exif022.phpt b/ext/exif/tests/exif022.phpt
index f523d88bc1..6fffe50ddd 100644
--- a/ext/exif/tests/exif022.phpt
+++ b/ext/exif/tests/exif022.phpt
@@ -1679,5 +1679,5 @@ array(45) {
     string(4) "53/1"
   }
 }
---CREDIT--
+--CREDITS--
 Eric Stewart <ericleestewart@gmail.com>
diff --git a/ext/exif/tests/exif023.phpt b/ext/exif/tests/exif023.phpt
index 5940d97144..3c6803fc4c 100644
--- a/ext/exif/tests/exif023.phpt
+++ b/ext/exif/tests/exif023.phpt
@@ -1679,5 +1679,5 @@ array(45) {
     string(4) "53/1"
   }
 }
---CREDIT--
+--CREDITS--
 Eric Stewart <ericleestewart@gmail.com>
diff --git a/ext/exif/tests/exif024.phpt b/ext/exif/tests/exif024.phpt
index 4839d1cb3f..a1ee94b487 100644
--- a/ext/exif/tests/exif024.phpt
+++ b/ext/exif/tests/exif024.phpt
@@ -51,5 +51,5 @@ array(14) {
   ["RelatedImageHeight"]=>
   int(1)
 }
---CREDIT--
+--CREDITS--
 Eric Stewart <ericleestewart@gmail.com>
diff --git a/ext/exif/tests/exif025.phpt b/ext/exif/tests/exif025.phpt
index 683dc7e3eb..b224c91546 100644
--- a/ext/exif/tests/exif025.phpt
+++ b/ext/exif/tests/exif025.phpt
@@ -51,5 +51,5 @@ array(14) {
   ["RelatedImageHeight"]=>
   int(1)
 }
---CREDIT--
+--CREDITS--
 Eric Stewart <ericleestewart@gmail.com>
diff --git a/ext/exif/tests/exif026.phpt b/ext/exif/tests/exif026.phpt
index 7de796801d..c0a8bc60ab 100644
--- a/ext/exif/tests/exif026.phpt
+++ b/ext/exif/tests/exif026.phpt
@@ -1628,5 +1628,5 @@ array(31) {
   ["RelatedImageHeight"]=>
   int(1)
 }
---CREDIT--
+--CREDITS--
 Eric Stewart <ericleestewart@gmail.com>
diff --git a/ext/exif/tests/exif027.phpt b/ext/exif/tests/exif027.phpt
index f527c37bf1..58c94ccef3 100644
--- a/ext/exif/tests/exif027.phpt
+++ b/ext/exif/tests/exif027.phpt
@@ -1628,5 +1628,5 @@ array(31) {
   ["RelatedImageHeight"]=>
   int(1)
 }
---CREDIT--
+--CREDITS--
 Eric Stewart <ericleestewart@gmail.com>
diff --git a/ext/gettext/tests/gettext_bindtextdomain-cwd.phpt b/ext/gettext/tests/gettext_bindtextdomain-cwd.phpt
index 375e5fba4c..eac7ff3fc7 100644
--- a/ext/gettext/tests/gettext_bindtextdomain-cwd.phpt
+++ b/ext/gettext/tests/gettext_bindtextdomain-cwd.phpt
@@ -22,6 +22,6 @@ var_dump(gettext('Basic test'));
 --EXPECTF--
 string(10) "Basic test"
 string(12) "A basic test"
---CREDIT--
+--CREDITS--
 Moritz Neuhaeuser, info@xcompile.net
 PHP Testfest Berlin 2009-05-09
diff --git a/ext/mbstring/tests/bug20087.phpt b/ext/mbstring/tests/bug20087.phpt
index ea6ce1a37d..842c1092b8 100644
--- a/ext/mbstring/tests/bug20087.phpt
+++ b/ext/mbstring/tests/bug20087.phpt
@@ -2,8 +2,6 @@
 Bug #20087 (Assertion failure)
 --SKIPIF--
 <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
---FAIL--
-register_globals calls killed the ability for mb_parse_str() to register into the global scope
 --FILE--
 <?php
 ini_set('include_path', dirname(__FILE__));
diff --git a/ext/mbstring/tests/mb_parse_str.phpt b/ext/mbstring/tests/mb_parse_str.phpt
index 94f6a9f0a0..8580ac52c5 100644
--- a/ext/mbstring/tests/mb_parse_str.phpt
+++ b/ext/mbstring/tests/mb_parse_str.phpt
@@ -2,8 +2,6 @@
 mb_parse_str()
 --SKIPIF--
 <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
---FAIL--
-register_globals calls killed the ability for mb_parse_str() to register into the global scope
 --INI--
 arg_separator.input=&
 --FILE--
diff --git a/ext/mbstring/tests/mb_parse_str02.phpt b/ext/mbstring/tests/mb_parse_str02.phpt
index d89137de07..e1871bf596 100644
--- a/ext/mbstring/tests/mb_parse_str02.phpt
+++ b/ext/mbstring/tests/mb_parse_str02.phpt
@@ -2,8 +2,6 @@
 mb_parse_str() test 2
 --SKIPIF--
 <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
---FAIL--
-register_globals calls killed the ability for mb_parse_str() to register into the global scope
 --INI--
 arg_separator.input=&#
 --FILE--
diff --git a/ext/standard/tests/math/rand_inverted_order.phpt b/ext/standard/tests/math/rand_inverted_order.phpt
index ac904b21ed..4c2fc96b54 100644
--- a/ext/standard/tests/math/rand_inverted_order.phpt
+++ b/ext/standard/tests/math/rand_inverted_order.phpt
@@ -1,6 +1,6 @@
 --TEST--
 Test rand funtion when min and max are in proper or inverted order
---CREDIT--
+--CREDITS--
 PHP TestFEst 2017 - PHPDublin, PHPSP - Joao P V Martins <jp.joao@gmail.com>
 --FILE--
 <?php
diff --git a/ext/standard/tests/setrawcookie_basic_001.phpt b/ext/standard/tests/setrawcookie_basic_001.phpt
index 4a6fcc8d9b..0cf36b635a 100644
--- a/ext/standard/tests/setrawcookie_basic_001.phpt
+++ b/ext/standard/tests/setrawcookie_basic_001.phpt
@@ -1,6 +1,6 @@
 --TEST--
 Test setrawcookie basic functionality
---CREDIT--
+--CREDITS--
 PHP TestFEst 2017 - PHPDublin, PHPSP - Joao P V Martins <jp.joao@gmail.com>
 --FILE--
 <?php
diff --git a/ext/standard/tests/setrawcookie_basic_002.phpt b/ext/standard/tests/setrawcookie_basic_002.phpt
index fc98c8dcf4..5f12465cc7 100644
--- a/ext/standard/tests/setrawcookie_basic_002.phpt
+++ b/ext/standard/tests/setrawcookie_basic_002.phpt
@@ -1,6 +1,6 @@
 --TEST--
 Test setrawcookie to fail when output exists before
---CREDIT--
+--CREDITS--
 PHP TestFEst 2017 - PHPDublin, PHPSP - Joao P V Martins <jp.joao@gmail.com>
 --FILE--
 <?php
diff --git a/ext/standard/tests/strings/strnatcmp_leftalign.phpt b/ext/standard/tests/strings/strnatcmp_leftalign.phpt
index 31eed642ac..70d469dfa2 100644
--- a/ext/standard/tests/strings/strnatcmp_leftalign.phpt
+++ b/ext/standard/tests/strings/strnatcmp_leftalign.phpt
@@ -1,6 +1,6 @@
 --TEST--
 Test strnatcmp() function : left align, whitespace, digits
---CREDIT--
+--CREDITS--
 Sol Richardson <sr5732358@hotmail.com>
 --FILE--
 <?php
diff --git a/ext/zip/tests/oo_extract.phpt b/ext/zip/tests/oo_extract.phpt
index 7ca39eeab8..1e4d6b25f6 100644
--- a/ext/zip/tests/oo_extract.phpt
+++ b/ext/zip/tests/oo_extract.phpt
@@ -80,16 +80,3 @@ bar
 bar
 
 foo
---UEXPECTF--
-blabla laber rababer sülz
-
-bar
-
-foo
-
-
-bar
-
-bar
-
-foo
diff --git a/ext/zip/tests/pecl12414.phpt b/ext/zip/tests/pecl12414.phpt
index 61546386ab..fed9bf9d6b 100644
--- a/ext/zip/tests/pecl12414.phpt
+++ b/ext/zip/tests/pecl12414.phpt
@@ -33,6 +33,5 @@ if ($res === TRUE) {
 }
 
 ?>
---DONE--
 --EXPECTF--
 zip_readfile could not read from %specl12414.zip : MYLOGOV2.GFX
diff --git a/ext/zlib/tests/zlib_get_coding_type_basic.phpt b/ext/zlib/tests/zlib_get_coding_type_basic.phpt
index e60a97f2d9..48fa745745 100644
--- a/ext/zlib/tests/zlib_get_coding_type_basic.phpt
+++ b/ext/zlib/tests/zlib_get_coding_type_basic.phpt
@@ -1,6 +1,6 @@
 --TEST--
 zlib_get_coding_type() basic call without env
---CREDIT--
+--CREDITS--
 PHP TestFest 2017 - Bergfreunde, Florian Engelhardt <florian.engelhardt@bergfreunde.de>
 --SKIPIF--
 <?php if (!extension_loaded("zlib")) print "skip"; ?>
diff --git a/ext/zlib/tests/zlib_get_coding_type_br.phpt b/ext/zlib/tests/zlib_get_coding_type_br.phpt
index dca6ad7571..2c4d46ddd7 100644
--- a/ext/zlib/tests/zlib_get_coding_type_br.phpt
+++ b/ext/zlib/tests/zlib_get_coding_type_br.phpt
@@ -1,6 +1,6 @@
 --TEST--
 zlib_get_coding_type() with unsupported encoding
---CREDIT--
+--CREDITS--
 PHP TestFest 2017 - Bergfreunde, Florian Engelhardt <florian.engelhardt@bergfreunde.de>
 --SKIPIF--
 <?php if (!extension_loaded("zlib")) print "skip"; ?>
diff --git a/ext/zlib/tests/zlib_get_coding_type_deflate.phpt b/ext/zlib/tests/zlib_get_coding_type_deflate.phpt
index bca85e9cb9..f6f999b978 100644
--- a/ext/zlib/tests/zlib_get_coding_type_deflate.phpt
+++ b/ext/zlib/tests/zlib_get_coding_type_deflate.phpt
@@ -1,6 +1,6 @@
 --TEST--
 zlib_get_coding_type() with deflate encoding
---CREDIT--
+--CREDITS--
 PHP TestFest 2017 - Bergfreunde, Florian Engelhardt <florian.engelhardt@bergfreunde.de>
 --SKIPIF--
 <?php if (!extension_loaded("zlib")) print "skip"; ?>
diff --git a/ext/zlib/tests/zlib_get_coding_type_gzip.phpt b/ext/zlib/tests/zlib_get_coding_type_gzip.phpt
index e3d26e5e71..b5afb0c02a 100644
--- a/ext/zlib/tests/zlib_get_coding_type_gzip.phpt
+++ b/ext/zlib/tests/zlib_get_coding_type_gzip.phpt
@@ -1,6 +1,6 @@
 --TEST--
 zlib_get_coding_type() with gzip encoding
---CREDIT--
+--CREDITS--
 PHP TestFest 2017 - Bergfreunde, Florian Engelhardt <florian.engelhardt@bergfreunde.de>
 --SKIPIF--
 <?php if (!extension_loaded("zlib")) print "skip"; ?>