svn: /php/php-src/ branches/PHP_5_4/NEWS branches/PHP_5_4/ext/reflection/php_reflection.c branches/PHP_5_4/ext/reflection/tests/bug60367.phpt
trunk/NEWS
| From: | Xinchen Hui | Date: | Fri, 02 Mar 2012 03:36:30 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_4/NEWS branches/PHP_5_4/ext/reflection/php_reflection.c branches/PHP_5_4/ext/reflection/tests/bug60367.phpt trunk/NEWS |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-67785@lists.php.net to get a copy of this message | ||
laruence Fri, 02 Mar 2012 03:36:30 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=323777
Log:
MFH: Fixed bug #60968 (Late static binding doesn't work with ReflectionMethod::invokeArgs())
Bug: https://bugs.php.net/60968 (Assigned) Late static
binding doesn't work with ReflectionMethod::invokeArgs()
Changed paths:
U php/php-src/branches/PHP_5_4/NEWS
U php/php-src/branches/PHP_5_4/ext/reflection/php_reflection.c
U php/php-src/branches/PHP_5_4/ext/reflection/tests/bug60367.phpt
U php/php-src/trunk/NEWS
Modified: php/php-src/branches/PHP_5_4/NEWS
===================================================================
--- php/php-src/branches/PHP_5_4/NEWS 2012-03-02 03:34:03 UTC (rev 323776)
+++ php/php-src/branches/PHP_5_4/NEWS 2012-03-02 03:36:30 UTC (rev 323777)
@@ -22,6 +22,10 @@
- Installation
. Fixed bug #61172 (Add Apache 2.4 support). (Chris Jones)
+- Reflection:
+ . Fixed bug #60968 (Late static binding doesn't work with
+ ReflectionMethod::invokeArgs()). (Laruence)
+
01 Mar 2012, PHP 5.4.0
- Installation:
Modified: php/php-src/branches/PHP_5_4/ext/reflection/php_reflection.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/reflection/php_reflection.c 2012-03-02 03:34:03 UTC (rev
323776)
+++ php/php-src/branches/PHP_5_4/ext/reflection/php_reflection.c 2012-03-02 03:36:30 UTC (rev
323777)
@@ -2920,7 +2920,7 @@
fcc.initialized = 1;
fcc.function_handler = mptr;
fcc.calling_scope = obj_ce;
- fcc.called_scope = obj_ce;
+ fcc.called_scope = intern->ce;
fcc.object_ptr = object;
result = zend_call_function(&fci, &fcc TSRMLS_CC);
Modified: php/php-src/branches/PHP_5_4/ext/reflection/tests/bug60367.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/reflection/tests/bug60367.phpt 2012-03-02 03:34:03 UTC (rev
323776)
+++ php/php-src/branches/PHP_5_4/ext/reflection/tests/bug60367.phpt 2012-03-02 03:36:30 UTC (rev
323777)
@@ -20,7 +20,9 @@
$method = new ReflectionMethod("b::call");
$method->invoke(null);
+$method->invokeArgs(null, array());
$method = new ReflectionMethod("A::call");
$method->invoke(null);
+$method->invokeArgs(null, array());
--EXPECTF--
-BA
+BBAA
Modified: php/php-src/trunk/NEWS
===================================================================
--- php/php-src/trunk/NEWS 2012-03-02 03:34:03 UTC (rev 323776)
+++ php/php-src/trunk/NEWS 2012-03-02 03:36:30 UTC (rev 323777)
@@ -31,10 +31,6 @@
- pgsql
. Added pg_escape_literal() and pg_escape_identifier() (Yasuo)
-- Reflection:
- . Fixed bug #60968 (Late static binding doesn't work with
- ReflectionMethod::invokeArgs()). (Laruence)
-
- Array:
. Fixed bug #61058 (array_fill leaks if start index is PHP_INT_MAX).
(Laruence)