From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Thu, 23 May 2019 11:14:38 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=531005d5e7eec35db0d063833c6d297cc9bdf1a6;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  Prevent further potential test conflicts
---

531005d5e7eec35db0d063833c6d297cc9bdf1a6