Merge branch 'PHP-7.4'

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

Fri, 28 Jun 2019 15:47:45 +0000 (17:47 +0200)

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

Fri, 28 Jun 2019 15:47:45 +0000 (17:47 +0200)
author Nikita Popov <nikita.ppv@gmail.com>
Fri, 28 Jun 2019 15:47:45 +0000 (17:47 +0200)
committer Nikita Popov <nikita.ppv@gmail.com>
Fri, 28 Jun 2019 15:47:45 +0000 (17:47 +0200)
diff --cc Zend/zend_cpuinfo.h
Simple merge
diff --cc ext/standard/base64.c
Simple merge
diff --cc ext/standard/string.c
Simple merge
author	Nikita Popov <nikita.ppv@gmail.com>
	Fri, 28 Jun 2019 15:47:45 +0000 (17:47 +0200)
committer	Nikita Popov <nikita.ppv@gmail.com>
	Fri, 28 Jun 2019 15:47:45 +0000 (17:47 +0200)
		1	2
Zend/zend_cpuinfo.h	patch \|	diff1 \|	diff2 \|	blob \| history
ext/standard/base64.c	patch \|	diff1 \|	diff2 \|	blob \| history
ext/standard/string.c	patch \|	diff1 \|	diff2 \|	blob \| history