- Synced old changes

diff --git a/Zend/tests/objects_002.phpt b/Zend/tests/objects_002.phpt
index b130097d6acc294f347c1e9377a0c300578cfc85..7f26236f9927a134863c945f7315a0f75bc2b14e 100644 (file)
--- a/Zend/tests/objects_002.phpt
+++ b/Zend/tests/objects_002.phpt
@@ -20,4 +20,5 @@ class test3 extends test {
 echo "Done\n";
 ?>
 --EXPECTF--
-Fatal error: Declaration of test3::foo() must be compatible with that of test::foo() in %s on line %d
+Strict Standards: Declaration of test3::foo() should be compatible with that of test::foo() in %s on line %d
+Done

diff --git a/Zend/tests/objects_003.phpt b/Zend/tests/objects_003.phpt
index ec1e7d701c5c5a74d68033a1d1ef800e6154b940..3c47808b88778b757adf52e90c584b27dbb2e7dd 100644 (file)
--- a/Zend/tests/objects_003.phpt
+++ b/Zend/tests/objects_003.phpt
@@ -20,4 +20,5 @@ class test3 extends test {
 echo "Done\n";
 ?>
 --EXPECTF--
-Fatal error: Declaration of test3::foo() must be compatible with that of test::foo() in %s on line %d
+Strict Standards: Declaration of test3::foo() should be compatible with that of test::foo() in %s on line %d
+Done

diff --git a/Zend/tests/objects_004.phpt b/Zend/tests/objects_004.phpt
index 182ca8ec299020fcc378a7aca36185ee71c66099..346a9643121c110df3a95ad55f5faac6329a221b 100644 (file)
--- a/Zend/tests/objects_004.phpt
+++ b/Zend/tests/objects_004.phpt
@@ -20,4 +20,5 @@ class test3 extends test {
 echo "Done\n";
 ?>
 --EXPECTF--
-Fatal error: Declaration of test3::foo() must be compatible with that of test::foo() in %s on line %d
+Strict Standards: Declaration of test3::foo() should be compatible with that of test::foo() in %s on line %d
+Done

diff --git a/Zend/tests/objects_005.phpt b/Zend/tests/objects_005.phpt
index 9f8c2b9f993593d06a839b969f62a9cefdc74107..2b7b3b26db361c66494b56ddc3f61b8d247488c8 100644 (file)
--- a/Zend/tests/objects_005.phpt
+++ b/Zend/tests/objects_005.phpt
@@ -20,4 +20,5 @@ class test3 extends test {
 echo "Done\n";
 ?>
 --EXPECTF--
-Fatal error: Declaration of test3::foo() must be compatible with that of test::foo() in %s on line %d
+Strict Standards: Declaration of test3::foo() should be compatible with that of test::foo() in %s on line %d
+Done

diff --git a/Zend/tests/objects_006.phpt b/Zend/tests/objects_006.phpt
index adb0e8826d5cad478ba84bda6b468d0029526361..33444871bc63a94cb850ddc5a3637011361a9f8a 100644 (file)
--- a/Zend/tests/objects_006.phpt
+++ b/Zend/tests/objects_006.phpt
@@ -20,4 +20,5 @@ class test3 extends test {
 echo "Done\n";
 ?>
 --EXPECTF--
-Fatal error: Declaration of test3::foo() must be compatible with that of test::foo() in %s on line %d
+Strict Standards: Declaration of test3::foo() should be compatible with that of test::foo() in %s on line %d
+Done

diff --git a/Zend/tests/objects_007.phpt b/Zend/tests/objects_007.phpt
index 5b6b68bd2285a24cfea76b7ff6dc6f3112f7ca1f..ebf3c16c1136b6534b40946403203ead0e75aa97 100644 (file)
--- a/Zend/tests/objects_007.phpt
+++ b/Zend/tests/objects_007.phpt
@@ -20,4 +20,5 @@ class test3 extends test {
 echo "Done\n";
 ?>
 --EXPECTF--
-Fatal error: Declaration of test3::foo() must be compatible with that of test::foo() in %s on line %d
+Strict Standards: Declaration of test3::foo() should be compatible with that of test::foo() in %s on line %d
+Done

diff --git a/Zend/tests/objects_008.phpt b/Zend/tests/objects_008.phpt
index e0bba4c756a3b92e0ffdf7addefd221b18e6eab7..b33270454a5beb4c6fe648a603531797f408cda4 100644 (file)
--- a/Zend/tests/objects_008.phpt
+++ b/Zend/tests/objects_008.phpt
@@ -20,4 +20,5 @@ class test3 extends test {
 echo "Done\n";
 ?>
 --EXPECTF--
-Fatal error: Declaration of test3::foo() must be compatible with that of test::foo() in %s on line %d
+Strict Standards: Declaration of test3::foo() should be compatible with that of test::foo() in %s on line %d
+Done

diff --git a/Zend/tests/objects_009.phpt b/Zend/tests/objects_009.phpt
index d3de6b563057842959404bf2a224024d36d16ccb..8e09a72f565df2c3806c891d9327ff085b195e37 100644 (file)
--- a/Zend/tests/objects_009.phpt
+++ b/Zend/tests/objects_009.phpt
@@ -20,4 +20,5 @@ class test3 extends test {
 echo "Done\n";
 ?>
 --EXPECTF--
-Fatal error: Declaration of test3::foo() must be compatible with that of test::foo() in %s on line %d
+Strict Standards: Declaration of test3::foo() should be compatible with that of test::foo() in %s on line %d
+Done

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 4b75d58083348a7ba546ccc1cf6cc76477b50833..4f9c62f3ec8e1a3c3d5b4e3a450a9825e2e8cb70 100644 (file)
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -2727,7 +2727,7 @@ static zend_bool do_inherit_method_check(HashTable *child_function_table, zend_f
                child->common.prototype = parent->common.prototype ? parent->common.prototype : parent;
        }
 
-       if (child->common.prototype) {
+       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 %v::%v() must be compatible with that of %v::%v()", ZEND_FN_SCOPE_NAME(child), child->common.function_name, ZEND_FN_SCOPE_NAME(child->common.prototype), child->common.prototype->common.function_name);
                }