Merge branch 'PHP-7.3' into PHP-7.4

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

Tue, 11 Jun 2019 13:41:05 +0000 (15:41 +0200)

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

Tue, 11 Jun 2019 13:41:05 +0000 (15:41 +0200)
author Nikita Popov <nikita.ppv@gmail.com>
Tue, 11 Jun 2019 13:41:05 +0000 (15:41 +0200)
committer Nikita Popov <nikita.ppv@gmail.com>
Tue, 11 Jun 2019 13:41:05 +0000 (15:41 +0200)
diff --cc ext/mysqli/mysqli_api.c
Simple merge
diff --cc ext/mysqli/mysqli_priv.h
Simple merge
diff --cc ext/opcache/Optimizer/zend_func_info.c
Simple merge
author	Nikita Popov <nikita.ppv@gmail.com>
	Tue, 11 Jun 2019 13:41:05 +0000 (15:41 +0200)
committer	Nikita Popov <nikita.ppv@gmail.com>
	Tue, 11 Jun 2019 13:41:05 +0000 (15:41 +0200)
		1	2
ext/mysqli/mysqli_api.c	patch \|	diff1 \|	diff2 \|	blob \| history
ext/mysqli/mysqli_priv.h	patch \|	diff1 \|	diff2 \|	blob \| history
ext/opcache/Optimizer/zend_func_info.c	patch \|	diff1 \|	diff2 \|	blob \| history