From: Julien Pauli <jpauli@php.net>
Date: Fri, 5 Dec 2014 04:15:23 +0000 (+0000)
Subject: Merged PR #911.
X-Git-Tag: PRE_NATIVE_TLS_MERGE~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0adfa03397edcde8cba3bae2032b1f2ef26ea760;p=php

Merged PR #911.
---

diff --git a/NEWS b/NEWS
index 2ab4d99a60..44c247624e 100644
--- 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 0c4dc8a342..3b80f295e2 100644
--- 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