Merge branch 'PHP-7.3' into PHP-7.4

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

Fri, 4 Oct 2019 20:46:53 +0000 (22:46 +0200)

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

Fri, 4 Oct 2019 20:46:53 +0000 (22:46 +0200)
author Nikita Popov <nikita.ppv@gmail.com>
Fri, 4 Oct 2019 20:46:53 +0000 (22:46 +0200)
committer Nikita Popov <nikita.ppv@gmail.com>
Fri, 4 Oct 2019 20:46:53 +0000 (22:46 +0200)
diff --cc Zend/zend_compile.c
Simple merge
diff --cc Zend/zend_language_scanner.l
Simple merge
author	Nikita Popov <nikita.ppv@gmail.com>
	Fri, 4 Oct 2019 20:46:53 +0000 (22:46 +0200)
committer	Nikita Popov <nikita.ppv@gmail.com>
	Fri, 4 Oct 2019 20:46:53 +0000 (22:46 +0200)
		1	2
Zend/zend_compile.c	patch \|	diff1 \|	diff2 \|	blob \| history
Zend/zend_language_scanner.l	patch \|	diff1 \|	diff2 \|	blob \| history