[4.x] Make TenancyUrlGenerator inherit the original UrlGenerator's scheme (http or https) #1390
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
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## master #1390 +/- ##
=========================================
Coverage 85.95% 85.96%
Complexity 1098 1098
=========================================
Files 178 178
Lines 3204 3206 +2
=========================================
+ Hits 2754 2756 +2
Misses 450 450 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
stancl
reviewed
Aug 25, 2025
Comment on lines
+83
to
+84
| $originalScheme = Str::before($this->originalUrlGenerator->formatScheme(), '://'); | ||
| $newGenerator->forceScheme($originalScheme); |
There was a problem hiding this comment.
What does formatScheme() return if no scheme was forced? Is it just http://?
Wondering if we can detect if a scheme was forced so we do not force a scheme if a scheme was not forced on the original generator.
There was a problem hiding this comment.
Tests should also probably first start with a case where the scheme was not forced.
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.
Before, when using UrlGeneratorBootstrapper, and your app had a
https://url, in tenant context, the url would have thehttp://scheme.Now, the bootstrapper makes sure that the TenancyUrlGenerator inherits the original UrlGenerator's scheme. So if your app has e.g. url "https://some-url.test",
route('home')in tenant context will return "https://some-url.test/home" (originally, you'd get "http://some-url.test/home" - the original scheme - https - wouldn't be respected in the tenant context).This PR addresses the issue reported on Discord (https://discord.com/channels/976506366502006874/976506736120823909/1399012794514411621).