[HttpKernel] fix triggering deprecation in file locator #34886
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
Member
xabbuh
commented
Dec 9, 2019
| Q | A |
|---|---|
| Branch? | 4.4 |
| Bug fix? | yes |
| New feature? | no |
| Deprecations? | no |
| Tickets | Fix #34556 |
| License | MIT |
| Doc PR |
|
@xabbuh I can confirm the fix works and the deprecation is not triggered anymore! Nice :D |
| // no need to trigger deprecations when the loaded file is given as absolute path | ||
| foreach ($this->paths as $deprecatedPath) { | ||
| if (\is_array($locations)) { | ||
| foreach ($locations as $location) { | ||
| if (null !== $currentPath && 0 === strpos($location, $currentPath)) { | ||
| return $locations; |
There was a problem hiding this comment.
Basically, when there are several paths and one of them is not deprecated, we don't know anymore if a deprecated path is going to be used or not, so we skip the deprecation to prevent a false-positive. This means we might miss a deprecation, but that's the best we can do, isn't it?
There was a problem hiding this comment.
Yes, I am afraid there isn't anything we can do about this. Either we trigger deprecations where we shouldn't or we miss some where they would be appropriate.
nicolas-grekas
approved these changes
Dec 10, 2019
fabpot
approved these changes
Dec 11, 2019
|
Thank you @xabbuh. |
fabpot
added a commit
that referenced
this pull request
Dec 11, 2019
…abbuh) This PR was merged into the 4.4 branch. Discussion ---------- [HttpKernel] fix triggering deprecation in file locator | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #34556 | License | MIT | Doc PR | Commits ------- 142b179 fix triggering deprecation in file locator
nicolas-grekas
added a commit
that referenced
this pull request
Jan 9, 2020
This PR was merged into the 4.4 branch. Discussion ---------- [HttpKernel][FileLocator] Fix deprecation message | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Ref #34886 `$deprecatedPath` is the foreach value so it only works if the last element triggers the deprecation, otherwise the value is wrong. Commits ------- 18ce839 [HttpKernel][FileLocator] Fix deprecation message
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.