Merge branch 'PHP-7.0' into PHP-7.1

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

Fri, 3 Feb 2017 17:29:58 +0000 (18:29 +0100)

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

Fri, 3 Feb 2017 17:30:32 +0000 (18:30 +0100)
author Nikita Popov <nikita.ppv@gmail.com>
Fri, 3 Feb 2017 17:29:58 +0000 (18:29 +0100)
committer Nikita Popov <nikita.ppv@gmail.com>
Fri, 3 Feb 2017 17:30:32 +0000 (18:30 +0100)
diff --cc NEWS
Simple merge
diff --cc ext/reflection/php_reflection.c
Simple merge
diff --cc ext/reflection/tests/ReflectionClass_toString_001.phpt
Simple merge
author	Nikita Popov <nikita.ppv@gmail.com>
	Fri, 3 Feb 2017 17:29:58 +0000 (18:29 +0100)
committer	Nikita Popov <nikita.ppv@gmail.com>
	Fri, 3 Feb 2017 17:30:32 +0000 (18:30 +0100)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
ext/reflection/php_reflection.c	patch \|	diff1 \|	diff2 \|	blob \| history
ext/reflection/tests/ReflectionClass_toString_001.phpt	patch \|	diff1 \|	diff2 \|	blob \| history