Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix bug #66509: copy() arginfo incorrect since 5.4

Conflicts:
	NEWS

Author: willfitch

NEWS

@@ -2,6 +2,9 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2014, PHP 5.5.9
 
+- Core:
+  . Fixed bug #66509 (copy() arginfo has changed starting from 5.4). (willfitch)
+
 - GD:
   . Fixed bug #66356 (Heap Overflow Vulnerability in imagecrop()).
     (Laruence, Remi)

ext/standard/basic_functions.c

@@ -1214,7 +1214,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)

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)