diff options
| author | Will Fitch <willfitch@php.net> | 2014-01-18 11:57:34 -0500 |
|---|---|---|
| committer | Will Fitch <willfitch@php.net> | 2014-01-18 11:57:34 -0500 |
| commit | 4e5195f82cde3bb16cfe078d06a783ffec267c25 (patch) | |
| tree | dae63695caaab0c86fa79b1a7462ce5a7551c74f | |
| parent | 89eab884d9aec3a023ac56289974647c446a0f60 (diff) | |
| parent | a540c5733113ed08f63244492c6a3be847916805 (diff) | |
| download | php-git-4e5195f82cde3bb16cfe078d06a783ffec267c25.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix bug #66509: copy() arginfo incorrect since 5.4
| -rw-r--r-- | ext/standard/basic_functions.c | 2 | ||||
| -rw-r--r-- | ext/standard/tests/file/bug66509.phpt | 15 |
2 files changed, 16 insertions, 1 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 4604f60adb..6409ff37d8 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -1216,7 +1216,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO(arginfo_fstat, 0) ZEND_ARG_INFO(0, fp) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO(arginfo_copy, 0) +ZEND_BEGIN_ARG_INFO_EX(arginfo_copy, 0, 0, 2) ZEND_ARG_INFO(0, source_file) ZEND_ARG_INFO(0, destination_file) ZEND_ARG_INFO(0, context) diff --git a/ext/standard/tests/file/bug66509.phpt b/ext/standard/tests/file/bug66509.phpt new file mode 100644 index 0000000000..0e414f2321 --- /dev/null +++ b/ext/standard/tests/file/bug66509.phpt @@ -0,0 +1,15 @@ +--TEST-- +Bug #66509 (copy() showing $context parameter as required) +--FILE-- +<?php + +$r = new \ReflectionFunction('copy'); + +foreach($r->getParameters() as $p) { + var_dump($p->isOptional()); +} +?> +--EXPECT-- +bool(false) +bool(false) +bool(true) |