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

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Add missing SKIPIFs
---

52a0630cd43d189ca4a5a82632163f0f3a595c22
diff --cc ext/opcache/tests/bug78034.phpt
index ca9cd4ec07,0000000000..b4ef93dff6
mode 100644,000000..100644
--- a/ext/opcache/tests/bug78034.phpt
+++ b/ext/opcache/tests/bug78034.phpt
@@@ -1,21 -1,0 +1,23 @@@
 +--TEST--
 +Bug #78034: "pecl" tool fails with abort assertion in zend_ssa.c
++--SKIPIF--
++<?php require_once('skipif.inc'); ?>
 +--FILE--
 +<?php
 +
 +function &ref() {}
 +
 +class Test {
 +    function method($bool) {
 +        if (!$bool) {
 +            $this->foo = &ref();
 +        }
 +
 +        $this->foo = &ref();
 +    }
 +}
 +
 +?>
 +===DONE===
 +--EXPECT--
 +===DONE===