summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMitch Hagstrand <mhagstrand@gmail.com>2017-04-09 15:30:35 -0700
committerJoe Watkins <krakjoe@php.net>2017-04-10 06:32:15 +0100
commitd9a05807d26be80e0821be52f9ac60a35c52d004 (patch)
tree3b0d7470e142ac939330214ffcec1bfed03b4fe6
parent9c7cb2cdcde92691f1f833546eb1382acf788e2c (diff)
downloadphp-git-d9a05807d26be80e0821be52f9ac60a35c52d004.tar.gz
Fix of Bug #74383: Wrong reflection on Phar::running
-rw-r--r--NEWS3
-rw-r--r--ext/phar/phar_object.c2
-rw-r--r--ext/phar/tests/bug74383.phpt20
3 files changed, 24 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 049cf66209..10bb6e2b8a 100644
--- a/NEWS
+++ b/NEWS
@@ -18,6 +18,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)
+
13 Apr 2017 PHP 7.0.18
- Core:
diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
index 31d443cd43..1799268297 100644
--- a/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@ -5191,7 +5191,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_phar_webPhar, 0, 0, 0)
ZEND_END_ARG_INFO()
PHAR_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()
diff --git a/ext/phar/tests/bug74383.phpt b/ext/phar/tests/bug74383.phpt
new file mode 100644
index 0000000000..366c4fcb9b
--- /dev/null
+++ b/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 \ No newline at end of file