colder          Fri Feb 29 13:48:09 2008 UTC

  Modified files:              
    /php-src/ext/spl    php_spl.c 
    /php-src/ext/spl/tests      bug40091.phpt 
  Log:
  Fix #44144 (object methods as spl autoload functions returned correctly)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/php_spl.c?r1=1.126&r2=1.127&diff_format=u
Index: php-src/ext/spl/php_spl.c
diff -u php-src/ext/spl/php_spl.c:1.126 php-src/ext/spl/php_spl.c:1.127
--- php-src/ext/spl/php_spl.c:1.126     Mon Feb 25 23:36:36 2008
+++ php-src/ext/spl/php_spl.c   Fri Feb 29 13:48:09 2008
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php_spl.c,v 1.126 2008/02/25 23:36:36 colder Exp $ */
+/* $Id: php_spl.c,v 1.127 2008/02/29 13:48:09 colder Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -606,8 +606,9 @@
  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) {
@@ -624,17 +625,23 @@
                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_text(tmp, 
(*func_ptr_ptr)->common.scope->name, 1);
-                               add_next_index_text(tmp, 
(*func_ptr_ptr)->common.function_name, 1);
+                               if (alfi->obj) {
+                                       Z_ADDREF_P(alfi->obj);
+                                       add_next_index_zval(tmp, alfi->obj);
+                               } else {
+                                       add_next_index_text(tmp, 
alfi->ce->name, 1);
+                               }
+                               add_next_index_text(tmp, 
alfi->func_ptr->common.function_name, 1);
                                add_next_index_zval(return_value, tmp);
-                       } else
-                               add_next_index_text(return_value, 
(*func_ptr_ptr)->common.function_name, 1);
+                       } else {
+                               add_next_index_text(return_value, 
alfi->func_ptr->common.function_name, 1);
+                       }
 
                        zend_hash_move_forward_ex(SPL_G(autoload_functions), 
&function_pos);
                }
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/bug40091.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/spl/tests/bug40091.phpt
diff -u php-src/ext/spl/tests/bug40091.phpt:1.2 
php-src/ext/spl/tests/bug40091.phpt:1.3
--- php-src/ext/spl/tests/bug40091.phpt:1.2     Tue Nov  6 15:29:32 2007
+++ php-src/ext/spl/tests/bug40091.phpt Fri Feb 29 13:48:09 2008
@@ -25,13 +25,19 @@
 (
     [0] => Array
         (
-            [0] => MyAutoloader
+            [0] => MyAutoloader Object
+                (
+                )
+
             [1] => autoload
         )
 
     [1] => Array
         (
-            [0] => MyAutoloader
+            [0] => MyAutoloader Object
+                (
+                )
+
             [1] => autoload
         )
 

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

Reply via email to