Merge branch 'PHP-7.2' into PHP-7.3

author Remi Collet <remi@php.net>

Wed, 20 Mar 2019 13:08:18 +0000 (14:08 +0100)

committer Remi Collet <remi@php.net>

Wed, 20 Mar 2019 13:08:18 +0000 (14:08 +0100)
author Remi Collet <remi@php.net>
Wed, 20 Mar 2019 13:08:18 +0000 (14:08 +0100)
committer Remi Collet <remi@php.net>
Wed, 20 Mar 2019 13:08:18 +0000 (14:08 +0100)
diff --cc ext/standard/tests/general_functions/var_export-locale.phpt
Simple merge
diff --cc ext/standard/tests/general_functions/var_export_basic1.phpt
Simple merge
author	Remi Collet <remi@php.net>
	Wed, 20 Mar 2019 13:08:18 +0000 (14:08 +0100)
committer	Remi Collet <remi@php.net>
	Wed, 20 Mar 2019 13:08:18 +0000 (14:08 +0100)
		1	2
ext/standard/tests/general_functions/var_export-locale.phpt	patch \|	diff1 \|	diff2 \|	blob \| history
ext/standard/tests/general_functions/var_export_basic1.phpt	patch \|	diff1 \|	diff2 \|	blob \| history