Merge branch 'PHP-7.4' into PHP-8.0

author Christoph M. Becker <cmbecker69@gmx.de>

Wed, 3 Feb 2021 10:23:59 +0000 (11:23 +0100)

committer Christoph M. Becker <cmbecker69@gmx.de>

Wed, 3 Feb 2021 10:24:36 +0000 (11:24 +0100)
author Christoph M. Becker <cmbecker69@gmx.de>
Wed, 3 Feb 2021 10:23:59 +0000 (11:23 +0100)
committer Christoph M. Becker <cmbecker69@gmx.de>
Wed, 3 Feb 2021 10:24:36 +0000 (11:24 +0100)
diff --cc NEWS
Simple merge
diff --cc ext/phar/phar.c
Simple merge
author	Christoph M. Becker <cmbecker69@gmx.de>
	Wed, 3 Feb 2021 10:23:59 +0000 (11:23 +0100)
committer	Christoph M. Becker <cmbecker69@gmx.de>
	Wed, 3 Feb 2021 10:24:36 +0000 (11:24 +0100)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
ext/phar/phar.c	patch \|	diff1 \|	diff2 \|	blob \| history