From: Ulf Wendel <uw@php.net>
Date: Wed, 11 Jul 2007 15:07:28 +0000 (+0000)
Subject: Mainly Whitespace/CS changes. Partly "too many arguments" check added.
X-Git-Tag: BEFORE_IMPORT_OF_MYSQLND~222
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3f0339a42c18b2b6ed4113a3f923789e68984ecb;p=php

Mainly Whitespace/CS changes. Partly "too many arguments" check added.
---

diff --git a/ext/mysql/tests/mysql_get_host_info.phpt b/ext/mysql/tests/mysql_get_host_info.phpt
index e6f5ee463c..73468319f6 100644
--- a/ext/mysql/tests/mysql_get_host_info.phpt
+++ b/ext/mysql/tests/mysql_get_host_info.phpt
@@ -4,30 +4,34 @@ mysql_get_host_info()
 <?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
-    include_once "connect.inc";
-        
-    if (false !== ($tmp = @mysql_get_host_info(NULL)))
-        printf("[001] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
-        
-    require "table.inc";    
-    if (!is_string($info = mysql_get_host_info($link)) || ('' === $info))
-        printf("[003] Expecting string/any_non_empty, got %s/%s\n", gettype($info), $info);
-        
-    $def_info = mysql_get_host_info();
-    if ($def_info !== $info) {
-        printf("[004] Host info for the default link and the specified link differ, [%d] %s\n",
-            mysql_errno(), mysql_error());
-            
-        var_dump($def_info);
-        var_dump($info);            
-    }
-                
-    if (ini_get('unicode.semantics') && !is_unicode($info)) {
-        printf("[005] Expecting Unicode error message!\n");
-        var_inspect($info);
-    }        
+include_once "connect.inc";
 
-    print "done!";
+if (false !== ($tmp = @mysql_get_host_info(NULL)))
+	printf("[001] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+require "table.inc";
+if (!is_string($info = mysql_get_host_info($link)) || ('' === $info))
+	printf("[003] Expecting string/any_non_empty, got %s/%s\n", gettype($info), $info);
+
+$def_info = mysql_get_host_info();
+if ($def_info !== $info) {
+	printf("[004] Host info for the default link and the specified link differ, [%d] %s\n",
+		mysql_errno(), mysql_error());
+
+	var_dump($def_info);
+	var_dump($info);
+}
+
+if (ini_get('unicode.semantics') && !is_unicode($info)) {
+	printf("[005] Expecting Unicode error message!\n");
+	var_inspect($info);
+}
+
+if (!is_null($tmp = @mysql_get_host_info($link, "too many arguments"))) {
+	printf("[006] Expecting NULL/NULL got %s/%s\n", $tmp, gettype($tmp));
+}
+
+print "done!";
 ?>
 --EXPECTF--
 done!
diff --git a/ext/mysql/tests/mysql_get_proto_info.phpt b/ext/mysql/tests/mysql_get_proto_info.phpt
index ae804a8801..9483296fa3 100644
--- a/ext/mysql/tests/mysql_get_proto_info.phpt
+++ b/ext/mysql/tests/mysql_get_proto_info.phpt
@@ -2,19 +2,26 @@
 mysql_get_proto_info()
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
 --FILE--
 <?php
-    include_once "connect.inc";
-       
-    if (false !== ($tmp = @mysql_get_proto_info(NULL)))
-        printf("[002] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);        
-    
-    require "table.inc";    
-    if (!is_int($info = mysql_get_proto_info($link)) || (0 === $info))
-        printf("[003] Expecting int/any_non_empty, got %s/%s\n", gettype($info), $info);        
+include_once "connect.inc";
 
-    print "done!";
+if (false !== ($tmp = @mysql_get_proto_info(NULL)))
+	printf("[002] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+require "table.inc";
+if (!is_int($info = mysql_get_proto_info($link)) || (0 === $info))
+	printf("[003] Expecting int/any_non_empty, got %s/%s\n", gettype($info), $info);
+
+if (!is_int($info2 = mysql_get_proto_info()) || (0 === $info2))
+	printf("[004] Expecting int/any_non_empty, got %s/%s\n", gettype($info2), $info2);
+
+assert($info === $info2);
+
+if (NULL !== ($tmp = @mysql_get_proto_info('too many', 'arguments')))
+	printf("[005] Expecting NULL got %s/%s\n", gettype($tmp), $tmp);
+
+print "done!";
 ?>
 --EXPECTF--
 done!
diff --git a/ext/mysql/tests/mysql_get_server_info.phpt b/ext/mysql/tests/mysql_get_server_info.phpt
index 0a633b7a60..da32363e5c 100644
--- a/ext/mysql/tests/mysql_get_server_info.phpt
+++ b/ext/mysql/tests/mysql_get_server_info.phpt
@@ -2,33 +2,35 @@
 mysql_get_server_info()
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
 --FILE--
 <?php
-    include "connect.inc";
-        
-    if (false !== ($tmp = @mysql_get_server_info(NULL)))
-        printf("[002] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);        
-    
-    require "table.inc";    
-    if (!is_string($info = mysql_get_server_info($link)) || ('' === $info))
-        printf("[003] Expecting string/any_non_empty, got %s/%s\n", gettype($info), $info);        
-        
-    $def_info = mysql_get_server_info();
-    if ($def_info !== $info) {
-        printf("[004] Server info for the default link and the specified link differ, [%d] %s\n",
-            mysql_errno(), mysql_error());
-            
-        var_dump($def_info);
-        var_dump($info);            
-    }
-                
-    if (ini_get('unicode.semantics') && !is_unicode($info)) {
-        printf("[005] Expecting Unicode error message!\n");
-        var_inspect($info);
-    }
+include "connect.inc";
 
-    print "done!";
+if (false !== ($tmp = @mysql_get_server_info(NULL)))
+	printf("[002] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp);
+
+require "table.inc";
+if (!is_string($info = mysql_get_server_info($link)) || ('' === $info))
+	printf("[003] Expecting string/any_non_empty, got %s/%s\n", gettype($info), $info);
+
+$def_info = mysql_get_server_info();
+if ($def_info !== $info) {
+	printf("[004] Server info for the default link and the specified link differ, [%d] %s\n",
+		mysql_errno(), mysql_error());
+
+	var_dump($def_info);
+	var_dump($info);
+}
+
+if (ini_get('unicode.semantics') && !is_unicode($info)) {
+	printf("[005] Expecting Unicode error message!\n");
+	var_inspect($info);
+}
+
+if (NULL !== ($tmp = @mysql_get_server_info('too many', 'just too many')))
+	printf("[006] Expecting NULL got %s/%s\n", gettype($tmp), $tmp);
+
+print "done!";
 ?>
 --EXPECTF--
 done!