Skip to content

Commit 6fb1c7a

Browse files
kamil-tekielakamil-tekiela
authored
Remove unnecessary skip checks (#13637)
1 parent c412919 commit 6fb1c7a

28 files changed

+97
-175
lines changed

‎ext/mysqli/tests/bug46614.phpt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ mysqli
55
--SKIPIF--
66
<?php
77
require_once 'skipifconnectfailure.inc';
8-
if (!defined("MYSQLI_ASYNC")) {
9-
die("skip mysqlnd only");
10-
}
118
?>
129
--FILE--
1310
<?php

‎ext/mysqli/tests/bug47050.phpt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ mysqli
55
--SKIPIF--
66
<?php
77
require_once 'skipifconnectfailure.inc';
8-
if (!defined("MYSQLI_ASYNC")) {
9-
die("skip mysqlnd only");
10-
}
118
?>
129
--FILE--
1310
<?php

‎ext/mysqli/tests/bug73800.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ mysqli
66
<?php
77
require_once 'skipifconnectfailure.inc';
88
if (PHP_INT_SIZE != 8) die('skip requires 64-bit');
9-
if (!defined('MYSQLI_OPT_INT_AND_FLOAT_NATIVE')) die('skip requires mysqlnd');
109
?>
1110
--FILE--
1211
<?php

‎ext/mysqli/tests/bug77597.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ mysqli
55
--SKIPIF--
66
<?php
77
require_once 'skipifconnectfailure.inc';
8-
if (!defined('MYSQLI_STORE_RESULT_COPY_DATA')) die('skip requires mysqlnd');
98
?>
109
--FILE--
1110
<?php

‎ext/mysqli/tests/bug79375.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ mysqli
66
<?php
77
if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
88
require_once 'skipifconnectfailure.inc';
9-
if (!defined('MYSQLI_STORE_RESULT_COPY_DATA')) die('skip requires mysqlnd');
109
?>
1110
--FILE--
1211
<?php

‎ext/mysqli/tests/bug80837.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ mysqli
55
--SKIPIF--
66
<?php
77
require_once 'skipifconnectfailure.inc';
8-
if (!defined('MYSQLI_STORE_RESULT_COPY_DATA')) die('skip requires mysqlnd');
98
?>
109
--FILE--
1110
<?php

‎ext/mysqli/tests/deprecated_constants.phpt

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,8 @@ echo constant('MYSQLI_NO_DATA')."\n";
99
echo constant('MYSQLI_DATA_TRUNCATED')."\n";
1010
echo constant('MYSQLI_SERVER_QUERY_NO_GOOD_INDEX_USED')."\n";
1111
echo constant('MYSQLI_SERVER_QUERY_NO_INDEX_USED')."\n";
12-
if (stristr(mysqli_get_client_info(), 'mysqlnd')) {
13-
echo constant('MYSQLI_SERVER_QUERY_WAS_SLOW')."\n";
14-
echo constant('MYSQLI_SERVER_PS_OUT_PARAMS')."\n";
15-
} else {
16-
print("\nDeprecated: Constant MYSQLI_SERVER_QUERY_WAS_SLOW is deprecated in dummy\n-1\n");
17-
print("\nDeprecated: Constant MYSQLI_SERVER_PS_OUT_PARAMS is deprecated in dummy\n-1\n");
18-
}
12+
echo constant('MYSQLI_SERVER_QUERY_WAS_SLOW')."\n";
13+
echo constant('MYSQLI_SERVER_PS_OUT_PARAMS')."\n";
1914
echo constant('MYSQLI_IS_MARIADB')."\n";
2015

2116
?>

‎ext/mysqli/tests/mysqli_explain_metadata.phpt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,7 @@ require_once 'skipifconnectfailure.inc';
9595
var_dump($fields);
9696
}
9797

98-
if (function_exists('mysqli_stmt_get_result') &&
99-
$stmt->prepare('EXPLAIN SELECT t1.*, t2.* FROM test AS t1, test AS t2') &&
98+
if ($stmt->prepare('EXPLAIN SELECT t1.*, t2.* FROM test AS t1, test AS t2') &&
10099
$stmt->execute()) {
101100
if (!$res_stmt = mysqli_stmt_get_result($stmt)) {
102101
printf("[017] Cannot fetch result from PS [%d] %s\n",

‎ext/mysqli/tests/mysqli_get_client_stats.phpt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ mysqli
55
--SKIPIF--
66
<?PHP
77
require_once 'skipifconnectfailure.inc';
8-
if (!function_exists('mysqli_get_client_stats')) {
9-
die("skip only available with mysqlnd");
10-
}
118
?>
129
--INI--
1310
mysqlnd.collect_statistics=1

‎ext/mysqli/tests/mysqli_get_client_stats_implicit_free.phpt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ mysqli
55
--SKIPIF--
66
<?PHP
77
require_once 'skipifconnectfailure.inc';
8-
if (!function_exists('mysqli_get_client_stats')) {
9-
die("skip only available with mysqlnd");
10-
}
118
?>
129
--INI--
1310
mysqlnd.collect_statistics=1

‎ext/mysqli/tests/mysqli_get_client_stats_off.phpt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ mysqli
55
--SKIPIF--
66
<?PHP
77
require_once 'skipifconnectfailure.inc';
8-
if (!function_exists('mysqli_get_client_stats')) {
9-
die("skip only available with mysqlnd");
10-
}
118
?>
129
--INI--
1310
mysqlnd.collect_statistics=0

‎ext/mysqli/tests/mysqli_get_client_stats_ps.phpt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ mysqli
55
--SKIPIF--
66
<?PHP
77
require_once 'skipifconnectfailure.inc';
8-
if (!function_exists('mysqli_get_client_stats')) {
9-
die("skip only available with mysqlnd");
10-
}
118
?>
129
--INI--
1310
mysqlnd.collect_statistics=1

‎ext/mysqli/tests/mysqli_get_client_stats_skipped.phpt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ mysqli
88
--SKIPIF--
99
<?PHP
1010
require_once 'skipifconnectfailure.inc';
11-
if (!function_exists('mysqli_get_client_stats')) {
12-
die("skip only available with mysqlnd");
13-
}
1411
?>
1512
--FILE--
1613
<?php

‎ext/mysqli/tests/mysqli_get_connection_stats.phpt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ mysqli
88
--SKIPIF--
99
<?PHP
1010
require_once 'skipifconnectfailure.inc';
11-
if (!function_exists('mysqli_get_connection_stats')) {
12-
die("skip only available with mysqlnd");
13-
}
1411
?>
1512
--FILE--
1613
<?php

‎ext/mysqli/tests/mysqli_get_connection_stats_off.phpt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ mysqli
88
--SKIPIF--
99
<?PHP
1010
require_once 'skipifconnectfailure.inc';
11-
if (!function_exists('mysqli_get_connection_stats')) {
12-
die("skip only available with mysqlnd");
13-
}
1411
?>
1512
--FILE--
1613
<?php

‎ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt

Lines changed: 24 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -63,43 +63,39 @@ if (mysqli_get_server_version($link) <= 50000) {
6363
}
6464

6565

66-
if (function_exists('mysqli_stmt_get_result')) {
67-
68-
if (!mysqli_query($link, 'DROP PROCEDURE IF EXISTS p'))
69-
printf("[019] [%d] %s.\n", mysqli_errno($link), mysqli_error($link));
70-
71-
if (mysqli_real_query($link, 'CREATE PROCEDURE p(OUT ver_param VARCHAR(25)) BEGIN SELECT VERSION() INTO ver_param; END;')) {
72-
// no result set, one output parameter
73-
if (!$stmt = mysqli_prepare($link, 'CALL p(@version)'))
74-
printf("[020] Cannot prepare CALL, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
66+
if (!mysqli_query($link, 'DROP PROCEDURE IF EXISTS p'))
67+
printf("[019] [%d] %s.\n", mysqli_errno($link), mysqli_error($link));
7568

76-
if (!mysqli_stmt_execute($stmt))
77-
printf("[021] Cannot execute CALL, [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
69+
if (mysqli_real_query($link, 'CREATE PROCEDURE p(OUT ver_param VARCHAR(25)) BEGIN SELECT VERSION() INTO ver_param; END;')) {
70+
// no result set, one output parameter
71+
if (!$stmt = mysqli_prepare($link, 'CALL p(@version)'))
72+
printf("[020] Cannot prepare CALL, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
7873

79-
if (!mysqli_stmt_close($stmt))
80-
printf("[022] Cannot close statement, [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
74+
if (!mysqli_stmt_execute($stmt))
75+
printf("[021] Cannot execute CALL, [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
8176

82-
if (!$stmt = mysqli_prepare($link, 'SELECT @version AS _version'))
83-
printf("[023] Cannot prepare SELECT, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
77+
if (!mysqli_stmt_close($stmt))
78+
printf("[022] Cannot close statement, [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
8479

85-
if (!mysqli_stmt_execute($stmt))
86-
printf("[024] Cannot execute SELECT, [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
80+
if (!$stmt = mysqli_prepare($link, 'SELECT @version AS _version'))
81+
printf("[023] Cannot prepare SELECT, [%d] %s\n", mysqli_errno($link), mysqli_error($link));
8782

88-
if (!$res = mysqli_stmt_get_result($stmt))
89-
printf("[025] Cannot get result set, [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
83+
if (!mysqli_stmt_execute($stmt))
84+
printf("[024] Cannot execute SELECT, [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
9085

91-
if ((!($row = mysqli_fetch_assoc($res))) || ($row['_version'] == ""))
92-
printf("[026] Results seem wrong, got %s, [%d] %s\n",
93-
$row['_version'],
94-
mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
86+
if (!$res = mysqli_stmt_get_result($stmt))
87+
printf("[025] Cannot get result set, [%d] %s\n", mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
9588

96-
mysqli_free_result($res);
97-
mysqli_stmt_close($stmt);
89+
if ((!($row = mysqli_fetch_assoc($res))) || ($row['_version'] == ""))
90+
printf("[026] Results seem wrong, got %s, [%d] %s\n",
91+
$row['_version'],
92+
mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
9893

99-
} else {
100-
printf("[027] Cannot create SP, [%d] %s.\n", mysqli_errno($link), mysqli_error($link));
101-
}
94+
mysqli_free_result($res);
95+
mysqli_stmt_close($stmt);
10296

97+
} else {
98+
printf("[027] Cannot create SP, [%d] %s.\n", mysqli_errno($link), mysqli_error($link));
10399
}
104100

105101
if (!mysqli_query($link, 'DROP PROCEDURE IF EXISTS p'))

‎ext/mysqli/tests/mysqli_stmt_get_result.phpt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ mysqli
55
--SKIPIF--
66
<?php
77
require_once 'skipifconnectfailure.inc';
8-
9-
if (!function_exists('mysqli_stmt_get_result'))
10-
die('skip mysqli_stmt_get_result not available');
118
?>
129
--FILE--
1310
<?php

‎ext/mysqli/tests/mysqli_stmt_get_result2.phpt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ mysqli
55
--SKIPIF--
66
<?php
77
require_once 'skipifconnectfailure.inc';
8-
if (!function_exists('mysqli_stmt_get_result'))
9-
die('skip mysqli_stmt_get_result not available');
108
?>
119
--FILE--
1210
<?php

‎ext/mysqli/tests/mysqli_stmt_get_result_bit.phpt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@ Fetching BIT column values using the PS API
44
mysqli
55
--SKIPIF--
66
<?php
7-
if (!function_exists('mysqli_stmt_get_result')) {
8-
die("skip mysqli_stmt_get_result() not available");
9-
}
10-
117
require_once 'connect.inc';
128
if (!$link = @my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
139
die(sprintf("skip Can't connect to MySQL Server - [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));

‎ext/mysqli/tests/mysqli_stmt_get_result_field_count.phpt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ mysqli
55
--SKIPIF--
66
<?php
77
require_once 'skipifconnectfailure.inc';
8-
9-
if (!function_exists('mysqli_stmt_get_result'))
10-
die('skip mysqli_stmt_get_result not available');
118
?>
129
--FILE--
1310
<?php

‎ext/mysqli/tests/mysqli_stmt_get_result_geom.phpt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ mysqli
66
<?php
77
require_once 'skipifconnectfailure.inc';
88

9-
if (!function_exists('mysqli_stmt_get_result'))
10-
die("skip mysqli_stmt_get_result() not available");
11-
129
if (!defined("MYSQLI_TYPE_GEOMETRY"))
1310
die("skip MYSQLI_TYPE_GEOMETRY not defined");
1411
?>

‎ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ mysqli
55
--SKIPIF--
66
<?php
77
require_once 'skipifconnectfailure.inc';
8-
9-
if (!function_exists('mysqli_stmt_get_result'))
10-
die('skip mysqli_stmt_get_result not available');
118
?>
129
--FILE--
1310
<?php

‎ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ mysqli
55
--SKIPIF--
66
<?php
77
require_once 'skipifconnectfailure.inc';
8-
9-
if (!function_exists('mysqli_stmt_get_result'))
10-
die('skip mysqli_stmt_get_result not available');
118
?>
129
--FILE--
1310
<?php

‎ext/mysqli/tests/mysqli_stmt_get_result_non_select.phpt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ mysqli
55
--SKIPIF--
66
<?php
77
require_once 'skipifconnectfailure.inc';
8-
9-
if (!function_exists('mysqli_stmt_get_result'))
10-
die('skip mysqli_stmt_get_result not available');
118
?>
129
--FILE--
1310
<?php

‎ext/mysqli/tests/mysqli_stmt_get_result_seek.phpt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ mysqli
55
--SKIPIF--
66
<?php
77
require_once 'skipifconnectfailure.inc';
8-
9-
if (!function_exists('mysqli_stmt_get_result'))
10-
die('skip mysqli_stmt_get_result not available');
118
?>
129
--FILE--
1310
<?php

‎ext/mysqli/tests/mysqli_stmt_get_result_types.phpt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ mysqli
55
--SKIPIF--
66
<?php
77
require_once 'skipifconnectfailure.inc';
8-
9-
if (!function_exists('mysqli_stmt_get_result'))
10-
die("skip mysqli_stmt_get_result() not available");
118
?>
129
--FILE--
1310
<?php

0 commit comments

Comments
 (0)