[stable30] fix(setup-checks): Ensure URL with webroot works #47944
Conversation
This file contains 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
![backportbot[bot]](https://avatars.githubusercontent.com/in/60201?s=60&v=4){kind=small}
AndyScherzinger
force-pushed
the
backport/47883/stable30
branch
from
bb19c18
to
a2b1aaa
Compare
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 <opensource@fthiessen.de> Co-authored-by: Daniel <mail@danielkesselberg.de> Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
… path Co-authored-by: Ferdinand Thiessen <opensource@fthiessen.de> Co-authored-by: Côme Chilliet <91878298+come-nc@users.noreply.github.com> Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
kesselb
force-pushed
the
backport/47883/stable30
branch
from
a2b1aaa
to
71d870d
Compare
|
Conflicts:
|
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| if ($removeWebroot) { | ||
| $segments = parse_url($url); | ||
| $port = isset($segments['port']) ? (':' . $segments['port']) : ''; | ||
| return $segments['scheme'] . '://' . $segments['host'] . $port; |
Check notice
Code scanning / Psalm
PossiblyUndefinedArrayOffset Note
| if ($removeWebroot) { | ||
| $segments = parse_url($url); | ||
| $port = isset($segments['port']) ? (':' . $segments['port']) : ''; | ||
| return $segments['scheme'] . '://' . $segments['host'] . $port; |
Check notice
Code scanning / Psalm
PossiblyUndefinedArrayOffset Note
skjnldsv
approved these changes
Sep 16, 2024
susnux
approved these changes
Sep 18, 2024
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.
Backport of #47883
Warning, This backport's changes differ from the original and might be incomplete⚠️
Todo
Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.