- Fixed bug #43663 (Extending PDO class with a __call() function doesn't work).

CVS

diff --git a/ext/pdo/pdo_dbh.c b/ext/pdo/pdo_dbh.c
index 85a53bf93d950722a01191c81bf9b81fadc14fb7..251c841fe8ff3285e6197eda435ffefb937a3294 100755 (executable)
--- a/ext/pdo/pdo_dbh.c
+++ b/ext/pdo/pdo_dbh.c
@@ -1273,12 +1273,19 @@ static union _zend_function *dbh_method_get(
 
                if (zend_hash_find(dbh->cls_methods[PDO_DBH_DRIVER_METHOD_KIND_DBH],
                                lc_method_name, method_len+1, (void**)&fbc) == FAILURE) {
-                       fbc = NULL;
+                       if (std_object_handlers.get_method) {
+                               fbc = std_object_handlers.get_method(object_pp, lc_method_name, method_len TSRMLS_CC);
+                       }
+
+                       if (!fbc) {
+                               fbc = NULL;
+                       }
+
                        goto out;
                }
                /* got it */
        }
-       
+
 out:
        efree(lc_method_name);
        return fbc;

diff --git a/ext/pdo/tests/bug_43663.phpt b/ext/pdo/tests/bug_43663.phpt
new file mode 100644 (file)
index 0000000..25af588
--- /dev/null
+++ b/ext/pdo/tests/bug_43663.phpt
@@ -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