archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 13:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Remove unnecessary skip checks (#13637)

Browse source
This commit is contained in:
Kamil Tekiela 2024-03-08 16:59:51 +01:00 • committed by GitHub
parent c412919c93
commit 6fb1c7a742
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
28 changed files with 97 additions and 175 deletions
Download patch file Download diff file Expand all files Collapse all files

3
ext/mysqli/tests/bug46614.phpt
View file

@ -5,9 +5,6 @@ mysqli
--SKIPIF--
<?php
require_once 'skipifconnectfailure.inc';
if (!defined("MYSQLI_ASYNC")) {
die("skip mysqlnd only");
}
?>
--FILE--
<?php

3
ext/mysqli/tests/bug47050.phpt
View file

@ -5,9 +5,6 @@ mysqli
--SKIPIF--
<?php
require_once 'skipifconnectfailure.inc';
if (!defined("MYSQLI_ASYNC")) {
die("skip mysqlnd only");
}
?>
--FILE--
<?php

1
ext/mysqli/tests/bug73800.phpt
View file

@ -6,7 +6,6 @@ mysqli
<?php
require_once 'skipifconnectfailure.inc';
if (PHP_INT_SIZE != 8) die('skip requires 64-bit');
if (!defined('MYSQLI_OPT_INT_AND_FLOAT_NATIVE')) die('skip requires mysqlnd');
?>
--FILE--
<?php

1
ext/mysqli/tests/bug77597.phpt
View file

@ -5,7 +5,6 @@ mysqli
--SKIPIF--
<?php
require_once 'skipifconnectfailure.inc';
if (!defined('MYSQLI_STORE_RESULT_COPY_DATA')) die('skip requires mysqlnd');
?>
--FILE--
<?php

1
ext/mysqli/tests/bug79375.phpt
View file

@ -6,7 +6,6 @@ mysqli
<?php
if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
require_once 'skipifconnectfailure.inc';
if (!defined('MYSQLI_STORE_RESULT_COPY_DATA')) die('skip requires mysqlnd');
?>
--FILE--
<?php

1
ext/mysqli/tests/bug80837.phpt
View file

@ -5,7 +5,6 @@ mysqli
--SKIPIF--
<?php
require_once 'skipifconnectfailure.inc';
if (!defined('MYSQLI_STORE_RESULT_COPY_DATA')) die('skip requires mysqlnd');
?>
--FILE--
<?php

9
ext/mysqli/tests/deprecated_constants.phpt
View file

@ -9,13 +9,8 @@ echo constant('MYSQLI_NO_DATA')."\n";
echo constant('MYSQLI_DATA_TRUNCATED')."\n";
echo constant('MYSQLI_SERVER_QUERY_NO_GOOD_INDEX_USED')."\n";
echo constant('MYSQLI_SERVER_QUERY_NO_INDEX_USED')."\n";
if (stristr(mysqli_get_client_info(), 'mysqlnd')) {
echo constant('MYSQLI_SERVER_QUERY_WAS_SLOW')."\n";
echo constant('MYSQLI_SERVER_PS_OUT_PARAMS')."\n";
} else {
print("\nDeprecated: Constant MYSQLI_SERVER_QUERY_WAS_SLOW is deprecated in dummy\n-1\n");
print("\nDeprecated: Constant MYSQLI_SERVER_PS_OUT_PARAMS is deprecated in dummy\n-1\n");
}
echo constant('MYSQLI_SERVER_QUERY_WAS_SLOW')."\n";
echo constant('MYSQLI_SERVER_PS_OUT_PARAMS')."\n";
echo constant('MYSQLI_IS_MARIADB')."\n";
?>

3
ext/mysqli/tests/mysqli_explain_metadata.phpt
View file

@ -95,8 +95,7 @@ require_once 'skipifconnectfailure.inc';
var_dump($fields);
}
if (function_exists('mysqli_stmt_get_result') &&
$stmt->prepare('EXPLAIN SELECT t1.*, t2.* FROM test AS t1, test AS t2') &&
if ($stmt->prepare('EXPLAIN SELECT t1.*, t2.* FROM test AS t1, test AS t2') &&
$stmt->execute()) {
if (!$res_stmt = mysqli_stmt_get_result($stmt)) {
printf("[017] Cannot fetch result from PS [%d] %s\n",

3
ext/mysqli/tests/mysqli_get_client_stats.phpt
View file

@ -5,9 +5,6 @@ mysqli
--SKIPIF--
<?PHP
require_once 'skipifconnectfailure.inc';
if (!function_exists('mysqli_get_client_stats')) {
die("skip only available with mysqlnd");
}
?>
--INI--
mysqlnd.collect_statistics=1

3
ext/mysqli/tests/mysqli_get_client_stats_implicit_free.phpt
View file

@ -5,9 +5,6 @@ mysqli
--SKIPIF--
<?PHP
require_once 'skipifconnectfailure.inc';
if (!function_exists('mysqli_get_client_stats')) {
die("skip only available with mysqlnd");
}
?>
--INI--
mysqlnd.collect_statistics=1

3
ext/mysqli/tests/mysqli_get_client_stats_off.phpt
View file

@ -5,9 +5,6 @@ mysqli
--SKIPIF--
<?PHP
require_once 'skipifconnectfailure.inc';
if (!function_exists('mysqli_get_client_stats')) {
die("skip only available with mysqlnd");
}
?>
--INI--
mysqlnd.collect_statistics=0

3
ext/mysqli/tests/mysqli_get_client_stats_ps.phpt
View file

@ -5,9 +5,6 @@ mysqli
--SKIPIF--
<?PHP
require_once 'skipifconnectfailure.inc';
if (!function_exists('mysqli_get_client_stats')) {
die("skip only available with mysqlnd");
}
?>
--INI--
mysqlnd.collect_statistics=1

3
ext/mysqli/tests/mysqli_get_client_stats_skipped.phpt
View file

@ -8,9 +8,6 @@ mysqli
--SKIPIF--
<?PHP
require_once 'skipifconnectfailure.inc';
if (!function_exists('mysqli_get_client_stats')) {
die("skip only available with mysqlnd");
}
?>
--FILE--
<?php

3
ext/mysqli/tests/mysqli_get_connection_stats.phpt
View file

@ -8,9 +8,6 @@ mysqli
--SKIPIF--
<?PHP
require_once 'skipifconnectfailure.inc';
if (!function_exists('mysqli_get_connection_stats')) {
die("skip only available with mysqlnd");
}
?>
--FILE--
<?php

3
ext/mysqli/tests/mysqli_get_connection_stats_off.phpt
View file

@ -8,9 +8,6 @@ mysqli
--SKIPIF--
<?PHP
require_once 'skipifconnectfailure.inc';
if (!function_exists('mysqli_get_connection_stats')) {
die("skip only available with mysqlnd");
}
?>
--FILE--
<?php

52
ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt
View file

@ -63,43 +63,39 @@ if (mysqli_get_server_version($link) <= 50000) {
}
if (function_exists('mysqli_stmt_get_result')) {
if (!mysqli_query($link, 'DROP PROCEDURE IF EXISTS p'))
printf("[019] [%d] %s.\n", mysqli_errno($link), mysqli_error($link));
if (!mysqli_query($link, 'DROP PROCEDURE IF EXISTS p'))
printf("[019] [%d] %s.\n", mysqli_errno($link), mysqli_error($link));
if (mysqli_real_query($link, 'CREATE PROCEDURE p(OUT ver_param VARCHAR(25)) BEGIN SELECT VERSION() INTO ver_param; END;')) {
// no result set, one output parameter
if (!$stmt = mysqli_prepare($link, 'CALL p(@version)'))
printf("[020] Cannot prepare CALL, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
if (mysqli_real_query($link, 'CREATE PROCEDURE p(OUT ver_param VARCHAR(25)) BEGIN SELECT VERSION() INTO ver_param; END;')) {
// no result set, one output parameter
if (!$stmt = mysqli_prepare($link, 'CALL p(@version)'))
printf("[020] Cannot prepare CALL, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
if (!mysqli_stmt_execute($stmt))
printf("[021] Cannot execute CALL, [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
if (!mysqli_stmt_execute($stmt))
printf("[021] Cannot execute CALL, [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
if (!mysqli_stmt_close($stmt))
printf("[022] Cannot close statement, [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
if (!mysqli_stmt_close($stmt))
printf("[022] Cannot close statement, [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
if (!$stmt = mysqli_prepare($link, 'SELECT @version AS _version'))
printf("[023] Cannot prepare SELECT, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
if (!$stmt = mysqli_prepare($link, 'SELECT @version AS _version'))
printf("[023] Cannot prepare SELECT, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
if (!mysqli_stmt_execute($stmt))
printf("[024] Cannot execute SELECT, [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
if (!mysqli_stmt_execute($stmt))
printf("[024] Cannot execute SELECT, [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
if (!$res = mysqli_stmt_get_result($stmt))
printf("[025] Cannot get result set, [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
if (!$res = mysqli_stmt_get_result($stmt))
printf("[025] Cannot get result set, [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
if ((!($row = mysqli_fetch_assoc($res))) || ($row['_version'] == ""))
printf("[026] Results seem wrong, got %s, [%d] %s\n",
$row['_version'],
mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
if ((!($row = mysqli_fetch_assoc($res))) || ($row['_version'] == ""))
printf("[026] Results seem wrong, got %s, [%d] %s\n",
$row['_version'],
mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
mysqli_free_result($res);
mysqli_stmt_close($stmt);
} else {
printf("[027] Cannot create SP, [%d] %s.\n", mysqli_errno($link), mysqli_error($link));
}
mysqli_free_result($res);
mysqli_stmt_close($stmt);
} else {
printf("[027] Cannot create SP, [%d] %s.\n", mysqli_errno($link), mysqli_error($link));
}
if (!mysqli_query($link, 'DROP PROCEDURE IF EXISTS p'))

3
ext/mysqli/tests/mysqli_stmt_get_result.phpt
View file

@ -5,9 +5,6 @@ mysqli
--SKIPIF--
<?php
require_once 'skipifconnectfailure.inc';
if (!function_exists('mysqli_stmt_get_result'))
die('skip mysqli_stmt_get_result not available');
?>
--FILE--
<?php

2
ext/mysqli/tests/mysqli_stmt_get_result2.phpt
View file

@ -5,8 +5,6 @@ mysqli
--SKIPIF--
<?php
require_once 'skipifconnectfailure.inc';
if (!function_exists('mysqli_stmt_get_result'))
die('skip mysqli_stmt_get_result not available');
?>
--FILE--
<?php

4
ext/mysqli/tests/mysqli_stmt_get_result_bit.phpt
View file

@ -4,10 +4,6 @@ Fetching BIT column values using the PS API
mysqli
--SKIPIF--
<?php
if (!function_exists('mysqli_stmt_get_result')) {
die("skip mysqli_stmt_get_result() not available");
}
require_once 'connect.inc';
if (!$link = @my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
die(sprintf("skip Can't connect to MySQL Server - [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));

3
ext/mysqli/tests/mysqli_stmt_get_result_field_count.phpt
View file

@ -5,9 +5,6 @@ mysqli
--SKIPIF--
<?php
require_once 'skipifconnectfailure.inc';
if (!function_exists('mysqli_stmt_get_result'))
die('skip mysqli_stmt_get_result not available');
?>
--FILE--
<?php

3
ext/mysqli/tests/mysqli_stmt_get_result_geom.phpt
View file

@ -6,9 +6,6 @@ mysqli
<?php
require_once 'skipifconnectfailure.inc';
if (!function_exists('mysqli_stmt_get_result'))
die("skip mysqli_stmt_get_result() not available");
if (!defined("MYSQLI_TYPE_GEOMETRY"))
die("skip MYSQLI_TYPE_GEOMETRY not defined");
?>

3
ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt
View file

@ -5,9 +5,6 @@ mysqli
--SKIPIF--
<?php
require_once 'skipifconnectfailure.inc';
if (!function_exists('mysqli_stmt_get_result'))
die('skip mysqli_stmt_get_result not available');
?>
--FILE--
<?php

3
ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt
View file

@ -5,9 +5,6 @@ mysqli
--SKIPIF--
<?php
require_once 'skipifconnectfailure.inc';
if (!function_exists('mysqli_stmt_get_result'))
die('skip mysqli_stmt_get_result not available');
?>
--FILE--
<?php

3
ext/mysqli/tests/mysqli_stmt_get_result_non_select.phpt
View file

@ -5,9 +5,6 @@ mysqli
--SKIPIF--
<?php
require_once 'skipifconnectfailure.inc';
if (!function_exists('mysqli_stmt_get_result'))
die('skip mysqli_stmt_get_result not available');
?>
--FILE--
<?php

3
ext/mysqli/tests/mysqli_stmt_get_result_seek.phpt
View file

@ -5,9 +5,6 @@ mysqli
--SKIPIF--
<?php
require_once 'skipifconnectfailure.inc';
if (!function_exists('mysqli_stmt_get_result'))
die('skip mysqli_stmt_get_result not available');
?>
--FILE--
<?php

3
ext/mysqli/tests/mysqli_stmt_get_result_types.phpt
View file

@ -5,9 +5,6 @@ mysqli
--SKIPIF--
<?php
require_once 'skipifconnectfailure.inc';
if (!function_exists('mysqli_stmt_get_result'))
die("skip mysqli_stmt_get_result() not available");
?>
--FILE--
<?php

144
ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt
View file

@ -83,86 +83,82 @@ die("skip Check again when the Klingons visit earth - http://bugs.mysql.com/bug.
}
}
if (function_exists('mysqli_stmt_get_result')) {
/* mysqlnd only */
if (!mysqli_stmt_execute($stmt)) {
printf("[%04d - %s] [%d] %s\n",
$offset + 6, $sql,
mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
return false;
}
if (!mysqli_stmt_execute($stmt)) {
printf("[%04d - %s] [%d] %s\n",
$offset + 6, $sql,
mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
return false;
}
$res = mysqli_stmt_get_result($stmt);
if (false === $res && !empty($expected_mysqlnd)) {
printf("[%04d - %s] Expecting resultset [%d] %s\n",
$offset + 7, $sql,
mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
return false;
} else if (empty($expected_mysqlnd) && false !== $res) {
printf("[%04d - %s] Unexpected resultset [%d] %s\n",
$offset + 8, $sql,
mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
return false;
}
$res = mysqli_stmt_get_result($stmt);
if (false === $res && !empty($expected_mysqlnd)) {
printf("[%04d - %s] Expecting resultset [%d] %s\n",
$offset + 7, $sql,
mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
return false;
} else if (empty($expected_mysqlnd) && false !== $res) {
printf("[%04d - %s] Unexpected resultset [%d] %s\n",
$offset + 8, $sql,
mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
return false;
}
if (!is_object($res)) {
printf("[%04d - %s] [%d] %s\n",
$offset + 9, $sql,
mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
return false;
}
if ('mysqli_result' != get_class($res)) {
printf("[%04d - %s] Expecting object/mysqli_result got object/%s\n",
$offset + 10, $sql,
get_class($res));
return false;
}
if (!is_object($res)) {
printf("[%04d - %s] [%d] %s\n",
$offset + 9, $sql,
mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
return false;
}
if ('mysqli_result' != get_class($res)) {
printf("[%04d - %s] Expecting object/mysqli_result got object/%s\n",
$offset + 10, $sql,
get_class($res));
return false;
}
$meta_res = array(
'num_fields' => mysqli_num_fields($res),
'fetch_field' => mysqli_fetch_field($res),
'fetch_field_direct0' => mysqli_fetch_field_direct($res, 0),
'fetch_field_direct1' => @mysqli_fetch_field_direct($res, 1),
'fetch_fields' => count(mysqli_fetch_fields($res)),
'field_count' => mysqli_field_count($link),
'field_seek-1' => @mysqli_field_seek($res, -1),
'field_seek0' => mysqli_field_seek($res, 0),
'field_tell' => mysqli_field_tell($res),
);
if (is_object($meta_res['fetch_field'])) {
$meta_res['fetch_field']->charsetnr = 'ignore';
$meta_res['fetch_field']->flags = 'ignore';
}
if (is_object($meta_res['fetch_field_direct0'])) {
$meta_res['fetch_field_direct0']->charsetnr = 'ignore';
$meta_res['fetch_field_direct0']->flags = 'ignore';
}
if (is_object($meta_res['fetch_field_direct1'])) {
$meta_res['fetch_field_direct1']->charsetnr = 'ignore';
$meta_res['fetch_field_direct1']->flags = 'ignore';
}
mysqli_free_result($res);
if ($check_mysqlnd && $meta_res != $expected_mysqlnd) {
printf("[%04d - %s] Metadata differs from expected\n",
$offset + 11, $sql);
$meta_res = array(
'num_fields' => mysqli_num_fields($res),
'fetch_field' => mysqli_fetch_field($res),
'fetch_field_direct0' => mysqli_fetch_field_direct($res, 0),
'fetch_field_direct1' => @mysqli_fetch_field_direct($res, 1),
'fetch_fields' => count(mysqli_fetch_fields($res)),
'field_count' => mysqli_field_count($link),
'field_seek-1' => @mysqli_field_seek($res, -1),
'field_seek0' => mysqli_field_seek($res, 0),
'field_tell' => mysqli_field_tell($res),
);
if (is_object($meta_res['fetch_field'])) {
$meta_res['fetch_field']->charsetnr = 'ignore';
$meta_res['fetch_field']->flags = 'ignore';
}
if (is_object($meta_res['fetch_field_direct0'])) {
$meta_res['fetch_field_direct0']->charsetnr = 'ignore';
$meta_res['fetch_field_direct0']->flags = 'ignore';
}
if (is_object($meta_res['fetch_field_direct1'])) {
$meta_res['fetch_field_direct1']->charsetnr = 'ignore';
$meta_res['fetch_field_direct1']->flags = 'ignore';
}
mysqli_free_result($res);
if ($check_mysqlnd && $meta_res != $expected_mysqlnd) {
printf("[%04d - %s] Metadata differs from expected\n",
$offset + 11, $sql);
var_dump($meta_res);
var_dump($expected_mysqlnd);
} else {
if ($meta_res['field_count'] < 1) {
printf("[%04d - %s] Metadata seems wrong, no fields?\n",
$offset + 12, $sql);
var_dump($meta_res);
var_dump($expected_mysqlnd);
} else {
if ($meta_res['field_count'] < 1) {
printf("[%04d - %s] Metadata seems wrong, no fields?\n",
$offset + 12, $sql);
var_dump($meta_res);
var_dump(mysqli_fetch_assoc($res));
}
}
if ($compare && $meta_res != $meta) {
printf("[%04d - %s] Metadata returned by mysqli_stmt_result_metadata() and mysqli_stmt_get_result() differ\n",
$offset + 13, $sql);
var_dump($meta_res);
var_dump($meta);
var_dump(mysqli_fetch_assoc($res));
}
}
if ($compare && $meta_res != $meta) {
printf("[%04d - %s] Metadata returned by mysqli_stmt_result_metadata() and mysqli_stmt_get_result() differ\n",
$offset + 13, $sql);
var_dump($meta_res);
var_dump($meta);
}
mysqli_stmt_close($stmt);

3
ext/mysqli/tests/mysqli_store_result_buffered_c.phpt
View file

@ -5,9 +5,6 @@ mysqli
--SKIPIF--
<?php
require_once 'skipifconnectfailure.inc';
if (!defined('MYSQLI_STORE_RESULT_COPY_DATA')) {
die("skip Requires MYSQLI_STORE_RESULT_COPY_DATA");
}
?>
--FILE--
<?php