[FrameworkBundle] Remove useless checks in descriptors #21341
Conversation
709aae7 to
6205e1a
Compare
|
|
||
| $tableRows[] = array('Autowiring Types', $autowiringTypesInformation); | ||
| $autowiringTypes = $definition->getAutowiringTypes(); | ||
| if (count($autowiringTypes)) { |
There was a problem hiding this comment.
As pointed out multiple times on some other PRs by @nicolas-grekas , the count is useless and seems to be avoided thus in the Symfony codebase. Could you take advantage of this PR to change it here too?
Could also be inlined using a ternary without loosing readability here IMHO.
|
Status: Reviewed |
| if ($definition->getFactoryMethod(false)) { | ||
| $serviceXML->setAttribute('factory-method', $definition->getFactoryMethod(false)); | ||
| } | ||
| if ($definition->getFactoryMethod(false)) { |
There was a problem hiding this comment.
That's wrong. FactoryClass, FactoryService and FactoryMethod are removed in 3.0. So this must still be conditional here (and the code should be removed when dropping support for DI 2.8)
There was a problem hiding this comment.
@stof We're in the 2.8 branch and it requires only Symfony 2.8 (it doesn't work with 3.0). It must indeed be dropped when merging in 3.0.
There was a problem hiding this comment.
oh, we used to support 3.0.x in the past
There was a problem hiding this comment.
After double checking:
It should be as is in 2.8, conditional in 3.0 and 3.1 and finally dropped in 3.2.
There was a problem hiding this comment.
Can you check when and why we dropped support for 3.0 here?
There was a problem hiding this comment.
It looks like it has never been supported. The DI dependency was bumped to 2.8 (with no explicit support for 3.0) in 73f0ee2 without obvious reasons and stayed as is since 2 years.
| $serviceXML->setAttribute('synchronized', $definition->isSynchronized(false) ? 'true' : 'false'); | ||
| } | ||
| $serviceXML->setAttribute('shared', $definition->isShared() ? 'true' : 'false'); | ||
| $serviceXML->setAttribute('synchronized', $definition->isSynchronized(false) ? 'true' : 'false'); |
There was a problem hiding this comment.
same issue here. isSynchronized is removed in 3.0
| if (method_exists($definition, 'isSynchronized')) { | ||
| $tableRows[] = array('Synchronized', $definition->isSynchronized(false) ? 'yes' : 'no'); | ||
| } | ||
| $tableRows[] = array('Synchronized', $definition->isSynchronized(false) ? 'yes' : 'no'); |
| @@ -183,24 +183,14 @@ protected function describeContainerDefinition(Definition $definition, array $op | |||
| ."\n".'- Public: '.($definition->isPublic() ? 'yes' : 'no') | |||
| ."\n".'- Synthetic: '.($definition->isSynthetic() ? 'yes' : 'no') | |||
| ."\n".'- Lazy: '.($definition->isLazy() ? 'yes' : 'no') | |||
| ."\n".'- Shared: '.($definition->isShared() ? 'yes' : 'no') | |||
| ."\n".'- Synchronized: '.($definition->isSynchronized(false) ? 'yes' : 'no') | |||
| @@ -217,29 +217,18 @@ private function getContainerDefinitionData(Definition $definition, $omitTags = | |||
| 'public' => $definition->isPublic(), | |||
| 'synthetic' => $definition->isSynthetic(), | |||
| 'lazy' => $definition->isLazy(), | |||
| 'shared' => $definition->isShared(), | |||
| 'synchronized' => $definition->isSynchronized(false), | |||
|
Removed some useless counts. |
| @@ -269,8 +258,8 @@ private function getContainerDefinitionData(Definition $definition, $omitTags = | |||
|
|
|||
| if (!$omitTags) { | |||
| $data['tags'] = array(); | |||
| if (count($definition->getTags())) { | |||
| foreach ($definition->getTags() as $tagName => $tagData) { | |||
| if ($tags = $definition->getTags()) { | |||
There was a problem hiding this comment.
This if becomes useless too.
|
👍 |
|
Does it mean that @stof comments were wrong or fixed but Github does not show that? Sorry, I haven't re-read the PR. |
|
@fabpot yes but we need to be very careful when merging to other branches (I can do the merge if you want). |
|
@dunglas Ok, I Iet you merge this one and then merge to other branches, that will be much easier. |
…dunglas) This PR was merged into the 2.8 branch. Discussion ---------- [FrameworkBundle] Remove useless checks in descriptors | Q | A | ------------- | --- | Branch? | 2.8 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a As pointed out by @ogizanagi in #21315 (comment), some code in FrameworkBundle's descriptors is useless because the bundle works only with DI 2.8. Commits ------- c759345 [FrameworkBundle] Remove useless checks in descriptors
As pointed out by @ogizanagi in #21315 (comment), some code in FrameworkBundle's descriptors is useless because the bundle works only with DI 2.8.