[DI] allow "." and "-" in env processor lines #35029
Merged
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
stof
requested changes
Dec 18, 2019
| throw new InvalidArgumentException(sprintf('Invalid %s name: only "word" characters are allowed.', $name)); | ||
| } | ||
| if ($this->has($name) && null !== ($defaultValue = parent::get($name)) && !\is_string($defaultValue)) { | ||
| throw new RuntimeException(sprintf('The default value of an env() parameter must be a string or null, but "%s" given to "%s".', \gettype($defaultValue), $name)); | ||
| } | ||
|
|
||
| $uniqueName = md5($name.'_'.self::$counter++); | ||
| $placeholder = sprintf('%s_%s_%s', $this->getEnvPlaceholderUniquePrefix(), str_replace(':', '_', $env), $uniqueName); | ||
| $placeholder = sprintf('%s_%s_%s', $this->getEnvPlaceholderUniquePrefix(), strtr($env, ':-.', '___'), $uniqueName); |
There was a problem hiding this comment.
replacing the 3 chars with the same replacement will be an issue: we can have multiple env lines producing the same placeholder, which will go wrong when reverting them.
There was a problem hiding this comment.
There is an md5 on the line before that will prevent any collisions from happening.
stof
approved these changes
Dec 18, 2019
fabpot
approved these changes
Dec 19, 2019
|
Thank you @nicolas-grekas. |
fabpot
added a commit
that referenced
this pull request
Dec 19, 2019
…-grekas) This PR was merged into the 5.1-dev branch. Discussion ---------- [DI] allow "." and "-" in env processor lines | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | yes | Deprecations? | no | Tickets | Fix #34864 | License | MIT | Doc PR | - As explained in the linked issue, this is especially usefull with the `key` processor. Commits ------- 231c505 [DI] allow "." and "-" in env processor lines
Merged
nicolas-grekas
added a commit
that referenced
this pull request
Oct 13, 2020
This PR was merged into the 4.4 branch. Discussion ---------- [DI] fix dumping env vars | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Forgotten in #35029 For 4.4 to reduce merge conflicts (it doesn't allow the new chars in 4.4 anyway, #35029 is still needed) Commits ------- 746a8d1 [DI] fix dumping env vars
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.
As explained in the linked issue, this is especially usefull with the
keyprocessor.