[FrameworkBundle] Deprecate support for legacy directories in Translation comands #28892
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
stof
reviewed
Oct 16, 2018
src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationUpdateCommandTest.php
Show resolved
Hide resolved
yceruto
reviewed
Oct 16, 2018
| @@ -91,7 +91,6 @@ protected function setUp() | |||
| { | |||
| $this->fs = new Filesystem(); | |||
| $this->translationDir = sys_get_temp_dir().'/'.uniqid('sf_translation', true); | |||
| $this->fs->mkdir($this->translationDir.'/Resources/translations'); | |||
| $this->fs->mkdir($this->translationDir.'/Resources/views'); | |||
There was a problem hiding this comment.
We can remove this too, I guess.
There was a problem hiding this comment.
Yea, this PR needs work, will finish tomorrow :)
yceruto
reviewed
Oct 16, 2018
| @@ -147,12 +155,24 @@ protected function execute(InputInterface $input, OutputInterface $output) | |||
| if ($this->defaultTransPath) { | |||
| $transPaths[] = $this->defaultTransPath.'/'.$bundle->getName(); | |||
| } | |||
| $transPaths[] = sprintf('%s/Resources/%s/translations', $kernel->getRootDir(), $bundle->getName()); | |||
| $transPaths[] = $deprecatedPath = sprintf('%s/Resources/%s/translations', $kernel->getRootDir(), $bundle->getName()); | |||
| if ($deprecatedPath !== $this->defaultTransPath.'/'.$bundle->getName() && is_dir($deprecatedPath)) { | |||
There was a problem hiding this comment.
The overriding path for bundles shouldn't match $this->defaultTransPath.'/'.$bundle->getName() never, right?
|
@chalasr Will you have time to finish this PR? I'd like to wrap up 4.2 and this one is needed before the first beta. Thank you. |
a2b95dc to
342c4a0
Compare
342c4a0 to
78026ca
Compare
037ea64 to
c4ed34a
Compare
|
@fabpot thanks for the ping, PR ready. |
f7913b8 to
36ee73e
Compare
fabpot
requested changes
Oct 27, 2018
| $transPaths = array(); | ||
| if (is_dir($dir = $rootDir.'/Resources/translations')) { | ||
| if ($dir !== $this->defaultTransPath) { | ||
| $notice = sprintf('Storing translations in the "%s" directory is deprecated since Symfony 4.2. ', $dir); |
There was a problem hiding this comment.
we are using single sentences for deprecation message: Storing ... since Symfony 4.2, use the ...
36ee73e to
5521f22
Compare
a45a9fc to
afe797e
Compare
yceruto
reviewed
Oct 27, 2018
| if (is_dir($dir = sprintf('%s/Resources/%s/translations', $rootDir, $bundle->getName()))) { | ||
| $transPaths[] = $dir; | ||
| $notice = sprintf('Storing translations files for "%s" in the "%s" directory is deprecated since Symfony 4.2, ', $dir, $bundle->getName()); | ||
| @trigger_error($notice.($this->defaultTransPath ? sprintf('use the "%s" directory instead.', $this->defaultTransPath.'/bundles/'.$bundle->getName()) : sprintf('configure "translator.default_path" and create a "bundles/%s/" directory into it instead.', $bundle->getName())), E_USER_DEPRECATED); |
There was a problem hiding this comment.
Maybe same here and mention just $this->defaultTransPath?
| @@ -169,12 +206,20 @@ protected function execute(InputInterface $input, OutputInterface $output) | |||
| if ($this->defaultTransPath) { | |||
| $transPaths[] = $this->defaultTransPath.'/'.$bundle->getName(); | |||
| } | |||
afe797e to
a7a8aad
Compare
fabpot
approved these changes
Oct 27, 2018
|
Thank you @chalasr. |
fabpot
added a commit
that referenced
this pull request
Oct 27, 2018
…ries in Translation comands (chalasr) This PR was merged into the 4.2-dev branch. Discussion ---------- [FrameworkBundle] Deprecate support for legacy directories in Translation comands | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | yes | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | todo Commits ------- a7a8aad [FrameworkBundle] Deprecate support for legacy translations and views directories
This was referenced Nov 3, 2018
Closed
Merged
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.
Uh oh!
There was an error while loading. Please reload this page.