PHP mysqlnd svn commit: r714 - trunk/tests/ext/mysql

[uwendel]

Author: uwendel
Date: 2007-07-11 16:34:06 +0200 (Wed, 11 Jul 2007)
New Revision: 714

Modified:
   trunk/tests/ext/mysql/mysql_field_name.phpt
   trunk/tests/ext/mysql/mysql_field_seek.phpt
   trunk/tests/ext/mysql/mysql_field_table.phpt
Log:
Yet another Whitespace/Coding Standard commit while merging the tests with the php.net
repro


Modified: trunk/tests/ext/mysql/mysql_field_name.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_field_name.phpt	2007-07-11 14:26:57 UTC (rev 713)
+++ trunk/tests/ext/mysql/mysql_field_name.phpt	2007-07-11 14:34:06 UTC (rev 714)
@@ -4,39 +4,39 @@
 <?php require_once('skipif.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);
+$tmp    = NULL;
+$link   = NULL;
 
-    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 (!is_null($tmp = @mysql_field_name()))
+	printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
 
-    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!";
+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

Modified: trunk/tests/ext/mysql/mysql_field_seek.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_field_seek.phpt	2007-07-11 14:26:57 UTC (rev 713)
+++ trunk/tests/ext/mysql/mysql_field_seek.phpt	2007-07-11 14:34:06 UTC (rev 714)
@@ -4,37 +4,37 @@
 <?php require_once('skipif.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);
+$tmp    = NULL;
+$link   = NULL;
 
-    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!";
+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

Modified: trunk/tests/ext/mysql/mysql_field_table.phpt
===================================================================
--- trunk/tests/ext/mysql/mysql_field_table.phpt	2007-07-11 14:26:57 UTC (rev 713)
+++ trunk/tests/ext/mysql/mysql_field_table.phpt	2007-07-11 14:34:06 UTC (rev 714)
@@ -4,39 +4,39 @@
 <?php require_once('skipif.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);
+$tmp    = NULL;
+$link   = NULL;
 
-    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 (!is_null($tmp = @mysql_field_table()))
+	printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
 
-    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!";
+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