Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix build

diff --cc ext/zip/php_zip.c
index 99adb723e38b246cfad81654a7e3e9d1d35ef32c,c203148334b6f80d27bc5d23fad5ec3ca7dcf444..f68534c48d6080faa2844aec99c8158a6bee81e7
--- 1/ext/zip/php_zip.c
--- 2/ext/zip/php_zip.c
+++ b/ext/zip/php_zip.c
@@@ -1501,12 -1622,12 +1501,12 @@@ static ZIPARCHIVE_METHOD(close
                RETURN_FALSE;
        }
  
 -      ZIP_FROM_OBJECT(intern, this);
 +      ZIP_FROM_OBJECT(intern, self);
  
 -      ze_obj = (ze_zip_object*) zend_object_store_get_object(this TSRMLS_CC);
 +      ze_obj = Z_ZIP_P(self);
  
-       if (err = zip_close(intern)) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, zip_strerror(intern));
+       if ((err = zip_close(intern))) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", zip_strerror(intern));
                zip_discard(intern);
        }