Merge branch 'PHP-7.4' into PHP-8.0

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

diff --cc NEWS
index efc7378f7458a3b14f9fdb3f40f31a28b1d05d80,00fb7f75c210037e6a80d93d7ba1441bdc9c6b97..c5691d40e3dc5a7868091789ab5df1d895c5f848
--- 1/NEWS
--- 2/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)
  
 -- Zip:
 -  . Fixed bug #80648 (Fix for bug 79296 should be based on runtime version).
 -    (cmb, Remi)
 -
 -21 Jan 2021, PHP 7.4.15
+ - Phar:
+   . Fixed bug #75850 (Unclear error message wrt. __halt_compiler() w/o
+     semicolon) (cmb)
+ 
 +21 Jan 2021, PHP 8.0.2
  
  - Core:
    . Fixed bug #80523 (bogus parse error on >4GB source code). (Nikita)

diff --cc ext/phar/phar.c
Simple merge

diff --cc ext/phar/tests/phar_stub_error.phpt
Simple merge