Skip to content

Commit f025392

Browse files
dunglasdunglas
committed
Merge branch '3.2'
* 3.2: [FrameworkBundle] Remove useless checks in descriptors fixed typo
2 parents b1098d9 + 39c81c2 commit f025392

File tree

4 files changed

+28
-61
lines changed

4 files changed

+28
-61
lines changed

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

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -217,21 +217,14 @@ private function getContainerDefinitionData(Definition $definition, $omitTags =
217217
'public' => $definition->isPublic(),
218218
'synthetic' => $definition->isSynthetic(),
219219
'lazy' => $definition->isLazy(),
220+
'shared' => $definition->isShared(),
221+
'abstract' => $definition->isAbstract(),
222+
'autowire' => $definition->isAutowired(),
223+
'autowiring_types' => array(),
220224
);
221225

222-
if (method_exists($definition, 'isShared')) {
223-
$data['shared'] = $definition->isShared();
224-
}
225-
226-
$data['abstract'] = $definition->isAbstract();
227-
228-
if (method_exists($definition, 'isAutowired')) {
229-
$data['autowire'] = $definition->isAutowired();
230-
231-
$data['autowiring_types'] = array();
232-
foreach ($definition->getAutowiringTypes() as $autowiringType) {
233-
$data['autowiring_types'][] = $autowiringType;
234-
}
226+
foreach ($definition->getAutowiringTypes() as $autowiringType) {
227+
$data['autowiring_types'][] = $autowiringType;
235228
}
236229

237230
if ($showArguments) {
@@ -278,11 +271,9 @@ private function getContainerDefinitionData(Definition $definition, $omitTags =
278271

279272
if (!$omitTags) {
280273
$data['tags'] = array();
281-
if (count($definition->getTags())) {
282-
foreach ($definition->getTags() as $tagName => $tagData) {
283-
foreach ($tagData as $parameters) {
284-
$data['tags'][] = array('name' => $tagName, 'parameters' => $parameters);
285-
}
274+
foreach ($definition->getTags() as $tagName => $tagData) {
275+
foreach ($tagData as $parameters) {
276+
$data['tags'][] = array('name' => $tagName, 'parameters' => $parameters);
286277
}
287278
}
288279
}

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

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -180,20 +180,13 @@ protected function describeContainerDefinition(Definition $definition, array $op
180180
."\n".'- Public: '.($definition->isPublic() ? 'yes' : 'no')
181181
."\n".'- Synthetic: '.($definition->isSynthetic() ? 'yes' : 'no')
182182
."\n".'- Lazy: '.($definition->isLazy() ? 'yes' : 'no')
183+
."\n".'- Shared: '.($definition->isShared() ? 'yes' : 'no')
184+
."\n".'- Abstract: '.($definition->isAbstract() ? 'yes' : 'no')
185+
."\n".'- Autowired: '.($definition->isAutowired() ? 'yes' : 'no')
183186
;
184187

185-
if (method_exists($definition, 'isShared')) {
186-
$output .= "\n".'- Shared: '.($definition->isShared() ? 'yes' : 'no');
187-
}
188-
189-
$output .= "\n".'- Abstract: '.($definition->isAbstract() ? 'yes' : 'no');
190-
191-
if (method_exists($definition, 'isAutowired')) {
192-
$output .= "\n".'- Autowired: '.($definition->isAutowired() ? 'yes' : 'no');
193-
194-
foreach ($definition->getAutowiringTypes() as $autowiringType) {
195-
$output .= "\n".'- Autowiring Type: `'.$autowiringType.'`';
196-
}
188+
foreach ($definition->getAutowiringTypes() as $autowiringType) {
189+
$output .= "\n" . '- Autowiring Type: `' . $autowiringType . '`';
197190
}
198191

199192
if (isset($options['show_arguments']) && $options['show_arguments']) {
@@ -372,7 +365,7 @@ protected function describeCallable($callable, array $options = array())
372365
*/
373366
private function formatRouterConfig(array $array)
374367
{
375-
if (!count($array)) {
368+
if (!$array) {
376369
return 'NONE';
377370
}
378371

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

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -290,23 +290,12 @@ protected function describeContainerDefinition(Definition $definition, array $op
290290
$tableRows[] = array('Public', $definition->isPublic() ? 'yes' : 'no');
291291
$tableRows[] = array('Synthetic', $definition->isSynthetic() ? 'yes' : 'no');
292292
$tableRows[] = array('Lazy', $definition->isLazy() ? 'yes' : 'no');
293-
if (method_exists($definition, 'isShared')) {
294-
$tableRows[] = array('Shared', $definition->isShared() ? 'yes' : 'no');
295-
}
293+
$tableRows[] = array('Shared', $definition->isShared() ? 'yes' : 'no');
296294
$tableRows[] = array('Abstract', $definition->isAbstract() ? 'yes' : 'no');
295+
$tableRows[] = array('Autowired', $definition->isAutowired() ? 'yes' : 'no');
297296

298-
if (method_exists($definition, 'isAutowired')) {
299-
$tableRows[] = array('Autowired', $definition->isAutowired() ? 'yes' : 'no');
300-
301-
$autowiringTypes = $definition->getAutowiringTypes();
302-
if (count($autowiringTypes)) {
303-
$autowiringTypesInformation = implode(', ', $autowiringTypes);
304-
} else {
305-
$autowiringTypesInformation = '-';
306-
}
307-
308-
$tableRows[] = array('Autowiring Types', $autowiringTypesInformation);
309-
}
297+
$autowiringTypes = $definition->getAutowiringTypes();
298+
$tableRows[] = array('Autowiring Types', $autowiringTypes ? implode(', ', $autowiringTypes) : '-');
310299

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

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

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ private function getRouteDocument(Route $route, $name = null)
196196
$methodXML->appendChild(new \DOMText($method));
197197
}
198198

199-
if (count($route->getDefaults())) {
199+
if ($route->getDefaults()) {
200200
$routeXML->appendChild($defaultsXML = $dom->createElement('defaults'));
201201
foreach ($route->getDefaults() as $attribute => $value) {
202202
$defaultsXML->appendChild($defaultXML = $dom->createElement('default'));
@@ -205,16 +205,18 @@ private function getRouteDocument(Route $route, $name = null)
205205
}
206206
}
207207

208-
if (count($route->getRequirements())) {
208+
$originRequirements = $requirements = $route->getRequirements();
209+
unset($requirements['_scheme'], $requirements['_method']);
210+
if ($requirements) {
209211
$routeXML->appendChild($requirementsXML = $dom->createElement('requirements'));
210-
foreach ($route->getRequirements() as $attribute => $pattern) {
212+
foreach ($originRequirements as $attribute => $pattern) {
211213
$requirementsXML->appendChild($requirementXML = $dom->createElement('requirement'));
212214
$requirementXML->setAttribute('key', $attribute);
213215
$requirementXML->appendChild(new \DOMText($pattern));
214216
}
215217
}
216218

217-
if (count($route->getOptions())) {
219+
if ($route->getOptions()) {
218220
$routeXML->appendChild($optionsXML = $dom->createElement('options'));
219221
foreach ($route->getOptions() as $name => $value) {
220222
$optionsXML->appendChild($optionXML = $dom->createElement('option'));
@@ -364,15 +366,9 @@ private function getContainerDefinitionDocument(Definition $definition, $id = nu
364366
$serviceXML->setAttribute('public', $definition->isPublic() ? 'true' : 'false');
365367
$serviceXML->setAttribute('synthetic', $definition->isSynthetic() ? 'true' : 'false');
366368
$serviceXML->setAttribute('lazy', $definition->isLazy() ? 'true' : 'false');
367-
if (method_exists($definition, 'isShared')) {
368-
$serviceXML->setAttribute('shared', $definition->isShared() ? 'true' : 'false');
369-
}
369+
$serviceXML->setAttribute('shared', $definition->isShared() ? 'true' : 'false');
370370
$serviceXML->setAttribute('abstract', $definition->isAbstract() ? 'true' : 'false');
371-
372-
if (method_exists($definition, 'isAutowired')) {
373-
$serviceXML->setAttribute('autowired', $definition->isAutowired() ? 'true' : 'false');
374-
}
375-
371+
$serviceXML->setAttribute('autowired', $definition->isAutowired() ? 'true' : 'false');
376372
$serviceXML->setAttribute('file', $definition->getFile());
377373

378374
$calls = $definition->getMethodCalls();
@@ -391,9 +387,7 @@ private function getContainerDefinitionDocument(Definition $definition, $id = nu
391387
}
392388

393389
if (!$omitTags) {
394-
$tags = $definition->getTags();
395-
396-
if (count($tags) > 0) {
390+
if ($tags = $definition->getTags()) {
397391
$serviceXML->appendChild($tagsXML = $dom->createElement('tags'));
398392
foreach ($tags as $tagName => $tagData) {
399393
foreach ($tagData as $parameters) {

0 commit comments

Comments
 (0)