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

tweaking EXPECTF.

diff --git a/ext/mysql/tests/mysql_fetch_object.phpt b/ext/mysql/tests/mysql_fetch_object.phpt
index d2e772062fe1cdf0fef52f332dc059828db36d1b..cd4c01f8751fc709bff1d3fddc23e351b109e343 100644 (file)
--- a/ext/mysql/tests/mysql_fetch_object.phpt
+++ b/ext/mysql/tests/mysql_fetch_object.phpt
@@ -2,69 +2,68 @@
 mysql_fetch_object()
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
 --FILE--
 <?php
-    include "connect.inc";
-
-    $tmp    = NULL;
-    $link   = NULL;
-
-    if (!is_null($tmp = @mysql_fetch_object()))
-        printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
-
-    if (false !== ($tmp = @mysql_fetch_object($link)))
-        printf("[002] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);                
-
-    require('table.inc');
-    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));
-    }
-    
-    var_dump(mysql_fetch_object($res));
-            
-    class mysql_fetch_object_test {
-        
-        public $a = null;
-        public $b = null;              
-        
-        public function toString() {
-            var_dump($this);
-        }        
-    }
-    
-    var_dump(mysql_fetch_object($res, 'mysql_fetch_object_test'));
-        
-    class mysql_fetch_object_construct extends mysql_fetch_object_test {
-        
-        public function __construct($a, $b) {
-            $this->a = $a;
-            $this->b = $b;
-        }
-        
-    }
-    
-    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', 'b')));    
-    var_dump(mysql_fetch_object($res, 'mysql_fetch_object_construct', array('a', 'b', 'c')));    
-    var_dump(mysql_fetch_object($res));
-    
-    mysql_free_result($res); 
-    
-    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));
-    }
-    
-    mysql_free_result($res);
-    
-    var_dump(mysql_fetch_object($res));
-    
-    // Fatal error, script execution will end
-    var_dump(mysql_fetch_object($res, 'this_class_does_not_exist'));   
-    
-    mysql_close($link);
-    print "done!";
+include "connect.inc";
+
+$tmp    = NULL;
+$link   = NULL;
+
+if (!is_null($tmp = @mysql_fetch_object()))
+       printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+if (false !== ($tmp = @mysql_fetch_object($link)))
+       printf("[002] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+require('table.inc');
+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));
+}
+
+var_dump(mysql_fetch_object($res));
+
+class mysql_fetch_object_test {
+
+       public $a = null;
+       public $b = null;
+
+       public function toString() {
+               var_dump($this);
+       }
+}
+
+var_dump(mysql_fetch_object($res, 'mysql_fetch_object_test'));
+
+class mysql_fetch_object_construct extends mysql_fetch_object_test {
+
+       public function __construct($a, $b) {
+               $this->a = $a;
+               $this->b = $b;
+       }
+
+}
+
+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', 'b')));
+var_dump(mysql_fetch_object($res, 'mysql_fetch_object_construct', array('a', 'b', 'c')));
+var_dump(mysql_fetch_object($res));
+
+mysql_free_result($res);
+
+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));
+}
+
+mysql_free_result($res);
+
+var_dump(mysql_fetch_object($res));
+
+// Fatal error, script execution will end
+var_dump(mysql_fetch_object($res, 'this_class_does_not_exist'));
+
+mysql_close($link);
+print "done!";
 ?>
 --EXPECTF--
 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: b in %s on line %d
-object(mysql_fetch_object_construct)#1 (4) {
+object(mysql_fetch_object_construct)#%d (4) {
   ["a"]=>
   NULL
   ["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
 
 Notice: Undefined variable: b in %s on line %d
-object(mysql_fetch_object_construct)#1 (4) {
+object(mysql_fetch_object_construct)#%d (4) {
   ["a"]=>
   string(1) "a"
   ["b"]=>
@@ -115,7 +114,7 @@ object(mysql_fetch_object_construct)#1 (4) {
   ["label"]=>
   string(1) "d"
 }
-object(mysql_fetch_object_construct)#1 (4) {
+object(mysql_fetch_object_construct)#%d (4) {
   ["a"]=>
   string(1) "a"
   ["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: b in %s on line %d
-object(mysql_fetch_object_construct)#1 (4) {
+object(mysql_fetch_object_construct)#%d (4) {
   [u"a"]=>
   NULL
   [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
 
 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"]=>
   unicode(1) "a"
   [u"b"]=>
@@ -181,7 +180,7 @@ object(mysql_fetch_object_construct)#1 (4) {
   [u"label"]=>
   unicode(1) "d"
 }
-object(mysql_fetch_object_construct)#1 (4) {
+object(mysql_fetch_object_construct)#%d (4) {
   [u"a"]=>
   unicode(1) "a"
   [u"b"]=>