Merge branch 'PHP-7.4'

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

Fri, 20 Mar 2020 07:57:43 +0000 (08:57 +0100)

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

Fri, 20 Mar 2020 07:57:43 +0000 (08:57 +0100)
author Christoph M. Becker <cmbecker69@gmx.de>
Fri, 20 Mar 2020 07:57:43 +0000 (08:57 +0100)
committer Christoph M. Becker <cmbecker69@gmx.de>
Fri, 20 Mar 2020 07:57:43 +0000 (08:57 +0100)
diff --cc ext/standard/tests/file/windows_mb_path/bug54028_2.phpt
Simple merge
author	Christoph M. Becker <cmbecker69@gmx.de>
	Fri, 20 Mar 2020 07:57:43 +0000 (08:57 +0100)
committer	Christoph M. Becker <cmbecker69@gmx.de>
	Fri, 20 Mar 2020 07:57:43 +0000 (08:57 +0100)