From 73c4690c0e29b6d7b8e1f0c7ca8c8d84e583f88c Mon Sep 17 00:00:00 2001 From: Weilin Du <108666168+LamentXU123@users.noreply.github.com> Date: Sun, 29 Mar 2026 22:40:48 +0800 Subject: [PATCH] [skip ci] Fix various typos in ext/zip (GH-21571) --- ext/zip/php_zip.c | 2 +- ext/zip/php_zip.h | 2 +- ext/zip/php_zip.stub.php | 2 +- ext/zip/php_zip_arginfo.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c index 77d5dacbff94e..805527b7d848b 100644 --- a/ext/zip/php_zip.c +++ b/ext/zip/php_zip.c @@ -151,7 +151,7 @@ static bool php_zip_extract_file(struct zip * za, char *dest, const char *file, new_state.cwd[0] = '\0'; new_state.cwd_length = 0; - /* Clean/normlize the path and then transform any path (absolute or relative) + /* Clean/normalize the path and then transform any path (absolute or relative) to a path relative to cwd (../../mydir/foo.txt > mydir/foo.txt) */ virtual_file_ex(&new_state, file, NULL, CWD_EXPAND); diff --git a/ext/zip/php_zip.h b/ext/zip/php_zip.h index 0b96d6ec3eaa4..486d117398c8f 100644 --- a/ext/zip/php_zip.h +++ b/ext/zip/php_zip.h @@ -36,7 +36,7 @@ extern zend_module_entry zip_module_entry; #define ZIP_LENGTH_TO_END 0 #endif -/* Additionnal flags not from libzip */ +/* Additional flags not from libzip */ #define ZIP_FL_OPEN_FILE_NOW (1u<<30) #define PHP_ZIP_VERSION "1.22.8" diff --git a/ext/zip/php_zip.stub.php b/ext/zip/php_zip.stub.php index 42dfb006fc61a..19ea67e07fba2 100644 --- a/ext/zip/php_zip.stub.php +++ b/ext/zip/php_zip.stub.php @@ -152,7 +152,7 @@ class ZipArchive implements Countable public const int FL_ENC_CP437 = UNKNOWN; /** - * Additionnal flags not from libzip + * Additional flags not from libzip * @cvalue ZIP_FL_OPEN_FILE_NOW */ public const int FL_OPEN_FILE_NOW = UNKNOWN; diff --git a/ext/zip/php_zip_arginfo.h b/ext/zip/php_zip_arginfo.h index 89dd33b6f1a03..ae2569400efe1 100644 --- a/ext/zip/php_zip_arginfo.h +++ b/ext/zip/php_zip_arginfo.h @@ -1,5 +1,5 @@ /* This is a generated file, edit php_zip.stub.php instead. - * Stub hash: e04b3e90c42074ac364ea25a0e794815bd4271e5 */ + * Stub hash: bf6706496639628a3287d0026f68f57ecebc4a55 */ ZEND_BEGIN_ARG_INFO_EX(arginfo_zip_open, 0, 0, 1) ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)