Merge branch 'PHP-7.4'

author Fabien Villepinte <fabien.villepinte@gmail.com>

Fri, 1 Nov 2019 11:38:32 +0000 (12:38 +0100)

committer Fabien Villepinte <fabien.villepinte@gmail.com>

Fri, 1 Nov 2019 11:38:32 +0000 (12:38 +0100)
author Fabien Villepinte <fabien.villepinte@gmail.com>
Fri, 1 Nov 2019 11:38:32 +0000 (12:38 +0100)
committer Fabien Villepinte <fabien.villepinte@gmail.com>
Fri, 1 Nov 2019 11:38:32 +0000 (12:38 +0100)
diff --cc ext/standard/tests/file/file_get_contents_variation8.phpt
Simple merge
diff --cc ext/standard/tests/file/file_put_contents_variation8.phpt

index 8d2c148598b7a12f2e88b7b9d8282f5f0b7980e1,497c68b2bb759b18270c036d78419e6986d6febc..be20782c4e33c19d9340e3a82f3fa101af29ed02

Binary files differ
author	Fabien Villepinte <fabien.villepinte@gmail.com>
	Fri, 1 Nov 2019 11:38:32 +0000 (12:38 +0100)
committer	Fabien Villepinte <fabien.villepinte@gmail.com>
	Fri, 1 Nov 2019 11:38:32 +0000 (12:38 +0100)
		1	2
ext/standard/tests/file/file_get_contents_variation8.phpt	patch \|	diff1 \|	diff2 \|	blob \| history
ext/standard/tests/file/file_put_contents_variation8.phpt	patch \|	diff1 \|	diff2 \|	blob \| history