From: Ulf Wendel <uw@php.net>
Date: Thu, 12 Jul 2007 10:18:14 +0000 (+0000)
Subject: Whitespace/CS only
X-Git-Tag: BEFORE_IMPORT_OF_MYSQLND~194
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e58bb463291e4fe39f6b9489ca80e4a2f22087a8;p=php

Whitespace/CS only
---

diff --git a/ext/mysql/tests/mysql_num_rows.phpt b/ext/mysql/tests/mysql_num_rows.phpt
index 978afa9801..db34134e5d 100644
--- a/ext/mysql/tests/mysql_num_rows.phpt
+++ b/ext/mysql/tests/mysql_num_rows.phpt
@@ -2,59 +2,57 @@
 mysql_num_rows()
 --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_num_rows()))
-        printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
-        
-    if (false !== ($tmp = @mysql_num_rows($link)))
-        printf("[002] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
-
-    require('table.inc');
-    
-    function func_test_mysql_num_rows($link, $query, $expected, $offset, $test_free = false) {
-        
-        if (!$res = mysql_query($query, $link)) {
-            printf("[%03d] [%d] %s\n", $offset, mysql_errno($link), mysql_error($link));
-            return;
-        }
-            
-        if ($expected !== ($tmp = mysql_num_rows($res)))
-            printf("[%03d] Expecting %s/%d, got %s/%d\n", $offset + 1, 
-                gettype($expected), $expected,
-                gettype($tmp), $tmp);
-            
-        mysql_free_result($res);
-        
-        if ($test_free && (false !== ($tmp = mysql_num_rows($res))))
-            printf("[%03d] Expecting boolean/false, got %s/%s\n", $offset + 2, gettype($tmp), $tmp);
-            
-    }   
-    
-    func_test_mysql_num_rows($link, "SELECT 1 AS a", 1, 5);
-    func_test_mysql_num_rows($link, "SHOW VARIABLES LIKE '%nixnutz%'", 0, 10);
-    func_test_mysql_num_rows($link, "INSERT INTO test(id, label) VALUES (100, 'z')", false, 15);
-    func_test_mysql_num_rows($link, "SELECT id FROM test LIMIT 2", 2, 20, true);
-    
-    if ($res = mysql_query('SELECT COUNT(id) AS num FROM test', $link)) {
-        
-        $row = mysql_fetch_assoc($res);
-        mysql_free_result($res);
-        
-        func_test_mysql_num_rows($link, "SELECT id, label FROM test", (int)$row['num'], 25);
-        
-    } else {
-       printf("[030] [%d] %s\n", mysql_errno($link), mysql_error($link));        
-    }
-                    
-    mysql_close($link);
-    print "done!";
+include "connect.inc";
+
+$tmp    = NULL;
+$link   = NULL;
+
+if (!is_null($tmp = @mysql_num_rows()))
+printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+if (false !== ($tmp = @mysql_num_rows($link)))
+printf("[002] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+require('table.inc');
+
+function func_test_mysql_num_rows($link, $query, $expected, $offset, $test_free = false) {
+
+	if (!$res = mysql_query($query, $link)) {
+		printf("[%03d] [%d] %s\n", $offset, mysql_errno($link), mysql_error($link));
+		return;
+	}
+
+	if ($expected !== ($tmp = mysql_num_rows($res)))
+		printf("[%03d] Expecting %s/%d, got %s/%d\n", $offset + 1,
+			gettype($expected), $expected,
+			gettype($tmp), $tmp);
+
+	mysql_free_result($res);
+
+	if ($test_free && (false !== ($tmp = mysql_num_rows($res))))
+		printf("[%03d] Expecting boolean/false, got %s/%s\n", $offset + 2, gettype($tmp), $tmp);
+}
+
+func_test_mysql_num_rows($link, "SELECT 1 AS a", 1, 5);
+func_test_mysql_num_rows($link, "SHOW VARIABLES LIKE '%nixnutz%'", 0, 10);
+func_test_mysql_num_rows($link, "INSERT INTO test(id, label) VALUES (100, 'z')", false, 15);
+func_test_mysql_num_rows($link, "SELECT id FROM test LIMIT 2", 2, 20, true);
+
+if ($res = mysql_query('SELECT COUNT(id) AS num FROM test', $link)) {
+
+	$row = mysql_fetch_assoc($res);
+	mysql_free_result($res);
+
+	func_test_mysql_num_rows($link, "SELECT id, label FROM test", (int)$row['num'], 25);
+
+} else {
+	printf("[030] [%d] %s\n", mysql_errno($link), mysql_error($link));
+}
+
+mysql_close($link);
+print "done!";
 ?>
 --EXPECTF--
 Warning: mysql_num_rows(): supplied argument is not a valid MySQL result resource in %s on line %d