Skip to content

[RFC] Add RFC 3986 and WHATWG compliant URL parsing support #14461

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 22 commits into
base: master
Choose a base branch
from
+283,743 −213
Open

[RFC] Add RFC 3986 and WHATWG compliant URL parsing support #14461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
be61144
Add RFC 3986 and WHATWG compliant URL parsing support
kocsismate Jun 3, 2024
88d4c06
Serialization
kocsismate Oct 22, 2024
a60857c
Improve error handling
kocsismate Oct 26, 2024
9b6684f
Lot of fixes and added support for equalsTo()
kocsismate Nov 11, 2024
6764c12
Add normalization support
kocsismate Nov 13, 2024
1b6233c
SOAP test fixes
kocsismate Nov 13, 2024
ff05ee1
Fix some memory leaks
kocsismate Nov 13, 2024
ea7848d
Some cleanups
kocsismate Nov 18, 2024
45542b3
Changes based on discussion
kocsismate Nov 30, 2024
066dd2a
Removal of Uri\Uri
kocsismate Dec 30, 2024
b485171
A lot of fixes and API changes
kocsismate Jan 6, 2025
b3a48bf
Updates
kocsismate Feb 5, 2025
ea81d80
Add new tests, path fixes
kocsismate Feb 9, 2025
17c7300
Add more tests for verifying the behavior of withers
kocsismate Feb 15, 2025
aafa027
Fix code review comments
kocsismate Feb 19, 2025
449fda3
A few fixes and improvements after feedback
kocsismate Apr 14, 2025
96691bf
Test fixes
kocsismate Apr 14, 2025
3ac4884
Remove WHATWG non-raw getters
kocsismate Apr 18, 2025
88c8a46
Rename WHATWG getters again
kocsismate Apr 26, 2025
b8a8ba7
Add UriComparisonMode
kocsismate Apr 28, 2025
0a1d1ec
Expose $softErrors for Uri\WhatWg\Url::resolve()
kocsismate Apr 30, 2025
35f737d
Add SensitiveParameter support
kocsismate May 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/actions/configure-macos/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ runs:
--enable-pcntl \
--with-readline="$BREW_OPT"/readline \
--enable-mbstring \
--enable-uri \
--with-curl \
--with-gettext="$BREW_OPT"/gettext \
--enable-sockets \
Expand Down
1 change: 1 addition & 0 deletions .github/actions/configure-x32/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ runs:
--enable-pcntl \
--with-readline \
--enable-mbstring \
--enable-uri \
--with-curl \
--with-gettext \
--enable-sockets \
Expand Down
1 change: 1 addition & 0 deletions .github/actions/configure-x64/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ runs:
--enable-pcntl \
--without-readline --with-libedit \
--enable-mbstring \
--enable-uri \
--with-curl \
--with-gettext \
--enable-sockets \
Expand Down
5 changes: 5 additions & 0 deletions .github/labeler.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,11 @@
- any-glob-to-any-file:
- ext/tokenizer/**/*

"Extension: uri":
- changed-files:
- any-glob-to-any-file:
- ext/uri/**/*

"Extension: xml":
- changed-files:
- any-glob-to-any-file:
Expand Down
6 changes: 6 additions & 0 deletions EXTENSIONS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,6 +496,12 @@ PRIMARY MAINTAINER: Andrei Zmievski <andrei@php.net> (2002 - 2002)
MAINTENANCE: Maintained
STATUS: Working
-------------------------------------------------------------------------------
EXTENSION: uri
PRIMARY MAINTAINER Máté Kocsis <kocsismate@php.net> (2025 - 2025)
MAINTENANCE: Maintained
STATUS: Working
SINCE: 8.5.0
-------------------------------------------------------------------------------
EXTENSION: zip
PRIMARY MAINTAINER: Pierre-Alain Joye <pajoye@php.net> (2006 - 2011)
Remi Collet <remi@php.net> (2013-2020)
Expand Down
3 changes: 3 additions & 0 deletions Zend/zend_string.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -596,8 +596,11 @@ EMPTY_SWITCH_DEFAULT_CASE()
_(ZEND_STR_SCHEME, "scheme") \
_(ZEND_STR_HOST, "host") \
_(ZEND_STR_PORT, "port") \
_(ZEND_STR_USERINFO, "userinfo") \
_(ZEND_STR_USER, "user") \
_(ZEND_STR_USERNAME, "username") \
_(ZEND_STR_PASS, "pass") \
_(ZEND_STR_PASSWORD, "password") \
_(ZEND_STR_PATH, "path") \
_(ZEND_STR_QUERY, "query") \
_(ZEND_STR_FRAGMENT, "fragment") \
Expand Down
10 changes: 9 additions & 1 deletion ext/dom/config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ if test "$PHP_DOM" != "no"; then
PHP_SETUP_LIBXML([DOM_SHARED_LIBADD], [
AC_DEFINE([HAVE_DOM], [1],
[Define to 1 if the PHP extension 'dom' is available.])
PHP_LEXBOR_CFLAGS="-I@ext_srcdir@/lexbor -DLEXBOR_STATIC"
PHP_LEXBOR_CFLAGS="-I@ext_srcdir@/lexbor -DLEXBOR_STATIC -Wno-uninitialized"
LEXBOR_DIR="lexbor/lexbor"
LEXBOR_SOURCES=m4_normalize(["
$LEXBOR_DIR/core/array_obj.c
Expand All @@ -22,6 +22,7 @@ if test "$PHP_DOM" != "no"; then
$LEXBOR_DIR/core/hash.c
$LEXBOR_DIR/core/mem.c
$LEXBOR_DIR/core/mraw.c
$LEXBOR_DIR/core/plog.c
$LEXBOR_DIR/core/print.c
$LEXBOR_DIR/core/serialize.c
$LEXBOR_DIR/core/shs.c
Expand Down Expand Up @@ -184,8 +185,12 @@ if test "$PHP_DOM" != "no"; then
$LEXBOR_DIR/html/tree/open_elements.c
$LEXBOR_DIR/ns/ns.c
$LEXBOR_DIR/ports/posix/lexbor/core/memory.c
$LEXBOR_DIR/punycode/punycode.c
$LEXBOR_DIR/selectors-adapted/selectors.c
$LEXBOR_DIR/tag/tag.c
$LEXBOR_DIR/unicode/idna.c
$LEXBOR_DIR/unicode/unicode.c
$LEXBOR_DIR/url/url.c
"])
PHP_NEW_EXTENSION([dom], m4_normalize([
attr.c
Expand Down Expand Up @@ -242,6 +247,9 @@ if test "$PHP_DOM" != "no"; then
$ext_builddir/$LEXBOR_DIR/ports/posix/lexbor/core
$ext_builddir/$LEXBOR_DIR/selectors-adapted
$ext_builddir/$LEXBOR_DIR/tag
$ext_builddir/$LEXBOR_DIR/punycode
$ext_builddir/$LEXBOR_DIR/unicode
$ext_builddir/$LEXBOR_DIR/url
])
PHP_SUBST([DOM_SHARED_LIBADD])
PHP_INSTALL_HEADERS([ext/dom], m4_normalize([
Expand Down
30 changes: 30 additions & 0 deletions ext/dom/lexbor/lexbor/punycode/base.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
/*
* Copyright (C) 2023 Alexander Borisov
*
* Author: Alexander Borisov <borisov@lexbor.com>
*/

#ifndef LEXBOR_PUNYCODE_BASE_H
#define LEXBOR_PUNYCODE_BASE_H

#ifdef __cplusplus
extern "C" {
#endif

#include "lexbor/core/base.h"


#define LXB_PUNYCODE_VERSION_MAJOR 1
#define LXB_PUNYCODE_VERSION_MINOR 0
#define LXB_PUNYCODE_VERSION_PATCH 0

#define LEXBOR_PUNYCODE_VERSION_STRING LEXBOR_STRINGIZE(LXB_PUNYCODE_VERSION_MAJOR) "." \
LEXBOR_STRINGIZE(LXB_PUNYCODE_VERSION_MINOR) "." \
LEXBOR_STRINGIZE(LXB_PUNYCODE_VERSION_PATCH)


#ifdef __cplusplus
} /* extern "C" */
#endif

#endif /* LEXBOR_PUNYCODE_BASE_H */
3 changes: 3 additions & 0 deletions ext/dom/lexbor/lexbor/punycode/config.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
set(DEPENDENCIES "core encoding")
set(DESCRIPTION "The module implemented by PUNYCODE specification.
Specification: https://www.rfc-editor.org/rfc/inline-errata/rfc3492.html")
Loading
Loading