From: Joe Watkins <krakjoe@php.net>
Date: Mon, 29 May 2017 07:31:58 +0000 (+0100)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha1~57^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2a64f548daebfefe5fe5acd99a00ead3d526454c;p=php

Merge branch 'PHP-7.1'

* PHP-7.1:
  Fix Bug #74386Phar::__construct(): wrong number of parameters by reflection
---

2a64f548daebfefe5fe5acd99a00ead3d526454c
diff --cc NEWS
index 0d32a5d25e,0516ed0822..56f25666a9
--- a/NEWS
+++ b/NEWS
@@@ -164,17 -339,8 +164,18 @@@ PH
    . Fixed bug #73959 (lastInsertId fails to throw an exception for wrong 
      sequence name). (andrewnester)
  
 -- Phar:
 -  . Fixed bug #70417 (PharData::compress() doesn't close temp file). (cmb)
 +- PDO_Sqlite
 +  . Switch to sqlite3_prepare_v2() and sqlite3_close_v2() functions (rasmus)
 +
 +- phar:
 +  . Fixed bug #74383 (phar method parameters reflection correction). 
 +    (mhagstrand)
 +  . Fixed bug #74196 (phar does not correctly handle names containing dots).
 +    (mhagstrand)
++  . Fixed bug #74386 (Phar::__construct reflection incorrect). (villfa)
 +
 +- PHPDBG
 +  . Added extended_value to opcode dump output. (Sara)
  
  - posix:
    . Fixed bug #71219 (configure script incorrectly checks for ttyname_r). (atoh)
diff --cc ext/phar/phar_object.c
index 694b4b9377,79cc9c1e31..c3102039f0
--- a/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@@ -5403,12 -5424,12 +5471,12 @@@ void phar_object_init(void) /* {{{ *
  	INIT_CLASS_ENTRY(ce, "Phar", php_archive_methods);
  	phar_ce_archive = zend_register_internal_class_ex(&ce, spl_ce_RecursiveDirectoryIterator);
  
 -	zend_class_implements(phar_ce_archive, 2, spl_ce_Countable, zend_ce_arrayaccess);
 +	zend_class_implements(phar_ce_archive, 2, zend_ce_countable, zend_ce_arrayaccess);
  
- 	INIT_CLASS_ENTRY(ce, "PharData", php_archive_methods);
+ 	INIT_CLASS_ENTRY(ce, "PharData", php_data_methods);
  	phar_ce_data = zend_register_internal_class_ex(&ce, spl_ce_RecursiveDirectoryIterator);
  
 -	zend_class_implements(phar_ce_data, 2, spl_ce_Countable, zend_ce_arrayaccess);
 +	zend_class_implements(phar_ce_data, 2, zend_ce_countable, zend_ce_arrayaccess);
  
  	INIT_CLASS_ENTRY(ce, "PharFileInfo", php_entry_methods);
  	phar_ce_entry = zend_register_internal_class_ex(&ce, spl_ce_SplFileInfo);