fix(setup-checks): Ensure URL with webroot works #47883
Merged
Conversation
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
Contributor
Author
|
/backport to stable30 |
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
solracsf
reviewed
Sep 11, 2024
solracsf
reviewed
Sep 11, 2024
This comment was marked as resolved.
This comment was marked as resolved.
susnux
commented
Sep 11, 2024
susnux
commented
Sep 11, 2024
This comment was marked as resolved.
This comment was marked as resolved.
susnux
force-pushed
the
fix/setup-checks
branch
from
d00f9ee to
6d21907
Compare
This comment was marked as resolved.
This comment was marked as resolved.
susnux
force-pushed
the
fix/setup-checks
branch
from
6d21907 to
f64d762
Compare
This comment was marked as resolved.
This comment was marked as resolved.
kesselb
reviewed
Sep 11, 2024
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as resolved.
susnux
force-pushed
the
fix/setup-checks
branch
from
2b256a7 to
70d47cf
Compare
Contributor
|
Too many forward slashes for me 🙈 |
kesselb
approved these changes
Sep 11, 2024
Contributor
|
/backport to stable29 |
8 tasks
8 tasks
come-nc
reviewed
Sep 12, 2024
come-nc
reviewed
Sep 12, 2024
There was a problem hiding this comment.
Psalm found more than 20 potential problems in the proposed changes. Check the Files changed tab for more details.
susnux
force-pushed
the
fix/setup-checks
branch
from
4efd11a to
18d3b4f
Compare
come-nc
reviewed
Sep 13, 2024
come-nc
approved these changes
Sep 13, 2024
Contributor
come-nc
left a comment
come-nc
left a comment
There was a problem hiding this comment.
I think fixing the wrong type in the phpdoc should fix psalm errors.
Nice job 👍
Contributor
|
phpunit tests also need to be adapted to change from getSystemValue to getSystemValueString |
| if ($removeWebroot) { | ||
| $segments = parse_url($url); | ||
| $port = isset($segments['port']) ? (':' . $segments['port']) : ''; | ||
| return $segments['scheme'] . '://' . $segments['host'] . $port; |
Check notice
Code scanning / Psalm
PossiblyUndefinedArrayOffset
| if ($removeWebroot) { | ||
| $segments = parse_url($url); | ||
| $port = isset($segments['port']) ? (':' . $segments['port']) : ''; | ||
| return $segments['scheme'] . '://' . $segments['host'] . $port; |
Check notice
Code scanning / Psalm
PossiblyUndefinedArrayOffset
We basically mock the way `URLGenerator::getAbsoluteURL` works, so we must make sure that the URL might already contain the webroot. Because `baseURL` and `cliURL` also contain the webroot we need to remove the webroot from the URL first. Co-authored-by: Ferdinand Thiessen <[email protected]> Co-authored-by: Daniel <[email protected]> Signed-off-by: Ferdinand Thiessen <[email protected]>
… path Co-authored-by: Ferdinand Thiessen <[email protected]> Co-authored-by: Côme Chilliet <[email protected]> Signed-off-by: Ferdinand Thiessen <[email protected]>
susnux
force-pushed
the
fix/setup-checks
branch
from
832d41e to
be1cd7a
Compare
This was referenced Sep 13, 2024
8 tasks
8 tasks
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
We basically mock the way
URLGenerator::getAbsoluteURLworks, so we must make sure that the URL might already contain the webroot. BecausebaseURLandcliURLalso contain the webroot we need to remove the webroot from the URL first.Checklist