[DI] Removes number of elements information in debug mode #31371
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
ro0NL
reviewed
May 3, 2019
src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
Outdated
Show resolved
Hide resolved
jschaedl
force-pushed
the
fix-issue-31340
branch
2 times, most recently
from
249920f
to
7e71b96
Compare
xabbuh
approved these changes
May 4, 2019
xabbuh
reviewed
May 4, 2019
| if ($argument instanceof TaggedIteratorArgument) { | ||
| $argumentsInformation[] = sprintf('Tagged Iterator for "%s" %s', $argument->getTag(), !$options['is_debug'] ? sprintf('(%d element(s))', \count($argument->getValues())) : ''); | ||
| } else { | ||
| $argumentsInformation[] = $options['is_debug'] ? 'Iterator' : sprintf('Iterator (%d element(s))', \count($argument->getValues())); |
There was a problem hiding this comment.
We maybe want to be consistent wether we handle the debug or the non-debug case first.
There was a problem hiding this comment.
displaying useful info is more important than "consistency" here to me
There was a problem hiding this comment.
displaying useful info is more important than "consistency" here to me
| @@ -337,9 +338,13 @@ protected function describeContainerDefinition(Definition $definition, array $op | |||
| $argument = $argument->getValues()[0]; | |||
| } | |||
| if ($argument instanceof Reference) { | |||
| $argumentsInformation[] = sprintf('Service(%s)', (string) $argument); | |||
| $argumentsInformation[] = sprintf('Service (%s)', (string) $argument); | |||
There was a problem hiding this comment.
this is unrelated and should be reverted - it can break scripts that parse the output
There was a problem hiding this comment.
Hopefully, such script should use the json or XML output, but yes, I still vote for reverting.
| if ($argument instanceof TaggedIteratorArgument) { | ||
| $argumentsInformation[] = sprintf('Tagged Iterator for "%s"%s', $argument->getTag(), $options['is_debug'] ? '': sprintf(' (%d element(s))', \count($argument->getValues()))); | ||
| } else { | ||
| $argumentsInformation[] = sprintf('Iterator%s', $options['is_debug'] ? '' : sprintf(' (%d element(s))', \count($argument->getValues()))); |
There was a problem hiding this comment.
do we really need the ternary on this line?
There was a problem hiding this comment.
You are right we don't need the ternary. The array of services given for the Iterator is always filled. Will revert it.
nicolas-grekas
force-pushed
the
fix-issue-31340
branch
from
fb53604
to
0da4b83
Compare
|
Thank you @jschaedl. |
nicolas-grekas
added a commit
that referenced
this pull request
May 9, 2019
…(jschaedl) This PR was squashed before being merged into the 3.4 branch (closes #31371). Discussion ---------- [DI] Removes number of elements information in debug mode | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #31340 | License | MIT | Doc PR | - With this services config: ```yaml my_service: class: stdClass arguments: [!tagged my_tag] my_tagged_service_1: class: stdClass tags: [my_tag] my_tagged_service_2: class: stdClass tags: [my_tag] ``` Executing `./bin/console debug:container my_service --show-arguments --env=dev` resulted in ```bash Information for Service "my_service" ==================================== ---------------- ------------------------- Option Value ---------------- ------------------------- Service ID my_service Class stdClass Tags - Public no Synthetic no Lazy no Shared yes Abstract no Autowired yes Autoconfigured yes Arguments Iterator (0 element(s)) ---------------- ------------------------- ``` With this fix the output changed to: ```bash Information for Service "my_service" ==================================== ---------------- ------------ Option Value ---------------- ------------ Service ID my_service Class stdClass Tags - Public no Synthetic no Lazy no Shared yes Abstract no Autowired yes Autoconfigured yes Arguments Tagged Iterator for "my_tag" ---------------- ------------ ``` and with `./bin/console debug:container my_service --show-arguments --env=prod` ```bash Information for Service "my_service_tagged_iterator" ==================================================== ---------------- --------------------------------------------- Option Value ---------------- --------------------------------------------- Service ID my_service Class stdClass Tags - Public no Synthetic no Lazy no Shared yes Abstract no Autowired yes Autoconfigured yes Arguments Tagged Iterator for "my_tag" (2 element(s)) ---------------- --------------------------------------------- ``` Commits ------- 0da4b83 [DI] Removes number of elements information in debug mode
This was referenced May 22, 2019
Merged
Merged
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.
With this services config:
Executing
./bin/console debug:container my_service --show-arguments --env=devresulted inWith this fix the output changed to:
and with
./bin/console debug:container my_service --show-arguments --env=prod