Skip to content

Commit 5bc83c4

Browse files
dunglasdunglas
committed
minor #21341 [FrameworkBundle] Remove useless checks in descriptors (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
2 parents 137a774 + c759345 commit 5bc83c4

File tree

4 files changed

+38
-86
lines changed

4 files changed

+38
-86
lines changed

‎src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php

Lines changed: 11 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -217,29 +217,18 @@ private function getContainerDefinitionData(Definition $definition, $omitTags =
217217
'public' => $definition->isPublic(),
218218
'synthetic' => $definition->isSynthetic(),
219219
'lazy' => $definition->isLazy(),
220+
'shared' => $definition->isShared(),
221+
'synchronized' => $definition->isSynchronized(false),
222+
'abstract' => $definition->isAbstract(),
223+
'autowire' => $definition->isAutowired(),
224+
'autowiring_types' => array(),
225+
'file' => $definition->getFile(),
220226
);
221227

222-
if (method_exists($definition, 'isShared')) {
223-
$data['shared'] = $definition->isShared();
228+
foreach ($definition->getAutowiringTypes() as $autowiringType) {
229+
$data['autowiring_types'][] = $autowiringType;
224230
}
225231

226-
if (method_exists($definition, 'isSynchronized')) {
227-
$data['synchronized'] = $definition->isSynchronized(false);
228-
}
229-
230-
$data['abstract'] = $definition->isAbstract();
231-
232-
if (method_exists($definition, 'isAutowired')) {
233-
$data['autowire'] = $definition->isAutowired();
234-
235-
$data['autowiring_types'] = array();
236-
foreach ($definition->getAutowiringTypes() as $autowiringType) {
237-
$data['autowiring_types'][] = $autowiringType;
238-
}
239-
}
240-
241-
$data['file'] = $definition->getFile();
242-
243232
if ($definition->getFactoryClass(false)) {
244233
$data['factory_class'] = $definition->getFactoryClass(false);
245234
}
@@ -269,11 +258,9 @@ private function getContainerDefinitionData(Definition $definition, $omitTags =
269258

270259
if (!$omitTags) {
271260
$data['tags'] = array();
272-
if (count($definition->getTags())) {
273-
foreach ($definition->getTags() as $tagName => $tagData) {
274-
foreach ($tagData as $parameters) {
275-
$data['tags'][] = array('name' => $tagName, 'parameters' => $parameters);
276-
}
261+
foreach ($definition->getTags() as $tagName => $tagData) {
262+
foreach ($tagData as $parameters) {
263+
$data['tags'][] = array('name' => $tagName, 'parameters' => $parameters);
277264
}
278265
}
279266
}

‎src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -183,24 +183,14 @@ protected function describeContainerDefinition(Definition $definition, array $op
183183
."\n".'- Public: '.($definition->isPublic() ? 'yes' : 'no')
184184
."\n".'- Synthetic: '.($definition->isSynthetic() ? 'yes' : 'no')
185185
."\n".'- Lazy: '.($definition->isLazy() ? 'yes' : 'no')
186+
."\n".'- Shared: '.($definition->isShared() ? 'yes' : 'no')
187+
."\n".'- Synchronized: '.($definition->isSynchronized(false) ? 'yes' : 'no')
188+
."\n".'- Abstract: '.($definition->isAbstract() ? 'yes' : 'no')
189+
."\n".'- Autowired: '.($definition->isAutowired() ? 'yes' : 'no')
186190
;
187191

188-
if (method_exists($definition, 'isShared')) {
189-
$output .= "\n".'- Shared: '.($definition->isShared() ? 'yes' : 'no');
190-
}
191-
192-
if (method_exists($definition, 'isSynchronized')) {
193-
$output .= "\n".'- Synchronized: '.($definition->isSynchronized(false) ? 'yes' : 'no');
194-
}
195-
196-
$output .= "\n".'- Abstract: '.($definition->isAbstract() ? 'yes' : 'no');
197-
198-
if (method_exists($definition, 'isAutowired')) {
199-
$output .= "\n".'- Autowired: '.($definition->isAutowired() ? 'yes' : 'no');
200-
201-
foreach ($definition->getAutowiringTypes() as $autowiringType) {
202-
$output .= "\n".'- Autowiring Type: `'.$autowiringType.'`';
203-
}
192+
foreach ($definition->getAutowiringTypes() as $autowiringType) {
193+
$output .= "\n".'- Autowiring Type: `'.$autowiringType.'`';
204194
}
205195

206196
if ($definition->getFile()) {
@@ -371,7 +361,7 @@ protected function describeCallable($callable, array $options = array())
371361
*/
372362
private function formatRouterConfig(array $array)
373363
{
374-
if (!count($array)) {
364+
if (!$array) {
375365
return 'NONE';
376366
}
377367

‎src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -255,8 +255,7 @@ protected function describeContainerDefinition(Definition $definition, array $op
255255
$tableRows[] = array('Service ID', isset($options['id']) ? $options['id'] : '-');
256256
$tableRows[] = array('Class', $definition->getClass() ?: '-');
257257

258-
$tags = $definition->getTags();
259-
if (count($tags)) {
258+
if ($tags = $definition->getTags()) {
260259
$tagInformation = '';
261260
foreach ($tags as $tagName => $tagData) {
262261
foreach ($tagData as $tagParameters) {
@@ -281,24 +280,12 @@ protected function describeContainerDefinition(Definition $definition, array $op
281280
$tableRows[] = array('Public', $definition->isPublic() ? 'yes' : 'no');
282281
$tableRows[] = array('Synthetic', $definition->isSynthetic() ? 'yes' : 'no');
283282
$tableRows[] = array('Lazy', $definition->isLazy() ? 'yes' : 'no');
284-
285-
if (method_exists($definition, 'isSynchronized')) {
286-
$tableRows[] = array('Synchronized', $definition->isSynchronized(false) ? 'yes' : 'no');
287-
}
283+
$tableRows[] = array('Synchronized', $definition->isSynchronized(false) ? 'yes' : 'no');
288284
$tableRows[] = array('Abstract', $definition->isAbstract() ? 'yes' : 'no');
285+
$tableRows[] = array('Autowired', $definition->isAutowired() ? 'yes' : 'no');
289286

290-
if (method_exists($definition, 'isAutowired')) {
291-
$tableRows[] = array('Autowired', $definition->isAutowired() ? 'yes' : 'no');
292-
293-
$autowiringTypes = $definition->getAutowiringTypes();
294-
if (count($autowiringTypes)) {
295-
$autowiringTypesInformation = implode(', ', $autowiringTypes);
296-
} else {
297-
$autowiringTypesInformation = '-';
298-
}
299-
300-
$tableRows[] = array('Autowiring Types', $autowiringTypesInformation);
301-
}
287+
$autowiringTypes = $definition->getAutowiringTypes();
288+
$tableRows[] = array('Autowiring Types', $autowiringTypes ? implode(', ', $autowiringTypes) : '-');
302289

303290
if ($definition->getFile()) {
304291
$tableRows[] = array('Required File', $definition->getFile() ? $definition->getFile() : '-');

‎src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php

Lines changed: 15 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ private function getRouteDocument(Route $route, $name = null)
187187
$methodXML->appendChild(new \DOMText($method));
188188
}
189189

190-
if (count($route->getDefaults())) {
190+
if ($route->getDefaults()) {
191191
$routeXML->appendChild($defaultsXML = $dom->createElement('defaults'));
192192
foreach ($route->getDefaults() as $attribute => $value) {
193193
$defaultsXML->appendChild($defaultXML = $dom->createElement('default'));
@@ -198,7 +198,7 @@ private function getRouteDocument(Route $route, $name = null)
198198

199199
$requirements = $route->getRequirements();
200200
unset($requirements['_scheme'], $requirements['_method']);
201-
if (count($requirements)) {
201+
if ($requirements) {
202202
$routeXML->appendChild($requirementsXML = $dom->createElement('requirements'));
203203
foreach ($requirements as $attribute => $pattern) {
204204
$requirementsXML->appendChild($requirementXML = $dom->createElement('requirement'));
@@ -207,7 +207,7 @@ private function getRouteDocument(Route $route, $name = null)
207207
}
208208
}
209209

210-
if (count($route->getOptions())) {
210+
if ($route->getOptions()) {
211211
$routeXML->appendChild($optionsXML = $dom->createElement('options'));
212212
foreach ($route->getOptions() as $name => $value) {
213213
$optionsXML->appendChild($optionXML = $dom->createElement('option'));
@@ -331,18 +331,16 @@ private function getContainerDefinitionDocument(Definition $definition, $id = nu
331331

332332
$serviceXML->setAttribute('class', $definition->getClass());
333333

334-
if (method_exists($definition, 'getFactoryMethod')) {
335-
if ($definition->getFactoryClass(false)) {
336-
$serviceXML->setAttribute('factory-class', $definition->getFactoryClass(false));
337-
}
334+
if ($definition->getFactoryClass(false)) {
335+
$serviceXML->setAttribute('factory-class', $definition->getFactoryClass(false));
336+
}
338337

339-
if ($definition->getFactoryService(false)) {
340-
$serviceXML->setAttribute('factory-service', $definition->getFactoryService(false));
341-
}
338+
if ($definition->getFactoryService(false)) {
339+
$serviceXML->setAttribute('factory-service', $definition->getFactoryService(false));
340+
}
342341

343-
if ($definition->getFactoryMethod(false)) {
344-
$serviceXML->setAttribute('factory-method', $definition->getFactoryMethod(false));
345-
}
342+
if ($definition->getFactoryMethod(false)) {
343+
$serviceXML->setAttribute('factory-method', $definition->getFactoryMethod(false));
346344
}
347345

348346
if ($factory = $definition->getFactory()) {
@@ -366,24 +364,14 @@ private function getContainerDefinitionDocument(Definition $definition, $id = nu
366364
$serviceXML->setAttribute('public', $definition->isPublic() ? 'true' : 'false');
367365
$serviceXML->setAttribute('synthetic', $definition->isSynthetic() ? 'true' : 'false');
368366
$serviceXML->setAttribute('lazy', $definition->isLazy() ? 'true' : 'false');
369-
if (method_exists($definition, 'isShared')) {
370-
$serviceXML->setAttribute('shared', $definition->isShared() ? 'true' : 'false');
371-
}
372-
if (method_exists($definition, 'isSynchronized')) {
373-
$serviceXML->setAttribute('synchronized', $definition->isSynchronized(false) ? 'true' : 'false');
374-
}
367+
$serviceXML->setAttribute('shared', $definition->isShared() ? 'true' : 'false');
368+
$serviceXML->setAttribute('synchronized', $definition->isSynchronized(false) ? 'true' : 'false');
375369
$serviceXML->setAttribute('abstract', $definition->isAbstract() ? 'true' : 'false');
376-
377-
if (method_exists($definition, 'isAutowired')) {
378-
$serviceXML->setAttribute('autowired', $definition->isAutowired() ? 'true' : 'false');
379-
}
380-
370+
$serviceXML->setAttribute('autowired', $definition->isAutowired() ? 'true' : 'false');
381371
$serviceXML->setAttribute('file', $definition->getFile());
382372

383373
if (!$omitTags) {
384-
$tags = $definition->getTags();
385-
386-
if (count($tags) > 0) {
374+
if ($tags = $definition->getTags()) {
387375
$serviceXML->appendChild($tagsXML = $dom->createElement('tags'));
388376
foreach ($tags as $tagName => $tagData) {
389377
foreach ($tagData as $parameters) {

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy