Whitespace/Coding Standards, removing reference to skipifemb.inc,

tweaking EXPECTF.
This commit is contained in:
Ulf Wendel 2007-07-11 13:56:37 +00:00
parent 6c353e1046
commit cbe689d16c

View file

@ -2,69 +2,68 @@
mysql_fetch_object() mysql_fetch_object()
--SKIPIF-- --SKIPIF--
<?php require_once('skipif.inc'); ?> <?php require_once('skipif.inc'); ?>
<?php require_once('skipifemb.inc'); ?>
--FILE-- --FILE--
<?php <?php
include "connect.inc"; include "connect.inc";
$tmp = NULL; $tmp = NULL;
$link = NULL; $link = NULL;
if (!is_null($tmp = @mysql_fetch_object())) if (!is_null($tmp = @mysql_fetch_object()))
printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
if (false !== ($tmp = @mysql_fetch_object($link))) if (false !== ($tmp = @mysql_fetch_object($link)))
printf("[002] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp); printf("[002] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
require('table.inc'); require('table.inc');
if (!$res = mysql_query("SELECT id AS ID, label FROM test AS TEST ORDER BY id LIMIT 5", $link)) { if (!$res = mysql_query("SELECT id AS ID, label FROM test AS TEST ORDER BY id LIMIT 5", $link)) {
printf("[003] [%d] %s\n", mysql_errno($link), mysql_error($link)); printf("[003] [%d] %s\n", mysql_errno($link), mysql_error($link));
} }
var_dump(mysql_fetch_object($res)); var_dump(mysql_fetch_object($res));
class mysql_fetch_object_test { class mysql_fetch_object_test {
public $a = null; public $a = null;
public $b = null; public $b = null;
public function toString() { public function toString() {
var_dump($this); var_dump($this);
} }
} }
var_dump(mysql_fetch_object($res, 'mysql_fetch_object_test')); var_dump(mysql_fetch_object($res, 'mysql_fetch_object_test'));
class mysql_fetch_object_construct extends mysql_fetch_object_test { class mysql_fetch_object_construct extends mysql_fetch_object_test {
public function __construct($a, $b) { public function __construct($a, $b) {
$this->a = $a; $this->a = $a;
$this->b = $b; $this->b = $b;
} }
} }
var_dump(mysql_fetch_object($res, 'mysql_fetch_object_construct', null)); var_dump(mysql_fetch_object($res, 'mysql_fetch_object_construct', null));
var_dump(mysql_fetch_object($res, 'mysql_fetch_object_construct', array('a'))); var_dump(mysql_fetch_object($res, 'mysql_fetch_object_construct', array('a')));
var_dump(mysql_fetch_object($res, 'mysql_fetch_object_construct', array('a', 'b'))); var_dump(mysql_fetch_object($res, 'mysql_fetch_object_construct', array('a', 'b')));
var_dump(mysql_fetch_object($res, 'mysql_fetch_object_construct', array('a', 'b', 'c'))); var_dump(mysql_fetch_object($res, 'mysql_fetch_object_construct', array('a', 'b', 'c')));
var_dump(mysql_fetch_object($res)); var_dump(mysql_fetch_object($res));
mysql_free_result($res); mysql_free_result($res);
if (!$res = mysql_query("SELECT id AS ID, label FROM test AS TEST", $link)) { if (!$res = mysql_query("SELECT id AS ID, label FROM test AS TEST", $link)) {
printf("[009] [%d] %s\n", mysql_errno($link), mysql_error($link)); printf("[009] [%d] %s\n", mysql_errno($link), mysql_error($link));
} }
mysql_free_result($res); mysql_free_result($res);
var_dump(mysql_fetch_object($res)); var_dump(mysql_fetch_object($res));
// Fatal error, script execution will end // Fatal error, script execution will end
var_dump(mysql_fetch_object($res, 'this_class_does_not_exist')); var_dump(mysql_fetch_object($res, 'this_class_does_not_exist'));
mysql_close($link); mysql_close($link);
print "done!"; print "done!";
?> ?>
--EXPECTF-- --EXPECTF--
object(stdClass)#%d (2) { object(stdClass)#%d (2) {
@ -91,7 +90,7 @@ Warning: Missing argument 2 for mysql_fetch_object_construct::__construct() in %
Notice: Undefined variable: a in %s on line %d Notice: Undefined variable: a in %s on line %d
Notice: Undefined variable: b in %s on line %d Notice: Undefined variable: b in %s on line %d
object(mysql_fetch_object_construct)#1 (4) { object(mysql_fetch_object_construct)#%d (4) {
["a"]=> ["a"]=>
NULL NULL
["b"]=> ["b"]=>
@ -105,7 +104,7 @@ object(mysql_fetch_object_construct)#1 (4) {
Warning: Missing argument 2 for mysql_fetch_object_construct::__construct() in %s on line %d Warning: Missing argument 2 for mysql_fetch_object_construct::__construct() in %s on line %d
Notice: Undefined variable: b in %s on line %d Notice: Undefined variable: b in %s on line %d
object(mysql_fetch_object_construct)#1 (4) { object(mysql_fetch_object_construct)#%d (4) {
["a"]=> ["a"]=>
string(1) "a" string(1) "a"
["b"]=> ["b"]=>
@ -115,7 +114,7 @@ object(mysql_fetch_object_construct)#1 (4) {
["label"]=> ["label"]=>
string(1) "d" string(1) "d"
} }
object(mysql_fetch_object_construct)#1 (4) { object(mysql_fetch_object_construct)#%d (4) {
["a"]=> ["a"]=>
string(1) "a" string(1) "a"
["b"]=> ["b"]=>
@ -157,7 +156,7 @@ Warning: Missing argument 2 for mysql_fetch_object_construct::__construct() in %
Notice: Undefined variable: a in %s on line %d Notice: Undefined variable: a in %s on line %d
Notice: Undefined variable: b in %s on line %d Notice: Undefined variable: b in %s on line %d
object(mysql_fetch_object_construct)#1 (4) { object(mysql_fetch_object_construct)#%d (4) {
[u"a"]=> [u"a"]=>
NULL NULL
[u"b"]=> [u"b"]=>
@ -171,7 +170,7 @@ object(mysql_fetch_object_construct)#1 (4) {
Warning: Missing argument 2 for mysql_fetch_object_construct::__construct() in %s on line %d Warning: Missing argument 2 for mysql_fetch_object_construct::__construct() in %s on line %d
Notice: Undefined variable: b in %s on line %d Notice: Undefined variable: b in %s on line %d
object(mysql_fetch_object_construct)#1 (4) { object(mysql_fetch_object_construct)#%d (4) {
[u"a"]=> [u"a"]=>
unicode(1) "a" unicode(1) "a"
[u"b"]=> [u"b"]=>
@ -181,7 +180,7 @@ object(mysql_fetch_object_construct)#1 (4) {
[u"label"]=> [u"label"]=>
unicode(1) "d" unicode(1) "d"
} }
object(mysql_fetch_object_construct)#1 (4) { object(mysql_fetch_object_construct)#%d (4) {
[u"a"]=> [u"a"]=>
unicode(1) "a" unicode(1) "a"
[u"b"]=> [u"b"]=>