From: Joe Watkins <krakjoe@php.net>
Date: Mon, 10 Apr 2017 05:28:43 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.5RC1~59
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9fe4d2d9cb52903decfb0177615dde35ec244111;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix of Bug #74383: Wrong reflection on Phar::running
---

9fe4d2d9cb52903decfb0177615dde35ec244111
diff --cc NEWS
index 732a076538,0e3d3b1fd7..0dac949f61
--- a/NEWS
+++ b/NEWS
@@@ -31,15 -18,12 +31,18 @@@ PH
    . Fixed bug #74341 (openssl_x509_parse fails to parse ASN.1 UTCTime without
      seconds). (Moritz Fain)
  
+ - phar:
 -  . Fixed reflection on Phar::isRunning parameters. (mhagstrand)
++  . Fixed bug #74383 phar method parameters reflection correction. (mhagstrand)
++
 +- Standard:
 +  . Fixed bug #72071 (setcookie allows max-age to be negative). (Craig Duncan)
 +  . Fixed bug #74361 (Compaction in array_rand() violates COW). (Nikita)
  
 -13 Apr 2017 PHP 7.0.18
 +
 +13 Apr 2017, PHP 7.1.4
  
  - Core:
 +  . Fixed bug #74149 (static embed SAPI linkage error). (krakjoe)
    . Fixed bug #73370 (falsely exits with "Out of Memory" when using
      USE_ZEND_ALLOC=0). (Nikita)
    . Fixed bug #73960 (Leak with instance method calling static method with
diff --cc ext/phar/phar_object.c
index 00720385de,1799268297..ba0b0da41a
--- a/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@@ -5134,7 -5190,8 +5134,7 @@@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_web
  	ZEND_ARG_INFO(0, rewrites)
  ZEND_END_ARG_INFO()
  
- ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_running, 0, 0, 1)
 -PHAR_ARG_INFO
+ ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_running, 0, 0, 0)
  	ZEND_ARG_INFO(0, retphar)
  ZEND_END_ARG_INFO()
  
diff --cc ext/phar/tests/bug74383.phpt
index 0000000000,366c4fcb9b..4257629ff5
mode 000000,100644..100644
--- a/ext/phar/tests/bug74383.phpt
+++ b/ext/phar/tests/bug74383.phpt
@@@ -1,0 -1,20 +1,20 @@@
+ --TEST--
+ Phar: bug #74383: Wrong reflection on Phar::running
+ --SKIPIF--
+ <?php if (!extension_loaded("phar") || !extension_loaded('reflection')) die("skip"); ?>
+ --FILE--
+ <?php
+ $rc = new ReflectionClass(Phar::class);
+ $rm = $rc->getMethod("running");
+ echo $rm->getNumberOfParameters();
+ echo PHP_EOL;
+ echo $rm->getNumberOfRequiredParameters();
+ echo PHP_EOL;
+ echo (int) $rm->getParameters()[0]->isOptional();
+ 
+ ?>
+ 
+ --EXPECT--
+ 1
+ 0
 -1
++1