Merge branch 'PHP-7.4'

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

Tue, 23 Jul 2019 09:28:10 +0000 (11:28 +0200)

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

Tue, 23 Jul 2019 09:28:10 +0000 (11:28 +0200)
author Nikita Popov <nikita.ppv@gmail.com>
Tue, 23 Jul 2019 09:28:10 +0000 (11:28 +0200)
committer Nikita Popov <nikita.ppv@gmail.com>
Tue, 23 Jul 2019 09:28:10 +0000 (11:28 +0200)
diff --cc Zend/tests/bug64988.phpt
Simple merge
diff --cc Zend/tests/bug67436/bug67436_nohandler.phpt
Simple merge
diff --cc ext/pdo/pdo_stmt.c
Simple merge
author	Nikita Popov <nikita.ppv@gmail.com>
	Tue, 23 Jul 2019 09:28:10 +0000 (11:28 +0200)
committer	Nikita Popov <nikita.ppv@gmail.com>
	Tue, 23 Jul 2019 09:28:10 +0000 (11:28 +0200)
		1	2
Zend/tests/bug64988.phpt	patch \|	diff1 \|	diff2 \|	blob \| history
Zend/tests/bug67436/bug67436_nohandler.phpt	patch \|	diff1 \|	diff2 \|	blob \| history
ext/pdo/pdo_stmt.c	patch \|	diff1 \|	diff2 \|	blob \| history