1) Whitespace/CS

2) Tiny check for default link added

diff --git a/ext/mysql/tests/mysql_real_escape_string.phpt b/ext/mysql/tests/mysql_real_escape_string.phpt
index 7d3f957cb24e993f29ab1de53afbeec99d4abf75..cef123720eb4af9bd1aba2935d7f6db9f75fbbe2 100644 (file)
--- a/ext/mysql/tests/mysql_real_escape_string.phpt
+++ b/ext/mysql/tests/mysql_real_escape_string.phpt
@@ -2,28 +2,32 @@
 mysql_real_escape_string()
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
 --FILE--
 <?php
-    include "connect.inc";
+include "connect.inc";
 
-    $tmp    = NULL;   
-    $link   = NULL;    
-    
-    if (NULL !== ($tmp = @mysql_real_escape_string()))
-        printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);   
-        
-    require('table.inc');
-        
-    var_dump(mysql_real_escape_string("Am I a unicode string in PHP 6?", $link));
-    var_dump(mysql_real_escape_string('\\', $link));
-    var_dump(mysql_real_escape_string('"', $link));
-    var_dump(mysql_real_escape_string("'", $link));
-    var_dump(mysql_real_escape_string("\n", $link));
-    var_dump(mysql_real_escape_string("\r", $link));
-    var_dump(mysql_real_escape_string("foo" . chr(0) . "bar", $link));
-            
-    print "done!";
+$tmp    = NULL;
+$link   = NULL;
+
+if (NULL !== ($tmp = @mysql_real_escape_string()))
+       printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+require('table.inc');
+
+if (NULL !== ($tmp = @mysql_real_escape_string('foo', $link, $link)))
+       printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+var_dump(mysql_real_escape_string("Am I a unicode string in PHP 6?", $link));
+var_dump(mysql_real_escape_string('\\', $link));
+var_dump(mysql_real_escape_string('"', $link));
+var_dump(mysql_real_escape_string("'", $link));
+var_dump(mysql_real_escape_string("\n", $link));
+var_dump(mysql_real_escape_string("\r", $link));
+var_dump($tmp = mysql_real_escape_string("foo" . chr(0) . "bar", $link));
+
+assert($tmp === mysql_real_escape_string("foo" . chr(0) . "bar"));
+
+print "done!";
 ?>
 --EXPECTF--
 string(31) "Am I a unicode string in PHP 6?"