Merge branch 'PHP-7.4'

diff --cc ext/opcache/tests/bug66338.phpt
index 676af19ec58089fbfdd8d8df6f6f860bdd870319,5cd96937936e7473f730f11d7a85ac433359e482..40f563446529f805b8343f808cd489ebbeff1d0f
--- 1/ext/opcache/tests/bug66338.phpt
--- 2/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 c538a256ecdba0a593cd8f82e5f2778897b258af,bc86d0f4fc44a2631ac62db2db528a812080e9ff..b8df30a164246f47e0087df9284445000ef8062e
--- 1/ext/opcache/tests/issue0115.phpt
--- 2/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 31a804964304353a17376b556be40ec592fe587d,da3b778ef5642625852ea441b4316d7e4e8c69e6..0896e39d0c2874c815e64f2f5fcea98021c83c3e
--- 1/ext/opcache/tests/issue0149.phpt
--- 2/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 79936b6421db3a3b5e54a1b83dabbc669df7add0,b924ba746bf8d821c551c705e3332a14b1dfd213..a1d72bbcc5f24f12363320af5606e8f3d1458d99
--- 1/ext/opcache/tests/revalidate_path_01.phpt
--- 2/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__);