From: Joe Watkins <krakjoe@php.net>
Date: Mon, 30 Jan 2017 11:26:37 +0000 (+0000)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.2RC1~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e6bc4f39a27c8a91df48cf9ab2de76eb1b7c81c0;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix BC break introduced by #2346 (sebastianbergmann/phpunit#2454)
---

e6bc4f39a27c8a91df48cf9ab2de76eb1b7c81c0