Implement "Followup improvements for ext/uri" RFC - RFC 3986 URI building#22173
Merged
Conversation
TimWolla
reviewed
May 28, 2026
TimWolla
left a comment
TimWolla
left a comment
Member
There was a problem hiding this comment.
I'm not yet sure how I feel about the manual validation happening during recomposition. I'd like to take a second look later.
kocsismate
commented
May 31, 2026
ndossche
requested changes
May 31, 2026
ndossche
requested changes
May 31, 2026
Member
Author
|
I fixed a few suggestions, thank you very much! I'll continue tomorrow with the rest |
ndossche
requested changes
Jun 1, 2026
kocsismate
commented
Jun 7, 2026
ndossche
approved these changes
Jun 8, 2026
kocsismate
force-pushed
the
uri-followup3
branch
from
4ccd652 to
3048323
Compare
ndossche
approved these changes
Jun 14, 2026
| char buf[MAX_LENGTH_OF_LONG + 1]; | ||
| const char *res = zend_print_long_to_buf(buf + sizeof(buf) - 1, port); | ||
|
|
||
| const bool well_formed = uriIsWellFormedPortA(res, res + strlen(res)); |
Member
There was a problem hiding this comment.
Should also work:
Suggested change
| const bool well_formed = uriIsWellFormedPortA(res, res + strlen(res)); | |
| const bool well_formed = uriIsWellFormedPortA(res, buf + sizeof(buf) - 1 - res); |
Member
Author
There was a problem hiding this comment.
Hm, very clever, but the current approach seems much more straightforward for me
kocsismate
force-pushed
the
uri-followup3
branch
from
a3ec042 to
0bf64ff
Compare
TimWolla
reviewed
Jun 22, 2026
TimWolla
left a comment
TimWolla
left a comment
Member
There was a problem hiding this comment.
I wonder if all success tests should reparse the resulting URL for extra safety. So basically add:
var_dump($uri->equals(new Uri\Rfc3986\Uri($uri->toRawString())));
at the end of every test (it should always be bool(true)).
I looked at all the tests for now. Did not yet take a full look at the implementation.
| const char *p = Z_STRVAL_P(path); | ||
| while (*p != '\0' && *p != '/') { | ||
| if (*p == ':') { | ||
| zend_throw_exception(php_uri_ce_invalid_uri_exception, "The path must not begin with \":\" when the URI doesn't contain a scheme", 0); |
Member
There was a problem hiding this comment.
Suggested change
| zend_throw_exception(php_uri_ce_invalid_uri_exception, "The path must not begin with \":\" when the URI doesn't contain a scheme", 0); | |
| zend_throw_exception(php_uri_ce_invalid_uri_exception, "The path must not begin with \":\" when the URI does not contain a scheme", 0); |
Using contractions is colloquial (same applies to the other error message.
/cc @Girgias for error message suggestions.
kocsismate
force-pushed
the
uri-followup3
branch
from
0bf64ff to
7f1c843
Compare
[skip ci]
TimWolla
reviewed
Jun 24, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
RFC: https://wiki.php.net/rfc/uri_followup#uri_building