From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Mon, 25 Jan 2021 17:48:35 +0000 (+0100)
Subject: Merge branch 'PHP-7.4' into PHP-8.0
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2e580da28ebebb35eefd084dc5a0cdbc94872ff4;p=php

Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Fix #75850: Unclear error message wrt. __halt_compiler() w/o semicolon
---

2e580da28ebebb35eefd084dc5a0cdbc94872ff4
diff --cc NEWS
index efc7378f74,00fb7f75c2..c5691d40e3
--- a/NEWS
+++ b/NEWS
@@@ -1,16 -1,16 +1,20 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2021, PHP 7.4.16
 +?? ??? 2021, PHP 8.0.3
 +
 +- Gettext:
 +  . Fixed bug #53251 (bindtextdomain with null dir doesn't return old value).
 +    (cmb)
 +
 +- Opcache:
 +  . Fixed bug #80634 (write_property handler of internal classes is skipped on
 +    preloaded JITted code). (Dmitry)
  
+ - Phar:
+   . Fixed bug #75850 (Unclear error message wrt. __halt_compiler() w/o
+     semicolon) (cmb)
+ 
 -- Zip:
 -  . Fixed bug #80648 (Fix for bug 79296 should be based on runtime version).
 -    (cmb, Remi)
 -
 -21 Jan 2021, PHP 7.4.15
 +21 Jan 2021, PHP 8.0.2
  
  - Core:
    . Fixed bug #80523 (bogus parse error on >4GB source code). (Nikita)