Merge branch 'PHP-7.2' into PHP-7.3

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

Tue, 23 Apr 2019 10:43:22 +0000 (12:43 +0200)

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

Tue, 23 Apr 2019 10:43:32 +0000 (12:43 +0200)
author Nikita Popov <nikita.ppv@gmail.com>
Tue, 23 Apr 2019 10:43:22 +0000 (12:43 +0200)
committer Nikita Popov <nikita.ppv@gmail.com>
Tue, 23 Apr 2019 10:43:32 +0000 (12:43 +0200)
diff --cc NEWS
Simple merge
diff --cc ext/json/json_encoder.c
Simple merge
author	Nikita Popov <nikita.ppv@gmail.com>
	Tue, 23 Apr 2019 10:43:22 +0000 (12:43 +0200)
committer	Nikita Popov <nikita.ppv@gmail.com>
	Tue, 23 Apr 2019 10:43:32 +0000 (12:43 +0200)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
ext/json/json_encoder.c	patch \|	diff1 \|	diff2 \|	blob \| history