From: Gabriel Caruso <carusogabriel34@gmail.com>
Date: Sat, 3 Feb 2018 15:51:22 +0000 (-0200)
Subject: Remove superfluous PHP version check in tests
X-Git-Tag: php-7.3.0alpha1~479
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9a4cc52c23bfe2c11f29b578c4d5e324e0fe9b0c;p=php

Remove superfluous PHP version check in tests

Also remove tests that target only old PHP versions.
---

diff --git a/ext/date/tests/DateTimeZone_getLocation.phpt b/ext/date/tests/DateTimeZone_getLocation.phpt
index 011f0460f3..06d22820f1 100644
--- a/ext/date/tests/DateTimeZone_getLocation.phpt
+++ b/ext/date/tests/DateTimeZone_getLocation.phpt
@@ -2,12 +2,6 @@
 DateTimeZone::getLocation -- timezone_location_get — Returns location information for a timezone public array DateTimeZone::getLocation ( void ) ;
 --CREDITS--
 marcosptf - <marcosptf@yahoo.com.br> - #phparty7 - @phpsp - novatec/2015 - sao paulo - br
---SKIPIF--
-<?php
-if (phpversion() < "5.3.0") {
-  die('SKIP php version so lower.');
-}
-?>
 --FILE--
 <?php
 $arrayDate = DateTimeZone::listAbbreviations();
@@ -22,7 +16,7 @@ foreach($arrayDate as $value){
 
         if((!in_array($timeZoneArray['country_code'], $countryCode)) && (NULL != $timeZoneArray['country_code']) && ("" != $timeZoneArray['country_code'])) {
             array_push($countryCode, $timeZoneArray['country_code']);
-            
+
             if(in_array($timeZoneArray['country_code'], $countryCodeTest)){
                 print_r($timeZoneArray);
             }
diff --git a/ext/hash/tests/hash_update_stream.phpt b/ext/hash/tests/hash_update_stream.phpt
index b628b9c912..7a74313448 100644
--- a/ext/hash/tests/hash_update_stream.phpt
+++ b/ext/hash/tests/hash_update_stream.phpt
@@ -4,9 +4,6 @@ int hash_update_stream ( resource $context , resource $handle [, int $length = -
 marcosptf - <marcosptf@yahoo.com.br> - @phpsp - sao paulo - br
 --SKIPIF--
 <?php
-if (phpversion() < "5.3.0") {
-    die('SKIP php version so lower.');
-}
 require_once(dirname(__FILE__) . '/skip_mhash.inc'); ?>
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_class_mysqli_driver_reflection.phpt b/ext/mysqli/tests/mysqli_class_mysqli_driver_reflection.phpt
index 2e6d9c2fd1..11c3492817 100644
--- a/ext/mysqli/tests/mysqli_class_mysqli_driver_reflection.phpt
+++ b/ext/mysqli/tests/mysqli_class_mysqli_driver_reflection.phpt
@@ -5,8 +5,6 @@ Interface of the class mysqli_driver - Reflection
 require_once('skipif.inc');
 require_once('skipifemb.inc');
 require_once('connect.inc');
-if (($tmp = substr(PHP_VERSION, 0, strpos(PHP_VERSION, '.'))) && ($tmp < 5))
-	die("skip Reflection not available before PHP 5 (found PHP $tmp)");
 
 /*
 Let's not deal with cross-version issues in the EXPECTF/UEXPECTF.
diff --git a/ext/mysqli/tests/mysqli_class_mysqli_result_reflection.phpt b/ext/mysqli/tests/mysqli_class_mysqli_result_reflection.phpt
index 89be46fb8a..75a8e8cfcb 100644
--- a/ext/mysqli/tests/mysqli_class_mysqli_result_reflection.phpt
+++ b/ext/mysqli/tests/mysqli_class_mysqli_result_reflection.phpt
@@ -7,9 +7,6 @@ require_once('skipifemb.inc');
 require_once('skipifconnectfailure.inc');
 require_once('connect.inc');
 
-if (($tmp = substr(PHP_VERSION, 0, strpos(PHP_VERSION, '.'))) && ($tmp < 5))
-	die("skip Reflection not available before PHP 5 (found PHP $tmp)");
-
 /*
 Let's not deal with cross-version issues in the EXPECTF/UEXPECTF.
 Most of the things which we test are covered by mysqli_class_*_interface.phpt.
diff --git a/ext/mysqli/tests/mysqli_class_mysqli_warning_reflection.phpt b/ext/mysqli/tests/mysqli_class_mysqli_warning_reflection.phpt
index dc0c14e6e8..8ad12737a7 100644
--- a/ext/mysqli/tests/mysqli_class_mysqli_warning_reflection.phpt
+++ b/ext/mysqli/tests/mysqli_class_mysqli_warning_reflection.phpt
@@ -6,9 +6,6 @@ require_once('skipif.inc');
 require_once('skipifemb.inc');
 require_once('connect.inc');
 
-if (($tmp = substr(PHP_VERSION, 0, strpos(PHP_VERSION, '.'))) && ($tmp < 5))
-	die("skip Reflection not available before PHP 5 (found PHP $tmp)");
-
 /*
 Let's not deal with cross-version issues in the EXPECTF/UEXPECTF.
 Most of the things which we test are covered by mysqli_class_*_interface.phpt.
diff --git a/ext/phar/tests/fopen.phpt b/ext/phar/tests/fopen.phpt
index 5b694d6e2d..b55bc59c84 100644
--- a/ext/phar/tests/fopen.phpt
+++ b/ext/phar/tests/fopen.phpt
@@ -2,7 +2,6 @@
 Phar: test fopen() interception
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip");?>
-<?php if (substr(phpversion(), 0, 3) == '5.2') die("skip PHP >= 5.3 required for this test");?>
 --INI--
 phar.require_hash=1
 phar.readonly=0
@@ -40,4 +39,4 @@ include $fname;
 Warning: fopen() expects at least 2 parameters, 0 given in %sfopen.php on line %d
 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===
\ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/fopen5.2.phpt b/ext/phar/tests/fopen5.2.phpt
deleted file mode 100644
index aa064f1662..0000000000
--- a/ext/phar/tests/fopen5.2.phpt
+++ /dev/null
@@ -1,43 +0,0 @@
---TEST--
-Phar: test fopen() interception
---SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip");?>
-<?php if (substr(phpversion(), 0, 3) != '5.2') die("skip PHP 5.2 required for this test");?>
---INI--
-phar.require_hash=1
-phar.readonly=0
---FILE--
-<?php
-Phar::interceptFileFuncs();
-$a = fopen(__FILE__, 'rb'); // this satisfies 1 line of code coverage
-fclose($a);
-$a = fopen(); // this satisfies another line of code coverage
-
-$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php';
-$a = new Phar($fname);
-$a['index.php'] = '<?php
-$a = fopen("dir/file1.txt", "r");
-echo fread($a, 2);
-fclose($a);
-$a = fopen("file1.txt", "r", true);
-echo fread($a, 2);
-fclose($a);
-$a = fopen("notfound.txt", "r", true);
-?>';
-$a['dir/file1.txt'] = 'hi';
-$a['dir/file2.txt'] = 'hi2';
-$a['dir/file3.txt'] = 'hi3';
-$a->setStub('<?php
-set_include_path("phar://" . __FILE__ . "/dir" . PATH_SEPARATOR . "phar://" . __FILE__);
-include "index.php";
-__HALT_COMPILER();');
-include $fname;
-?>
-===DONE===
---CLEAN--
-<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
---EXPECTF--
-Warning: fopen() expects at least 2 parameters, 0 given in %sfopen5.2.php on line %d
-hihi
-Warning: fopen(phar://%sfopen5.2.phar.php/notfound.txt): failed to open stream: phar error: "notfound.txt" is not a file in phar "%sfopen5.2.phar.php" in phar://%sfopen5.2.phar.php/index.php on line %d
-===DONE===
\ No newline at end of file
diff --git a/ext/phar/tests/fopen_edgecases2.phpt b/ext/phar/tests/fopen_edgecases2.phpt
index 4510fbd801..4ac529a4e0 100644
--- a/ext/phar/tests/fopen_edgecases2.phpt
+++ b/ext/phar/tests/fopen_edgecases2.phpt
@@ -2,7 +2,6 @@
 Phar: test edge cases of fopen() function interception #2
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (version_compare(phpversion(), '6.0', '>=')) die('skip parameter parsing changed in 6.0'); ?>
 --INI--
 phar.readonly=0
 --FILE--
diff --git a/ext/phar/tests/stat2.phpt b/ext/phar/tests/stat2.phpt
deleted file mode 100644
index defda719f3..0000000000
--- a/ext/phar/tests/stat2.phpt
+++ /dev/null
@@ -1,61 +0,0 @@
---TEST--
-Phar: test stat function interceptions and is_file/is_link edge cases (PHP 5.2)
---SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip");?>
-<?php if (substr(phpversion(), 0, 3) != '5.2') die("skip PHP 5.2 required for this test");?>
---INI--
-phar.readonly=0
-phar.require_hash=0
---FILE--
-<?php
-Phar::interceptFileFuncs();
-is_file();
-is_link();
-var_dump(is_file(__FILE__));
-
-$fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.tar';
-$fname3 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.tar';
-copy(dirname(__FILE__) . '/tar/files/links.tar', $fname2);
-$a = new PharData($fname2);
-$b = $a->convertToExecutable();
-unset($a);
-Phar::unlinkArchive($fname2);
-$b['foo/stat.php'] = '<?php
-echo "is_link\n";
-var_dump(is_link("./stat.php"),is_file("./stat.php"), is_link("./oops"), is_file("./oops"));
-var_dump(is_link("testit/link"), filetype("testit/link"), filetype("testit"), is_file("testit/link"));
-echo "not found\n";
-var_dump(is_link("notfound"));
-echo "dir\n";
-var_dump(is_dir("./bar"), is_file("foo/bar/blah"));
-?>';
-$b->addEmptyDir('foo/bar/blah');
-$b->setStub('<?php
-include "phar://" . __FILE__ . "/foo/stat.php";
-__HALT_COMPILER();');
-include $fname3;
-?>
-===DONE===
---CLEAN--
-<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?>
-<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.tar'); ?>
---EXPECTF--
-Warning: Wrong parameter count for is_file() in %sstat2.php on line %d
-
-Warning: Wrong parameter count for is_link() in %sstat2.php on line %d
-bool(true)
-is_link
-bool(false)
-bool(true)
-bool(false)
-bool(false)
-bool(true)
-string(4) "link"
-string(3) "dir"
-bool(true)
-not found
-bool(false)
-dir
-bool(true)
-bool(false)
-===DONE===
\ No newline at end of file
diff --git a/ext/phar/tests/stat2_5.3.phpt b/ext/phar/tests/stat2_5.3.phpt
index 6a3f2bf2c8..99f658fa78 100644
--- a/ext/phar/tests/stat2_5.3.phpt
+++ b/ext/phar/tests/stat2_5.3.phpt
@@ -2,7 +2,6 @@
 Phar: test stat function interceptions and is_file/is_link edge cases (PHP 5.3+)
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip");?>
-<?php if (substr(phpversion(), 0, 3) == '5.2') die("skip PHP 5.3+ required for this test");?>
 --INI--
 phar.readonly=0
 phar.require_hash=0
diff --git a/ext/sockets/tests/bug46360.phpt b/ext/sockets/tests/bug46360.phpt
index c725a82f9a..8c15d4c340 100644
--- a/ext/sockets/tests/bug46360.phpt
+++ b/ext/sockets/tests/bug46360.phpt
@@ -3,12 +3,6 @@ Bug 46360 - TCP_NODELAY constant (sock_get_option, sock_set_option)
 --CREDITS--
 Florian Anderiasch
 fa@php.net
---SKIPIF--
-<?php
-    if (version_compare(phpversion(), '5.2.7', '<')) {
-        die('skip old php, not eligible');
-    }
-?>
 --FILE--
 <?php
     var_dump('TCP_NODELAY');
diff --git a/ext/standard/tests/forward_static_call_array.phpt b/ext/standard/tests/forward_static_call_array.phpt
index a135a712fc..fe063824e1 100644
--- a/ext/standard/tests/forward_static_call_array.phpt
+++ b/ext/standard/tests/forward_static_call_array.phpt
@@ -2,12 +2,6 @@
 mixed forward_static_call_array ( callable $function , array $parameters );
 --CREDITS--
 marcosptf - <marcosptf@yahoo.com.br> - @phpsp - sao paulo - br
---SKIPIF--
-<?php
-if (phpversion() < "5.3.0") {
-    die('SKIP php version so lower.');
-}
-?>
 --FILE--
 <?php
 
diff --git a/ext/standard/tests/network/gethostname.phpt b/ext/standard/tests/network/gethostname.phpt
index 5c811b8c6f..e7caaf48eb 100644
--- a/ext/standard/tests/network/gethostname.phpt
+++ b/ext/standard/tests/network/gethostname.phpt
@@ -2,12 +2,6 @@
 string gethostname(void);
 --CREDITS--
 marcosptf - <marcosptf@yahoo.com.br> - #phparty7 - @phpsp - novatec/2015 - sao paulo - br
---SKIPIF--
-<?php
-if (phpversion() < "5.3.0") {
-  die('SKIP php version so lower.');
-}
-?>
 --FILE--
 <?php
 var_dump(gethostname());
diff --git a/ext/standard/tests/streams/stream_get_transports.phpt b/ext/standard/tests/streams/stream_get_transports.phpt
index 0d4e194d64..5a30a23cb4 100644
--- a/ext/standard/tests/streams/stream_get_transports.phpt
+++ b/ext/standard/tests/streams/stream_get_transports.phpt
@@ -2,12 +2,6 @@
 array stream_get_transports ( void );
 --CREDITS--
 marcosptf - <marcosptf@yahoo.com.br> - #phparty7 - @phpsp - novatec/2015 - sao paulo - br
---SKIPIF--
-<?php
-if (phpversion() < "5.3.0") {
-  die('SKIP php version so lower.');
-}
-?>
 --FILE--
 <?php
 print((is_array(stream_get_transports())) ? ("yes") : ("Test 'array stream_get_transports ( void );' has failed"));
diff --git a/ext/standard/tests/streams/stream_get_wrappers.phpt b/ext/standard/tests/streams/stream_get_wrappers.phpt
index 58dfdc930d..c529dc37bf 100644
--- a/ext/standard/tests/streams/stream_get_wrappers.phpt
+++ b/ext/standard/tests/streams/stream_get_wrappers.phpt
@@ -2,12 +2,6 @@
 array stream_get_wrappers ( void );
 --CREDITS--
 marcosptf - <marcosptf@yahoo.com.br> - #phparty7 - @phpsp - novatec/2015 - sao paulo - br
---SKIPIF--
-<?php
-if (phpversion() < "5.3.0") {
-  die('SKIP php version so lower.');
-}
-?>
 --FILE--
 <?php
 print((is_array(stream_get_wrappers())) ? ("yes") : ("Test 'array stream_get_wrappers ( void );' has failed"));
diff --git a/ext/standard/tests/streams/stream_socket_get_name.phpt b/ext/standard/tests/streams/stream_socket_get_name.phpt
index 17bf0b7db4..34c88b9c96 100644
--- a/ext/standard/tests/streams/stream_socket_get_name.phpt
+++ b/ext/standard/tests/streams/stream_socket_get_name.phpt
@@ -2,12 +2,6 @@
 string stream_socket_get_name ( resource $handle , bool $want_peer ) ;
 --CREDITS--
 marcosptf - <marcosptf@yahoo.com.br> - #phparty7 - @phpsp - novatec/2015 - sao paulo - br
---SKIPIF--
-<?php
-if (phpversion() < "5.3.0") {
-  die('SKIP php version so lower.');
-}
-?>
 --FILE--
 <?php
 $serverUri = "tcp://127.0.0.1:31854";
diff --git a/ext/standard/tests/streams/stream_socket_recvfrom.phpt b/ext/standard/tests/streams/stream_socket_recvfrom.phpt
index f4161288ff..08de4e31a9 100644
--- a/ext/standard/tests/streams/stream_socket_recvfrom.phpt
+++ b/ext/standard/tests/streams/stream_socket_recvfrom.phpt
@@ -2,12 +2,6 @@
 string stream_socket_recvfrom ( resource $socket , int $length [, int $flags = 0 [, string &$address ]] );
 --CREDITS--
 marcosptf - <marcosptf@yahoo.com.br> - #phparty7 - @phpsp - novatec/2015 - sao paulo - br
---SKIPIF--
-<?php
-if (phpversion() < "5.3.0") {
-  die('SKIP php version so lower.');
-}
-?>
 --FILE--
 <?php
 $serverUri = "tcp://127.0.0.1:31854";
diff --git a/ext/standard/tests/versioning/phpversion.phpt b/ext/standard/tests/versioning/phpversion.phpt
index ef8c354c36..9cd70c488c 100644
--- a/ext/standard/tests/versioning/phpversion.phpt
+++ b/ext/standard/tests/versioning/phpversion.phpt
@@ -6,7 +6,7 @@ phpversion test
 print phpversion();
 print "\n";
 print phpversion('standard');
-
+?>
 --EXPECTF--
 %s
 %s