diff options
| author | Ulf Wendel <uw@php.net> | 2009-10-19 20:07:25 +0000 |
|---|---|---|
| committer | Ulf Wendel <uw@php.net> | 2009-10-19 20:07:25 +0000 |
| commit | 210353caee6118c3d9872309dad705aa505bd4a4 (patch) | |
| tree | cef2725120a558ab518c7acdc6539a3181dde4d1 /ext | |
| parent | 6450f43efb6561a45aad7ac2c12079617674d060 (diff) | |
| download | php-git-210353caee6118c3d9872309dad705aa505bd4a4.tar.gz | |
Using require[_once] instead of include. Adding logic to connect.inc to detect multiple inclusions of connect.inc which leads to a Fatal error because of my_mysqli_connect() function redefinition. Some tests did include connect.inc twice -> run-tests - even the one from trunk - did not detect Fatal error in SKIPIF -> false-positive test result...
Diffstat (limited to 'ext')
258 files changed, 367 insertions, 395 deletions
diff --git a/ext/mysqli/tests/001.phpt b/ext/mysqli/tests/001.phpt index 4e19d81090..ed09b2eecb 100644 --- a/ext/mysqli/tests/001.phpt +++ b/ext/mysqli/tests/001.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $test = ""; diff --git a/ext/mysqli/tests/002.phpt b/ext/mysqli/tests/002.phpt index 6bbdecfdcc..c18310871e 100644 --- a/ext/mysqli/tests/002.phpt +++ b/ext/mysqli/tests/002.phpt @@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); /*** test mysqli_connect 127.0.0.1 ***/ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) @@ -48,7 +48,7 @@ require_once('skipifconnectfailure.inc'); ?> --CLEAN-- <?php -include "connect.inc"; +require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/003.phpt b/ext/mysqli/tests/003.phpt index e22fec143e..9094c86a76 100644 --- a/ext/mysqli/tests/003.phpt +++ b/ext/mysqli/tests/003.phpt @@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); @@ -74,7 +74,7 @@ require_once('skipifconnectfailure.inc'); ?> --CLEAN-- <?php -include "connect.inc"; +require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/004.phpt b/ext/mysqli/tests/004.phpt index 1eae99df70..184eceaa89 100644 --- a/ext/mysqli/tests/004.phpt +++ b/ext/mysqli/tests/004.phpt @@ -49,7 +49,7 @@ require_once('skipifconnectfailure.inc'); ?> --CLEAN-- <?php -include "connect.inc"; +require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/005.phpt b/ext/mysqli/tests/005.phpt index 728f45e06c..0d59f40b7e 100644 --- a/ext/mysqli/tests/005.phpt +++ b/ext/mysqli/tests/005.phpt @@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); /*** test mysqli_connect 127.0.0.1 ***/ $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); @@ -42,7 +42,7 @@ require_once('skipifconnectfailure.inc'); ?> --CLEAN-- <?php -include "connect.inc"; +require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/006.phpt b/ext/mysqli/tests/006.phpt index a10e22c44c..497426598c 100644 --- a/ext/mysqli/tests/006.phpt +++ b/ext/mysqli/tests/006.phpt @@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); /*** test mysqli_connect 127.0.0.1 ***/ $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); @@ -47,7 +47,7 @@ require_once('skipifconnectfailure.inc'); ?> --CLEAN-- <?php -include "connect.inc"; +require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/007.phpt b/ext/mysqli/tests/007.phpt index fe266bf1b2..05a8ae5baf 100644 --- a/ext/mysqli/tests/007.phpt +++ b/ext/mysqli/tests/007.phpt @@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); /*** test mysqli_connect 127.0.0.1 ***/ $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); @@ -47,7 +47,7 @@ require_once('skipifconnectfailure.inc'); ?> --CLEAN-- <?php -include "connect.inc"; +require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/008.phpt b/ext/mysqli/tests/008.phpt index 685110f08e..ba0e340891 100644 --- a/ext/mysqli/tests/008.phpt +++ b/ext/mysqli/tests/008.phpt @@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); /*** test mysqli_connect 127.0.0.1 ***/ $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); @@ -47,7 +47,7 @@ require_once('skipifconnectfailure.inc'); ?> --CLEAN-- <?php -include "connect.inc"; +require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/009.phpt b/ext/mysqli/tests/009.phpt index 0584a14cfd..3e26f518ad 100644 --- a/ext/mysqli/tests/009.phpt +++ b/ext/mysqli/tests/009.phpt @@ -11,7 +11,7 @@ mysqli fetch bigint values (ok to fail with 4.1.x) ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); /*** test mysqli_connect 127.0.0.1 ***/ $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); @@ -80,7 +80,7 @@ mysqli fetch bigint values (ok to fail with 4.1.x) ?> --CLEAN-- <?php -include "connect.inc"; +require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/010.phpt b/ext/mysqli/tests/010.phpt index de22c08241..fab0c57889 100644 --- a/ext/mysqli/tests/010.phpt +++ b/ext/mysqli/tests/010.phpt @@ -9,7 +9,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); /*** test mysqli_connect 127.0.0.1 ***/ $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); @@ -50,7 +50,7 @@ require_once('skipifconnectfailure.inc'); ?> --CLEAN-- <?php -include "connect.inc"; +require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/011.phpt b/ext/mysqli/tests/011.phpt index 4c4ff77069..83f35e5869 100644 --- a/ext/mysqli/tests/011.phpt +++ b/ext/mysqli/tests/011.phpt @@ -9,7 +9,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); /*** test mysqli_connect 127.0.0.1 ***/ $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); @@ -47,7 +47,7 @@ require_once('skipifconnectfailure.inc'); ?> --CLEAN-- <?php -include "connect.inc"; +require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/012.phpt b/ext/mysqli/tests/012.phpt index 2ce8104005..da4a48ab51 100644 --- a/ext/mysqli/tests/012.phpt +++ b/ext/mysqli/tests/012.phpt @@ -9,7 +9,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); /*** test mysqli_connect 127.0.0.1 ***/ $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); @@ -46,7 +46,7 @@ require_once('skipifconnectfailure.inc'); ?> --CLEAN-- <?php -include "connect.inc"; +require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/013.phpt b/ext/mysqli/tests/013.phpt index 8c123d1ab4..5ddb49632a 100644 --- a/ext/mysqli/tests/013.phpt +++ b/ext/mysqli/tests/013.phpt @@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); /*** test mysqli_connect 127.0.0.1 ***/ $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); @@ -58,7 +58,7 @@ require_once('skipifconnectfailure.inc'); ?> --CLEAN-- <?php -include "connect.inc"; +require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/014.phpt b/ext/mysqli/tests/014.phpt index cd7fa19c72..8fb8cceef6 100644 --- a/ext/mysqli/tests/014.phpt +++ b/ext/mysqli/tests/014.phpt @@ -4,7 +4,7 @@ mysqli autocommit/commit/rollback <?php require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); - include "connect.inc"; + require_once("connect.inc"); $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); if (!$result = mysqli_query($link, "SHOW VARIABLES LIKE 'have_innodb'")) { die("skip Cannot check for required InnoDB suppot"); @@ -21,7 +21,7 @@ mysqli autocommit/commit/rollback ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); if (!mysqli_autocommit($link, TRUE)) diff --git a/ext/mysqli/tests/015.phpt b/ext/mysqli/tests/015.phpt index b3af0142ae..f42129f872 100644 --- a/ext/mysqli/tests/015.phpt +++ b/ext/mysqli/tests/015.phpt @@ -4,7 +4,7 @@ mysqli autocommit/commit/rollback with innodb <?php require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); - include "connect.inc"; + require_once("connect.inc"); $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); $result = mysqli_query($link, "SHOW VARIABLES LIKE 'have_innodb'"); $row = mysqli_fetch_row($result); @@ -17,7 +17,7 @@ mysqli autocommit/commit/rollback with innodb ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); if (!$link) diff --git a/ext/mysqli/tests/016.phpt b/ext/mysqli/tests/016.phpt index c8046de9a1..ce1ea83062 100644 --- a/ext/mysqli/tests/016.phpt +++ b/ext/mysqli/tests/016.phpt @@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); /*** test mysqli_connect 127.0.0.1 ***/ $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); diff --git a/ext/mysqli/tests/017.phpt b/ext/mysqli/tests/017.phpt index 7220b4ef09..a48ae5c9d6 100644 --- a/ext/mysqli/tests/017.phpt +++ b/ext/mysqli/tests/017.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); /*** test mysqli_connect 127.0.0.1 ***/ $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); diff --git a/ext/mysqli/tests/018.phpt b/ext/mysqli/tests/018.phpt index 1a8d762088..87476442d2 100644 --- a/ext/mysqli/tests/018.phpt +++ b/ext/mysqli/tests/018.phpt @@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); /*** test mysqli_connect 127.0.0.1 ***/ $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); diff --git a/ext/mysqli/tests/019.phpt b/ext/mysqli/tests/019.phpt index f3741a5d32..51cf973324 100644 --- a/ext/mysqli/tests/019.phpt +++ b/ext/mysqli/tests/019.phpt @@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); /*** test mysqli_connect 127.0.0.1 ***/ $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); @@ -57,7 +57,7 @@ require_once('skipifconnectfailure.inc'); ?> --CLEAN-- <?php -include "connect.inc"; +require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/020.phpt b/ext/mysqli/tests/020.phpt index f313a616a1..6e867d7a0f 100644 --- a/ext/mysqli/tests/020.phpt +++ b/ext/mysqli/tests/020.phpt @@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); /*** test mysqli_connect 127.0.0.1 ***/ $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); @@ -69,7 +69,7 @@ require_once('skipifconnectfailure.inc'); ?> --CLEAN-- <?php -include "connect.inc"; +require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/021.phpt b/ext/mysqli/tests/021.phpt index 3843566ea2..5dec86c90b 100644 --- a/ext/mysqli/tests/021.phpt +++ b/ext/mysqli/tests/021.phpt @@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); /*** test mysqli_connect 127.0.0.1 ***/ $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); @@ -40,7 +40,7 @@ require_once('skipifconnectfailure.inc'); ?> --CLEAN-- <?php -include "connect.inc"; +require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/022.phpt b/ext/mysqli/tests/022.phpt index 5c448b9c1e..8e1f0170a5 100644 --- a/ext/mysqli/tests/022.phpt +++ b/ext/mysqli/tests/022.phpt @@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); /*** test mysqli_connect 127.0.0.1 ***/ $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); @@ -45,7 +45,7 @@ require_once('skipifconnectfailure.inc'); ?> --CLEAN-- <?php -include "connect.inc"; +require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/023.phpt b/ext/mysqli/tests/023.phpt index d3d4762a6c..97c7812567 100644 --- a/ext/mysqli/tests/023.phpt +++ b/ext/mysqli/tests/023.phpt @@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); /*** test mysqli_connect 127.0.0.1 ***/ $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); @@ -54,7 +54,7 @@ require_once('skipifconnectfailure.inc'); ?> --CLEAN-- <?php -include "connect.inc"; +require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/024.phpt b/ext/mysqli/tests/024.phpt index 7dd5408537..2cb93be965 100644 --- a/ext/mysqli/tests/024.phpt +++ b/ext/mysqli/tests/024.phpt @@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); /*** test mysqli_connect 127.0.0.1 ***/ $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); @@ -54,7 +54,7 @@ require_once('skipifconnectfailure.inc'); ?> --CLEAN-- <?php -include "connect.inc"; +require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/025.phpt b/ext/mysqli/tests/025.phpt index 9c076dfaeb..84a9f67a19 100644 --- a/ext/mysqli/tests/025.phpt +++ b/ext/mysqli/tests/025.phpt @@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); /*** test mysqli_connect 127.0.0.1 ***/ $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); @@ -59,7 +59,7 @@ require_once('skipifconnectfailure.inc'); ?> --CLEAN-- <?php -include "connect.inc"; +require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/026.phpt b/ext/mysqli/tests/026.phpt index 57fe33e006..ec4baa262d 100644 --- a/ext/mysqli/tests/026.phpt +++ b/ext/mysqli/tests/026.phpt @@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); /*** test mysqli_connect 127.0.0.1 ***/ $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); @@ -46,7 +46,7 @@ require_once('skipifconnectfailure.inc'); ?> --CLEAN-- <?php -include "connect.inc"; +require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/027.phpt b/ext/mysqli/tests/027.phpt index 0926b70e27..69233d683e 100644 --- a/ext/mysqli/tests/027.phpt +++ b/ext/mysqli/tests/027.phpt @@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); /*** test mysqli_connect 127.0.0.1 ***/ $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); diff --git a/ext/mysqli/tests/028.phpt b/ext/mysqli/tests/028.phpt index 6c4425e2b4..af453dde01 100644 --- a/ext/mysqli/tests/028.phpt +++ b/ext/mysqli/tests/028.phpt @@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); /*** test mysqli_connect 127.0.0.1 ***/ $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); diff --git a/ext/mysqli/tests/029.phpt b/ext/mysqli/tests/029.phpt index bfc54bcc61..936420649d 100644 --- a/ext/mysqli/tests/029.phpt +++ b/ext/mysqli/tests/029.phpt @@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); /*** test mysqli_connect 127.0.0.1 ***/ $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); @@ -28,7 +28,7 @@ require_once('skipifconnectfailure.inc'); ?> --CLEAN-- <?php -include "connect.inc"; +require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/030.phpt b/ext/mysqli/tests/030.phpt index 656946fb62..c4b1710439 100644 --- a/ext/mysqli/tests/030.phpt +++ b/ext/mysqli/tests/030.phpt @@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); /*** test mysqli_connect 127.0.0.1 ***/ $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); diff --git a/ext/mysqli/tests/031.phpt b/ext/mysqli/tests/031.phpt index 9f632cb42a..9b8c720d3e 100644 --- a/ext/mysqli/tests/031.phpt +++ b/ext/mysqli/tests/031.phpt @@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); /*** test mysqli_connect 127.0.0.1 ***/ $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); diff --git a/ext/mysqli/tests/032.phpt b/ext/mysqli/tests/032.phpt index 386883d0e8..5fcd5484d2 100644 --- a/ext/mysqli/tests/032.phpt +++ b/ext/mysqli/tests/032.phpt @@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); /*** test mysqli_connect 127.0.0.1 ***/ $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); @@ -28,7 +28,7 @@ require_once('skipifconnectfailure.inc'); ?> --CLEAN-- <?php -include "connect.inc"; +require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/033.phpt b/ext/mysqli/tests/033.phpt index ade0bb8329..b499bd71a6 100644 --- a/ext/mysqli/tests/033.phpt +++ b/ext/mysqli/tests/033.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); /*** test mysqli_connect 127.0.0.1 ***/ $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); diff --git a/ext/mysqli/tests/034.phpt b/ext/mysqli/tests/034.phpt index cc415344c2..3fda560080 100644 --- a/ext/mysqli/tests/034.phpt +++ b/ext/mysqli/tests/034.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); /*** test mysqli_connect 127.0.0.1 ***/ $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); diff --git a/ext/mysqli/tests/035.phpt b/ext/mysqli/tests/035.phpt index 7b621aa222..7b18e027b8 100644 --- a/ext/mysqli/tests/035.phpt +++ b/ext/mysqli/tests/035.phpt @@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); /*** test mysqli_connect 127.0.0.1 ***/ $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); diff --git a/ext/mysqli/tests/036.phpt b/ext/mysqli/tests/036.phpt index 4e68b6c2a1..b0d259c3f4 100644 --- a/ext/mysqli/tests/036.phpt +++ b/ext/mysqli/tests/036.phpt @@ -11,7 +11,7 @@ function test: mysqli_insert_id() ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); /*** test mysqli_connect 127.0.0.1 ***/ $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); @@ -44,7 +44,7 @@ function test: mysqli_insert_id() ?> --CLEAN-- <?php -include "connect.inc"; +require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/037.phpt b/ext/mysqli/tests/037.phpt index 856bdc6982..03d5d5562c 100644 --- a/ext/mysqli/tests/037.phpt +++ b/ext/mysqli/tests/037.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); /*** test mysqli_connect 127.0.0.1 ***/ $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); @@ -34,7 +34,7 @@ require_once('skipifconnectfailure.inc'); ?> --CLEAN-- <?php -include "connect.inc"; +require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/038.phpt b/ext/mysqli/tests/038.phpt index 7be16f4493..45b724ca3c 100644 --- a/ext/mysqli/tests/038.phpt +++ b/ext/mysqli/tests/038.phpt @@ -7,8 +7,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - - include "connect.inc"; + require_once("connect.inc"); /*** test mysqli_connect 127.0.0.1 ***/ $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); @@ -35,7 +34,7 @@ require_once('skipifconnectfailure.inc'); ?> --CLEAN-- <?php -include "connect.inc"; +require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/039.phpt b/ext/mysqli/tests/039.phpt index 9ed7ef9ea1..ae881e1d2d 100644 --- a/ext/mysqli/tests/039.phpt +++ b/ext/mysqli/tests/039.phpt @@ -7,8 +7,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - - include "connect.inc"; + require_once("connect.inc"); /*** test mysqli_connect 127.0.0.1 ***/ $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); diff --git a/ext/mysqli/tests/040.phpt b/ext/mysqli/tests/040.phpt index 6b115166bd..3e28883550 100644 --- a/ext/mysqli/tests/040.phpt +++ b/ext/mysqli/tests/040.phpt @@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); /*** test mysqli_connect 127.0.0.1 ***/ $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); @@ -33,7 +33,7 @@ require_once('skipifconnectfailure.inc'); ?> --CLEAN-- <?php -include "connect.inc"; +require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/041.phpt b/ext/mysqli/tests/041.phpt index aac91f86a2..ec67e476ca 100644 --- a/ext/mysqli/tests/041.phpt +++ b/ext/mysqli/tests/041.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); /*** test mysqli_connect 127.0.0.1 ***/ $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); @@ -24,7 +24,7 @@ require_once('skipifconnectfailure.inc'); ?> --CLEAN-- <?php -include "connect.inc"; +require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/042.phpt b/ext/mysqli/tests/042.phpt index 9d79f148cb..55da0cd827 100644 --- a/ext/mysqli/tests/042.phpt +++ b/ext/mysqli/tests/042.phpt @@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); /*** test mysqli_connect 127.0.0.1 ***/ $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); @@ -50,7 +50,7 @@ require_once('skipifconnectfailure.inc'); ?> --CLEAN-- <?php -include "connect.inc"; +require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/043.phpt b/ext/mysqli/tests/043.phpt index 51b2a91ff6..5d060b9bbb 100644 --- a/ext/mysqli/tests/043.phpt +++ b/ext/mysqli/tests/043.phpt @@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); /*** test mysqli_connect 127.0.0.1 ***/ $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); @@ -42,7 +42,7 @@ require_once('skipifconnectfailure.inc'); ?> --CLEAN-- <?php -include "connect.inc"; +require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/044.phpt b/ext/mysqli/tests/044.phpt index 9d227f49e5..3ddae3e420 100644 --- a/ext/mysqli/tests/044.phpt +++ b/ext/mysqli/tests/044.phpt @@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); /*** test mysqli_connect 127.0.0.1 ***/ $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); diff --git a/ext/mysqli/tests/045.phpt b/ext/mysqli/tests/045.phpt index d5ee5ad2bc..0b1706002e 100644 --- a/ext/mysqli/tests/045.phpt +++ b/ext/mysqli/tests/045.phpt @@ -6,7 +6,7 @@ mysqli_bind_result (SHOW) require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); - include "connect.inc"; + require_once("connect.inc"); $link = my_mysqli_connect($host, $user, $passwd); $stmt = mysqli_prepare($link, "SHOW VARIABLES LIKE 'port'"); @@ -20,7 +20,7 @@ mysqli_bind_result (SHOW) ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); /*** test mysqli_connect 127.0.0.1 ***/ $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); diff --git a/ext/mysqli/tests/046.phpt b/ext/mysqli/tests/046.phpt index cf77392101..18c86e3166 100644 --- a/ext/mysqli/tests/046.phpt +++ b/ext/mysqli/tests/046.phpt @@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); /*** test mysqli_connect 127.0.0.1 ***/ $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); @@ -36,7 +36,7 @@ require_once('skipifconnectfailure.inc'); ?> --CLEAN-- <?php -include "connect.inc"; +require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/047.phpt b/ext/mysqli/tests/047.phpt index 3401418e91..5a86857031 100644 --- a/ext/mysqli/tests/047.phpt +++ b/ext/mysqli/tests/047.phpt @@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); /*** test mysqli_connect 127.0.0.1 ***/ $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); @@ -47,7 +47,7 @@ require_once('skipifconnectfailure.inc'); ?> --CLEAN-- <?php -include "connect.inc"; +require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/048.phpt b/ext/mysqli/tests/048.phpt index 5ab60e5a5f..afc0923577 100644 --- a/ext/mysqli/tests/048.phpt +++ b/ext/mysqli/tests/048.phpt @@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); /*** test mysqli_connect 127.0.0.1 ***/ $mysql = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); @@ -42,7 +42,7 @@ require_once('skipifconnectfailure.inc'); ?> --CLEAN-- <?php -include "connect.inc"; +require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/049.phpt b/ext/mysqli/tests/049.phpt index eb977a8b69..c87f369487 100644 --- a/ext/mysqli/tests/049.phpt +++ b/ext/mysqli/tests/049.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); /*** test mysqli_connect 127.0.0.1 ***/ $mysql = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); diff --git a/ext/mysqli/tests/050.phpt b/ext/mysqli/tests/050.phpt index ba668f0a84..4e750c9248 100644 --- a/ext/mysqli/tests/050.phpt +++ b/ext/mysqli/tests/050.phpt @@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); /************************ * non freed stamement diff --git a/ext/mysqli/tests/051.phpt b/ext/mysqli/tests/051.phpt index 82665156db..ac85410bb3 100644 --- a/ext/mysqli/tests/051.phpt +++ b/ext/mysqli/tests/051.phpt @@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); /************************ * free statement after close diff --git a/ext/mysqli/tests/052.phpt b/ext/mysqli/tests/052.phpt index f280d84061..89336ade60 100644 --- a/ext/mysqli/tests/052.phpt +++ b/ext/mysqli/tests/052.phpt @@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); /************************ * statement call after close diff --git a/ext/mysqli/tests/053.phpt b/ext/mysqli/tests/053.phpt index e0bbcbeee3..a1840c9726 100644 --- a/ext/mysqli/tests/053.phpt +++ b/ext/mysqli/tests/053.phpt @@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); /************************ * non freed resultset diff --git a/ext/mysqli/tests/054.phpt b/ext/mysqli/tests/054.phpt index 2d957cb3cc..6bd45a7c4b 100644 --- a/ext/mysqli/tests/054.phpt +++ b/ext/mysqli/tests/054.phpt @@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); /************************ * free resultset after close diff --git a/ext/mysqli/tests/055.phpt b/ext/mysqli/tests/055.phpt index 1f0461bb24..c73266e748 100644 --- a/ext/mysqli/tests/055.phpt +++ b/ext/mysqli/tests/055.phpt @@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); /************************ * don't free anything diff --git a/ext/mysqli/tests/056.phpt b/ext/mysqli/tests/056.phpt index f5571aca62..413e678987 100644 --- a/ext/mysqli/tests/056.phpt +++ b/ext/mysqli/tests/056.phpt @@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); class foobar extends mysqli { function test () { diff --git a/ext/mysqli/tests/057.phpt b/ext/mysqli/tests/057.phpt index 9da9a10149..92f82d4e1a 100644 --- a/ext/mysqli/tests/057.phpt +++ b/ext/mysqli/tests/057.phpt @@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); /*** test mysqli_connect 127.0.0.1 ***/ $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); @@ -64,7 +64,7 @@ require_once('skipifconnectfailure.inc'); ?> --CLEAN-- <?php -include "connect.inc"; +require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/058.phpt b/ext/mysqli/tests/058.phpt index d1a90a0041..a8312617c7 100644 --- a/ext/mysqli/tests/058.phpt +++ b/ext/mysqli/tests/058.phpt @@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); /*** test mysqli_connect 127.0.0.1 ***/ $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); @@ -50,7 +50,7 @@ require_once('skipifconnectfailure.inc'); ?> --CLEAN-- <?php -include "connect.inc"; +require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/059.phpt b/ext/mysqli/tests/059.phpt index 4897981cf4..733a3cefba 100644 --- a/ext/mysqli/tests/059.phpt +++ b/ext/mysqli/tests/059.phpt @@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); /*** test mysqli_connect 127.0.0.1 ***/ $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); @@ -43,7 +43,7 @@ require_once('skipifconnectfailure.inc'); ?> --CLEAN-- <?php -include "connect.inc"; +require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/060.phpt b/ext/mysqli/tests/060.phpt index f1c20bfa1d..5d17f8f953 100644 --- a/ext/mysqli/tests/060.phpt +++ b/ext/mysqli/tests/060.phpt @@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); class test_class { function __construct($arg1, $arg2) { @@ -44,7 +44,7 @@ require_once('skipifconnectfailure.inc'); ?> --CLEAN-- <?php -include "connect.inc"; +require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/061.phpt b/ext/mysqli/tests/061.phpt index e40f3a273a..08b4cda251 100644 --- a/ext/mysqli/tests/061.phpt +++ b/ext/mysqli/tests/061.phpt @@ -9,7 +9,7 @@ if (!function_exists('mysqli_set_local_infile_handler')) ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); function my_read($fp, &$buffer, $buflen, &$error) { $buffer = strrev(fread($fp, $buflen)); @@ -51,7 +51,7 @@ if (!function_exists('mysqli_set_local_infile_handler')) ?> --CLEAN-- <?php -include "connect.inc"; +require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/062.phpt b/ext/mysqli/tests/062.phpt index 0438553651..bc6198c6a1 100644 --- a/ext/mysqli/tests/062.phpt +++ b/ext/mysqli/tests/062.phpt @@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket); diff --git a/ext/mysqli/tests/063.phpt b/ext/mysqli/tests/063.phpt index 9b42ab7fbf..b184d72eea 100644 --- a/ext/mysqli/tests/063.phpt +++ b/ext/mysqli/tests/063.phpt @@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket); diff --git a/ext/mysqli/tests/064.phpt b/ext/mysqli/tests/064.phpt index a308e4ab29..46af7a6628 100644 --- a/ext/mysqli/tests/064.phpt +++ b/ext/mysqli/tests/064.phpt @@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket); diff --git a/ext/mysqli/tests/065.phpt b/ext/mysqli/tests/065.phpt index d0f1d16291..172cecde3c 100644 --- a/ext/mysqli/tests/065.phpt +++ b/ext/mysqli/tests/065.phpt @@ -14,7 +14,7 @@ if (version_compare(PHP_VERSION, '5.9.9', '>') == 1) { ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); if (!$mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket)) printf("[001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/066.phpt b/ext/mysqli/tests/066.phpt index 7581876ca4..91dfce5073 100644 --- a/ext/mysqli/tests/066.phpt +++ b/ext/mysqli/tests/066.phpt @@ -7,8 +7,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - - include "connect.inc"; + require_once("connect.inc"); /*** test mysqli_connect 127.0.0.1 ***/ $mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket); @@ -30,7 +29,7 @@ require_once('skipifconnectfailure.inc'); ?> --CLEAN-- <?php -include "connect.inc"; +require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/067.phpt b/ext/mysqli/tests/067.phpt index f571495185..d5795bdee8 100644 --- a/ext/mysqli/tests/067.phpt +++ b/ext/mysqli/tests/067.phpt @@ -4,7 +4,7 @@ function test: nested selects (cursors) <?php require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); - include "connect.inc"; + require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) die("skip Cannot connect to check required version"); @@ -29,7 +29,7 @@ function test: nested selects (cursors) return $stmt; } - include "connect.inc"; + require_once("connect.inc"); $mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket); if ((!$IS_MYSQLND && mysqli_get_client_version() < 50009) || @@ -66,7 +66,7 @@ function test: nested selects (cursors) ?> --CLEAN-- <?php -include "connect.inc"; +require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/069.phpt b/ext/mysqli/tests/069.phpt index 404b6ab106..ee76ca5c10 100644 --- a/ext/mysqli/tests/069.phpt +++ b/ext/mysqli/tests/069.phpt @@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket); $mysql->multi_query('SELECT 1;SELECT 2'); diff --git a/ext/mysqli/tests/070.phpt b/ext/mysqli/tests/070.phpt index eee5125133..b71d9b2e49 100644 --- a/ext/mysqli/tests/070.phpt +++ b/ext/mysqli/tests/070.phpt @@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket); var_dump($mysql->ping()); diff --git a/ext/mysqli/tests/071.phpt b/ext/mysqli/tests/071.phpt index 8888fb1706..4788a60913 100644 --- a/ext/mysqli/tests/071.phpt +++ b/ext/mysqli/tests/071.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket); diff --git a/ext/mysqli/tests/072.phpt b/ext/mysqli/tests/072.phpt index 637014b29c..036253a0b1 100644 --- a/ext/mysqli/tests/072.phpt +++ b/ext/mysqli/tests/072.phpt @@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket); diff --git a/ext/mysqli/tests/073.phpt b/ext/mysqli/tests/073.phpt index 7428bc3710..c70f7d9471 100644 --- a/ext/mysqli/tests/073.phpt +++ b/ext/mysqli/tests/073.phpt @@ -4,7 +4,7 @@ mysqli_driver properties <?php require_once('skipif.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); var_dump($driver->embedded); var_dump($driver->client_version); diff --git a/ext/mysqli/tests/074.phpt b/ext/mysqli/tests/074.phpt index 883655bc5e..7d9d01b3be 100644 --- a/ext/mysqli/tests/074.phpt +++ b/ext/mysqli/tests/074.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $mysqli = new my_mysqli($host, $user, $passwd, $db, $port, $socket); diff --git a/ext/mysqli/tests/bug28817.phpt b/ext/mysqli/tests/bug28817.phpt index e5fa7d563c..254c0e50de 100644 --- a/ext/mysqli/tests/bug28817.phpt +++ b/ext/mysqli/tests/bug28817.phpt @@ -1,14 +1,14 @@ --TEST-- Bug #28817 (problems with properties declared in the class extending MySQLi) --SKIPIF-- -<?php -require_once('skipif.inc'); +<?php +require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; - + require_once("connect.inc"); + class my_mysql extends mysqli { public $p_test; diff --git a/ext/mysqli/tests/bug29311.phpt b/ext/mysqli/tests/bug29311.phpt index 83b18388c4..cd7b9ef009 100644 --- a/ext/mysqli/tests/bug29311.phpt +++ b/ext/mysqli/tests/bug29311.phpt @@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); /* class 1 calls parent constructor */ class mysql1 extends mysqli { diff --git a/ext/mysqli/tests/bug30967.phpt b/ext/mysqli/tests/bug30967.phpt index 8051acbdb3..48007cee6c 100644 --- a/ext/mysqli/tests/bug30967.phpt +++ b/ext/mysqli/tests/bug30967.phpt @@ -1,14 +1,14 @@ --TEST-- Bug #30967 (problems with properties declared in the class extending the class extending MySQLi) --SKIPIF-- -<?php -require_once('skipif.inc'); +<?php +require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; - + require_once("connect.inc"); + class mysql1 extends mysqli { } diff --git a/ext/mysqli/tests/bug31668.phpt b/ext/mysqli/tests/bug31668.phpt index cdca551f21..9b769a1bae 100644 --- a/ext/mysqli/tests/bug31668.phpt +++ b/ext/mysqli/tests/bug31668.phpt @@ -9,7 +9,7 @@ require_once('skipifconnectfailure.inc'); error_reporting = E_ALL & ~E_STRICT --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket); $mysql->multi_query('SELECT 1;SELECT 2'); diff --git a/ext/mysqli/tests/bug32405.phpt b/ext/mysqli/tests/bug32405.phpt index 24bcdb4d0f..0b3cad50ff 100644 --- a/ext/mysqli/tests/bug32405.phpt +++ b/ext/mysqli/tests/bug32405.phpt @@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include ("connect.inc"); + require_once("connect.inc"); /*** test mysqli_connect 127.0.0.1 ***/ $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); @@ -33,7 +33,7 @@ require_once('skipifconnectfailure.inc'); ?> --CLEAN-- <?php -include "connect.inc"; +require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/bug33263.phpt b/ext/mysqli/tests/bug33263.phpt index 4f2a37c865..ac2de197bb 100644 --- a/ext/mysqli/tests/bug33263.phpt +++ b/ext/mysqli/tests/bug33263.phpt @@ -8,8 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - - include "connect.inc"; + require_once("connect.inc"); class test extends mysqli { diff --git a/ext/mysqli/tests/bug34810.phpt b/ext/mysqli/tests/bug34810.phpt index fac805312a..19a7e589bb 100644 --- a/ext/mysqli/tests/bug34810.phpt +++ b/ext/mysqli/tests/bug34810.phpt @@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc'); class DbConnection { public function connect() { - include "connect.inc"; + require_once("connect.inc"); $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); var_dump($link); @@ -35,7 +35,7 @@ echo "Done\n"; ?> --CLEAN-- <?php -include "connect.inc"; +require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/bug35103.phpt b/ext/mysqli/tests/bug35103.phpt index 9c137b5543..fc3cad04c2 100644 --- a/ext/mysqli/tests/bug35103.phpt +++ b/ext/mysqli/tests/bug35103.phpt @@ -12,7 +12,7 @@ $drop = <<<EOSQL DROP TABLE test_bint; DROP TABLE test_buint; EOSQL; - include "connect.inc"; + require_once("connect.inc"); $mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket); $mysql->query("DROP TABLE IF EXISTS test_bint"); @@ -53,7 +53,7 @@ EOSQL; ?> --CLEAN-- <?php -include "connect.inc"; +require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/bug35517.phpt b/ext/mysqli/tests/bug35517.phpt index c769eed1f1..746251f97c 100644 --- a/ext/mysqli/tests/bug35517.phpt +++ b/ext/mysqli/tests/bug35517.phpt @@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket); @@ -39,7 +39,7 @@ require_once('skipifconnectfailure.inc'); ?> --CLEAN-- <?php -include "connect.inc"; +require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/bug35759.phpt b/ext/mysqli/tests/bug35759.phpt index 39b21c476e..cbceb3b42e 100644 --- a/ext/mysqli/tests/bug35759.phpt +++ b/ext/mysqli/tests/bug35759.phpt @@ -14,7 +14,7 @@ CREATE TABLE blobby ( EOSQL; - include "connect.inc"; + require_once("connect.inc"); $col_num= 1000; $mysql = new mysqli($host, $user, $passwd, $db, $port, $socket); @@ -47,7 +47,7 @@ EOSQL; ?> --CLEAN-- <?php -include "connect.inc"; +require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/bug36420.phpt b/ext/mysqli/tests/bug36420.phpt index 54657a7001..6dd03b37f0 100644 --- a/ext/mysqli/tests/bug36420.phpt +++ b/ext/mysqli/tests/bug36420.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); --FILE-- <?php -include "connect.inc"; +require_once("connect.inc"); $mysqli = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); $result = $mysqli->query('select 1'); diff --git a/ext/mysqli/tests/bug36745.phpt b/ext/mysqli/tests/bug36745.phpt index 511eaf38fd..5e203e14eb 100644 --- a/ext/mysqli/tests/bug36745.phpt +++ b/ext/mysqli/tests/bug36745.phpt @@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include ("connect.inc"); + require_once("connect.inc"); /*** test mysqli_connect 127.0.0.1 ***/ $mysql = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket); @@ -23,7 +23,7 @@ require_once('skipifconnectfailure.inc'); ?> --CLEAN-- <?php -include "connect.inc"; +require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/bug36802.phpt b/ext/mysqli/tests/bug36802.phpt index d7144bddad..3694a26db3 100644 --- a/ext/mysqli/tests/bug36802.phpt +++ b/ext/mysqli/tests/bug36802.phpt @@ -10,7 +10,7 @@ Bug #36802 (crashes with with mysqli_set_charset()) } } - include "connect.inc"; + require_once("connect.inc"); $mysql = mysqli_init(); /* following operations should not work */ diff --git a/ext/mysqli/tests/bug36949.phpt b/ext/mysqli/tests/bug36949.phpt index 39909f9efd..2b3cc4955b 100644 --- a/ext/mysqli/tests/bug36949.phpt +++ b/ext/mysqli/tests/bug36949.phpt @@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php -include "connect.inc"; +require_once("connect.inc"); class A { private $mysqli; @@ -49,7 +49,7 @@ $B = new B(); ?> --CLEAN-- <?php -include "connect.inc"; +require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/bug37090.phpt b/ext/mysqli/tests/bug37090.phpt index 7e8b4931b2..839081df53 100644 --- a/ext/mysqli/tests/bug37090.phpt +++ b/ext/mysqli/tests/bug37090.phpt @@ -13,7 +13,7 @@ if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1)) { ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket); diff --git a/ext/mysqli/tests/bug38710.phpt b/ext/mysqli/tests/bug38710.phpt index 280a51a6fc..c3bb7285c8 100755 --- a/ext/mysqli/tests/bug38710.phpt +++ b/ext/mysqli/tests/bug38710.phpt @@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php -include "connect.inc"; +require_once("connect.inc"); $db = new my_mysqli($host, $user, $passwd, $db, $port, $socket); $qry=$db->stmt_init(); diff --git a/ext/mysqli/tests/bug39457.phpt b/ext/mysqli/tests/bug39457.phpt index b834ff1b70..ec9239bb15 100644 --- a/ext/mysqli/tests/bug39457.phpt +++ b/ext/mysqli/tests/bug39457.phpt @@ -1,13 +1,13 @@ --TEST-- Bug #39457 (Multiple invoked OO connections never close) --SKIPIF-- -<?php -require_once('skipif.inc'); +<?php +require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $mysql = mysqli_init(); $mysql->connect($host, $user, $passwd, $db, $port, $socket); diff --git a/ext/mysqli/tests/bug42548.phpt b/ext/mysqli/tests/bug42548.phpt index c9950be3a1..ef0c831e4d 100644 --- a/ext/mysqli/tests/bug42548.phpt +++ b/ext/mysqli/tests/bug42548.phpt @@ -52,7 +52,7 @@ print "done!"; ?> --CLEAN-- <?php -include "connect.inc"; +require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/bug44897.phpt b/ext/mysqli/tests/bug44897.phpt index 92fc0a2e27..84c245d0fc 100644 --- a/ext/mysqli/tests/bug44897.phpt +++ b/ext/mysqli/tests/bug44897.phpt @@ -19,7 +19,6 @@ if (mysqli_get_server_version($link) <= 50000) { ?> --FILE-- <?php - require_once("connect.inc"); require_once("table.inc"); if (!$link->query('DROP PROCEDURE IF EXISTS p')) @@ -74,7 +73,7 @@ if (mysqli_get_server_version($link) <= 50000) { ?> --CLEAN-- <?php -include "connect.inc"; +require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/bug46109.phpt b/ext/mysqli/tests/bug46109.phpt index bbb2903ab6..c377171b7b 100644 --- a/ext/mysqli/tests/bug46109.phpt +++ b/ext/mysqli/tests/bug46109.phpt @@ -1,18 +1,18 @@ --TEST-- Bug #46109 (MySQLi::init - Memory leaks) --SKIPIF-- -<?php -require_once('skipif.inc'); +<?php +require_once('skipif.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $mysqli = new mysqli(); $mysqli->init(); $mysqli->init(); - echo "done"; + echo "done"; ?> --EXPECTF-- done diff --git a/ext/mysqli/tests/bug48909.phpt b/ext/mysqli/tests/bug48909.phpt index 55c85a6860..81df544190 100644 --- a/ext/mysqli/tests/bug48909.phpt +++ b/ext/mysqli/tests/bug48909.phpt @@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); if (!($link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))) printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", diff --git a/ext/mysqli/tests/connect.inc b/ext/mysqli/tests/connect.inc index ad2428647c..48ba893ccc 100644 --- a/ext/mysqli/tests/connect.inc +++ b/ext/mysqli/tests/connect.inc @@ -74,53 +74,58 @@ } } - /** - * Whenever possible, please use this wrapper to make testing ot MYSQLI_CLIENT_COMPRESS (and potentially SSL) possible - * - * @param enable_env_flags Enable setting of connection flags through env(MYSQL_TEST_CONNECT_FLAGS)? - */ - function my_mysqli_connect($host, $user, $passwd, $db, $port, $socket, $enable_env_flags = true) { - global $connect_flags; + if (!function_exists('my_mysqli_connect')) { - $flags = ($enable_env_flags) ? $connect_flags : false; + /** + * Whenever possible, please use this wrapper to make testing ot MYSQLI_CLIENT_COMPRESS (and potentially SSL) possible + * + * @param enable_env_flags Enable setting of connection flags through env(MYSQL_TEST_CONNECT_FLAGS)? + */ + function my_mysqli_connect($host, $user, $passwd, $db, $port, $socket, $enable_env_flags = true) { + global $connect_flags; - if ($flags !== false) { - $link = mysqli_init(); - if (!mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket, $flags)) - $link = false; - } else { - $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); - } + $flags = ($enable_env_flags) ? $connect_flags : false; - return $link; - } + if ($flags !== false) { + $link = mysqli_init(); + if (!mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket, $flags)) + $link = false; + } else { + $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket); + } - /** - * Whenever possible, please use this wrapper to make testing ot MYSQLI_CLIENT_COMPRESS (and potentially SSL) possible - * - * @param enable_env_flags Enable setting of connection flags through env(MYSQL_TEST_CONNECT_FLAGS) - */ - function my_mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket, $flags = 0, $enable_env_flags = true) { - global $connect_flags; + return $link; + } - if ($enable_env_flags) - $flags & $connect_flags; + /** + * Whenever possible, please use this wrapper to make testing ot MYSQLI_CLIENT_COMPRESS (and potentially SSL) possible + * + * @param enable_env_flags Enable setting of connection flags through env(MYSQL_TEST_CONNECT_FLAGS) + */ + function my_mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket, $flags = 0, $enable_env_flags = true) { + global $connect_flags; - return mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket, $flags); - } + if ($enable_env_flags) + $flags & $connect_flags; - class my_mysqli extends mysqli { - public function __construct($host, $user, $passwd, $db, $port, $socket, $enable_env_flags = true) { - global $connect_flags; + return mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket, $flags); + } - $flags = ($enable_env_flags) ? $connect_flags : false; + class my_mysqli extends mysqli { + public function __construct($host, $user, $passwd, $db, $port, $socket, $enable_env_flags = true) { + global $connect_flags; - if ($flags !== false) { - parent::init(); - $this->real_connect($host, $user, $passwd, $db, $port, $socket, $flags); - } else { - parent::__construct($host, $user, $passwd, $db, $port, $socket); + $flags = ($enable_env_flags) ? $connect_flags : false; + + if ($flags !== false) { + parent::init(); + $this->real_connect($host, $user, $passwd, $db, $port, $socket, $flags); + } else { + parent::__construct($host, $user, $passwd, $db, $port, $socket); + } } } + } else { + printf("skip Eeeek/BUG/FIXME - connect.inc included twice! skipif bug?\n"); } ?>
\ No newline at end of file diff --git a/ext/mysqli/tests/mysqli_affected_rows.phpt b/ext/mysqli/tests/mysqli_affected_rows.phpt index 6cb5451c0b..958b83cb3c 100644 --- a/ext/mysqli/tests/mysqli_affected_rows.phpt +++ b/ext/mysqli/tests/mysqli_affected_rows.phpt @@ -8,7 +8,7 @@ mysqli_affected_rows() ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_affected_rows_oo.phpt b/ext/mysqli/tests/mysqli_affected_rows_oo.phpt index 07b7bcb486..6da026bc5a 100644 --- a/ext/mysqli/tests/mysqli_affected_rows_oo.phpt +++ b/ext/mysqli/tests/mysqli_affected_rows_oo.phpt @@ -8,7 +8,7 @@ mysqli->affected_rows ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $mysqli = new mysqli(); if (NULL !== ($tmp = @$mysqli->affected_rows)) diff --git a/ext/mysqli/tests/mysqli_autocommit.phpt b/ext/mysqli/tests/mysqli_autocommit.phpt index cdd5559767..f1f63e7f33 100644 --- a/ext/mysqli/tests/mysqli_autocommit.phpt +++ b/ext/mysqli/tests/mysqli_autocommit.phpt @@ -26,7 +26,7 @@ mysqli_autocommit() ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_autocommit_oo.phpt b/ext/mysqli/tests/mysqli_autocommit_oo.phpt index 8f2c4b472f..b1777b9f6a 100644 --- a/ext/mysqli/tests/mysqli_autocommit_oo.phpt +++ b/ext/mysqli/tests/mysqli_autocommit_oo.phpt @@ -29,7 +29,7 @@ mysqli->autocommit() ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); if (!$mysqli = new my_mysqli($host, $user, $passwd, $db, $port, $socket)) { printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", diff --git a/ext/mysqli/tests/mysqli_change_user.phpt b/ext/mysqli/tests/mysqli_change_user.phpt index d889ec8202..b699229ceb 100644 --- a/ext/mysqli/tests/mysqli_change_user.phpt +++ b/ext/mysqli/tests/mysqli_change_user.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_character_set.phpt b/ext/mysqli/tests/mysqli_character_set.phpt index 11c92ce63e..1fced9a3c4 100644 --- a/ext/mysqli/tests/mysqli_character_set.phpt +++ b/ext/mysqli/tests/mysqli_character_set.phpt @@ -16,7 +16,7 @@ if (version_compare(PHP_VERSION, '5.9.9', '>') == 1) { ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_character_set_name.phpt b/ext/mysqli/tests/mysqli_character_set_name.phpt index 9a40099fe1..3fa997b50d 100644 --- a/ext/mysqli/tests/mysqli_character_set_name.phpt +++ b/ext/mysqli/tests/mysqli_character_set_name.phpt @@ -9,7 +9,7 @@ require_once('skipifconnectfailure.inc'); --FILE-- <?php /* NOTE: http://bugs.mysql.com/bug.php?id=7923 makes this test fail very likely on all 4.1.x - 5.0.x! */ - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_character_set_name_oo.phpt b/ext/mysqli/tests/mysqli_character_set_name_oo.phpt index a56cf6ae8d..43a83bbcb7 100644 --- a/ext/mysqli/tests/mysqli_character_set_name_oo.phpt +++ b/ext/mysqli/tests/mysqli_character_set_name_oo.phpt @@ -9,7 +9,7 @@ mysqli_chararcter_set_name(), mysql_client_encoding() [alias] --FILE-- <?php /* NOTE: http://bugs.mysql.com/bug.php?id=7923 makes this test fail very likely on all 4.1.x - 5.0.x! */ - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_close.phpt b/ext/mysqli/tests/mysqli_close.phpt index 713c6e157e..c6ac92dd60 100644 --- a/ext/mysqli/tests/mysqli_close.phpt +++ b/ext/mysqli/tests/mysqli_close.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_close_oo.phpt b/ext/mysqli/tests/mysqli_close_oo.phpt index c3d6a93974..be67f779a8 100644 --- a/ext/mysqli/tests/mysqli_close_oo.phpt +++ b/ext/mysqli/tests/mysqli_close_oo.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_commit.phpt b/ext/mysqli/tests/mysqli_commit.phpt index 6a3c1e86c9..66113b3a5f 100644 --- a/ext/mysqli/tests/mysqli_commit.phpt +++ b/ext/mysqli/tests/mysqli_commit.phpt @@ -25,7 +25,7 @@ if ($row[1] == "DISABLED" || $row[1] == "NO") { ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_commit_oo.phpt b/ext/mysqli/tests/mysqli_commit_oo.phpt index 8d072999cb..fee7967392 100644 --- a/ext/mysqli/tests/mysqli_commit_oo.phpt +++ b/ext/mysqli/tests/mysqli_commit_oo.phpt @@ -24,7 +24,7 @@ if ($row[1] == "DISABLED" || $row[1] == "NO") { ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_connect.phpt b/ext/mysqli/tests/mysqli_connect.phpt index dd2792f811..cf7c7bede8 100644 --- a/ext/mysqli/tests/mysqli_connect.phpt +++ b/ext/mysqli/tests/mysqli_connect.phpt @@ -5,7 +5,7 @@ mysqli_connect() <?php require_once('skipifemb.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_connect_errno.phpt b/ext/mysqli/tests/mysqli_connect_errno.phpt index b48a75ef8c..a7f90f1527 100644 --- a/ext/mysqli/tests/mysqli_connect_errno.phpt +++ b/ext/mysqli/tests/mysqli_connect_errno.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_connect_error.phpt b/ext/mysqli/tests/mysqli_connect_error.phpt index e65dc0eb07..dc4db6af58 100644 --- a/ext/mysqli/tests/mysqli_connect_error.phpt +++ b/ext/mysqli/tests/mysqli_connect_error.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_connect_oo.phpt b/ext/mysqli/tests/mysqli_connect_oo.phpt index 63660fd2b6..d406e24845 100644 --- a/ext/mysqli/tests/mysqli_connect_oo.phpt +++ b/ext/mysqli/tests/mysqli_connect_oo.phpt @@ -5,7 +5,7 @@ new mysqli() <?php require_once('skipifemb.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt b/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt index ec5d1014c7..60f58fbf18 100644 --- a/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt +++ b/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt @@ -5,7 +5,7 @@ new mysqli() <?php require_once('skipifemb.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_connect_oo_warnings.phpt b/ext/mysqli/tests/mysqli_connect_oo_warnings.phpt index 1c2defc8b0..5ede44591e 100644 --- a/ext/mysqli/tests/mysqli_connect_oo_warnings.phpt +++ b/ext/mysqli/tests/mysqli_connect_oo_warnings.phpt @@ -12,7 +12,7 @@ new mysqli() ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $myhost = 'invalidhost'; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_connect_twice.phpt b/ext/mysqli/tests/mysqli_connect_twice.phpt index 7c6a726b29..a9d5b7ec94 100644 --- a/ext/mysqli/tests/mysqli_connect_twice.phpt +++ b/ext/mysqli/tests/mysqli_connect_twice.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", diff --git a/ext/mysqli/tests/mysqli_data_seek.phpt b/ext/mysqli/tests/mysqli_data_seek.phpt index cb54c80033..9e2d65047b 100644 --- a/ext/mysqli/tests/mysqli_data_seek.phpt +++ b/ext/mysqli/tests/mysqli_data_seek.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_data_seek_oo.phpt b/ext/mysqli/tests/mysqli_data_seek_oo.phpt index e75a04f36e..0858218a46 100644 --- a/ext/mysqli/tests/mysqli_data_seek_oo.phpt +++ b/ext/mysqli/tests/mysqli_data_seek_oo.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_disable_reads_from_master.phpt b/ext/mysqli/tests/mysqli_disable_reads_from_master.phpt index 79f081f50f..9814c6e255 100644 --- a/ext/mysqli/tests/mysqli_disable_reads_from_master.phpt +++ b/ext/mysqli/tests/mysqli_disable_reads_from_master.phpt @@ -12,7 +12,7 @@ if (!function_exists('mysqli_disable_reads_from_master')) { ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_driver.phpt b/ext/mysqli/tests/mysqli_driver.phpt index a2d1437a2a..4e266a0533 100644 --- a/ext/mysqli/tests/mysqli_driver.phpt +++ b/ext/mysqli/tests/mysqli_driver.phpt @@ -8,8 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; - include "table.inc"; + require("table.inc"); if (!is_object($driver = new mysqli_driver())) printf("[001] Failed to create mysqli_driver object\n"); diff --git a/ext/mysqli/tests/mysqli_dump_debug_info.phpt b/ext/mysqli/tests/mysqli_dump_debug_info.phpt index fe253e1cf7..bd87ddf0c8 100644 --- a/ext/mysqli/tests/mysqli_dump_debug_info.phpt +++ b/ext/mysqli/tests/mysqli_dump_debug_info.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_dump_debug_info_oo.phpt b/ext/mysqli/tests/mysqli_dump_debug_info_oo.phpt index 1d334f95df..82edef5619 100644 --- a/ext/mysqli/tests/mysqli_dump_debug_info_oo.phpt +++ b/ext/mysqli/tests/mysqli_dump_debug_info_oo.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_embedded_connect.phpt b/ext/mysqli/tests/mysqli_embedded_connect.phpt index 5ee5fa76a1..37891f55e6 100644 --- a/ext/mysqli/tests/mysqli_embedded_connect.phpt +++ b/ext/mysqli/tests/mysqli_embedded_connect.phpt @@ -1,14 +1,14 @@ --TEST-- mysqli_embedded_connect() --SKIPIF-- -<?php -require_once('skipif.inc'); +<?php +require_once('skipif.inc'); require_once('skipifnotemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_enable_reads_from_master.phpt b/ext/mysqli/tests/mysqli_enable_reads_from_master.phpt index 171ed56505..e23ddd1671 100644 --- a/ext/mysqli/tests/mysqli_enable_reads_from_master.phpt +++ b/ext/mysqli/tests/mysqli_enable_reads_from_master.phpt @@ -12,7 +12,7 @@ if (!function_exists('mysqli_enable_reads_from_master')) { ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_errno.phpt b/ext/mysqli/tests/mysqli_errno.phpt index 48acbb6235..0e9f0496af 100644 --- a/ext/mysqli/tests/mysqli_errno.phpt +++ b/ext/mysqli/tests/mysqli_errno.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_errno_oo.phpt b/ext/mysqli/tests/mysqli_errno_oo.phpt index 032f70a878..bef4a607eb 100644 --- a/ext/mysqli/tests/mysqli_errno_oo.phpt +++ b/ext/mysqli/tests/mysqli_errno_oo.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_error.phpt b/ext/mysqli/tests/mysqli_error.phpt index 5173880457..5e70d59d41 100644 --- a/ext/mysqli/tests/mysqli_error.phpt +++ b/ext/mysqli/tests/mysqli_error.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_error_oo.phpt b/ext/mysqli/tests/mysqli_error_oo.phpt index 456f8f9a35..31716d9aaf 100644 --- a/ext/mysqli/tests/mysqli_error_oo.phpt +++ b/ext/mysqli/tests/mysqli_error_oo.phpt @@ -1,14 +1,14 @@ --TEST-- $mysqli->error --SKIPIF-- -<?php -require_once('skipif.inc'); +<?php +require_once('skipif.inc'); require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_error_unicode.phpt b/ext/mysqli/tests/mysqli_error_unicode.phpt index 8789f89e84..b59ed5f601 100644 --- a/ext/mysqli/tests/mysqli_error_unicode.phpt +++ b/ext/mysqli/tests/mysqli_error_unicode.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_fetch_all.phpt b/ext/mysqli/tests/mysqli_fetch_all.phpt index 26401e7cce..eacecc92d0 100644 --- a/ext/mysqli/tests/mysqli_fetch_all.phpt +++ b/ext/mysqli/tests/mysqli_fetch_all.phpt @@ -10,7 +10,7 @@ if (!function_exists('mysqli_fetch_all')) ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_fetch_all_oo.phpt b/ext/mysqli/tests/mysqli_fetch_all_oo.phpt index 297d92ac7d..a71eb2bce2 100644 --- a/ext/mysqli/tests/mysqli_fetch_all_oo.phpt +++ b/ext/mysqli/tests/mysqli_fetch_all_oo.phpt @@ -11,7 +11,7 @@ if (!function_exists('mysqli_fetch_all')) ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_fetch_array.phpt b/ext/mysqli/tests/mysqli_fetch_array.phpt index f43804d966..cff3141661 100644 --- a/ext/mysqli/tests/mysqli_fetch_array.phpt +++ b/ext/mysqli/tests/mysqli_fetch_array.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_fetch_array_assoc.phpt b/ext/mysqli/tests/mysqli_fetch_array_assoc.phpt index d85eb9e6ff..957ca12de9 100644 --- a/ext/mysqli/tests/mysqli_fetch_array_assoc.phpt +++ b/ext/mysqli/tests/mysqli_fetch_array_assoc.phpt @@ -8,7 +8,6 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; require('table.inc'); if (!$res = mysqli_query($link, "SELECT * FROM test ORDER BY id LIMIT 5")) { diff --git a/ext/mysqli/tests/mysqli_fetch_array_large.phpt b/ext/mysqli/tests/mysqli_fetch_array_large.phpt index aa8c768715..b11f954774 100644 --- a/ext/mysqli/tests/mysqli_fetch_array_large.phpt +++ b/ext/mysqli/tests/mysqli_fetch_array_large.phpt @@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); function mysqli_fetch_array_large($offset, $link, $package_size) { diff --git a/ext/mysqli/tests/mysqli_fetch_array_many_rows.phpt b/ext/mysqli/tests/mysqli_fetch_array_many_rows.phpt index c9ed7ccac7..82e4d7b666 100644 --- a/ext/mysqli/tests/mysqli_fetch_array_many_rows.phpt +++ b/ext/mysqli/tests/mysqli_fetch_array_many_rows.phpt @@ -8,7 +8,6 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; require("table.inc"); // do as much as we can do in 5 seconds diff --git a/ext/mysqli/tests/mysqli_fetch_array_oo.phpt b/ext/mysqli/tests/mysqli_fetch_array_oo.phpt index fcabb59030..78c21308f3 100644 --- a/ext/mysqli/tests/mysqli_fetch_array_oo.phpt +++ b/ext/mysqli/tests/mysqli_fetch_array_oo.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_fetch_assoc.phpt b/ext/mysqli/tests/mysqli_fetch_assoc.phpt index 6aaed3eb1f..edf143b726 100644 --- a/ext/mysqli/tests/mysqli_fetch_assoc.phpt +++ b/ext/mysqli/tests/mysqli_fetch_assoc.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_fetch_assoc_no_alias.phpt b/ext/mysqli/tests/mysqli_fetch_assoc_no_alias.phpt index fa60582c48..a273b73aa9 100644 --- a/ext/mysqli/tests/mysqli_fetch_assoc_no_alias.phpt +++ b/ext/mysqli/tests/mysqli_fetch_assoc_no_alias.phpt @@ -8,7 +8,6 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; require('table.inc'); if (!$res = mysqli_query($link, "SELECT 1, 2")) { diff --git a/ext/mysqli/tests/mysqli_fetch_assoc_no_alias_utf8.phpt b/ext/mysqli/tests/mysqli_fetch_assoc_no_alias_utf8.phpt index 18d60c4b67..fa00ecda15 100644 --- a/ext/mysqli/tests/mysqli_fetch_assoc_no_alias_utf8.phpt +++ b/ext/mysqli/tests/mysqli_fetch_assoc_no_alias_utf8.phpt @@ -5,7 +5,7 @@ mysqli_fetch_assoc() - utf8 require_once('skipif.inc'); require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); - require('connect.inc'); + require_once("connect.inc"); if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) die("skip Cannot connect to server to check charsets"); @@ -35,7 +35,6 @@ mysqli_fetch_assoc() - utf8 ?> --FILE-- <?php - include "connect.inc"; require('table.inc'); /* some cyrillic (utf8) comes here */ diff --git a/ext/mysqli/tests/mysqli_fetch_assoc_oo.phpt b/ext/mysqli/tests/mysqli_fetch_assoc_oo.phpt index e9a746ec01..8a71fa740c 100644 --- a/ext/mysqli/tests/mysqli_fetch_assoc_oo.phpt +++ b/ext/mysqli/tests/mysqli_fetch_assoc_oo.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_fetch_field.phpt b/ext/mysqli/tests/mysqli_fetch_field.phpt index dba9f2f557..e90599257e 100644 --- a/ext/mysqli/tests/mysqli_fetch_field.phpt +++ b/ext/mysqli/tests/mysqli_fetch_field.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_fetch_field_direct.phpt b/ext/mysqli/tests/mysqli_fetch_field_direct.phpt index 5b4dc56711..33c5a0cf30 100644 --- a/ext/mysqli/tests/mysqli_fetch_field_direct.phpt +++ b/ext/mysqli/tests/mysqli_fetch_field_direct.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt b/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt index f1075139e3..23d46f3092 100644 --- a/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt +++ b/ext/mysqli/tests/mysqli_fetch_field_direct_oo.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_fetch_field_flags.phpt b/ext/mysqli/tests/mysqli_fetch_field_flags.phpt index 2a8b20b83a..42cbc1487f 100644 --- a/ext/mysqli/tests/mysqli_fetch_field_flags.phpt +++ b/ext/mysqli/tests/mysqli_fetch_field_flags.phpt @@ -17,7 +17,7 @@ mysqli_close($link); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); /* TODO: mysqli.c needs to export a few more constants - see all the defined() calls! */ diff --git a/ext/mysqli/tests/mysqli_fetch_field_oo.phpt b/ext/mysqli/tests/mysqli_fetch_field_oo.phpt index 2c169ed3f0..f7dcd9b9af 100644 --- a/ext/mysqli/tests/mysqli_fetch_field_oo.phpt +++ b/ext/mysqli/tests/mysqli_fetch_field_oo.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_fetch_field_types.phpt b/ext/mysqli/tests/mysqli_fetch_field_types.phpt index ae18f0ca63..5d7e5ebc8d 100644 --- a/ext/mysqli/tests/mysqli_fetch_field_types.phpt +++ b/ext/mysqli/tests/mysqli_fetch_field_types.phpt @@ -8,7 +8,6 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; require('table.inc'); function mysqli_field_datatypes($link, $sql_type, $php_value, $php_type, $datatypes) { diff --git a/ext/mysqli/tests/mysqli_fetch_fields.phpt b/ext/mysqli/tests/mysqli_fetch_fields.phpt index 0acec5477c..a87956de11 100644 --- a/ext/mysqli/tests/mysqli_fetch_fields.phpt +++ b/ext/mysqli/tests/mysqli_fetch_fields.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_fetch_lengths.phpt b/ext/mysqli/tests/mysqli_fetch_lengths.phpt index 71c2349224..1abc61170e 100644 --- a/ext/mysqli/tests/mysqli_fetch_lengths.phpt +++ b/ext/mysqli/tests/mysqli_fetch_lengths.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); if (!$mysqli = new mysqli($host, $user, $passwd, $db, $port, $socket)) printf("[001] Cannot connect\n"); diff --git a/ext/mysqli/tests/mysqli_fetch_lengths_oo.phpt b/ext/mysqli/tests/mysqli_fetch_lengths_oo.phpt index ef7d7622fd..7523621a34 100644 --- a/ext/mysqli/tests/mysqli_fetch_lengths_oo.phpt +++ b/ext/mysqli/tests/mysqli_fetch_lengths_oo.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); if (!$mysqli = new my_mysqli($host, $user, $passwd, $db, $port, $socket)) printf("[001] Cannot connect\n"); diff --git a/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt b/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt index fc7efe4b2d..2fa80cfa94 100644 --- a/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt +++ b/ext/mysqli/tests/mysqli_fetch_object_no_constructor.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_fetch_object_no_object.phpt b/ext/mysqli/tests/mysqli_fetch_object_no_object.phpt index c76742226d..c8e2b8508e 100644 --- a/ext/mysqli/tests/mysqli_fetch_object_no_object.phpt +++ b/ext/mysqli/tests/mysqli_fetch_object_no_object.phpt @@ -8,7 +8,6 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; require('table.inc'); if (!$res = mysqli_query($link, "SELECT id AS ID, label FROM test AS TEST ORDER BY id LIMIT 5")) { printf("[003] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); diff --git a/ext/mysqli/tests/mysqli_fetch_object_oo.phpt b/ext/mysqli/tests/mysqli_fetch_object_oo.phpt index 10b39e2ecd..3b263e49e4 100644 --- a/ext/mysqli/tests/mysqli_fetch_object_oo.phpt +++ b/ext/mysqli/tests/mysqli_fetch_object_oo.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_fetch_row.phpt b/ext/mysqli/tests/mysqli_fetch_row.phpt index bb44fd4189..e0359e058e 100644 --- a/ext/mysqli/tests/mysqli_fetch_row.phpt +++ b/ext/mysqli/tests/mysqli_fetch_row.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_field_count.phpt b/ext/mysqli/tests/mysqli_field_count.phpt index 5c63b86f67..9a778c94cb 100644 --- a/ext/mysqli/tests/mysqli_field_count.phpt +++ b/ext/mysqli/tests/mysqli_field_count.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_field_seek.phpt b/ext/mysqli/tests/mysqli_field_seek.phpt index 9d17f1a757..58692a620d 100644 --- a/ext/mysqli/tests/mysqli_field_seek.phpt +++ b/ext/mysqli/tests/mysqli_field_seek.phpt @@ -54,7 +54,7 @@ require_once('skipifconnectfailure.inc'); return $ret; } - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_field_tell.phpt b/ext/mysqli/tests/mysqli_field_tell.phpt index 9609a7c5df..f1e43c4912 100644 --- a/ext/mysqli/tests/mysqli_field_tell.phpt +++ b/ext/mysqli/tests/mysqli_field_tell.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_fork.phpt b/ext/mysqli/tests/mysqli_fork.phpt index 7e5aac928a..6c5096f37a 100644 --- a/ext/mysqli/tests/mysqli_fork.phpt +++ b/ext/mysqli/tests/mysqli_fork.phpt @@ -32,7 +32,6 @@ if ($row[1] == "DISABLED" || $row[1] == "NO") { ?> --FILE-- <?php - require_once("connect.inc"); require_once("table.inc"); $res = mysqli_query($link, "SELECT 'dumped by the parent' AS message"); @@ -236,7 +235,7 @@ if ($row[1] == "DISABLED" || $row[1] == "NO") { ?> --CLEAN-- <?php -include "connect.inc"; +require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/mysqli_free_result.phpt b/ext/mysqli/tests/mysqli_free_result.phpt index 1454353583..a065e14821 100644 --- a/ext/mysqli/tests/mysqli_free_result.phpt +++ b/ext/mysqli/tests/mysqli_free_result.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $db = 'test'; $tmp = NULL; diff --git a/ext/mysqli/tests/mysqli_get_cache_stats.phpt b/ext/mysqli/tests/mysqli_get_cache_stats.phpt index d49e399bbf..572be47be3 100644 --- a/ext/mysqli/tests/mysqli_get_cache_stats.phpt +++ b/ext/mysqli/tests/mysqli_get_cache_stats.phpt @@ -20,7 +20,7 @@ if (!function_exists('mysqli_get_cache_stats')) { if (!is_null($tmp = @mysqli_get_cache_stats($link))) printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); - include "connect.inc"; + require_once("connect.inc"); if (!is_array($info = mysqli_get_cache_stats()) || empty($info)) printf("[002] Expecting array/any_non_empty, got %s/%s\n", gettype($info), $info); diff --git a/ext/mysqli/tests/mysqli_get_cache_stats_free_buffered.phpt b/ext/mysqli/tests/mysqli_get_cache_stats_free_buffered.phpt index 0bb90fa714..643f8b1403 100644 --- a/ext/mysqli/tests/mysqli_get_cache_stats_free_buffered.phpt +++ b/ext/mysqli/tests/mysqli_get_cache_stats_free_buffered.phpt @@ -16,7 +16,6 @@ if (!function_exists('mysqli_get_cache_stats')) { ?> --FILE-- <?php - include "connect.inc"; require_once('table.inc'); if (!is_array($info = mysqli_get_cache_stats()) || empty($info)) @@ -96,4 +95,4 @@ if (!function_exists('mysqli_get_cache_stats')) { require_once("clean_table.inc"); ?> --EXPECTF-- -done!
\ No newline at end of file +done! diff --git a/ext/mysqli/tests/mysqli_get_charset.phpt b/ext/mysqli/tests/mysqli_get_charset.phpt index 314853dc02..8f81b3342e 100644 --- a/ext/mysqli/tests/mysqli_get_charset.phpt +++ b/ext/mysqli/tests/mysqli_get_charset.phpt @@ -10,7 +10,7 @@ if (!function_exists('mysqli_get_charset')) ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_get_client_info.phpt b/ext/mysqli/tests/mysqli_get_client_info.phpt index c927231aad..bb3f5cc1f1 100644 --- a/ext/mysqli/tests/mysqli_get_client_info.phpt +++ b/ext/mysqli/tests/mysqli_get_client_info.phpt @@ -1,14 +1,14 @@ --TEST-- mysqli_get_client_info() --SKIPIF-- -<?php -require_once('skipif.inc'); +<?php +require_once('skipif.inc'); require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); if (!is_string($info = mysqli_get_client_info()) || ('' === $info)) printf("[001] Expecting string/any_non_empty, got %s/%s\n", gettype($info), $info); diff --git a/ext/mysqli/tests/mysqli_get_client_stats.phpt b/ext/mysqli/tests/mysqli_get_client_stats.phpt index 8120117fb1..da1012ab48 100644 --- a/ext/mysqli/tests/mysqli_get_client_stats.phpt +++ b/ext/mysqli/tests/mysqli_get_client_stats.phpt @@ -84,7 +84,7 @@ mysqlnd.collect_memory_statistics=1 if (!is_null($tmp = @mysqli_get_client_stats($link))) printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); - include "connect.inc"; + require_once("connect.inc"); if (!is_array($info = mysqli_get_client_stats()) || empty($info)) printf("[002] Expecting array/any_non_empty, got %s/%s\n", gettype($info), $info); @@ -862,7 +862,7 @@ mysqlnd.collect_memory_statistics=1 ?> --CLEAN-- <?php -include "connect.inc"; +require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/mysqli_get_connection_stats.phpt b/ext/mysqli/tests/mysqli_get_connection_stats.phpt index 698a4684ff..64eba16679 100644 --- a/ext/mysqli/tests/mysqli_get_connection_stats.phpt +++ b/ext/mysqli/tests/mysqli_get_connection_stats.phpt @@ -21,8 +21,7 @@ if (!function_exists('mysqli_get_connection_stats')) { if (!is_null($tmp = @mysqli_get_connection_stats($link))) printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); - include "connect.inc"; - include "table.inc"; + require("table.inc"); if (!is_array($info = mysqli_get_connection_stats($link)) || empty($info)) printf("[003] Expecting array/any_non_empty, got %s/%s\n", gettype($info), $info); @@ -63,7 +62,7 @@ if (!function_exists('mysqli_get_connection_stats')) { } mysqli_close($link); - include "table.inc"; + require("table.inc"); if (!is_array($info = mysqli_get_connection_stats($link)) || empty($info)) printf("[008] Expecting array/any_non_empty, got %s/%s\n", gettype($info), $info); diff --git a/ext/mysqli/tests/mysqli_get_host_info.phpt b/ext/mysqli/tests/mysqli_get_host_info.phpt index b3db9be8dc..2c3c0f806d 100644 --- a/ext/mysqli/tests/mysqli_get_host_info.phpt +++ b/ext/mysqli/tests/mysqli_get_host_info.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); if (!is_null($tmp = @mysqli_get_host_info())) printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); diff --git a/ext/mysqli/tests/mysqli_get_proto_info.phpt b/ext/mysqli/tests/mysqli_get_proto_info.phpt index b5dd985181..7fbefeb853 100644 --- a/ext/mysqli/tests/mysqli_get_proto_info.phpt +++ b/ext/mysqli/tests/mysqli_get_proto_info.phpt @@ -1,14 +1,14 @@ --TEST-- mysqli_get_proto_info() --SKIPIF-- -<?php +<?php require_once('skipif.inc'); -require_once('skipifemb.inc'); +require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); if (!is_null($tmp = @mysqli_get_proto_info())) printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); diff --git a/ext/mysqli/tests/mysqli_get_server_info.phpt b/ext/mysqli/tests/mysqli_get_server_info.phpt index f10cc4cfa9..a7f785302b 100644 --- a/ext/mysqli/tests/mysqli_get_server_info.phpt +++ b/ext/mysqli/tests/mysqli_get_server_info.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); if (!is_null($tmp = @mysqli_get_server_info())) printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); diff --git a/ext/mysqli/tests/mysqli_get_server_version.phpt b/ext/mysqli/tests/mysqli_get_server_version.phpt index a97c9a23b2..b30c4a3801 100644 --- a/ext/mysqli/tests/mysqli_get_server_version.phpt +++ b/ext/mysqli/tests/mysqli_get_server_version.phpt @@ -1,14 +1,14 @@ --TEST-- mysqli_get_server_version() --SKIPIF-- -<?php +<?php require_once('skipif.inc'); require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); if (!is_null($tmp = @mysqli_get_server_version())) printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); diff --git a/ext/mysqli/tests/mysqli_get_warnings.phpt b/ext/mysqli/tests/mysqli_get_warnings.phpt index 1472f297f3..00548de709 100644 --- a/ext/mysqli/tests/mysqli_get_warnings.phpt +++ b/ext/mysqli/tests/mysqli_get_warnings.phpt @@ -11,7 +11,7 @@ if (!$TEST_EXPERIMENTAL) ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; @@ -144,7 +144,7 @@ if (!$TEST_EXPERIMENTAL) print "done!"; ?> <?php -include "connect.inc"; +require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/mysqli_info.phpt b/ext/mysqli/tests/mysqli_info.phpt index caa7c90103..2d5004fe6e 100644 --- a/ext/mysqli/tests/mysqli_info.phpt +++ b/ext/mysqli/tests/mysqli_info.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); if (!is_null($tmp = @mysqli_info())) printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); diff --git a/ext/mysqli/tests/mysqli_insert_id.phpt b/ext/mysqli/tests/mysqli_insert_id.phpt index a5491bf973..549d71d156 100644 --- a/ext/mysqli/tests/mysqli_insert_id.phpt +++ b/ext/mysqli/tests/mysqli_insert_id.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_insert_id_variation.phpt b/ext/mysqli/tests/mysqli_insert_id_variation.phpt index 1717b309c1..e858ca0689 100644 --- a/ext/mysqli/tests/mysqli_insert_id_variation.phpt +++ b/ext/mysqli/tests/mysqli_insert_id_variation.phpt @@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php -include "connect.inc"; +require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", @@ -90,7 +90,7 @@ echo "DONE"; ?> --CLEAN-- <?php -include "connect.inc"; +require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/mysqli_kill.phpt b/ext/mysqli/tests/mysqli_kill.phpt index 64daad88eb..f680a68137 100644 --- a/ext/mysqli/tests/mysqli_kill.phpt +++ b/ext/mysqli/tests/mysqli_kill.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_more_results.phpt b/ext/mysqli/tests/mysqli_more_results.phpt index 49de0d7fad..271c63e1d1 100644 --- a/ext/mysqli/tests/mysqli_more_results.phpt +++ b/ext/mysqli/tests/mysqli_more_results.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $strict_on = false; if (defined('E_STRICT')) { diff --git a/ext/mysqli/tests/mysqli_multi_query.phpt b/ext/mysqli/tests/mysqli_multi_query.phpt index dd26fd71ba..91c07c2564 100644 --- a/ext/mysqli/tests/mysqli_multi_query.phpt +++ b/ext/mysqli/tests/mysqli_multi_query.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $strict_on = false; if (defined('E_STRICT')) { diff --git a/ext/mysqli/tests/mysqli_next_result.phpt b/ext/mysqli/tests/mysqli_next_result.phpt index 0dc49c72f0..c36920e1ec 100644 --- a/ext/mysqli/tests/mysqli_next_result.phpt +++ b/ext/mysqli/tests/mysqli_next_result.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $strict_on = false; if (defined('E_STRICT')) { diff --git a/ext/mysqli/tests/mysqli_num_fields.phpt b/ext/mysqli/tests/mysqli_num_fields.phpt index 88825573c1..4c2510af45 100644 --- a/ext/mysqli/tests/mysqli_num_fields.phpt +++ b/ext/mysqli/tests/mysqli_num_fields.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_num_rows.phpt b/ext/mysqli/tests/mysqli_num_rows.phpt index f1798cc2c8..376ddd4e8f 100644 --- a/ext/mysqli/tests/mysqli_num_rows.phpt +++ b/ext/mysqli/tests/mysqli_num_rows.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_options.phpt b/ext/mysqli/tests/mysqli_options.phpt index 670f9aca75..1ca3a34a15 100644 --- a/ext/mysqli/tests/mysqli_options.phpt +++ b/ext/mysqli/tests/mysqli_options.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); /* TODO: ext/mysqli might lack support for those options which are available diff --git a/ext/mysqli/tests/mysqli_options_init_command.phpt b/ext/mysqli/tests/mysqli_options_init_command.phpt index 2ba2ce4616..a78dfca20f 100644 --- a/ext/mysqli/tests/mysqli_options_init_command.phpt +++ b/ext/mysqli/tests/mysqli_options_init_command.phpt @@ -10,7 +10,7 @@ require_once('skipifconnectfailure.inc'); --FILE-- <?php /* see mysqli.c for details */ - include "connect.inc"; + require_once("connect.inc"); if (!($link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))) printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", diff --git a/ext/mysqli/tests/mysqli_pconn_conn_multiple.phpt b/ext/mysqli/tests/mysqli_pconn_conn_multiple.phpt index 2c6aae0d3b..f40965e594 100644 --- a/ext/mysqli/tests/mysqli_pconn_conn_multiple.phpt +++ b/ext/mysqli/tests/mysqli_pconn_conn_multiple.phpt @@ -15,7 +15,7 @@ mysqli.max_persistent=-1 mysqli.max_links=-1 --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $phost = 'p:' . $host; diff --git a/ext/mysqli/tests/mysqli_pconn_disabled.phpt b/ext/mysqli/tests/mysqli_pconn_disabled.phpt index ee0efc4e53..1fe6271c7e 100644 --- a/ext/mysqli/tests/mysqli_pconn_disabled.phpt +++ b/ext/mysqli/tests/mysqli_pconn_disabled.phpt @@ -17,7 +17,7 @@ mysqli.max_persistent=2 mysqli.max_links=2 --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $host = 'p:' . $host; if (!$link1 = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { diff --git a/ext/mysqli/tests/mysqli_pconn_max_links.phpt b/ext/mysqli/tests/mysqli_pconn_max_links.phpt index 3ccb761360..8e755393fe 100644 --- a/ext/mysqli/tests/mysqli_pconn_max_links.phpt +++ b/ext/mysqli/tests/mysqli_pconn_max_links.phpt @@ -160,7 +160,7 @@ mysqli.max_persistent=2 ?> --CLEAN-- <?php -include "connect.inc"; +require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/mysqli_pconn_reuse.phpt b/ext/mysqli/tests/mysqli_pconn_reuse.phpt index 8a43e7c305..b42800a77d 100644 --- a/ext/mysqli/tests/mysqli_pconn_reuse.phpt +++ b/ext/mysqli/tests/mysqli_pconn_reuse.phpt @@ -17,7 +17,7 @@ mysqli.max_persistent=2 mysqli.max_links=2 --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $host = 'p:' . $host; if (!$link1 = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { diff --git a/ext/mysqli/tests/mysqli_pconn_twice.phpt b/ext/mysqli/tests/mysqli_pconn_twice.phpt index ddb95e732d..12800c2ce4 100644 --- a/ext/mysqli/tests/mysqli_pconn_twice.phpt +++ b/ext/mysqli/tests/mysqli_pconn_twice.phpt @@ -15,7 +15,7 @@ mysqli.max_persistent=-1 mysqli.max_links=-1 --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $host = 'p:' . $host; if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) @@ -26,7 +26,7 @@ mysqli.max_links=-1 printf("[003] Expecting boolean/true got %s/%s\n", gettype($tmp), $tmp); /* it is undefined which pooled connection we get - thread ids may differ */ - + if (!($res = mysqli_query($link, "SELECT 'ok' AS it_works")) || !($row = mysqli_fetch_assoc($res))) printf("[006] [%d] %s\n", mysqli_errno($link), mysqli_error($link)); @@ -40,7 +40,7 @@ mysqli.max_links=-1 printf("[007] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); - + if (true !== ($tmp = $link->real_connect($host, $user, $passwd, $db, $port, $socket))) printf("[009] Expecting boolean/true got %s/%s\n", gettype($tmp), $tmp); diff --git a/ext/mysqli/tests/mysqli_pconnect.phpt b/ext/mysqli/tests/mysqli_pconnect.phpt index 57b44ebaf2..fbb1092e6e 100644 --- a/ext/mysqli/tests/mysqli_pconnect.phpt +++ b/ext/mysqli/tests/mysqli_pconnect.phpt @@ -11,7 +11,7 @@ if (!stristr(mysqli_get_client_info(), 'mysqlnd')) ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $host = 'p:' . $host; if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) diff --git a/ext/mysqli/tests/mysqli_ping.phpt b/ext/mysqli/tests/mysqli_ping.phpt index 80a2a20a28..d9a134c0e9 100644 --- a/ext/mysqli/tests/mysqli_ping.phpt +++ b/ext/mysqli/tests/mysqli_ping.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_poll_mixing_insert_select.phpt b/ext/mysqli/tests/mysqli_poll_mixing_insert_select.phpt index 56f9182f48..9c02cf9760 100644 --- a/ext/mysqli/tests/mysqli_poll_mixing_insert_select.phpt +++ b/ext/mysqli/tests/mysqli_poll_mixing_insert_select.phpt @@ -155,7 +155,7 @@ if (!$IS_MYSQLND) ?> --CLEAN-- <?php -include "connect.inc"; +require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/mysqli_prepare.phpt b/ext/mysqli/tests/mysqli_prepare.phpt index 0737aba83d..bba82745e7 100644 --- a/ext/mysqli/tests/mysqli_prepare.phpt +++ b/ext/mysqli/tests/mysqli_prepare.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; @@ -118,7 +118,7 @@ require_once('skipifconnectfailure.inc'); ?> --CLEAN-- <?php -include "connect.inc"; +require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/mysqli_prepare_no_object.phpt b/ext/mysqli/tests/mysqli_prepare_no_object.phpt index 3d022f440b..e45de69eda 100644 --- a/ext/mysqli/tests/mysqli_prepare_no_object.phpt +++ b/ext/mysqli/tests/mysqli_prepare_no_object.phpt @@ -8,7 +8,6 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; require('table.inc'); if (false !== ($tmp = mysqli_prepare($link, false))) diff --git a/ext/mysqli/tests/mysqli_query.phpt b/ext/mysqli/tests/mysqli_query.phpt index 0e45f03882..73bebe107c 100644 --- a/ext/mysqli/tests/mysqli_query.phpt +++ b/ext/mysqli/tests/mysqli_query.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; @@ -114,7 +114,7 @@ require_once('skipifconnectfailure.inc'); ?> --CLEAN-- <?php -include "connect.inc"; +require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/mysqli_query_local_infile_large.phpt b/ext/mysqli/tests/mysqli_query_local_infile_large.phpt index 306dfceab6..8b115a507d 100644 --- a/ext/mysqli/tests/mysqli_query_local_infile_large.phpt +++ b/ext/mysqli/tests/mysqli_query_local_infile_large.phpt @@ -31,7 +31,7 @@ mysqli.allow_local_infile=1 fclose($fp); printf("Filesize in bytes: %d\nRows: %d\n", $bytes, $rowno); - include "connect.inc"; + require_once("connect.inc"); if (!($link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))) printf("[002] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); @@ -72,7 +72,7 @@ $file = tempnam(sys_get_temp_dir(), 'mysqli_test.cvs'); if (file_exists($file)) unlink($file); -include "connect.inc"; +require_once("connect.inc"); if (!($link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))) printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/mysqli_query_stored_proc.phpt b/ext/mysqli/tests/mysqli_query_stored_proc.phpt index 0ca71a40b5..10bf86bf48 100644 --- a/ext/mysqli/tests/mysqli_query_stored_proc.phpt +++ b/ext/mysqli/tests/mysqli_query_stored_proc.phpt @@ -152,7 +152,7 @@ END;')) { ?> --CLEAN-- <?php -include "connect.inc"; +require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/mysqli_real_escape_string.phpt b/ext/mysqli/tests/mysqli_real_escape_string.phpt index b25c72acd8..6c372581e0 100644 --- a/ext/mysqli/tests/mysqli_real_escape_string.phpt +++ b/ext/mysqli/tests/mysqli_real_escape_string.phpt @@ -1,14 +1,14 @@ --TEST-- mysqli_real_escape_string() --SKIPIF-- -<?php +<?php require_once('skipif.inc'); -require_once('skipifemb.inc'); +require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_real_escape_string_unicode.phpt b/ext/mysqli/tests/mysqli_real_escape_string_unicode.phpt index 038cca9402..79309923c4 100644 --- a/ext/mysqli/tests/mysqli_real_escape_string_unicode.phpt +++ b/ext/mysqli/tests/mysqli_real_escape_string_unicode.phpt @@ -1,14 +1,14 @@ --TEST-- mysqli_real_escape_string() --SKIPIF-- -<?php +<?php require_once('skipif.inc'); -require_once('skipifemb.inc'); +require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_real_query.phpt b/ext/mysqli/tests/mysqli_real_query.phpt index 8e30344159..866ad6a9d4 100644 --- a/ext/mysqli/tests/mysqli_real_query.phpt +++ b/ext/mysqli/tests/mysqli_real_query.phpt @@ -7,7 +7,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; @@ -91,7 +91,7 @@ ver_param;')) { ?> --CLEAN-- <?php -include "connect.inc"; +require_once("connect.inc"); if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/mysqli_report.phpt b/ext/mysqli/tests/mysqli_report.phpt index dc927997f3..11ddef88bd 100644 --- a/ext/mysqli/tests/mysqli_report.phpt +++ b/ext/mysqli/tests/mysqli_report.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_report_wo_ps.phpt b/ext/mysqli/tests/mysqli_report_wo_ps.phpt index 08909264a7..e7ba6bb7eb 100644 --- a/ext/mysqli/tests/mysqli_report_wo_ps.phpt +++ b/ext/mysqli/tests/mysqli_report_wo_ps.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_result_unclonable.phpt b/ext/mysqli/tests/mysqli_result_unclonable.phpt index dfde9a78c5..0ecc30b62a 100644 --- a/ext/mysqli/tests/mysqli_result_unclonable.phpt +++ b/ext/mysqli/tests/mysqli_result_unclonable.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", diff --git a/ext/mysqli/tests/mysqli_rollback.phpt b/ext/mysqli/tests/mysqli_rollback.phpt index 616f50da84..1b1fe8b356 100644 --- a/ext/mysqli/tests/mysqli_rollback.phpt +++ b/ext/mysqli/tests/mysqli_rollback.phpt @@ -29,7 +29,7 @@ mysqli_rollback() ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_select_db.phpt b/ext/mysqli/tests/mysqli_select_db.phpt index bc774cfec9..d700a2b557 100644 --- a/ext/mysqli/tests/mysqli_select_db.phpt +++ b/ext/mysqli/tests/mysqli_select_db.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_send_query.phpt b/ext/mysqli/tests/mysqli_send_query.phpt index 53cf25093e..7de2bfc21c 100755 --- a/ext/mysqli/tests/mysqli_send_query.phpt +++ b/ext/mysqli/tests/mysqli_send_query.phpt @@ -15,7 +15,7 @@ if (!$TEST_EXPERIMENTAL) --FILE-- <?php /* NOTE: tests is a stub, but function is deprecated, as long as it does not crash when invoking it... */ - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_set_charset.phpt b/ext/mysqli/tests/mysqli_set_charset.phpt index baf97bd3d3..4f4aaa52a0 100644 --- a/ext/mysqli/tests/mysqli_set_charset.phpt +++ b/ext/mysqli/tests/mysqli_set_charset.phpt @@ -50,7 +50,7 @@ if ((($res = mysqli_query($link, 'SHOW CHARACTER SET LIKE "latin1"', MYSQLI_STOR ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_set_local_infile_handler_close_link.phpt b/ext/mysqli/tests/mysqli_set_local_infile_handler_close_link.phpt index cb8162db70..d5fd236013 100644 --- a/ext/mysqli/tests/mysqli_set_local_infile_handler_close_link.phpt +++ b/ext/mysqli/tests/mysqli_set_local_infile_handler_close_link.phpt @@ -33,8 +33,7 @@ if ('ON' != $row['Value']) mysqli.allow_local_infile=1 --FILE-- <?php - include "connect.inc"; - include("table.inc"); + require("table.inc"); require_once('local_infile_tools.inc'); function callback_close_link($fp, &$buffer, $buflen, &$error) { diff --git a/ext/mysqli/tests/mysqli_set_local_infile_handler_closefile.phpt b/ext/mysqli/tests/mysqli_set_local_infile_handler_closefile.phpt index 7498e64f43..a2e6c57ad7 100644 --- a/ext/mysqli/tests/mysqli_set_local_infile_handler_closefile.phpt +++ b/ext/mysqli/tests/mysqli_set_local_infile_handler_closefile.phpt @@ -33,8 +33,7 @@ if ('ON' != $row['Value']) mysqli.allow_local_infile=1 --FILE-- <?php - include "connect.inc"; - include("table.inc"); + require_once("table.inc"); require_once('local_infile_tools.inc'); function callback_closefile($fp, &$buffer, $buflen, &$error) { diff --git a/ext/mysqli/tests/mysqli_set_local_infile_handler_kill_link.phpt b/ext/mysqli/tests/mysqli_set_local_infile_handler_kill_link.phpt index 3757b61d95..d3b56ebb49 100644 --- a/ext/mysqli/tests/mysqli_set_local_infile_handler_kill_link.phpt +++ b/ext/mysqli/tests/mysqli_set_local_infile_handler_kill_link.phpt @@ -30,8 +30,7 @@ if ('ON' != $row['Value']) mysqli.allow_local_infile=1 --FILE-- <?php - include "connect.inc"; - include("table.inc"); + require("table.inc"); require_once('local_infile_tools.inc'); function callback_kill_link($fp, &$buffer, $buflen, &$error) { diff --git a/ext/mysqli/tests/mysqli_set_opt.phpt b/ext/mysqli/tests/mysqli_set_opt.phpt index 21aacd25ff..7c96d5980d 100644 --- a/ext/mysqli/tests/mysqli_set_opt.phpt +++ b/ext/mysqli/tests/mysqli_set_opt.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_set_opt_numeric_and_datetime_as_unicode.phpt b/ext/mysqli/tests/mysqli_set_opt_numeric_and_datetime_as_unicode.phpt index 77047a19cb..7e0593cb50 100644 --- a/ext/mysqli/tests/mysqli_set_opt_numeric_and_datetime_as_unicode.phpt +++ b/ext/mysqli/tests/mysqli_set_opt_numeric_and_datetime_as_unicode.phpt @@ -14,8 +14,7 @@ if (!stristr(mysqli_get_client_info(), "mysqlnd")) ?> --FILE-- <?php - include "connect.inc"; - include "table.inc"; + require_once("table.inc"); if (true !== ($tmp = mysqli_set_opt($link, MYSQLI_OPT_NUMERIC_AND_DATETIME_AS_UNICODE, 1))) printf("[001] Expecting boolean/true, got %s/%s\n", gettype($tmp), $tmp); diff --git a/ext/mysqli/tests/mysqli_sqlstate.phpt b/ext/mysqli/tests/mysqli_sqlstate.phpt index 0ed39f4ee5..56580cda46 100644 --- a/ext/mysqli/tests/mysqli_sqlstate.phpt +++ b/ext/mysqli/tests/mysqli_sqlstate.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_ssl_set.phpt b/ext/mysqli/tests/mysqli_ssl_set.phpt index e868f34f19..2abae55c1e 100644 --- a/ext/mysqli/tests/mysqli_ssl_set.phpt +++ b/ext/mysqli/tests/mysqli_ssl_set.phpt @@ -10,7 +10,7 @@ if (!function_exists('mysqli_ssl_set')) ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_stat.phpt b/ext/mysqli/tests/mysqli_stat.phpt index 7d7d4e70ce..f1cd56ccd1 100644 --- a/ext/mysqli/tests/mysqli_stat.phpt +++ b/ext/mysqli/tests/mysqli_stat.phpt @@ -1,14 +1,14 @@ --TEST-- mysqli_stat() --SKIPIF-- -<?php +<?php require_once('skipif.inc'); -require_once('skipifemb.inc'); +require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_stmt_affected_rows.phpt b/ext/mysqli/tests/mysqli_stmt_affected_rows.phpt index d4761dd6b8..4765d64872 100644 --- a/ext/mysqli/tests/mysqli_stmt_affected_rows.phpt +++ b/ext/mysqli/tests/mysqli_stmt_affected_rows.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_stmt_attr_get.phpt b/ext/mysqli/tests/mysqli_stmt_attr_get.phpt index abedf56b21..a4eb4d0f35 100644 --- a/ext/mysqli/tests/mysqli_stmt_attr_get.phpt +++ b/ext/mysqli/tests/mysqli_stmt_attr_get.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_stmt_attr_get_prefetch.phpt b/ext/mysqli/tests/mysqli_stmt_attr_get_prefetch.phpt index 26bbf9649c..0d5e8f9bec 100644 --- a/ext/mysqli/tests/mysqli_stmt_attr_get_prefetch.phpt +++ b/ext/mysqli/tests/mysqli_stmt_attr_get_prefetch.phpt @@ -9,7 +9,6 @@ die("SKIP: prefetch isn't supported at the moment"); ?> --FILE-- <?php - include "connect.inc"; require('table.inc'); $stmt = mysqli_stmt_init($link); diff --git a/ext/mysqli/tests/mysqli_stmt_attr_set.phpt b/ext/mysqli/tests/mysqli_stmt_attr_set.phpt index 7bc9882f8a..db92d4bff2 100644 --- a/ext/mysqli/tests/mysqli_stmt_attr_set.phpt +++ b/ext/mysqli/tests/mysqli_stmt_attr_set.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_stmt_bind_param.phpt b/ext/mysqli/tests/mysqli_stmt_bind_param.phpt index 9aaac98040..33ef3175ac 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_param.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_param.phpt @@ -17,7 +17,7 @@ require_once('skipifconnectfailure.inc'); in this file and we test mysqli_stmt_bind_result() in the other test -- therefore the "duplicate" makes some sense to me. */ - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_stmt_bind_param_check_param_no_change.phpt b/ext/mysqli/tests/mysqli_stmt_bind_param_check_param_no_change.phpt index a7d36743c0..e1e3a92e56 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_param_check_param_no_change.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_param_check_param_no_change.phpt @@ -8,7 +8,6 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; require('table.inc'); class foo { diff --git a/ext/mysqli/tests/mysqli_stmt_bind_param_references.phpt b/ext/mysqli/tests/mysqli_stmt_bind_param_references.phpt index 24d4314f1f..91cb9d022b 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_param_references.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_param_references.phpt @@ -8,7 +8,6 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; require('table.inc'); function findRow($offset, $link, $id, $label) { diff --git a/ext/mysqli/tests/mysqli_stmt_bind_param_type_juggling.phpt b/ext/mysqli/tests/mysqli_stmt_bind_param_type_juggling.phpt index ab871ce95a..daab40c506 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_param_type_juggling.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_param_type_juggling.phpt @@ -8,7 +8,6 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; require('table.inc'); function bind_twice($link, $engine, $sql_type1, $sql_type2, $bind_type1, $bind_type2, $bind_value1, $bind_value2, $offset) { diff --git a/ext/mysqli/tests/mysqli_stmt_bind_result.phpt b/ext/mysqli/tests/mysqli_stmt_bind_result.phpt index f5756740e0..5b7da34d8d 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_result.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_result.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $hint_str_or_unicode = (version_compare(PHP_VERSION, '5.9.9', '>') == 1) ? "unicode":"string"; diff --git a/ext/mysqli/tests/mysqli_stmt_bind_result_bit.phpt b/ext/mysqli/tests/mysqli_stmt_bind_result_bit.phpt index 1eef767478..acf0d0be2d 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_result_bit.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_result_bit.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); function dec32bin($dec, $bits) { diff --git a/ext/mysqli/tests/mysqli_stmt_bind_result_references.phpt b/ext/mysqli/tests/mysqli_stmt_bind_result_references.phpt index 511f7e3e19..ee659d4b4a 100644 --- a/ext/mysqli/tests/mysqli_stmt_bind_result_references.phpt +++ b/ext/mysqli/tests/mysqli_stmt_bind_result_references.phpt @@ -8,7 +8,6 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; require('table.inc'); $stmt = mysqli_stmt_init($link); diff --git a/ext/mysqli/tests/mysqli_stmt_close.phpt b/ext/mysqli/tests/mysqli_stmt_close.phpt index b38f0cd684..64e76e54ce 100644 --- a/ext/mysqli/tests/mysqli_stmt_close.phpt +++ b/ext/mysqli/tests/mysqli_stmt_close.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_stmt_data_seek.phpt b/ext/mysqli/tests/mysqli_stmt_data_seek.phpt index 246158e4cb..a1cebeae80 100644 --- a/ext/mysqli/tests/mysqli_stmt_data_seek.phpt +++ b/ext/mysqli/tests/mysqli_stmt_data_seek.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt b/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt index 25c183a2a1..b23f94d81e 100644 --- a/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt +++ b/ext/mysqli/tests/mysqli_stmt_datatype_change.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); if (!$c1 = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { printf("Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", $host, $user, $db, $port, $socket); @@ -56,7 +56,7 @@ require_once('skipifconnectfailure.inc'); ?> --CLEAN-- <?php -include "connect.inc"; +require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/mysqli_stmt_errno.phpt b/ext/mysqli/tests/mysqli_stmt_errno.phpt index 59fde718da..070f2514a2 100644 --- a/ext/mysqli/tests/mysqli_stmt_errno.phpt +++ b/ext/mysqli/tests/mysqli_stmt_errno.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_stmt_error.phpt b/ext/mysqli/tests/mysqli_stmt_error.phpt index ffb77fe0a5..e18aa07f32 100644 --- a/ext/mysqli/tests/mysqli_stmt_error.phpt +++ b/ext/mysqli/tests/mysqli_stmt_error.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_stmt_execute.phpt b/ext/mysqli/tests/mysqli_stmt_execute.phpt index d1d62c206f..61763864e5 100644 --- a/ext/mysqli/tests/mysqli_stmt_execute.phpt +++ b/ext/mysqli/tests/mysqli_stmt_execute.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt b/ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt index afedea42df..29e3947a78 100644 --- a/ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt +++ b/ext/mysqli/tests/mysqli_stmt_execute_stored_proc.phpt @@ -183,7 +183,7 @@ if (mysqli_get_server_version($link) <= 50000) { ?> --CLEAN-- <?php -include "connect.inc"; +require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()); diff --git a/ext/mysqli/tests/mysqli_stmt_fetch.phpt b/ext/mysqli/tests/mysqli_stmt_fetch.phpt index 6f7014831f..fca510003e 100644 --- a/ext/mysqli/tests/mysqli_stmt_fetch.phpt +++ b/ext/mysqli/tests/mysqli_stmt_fetch.phpt @@ -13,7 +13,7 @@ require_once('skipifconnectfailure.inc'); mysqli_stmt_bind_result.phpt already. Restrict this test case to the basics. */ - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_stmt_fetch_fields_win32_unicode.phpt b/ext/mysqli/tests/mysqli_stmt_fetch_fields_win32_unicode.phpt index e63591a108..0cbc05f6c7 100644 --- a/ext/mysqli/tests/mysqli_stmt_fetch_fields_win32_unicode.phpt +++ b/ext/mysqli/tests/mysqli_stmt_fetch_fields_win32_unicode.phpt @@ -8,8 +8,8 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; - require('table.inc'); + require_once("connect.inc"); + require_once('table.inc'); $bind_res = $id = null; if (!($stmt = mysqli_stmt_init($link)) || diff --git a/ext/mysqli/tests/mysqli_stmt_field_count.phpt b/ext/mysqli/tests/mysqli_stmt_field_count.phpt index 2dbf487ac3..7dfd3a400c 100644 --- a/ext/mysqli/tests/mysqli_stmt_field_count.phpt +++ b/ext/mysqli/tests/mysqli_stmt_field_count.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_stmt_free_result.phpt b/ext/mysqli/tests/mysqli_stmt_free_result.phpt index 12c1a34bcb..08b33b7959 100644 --- a/ext/mysqli/tests/mysqli_stmt_free_result.phpt +++ b/ext/mysqli/tests/mysqli_stmt_free_result.phpt @@ -13,7 +13,7 @@ require_once('skipifconnectfailure.inc'); mysqli_stmt_bind_result.phpt already. Restrict this test case to the basics. */ - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_stmt_get_result.phpt b/ext/mysqli/tests/mysqli_stmt_get_result.phpt index 58a7f0cde0..fe18be40c3 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result.phpt @@ -16,7 +16,7 @@ if (!function_exists('mysqli_stmt_get_result')) mysqli_stmt_bind_result.phpt already. Restrict this test case to the basics. */ - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_stmt_get_result2.phpt b/ext/mysqli/tests/mysqli_stmt_get_result2.phpt index 1f493d2f11..8c2aad1f12 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result2.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result2.phpt @@ -15,7 +15,7 @@ if (!function_exists('mysqli_stmt_get_result')) mysqli_stmt_bind_result.phpt already. Restrict this test case to the basics. */ - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_field_count.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_field_count.phpt index dab805c1b5..046f90438e 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result_field_count.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result_field_count.phpt @@ -11,7 +11,6 @@ mysqli_stmt_get_result() - meta data, field_count() ?> --FILE-- <?php - include "connect.inc"; require('table.inc'); if (!$stmt = mysqli_stmt_init($link)) diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt index 7fdabc001c..86898807ad 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result_metadata.phpt @@ -11,7 +11,6 @@ if (!function_exists('mysqli_stmt_get_result')) ?> --FILE-- <?php - include "connect.inc"; require('table.inc'); if (!$stmt = mysqli_stmt_init($link)) diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt index 43ec10c4f8..1a2dba4133 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result_metadata_fetch_field.phpt @@ -11,7 +11,6 @@ if (!function_exists('mysqli_stmt_get_result')) ?> --FILE-- <?php - include "connect.inc"; require('table.inc'); if (!($stmt = mysqli_stmt_init($link)) || diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_non_select.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_non_select.phpt index 717b39bd5b..c057f7d9fb 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result_non_select.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result_non_select.phpt @@ -16,7 +16,6 @@ if (!function_exists('mysqli_stmt_get_result')) mysqli_stmt_bind_result.phpt already. Restrict this test case to the basics. */ - include "connect.inc"; require('table.inc'); if (!$stmt = mysqli_stmt_init($link)) diff --git a/ext/mysqli/tests/mysqli_stmt_get_result_seek.phpt b/ext/mysqli/tests/mysqli_stmt_get_result_seek.phpt index c4312c603d..ffb655d5fa 100644 --- a/ext/mysqli/tests/mysqli_stmt_get_result_seek.phpt +++ b/ext/mysqli/tests/mysqli_stmt_get_result_seek.phpt @@ -11,7 +11,6 @@ if (!function_exists('mysqli_stmt_get_result')) ?> --FILE-- <?php - include "connect.inc"; require('table.inc'); if (!$stmt = mysqli_stmt_init($link)) diff --git a/ext/mysqli/tests/mysqli_stmt_init.phpt b/ext/mysqli/tests/mysqli_stmt_init.phpt index 7d0154d24c..4f09719c87 100644 --- a/ext/mysqli/tests/mysqli_stmt_init.phpt +++ b/ext/mysqli/tests/mysqli_stmt_init.phpt @@ -13,7 +13,7 @@ require_once('skipifconnectfailure.inc'); mysqli_stmt_bind_result.phpt already. Restrict this test case to the basics. */ - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_stmt_insert_id.phpt b/ext/mysqli/tests/mysqli_stmt_insert_id.phpt index 0347e66bd5..c7a5affd9d 100644 --- a/ext/mysqli/tests/mysqli_stmt_insert_id.phpt +++ b/ext/mysqli/tests/mysqli_stmt_insert_id.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_stmt_num_rows.phpt b/ext/mysqli/tests/mysqli_stmt_num_rows.phpt index 4f3bc61428..28ee64fd51 100644 --- a/ext/mysqli/tests/mysqli_stmt_num_rows.phpt +++ b/ext/mysqli/tests/mysqli_stmt_num_rows.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_stmt_param_count.phpt b/ext/mysqli/tests/mysqli_stmt_param_count.phpt index f55acfbbdb..84bcfd9e8b 100644 --- a/ext/mysqli/tests/mysqli_stmt_param_count.phpt +++ b/ext/mysqli/tests/mysqli_stmt_param_count.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_stmt_prepare.phpt b/ext/mysqli/tests/mysqli_stmt_prepare.phpt index 115e1a52e6..3eb576aec3 100644 --- a/ext/mysqli/tests/mysqli_stmt_prepare.phpt +++ b/ext/mysqli/tests/mysqli_stmt_prepare.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); // Note: No SQL tests here! We can expand one of the *fetch() // tests to a generic SQL test, if we ever need that. diff --git a/ext/mysqli/tests/mysqli_stmt_reset.phpt b/ext/mysqli/tests/mysqli_stmt_reset.phpt index 9f8864d286..d731da2f5e 100644 --- a/ext/mysqli/tests/mysqli_stmt_reset.phpt +++ b/ext/mysqli/tests/mysqli_stmt_reset.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); // Note: No SQL tests here! We can expand one of the *fetch() // tests to a generic SQL test, if we ever need that. diff --git a/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt b/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt index 34d3bb2015..faccdf9e89 100644 --- a/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt +++ b/ext/mysqli/tests/mysqli_stmt_result_metadata.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt b/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt index f0b7757649..a7dad1b47c 100644 --- a/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt +++ b/ext/mysqli/tests/mysqli_stmt_result_metadata_sqltests.phpt @@ -10,7 +10,6 @@ die("skip Check again when the Klingons visit earth - http://bugs.mysql.com/bug. ?> --FILE-- <?php - include "connect.inc"; require('table.inc'); function testStatement($offset, $link, $sql, $expected_lib, $expected_mysqlnd, $check_mysqlnd, $compare) { diff --git a/ext/mysqli/tests/mysqli_stmt_send_long_data.phpt b/ext/mysqli/tests/mysqli_stmt_send_long_data.phpt index 4f173eff68..1a6a3d7dbf 100644 --- a/ext/mysqli/tests/mysqli_stmt_send_long_data.phpt +++ b/ext/mysqli/tests/mysqli_stmt_send_long_data.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_libmysql.phpt b/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_libmysql.phpt index 5bd40d84f4..a1fc2007fe 100644 --- a/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_libmysql.phpt +++ b/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_libmysql.phpt @@ -11,7 +11,6 @@ if (stristr(mysqli_get_client_info(), 'mysqlnd')) ?> --FILE-- <?php - include "connect.inc"; require('table.inc'); if (!$stmt = mysqli_stmt_init($link)) diff --git a/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_mysqlnd.phpt b/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_mysqlnd.phpt index be8e59544b..95d2302f4c 100644 --- a/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_mysqlnd.phpt +++ b/ext/mysqli/tests/mysqli_stmt_send_long_data_packet_size_mysqlnd.phpt @@ -11,7 +11,6 @@ if (!stristr(mysqli_get_client_info(), 'mysqlnd')) ?> --FILE-- <?php - include "connect.inc"; require('table.inc'); if (!$stmt = mysqli_stmt_init($link)) diff --git a/ext/mysqli/tests/mysqli_stmt_sqlstate.phpt b/ext/mysqli/tests/mysqli_stmt_sqlstate.phpt index b8a97cdef8..5ea35df240 100644 --- a/ext/mysqli/tests/mysqli_stmt_sqlstate.phpt +++ b/ext/mysqli/tests/mysqli_stmt_sqlstate.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_stmt_store_result.phpt b/ext/mysqli/tests/mysqli_stmt_store_result.phpt index ee0bf83a84..a6411ca937 100644 --- a/ext/mysqli/tests/mysqli_stmt_store_result.phpt +++ b/ext/mysqli/tests/mysqli_stmt_store_result.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_stmt_unclonable.phpt b/ext/mysqli/tests/mysqli_stmt_unclonable.phpt index edddbea948..57d8d6d6a6 100644 --- a/ext/mysqli/tests/mysqli_stmt_unclonable.phpt +++ b/ext/mysqli/tests/mysqli_stmt_unclonable.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", diff --git a/ext/mysqli/tests/mysqli_store_result.phpt b/ext/mysqli/tests/mysqli_store_result.phpt index 206cae3095..c61c124daf 100644 --- a/ext/mysqli/tests/mysqli_store_result.phpt +++ b/ext/mysqli/tests/mysqli_store_result.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_thread_id.phpt b/ext/mysqli/tests/mysqli_thread_id.phpt index a67060a1c4..3a7e1ae5da 100644 --- a/ext/mysqli/tests/mysqli_thread_id.phpt +++ b/ext/mysqli/tests/mysqli_thread_id.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_unclonable.phpt b/ext/mysqli/tests/mysqli_unclonable.phpt index d21eafa797..e332b9f24f 100644 --- a/ext/mysqli/tests/mysqli_unclonable.phpt +++ b/ext/mysqli/tests/mysqli_unclonable.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", diff --git a/ext/mysqli/tests/mysqli_use_result.phpt b/ext/mysqli/tests/mysqli_use_result.phpt index d1b09f1043..25d16926a8 100644 --- a/ext/mysqli/tests/mysqli_use_result.phpt +++ b/ext/mysqli/tests/mysqli_use_result.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_warning_count.phpt b/ext/mysqli/tests/mysqli_warning_count.phpt index 0293fe8696..cff9c02b1f 100644 --- a/ext/mysqli/tests/mysqli_warning_count.phpt +++ b/ext/mysqli/tests/mysqli_warning_count.phpt @@ -8,7 +8,7 @@ require_once('skipifconnectfailure.inc'); ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); $tmp = NULL; $link = NULL; diff --git a/ext/mysqli/tests/mysqli_warning_unclonable.phpt b/ext/mysqli/tests/mysqli_warning_unclonable.phpt index 57d5de764c..d3ae47d0b4 100644 --- a/ext/mysqli/tests/mysqli_warning_unclonable.phpt +++ b/ext/mysqli/tests/mysqli_warning_unclonable.phpt @@ -11,7 +11,7 @@ if (!$TEST_EXPERIMENTAL) ?> --FILE-- <?php - include "connect.inc"; + require_once("connect.inc"); if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) printf("[001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n", |