Merge branch 'PHP-7.4' into PHP-8.0

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

Fri, 20 Nov 2020 15:50:52 +0000 (16:50 +0100)

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

Fri, 20 Nov 2020 15:50:52 +0000 (16:50 +0100)
author Nikita Popov <nikita.ppv@gmail.com>
Fri, 20 Nov 2020 15:50:52 +0000 (16:50 +0100)
committer Nikita Popov <nikita.ppv@gmail.com>
Fri, 20 Nov 2020 15:50:52 +0000 (16:50 +0100)
diff --cc php.ini-development
Simple merge
diff --cc php.ini-production
Simple merge
author	Nikita Popov <nikita.ppv@gmail.com>
	Fri, 20 Nov 2020 15:50:52 +0000 (16:50 +0100)
committer	Nikita Popov <nikita.ppv@gmail.com>
	Fri, 20 Nov 2020 15:50:52 +0000 (16:50 +0100)
		1	2
php.ini-development	patch \|	diff1 \|	diff2 \|	blob \| history
php.ini-production	patch \|	diff1 \|	diff2 \|	blob \| history