-
-
Notifications
You must be signed in to change notification settings - Fork 4.2k
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.
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
[stable29] fix(setup-checks): Ensure URL with webroot works #47943
Merged
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
8 tasks
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>
susnux
force-pushed
the
backport/47883/stable29
branch
from
October 11, 2024 11:10
549f140
to
6b964d8
Compare
susnux
approved these changes
Oct 11, 2024
8 tasks
MichaIng
approved these changes
Oct 11, 2024
8 tasks
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
Possibly undefined array key $segments['scheme'] on array{fragment?: string, host?: string, pass?: string, path?: string, port?: int, query?: string, scheme?: string, user?: string}|false
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
Possibly undefined array key $segments['host'] on array{fragment?: string, host?: string, pass?: string, path?: string, port?: int, query?: string, scheme?: string, user?: string}|false
susnux
force-pushed
the
backport/47883/stable29
branch
from
October 11, 2024 11:21
6b964d8
to
ef76a2c
Compare
kesselb
reviewed
Oct 11, 2024
… 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>
susnux
force-pushed
the
backport/47883/stable29
branch
from
October 11, 2024 11:27
ef76a2c
to
d126fc3
Compare
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.