MFH: Fixed bug #44144 & add test

diff --git a/NEWS b/NEWS
index 0b21084a4700d5772fc78df99a395e0879c32d3e..e1cd49c43232f68c6283aed23e5d5d685628d28b 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -67,6 +67,8 @@
   (Sriram Natarajan)
 - Fixed bug #48182 (ssl handshake fails during asynchronous socket connection).
   (Sriram Natarajan)
+- Fixed bug #44144 (spl_autoload_functions() should return object instance
+  when appropriate). (Hannes, Etienne)
 - Fixed bug #42434 (ImageLine w/ antialias = 1px shorter). (wojjie at gmail dot 
   com, Kalle)
 

diff --git a/ext/spl/php_spl.c b/ext/spl/php_spl.c
index eddb16f041100b6172f34a5ac9a7f39ea2a4b262..2d2cdb5aacd4eebba48d5455a292a5acd7a65a45 100755 (executable)
--- a/ext/spl/php_spl.c
+++ b/ext/spl/php_spl.c
@@ -564,8 +564,9 @@ PHP_FUNCTION(spl_autoload_unregister)
  Return all registered __autoload() functionns */
 PHP_FUNCTION(spl_autoload_functions)
 {
-       zend_function *fptr, **func_ptr_ptr;
+       zend_function *fptr;
        HashPosition function_pos;
+       autoload_func_info *alfi;
 
        if (!EG(autoload_func)) {
                if (zend_hash_find(EG(function_table), ZEND_AUTOLOAD_FUNC_NAME, sizeof(ZEND_AUTOLOAD_FUNC_NAME), (void **) &fptr) == SUCCESS) {
@@ -582,17 +583,22 @@ PHP_FUNCTION(spl_autoload_functions)
                array_init(return_value);
                zend_hash_internal_pointer_reset_ex(SPL_G(autoload_functions), &function_pos);
                while(zend_hash_has_more_elements_ex(SPL_G(autoload_functions), &function_pos) == SUCCESS) {
-                       zend_hash_get_current_data_ex(SPL_G(autoload_functions), (void **) &func_ptr_ptr, &function_pos);
-                       if ((*func_ptr_ptr)->common.scope) {
+                       zend_hash_get_current_data_ex(SPL_G(autoload_functions), (void **) &alfi, &function_pos);
+                       if (alfi->func_ptr->common.scope) {
                                zval *tmp;
                                MAKE_STD_ZVAL(tmp);
                                array_init(tmp);
 
-                               add_next_index_string(tmp, (*func_ptr_ptr)->common.scope->name, 1);
-                               add_next_index_string(tmp, (*func_ptr_ptr)->common.function_name, 1);
+                               if (alfi->obj) {
+                                       alfi->obj->refcount++;
+                                       add_next_index_zval(tmp, alfi->obj);
+                               } else {
+                                       add_next_index_string(tmp, alfi->ce->name, 1);
+                               }
+                               add_next_index_string(tmp, alfi->func_ptr->common.function_name, 1);
                                add_next_index_zval(return_value, tmp);
                        } else
-                               add_next_index_string(return_value, (*func_ptr_ptr)->common.function_name, 1);
+                               add_next_index_string(return_value, alfi->func_ptr->common.function_name, 1);
 
                        zend_hash_move_forward_ex(SPL_G(autoload_functions), &function_pos);
                }

diff --git a/ext/spl/tests/bug40091.phpt b/ext/spl/tests/bug40091.phpt
index 7d6210b8bb583467503a83e87049e86a30305f7b..316e302ea9ddf84780ace44d78e1b0451b1167e8 100644 (file)
--- a/ext/spl/tests/bug40091.phpt
+++ b/ext/spl/tests/bug40091.phpt
@@ -25,13 +25,19 @@ Array
 (
     [0] => Array
         (
-            [0] => MyAutoloader
+            [0] => MyAutoloader Object
+                (
+                )
+
             [1] => autoload
         )
 
     [1] => Array
         (
-            [0] => MyAutoloader
+            [0] => MyAutoloader Object
+                (
+                )
+
             [1] => autoload
         )
 

diff --git a/ext/spl/tests/bug44144.phpt b/ext/spl/tests/bug44144.phpt
new file mode 100644 (file)
index 0000000..2933d2f
--- /dev/null
+++ b/ext/spl/tests/bug44144.phpt
@@ -0,0 +1,27 @@
+--TEST--
+Bug #44144 (spl_autoload_functions() should return object instance when appropriate)
+--SKIPIF--
+<?php if (!extension_loaded("spl")) print "skip"; ?>
+--FILE--
+<?php
+class Foo {
+  public function nonstaticMethod() {}
+}
+$foo = new Foo;
+spl_autoload_register(array($foo, 'nonstaticMethod'));
+$funcs = spl_autoload_functions();
+var_dump($funcs);
+?>
+--EXPECTF--
+array(1) {
+  [0]=>
+  array(2) {
+    [0]=>
+    object(Foo)#%d (0) {
+    }
+    [1]=>
+    string(15) "nonstaticMethod"
+  }
+}
+
+