Merge branch 'PHP-7.2' into PHP-7.3

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

Mon, 18 Mar 2019 10:39:58 +0000 (11:39 +0100)

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

Mon, 18 Mar 2019 10:39:58 +0000 (11:39 +0100)
author Nikita Popov <nikita.ppv@gmail.com>
Mon, 18 Mar 2019 10:39:58 +0000 (11:39 +0100)
committer Nikita Popov <nikita.ppv@gmail.com>
Mon, 18 Mar 2019 10:39:58 +0000 (11:39 +0100)
diff --cc ext/intl/dateformat/dateformat_format_object.cpp
Simple merge
author	Nikita Popov <nikita.ppv@gmail.com>
	Mon, 18 Mar 2019 10:39:58 +0000 (11:39 +0100)
committer	Nikita Popov <nikita.ppv@gmail.com>
	Mon, 18 Mar 2019 10:39:58 +0000 (11:39 +0100)