From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Mon, 1 Jul 2019 15:24:33 +0000 (+0200)
Subject: Merge branch 'PHP-7.3' into PHP-7.4
X-Git-Tag: php-7.4.0alpha3~89
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=42bedcfb50a303173861e0fd24124df7b308d23d;p=php

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Add missing SKIPIFs
---

42bedcfb50a303173861e0fd24124df7b308d23d
diff --cc ext/opcache/tests/bug78106.phpt
index 11d5c9e2e3,87a524851d..a46312baa0
--- a/ext/opcache/tests/bug78106.phpt
+++ b/ext/opcache/tests/bug78106.phpt
@@@ -1,7 -1,7 +1,9 @@@
  --TEST--
  Bug #78106: Path resolution fails if opcache disabled during request
+ --SKIPIF--
+ <?php require_once('skipif.inc'); ?>
 +--CONFLICTS--
 +server
  --FILE--
  <?php