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

Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Add missing SKIPIFs
---

99e6c701e6ddde0697ee7ff3e1f3b8247dee3b9c
diff --cc ext/opcache/tests/bug73789.phpt
index c812982f20,383bbbfa26..d5efeb403d
--- a/ext/opcache/tests/bug73789.phpt
+++ b/ext/opcache/tests/bug73789.phpt
@@@ -1,7 -1,7 +1,8 @@@
  --TEST--
  Bug #73789 (Strange behavior of class constants in switch/case block)
  --SKIPIF--
+ <?php require_once('skipif.inc'); ?>
 +<?php if (!extension_loaded('ctype')) die('skip extension ctype not loaded'); ?>
  --FILE--
  <?php
  class Lexer
diff --cc ext/opcache/tests/bug76275.phpt
index f4ecaa3eb3,52d69ef14c..0600b382f9
--- a/ext/opcache/tests/bug76275.phpt
+++ b/ext/opcache/tests/bug76275.phpt
@@@ -4,8 -4,11 +4,10 @@@ Bug #76275: Assertion failure in file c
  opcache.enabled=1
  opcache.enable_cli=1
  opcache.file_cache={TMP}
+ --SKIPIF--
+ <?php require_once('skipif.inc'); ?>
  --FILE--
  <?php
 -
  if (PHP_VERSION_ID >= 70000) {
      echo "Done";
      return;