[HttpKernel][FileLocator] Fix deprecation message #35269
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
fancyweb
commented
Jan 8, 2020
| @@ -75,13 +75,13 @@ public function locate($file, $currentPath = null, $first = true) | ||
| } | ||
|
|
||
| if (0 === strpos($location, $deprecatedPath) && (null === $currentPath || false === strpos($location, $currentPath))) { | ||
| $triggerDeprecation = true; | ||
| $deprecation = sprintf('Loading the file "%s" from the global resource directory "%s" is deprecated since Symfony 4.4 and will be removed in 5.0.', $file, $deprecatedPath); |
There was a problem hiding this comment.
Alternative: $triggerDeprecation = $deprecatedPath; and then use $triggerDeprecation later but that seemed less readable.
nicolas-grekas
approved these changes
Jan 8, 2020
yceruto
approved these changes
Jan 8, 2020
yceruto
reviewed
Jan 8, 2020
| @@ -75,13 +75,13 @@ public function locate($file, $currentPath = null, $first = true) | ||
| } |
There was a problem hiding this comment.
shouldn't it be a continue statement instead of return $locations?
There was a problem hiding this comment.
see #34886 (comment) for the explanation I guess.
|
Thank you @fancyweb. |
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.
Ref #34886
$deprecatedPathis the foreach value so it only works if the last element triggers the deprecation, otherwise the value is wrong.