Merge branch 'PHP-7.0'

diff --cc Zend/zend.c
Simple merge

diff --cc Zend/zend.h
Simple merge

diff --cc ext/exif/exif.c
Simple merge

diff --cc ext/json/json.c
Simple merge

diff --cc ext/json/php_json.h
Simple merge

diff --cc ext/mysqli/mysqli.c
Simple merge

diff --cc ext/mysqli/php_mysqli_structs.h
Simple merge

diff --cc ext/mysqlnd/mysqlnd.h
Simple merge

diff --cc ext/mysqlnd/php_mysqlnd.c
Simple merge

diff --cc ext/opcache/ZendAccelerator.c
Simple merge

diff --cc ext/opcache/ZendAccelerator.h
Simple merge

diff --cc ext/pdo_mysql/pdo_mysql.c
Simple merge

diff --cc ext/pdo_mysql/php_pdo_mysql_int.h
Simple merge

diff --cc ext/pgsql/pgsql.c
Simple merge

diff --cc ext/pgsql/php_pgsql.h
Simple merge

diff --cc ext/phar/phar.c
Simple merge

diff --cc ext/phar/phar_internal.h
index 610482b29069b98387fb0a4a81465d880b5a184f,e0ae624dc912a49af284d07623cf33c34b9fd41f..cd562ea411d9e98f07e3de81c60247e999644410
--- 1/ext/phar/phar_internal.h
--- 2/ext/phar/phar_internal.h
+++ b/ext/phar/phar_internal.h
@@@ -196,13 -198,22 +196,13 @@@ ZEND_EXTERN_MODULE_GLOBALS(phar
  #define PHAR_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(phar, v)
  
  #if defined(ZTS) && defined(COMPILE_DL_PHAR)
- ZEND_TSRMLS_CACHE_EXTERN();
+ ZEND_TSRMLS_CACHE_EXTERN()
  #endif
  
 -#ifndef php_uint16
 -# if SIZEOF_SHORT == 2
 -#  define php_uint16 unsigned short
 -# else
 -#  define php_uint16 uint16_t
 -# endif
 -#endif
  #include "pharzip.h"
  
 -#if HAVE_SPL
  typedef union _phar_archive_object  phar_archive_object;
  typedef union _phar_entry_object    phar_entry_object;
 -#endif
  
  /*
   * used in phar_entry_info->fp_type to

diff --cc ext/session/session.c
Simple merge

diff --cc ext/soap/soap.c
Simple merge

diff --cc ext/sqlite3/sqlite3.c
Simple merge

diff --cc ext/xml/xml.c
Simple merge

diff --cc sapi/cgi/cgi_main.c
Simple merge

diff --cc sapi/phpdbg/phpdbg_help.c
Simple merge

diff --cc sapi/phpdbg/phpdbg_opcode.c
Simple merge

diff --cc sapi/phpdbg/phpdbg_prompt.c
Simple merge