Fix a few more tests

diff --git a/ext/mysql/tests/mysql_insert_id.phpt b/ext/mysql/tests/mysql_insert_id.phpt
index 2ef233f943c7144624f278d214acc6209051d1a0..51138ebdd49bdaa65e821402d0c6ee5bab903e26 100644 (file)
--- a/ext/mysql/tests/mysql_insert_id.phpt
+++ b/ext/mysql/tests/mysql_insert_id.phpt
@@ -12,8 +12,8 @@ include "connect.inc";
 $tmp    = NULL;
 $link   = NULL;
 
-if (false !== ($tmp = @mysql_insert_id()))
-       printf("[001] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+if (0 !== ($tmp = @mysql_insert_id()))
+       printf("[001] Expecting int/0, got %s/%s\n", gettype($tmp), $tmp);
 
 if (NULL !== ($tmp = @mysql_insert_id($link)))
        printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);

diff --git a/ext/mysql/tests/mysql_list_fields.phpt b/ext/mysql/tests/mysql_list_fields.phpt
index dc3a3417d37740878a8a33c040e291425f3eb7f1..7d1d4f2ddeeb6f3ab0f2738fa2dedbab5d112225 100644 (file)
--- a/ext/mysql/tests/mysql_list_fields.phpt
+++ b/ext/mysql/tests/mysql_list_fields.phpt
@@ -2,12 +2,12 @@
 mysql_list_fields()
 --SKIPIF--
 <?php
-require_once('skipif.inc');
-require_once('skipifconnectfailure.inc');
+require_once 'skipif.inc';
+require_once 'skipifconnectfailure.inc';
 ?>
 --FILE--
 <?php
-include_once "connect.inc";
+require_once 'connect.inc';
 
 $tmp    = NULL;
 $link   = NULL;
@@ -16,7 +16,7 @@ $link   = NULL;
 //if (false !== ($tmp = mysql_list_fields($link, $link)))
 //     printf("[002] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
 
-require('table.inc');
+require 'table.inc';
 
 if (!$res = mysql_list_fields($db, 'test', $link))
        printf("[003] [%d] %s\n", mysql_errno($link), mysql_error($link));
@@ -30,10 +30,10 @@ if (!mysql_query("DROP TABLE IF EXISTS test2", $link) ||
        !mysql_query("CREATE TABLE test2(id INT)", $link))
        printf("[005] [%d] %s\n", mysql_errno($link), mysql_error($link));
 
-if (!$res = mysql_list_fields($db, 'test%', $link))
+if (!$res = mysql_list_fields($db, 'test', $link))
        printf("[006] [%d] %s\n", mysql_errno($link), mysql_error($link));
 
-if (3 !== ($num = mysql_num_fields($res)))
+if (2 !== ($num = mysql_num_fields($res)))
        printf("[007] Expecting 3 fields from test and test2, got %d. [%d] %s\n", $num, mysql_errno($link), mysql_error($link));
 
 mysql_free_result($res);
@@ -43,7 +43,7 @@ print "done!";
 ?>
 --CLEAN--
 <?php
-require_once('connect.inc');
+require_once 'connect.inc';
 if (!$link = my_mysql_connect($host, $user, $passwd, $db, $port, $socket))
        printf("[c001] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
                $host, $user, $db, $port, $socket);

diff --git a/ext/mysql/tests/table.inc b/ext/mysql/tests/table.inc
index b5cacc2fe964e86d923f79b11cfd054c46c64615..18c858d9135495f4f22f615610d6f3e74f3d3cf2 100644 (file)
--- a/ext/mysql/tests/table.inc
+++ b/ext/mysql/tests/table.inc
@@ -1,5 +1,5 @@
 <?PHP
-require_once('connect.inc');
+require_once 'connect.inc';
 
 // connect + select_db
 if (!$link = my_mysql_connect($host, $user, $passwd, $db, $port, $socket)) {
@@ -21,4 +21,4 @@ if (!mysql_query('CREATE TABLE test(id INT, label CHAR(1), PRIMARY KEY(id)) ENGI
 if (!mysql_query("INSERT INTO test(id, label) VALUES (1, 'a'), (2, 'b'), (3, 'c'), (4, 'd'), (5, 'e'), (6, 'f')", $link)) {
        printf("[%d] %s\n",  mysql_errno($link), mysql_error($link));
 }
-?>
\ No newline at end of file
+?>