Merge branch 'PHP-7.3' into PHP-7.4

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

Tue, 11 Aug 2020 08:35:17 +0000 (10:35 +0200)

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

Tue, 11 Aug 2020 08:35:25 +0000 (10:35 +0200)
author Nikita Popov <nikita.ppv@gmail.com>
Tue, 11 Aug 2020 08:35:17 +0000 (10:35 +0200)
committer Nikita Popov <nikita.ppv@gmail.com>
Tue, 11 Aug 2020 08:35:25 +0000 (10:35 +0200)
diff --cc NEWS
Simple merge
diff --cc ext/standard/string.c
Simple merge
author	Nikita Popov <nikita.ppv@gmail.com>
	Tue, 11 Aug 2020 08:35:17 +0000 (10:35 +0200)
committer	Nikita Popov <nikita.ppv@gmail.com>
	Tue, 11 Aug 2020 08:35:25 +0000 (10:35 +0200)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
ext/standard/string.c	patch \|	diff1 \|	diff2 \|	blob \| history