mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-28 20:34:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.4'

Browse Source 
* PHP-7.4:
  No more need to cater to pre-PHP-5.3 or PHP-6 versions
This commit is contained in:
Christoph M. Becker 2019-07-12 18:56:09 +02:00
commit 5929f6fccb
5 changed files with 8 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ext/mysqli/tests/connect.inc
View File

@ -27,35 +27,6 @@
false; false;
$IS_MYSQLND = stristr(mysqli_get_client_info(), "mysqlnd"); $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')) { if (!function_exists('sys_get_temp_dir')) {
function sys_get_temp_dir() { function sys_get_temp_dir() {

6
ext/mysqli/tests/mysqli_class_mysqli_reflection.phpt
View File

@ -7,14 +7,12 @@ require_once('skipifemb.inc');
require_once('connect.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. 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. Those tests go into the details and are aimed to be a development tool, no more.
*/ */
if (!$IS_MYSQLND) if (!$IS_MYSQLND)
die("skip Test has been written for the latest version of mysqlnd only"); die("skip Test has been written for mysqlnd only");
if ($MYSQLND_VERSION < 50004)
die("skip Test requires mysqlnd Revision 5.0.4 or newer");
?> ?>
--FILE-- --FILE--

6
ext/mysqli/tests/mysqli_class_mysqli_result_reflection.phpt
View File

@ -8,14 +8,12 @@ require_once('skipifconnectfailure.inc');
require_once('connect.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. 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. Those tests go into the details and are aimed to be a development tool, no more.
*/ */
if (!$IS_MYSQLND) if (!$IS_MYSQLND)
die("skip Test has been written for the latest version of mysqlnd only"); die("skip Test has been written for mysqlnd only");
if ($MYSQLND_VERSION < 50004)
die("skip Test requires mysqlnd Revision 5.0.4 or newer");
?> ?>
--FILE-- --FILE--
<?php <?php

6
ext/mysqli/tests/mysqli_class_mysqli_warning_reflection.phpt
View File

@ -7,14 +7,12 @@ require_once('skipifemb.inc');
require_once('connect.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. 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. Those tests go into the details and are aimed to be a development tool, no more.
*/ */
if (!$IS_MYSQLND) if (!$IS_MYSQLND)
die("skip Test has been written for the latest version of mysqlnd only"); die("skip Test has been written for mysqlnd only");
if ($MYSQLND_VERSION < 50004)
die("skip Test requires mysqlnd Revision 5.0.4 or newer");
?> ?>
--FILE-- --FILE--
<?php <?php

4
ext/mysqli/tests/mysqli_debug_ini.phpt
View File

@ -16,8 +16,8 @@ if (defined('MYSQLI_DEBUG_TRACE_ENABLED') && !MYSQLI_DEBUG_TRACE_ENABLED)
die("skip: debug functionality not enabled"); die("skip: debug functionality not enabled");
require_once('connect.inc'); require_once('connect.inc');
if (!$IS_MYSQLND || ($MYSQLND_VERSION < 50004)) if (!$IS_MYSQLND)
die("skip needs mysqlnd version/revision 5.0.4"); die("skip needs mysqlnd");
if (!$fp = @fopen('/tmp/mysqli_debug_phpt.trace', 'w')) if (!$fp = @fopen('/tmp/mysqli_debug_phpt.trace', 'w'))
die("skip PHP cannot create a file in /tmp/mysqli_debug_phpt"); die("skip PHP cannot create a file in /tmp/mysqli_debug_phpt");