From: Nikita Popov <nikita.ppv@gmail.com>
Date: Wed, 20 Feb 2019 10:22:31 +0000 (+0100)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c8e2b333cbcb1cfeda276fbdbb7ae3555af3ae79;p=php

Merge branch 'PHP-7.4'
---

c8e2b333cbcb1cfeda276fbdbb7ae3555af3ae79
diff --cc ext/opcache/tests/bug66338.phpt
index 676af19ec5,5cd9693793..40f5634465
--- a/ext/opcache/tests/bug66338.phpt
+++ b/ext/opcache/tests/bug66338.phpt
@@@ -3,7 -3,9 +3,9 @@@ Bug #66338 (Optimization binding of cla
  --INI--
  opcache.enable=0
  --SKIPIF--
 -<?php if (!extension_loaded('Zend OPcache') || php_sapi_name() != "cli") die("skip CLI only"); ?>
 +<?php if (!extension_loaded('Zend OPcache')) die("skip Zend OPcache extension not loaded"); ?>
+ --CONFLICTS--
+ server
  --FILE--
  <?php
  $root  = str_replace('.php', "", __FILE__);
diff --cc ext/opcache/tests/issue0115.phpt
index c538a256ec,bc86d0f4fc..b8df30a164
--- a/ext/opcache/tests/issue0115.phpt
+++ b/ext/opcache/tests/issue0115.phpt
@@@ -7,6 -7,9 +7,8 @@@ phar.readonly=
  --SKIPIF--
  <?php require_once('skipif.inc'); ?>
  <?php if (!extension_loaded("phar")) die("skip"); ?>
 -<?php if (php_sapi_name() != "cli") die("skip CLI only"); ?>
+ --CONFLICTS--
+ server
  --FILE--
  <?php
  $stub = '<?php
diff --cc ext/opcache/tests/issue0149.phpt
index 31a8049643,da3b778ef5..0896e39d0c
--- a/ext/opcache/tests/issue0149.phpt
+++ b/ext/opcache/tests/issue0149.phpt
@@@ -7,6 -7,9 +7,8 @@@ phar.readonly=
  --SKIPIF--
  <?php require_once('skipif.inc'); ?>
  <?php if (!extension_loaded("phar")) die("skip"); ?>
 -<?php if (php_sapi_name() != "cli") die("skip CLI only"); ?>
+ --CONFLICTS--
+ server
  --FILE--
  <?php
  $stub = "<?php header('Content-Type: text/plain;');
diff --cc ext/opcache/tests/revalidate_path_01.phpt
index 79936b6421,b924ba746b..a1d72bbcc5
--- a/ext/opcache/tests/revalidate_path_01.phpt
+++ b/ext/opcache/tests/revalidate_path_01.phpt
@@@ -6,6 -6,9 +6,8 @@@ opcache.enable_cli=
  opcache.revalidate_path=1
  --SKIPIF--
  <?php require_once('skipif.inc'); ?>
 -<?php if (php_sapi_name() != "cli") die("skip CLI only"); ?>
+ --CONFLICTS--
+ server
  --FILE--
  <?php
  $dir = dirname(__FILE__);