[5.8] Rename cached schema to cached scheme #26706
Closed
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
…a migration path to the Migrator :)
…outes to the separate method; (laravel#26616) - moved registration of the typical reset password routes to the separate method, like it is for `emailVerification` routes;
Both methods internally use the `parseIds` method which, unless extended by a model, handles a `Model`. Since these methods list out all of the supported argument types, list this alternative as well.
This clarifies that connection will be set for any retrieved relation without a custom connection name. See https://github.com/laravel/framework/issues/24944#issuecomment-439912177
I removed the container namings in the Fluent and MessageBag classes because they don't make sense here. I think these are leftovers from a previous refactor. I also made sure that the other namings are consistent in these classes.
# Conflicts: # src/Illuminate/Foundation/Application.php
…UrlGenerator` - rename `$cachedSchema` property to `$cachedScheme` in `Routing\UrlGenerator`, since in laravel#26640 PR property is deprecated;
|
Looks like there is a lot of other commits in this PR. Can you send again? |
|
It is happening since of 5.7 br is not in the master ;) Could you merge 5.7 into master, please? |
|
@TBlindaruk if you want to add something to the next release (5.8) you can simply branch of the master branch. This will prevent commits from 5.7 to also be included. |
|
@driesvints , I know this. But in this PR I have delete of some code which was added only to the 5.7 and not merged to the master yet. |
|
@TBlindaruk ah okay! I see @GrahamCampbell just merged 5.7 into 5.8 so you should be able to resend it now :) |
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.
Rename
cachedSchematocachedScheme, sincecachedSchemais deprecated from#26640
P/S: please merge 5.7 br into master before merge this PR