uw Wed Jul 11 14:44:18 2007 UTC Modified files: /php-src/ext/mysql/tests mysql_free_result.phpt Log: Whitespace/Coding Standards and new check what happens if one tries to free not a mysql resource but a file resource. http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_free_result.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/mysql/tests/mysql_free_result.phpt diff -u php-src/ext/mysql/tests/mysql_free_result.phpt:1.1 php-src/ext/mysql/tests/mysql_free_result.phpt:1.2 --- php-src/ext/mysql/tests/mysql_free_result.phpt:1.1 Sun Nov 19 12:14:44 2006 +++ php-src/ext/mysql/tests/mysql_free_result.phpt Wed Jul 11 14:44:18 2007 @@ -2,30 +2,39 @@ mysql_free_result() --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_free_result())) - printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); - - if (false !== ($tmp = @mysql_free_result($link))) - printf("[002] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp); - - require('table.inc'); - if (!$res = mysql_query("SELECT id FROM test ORDER BY id LIMIT 1", $link)) { - printf("[003] [%d] %s\n", mysql_errno($link), mysql_error($link)); - } - - var_dump(mysql_free_result($res)); - var_dump(mysql_free_result($res)); - - mysql_close($link); - print "done!"; +$tmp = NULL; +$link = NULL; + +if (!is_null($tmp = @mysql_free_result())) + printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + +if (false !== ($tmp = @mysql_free_result($link))) + printf("[002] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp); + +require('table.inc'); +if (!$res = mysql_query("SELECT id FROM test ORDER BY id LIMIT 1", $link)) { + printf("[003] [%d] %s\n", mysql_errno($link), mysql_error($link)); +} + +var_dump(mysql_free_result($res)); +var_dump(mysql_free_result($res)); + +if ($tmp = sys_get_temp_dir()) { + $tmpname = tempnam($tmp, 'free_result'); + if ($fp = fopen($tmpname, 'w')) { + if (false !== ($tmp = @mysql_free_result($fp))) + printf("[004] Expecting boolean/false got %s/%s\n", gettype($tmp), $tmp); + fclose($fp); + @unlink($tmpname); + } +} + +mysql_close($link); +print "done!"; ?> --EXPECTF-- bool(true)
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php