Merge branch 'PHP-7.4'

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

Wed, 27 Mar 2019 12:05:04 +0000 (13:05 +0100)

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

Wed, 27 Mar 2019 12:05:04 +0000 (13:05 +0100)
author Nikita Popov <nikita.ppv@gmail.com>
Wed, 27 Mar 2019 12:05:04 +0000 (13:05 +0100)
committer Nikita Popov <nikita.ppv@gmail.com>
Wed, 27 Mar 2019 12:05:04 +0000 (13:05 +0100)
diff --cc Zend/zend.c
Simple merge
diff --cc Zend/zend.h
Simple merge
diff --cc Zend/zend_inheritance.c
Simple merge
author	Nikita Popov <nikita.ppv@gmail.com>
	Wed, 27 Mar 2019 12:05:04 +0000 (13:05 +0100)
committer	Nikita Popov <nikita.ppv@gmail.com>
	Wed, 27 Mar 2019 12:05:04 +0000 (13:05 +0100)
		1	2
Zend/zend.c	patch \|	diff1 \|	diff2 \|	blob \| history
Zend/zend.h	patch \|	diff1 \|	diff2 \|	blob \| history
Zend/zend_inheritance.c	patch \|	diff1 \|	diff2 \|	blob \| history