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

diff --git a/ext/mysqli/tests/connect.inc b/ext/mysqli/tests/connect.inc
index d795853e1f19bdef6e50ff4c76ba394696765f3e..91167fa8044bf76c7120f058f633eed046e45d4a 100644 (file)
--- 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 061d03feac88a28b7278cd181bb76d1829f7ad52..47beb1d79b3e526f812daaa9064b18e2c14a6b8d 100644 (file)
--- 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 52b984fa1515f975ebae541278b1995a655592a7..b3b7759ace3008c9173f9878bc10381e575aa929 100644 (file)
--- 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 3344bb479f1b71de7d65364e86f2fbdf7f443868..f57945e5895def3a79af4769415045a2bd608495 100644 (file)
--- 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 de02d0ebd7d6224830059ef303b1550854a26a26..f1a37bf8821ffc48bbda0d4eb733bc7724e95dc1 100644 (file)
--- 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");