Don't allow readonly -> readwrite change during inheritance

Author: nikic

Zend/tests/readonly_props/readonly_to_readwrite.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Can replace readonly with readwrite
+Cannot replace readonly with readwrite
 --FILE--
 <?php
 
@@ -11,6 +11,5 @@ class B extends A {
 }
 
 ?>
-===DONE===
---EXPECT--
-===DONE===
+--EXPECTF--
+Fatal error: Cannot redeclare readonly property A::$prop as non-readonly B::$prop in %s on line %d

Zend/zend_inheritance.c

@@ -1245,10 +1245,12 @@ static void do_inherit_property(zend_property_info *parent_info, zend_string *ke
 					(parent_info->flags & ZEND_ACC_STATIC) ? "static " : "non static ", ZSTR_VAL(parent_info->ce->name), ZSTR_VAL(key),
 					(child_info->flags & ZEND_ACC_STATIC) ? "static " : "non static ", ZSTR_VAL(ce->name), ZSTR_VAL(key));
 			}
-			if (UNEXPECTED((child_info->flags & ZEND_ACC_READONLY) && !(parent_info->flags & ZEND_ACC_READONLY))) {
+			if (UNEXPECTED((child_info->flags & ZEND_ACC_READONLY) != (parent_info->flags & ZEND_ACC_READONLY))) {
 				zend_error_noreturn(E_COMPILE_ERROR,
-					"Cannot redeclare non-readonly property %s::$%s as readonly %s::$%s",
+					"Cannot redeclare %s property %s::$%s as %s %s::$%s",
+					parent_info->flags & ZEND_ACC_READONLY ? "readonly" : "non-readonly",
 					ZSTR_VAL(parent_info->ce->name), ZSTR_VAL(key),
+					child_info->flags & ZEND_ACC_READONLY ? "readonly" : "non-readonly",
 					ZSTR_VAL(ce->name), ZSTR_VAL(key));
 			}