From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Mon, 20 May 2019 09:11:06 +0000 (+0200)
Subject: Merge branch 'PHP-7.3' into PHP-7.4
X-Git-Tag: php-7.4.0alpha1~235
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5f1d76a2c410fb5ea0c40fe570402bbef30b87d6;p=php

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix test wrt. opcache.error_log
---

5f1d76a2c410fb5ea0c40fe570402bbef30b87d6
diff --cc ext/opcache/tests/zzz_basic_logging.phpt
index e799bc6daa,778857df7c..bf04b50861
--- a/ext/opcache/tests/zzz_basic_logging.phpt
+++ b/ext/opcache/tests/zzz_basic_logging.phpt
@@@ -7,9 -7,9 +7,10 @@@ outputs the correct logging at the high
  opcache.enable=1
  opcache.enable_cli=1
  opcache.file_cache_only=0
+ opcache.error_log=
  opcache.log_verbosity_level=4
  opcache.huge_code_pages=0
 +opcache.preload=
  --SKIPIF--
  <?php require_once('skipif.inc'); ?>
  --FILE--