uw Wed Jul 11 14:36:26 2007 UTC Modified files: /php-src/ext/mysql/tests mysql_field_name.phpt mysql_field_seek.phpt mysql_field_table.phpt Log: Removing reference to skipifemb.inc which is not needed and Whitespace/Coding Standards.
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_field_name.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/mysql/tests/mysql_field_name.phpt diff -u php-src/ext/mysql/tests/mysql_field_name.phpt:1.1 php-src/ext/mysql/tests/mysql_field_name.phpt:1.2 --- php-src/ext/mysql/tests/mysql_field_name.phpt:1.1 Sun Nov 19 12:14:44 2006 +++ php-src/ext/mysql/tests/mysql_field_name.phpt Wed Jul 11 14:36:26 2007 @@ -2,42 +2,41 @@ mysql_field_name() --SKIPIF-- <?php require_once('skipif.inc'); ?> -<?php require_once('skipifemb.inc'); ?> --FILE-- <?php - include "connect.inc"; +include "connect.inc"; - $tmp = NULL; - $link = NULL; - - if (!is_null($tmp = @mysql_field_name())) - printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); - - if (null !== ($tmp = @mysql_field_name($link))) - printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); - - require('table.inc'); - if (!$res = mysql_query("SELECT id, label FROM test ORDER BY id LIMIT 2", $link)) { - printf("[003] [%d] %s\n", mysql_errno($link), mysql_error($link)); - } - - if (NULL !== ($tmp = mysql_field_name($res))) - printf("[004] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); - - if (false !== ($tmp = mysql_field_name($res, -1))) - printf("[005] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp); - - var_dump(mysql_field_name($res, 0)); - - if (false !== ($tmp = mysql_field_name($res, 2))) - printf("[008] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp); - - mysql_free_result($res); - - var_dump(mysql_field_name($res, 0)); - - mysql_close($link); - print "done!"; +$tmp = NULL; +$link = NULL; + +if (!is_null($tmp = @mysql_field_name())) + printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + +if (null !== ($tmp = @mysql_field_name($link))) + printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + +require('table.inc'); +if (!$res = mysql_query("SELECT id, label FROM test ORDER BY id LIMIT 2", $link)) { + printf("[003] [%d] %s\n", mysql_errno($link), mysql_error($link)); +} + +if (NULL !== ($tmp = mysql_field_name($res))) + printf("[004] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + +if (false !== ($tmp = mysql_field_name($res, -1))) + printf("[005] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp); + +var_dump(mysql_field_name($res, 0)); + +if (false !== ($tmp = mysql_field_name($res, 2))) + printf("[008] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp); + +mysql_free_result($res); + +var_dump(mysql_field_name($res, 0)); + +mysql_close($link); +print "done!"; ?> --EXPECTF-- Warning: Wrong parameter count for mysql_field_name() in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_field_seek.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/mysql/tests/mysql_field_seek.phpt diff -u php-src/ext/mysql/tests/mysql_field_seek.phpt:1.1 php-src/ext/mysql/tests/mysql_field_seek.phpt:1.2 --- php-src/ext/mysql/tests/mysql_field_seek.phpt:1.1 Sun Nov 19 12:14:44 2006 +++ php-src/ext/mysql/tests/mysql_field_seek.phpt Wed Jul 11 14:36:26 2007 @@ -2,40 +2,39 @@ mysql_field_seek() --SKIPIF-- <?php require_once('skipif.inc'); ?> -<?php require_once('skipifemb.inc'); ?> --FILE-- <?php - include "connect.inc"; +include "connect.inc"; - $tmp = NULL; - $link = NULL; - - if (!is_null($tmp = @mysql_field_seek())) - printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); - - if (!is_null($tmp = @mysql_field_seek($link))) - printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); - - require('table.inc'); - if (!$res = mysql_query("SELECT id, label FROM test ORDER BY id LIMIT 1", $link)) { - printf("[003] [%d] %s\n", mysql_errno($link), mysql_error($link)); - } - - var_dump(mysql_field_seek($res, -1)); - var_dump(mysql_fetch_field($res)); - var_dump(mysql_field_seek($res, 0)); - var_dump(mysql_fetch_field($res)); - var_dump(mysql_field_seek($res, 1)); - var_dump(mysql_fetch_field($res)); - var_dump(mysql_field_seek($res, 2)); - var_dump(mysql_fetch_field($res)); - - mysql_free_result($res); - - var_dump(mysql_field_seek($res, 0)); - - mysql_close($link); - print "done!"; +$tmp = NULL; +$link = NULL; + +if (!is_null($tmp = @mysql_field_seek())) + printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + +if (!is_null($tmp = @mysql_field_seek($link))) + printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + +require('table.inc'); +if (!$res = mysql_query("SELECT id, label FROM test ORDER BY id LIMIT 1", $link)) { + printf("[003] [%d] %s\n", mysql_errno($link), mysql_error($link)); +} + +var_dump(mysql_field_seek($res, -1)); +var_dump(mysql_fetch_field($res)); +var_dump(mysql_field_seek($res, 0)); +var_dump(mysql_fetch_field($res)); +var_dump(mysql_field_seek($res, 1)); +var_dump(mysql_fetch_field($res)); +var_dump(mysql_field_seek($res, 2)); +var_dump(mysql_fetch_field($res)); + +mysql_free_result($res); + +var_dump(mysql_field_seek($res, 0)); + +mysql_close($link); +print "done!"; ?> --EXPECTF-- Warning: mysql_field_seek(): Field -1 is invalid for MySQL result index %d in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_field_table.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/mysql/tests/mysql_field_table.phpt diff -u php-src/ext/mysql/tests/mysql_field_table.phpt:1.1 php-src/ext/mysql/tests/mysql_field_table.phpt:1.2 --- php-src/ext/mysql/tests/mysql_field_table.phpt:1.1 Sun Nov 19 12:14:44 2006 +++ php-src/ext/mysql/tests/mysql_field_table.phpt Wed Jul 11 14:36:26 2007 @@ -2,42 +2,41 @@ mysql_field_table() --SKIPIF-- <?php require_once('skipif.inc'); ?> -<?php require_once('skipifemb.inc'); ?> --FILE-- <?php - include "connect.inc"; +include "connect.inc"; - $tmp = NULL; - $link = NULL; - - if (!is_null($tmp = @mysql_field_table())) - printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); - - if (null !== ($tmp = @mysql_field_table($link))) - printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); - - require('table.inc'); - if (!$res = mysql_query("SELECT id, label FROM test ORDER BY id LIMIT 2", $link)) { - printf("[003] [%d] %s\n", mysql_errno($link), mysql_error($link)); - } - - if (NULL !== ($tmp = mysql_field_table($res))) - printf("[004] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); - - if (false !== ($tmp = mysql_field_table($res, -1))) - printf("[005] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp); - - var_dump(mysql_field_table($res, 0)); - - if (false !== ($tmp = mysql_field_table($res, 2))) - printf("[008] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp); - - mysql_free_result($res); - - var_dump(mysql_field_table($res, 0)); - - mysql_close($link); - print "done!"; +$tmp = NULL; +$link = NULL; + +if (!is_null($tmp = @mysql_field_table())) + printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + +if (null !== ($tmp = @mysql_field_table($link))) + printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + +require('table.inc'); +if (!$res = mysql_query("SELECT id, label FROM test ORDER BY id LIMIT 2", $link)) { + printf("[003] [%d] %s\n", mysql_errno($link), mysql_error($link)); +} + +if (NULL !== ($tmp = mysql_field_table($res))) + printf("[004] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + +if (false !== ($tmp = mysql_field_table($res, -1))) + printf("[005] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp); + +var_dump(mysql_field_table($res, 0)); + +if (false !== ($tmp = mysql_field_table($res, 2))) + printf("[008] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp); + +mysql_free_result($res); + +var_dump(mysql_field_table($res, 0)); + +mysql_close($link); +print "done!"; ?> --EXPECTF-- Warning: Wrong parameter count for mysql_field_table() in %s on line %d
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php