Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  bump ext/zip version

diff --cc ext/zip/php_zip.h
index 4e77932ee6ca1a443300ffe2448cebb60715dc57,3bc0cce0f6cf7e060bce97c3f90c676f32c4613e..ef861a4e7d3d7b60c9c487b6e3e2c17064225cd5
--- 1/ext/zip/php_zip.h
--- 2/ext/zip/php_zip.h
+++ b/ext/zip/php_zip.h
@@@ -37,9 -37,24 +37,9 @@@ extern zend_module_entry zip_module_ent
  #define ZIP_OVERWRITE ZIP_TRUNCATE
  #endif
  
- #define PHP_ZIP_VERSION "1.13.4"
+ #define PHP_ZIP_VERSION "1.13.5"
  
 -#ifndef  Z_SET_REFCOUNT_P
 -# if PHP_MAJOR_VERSION < 6 && (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION < 3)
 -#  define Z_SET_REFCOUNT_P(pz, rc)  pz->refcount = rc
 -#  define Z_UNSET_ISREF_P(pz) pz->is_ref = 0
 -# endif
 -#endif
 -
 -/* {{{ ZIP_OPENBASEDIR_CHECKPATH(filename) */
 -#if PHP_API_VERSION < 20100412
 -# define ZIP_OPENBASEDIR_CHECKPATH(filename) \
 -      (PG(safe_mode) && (!php_checkuid(filename, NULL, CHECKUID_CHECK_FILE_AND_DIR))) || php_check_open_basedir(filename)
 -#else
 -#define ZIP_OPENBASEDIR_CHECKPATH(filename) \
 -      php_check_open_basedir(filename)
 -#endif
 -/* }}} */
 +#define ZIP_OPENBASEDIR_CHECKPATH(filename) php_check_open_basedir(filename)
  
  typedef struct _ze_zip_rsrc {
        struct zip *za;