Merge branch 'PHP-7.0' into PHP-7.1

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

Author: krakjoe

NEWS

@@ -31,6 +31,9 @@ PHP                                                                        NEWS
   . Fixed bug #74341 (openssl_x509_parse fails to parse ASN.1 UTCTime without
     seconds). (Moritz Fain)
 
+- phar:
+  . 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)

ext/phar/phar_object.c

@@ -5134,7 +5134,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_webPhar, 0, 0, 0)
 	ZEND_ARG_INFO(0, rewrites)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_running, 0, 0, 1)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_running, 0, 0, 0)
 	ZEND_ARG_INFO(0, retphar)
 ZEND_END_ARG_INFO()
 

ext/phar/tests/bug74383.phpt

@@ -0,0 +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