Fixed bug #64988 (Class loading order affects E_STRICT warning)

diff --git a/NEWS b/NEWS
index 60af87887621a9e84f7a3c29ee514865de2d0c04..567c81bd2c58cff5bbbf6abd5c41d778e0d31efa 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ PHP                                                                        NEWS
 ?? ??? 2013, PHP 5.4.17
 
 - Core:
+  . Fixed bug #64988 (Class loading order affects E_STRICT warning). (Laruence)
   . Fixed bug #64966 (segfault in zend_do_fcall_common_helper_SPEC). (Laruence)
   . Fixed bug #64960 (Segfault in gc_zval_possible_root). (Laruence)
   . Fixed bug #64934 (Apache2 TS crash with get_browser()). (Anatol)

diff --git a/Zend/tests/bug64988.phpt b/Zend/tests/bug64988.phpt
new file mode 100644 (file)
index 0000000..34fd482
--- /dev/null
+++ b/Zend/tests/bug64988.phpt
@@ -0,0 +1,30 @@
+--TEST--
+Bug #64988 (Class loading order affects E_STRICT warning)
+--FILE--
+<?php
+abstract class Base1 {
+       public function insert(array $data){
+               return array_reverse($data);
+       }
+}
+
+class Noisy1 extends Base1 {
+       public function insert(array $data, $option1 = Null) {
+               if (!empty($option1)) {
+                       $data['option1'] = $option1;
+               }
+               return parent::insert($data);
+       }
+}
+class Smooth1 extends Noisy1 {
+       public function insert(array $data) {
+               return parent::insert($data, count($data));
+       }
+}
+
+$o = new Smooth1();
+echo "okey";
+?>
+--EXPECTF--
+Strict Standards: Declaration of Smooth1::insert() should be compatible with Noisy1::insert(array $data, $option1 = NULL) in %sbug64988.php on line 20
+okey

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 3959517a4d7023918d656b5e8c5d01c8591ecd9f..ab6020c623b6af3cc3fe790924f23aa3f65c9da1 100644 (file)
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -3267,11 +3267,11 @@ static void do_inheritance_check_on_method(zend_function *child, zend_function *
 
        if (child->common.prototype && (child->common.prototype->common.fn_flags & ZEND_ACC_ABSTRACT)) {
                if (!zend_do_perform_implementation_check(child, child->common.prototype TSRMLS_CC)) {
-                       zend_error(E_COMPILE_ERROR, "Declaration of %s::%s() must be compatible with %s", ZEND_FN_SCOPE_NAME(child), child->common.function_name, zend_get_function_declaration(child->common.prototype? child->common.prototype : parent TSRMLS_CC)); 
+                       zend_error(E_COMPILE_ERROR, "Declaration of %s::%s() must be compatible with %s", ZEND_FN_SCOPE_NAME(child), child->common.function_name, zend_get_function_declaration(child->common.prototype TSRMLS_CC)); 
                }
        } else if (EG(error_reporting) & E_STRICT || EG(user_error_handler)) { /* Check E_STRICT (or custom error handler) before the check so that we save some time */
                if (!zend_do_perform_implementation_check(child, parent TSRMLS_CC)) {
-                       char *method_prototype = zend_get_function_declaration(child->common.prototype? child->common.prototype : parent TSRMLS_CC);
+                       char *method_prototype = zend_get_function_declaration(parent TSRMLS_CC);
                        zend_error(E_STRICT, "Declaration of %s::%s() should be compatible with %s", ZEND_FN_SCOPE_NAME(child), child->common.function_name, method_prototype); 
                        efree(method_prototype);
                }