Merge branch 'PHP-7.4'

* PHP-7.4:
  No more need to cater to pre-PHP-5.3 or PHP-6 versions

5 files changed, 8 insertions, 43 deletions

diff --git a/ext/mysqli/tests/connect.inc b/ext/mysqli/tests/connect.inc
index d795853e1f..91167fa804 100644
--- a/ext/mysqli/tests/connect.inc
+++ b/ext/mysqli/tests/connect.inc
@@ -27,35 +27,6 @@
 				false;
 
 	$IS_MYSQLND = stristr(mysqli_get_client_info(), "mysqlnd");
-	if (!$IS_MYSQLND) {
-		$MYSQLND_VERSION = NULL;
-	} else {
-		/*
-		The formatting of the version reported by mysqli_get_client_info()
-		has changed significantly in the past. To get tests working properly
-		with PHP 5.3.0 and up, we set everything that looks like prior to
-		PHP 5.3.0 to version 5.0.4 = 5 * 10000 + 0 * 100 + 4 = 50004.
-		PHP 5.3.0	reports mysqlnd 5.0.5 dev (= 5 * 10000 + 0 * 100 + 5 = 50005.
-		*/
-		if (preg_match('@Revision:\s+(\d+)\s*\$@ism', mysqli_get_client_info(), $matches)) {
-			/* something prior to PHP 5.3.0 */
-			$MYSQLND_VERSION = 50004;
-		} else if (preg_match('@^mysqlnd (\d+)\.(\d+)\.(\d+).*@ism', mysqli_get_client_info(), $matches)) {
-			/* formatting schema used by PHP 5.3.0 */
-			$MYSQLND_VERSION = (int)$matches[1] * 10000 + (int)$matches[2] * 100 + (int)$matches[3];
-		} else if (preg_match('@^mysqlnd/PHP 6.0.0-dev@ism', mysqli_get_client_info(), $matches)) {
-			/*
-				PHP 6.0 at the time of the first PHP 5.3.0 release.
-				HEAD and 5.3 have been in sync when 5.3.0 was released.
-				It is at least 5.0.5-dev.
-			*/
-			$MYSQLND_VERSION = 50005;
-		} else {
-			/* unknown */
-			$MYSQLND_VERSION = -1;
-		}
-
-	}
 
 	if (!function_exists('sys_get_temp_dir')) {
 		function sys_get_temp_dir() {
diff --git a/ext/mysqli/tests/mysqli_class_mysqli_reflection.phpt b/ext/mysqli/tests/mysqli_class_mysqli_reflection.phpt
index 061d03feac..47beb1d79b 100644
--- a/ext/mysqli/tests/mysqli_class_mysqli_reflection.phpt
+++ b/ext/mysqli/tests/mysqli_class_mysqli_reflection.phpt
@@ -7,14 +7,12 @@ require_once('skipifemb.inc');
 require_once('connect.inc');
 
 /*
-Let's not deal with cross-version issues in the EXPECTF/UEXPECTF.
+Let's not deal with cross-version issues in the EXPECTF section.
 Most of the things which we test are covered by mysqli_class_*_interface.phpt.
 Those tests go into the details and are aimed to be a development tool, no more.
 */
 if (!$IS_MYSQLND)
-	die("skip Test has been written for the latest version of mysqlnd only");
-if ($MYSQLND_VERSION < 50004)
-	die("skip Test requires mysqlnd Revision 5.0.4 or newer");
+	die("skip Test has been written for mysqlnd only");
 
 ?>
 --FILE--
diff --git a/ext/mysqli/tests/mysqli_class_mysqli_result_reflection.phpt b/ext/mysqli/tests/mysqli_class_mysqli_result_reflection.phpt
index 52b984fa15..b3b7759ace 100644
--- a/ext/mysqli/tests/mysqli_class_mysqli_result_reflection.phpt
+++ b/ext/mysqli/tests/mysqli_class_mysqli_result_reflection.phpt
@@ -8,14 +8,12 @@ require_once('skipifconnectfailure.inc');
 require_once('connect.inc');
 
 /*
-Let's not deal with cross-version issues in the EXPECTF/UEXPECTF.
+Let's not deal with cross-version issues in the EXPECTF section.
 Most of the things which we test are covered by mysqli_class_*_interface.phpt.
 Those tests go into the details and are aimed to be a development tool, no more.
 */
 if (!$IS_MYSQLND)
-	die("skip Test has been written for the latest version of mysqlnd only");
-if ($MYSQLND_VERSION < 50004)
-	die("skip Test requires mysqlnd Revision 5.0.4 or newer");
+	die("skip Test has been written for mysqlnd only");
 ?>
 --FILE--
 <?php
diff --git a/ext/mysqli/tests/mysqli_class_mysqli_warning_reflection.phpt b/ext/mysqli/tests/mysqli_class_mysqli_warning_reflection.phpt
index 3344bb479f..f57945e589 100644
--- a/ext/mysqli/tests/mysqli_class_mysqli_warning_reflection.phpt
+++ b/ext/mysqli/tests/mysqli_class_mysqli_warning_reflection.phpt
@@ -7,14 +7,12 @@ require_once('skipifemb.inc');
 require_once('connect.inc');
 
 /*
-Let's not deal with cross-version issues in the EXPECTF/UEXPECTF.
+Let's not deal with cross-version issues in the EXPECTF section.
 Most of the things which we test are covered by mysqli_class_*_interface.phpt.
 Those tests go into the details and are aimed to be a development tool, no more.
 */
 if (!$IS_MYSQLND)
-	die("skip Test has been written for the latest version of mysqlnd only");
-if ($MYSQLND_VERSION < 50004)
-	die("skip Test requires mysqlnd Revision 5.0.4 or newer");
+	die("skip Test has been written for mysqlnd only");
 ?>
 --FILE--
 <?php
diff --git a/ext/mysqli/tests/mysqli_debug_ini.phpt b/ext/mysqli/tests/mysqli_debug_ini.phpt
index de02d0ebd7..f1a37bf882 100644
--- a/ext/mysqli/tests/mysqli_debug_ini.phpt
+++ b/ext/mysqli/tests/mysqli_debug_ini.phpt
@@ -16,8 +16,8 @@ if (defined('MYSQLI_DEBUG_TRACE_ENABLED') && !MYSQLI_DEBUG_TRACE_ENABLED)
 	die("skip: debug functionality not enabled");
 
 require_once('connect.inc');
-if (!$IS_MYSQLND || ($MYSQLND_VERSION < 50004))
-	die("skip needs mysqlnd version/revision 5.0.4");
+if (!$IS_MYSQLND)
+	die("skip needs mysqlnd");
 
 if (!$fp = @fopen('/tmp/mysqli_debug_phpt.trace', 'w'))
 	die("skip PHP cannot create a file in /tmp/mysqli_debug_phpt");