Merge branch 'PHP-7.4'

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

Mon, 1 Jul 2019 10:47:49 +0000 (12:47 +0200)

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

Mon, 1 Jul 2019 10:47:49 +0000 (12:47 +0200)
author Nikita Popov <nikita.ppv@gmail.com>
Mon, 1 Jul 2019 10:47:49 +0000 (12:47 +0200)
committer Nikita Popov <nikita.ppv@gmail.com>
Mon, 1 Jul 2019 10:47:49 +0000 (12:47 +0200)
diff --cc Zend/zend_execute_API.c
Simple merge
diff --cc ext/standard/tests/file/file_put_contents_variation8.phpt

index 76b7b6f5c6fcc3eb1cfc799147eb2fd70cadb7ef,f0161dca5745062a41e7664fc9cccaac100cd2f3..8d2c148598b7a12f2e88b7b9d8282f5f0b7980e1

Binary files differ
author	Nikita Popov <nikita.ppv@gmail.com>
	Mon, 1 Jul 2019 10:47:49 +0000 (12:47 +0200)
committer	Nikita Popov <nikita.ppv@gmail.com>
	Mon, 1 Jul 2019 10:47:49 +0000 (12:47 +0200)
		1	2
Zend/zend_execute_API.c	patch \|	diff1 \|	diff2 \|	blob \| history
ext/standard/tests/file/file_put_contents_variation8.phpt	patch \|	diff1 \|	diff2 \|	blob \| history