Merged PR #911.

diff --git a/NEWS b/NEWS
index 2ab4d99a60edc09f3e332b5010e69d9b761acd7c..44c247624e03bc92831e180700259c8ccb2d2ad9 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -24,6 +24,8 @@ PHP                                                                        NEWS
   . Fixed bug #65419 (Inside trait, self::class != __CLASS__). (Julien)
   . Fixed bug #65576 (Constructor from trait conflicts with inherited
     constructor). (dunglas at gmail dot com)
+  . Removed ZEND_ACC_FINAL_CLASS, promoting ZEND_ACC_FINAL as final class 
+    modifier. (Guilherme Blanco)
 
 - Date:
   . Fixed day_of_week function as it could sometimes return negative values

diff --git a/UPGRADING.INTERNALS b/UPGRADING.INTERNALS
index 0c4dc8a34254f6cb926dc6c3e2d5bc913760f492..3b80f295e23517bccf8c918ca9a63620155e198f 100644 (file)
--- a/UPGRADING.INTERNALS
+++ b/UPGRADING.INTERNALS
@@ -13,6 +13,7 @@ PHP 7.0 INTERNALS UPGRADE NOTES
   l. get_class_name object handler info
   m. Other portable macros info
   n. ZEND_ENGINE_2 removal
+  o. Updated final class modifier
 
 2. Build system changes
   a. Unix build system changes
@@ -123,6 +124,9 @@ PHP 7.0 INTERNALS UPGRADE NOTES
      ZEND_NORETURN is defined as __declspec(noreturn) on VS
 
   n. The ZEND_ENGINE_2 macro has been removed. A ZEND_ENGINE_3 macro has been added.
+  
+  o. Removed ZEND_ACC_FINAL_CLASS in favour of ZEND_ACC_FINAL, turning final class
+     modifier now a different class entry flag. Update your extensions.
 
 ========================
 2. Build system changes