Merge branch 'PHP-7.4' into master

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

Fri, 7 Aug 2020 13:06:40 +0000 (15:06 +0200)

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

Fri, 7 Aug 2020 13:06:40 +0000 (15:06 +0200)
author Christoph M. Becker <cmbecker69@gmx.de>
Fri, 7 Aug 2020 13:06:40 +0000 (15:06 +0200)
committer Christoph M. Becker <cmbecker69@gmx.de>
Fri, 7 Aug 2020 13:06:40 +0000 (15:06 +0200)
diff --cc ext/standard/tests/file/tempnam_variation5-win32.phpt
Simple merge
diff --cc ext/standard/tests/file/tempnam_variation8-win32.phpt
Simple merge
author	Christoph M. Becker <cmbecker69@gmx.de>
	Fri, 7 Aug 2020 13:06:40 +0000 (15:06 +0200)
committer	Christoph M. Becker <cmbecker69@gmx.de>
	Fri, 7 Aug 2020 13:06:40 +0000 (15:06 +0200)
		1	2
ext/standard/tests/file/tempnam_variation5-win32.phpt	patch \|	diff1 \|	diff2 \|	blob \| history
ext/standard/tests/file/tempnam_variation8-win32.phpt	patch \|	diff1 \|	diff2 \|	blob \| history