cvs: ZendEngine2(PHP_5_3) / zend_interfaces.c /tests bug47699.phpt php-src NEWS

dmitry		Wed Mar 25 10:39:26 2009 UTC

  Added files:                 (Branch: PHP_5_3)
    /ZendEngine2/tests	bug47699.phpt 

  Modified files:              
    /php-src	NEWS 
    /ZendEngine2	zend_interfaces.c 
  Log:
  Fixed bug #47699 (autoload and late static binding)
  
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.531&r2=1.2027.2.547.2.965.2.532&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.531 php-src/NEWS:1.2027.2.547.2.965.2.532
--- php-src/NEWS:1.2027.2.547.2.965.2.531	Tue Mar 24 09:45:39 2009
+++ php-src/NEWS	Wed Mar 25 10:39:26 2009
@@ -1,6 +1,7 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 200?, PHP 5.3.0 RC 2
+- Fixed bug #47699 (autoload and late static binding). (Dmitry)
 - Fixed bug #44409 (PDO::FETCH_SERIALIZE calls __construct()).
   (matteo at beccati dot com)
 - Fixed bug #42362 - (HTTP status codes 204 and 304 should not be gzipped).
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_interfaces.c?r1=1.33.2.4.2.6.2.12&r2=1.33.2.4.2.6.2.13&diff_format=u
Index: ZendEngine2/zend_interfaces.c
diff -u ZendEngine2/zend_interfaces.c:1.33.2.4.2.6.2.12 ZendEngine2/zend_interfaces.c:1.33.2.4.2.6.2.13
--- ZendEngine2/zend_interfaces.c:1.33.2.4.2.6.2.12	Wed Dec 31 11:15:32 2008
+++ ZendEngine2/zend_interfaces.c	Wed Mar 25 10:39:26 2009
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_interfaces.c,v 1.33.2.4.2.6.2.12 2008/12/31 11:15:32 sebastian Exp $ */
+/* $Id: zend_interfaces.c,v 1.33.2.4.2.6.2.13 2009/03/25 10:39:26 dmitry Exp $ */
 
 #include "zend.h"
 #include "zend_API.h"
@@ -84,7 +84,15 @@
 			fcic.function_handler = *fn_proxy;
 		}
 		fcic.calling_scope = obj_ce;
-		fcic.called_scope = object_pp ? obj_ce : EG(called_scope);
+		if (object_pp) {
+			fcic.called_scope = Z_OBJCE_PP(object_pp);
+		} else if (obj_ce &&
+		           !(EG(called_scope) &&
+		             instanceof_function(EG(called_scope), obj_ce TSRMLS_CC))) {
+			fcic.called_scope = obj_ce;
+		} else {
+			fcic.called_scope = EG(called_scope);
+		}
 		fcic.object_ptr = object_pp ? *object_pp : NULL;
 		result = zend_call_function(&fci, &fcic TSRMLS_CC);
 	}

http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/bug47699.phpt?view=markup&rev=1.1
Index: ZendEngine2/tests/bug47699.phpt
+++ ZendEngine2/tests/bug47699.phpt