Merge branch 'PHP-7.2' into PHP-7.3

author Anatol Belski <ab@php.net>

Fri, 16 Nov 2018 22:22:19 +0000 (23:22 +0100)

committer Anatol Belski <ab@php.net>

Fri, 16 Nov 2018 22:22:19 +0000 (23:22 +0100)
author Anatol Belski <ab@php.net>
Fri, 16 Nov 2018 22:22:19 +0000 (23:22 +0100)
committer Anatol Belski <ab@php.net>
Fri, 16 Nov 2018 22:22:19 +0000 (23:22 +0100)
diff --cc sapi/cli/config.w32
Simple merge
diff --cc sapi/cli/php_cli.c
Simple merge
author	Anatol Belski <ab@php.net>
	Fri, 16 Nov 2018 22:22:19 +0000 (23:22 +0100)
committer	Anatol Belski <ab@php.net>
	Fri, 16 Nov 2018 22:22:19 +0000 (23:22 +0100)
		1	2
sapi/cli/config.w32	patch \|	diff1 \|	diff2 \|	blob \| history
sapi/cli/php_cli.c	patch \|	diff1 \|	diff2 \|	blob \| history