Merge branch 'PHP-7.4' into PHP-8.0

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

Tue, 1 Dec 2020 15:59:47 +0000 (16:59 +0100)

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

Tue, 1 Dec 2020 16:00:27 +0000 (17:00 +0100)
author Christoph M. Becker <cmbecker69@gmx.de>
Tue, 1 Dec 2020 15:59:47 +0000 (16:59 +0100)
committer Christoph M. Becker <cmbecker69@gmx.de>
Tue, 1 Dec 2020 16:00:27 +0000 (17:00 +0100)
diff --cc NEWS
Simple merge
diff --cc ext/phar/zip.c
Simple merge
author	Christoph M. Becker <cmbecker69@gmx.de>
	Tue, 1 Dec 2020 15:59:47 +0000 (16:59 +0100)
committer	Christoph M. Becker <cmbecker69@gmx.de>
	Tue, 1 Dec 2020 16:00:27 +0000 (17:00 +0100)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
ext/phar/zip.c	patch \|	diff1 \|	diff2 \|	blob \| history