[HttpKernel] add a deprecation for global dir #31958
Closed
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
Simperfit
force-pushed
the
deprecated/add-deprecation-for-global-dir
branch
from
b6a8551 to
78bd10a
Compare
Simperfit
force-pushed
the
deprecated/add-deprecation-for-global-dir
branch
from
78bd10a to
1d9cd50
Compare
Tobion
reviewed
Jun 9, 2019
Simperfit
force-pushed
the
deprecated/add-deprecation-for-global-dir
branch
4 times, most recently
from
5ee876a to
fe45176
Compare
|
@Tobion @nicolas-grekas I've changed things a little bit, prepared the removels of the constructor argument like said and move the deprecation where it actually loads the file testing if it's load it globally or not, hope that's what you had in mind. |
|
cc @fabpot |
fabpot
requested changes
Jun 29, 2019
Simperfit
force-pushed
the
deprecated/add-deprecation-for-global-dir
branch
from
fe45176 to
1727473
Compare
fabpot
requested changes
Jun 29, 2019
Simperfit
force-pushed
the
deprecated/add-deprecation-for-global-dir
branch
6 times, most recently
from
3ee4d4b to
588fa39
Compare
Simperfit
force-pushed
the
deprecated/add-deprecation-for-global-dir
branch
from
588fa39 to
fc36e9f
Compare
|
Status: Needs review |
Tobion
reviewed
Jul 30, 2019
| { | ||
| $this->kernel = $kernel; | ||
| if (null !== $path) { | ||
| if (3 === \count(\func_get_args()) && \is_string(func_get_arg(1)) && null !== ($path = func_get_arg(1))) { |
There was a problem hiding this comment.
you can use func_num_args here
Tobion
reviewed
Jul 30, 2019
| @@ -87,7 +87,7 @@ | |||
|
|
|||
| <service id="file_locator" class="Symfony\Component\HttpKernel\Config\FileLocator"> | |||
| <argument type="service" id="kernel" /> | |||
| <argument>%kernel.root_dir%/Resources</argument> | |||
There was a problem hiding this comment.
you removed this argument. how does %kernel.root_dir%/Resources still work then?
Tobion
reviewed
Jul 30, 2019
| @@ -29,12 +29,14 @@ class FileLocator extends BaseFileLocator | |||
| * @param string|null $path The path the global resource directory | |||
There was a problem hiding this comment.
the phpdoc should be removed if it's not inteded to be used anymore
Tobion
reviewed
Jul 30, 2019
| @@ -261,6 +261,9 @@ public function locateResource($name, $dir = null, $first = true) | |||
| $files = []; | |||
|
|
|||
| if ($isResource && file_exists($file = $dir.'/'.$bundle->getName().$overridePath)) { | |||
| if (0 === strpos($dir, 'app') || 0 === strpos($dir, 'src')) { | |||
There was a problem hiding this comment.
$dir would normally be %kernel.root_dir%/Resources. I don't see when it would ever start with app or src? What is this supposed to do? Do we not always want to trigger a deprecation if a bundle overwrite is found?
|
Closing in favor of #33258 |
nicolas-grekas
added a commit
that referenced
this pull request
Aug 21, 2019
…om (Tobion) This PR was merged into the 4.4 branch. Discussion ---------- [HttpKernel] deprecate global dir to load resources from | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | no | New feature? | no <!-- please update src/**/CHANGELOG.md files --> | BC breaks? | no <!-- see https://symfony.com/bc --> | Deprecations? | yes <!-- please update UPGRADE-*.md and src/**/CHANGELOG.md files --> | Tests pass? | yes <!-- please add some, will be required by reviewers --> | Fixed tickets | #31915 <!-- #-prefixed issue number(s), if any --> | License | MIT | Doc PR | Replaces #31958 Here two example deprecations by adding files in the deprecated locations: ``` Overwriting the resource "@AcmeBundle/Resources/config/routing.yaml" with "/vagrant/src/Resources/AcmeBundle/config/routing.yaml" is deprecated since Symfony 4.4 and will be removed in 5.0. Loading the file "foobar.yaml" from the global resource directory "/vagrant/src" is deprecated since Symfony 4.4 and will be removed in 5.0. ``` Commits ------- aa82566 [HttpKernel] deprecate global dir to load resources from
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.
@Tobion is this what you had in mind ?