Merge branch 'PHP-7.1' into PHP-7.2

author Jakub Zelenka <bukka@php.net>

Sat, 30 Dec 2017 17:41:45 +0000 (17:41 +0000)

committer Jakub Zelenka <bukka@php.net>

Sat, 30 Dec 2017 17:41:45 +0000 (17:41 +0000)
author Jakub Zelenka <bukka@php.net>
Sat, 30 Dec 2017 17:41:45 +0000 (17:41 +0000)
committer Jakub Zelenka <bukka@php.net>
Sat, 30 Dec 2017 17:41:45 +0000 (17:41 +0000)
diff --cc ext/json/tests/pass001.1.phpt
Simple merge
diff --cc ext/json/tests/pass001.1_64bit.phpt
Simple merge
diff --cc ext/json/tests/pass001.phpt
Simple merge
author	Jakub Zelenka <bukka@php.net>
	Sat, 30 Dec 2017 17:41:45 +0000 (17:41 +0000)
committer	Jakub Zelenka <bukka@php.net>
	Sat, 30 Dec 2017 17:41:45 +0000 (17:41 +0000)
		1	2
ext/json/tests/pass001.1.phpt	patch \|	diff1 \|	diff2 \|	blob \| history
ext/json/tests/pass001.1_64bit.phpt	patch \|	diff1 \|	diff2 \|	blob \| history
ext/json/tests/pass001.phpt	patch \|	diff1 \|	diff2 \|	blob \| history