PHP mysqlnd svn commit: r1288 - trunk/tests/ext/pdo

[uwendel]

Author: uwendel
Date: 2008-02-19 13:28:16 +0100 (Tue, 19 Feb 2008)
New Revision: 1288

Modified:
   trunk/tests/ext/pdo/pdo_get_available_drivers.phpt
Log:
Fixing our libmysql EXPECTF - that happens if you spend 1 day on porting instead of 4 days
as estimated...



Modified: trunk/tests/ext/pdo/pdo_get_available_drivers.phpt
===================================================================
--- trunk/tests/ext/pdo/pdo_get_available_drivers.phpt	2008-02-18 16:14:07 UTC (rev 1287)
+++ trunk/tests/ext/pdo/pdo_get_available_drivers.phpt	2008-02-19 12:28:16 UTC (rev 1288)
@@ -18,7 +18,7 @@
 	$tmp = PDO::getAvailableDrivers('args', 'args');
 	if ((false !== $tmp) && (!is_null($tmp)))
 		printf("[001] Typically functions that get invoked with invalid arguments return NULL
or false, this one returned %s (%s)\n",
-			gettype($tmp), var_export($tmp, true));
+			gettype($tmp), ((is_scalar($tmp)) ? var_export($tmp, true) : gettype($tmp)));
 
 	$tmp = PDO::getAvailableDrivers();
 	if (!is_array($tmp)) {
@@ -86,13 +86,6 @@
 --BUGFREE_EXPECTF--
 done!
 --EXPECTF--
-[001] Typically functions that get invoked with invalid arguments return NULL or false,
this one returned array (array (
-  0 => 'sqlite2',
-  1 => 'sqlite',
-  2 => 'pgsql',
-  3 => 'oci',
-  4 => 'mysql',
-  5 => 'ibm',
-))
+[001] Typically functions that get invoked with invalid arguments return NULL or false,
this one returned array (array)
 [008] This is not a static method, change the manual or the implementation!
-done!
\ No newline at end of file
+done!