Skip to content

Commit 08739ce

Browse files
kocsismatekocsismate
committed
Additional fixes
1 parent 40bc6a8 commit 08739ce

File tree

7 files changed

+61
-77
lines changed

7 files changed

+61
-77
lines changed

‎.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@
3030
/ext/date/tests/ossfuzz*.txt binary
3131

3232
# Vendored libraries
33-
/ext/dom/lexbor/lexbor linguist-vendored
33+
/ext/lexbor/lexbor linguist-vendored

‎README.REDIST.BINS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
17. ext/mbstring/ucgendat portions based on the ucgendat.c from the OpenLDAP
1818
18. avifinfo (ext/standard/libavifinfo) see ext/standard/libavifinfo/LICENSE
1919
19. xxHash (ext/hash/xxhash)
20-
20. Lexbor (ext/dom/lexbor/lexbor) see ext/dom/lexbor/LICENSE
20+
20. Lexbor (ext/lexbor/lexbor) see ext/lexbor/LICENSE
2121
21. Portions of libcperciva (ext/hash/hash_sha_{ni,sse2}.c) see the header in the source file
2222

2323
3. pcre2lib (ext/pcre)

‎codecov.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
ignore:
22
# bundled libraries
3-
- "ext/dom/lexbor/lexbor/core"
4-
- "ext/dom/lexbor/lexbor/css"
5-
- "ext/dom/lexbor/lexbor/dom"
6-
- "ext/dom/lexbor/lexbor/encoding"
7-
- "ext/dom/lexbor/lexbor/html"
8-
- "ext/dom/lexbor/lexbor/ns"
9-
- "ext/dom/lexbor/lexbor/ports"
10-
- "ext/dom/lexbor/lexbor/tag"
3+
- "ext/lexbor/lexbor/core"
4+
- "ext/lexbor/lexbor/css"
5+
- "ext/lexbor/lexbor/dom"
6+
- "ext/lexbor/lexbor/encoding"
7+
- "ext/lexbor/lexbor/html"
8+
- "ext/lexbor/lexbor/ns"
9+
- "ext/lexbor/lexbor/ports"
10+
- "ext/lexbor/lexbor/tag"
1111
- "ext/pcre/pcre2lib"

‎ext/dom/config.m4

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ PHP_ARG_ENABLE([dom],
55
[yes])
66

77
if test "$PHP_DOM" != "no"; then
8-
PHP_LEXBOR_ENABLED=yes
9-
108
PHP_SETUP_LIBXML([DOM_SHARED_LIBADD], [
119
AC_DEFINE([HAVE_DOM], [1],
1210
[Define to 1 if the PHP extension 'dom' is available.])

‎ext/lexbor/config.m4

Lines changed: 27 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,10 @@
1-
PHP_ARG_ENABLE([lexbor],
2-
[whether to enable lexbor],
3-
[AS_HELP_STRING([--enable-lexbor],
4-
[Enable lexbor explicitly, will be done implicitly when required by other
5-
extensions])],
6-
[no],
7-
[yes])
1+
PHP_LEXBOR_CFLAGS="-I@ext_srcdir@/ -DLEXBOR_STATIC"
2+
LEXBOR_DIR="lexbor"
83

9-
if test "$PHP_LEXBOR" != "no" || test "$PHP_LEXBOR_ENABLED" = "yes"; then
10-
PHP_LEXBOR_CFLAGS="-I@ext_srcdir@/ -DLEXBOR_STATIC"
11-
LEXBOR_DIR="lexbor"
4+
AC_DEFINE([HAVE_LEXBOR], [1], [Define to 1 if the PHP extension 'lexbor' is available.])
5+
AC_DEFINE([LEXBOR_VERSION], ["2.5.0"], [Define the main Lexbor version])
126

13-
AC_DEFINE([HAVE_LEXBOR], [1], [Define to 1 if the PHP extension 'lexbor' is available.])
14-
AC_DEFINE([LEXBOR_VERSION], ["2.5.0"], [Define the main Lexbor version])
15-
16-
PHP_NEW_EXTENSION([lexbor], m4_normalize([
7+
PHP_NEW_EXTENSION([lexbor], m4_normalize([
178
php_lexbor.c
189
$LEXBOR_DIR/core/array_obj.c
1910
$LEXBOR_DIR/core/array.c
@@ -185,29 +176,28 @@ if test "$PHP_LEXBOR" != "no" || test "$PHP_LEXBOR_ENABLED" = "yes"; then
185176
$LEXBOR_DIR/ports/posix/lexbor/core/memory.c
186177
$LEXBOR_DIR/tag/tag.c
187178
]),
188-
[$ext_shared],,
179+
[no],,
189180
[-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 $PHP_LEXBOR_CFLAGS])
190181

191-
PHP_ADD_BUILD_DIR([
192-
$ext_builddir/
193-
$ext_builddir/$LEXBOR_DIR/core
194-
$ext_builddir/$LEXBOR_DIR/css/selectors
195-
$ext_builddir/$LEXBOR_DIR/css/syntax/tokenizer
196-
$ext_builddir/$LEXBOR_DIR/css/tokenizer
197-
$ext_builddir/$LEXBOR_DIR/dom/interfaces
198-
$ext_builddir/$LEXBOR_DIR/encoding
199-
$ext_builddir/$LEXBOR_DIR/html
200-
$ext_builddir/$LEXBOR_DIR/html/interfaces
201-
$ext_builddir/$LEXBOR_DIR/html/tokenizer
202-
$ext_builddir/$LEXBOR_DIR/html/tree/insertion_mode
203-
$ext_builddir/$LEXBOR_DIR/ns
204-
$ext_builddir/$LEXBOR_DIR/ports/posix/lexbor/core
205-
$ext_builddir/$LEXBOR_DIR/tag
206-
])
207-
PHP_ADD_INCLUDE([$ext_srcdir])
208-
PHP_INSTALL_HEADERS([ext/lexbor], m4_normalize([
209-
php_lexbor.h
210-
]))
182+
PHP_ADD_BUILD_DIR([
183+
$ext_builddir/
184+
$ext_builddir/$LEXBOR_DIR/core
185+
$ext_builddir/$LEXBOR_DIR/css/selectors
186+
$ext_builddir/$LEXBOR_DIR/css/syntax/tokenizer
187+
$ext_builddir/$LEXBOR_DIR/css/tokenizer
188+
$ext_builddir/$LEXBOR_DIR/dom/interfaces
189+
$ext_builddir/$LEXBOR_DIR/encoding
190+
$ext_builddir/$LEXBOR_DIR/html
191+
$ext_builddir/$LEXBOR_DIR/html/interfaces
192+
$ext_builddir/$LEXBOR_DIR/html/tokenizer
193+
$ext_builddir/$LEXBOR_DIR/html/tree/insertion_mode
194+
$ext_builddir/$LEXBOR_DIR/ns
195+
$ext_builddir/$LEXBOR_DIR/ports/posix/lexbor/core
196+
$ext_builddir/$LEXBOR_DIR/tag
197+
])
198+
PHP_ADD_INCLUDE([$ext_srcdir])
199+
PHP_INSTALL_HEADERS([ext/lexbor], m4_normalize([
200+
php_lexbor.h
201+
]))
211202

212-
PHP_SUBST([LEXBOR_SHARED_LIBADD])
213-
fi
203+
PHP_SUBST([LEXBOR_SHARED_LIBADD])

‎ext/lexbor/config.w32

Lines changed: 23 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,27 @@
11
// vim:ft=javascript
22

3-
ARG_ENABLE("lexbor", "Lexbor support", "yes");
3+
EXTENSION("lexbor", "php_lexbor.c", false, "/I " + configure_module_dirname + " /DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
4+
PHP_LEXBOR="yes";
5+
ADD_SOURCES("ext/lexbor", "php_lexbor.c", "lexbor");
6+
ADD_SOURCES("ext/lexbor/lexbor/ports/windows_nt/lexbor/core", "memory.c", "lexbor");
7+
ADD_SOURCES("ext/lexbor/lexbor/core", "array_obj.c array.c avl.c bst.c diyfp.c conv.c dobject.c dtoa.c hash.c mem.c mraw.c print.c serialize.c shs.c str.c strtod.c", "lexbor");
8+
ADD_SOURCES("ext/lexbor/lexbor/dom", "interface.c", "lexbor");
9+
ADD_SOURCES("ext/lexbor/lexbor/dom/interfaces", "attr.c cdata_section.c character_data.c comment.c document.c document_fragment.c document_type.c element.c node.c processing_instruction.c shadow_root.c text.c", "lexbor");
10+
ADD_SOURCES("ext/lexbor/lexbor/html/tokenizer", "error.c state_comment.c state_doctype.c state_rawtext.c state_rcdata.c state_script.c state.c", "lexbor");
11+
ADD_SOURCES("ext/lexbor/lexbor/html/tree", "active_formatting.c open_elements.c error.c","lexbor");
12+
ADD_SOURCES("ext/lexbor/lexbor/html/tree/insertion_mode", "after_after_body.c after_after_frameset.c after_body.c after_frameset.c after_head.c before_head.c before_html.c foreign_content.c in_body.c in_caption.c in_cell.c in_column_group.c in_frameset.c in_head.c in_head_noscript.c initial.c in_row.c in_select.c in_select_in_table.c in_table_body.c in_table.c in_table_text.c in_template.c text.c","lexbor");
13+
ADD_SOURCES("ext/lexbor/lexbor/html", "encoding.c interface.c parser.c token.c token_attr.c tokenizer.c tree.c","lexbor");
14+
ADD_SOURCES("ext/lexbor/lexbor/encoding", "big5.c decode.c encode.c encoding.c multi.c range.c res.c single.c","lexbor");
15+
ADD_SOURCES("ext/lexbor/lexbor/html/interfaces", "anchor_element.c area_element.c audio_element.c base_element.c body_element.c br_element.c button_element.c canvas_element.c data_element.c data_list_element.c details_element.c dialog_element.c directory_element.c div_element.c d_list_element.c document.c element.c embed_element.c field_set_element.c font_element.c form_element.c frame_element.c frame_set_element.c head_element.c heading_element.c hr_element.c html_element.c iframe_element.c image_element.c input_element.c label_element.c legend_element.c li_element.c link_element.c map_element.c marquee_element.c media_element.c menu_element.c meta_element.c meter_element.c mod_element.c object_element.c o_list_element.c opt_group_element.c option_element.c output_element.c paragraph_element.c param_element.c picture_element.c pre_element.c progress_element.c quote_element.c script_element.c select_element.c slot_element.c source_element.c span_element.c style_element.c table_caption_element.c table_cell_element.c table_col_element.c table_element.c table_row_element.c table_section_element.c template_element.c text_area_element.c time_element.c title_element.c track_element.c u_list_element.c unknown_element.c video_element.c window.c","lexbor");
16+
ADD_SOURCES("ext/lexbor/lexbor/css", "state.c log.c parser.c css.c","lexbor");
17+
ADD_SOURCES("ext/lexbor/lexbor/css/selectors", "state.c selectors.c selector.c pseudo_state.c pseudo.c","lexbor");
18+
ADD_SOURCES("ext/lexbor/lexbor/css/syntax", "state.c parser.c syntax.c anb.c tokenizer.c token.c","lexbor");
19+
ADD_SOURCES("ext/lexbor/lexbor/css/syntax/tokenizer", "error.c","lexbor");
20+
ADD_SOURCES("ext/lexbor/lexbor/ns", "ns.c","lexbor");
21+
ADD_SOURCES("ext/lexbor/lexbor/tag", "tag.c","lexbor");
22+
ADD_FLAG("CFLAGS_LEXBOR", "/D LEXBOR_STATIC /utf-8");
423

5-
if (PHP_LEXBOR == "yes") {
6-
EXTENSION("lexbor", "php_lexbor.c", null, "/I " + configure_module_dirname + " /DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
24+
AC_DEFINE("HAVE_LEXBOR", 1, "Define to 1 if the PHP extension 'lexbor' is available.");
25+
AC_DEFINE("LEXBOR_VERSION", "2.5.0", "Define the main Lexbor version")
726

8-
ADD_SOURCES("ext/lexbor", "php_lexbor.c", "lexbor");
9-
ADD_SOURCES("ext/lexbor/lexbor/ports/windows_nt/lexbor/core", "memory.c", "lexbor");
10-
ADD_SOURCES("ext/lexbor/lexbor/core", "array_obj.c array.c avl.c bst.c diyfp.c conv.c dobject.c dtoa.c hash.c mem.c mraw.c print.c serialize.c shs.c str.c strtod.c", "lexbor");
11-
ADD_SOURCES("ext/lexbor/lexbor/dom", "interface.c", "lexbor");
12-
ADD_SOURCES("ext/lexbor/lexbor/dom/interfaces", "attr.c cdata_section.c character_data.c comment.c document.c document_fragment.c document_type.c element.c node.c processing_instruction.c shadow_root.c text.c", "lexbor");
13-
ADD_SOURCES("ext/lexbor/lexbor/html/tokenizer", "error.c state_comment.c state_doctype.c state_rawtext.c state_rcdata.c state_script.c state.c", "lexbor");
14-
ADD_SOURCES("ext/lexbor/lexbor/html/tree", "active_formatting.c open_elements.c error.c","lexbor");
15-
ADD_SOURCES("ext/lexbor/lexbor/html/tree/insertion_mode", "after_after_body.c after_after_frameset.c after_body.c after_frameset.c after_head.c before_head.c before_html.c foreign_content.c in_body.c in_caption.c in_cell.c in_column_group.c in_frameset.c in_head.c in_head_noscript.c initial.c in_row.c in_select.c in_select_in_table.c in_table_body.c in_table.c in_table_text.c in_template.c text.c","lexbor");
16-
ADD_SOURCES("ext/lexbor/lexbor/html", "encoding.c interface.c parser.c token.c token_attr.c tokenizer.c tree.c","lexbor");
17-
ADD_SOURCES("ext/lexbor/lexbor/encoding", "big5.c decode.c encode.c encoding.c multi.c range.c res.c single.c","lexbor");
18-
ADD_SOURCES("ext/lexbor/lexbor/html/interfaces", "anchor_element.c area_element.c audio_element.c base_element.c body_element.c br_element.c button_element.c canvas_element.c data_element.c data_list_element.c details_element.c dialog_element.c directory_element.c div_element.c d_list_element.c document.c element.c embed_element.c field_set_element.c font_element.c form_element.c frame_element.c frame_set_element.c head_element.c heading_element.c hr_element.c html_element.c iframe_element.c image_element.c input_element.c label_element.c legend_element.c li_element.c link_element.c map_element.c marquee_element.c media_element.c menu_element.c meta_element.c meter_element.c mod_element.c object_element.c o_list_element.c opt_group_element.c option_element.c output_element.c paragraph_element.c param_element.c picture_element.c pre_element.c progress_element.c quote_element.c script_element.c select_element.c slot_element.c source_element.c span_element.c style_element.c table_caption_element.c table_cell_element.c table_col_element.c table_element.c table_row_element.c table_section_element.c template_element.c text_area_element.c time_element.c title_element.c track_element.c u_list_element.c unknown_element.c video_element.c window.c","lexbor");
19-
ADD_SOURCES("ext/lexbor/lexbor/css", "state.c log.c parser.c css.c","lexbor");
20-
ADD_SOURCES("ext/lexbor/lexbor/css/selectors", "state.c selectors.c selector.c pseudo_state.c pseudo.c","lexbor");
21-
ADD_SOURCES("ext/lexbor/lexbor/css/syntax", "state.c parser.c syntax.c anb.c tokenizer.c token.c","lexbor");
22-
ADD_SOURCES("ext/lexbor/lexbor/css/syntax/tokenizer", "error.c","lexbor");
23-
ADD_SOURCES("ext/lexbor/lexbor/ns", "ns.c","lexbor");
24-
ADD_SOURCES("ext/lexbor/lexbor/tag", "tag.c","lexbor");
25-
ADD_FLAG("CFLAGS_LEXBOR", "/D LEXBOR_STATIC /utf-8");
26-
27-
AC_DEFINE("HAVE_LEXBOR", 1, "Define to 1 if the PHP extension 'lexbor' is available.");
28-
AC_DEFINE("LEXBOR_VERSION", "2.5.0", "Define the main Lexbor version")
29-
30-
PHP_INSTALL_HEADERS("ext/lexbor", "php_lexbor.h lexbor/");
31-
}
27+
PHP_INSTALL_HEADERS("ext/lexbor", "php_lexbor.h lexbor/");

‎scripts/dev/tidy.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
$excludes = [
2424
// Bundled libraries / files.
2525
'ext/date/lib/',
26-
'ext/dom/lexbor/',
26+
'ext/lexbor/lexbor/',
2727
'ext/fileinfo/data_file.c',
2828
'ext/fileinfo/libmagic/',
2929
'ext/gd/libgd/',

0 commit comments

Comments
 (0)