Skip to content

Commit af4eabd

Browse files
committed
Remove unnecessary requires in mysqli tests
1 parent 2fbec09 commit af4eabd

File tree

92 files changed

+103
-274
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+103
-274
lines changed

ext/mysqli/tests/gracefull_fail_on_empty_result_set.phpt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@ require_once 'skipifconnectfailure.inc';
99
--FILE--
1010
<?php
1111
require_once 'connect.inc';
12-
require 'table.inc';
12+
if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
13+
printf("Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
14+
$host, $user, $db, $port, $socket);
15+
exit(1);
16+
}
1317

1418
// Returns only one result set
1519
$link->multi_query("SELECT 1");
@@ -24,10 +28,6 @@ require_once 'skipifconnectfailure.inc';
2428

2529
$link->close();
2630
?>
27-
--CLEAN--
28-
<?php
29-
require_once 'clean_table.inc';
30-
?>
3131
--EXPECT--
3232
bool(false)
3333
object(mysqli_result)#3 (5) {

ext/mysqli/tests/mysqli_class_mysqli_result_interface.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ require_once 'skipifconnectfailure.inc';
88
?>
99
--FILE--
1010
<?php
11-
require 'connect.inc';
1211
require 'table.inc';
1312

1413
$mysqli = new my_mysqli($host, $user, $passwd, $db, $port, $socket);

ext/mysqli/tests/mysqli_class_mysqli_stmt_interface.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ mysqli
88
?>
99
--FILE--
1010
<?php
11-
require 'connect.inc';
1211
require 'table.inc';
1312

1413
$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);

ext/mysqli/tests/mysqli_data_seek.phpt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ require_once 'skipifconnectfailure.inc';
88
?>
99
--FILE--
1010
<?php
11-
require_once 'connect.inc';
12-
1311
require 'table.inc';
1412
if (!$res = mysqli_query($link, 'SELECT * FROM test ORDER BY id LIMIT 4', MYSQLI_STORE_RESULT))
1513
printf("[004] [%d] %s\n", mysqli_errno($link), mysqli_error($link));

ext/mysqli/tests/mysqli_data_seek_oo.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ require_once 'skipifconnectfailure.inc';
88
?>
99
--FILE--
1010
<?php
11-
require_once 'connect.inc';
1211
require 'table.inc';
1312

1413
if (!$mysqli = new mysqli($host, $user, $passwd, $db, $port, $socket))

ext/mysqli/tests/mysqli_fetch_all.phpt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ require_once 'skipifconnectfailure.inc';
88
?>
99
--FILE--
1010
<?php
11-
require_once 'connect.inc';
12-
1311
require 'table.inc';
1412
if (!$res = mysqli_query($link, "SELECT * FROM test ORDER BY id LIMIT 2")) {
1513
printf("[004] [%d] %s\n", mysqli_errno($link), mysqli_error($link));

ext/mysqli/tests/mysqli_fetch_all_oo.phpt

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,8 @@ require_once 'skipifconnectfailure.inc';
88
?>
99
--FILE--
1010
<?php
11-
require_once 'connect.inc';
12-
13-
$tmp = NULL;
14-
$link = NULL;
15-
16-
$mysqli = new mysqli();
17-
18-
if (!$mysqli = new my_mysqli($host, $user, $passwd, $db, $port, $socket))
19-
printf("[002] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
20-
$host, $user, $db, $port, $socket);
21-
2211
require 'table.inc';
12+
$mysqli = $link;
2313
if (!$res = $mysqli->query("SELECT * FROM test ORDER BY id LIMIT 2")) {
2414
printf("[004] [%d] %s\n", $mysqli->errno, $mysqli->error);
2515
}

ext/mysqli/tests/mysqli_fetch_array.phpt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ require_once 'skipifconnectfailure.inc';
88
?>
99
--FILE--
1010
<?php
11-
require_once 'connect.inc';
12-
1311
require 'table.inc';
1412
if (!$res = mysqli_query($link, "SELECT * FROM test ORDER BY id LIMIT 5")) {
1513
printf("[004] [%d] %s\n", mysqli_errno($link), mysqli_error($link));

ext/mysqli/tests/mysqli_fetch_array_oo.phpt

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,8 @@ require_once 'skipifconnectfailure.inc';
88
?>
99
--FILE--
1010
<?php
11-
require_once 'connect.inc';
12-
13-
$tmp = NULL;
14-
$link = NULL;
15-
1611
require 'table.inc';
17-
if (!$mysqli = new my_mysqli($host, $user, $passwd, $db, $port, $socket))
18-
printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
19-
$host, $user, $db, $port, $socket);
12+
$mysqli = $link;
2013

2114
if (!$res = $mysqli->query("SELECT * FROM test ORDER BY id LIMIT 5")) {
2215
printf("[004] [%d] %s\n", $mysqli->errno, $mysqli->error);

ext/mysqli/tests/mysqli_fetch_assoc.phpt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ require_once 'skipifconnectfailure.inc';
88
?>
99
--FILE--
1010
<?php
11-
require_once 'connect.inc';
12-
1311
// Note: no SQL type tests, internally the same function gets used as for mysqli_fetch_array() which does a lot of SQL type test
1412

1513
require 'table.inc';

0 commit comments

Comments
 (0)