uw                                       Wed, 09 Dec 2009 12:06:10 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=291916

Log:
Adapting tests to accept actual behaviour found in 5.2, 5.3 and 6.0. The 
behaviour is wrong according to the documentation: mysqli_connect_error() 
should return an empty string (not NULL), if there is no error. However, 
changing this would break BC and most users will not notice the difference 
between NULL and empty string anyway.

Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/mysqli/tests/bug34810.phpt
    U   
php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt
    U   php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_connect_error.phpt
    U   php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_kill.phpt
    U   php/php-src/trunk/ext/mysqli/tests/bug34810.phpt
    U   php/php-src/trunk/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt
    U   php/php-src/trunk/ext/mysqli/tests/mysqli_connect_error.phpt
    U   php/php-src/trunk/ext/mysqli/tests/mysqli_kill.phpt

Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/bug34810.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqli/tests/bug34810.phpt 2009-12-09 
10:50:10 UTC (rev 291915)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/bug34810.phpt 2009-12-09 
12:06:10 UTC (rev 291916)
@@ -55,7 +55,7 @@
   [%u|b%"connect_errno"]=>
   int(0)
   [%u|b%"connect_error"]=>
-  %unicode|string%(0) ""
+  NULL
   [%u|b%"errno"]=>
   int(0)
   [%u|b%"error"]=>
@@ -91,7 +91,7 @@
   [%u|b%"connect_errno"]=>
   int(0)
   [%u|b%"connect_error"]=>
-  %unicode|string%(0) ""
+  NULL
   [%u|b%"errno"]=>
   int(0)
   [%u|b%"error"]=>

Modified: 
php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt
===================================================================
--- 
php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt
    2009-12-09 10:50:10 UTC (rev 291915)
+++ 
php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt
    2009-12-09 12:06:10 UTC (rev 291916)
@@ -276,6 +276,6 @@
 setting mysqli->unknown, mysqli_unknown = 'friday'

 Access hidden properties for MYSLQI_STATUS_INITIALIZED (TODO documentation):
-mysqli->connect_error = ''/%unicode|string% (''/%unicode|string%)
+mysqli->connect_error = ''/NULL (''/NULL)
 mysqli->connect_errno = '0'/integer ('0'/integer)
 done!
\ No newline at end of file

Modified: 
php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_connect_error.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_connect_error.phpt     
2009-12-09 10:50:10 UTC (rev 291915)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_connect_error.phpt     
2009-12-09 12:06:10 UTC (rev 291916)
@@ -21,8 +21,8 @@
                printf("[002] Cannot connect to the server using host=%s, 
user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
                        $host, $user, $db, $port, $socket);

-       if ('' !== ($tmp = mysqli_connect_error()))
-               printf("[003] Expecting string/'', got %s/%s\n", gettype($tmp), 
$tmp);
+       if (NULL !== ($tmp = mysqli_connect_error()))
+               printf("[003] Expecting NULL, got %s/%s\n", gettype($tmp), 
$tmp);

        mysqli_close($link);


Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_kill.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_kill.phpt      
2009-12-09 10:50:10 UTC (rev 291915)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_kill.phpt      
2009-12-09 12:06:10 UTC (rev 291916)
@@ -91,7 +91,7 @@
   [%u|b%"connect_errno"]=>
   int(0)
   [%u|b%"connect_error"]=>
-  %unicode|string%(0) ""
+  NULL
   [%u|b%"errno"]=>
   int(2006)
   [%u|b%"error"]=>

Modified: php/php-src/trunk/ext/mysqli/tests/bug34810.phpt
===================================================================
--- php/php-src/trunk/ext/mysqli/tests/bug34810.phpt    2009-12-09 10:50:10 UTC 
(rev 291915)
+++ php/php-src/trunk/ext/mysqli/tests/bug34810.phpt    2009-12-09 12:06:10 UTC 
(rev 291916)
@@ -55,7 +55,7 @@
   [%u|b%"connect_errno"]=>
   int(0)
   [%u|b%"connect_error"]=>
-  %unicode|string%(0) ""
+  NULL
   [%u|b%"errno"]=>
   int(0)
   [%u|b%"error"]=>
@@ -91,7 +91,7 @@
   [%u|b%"connect_errno"]=>
   int(0)
   [%u|b%"connect_error"]=>
-  %unicode|string%(0) ""
+  NULL
   [%u|b%"errno"]=>
   int(0)
   [%u|b%"error"]=>

Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt
===================================================================
--- php/php-src/trunk/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt       
2009-12-09 10:50:10 UTC (rev 291915)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_class_mysqli_interface.phpt       
2009-12-09 12:06:10 UTC (rev 291916)
@@ -276,6 +276,6 @@
 setting mysqli->unknown, mysqli_unknown = 'friday'

 Access hidden properties for MYSLQI_STATUS_INITIALIZED (TODO documentation):
-mysqli->connect_error = ''/%unicode|string% (''/%unicode|string%)
+mysqli->connect_error = ''/NULL (''/NULL)
 mysqli->connect_errno = '0'/integer ('0'/integer)
 done!
\ No newline at end of file

Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_connect_error.phpt
===================================================================
--- php/php-src/trunk/ext/mysqli/tests/mysqli_connect_error.phpt        
2009-12-09 10:50:10 UTC (rev 291915)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_connect_error.phpt        
2009-12-09 12:06:10 UTC (rev 291916)
@@ -21,8 +21,8 @@
                printf("[002] Cannot connect to the server using host=%s, 
user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
                        $host, $user, $db, $port, $socket);

-       if ('' !== ($tmp = mysqli_connect_error()))
-               printf("[003] Expecting string/'', got %s/%s\n", gettype($tmp), 
$tmp);
+       if (NULL !== ($tmp = mysqli_connect_error()))
+               printf("[003] Expecting NULL, got %s/%s\n", gettype($tmp), 
$tmp);

        mysqli_close($link);


Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_kill.phpt
===================================================================
--- php/php-src/trunk/ext/mysqli/tests/mysqli_kill.phpt 2009-12-09 10:50:10 UTC 
(rev 291915)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_kill.phpt 2009-12-09 12:06:10 UTC 
(rev 291916)
@@ -91,7 +91,7 @@
   [%u|b%"connect_errno"]=>
   int(0)
   [%u|b%"connect_error"]=>
-  %unicode|string%(0) ""
+  NULL
   [%u|b%"errno"]=>
   int(2006)
   [%u|b%"error"]=>

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to