From: Joe Watkins <krakjoe@php.net>
Date: Mon, 29 May 2017 07:29:58 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.2.0alpha1~43^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d351c199bb615c402007550f8fba085a4fb5c14b;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix Bug #74386 Phar::__construct(): wrong number of parameters by reflection
---

d351c199bb615c402007550f8fba085a4fb5c14b