Merge branch 'PHP-8.0'

cmb69 · cmb69 · commit 1c56a830ce5e · 2021-03-03T22:57:51.000+01:00
* PHP-8.0:
  Fix #80825: ZipArchive::isCompressionMethodSupported does not exist
diff --git a/ext/zip/config.w32 b/ext/zip/config.w32
@@ -16,7 +16,7 @@ if (PHP_ZIP != "no") {
 		}
 
 		AC_DEFINE('HAVE_ZIP', 1);
-		ADD_FLAG("CFLAGS_ZIP", "/D _WIN32 /D HAVE_SET_MTIME /D HAVE_ENCRYPTION /D HAVE_LIBZIP_VERSION /D HAVE_PROGRESS_CALLBACK /D HAVE_CANCEL_CALLBACK /D LZMA_API_STATIC");
+		ADD_FLAG("CFLAGS_ZIP", "/D _WIN32 /D HAVE_SET_MTIME /D HAVE_ENCRYPTION /D HAVE_LIBZIP_VERSION /D HAVE_PROGRESS_CALLBACK /D HAVE_CANCEL_CALLBACK /D HAVE_METHOD_SUPPORTED /D LZMA_API_STATIC");
 	} else {
 		WARNING("zip not enabled; libraries and headers not found");
 	}

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ if (PHP_ZIP != "no") {`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`AC_DEFINE('HAVE_ZIP', 1);`
`19`		`- ADD_FLAG("CFLAGS_ZIP", "/D _WIN32 /D HAVE_SET_MTIME /D HAVE_ENCRYPTION /D HAVE_LIBZIP_VERSION /D HAVE_PROGRESS_CALLBACK /D HAVE_CANCEL_CALLBACK /D LZMA_API_STATIC");`
	`19`	`+ ADD_FLAG("CFLAGS_ZIP", "/D _WIN32 /D HAVE_SET_MTIME /D HAVE_ENCRYPTION /D HAVE_LIBZIP_VERSION /D HAVE_PROGRESS_CALLBACK /D HAVE_CANCEL_CALLBACK /D HAVE_METHOD_SUPPORTED /D LZMA_API_STATIC");`
`20`	`20`	`} else {`
`21`	`21`	`WARNING("zip not enabled; libraries and headers not found");`
`22`	`22`	`}`