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

[uwendel]

Author: uwendel
Date: 2008-01-08 14:30:40 +0100 (Tue, 08 Jan 2008)
New Revision: 1190

Added:
   trunk/tests/ext/pdo/bug_43663.phpt
Modified:
   trunk/tests/ext/pdo/pdo_query.phpt
Log:
Merge from PHP 5_3


Added: trunk/tests/ext/pdo/bug_43663.phpt
===================================================================
--- trunk/tests/ext/pdo/bug_43663.phpt	                        (rev 0)
+++ trunk/tests/ext/pdo/bug_43663.phpt	2008-01-08 13:30:40 UTC (rev 1190)
@@ -0,0 +1,23 @@
+--TEST--
+PDO Common: Bug #43663 (__call on classes derived from PDO)
+--FILE--
+--SKIPIF--
+<?php # vim:ft=php
+if (!extension_loaded('pdo')) die('skip');
+?>
+--FILE--
+<?php
+class test extends PDO{
+    function __call($name, array $args) {
+        echo "Called $name in ".__CLASS__."\n";
+    }
+    function foo() {
+        echo "Called foo in ".__CLASS__."\n";
+    }
+}
+$a = new test('sqlite::memory:');
+$a->foo();
+$a->bar();
+--EXPECT--
+Called foo in test
+Called bar in test

Modified: trunk/tests/ext/pdo/pdo_query.phpt
===================================================================
--- trunk/tests/ext/pdo/pdo_query.phpt	2008-01-08 12:32:22 UTC (rev 1189)
+++ trunk/tests/ext/pdo/pdo_query.phpt	2008-01-08 13:30:40 UTC (rev 1190)
@@ -251,16 +251,16 @@
 array(2) {
   [0]=>
   object(fetch_class_private_members)#2 (2) {
-    ["id:private"]=>
+    ["id":"fetch_class_private_members":private"]=>
     string(1) "1"
-    ["val:private"]=>
+    ["val":"fetch_class_private_members":private"]=>
     string(1) "A"
   }
   [1]=>
   object(fetch_class_private_members)#%d (2) {
-    ["id:private"]=>
+    ["id":"fetch_class_private_members":private"]=>
     string(1) "2"
-    ["val:private"]=>
+    ["val":"fetch_class_private_members":private"]=>
     string(1) "B"
   }
 }