Merge branch 'PHP-7.4'

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

Thu, 11 Apr 2019 08:49:38 +0000 (10:49 +0200)

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

Thu, 11 Apr 2019 08:49:38 +0000 (10:49 +0200)
author Nikita Popov <nikita.ppv@gmail.com>
Thu, 11 Apr 2019 08:49:38 +0000 (10:49 +0200)
committer Nikita Popov <nikita.ppv@gmail.com>
Thu, 11 Apr 2019 08:49:38 +0000 (10:49 +0200)
diff --cc Zend/zend_compile.c
Simple merge
diff --cc Zend/zend_vm_def.h
Simple merge
diff --cc Zend/zend_vm_execute.h
Simple merge
author	Nikita Popov <nikita.ppv@gmail.com>
	Thu, 11 Apr 2019 08:49:38 +0000 (10:49 +0200)
committer	Nikita Popov <nikita.ppv@gmail.com>
	Thu, 11 Apr 2019 08:49:38 +0000 (10:49 +0200)
		1	2
Zend/zend_compile.c	patch \|	diff1 \|	diff2 \|	blob \| history
Zend/zend_vm_def.h	patch \|	diff1 \|	diff2 \|	blob \| history
Zend/zend_vm_execute.h	patch \|	diff1 \|	diff2 \|	blob \| history