Merge branch 'PHP-7.4'

author Nikita Popov <nikita.ppv@gmail.com>

Mon, 13 Jan 2020 09:10:16 +0000 (10:10 +0100)

committer Nikita Popov <nikita.ppv@gmail.com>

Mon, 13 Jan 2020 09:10:16 +0000 (10:10 +0100)
author Nikita Popov <nikita.ppv@gmail.com>
Mon, 13 Jan 2020 09:10:16 +0000 (10:10 +0100)
committer Nikita Popov <nikita.ppv@gmail.com>
Mon, 13 Jan 2020 09:10:16 +0000 (10:10 +0100)
diff --cc ext/standard/tests/strings/vfprintf_variation4.phpt
Simple merge
author	Nikita Popov <nikita.ppv@gmail.com>
	Mon, 13 Jan 2020 09:10:16 +0000 (10:10 +0100)
committer	Nikita Popov <nikita.ppv@gmail.com>
	Mon, 13 Jan 2020 09:10:16 +0000 (10:10 +0100)