[DependencyInjection] Handle env var placeholders in CheckTypeDeclarationsPass #34783
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
src/Symfony/Component/DependencyInjection/Compiler/CheckTypeDeclarationsPass.php
Outdated
Show resolved
Hide resolved
|
There's something we do in Config: we replace env placeholders with credible values. The goal of the command is not to prove a theoretical point but to help spot errors quickly. We should skip instead. |
748d88e to
28dc7ca
Compare
df891df to
47e9a0f
Compare
fancyweb
commented
Dec 5, 2019
src/Symfony/Component/DependencyInjection/Compiler/CheckTypeDeclarationsPass.php
Outdated
Show resolved
Hide resolved
fancyweb
commented
Dec 5, 2019
src/Symfony/Component/DependencyInjection/Compiler/CheckTypeDeclarationsPass.php
Show resolved
Hide resolved
fancyweb
commented
Dec 5, 2019
| $value = $this->container->getParameter($match[1]); | ||
| } elseif (\is_string($value)) { | ||
| if ('%' === ($value[0] ?? '') && preg_match('/^%([^%]+)%$/', $value, $match)) { | ||
| // Only array parameters are not inlined when dumped. |
There was a problem hiding this comment.
Added comments because those things are kind of hard to follow. We actually don't need to resolve the value here since we only care about the type.
fancyweb
commented
Dec 5, 2019
| } elseif ($envPlaceholderUniquePrefix && false !== strpos($value, 'env_')) { | ||
| // If the value is an env placeholder that is either mixed with a string or with another env placeholder, then its resolved value will always be a string, so we don't need to resolve it. | ||
| // We don't need to change the value because it is already a string. | ||
| if ('' === preg_replace('/'.$envPlaceholderUniquePrefix.'_\w+_[a-f0-9]{32}/U', '', $value, -1, $c) && 1 === $c) { |
There was a problem hiding this comment.
3 cases here (with param: "%env(FOO)%":
- only 1 env placeholder (eg:
%param%) -> we try to resolve it to get its type. - more than 1 chained env placeholder (eg:
%param%%param%) -> it has to be a string - mixed env placeholder with a string (eg :
foo%param%) -> it has to be a string
47e9a0f to
e1df59a
Compare
e1df59a to
c357485
Compare
nicolas-grekas
approved these changes
Dec 6, 2019
src/Symfony/Component/DependencyInjection/Compiler/CheckTypeDeclarationsPass.php
Show resolved
Hide resolved
fabpot
approved these changes
Dec 7, 2019
|
Thank you @fancyweb. |
fabpot
added a commit
that referenced
this pull request
Dec 7, 2019
…TypeDeclarationsPass (fancyweb) This PR was merged into the 4.4 branch. Discussion ---------- [DependencyInjection] Handle env var placeholders in CheckTypeDeclarationsPass | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - A case we forgot to handle. Commits ------- c357485 [DependencyInjection] Handle env var placeholders in CheckTypeDeclarationsPass
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.
A case we forgot to handle.