Merge branch 'PHP-8.0'

nikic · nikic · commit ca8247654c1e · 2021-05-07T22:42:50.000+02:00
* PHP-8.0:
  Fix zip build
diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c
@@ -2765,7 +2765,7 @@ PHP_METHOD(ZipArchive, extractTo)
 		}
 		for (i = 0; i < nelems; i++) {
 			zval *zval_file;
-			if ((zval_file = zend_hash_index_find_deref(Z_ARRVAL_P(zval_files), i)) != NULL) {
+			if ((zval_file = zend_hash_index_find_deref(files_ht, i)) != NULL) {
 				switch (Z_TYPE_P(zval_file)) {
 					case IS_LONG:
 						break;

Original file line number	Diff line number	Diff line change
`@@ -2765,7 +2765,7 @@ PHP_METHOD(ZipArchive, extractTo)`
`2765`	`2765`	`}`
`2766`	`2766`	`for (i = 0; i < nelems; i++) {`
`2767`	`2767`	`zval *zval_file;`
`2768`		`- if ((zval_file = zend_hash_index_find_deref(Z_ARRVAL_P(zval_files), i)) != NULL) {`
	`2768`	`+ if ((zval_file = zend_hash_index_find_deref(files_ht, i)) != NULL) {`
`2769`	`2769`	`switch (Z_TYPE_P(zval_file)) {`
`2770`	`2770`	`case IS_LONG:`
`2771`	`2771`	`break;`