[php-src] PHP-8.5: Merge branch 'PHP-8.4' into PHP-8.5
Tim Düsterhus <[email protected]>
| Newsgroups | gmane.comp.php.cvs.general |
|---|---|
| Message-ID | <[email protected]> |
Author: Tim Düsterhus (TimWolla) Date: 2026-06-30T00:40:16+02:00 Commit: https://github.com/php/php-src/commit/bc42635d54f431f336c4235c12dd56761c6484cf Raw diff: https://github.com/php/php-src/commit/bc42635d54f431f336c4235c12dd56761c6484cf.diff Merge branch 'PHP-8.4' into PHP-8.5 * PHP-8.4: lexbor: Refresh patch files (#22517) Changed paths: M ext/lexbor/lexbor/core/swar.h M ext/lexbor/patches/0001-Expose-line-and-column-information-for-use-in-PHP.patch M ext/lexbor/patches/0002-Track-implied-added-nodes-for-options-use-in-PHP.patch M ext/lexbor/patches/0003-Patch-utilities-and-data-structure-to-be-able-to-gen.patch M ext/lexbor/patches/0004-Remove-unused-upper-case-tag-static-data.patch M ext/lexbor/patches/0005-Shrink-size-of-static-binary-search-tree.patch M ext/lexbor/patches/0006-Patch-out-unused-CSS-style-code.patch M ext/lexbor/patches/update-lexbor.sh Diff: diff --git a/ext/lexbor/lexbor/core/swar.h b/ext/lexbor/lexbor/core/swar.h index 78579ad4bee7..ec0a13b8e23f 100644 --- a/ext/lexbor/lexbor/core/swar.h +++ b/ext/lexbor/lexbor/core/swar.h @@ -1,7 +1,7 @@ /* * Copyright (C) 2024 Alexander Borisov * - * Author: Nora Dossche <[email protected]> + * Author: Niels Dossche <[email protected]> */ #ifndef LEXBOR_SWAR_H diff --git a/ext/lexbor/patches/0001-Expose-line-and-column-information-for-use-in-PHP.patch b/ext/lexbor/patches/0001-Expose-line-and-column-information-for-use-in-PHP.patch index 32d9d42d2bf1..1b35913e91c7 100644 --- a/ext/lexbor/patches/0001-Expose-line-and-column-information-for-use-in-PHP.patch +++ b/ext/lexbor/patches/0001-Expose-line-and-column-information-for-use-in-PHP.patch @@ -1,4 +1,4 @@ -From 0cd2add6c46400b808329442f81451b369863983 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Niels Dossche <[email protected]> Date: Sat, 26 Aug 2023 15:08:59 +0200 Subject: [PATCH 1/6] Expose line and column information for use in PHP @@ -183,6 +183,3 @@ index 7a212af..b186772 100644 } lxb_html_tree_error_t; --- -2.51.2 - diff --git a/ext/lexbor/patches/0002-Track-implied-added-nodes-for-options-use-in-PHP.patch b/ext/lexbor/patches/0002-Track-implied-added-nodes-for-options-use-in-PHP.patch index 1902abf96e3a..24bc21630513 100644 --- a/ext/lexbor/patches/0002-Track-implied-added-nodes-for-options-use-in-PHP.patch +++ b/ext/lexbor/patches/0002-Track-implied-added-nodes-for-options-use-in-PHP.patch @@ -1,4 +1,4 @@ -From a4c29ba8d1ea1065ce6bd4a34382d53140cf1924 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Niels Dossche <[email protected]> Date: Mon, 14 Aug 2023 20:18:51 +0200 Subject: [PATCH 2/6] Track implied added nodes for options use in PHP @@ -62,6 +62,3 @@ index 05fe738..1e09cda 100644 tree->mode = lxb_html_tree_insertion_mode_before_head; break; --- -2.51.2 - diff --git a/ext/lexbor/patches/0003-Patch-utilities-and-data-structure-to-be-able-to-gen.patch b/ext/lexbor/patches/0003-Patch-utilities-and-data-structure-to-be-able-to-gen.patch index 51f77483bc6e..9c67ba740c4a 100644 --- a/ext/lexbor/patches/0003-Patch-utilities-and-data-structure-to-be-able-to-gen.patch +++ b/ext/lexbor/patches/0003-Patch-utilities-and-data-structure-to-be-able-to-gen.patch @@ -1,4 +1,4 @@ -From 46fc776449252e74795569759a19d13857a59069 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Niels Dossche <[email protected]> Date: Thu, 24 Aug 2023 22:57:48 +0200 Subject: [PATCH 3/6] Patch utilities and data structure to be able to generate @@ -92,6 +92,3 @@ index 3e75812..2370c66 100755 result.append("};") --- -2.51.2 - diff --git a/ext/lexbor/patches/0004-Remove-unused-upper-case-tag-static-data.patch b/ext/lexbor/patches/0004-Remove-unused-upper-case-tag-static-data.patch index 6cb6658a164b..4640a03647b9 100644 --- a/ext/lexbor/patches/0004-Remove-unused-upper-case-tag-static-data.patch +++ b/ext/lexbor/patches/0004-Remove-unused-upper-case-tag-static-data.patch @@ -1,4 +1,4 @@ -From ae9d7254ac129cc3be34de6fd34af27baf3bb396 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Niels Dossche <[email protected]> Date: Wed, 29 Nov 2023 21:26:47 +0100 Subject: [PATCH 4/6] Remove unused upper case tag static data @@ -48,6 +48,3 @@ index 780bc47..be5bb30 100644 /* * No inline functions for ABI. --- -2.51.2 - diff --git a/ext/lexbor/patches/0005-Shrink-size-of-static-binary-search-tree.patch b/ext/lexbor/patches/0005-Shrink-size-of-static-binary-search-tree.patch index 9ef6e305e498..d276ba8f2efa 100644 --- a/ext/lexbor/patches/0005-Shrink-size-of-static-binary-search-tree.patch +++ b/ext/lexbor/patches/0005-Shrink-size-of-static-binary-search-tree.patch @@ -1,4 +1,4 @@ -From 19cf6183813e013dfe0eb2303c15eaf6e01b9faf Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Niels Dossche <[email protected]> Date: Wed, 29 Nov 2023 21:29:31 +0100 Subject: [PATCH 5/6] Shrink size of static binary search tree @@ -111,6 +111,3 @@ index 2370c66..c41e645 100755 self.buffer.append(line) fh.close() --- -2.51.2 - diff --git a/ext/lexbor/patches/0006-Patch-out-unused-CSS-style-code.patch b/ext/lexbor/patches/0006-Patch-out-unused-CSS-style-code.patch index a643f9716488..827375f3f05c 100644 --- a/ext/lexbor/patches/0006-Patch-out-unused-CSS-style-code.patch +++ b/ext/lexbor/patches/0006-Patch-out-unused-CSS-style-code.patch @@ -1,4 +1,4 @@ -From 54399ee441d922d89c32909e2028f899f6091cd6 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Niels Dossche <[email protected]> Date: Sun, 7 Jan 2024 21:59:28 +0100 Subject: [PATCH 6/6] Patch out unused CSS style code @@ -27,6 +27,3 @@ index 308dced..d192a01 100644 } lxb_inline void --- -2.51.2 - diff --git a/ext/lexbor/patches/update-lexbor.sh b/ext/lexbor/patches/update-lexbor.sh index 55e330a87644..ae288285453d 100755 --- a/ext/lexbor/patches/update-lexbor.sh +++ b/ext/lexbor/patches/update-lexbor.sh @@ -25,8 +25,9 @@ for patch in "${patches[@]}"; do done # Refresh patches +rm "$PATCHES_DIR"/*.patch NUM_PATCHES=${#patches[@]} -git format-patch "HEAD~$NUM_PATCHES" -o "$PATCHES_DIR" +git format-patch --no-signature --zero-commit "HEAD~$NUM_PATCHES" -o "$PATCHES_DIR" # Run code-generation tools (cd "$LEXBOR_TMP_DIR/utils/lexbor/encoding" && python3 single-byte.py)