From fd109f82cc2a09aec31ac3c0e8b83116a76be153 Mon Sep 17 00:00:00 2001 From: lamentxu <1372449351@qq.com> Date: Tue, 30 Dec 2025 08:52:11 +0800 Subject: [PATCH 1/7] fix typo --- Zend/zend_verify_type_inference.h | 2 +- docs/source/miscellaneous/writing-tests.rst | 2 +- ext/date/lib/timelib.h | 2 +- ext/fileinfo/tests/magic | 8 ++++---- ...1\271\343\202\211\343\202\214\343\201\276\343\201\231" | 8 ++++---- ext/gd/gd.c | 2 +- ext/pcre/pcre2lib/pcre2_compile.c | 2 +- ext/pcre/pcre2lib/sljit/sljitLir.h | 6 +++--- .../methods/getBytesFromString_fast_path.phpt | 6 +++--- ext/uri/uriparser/src/UriCommon.c | 2 +- sapi/fpm/fpm/events/kqueue.c | 2 +- scripts/dev/bless_tests.php | 2 +- win32/sendmail.c | 2 +- 13 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Zend/zend_verify_type_inference.h b/Zend/zend_verify_type_inference.h index 0add01933495f..8e9cbcbc181f1 100644 --- a/Zend/zend_verify_type_inference.h +++ b/Zend/zend_verify_type_inference.h @@ -156,7 +156,7 @@ static void zend_verify_inference_def(zend_execute_data *execute_data, const zen } if (opline->op1_def_type && (opline->op1_type & (IS_TMP_VAR|IS_VAR|IS_CV)) - // array is actually changed by the the following instruction(s) + // array is actually changed by the following instruction(s) && opline->opcode != ZEND_FETCH_DIM_W && opline->opcode != ZEND_FETCH_DIM_RW && opline->opcode != ZEND_FETCH_DIM_FUNC_ARG diff --git a/docs/source/miscellaneous/writing-tests.rst b/docs/source/miscellaneous/writing-tests.rst index 4c46dad638b6c..000516fe4195d 100644 --- a/docs/source/miscellaneous/writing-tests.rst +++ b/docs/source/miscellaneous/writing-tests.rst @@ -1607,7 +1607,7 @@ Example 3 (snippet): ``--EXPECTREGEX_EXTERNAL--`` ---------------------------- -**Description:** Similar to to ``--EXPECTREGEX--`` section, but like the ``--EXPECT_EXTERNAL--`` +**Description:** Similar to ``--EXPECTREGEX--`` section, but like the ``--EXPECT_EXTERNAL--`` section just stating a filename where to load the expected output from. **Required:** One of the ``EXPECT`` type sections is required. diff --git a/ext/date/lib/timelib.h b/ext/date/lib/timelib.h index ef57a7ee783f0..32cae6ea8bc02 100644 --- a/ext/date/lib/timelib.h +++ b/ext/date/lib/timelib.h @@ -713,7 +713,7 @@ void timelib_set_timezone_from_offset(timelib_time *t, timelib_sll utc_offset); void timelib_set_timezone_from_abbr(timelib_time *t, timelib_abbr_info abbr_info); /** - * Attaches the time zone information in 'tz' to to 't'. + * Attaches the time zone information in 'tz' to 't'. * * It fetches the right UTC offset that is currently stored in the time * stamp field in 't' ('sse'), and assigns that to the 'z' field and 'dst' diff --git a/ext/fileinfo/tests/magic b/ext/fileinfo/tests/magic index e8ad0f0ce7843..a6f1b5926c660 100644 --- a/ext/fileinfo/tests/magic +++ b/ext/fileinfo/tests/magic @@ -15004,7 +15004,7 @@ >12 use next # bcachefs -# From: Thomas Weißschuh +# From: Thomas Wei�schuh 0 name bcachefs-uuid >0 ubelong x \b%08x @@ -19034,7 +19034,7 @@ # GRR: with --keep-going option the line above gives duplicate messages 0 search/1/ts #FIG >&0 use image-xfig -# binary data variant with non ASCII text characters like Control-A or °C in thermostat.fig +# binary data variant with non ASCII text characters like Control-A or �C in thermostat.fig 0 search/1/bs #FIG >&0 use image-xfig # display XFIG image describing text, mime type, file name extension and version @@ -28342,7 +28342,7 @@ # URL: https://en.wikipedia.org/wiki/Microsoft_OneNote#File_format # http://fileformats.archiveteam.org/wiki/OneNote # Reference: https://mark0.net/download/triddefs_xml.7z/defs/o/onepkg.trid.xml -# 1st member name like: "Class Notes.one" "test-onenote.one" "Open Notebook.onetoc2" "Editor Öffnen.onetoc2" +# 1st member name like: "Class Notes.one" "test-onenote.one" "Open Notebook.onetoc2" "Editor �ffnen.onetoc2" >>>>>&0 string/c one \b, OneNote Package !:mime application/msonenote !:ext onepkg @@ -39944,7 +39944,7 @@ # look for archive member RunTime.xml like in Microsoft.Windows.Cosa.Desktop.Client.ppkg >>>156 search/68233/s RunTime.xml \bWindows provisioning package) !:ext ppkg -# if is is not a Windows provisioning package, then it is a WIM +# if it is not a Windows provisioning package, then it is a WIM >>>156 default x \bWIM) image # second disk image part created by Microsoft's RecoveryDrive.exe has name Reconstruct.WIM2 !:ext wim/wim2 diff --git "a/ext/fileinfo/tests/magic\347\247\201\343\201\257\343\202\254\343\203\251\343\202\271\343\202\222\351\243\237\343\201\271\343\202\211\343\202\214\343\201\276\343\201\231" "b/ext/fileinfo/tests/magic\347\247\201\343\201\257\343\202\254\343\203\251\343\202\271\343\202\222\351\243\237\343\201\271\343\202\211\343\202\214\343\201\276\343\201\231" index e8ad0f0ce7843..a6f1b5926c660 100644 --- "a/ext/fileinfo/tests/magic\347\247\201\343\201\257\343\202\254\343\203\251\343\202\271\343\202\222\351\243\237\343\201\271\343\202\211\343\202\214\343\201\276\343\201\231" +++ "b/ext/fileinfo/tests/magic\347\247\201\343\201\257\343\202\254\343\203\251\343\202\271\343\202\222\351\243\237\343\201\271\343\202\211\343\202\214\343\201\276\343\201\231" @@ -15004,7 +15004,7 @@ >12 use next # bcachefs -# From: Thomas Weißschuh +# From: Thomas Wei�schuh 0 name bcachefs-uuid >0 ubelong x \b%08x @@ -19034,7 +19034,7 @@ # GRR: with --keep-going option the line above gives duplicate messages 0 search/1/ts #FIG >&0 use image-xfig -# binary data variant with non ASCII text characters like Control-A or °C in thermostat.fig +# binary data variant with non ASCII text characters like Control-A or �C in thermostat.fig 0 search/1/bs #FIG >&0 use image-xfig # display XFIG image describing text, mime type, file name extension and version @@ -28342,7 +28342,7 @@ # URL: https://en.wikipedia.org/wiki/Microsoft_OneNote#File_format # http://fileformats.archiveteam.org/wiki/OneNote # Reference: https://mark0.net/download/triddefs_xml.7z/defs/o/onepkg.trid.xml -# 1st member name like: "Class Notes.one" "test-onenote.one" "Open Notebook.onetoc2" "Editor Öffnen.onetoc2" +# 1st member name like: "Class Notes.one" "test-onenote.one" "Open Notebook.onetoc2" "Editor �ffnen.onetoc2" >>>>>&0 string/c one \b, OneNote Package !:mime application/msonenote !:ext onepkg @@ -39944,7 +39944,7 @@ # look for archive member RunTime.xml like in Microsoft.Windows.Cosa.Desktop.Client.ppkg >>>156 search/68233/s RunTime.xml \bWindows provisioning package) !:ext ppkg -# if is is not a Windows provisioning package, then it is a WIM +# if it is not a Windows provisioning package, then it is a WIM >>>156 default x \bWIM) image # second disk image part created by Microsoft's RecoveryDrive.exe has name Reconstruct.WIM2 !:ext wim/wim2 diff --git a/ext/gd/gd.c b/ext/gd/gd.c index 60b2ad65bf65e..135cff7fcc639 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -4309,7 +4309,7 @@ PHP_FUNCTION(imageresolution) * * Stream Handling * Formerly contained within ext/gd/gd_ctx.c and included - * at the the top of this file + * at the top of this file * ********************************************************/ diff --git a/ext/pcre/pcre2lib/pcre2_compile.c b/ext/pcre/pcre2lib/pcre2_compile.c index 8e6787aba38ec..71077e51f64a3 100644 --- a/ext/pcre/pcre2lib/pcre2_compile.c +++ b/ext/pcre/pcre2lib/pcre2_compile.c @@ -7753,7 +7753,7 @@ for (;; pptr++) /* If previous was a character type match (\d or similar), abolish it and create a suitable repeat item. The code is shared with single-character repeats by setting op_type to add a suitable offset into repeat_type. - Note the the Unicode property types will be present only when + Note the Unicode property types will be present only when SUPPORT_UNICODE is defined, but we don't wrap the little bits of code here because it just makes it horribly messy. */ diff --git a/ext/pcre/pcre2lib/sljit/sljitLir.h b/ext/pcre/pcre2lib/sljit/sljitLir.h index 8b6fa69a0a299..f9b132b5ba05f 100644 --- a/ext/pcre/pcre2lib/sljit/sljitLir.h +++ b/ext/pcre/pcre2lib/sljit/sljitLir.h @@ -1234,7 +1234,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op1(struct sljit_compiler *compile #define SLJIT_SHL (SLJIT_OP2_BASE + 8) #define SLJIT_SHL32 (SLJIT_SHL | SLJIT_32) /* Flags: Z - Same as SLJIT_SHL, except the the second operand is + Same as SLJIT_SHL, except the second operand is always masked by the length of the shift operation. */ #define SLJIT_MSHL (SLJIT_OP2_BASE + 9) #define SLJIT_MSHL32 (SLJIT_MSHL | SLJIT_32) @@ -1246,7 +1246,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op1(struct sljit_compiler *compile #define SLJIT_LSHR (SLJIT_OP2_BASE + 10) #define SLJIT_LSHR32 (SLJIT_LSHR | SLJIT_32) /* Flags: Z - Same as SLJIT_LSHR, except the the second operand is + Same as SLJIT_LSHR, except the second operand is always masked by the length of the shift operation. */ #define SLJIT_MLSHR (SLJIT_OP2_BASE + 11) #define SLJIT_MLSHR32 (SLJIT_MLSHR | SLJIT_32) @@ -1258,7 +1258,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op1(struct sljit_compiler *compile #define SLJIT_ASHR (SLJIT_OP2_BASE + 12) #define SLJIT_ASHR32 (SLJIT_ASHR | SLJIT_32) /* Flags: Z - Same as SLJIT_ASHR, except the the second operand is + Same as SLJIT_ASHR, except the second operand is always masked by the length of the shift operation. */ #define SLJIT_MASHR (SLJIT_OP2_BASE + 13) #define SLJIT_MASHR32 (SLJIT_MASHR | SLJIT_32) diff --git a/ext/random/tests/03_randomizer/methods/getBytesFromString_fast_path.phpt b/ext/random/tests/03_randomizer/methods/getBytesFromString_fast_path.phpt index 84c8ec611db80..7d7b98f1b27a9 100644 --- a/ext/random/tests/03_randomizer/methods/getBytesFromString_fast_path.phpt +++ b/ext/random/tests/03_randomizer/methods/getBytesFromString_fast_path.phpt @@ -41,7 +41,7 @@ for ($i = 1; $i <= strlen($allBytes); $i *= 2) { } // We also expect that each possible value appears at least once, if - // not is is very likely that some bits were erroneously masked away. + // not it is very likely that some bits were erroneously masked away. var_dump(count($count)); echo PHP_EOL; @@ -67,7 +67,7 @@ for ($i = 1; ($i + 1) <= strlen($allBytes); $i *= 2) { } // We expect that each possible value appears at least once, if - // not is is very likely that some bits were erroneously masked away. + // not it is very likely that some bits were erroneously masked away. var_dump(count($count)); echo PHP_EOL; @@ -90,7 +90,7 @@ for ($j = 0; $j < strlen($result); $j++) { } // We also expect that each possible value appears at least once, if -// not is is very likely that some bits were erroneously masked away. +// not it is very likely that some bits were erroneously masked away. var_dump(count($count)); ?> diff --git a/ext/uri/uriparser/src/UriCommon.c b/ext/uri/uriparser/src/UriCommon.c index 3644e8828f35f..2f81b186629be 100644 --- a/ext/uri/uriparser/src/UriCommon.c +++ b/ext/uri/uriparser/src/UriCommon.c @@ -727,7 +727,7 @@ UriBool URI_FUNC(FixPathNoScheme)(URI_TYPE(Uri) * uri, UriMemoryManager * memory } /* When dropping a host from a URI without a scheme, an absolute path - * and and empty first path segment, a consecutive reparse would rightfully + * and empty first path segment, a consecutive reparse would rightfully * mis-classify the first path segment as a host marker due to the "//". * To protect against this case, we prepend an artificial "." segment * to the path in here; the function is called after the host has diff --git a/sapi/fpm/fpm/events/kqueue.c b/sapi/fpm/fpm/events/kqueue.c index 09f5da12799be..21939d3414182 100644 --- a/sapi/fpm/fpm/events/kqueue.c +++ b/sapi/fpm/fpm/events/kqueue.c @@ -150,7 +150,7 @@ static int fpm_event_kqueue_wait(struct fpm_event_queue_s *queue, unsigned long /* }}} */ /* - * Add a FD to to kevent queue + * Add a FD to kevent queue */ static int fpm_event_kqueue_add(struct fpm_event_s *ev) /* {{{ */ { diff --git a/scripts/dev/bless_tests.php b/scripts/dev/bless_tests.php index 58baeac402462..7493a504729c4 100755 --- a/scripts/dev/bless_tests.php +++ b/scripts/dev/bless_tests.php @@ -124,7 +124,7 @@ function insertOutput(string $phpt, string $out): string { } /** - * Implementation of the the Myers diff algorithm. + * Implementation of the Myers diff algorithm. * * Myers, Eugene W. "An O (ND) difference algorithm and its variations." * Algorithmica 1.1 (1986): 251-266. diff --git a/win32/sendmail.c b/win32/sendmail.c index 394676f30316d..f267d1fae85ab 100644 --- a/win32/sendmail.c +++ b/win32/sendmail.c @@ -121,7 +121,7 @@ static int Ack(char **server_response); static unsigned long GetAddr(LPSTR szHost); static int FormatEmailAddress(char* Buf, char* EmailAddress, char* FormatString); -/* This function is meant to unify the headers passed to to mail() +/* This function is meant to unify the headers passed to mail() * This means, use PCRE to transform single occurrences of \n or \r in \r\n * As a second step we also eliminate all \r\n occurrences which are: * 1) At the start of the header From 3be74c84ecfb640dcb7feee115fc5a26d4bc7e98 Mon Sep 17 00:00:00 2001 From: lamentxu <1372449351@qq.com> Date: Tue, 30 Dec 2025 09:01:29 +0800 Subject: [PATCH 2/7] fix changes --- ext/fileinfo/tests/magic | 8 ++++---- ...1\271\343\202\211\343\202\214\343\201\276\343\201\231" | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ext/fileinfo/tests/magic b/ext/fileinfo/tests/magic index a6f1b5926c660..d52d65bac063d 100644 --- a/ext/fileinfo/tests/magic +++ b/ext/fileinfo/tests/magic @@ -15004,7 +15004,7 @@ >12 use next # bcachefs -# From: Thomas Wei�schuh +# From: Thomas Weißschuh 0 name bcachefs-uuid >0 ubelong x \b%08x @@ -19034,7 +19034,7 @@ # GRR: with --keep-going option the line above gives duplicate messages 0 search/1/ts #FIG >&0 use image-xfig -# binary data variant with non ASCII text characters like Control-A or �C in thermostat.fig +# binary data variant with non ASCII text characters like Control-A or °C in thermostat.fig 0 search/1/bs #FIG >&0 use image-xfig # display XFIG image describing text, mime type, file name extension and version @@ -28342,7 +28342,7 @@ # URL: https://en.wikipedia.org/wiki/Microsoft_OneNote#File_format # http://fileformats.archiveteam.org/wiki/OneNote # Reference: https://mark0.net/download/triddefs_xml.7z/defs/o/onepkg.trid.xml -# 1st member name like: "Class Notes.one" "test-onenote.one" "Open Notebook.onetoc2" "Editor �ffnen.onetoc2" +# 1st member name like: "Class Notes.one" "test-onenote.one" "Open Notebook.onetoc2" "Editor Öffnen.onetoc2" >>>>>&0 string/c one \b, OneNote Package !:mime application/msonenote !:ext onepkg @@ -39942,7 +39942,7 @@ !:ext esd >>12 ulelong !3584 ( # look for archive member RunTime.xml like in Microsoft.Windows.Cosa.Desktop.Client.ppkg ->>>156 search/68233/s RunTime.xml \bWindows provisioning package) +>>>156 search/68233/s RunTime.xml \bWindows provisioningt package) !:ext ppkg # if it is not a Windows provisioning package, then it is a WIM >>>156 default x \bWIM) image diff --git "a/ext/fileinfo/tests/magic\347\247\201\343\201\257\343\202\254\343\203\251\343\202\271\343\202\222\351\243\237\343\201\271\343\202\211\343\202\214\343\201\276\343\201\231" "b/ext/fileinfo/tests/magic\347\247\201\343\201\257\343\202\254\343\203\251\343\202\271\343\202\222\351\243\237\343\201\271\343\202\211\343\202\214\343\201\276\343\201\231" index a6f1b5926c660..c8783aea05c71 100644 --- "a/ext/fileinfo/tests/magic\347\247\201\343\201\257\343\202\254\343\203\251\343\202\271\343\202\222\351\243\237\343\201\271\343\202\211\343\202\214\343\201\276\343\201\231" +++ "b/ext/fileinfo/tests/magic\347\247\201\343\201\257\343\202\254\343\203\251\343\202\271\343\202\222\351\243\237\343\201\271\343\202\211\343\202\214\343\201\276\343\201\231" @@ -15004,7 +15004,7 @@ >12 use next # bcachefs -# From: Thomas Wei�schuh +# From: Thomas Weißschuh 0 name bcachefs-uuid >0 ubelong x \b%08x @@ -19034,7 +19034,7 @@ # GRR: with --keep-going option the line above gives duplicate messages 0 search/1/ts #FIG >&0 use image-xfig -# binary data variant with non ASCII text characters like Control-A or �C in thermostat.fig +# binary data variant with non ASCII text characters like Control-A or °C in thermostat.fig 0 search/1/bs #FIG >&0 use image-xfig # display XFIG image describing text, mime type, file name extension and version @@ -28342,7 +28342,7 @@ # URL: https://en.wikipedia.org/wiki/Microsoft_OneNote#File_format # http://fileformats.archiveteam.org/wiki/OneNote # Reference: https://mark0.net/download/triddefs_xml.7z/defs/o/onepkg.trid.xml -# 1st member name like: "Class Notes.one" "test-onenote.one" "Open Notebook.onetoc2" "Editor �ffnen.onetoc2" +# 1st member name like: "Class Notes.one" "test-onenote.one" "Open Notebook.onetoc2" "Editor Öffnen.onetoc2" >>>>>&0 string/c one \b, OneNote Package !:mime application/msonenote !:ext onepkg From c63c65aedc0624a6350b35a6cc4b8ac0291e7a94 Mon Sep 17 00:00:00 2001 From: lamentxu <1372449351@qq.com> Date: Tue, 30 Dec 2025 09:01:29 +0800 Subject: [PATCH 3/7] fix changes --- ext/fileinfo/tests/magic | 6 +++--- ...201\271\343\202\211\343\202\214\343\201\276\343\201\231" | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ext/fileinfo/tests/magic b/ext/fileinfo/tests/magic index a6f1b5926c660..c8783aea05c71 100644 --- a/ext/fileinfo/tests/magic +++ b/ext/fileinfo/tests/magic @@ -15004,7 +15004,7 @@ >12 use next # bcachefs -# From: Thomas Wei�schuh +# From: Thomas Weißschuh 0 name bcachefs-uuid >0 ubelong x \b%08x @@ -19034,7 +19034,7 @@ # GRR: with --keep-going option the line above gives duplicate messages 0 search/1/ts #FIG >&0 use image-xfig -# binary data variant with non ASCII text characters like Control-A or �C in thermostat.fig +# binary data variant with non ASCII text characters like Control-A or °C in thermostat.fig 0 search/1/bs #FIG >&0 use image-xfig # display XFIG image describing text, mime type, file name extension and version @@ -28342,7 +28342,7 @@ # URL: https://en.wikipedia.org/wiki/Microsoft_OneNote#File_format # http://fileformats.archiveteam.org/wiki/OneNote # Reference: https://mark0.net/download/triddefs_xml.7z/defs/o/onepkg.trid.xml -# 1st member name like: "Class Notes.one" "test-onenote.one" "Open Notebook.onetoc2" "Editor �ffnen.onetoc2" +# 1st member name like: "Class Notes.one" "test-onenote.one" "Open Notebook.onetoc2" "Editor Öffnen.onetoc2" >>>>>&0 string/c one \b, OneNote Package !:mime application/msonenote !:ext onepkg diff --git "a/ext/fileinfo/tests/magic\347\247\201\343\201\257\343\202\254\343\203\251\343\202\271\343\202\222\351\243\237\343\201\271\343\202\211\343\202\214\343\201\276\343\201\231" "b/ext/fileinfo/tests/magic\347\247\201\343\201\257\343\202\254\343\203\251\343\202\271\343\202\222\351\243\237\343\201\271\343\202\211\343\202\214\343\201\276\343\201\231" index a6f1b5926c660..c8783aea05c71 100644 --- "a/ext/fileinfo/tests/magic\347\247\201\343\201\257\343\202\254\343\203\251\343\202\271\343\202\222\351\243\237\343\201\271\343\202\211\343\202\214\343\201\276\343\201\231" +++ "b/ext/fileinfo/tests/magic\347\247\201\343\201\257\343\202\254\343\203\251\343\202\271\343\202\222\351\243\237\343\201\271\343\202\211\343\202\214\343\201\276\343\201\231" @@ -15004,7 +15004,7 @@ >12 use next # bcachefs -# From: Thomas Wei�schuh +# From: Thomas Weißschuh 0 name bcachefs-uuid >0 ubelong x \b%08x @@ -19034,7 +19034,7 @@ # GRR: with --keep-going option the line above gives duplicate messages 0 search/1/ts #FIG >&0 use image-xfig -# binary data variant with non ASCII text characters like Control-A or �C in thermostat.fig +# binary data variant with non ASCII text characters like Control-A or °C in thermostat.fig 0 search/1/bs #FIG >&0 use image-xfig # display XFIG image describing text, mime type, file name extension and version @@ -28342,7 +28342,7 @@ # URL: https://en.wikipedia.org/wiki/Microsoft_OneNote#File_format # http://fileformats.archiveteam.org/wiki/OneNote # Reference: https://mark0.net/download/triddefs_xml.7z/defs/o/onepkg.trid.xml -# 1st member name like: "Class Notes.one" "test-onenote.one" "Open Notebook.onetoc2" "Editor �ffnen.onetoc2" +# 1st member name like: "Class Notes.one" "test-onenote.one" "Open Notebook.onetoc2" "Editor Öffnen.onetoc2" >>>>>&0 string/c one \b, OneNote Package !:mime application/msonenote !:ext onepkg From 19be6148bc3c1feae9498891bc6530566839e382 Mon Sep 17 00:00:00 2001 From: lamentxu <1372449351@qq.com> Date: Tue, 30 Dec 2025 09:04:02 +0800 Subject: [PATCH 4/7] fix 'provisioningt' --- ext/fileinfo/tests/magic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/fileinfo/tests/magic b/ext/fileinfo/tests/magic index d52d65bac063d..c8783aea05c71 100644 --- a/ext/fileinfo/tests/magic +++ b/ext/fileinfo/tests/magic @@ -39942,7 +39942,7 @@ !:ext esd >>12 ulelong !3584 ( # look for archive member RunTime.xml like in Microsoft.Windows.Cosa.Desktop.Client.ppkg ->>>156 search/68233/s RunTime.xml \bWindows provisioningt package) +>>>156 search/68233/s RunTime.xml \bWindows provisioning package) !:ext ppkg # if it is not a Windows provisioning package, then it is a WIM >>>156 default x \bWIM) image From 3ac9a53140bb3a53c3a06c510eb4a19e6cff9e67 Mon Sep 17 00:00:00 2001 From: Weilin Du <108666168+LamentXU123@users.noreply.github.com> Date: Tue, 30 Dec 2025 09:06:04 +0800 Subject: [PATCH 5/7] fix more 'to to' typos --- docs/source/miscellaneous/writing-tests.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/miscellaneous/writing-tests.rst b/docs/source/miscellaneous/writing-tests.rst index 000516fe4195d..8c4e0535763cc 100644 --- a/docs/source/miscellaneous/writing-tests.rst +++ b/docs/source/miscellaneous/writing-tests.rst @@ -1389,7 +1389,7 @@ Example 1 (full): :ref:`sample002.phpt` ``--EXPECT_EXTERNAL--`` ----------------------- -**Description:** Similar to to ``--EXPECT--`` section, but just stating a filename where to load the +**Description:** Similar to ``--EXPECT--`` section, but just stating a filename where to load the expected output from. **Required:** One of the ``EXPECT`` type sections is required. @@ -1526,7 +1526,7 @@ Example 2 (full): :ref:`sample020.phpt` ``--EXPECTF_EXTERNAL--`` ------------------------ -**Description:** Similar to to ``--EXPECTF--`` section, but like the ``--EXPECT_EXTERNAL--`` section +**Description:** Similar to ``--EXPECTF--`` section, but like the ``--EXPECT_EXTERNAL--`` section just stating a filename where to load the expected output from. **Required:** One of the ``EXPECT`` type sections is required. From 01323af257e77542ae98353634ab0b27b5317ef3 Mon Sep 17 00:00:00 2001 From: lamentxu <1372449351@qq.com> Date: Tue, 30 Dec 2025 17:40:21 +0800 Subject: [PATCH 6/7] reset upstream fixes --- ext/pcre/pcre2lib/pcre2_compile.c | 2 +- ext/pcre/pcre2lib/sljit/sljitLir.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ext/pcre/pcre2lib/pcre2_compile.c b/ext/pcre/pcre2lib/pcre2_compile.c index 71077e51f64a3..8e6787aba38ec 100644 --- a/ext/pcre/pcre2lib/pcre2_compile.c +++ b/ext/pcre/pcre2lib/pcre2_compile.c @@ -7753,7 +7753,7 @@ for (;; pptr++) /* If previous was a character type match (\d or similar), abolish it and create a suitable repeat item. The code is shared with single-character repeats by setting op_type to add a suitable offset into repeat_type. - Note the Unicode property types will be present only when + Note the the Unicode property types will be present only when SUPPORT_UNICODE is defined, but we don't wrap the little bits of code here because it just makes it horribly messy. */ diff --git a/ext/pcre/pcre2lib/sljit/sljitLir.h b/ext/pcre/pcre2lib/sljit/sljitLir.h index f9b132b5ba05f..8b6fa69a0a299 100644 --- a/ext/pcre/pcre2lib/sljit/sljitLir.h +++ b/ext/pcre/pcre2lib/sljit/sljitLir.h @@ -1234,7 +1234,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op1(struct sljit_compiler *compile #define SLJIT_SHL (SLJIT_OP2_BASE + 8) #define SLJIT_SHL32 (SLJIT_SHL | SLJIT_32) /* Flags: Z - Same as SLJIT_SHL, except the second operand is + Same as SLJIT_SHL, except the the second operand is always masked by the length of the shift operation. */ #define SLJIT_MSHL (SLJIT_OP2_BASE + 9) #define SLJIT_MSHL32 (SLJIT_MSHL | SLJIT_32) @@ -1246,7 +1246,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op1(struct sljit_compiler *compile #define SLJIT_LSHR (SLJIT_OP2_BASE + 10) #define SLJIT_LSHR32 (SLJIT_LSHR | SLJIT_32) /* Flags: Z - Same as SLJIT_LSHR, except the second operand is + Same as SLJIT_LSHR, except the the second operand is always masked by the length of the shift operation. */ #define SLJIT_MLSHR (SLJIT_OP2_BASE + 11) #define SLJIT_MLSHR32 (SLJIT_MLSHR | SLJIT_32) @@ -1258,7 +1258,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op1(struct sljit_compiler *compile #define SLJIT_ASHR (SLJIT_OP2_BASE + 12) #define SLJIT_ASHR32 (SLJIT_ASHR | SLJIT_32) /* Flags: Z - Same as SLJIT_ASHR, except the second operand is + Same as SLJIT_ASHR, except the the second operand is always masked by the length of the shift operation. */ #define SLJIT_MASHR (SLJIT_OP2_BASE + 13) #define SLJIT_MASHR32 (SLJIT_MASHR | SLJIT_32) From 6970fe1d675d41b25e60c0bf92958eafdde8a68e Mon Sep 17 00:00:00 2001 From: lamentxu <1372449351@qq.com> Date: Tue, 30 Dec 2025 22:57:18 +0800 Subject: [PATCH 7/7] revert fixes --- ext/date/lib/timelib.h | 2 +- ext/uri/uriparser/src/UriCommon.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/date/lib/timelib.h b/ext/date/lib/timelib.h index 32cae6ea8bc02..ef57a7ee783f0 100644 --- a/ext/date/lib/timelib.h +++ b/ext/date/lib/timelib.h @@ -713,7 +713,7 @@ void timelib_set_timezone_from_offset(timelib_time *t, timelib_sll utc_offset); void timelib_set_timezone_from_abbr(timelib_time *t, timelib_abbr_info abbr_info); /** - * Attaches the time zone information in 'tz' to 't'. + * Attaches the time zone information in 'tz' to to 't'. * * It fetches the right UTC offset that is currently stored in the time * stamp field in 't' ('sse'), and assigns that to the 'z' field and 'dst' diff --git a/ext/uri/uriparser/src/UriCommon.c b/ext/uri/uriparser/src/UriCommon.c index 2f81b186629be..3644e8828f35f 100644 --- a/ext/uri/uriparser/src/UriCommon.c +++ b/ext/uri/uriparser/src/UriCommon.c @@ -727,7 +727,7 @@ UriBool URI_FUNC(FixPathNoScheme)(URI_TYPE(Uri) * uri, UriMemoryManager * memory } /* When dropping a host from a URI without a scheme, an absolute path - * and empty first path segment, a consecutive reparse would rightfully + * and and empty first path segment, a consecutive reparse would rightfully * mis-classify the first path segment as a host marker due to the "//". * To protect against this case, we prepend an artificial "." segment * to the path in here; the function is called after the host has