Merge branch 'PHP-7.4'

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

Fri, 12 Apr 2019 10:04:11 +0000 (12:04 +0200)

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

Fri, 12 Apr 2019 10:04:11 +0000 (12:04 +0200)
author Nikita Popov <nikita.ppv@gmail.com>
Fri, 12 Apr 2019 10:04:11 +0000 (12:04 +0200)
committer Nikita Popov <nikita.ppv@gmail.com>
Fri, 12 Apr 2019 10:04:11 +0000 (12:04 +0200)
diff --cc Zend/zend.c
Simple merge
diff --cc Zend/zend.h
Simple merge
diff --cc sapi/phpdbg/phpdbg_prompt.c
Simple merge
author	Nikita Popov <nikita.ppv@gmail.com>
	Fri, 12 Apr 2019 10:04:11 +0000 (12:04 +0200)
committer	Nikita Popov <nikita.ppv@gmail.com>
	Fri, 12 Apr 2019 10:04:11 +0000 (12:04 +0200)
		1	2
Zend/zend.c	patch \|	diff1 \|	diff2 \|	blob \| history
Zend/zend.h	patch \|	diff1 \|	diff2 \|	blob \| history
sapi/phpdbg/phpdbg_prompt.c	patch \|	diff1 \|	diff2 \|	blob \| history