8000 Merge branch '2.8' into 3.2 · symfony/symfony@39c81c2 · GitHub
[go: up one dir, main page]
Skip to content

Commit 39c81c2

Browse files
dunglasdunglas
committed
Merge branch '2.8' into 3.2
* 2.8: [FrameworkBundle] Remove useless checks in descriptors fixed typo
2 parents 7106653 + 5bc83c4 commit 39c81c2

File tree

4 files changed

+30
-65
lines changed

4 files changed

+30
-65
lines changed

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

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -208,25 +208,17 @@ private function getContainerDefinitionData(Definition $definition, $omitTags =
208208
'public' => $definition->isPublic(),
209209
'synthetic' => $definition->isSynthetic(),
210210
'lazy' => $definition->isLazy(),
211+
'shared' => $definition->isShared(),
212+
'abstract' => $definition->isAbstract(),
213+
'autowire' => $definition->isAutowired(),
214+
'autowiring_types' => array(),
215+
'file' => $definition->getFile(),
211216
);
212217

213-
if (method_exists($definition, 'isShared')) {
214-
$data['shared'] = $definition->isShared();
218+
foreach ($definition->getAutowiringTypes() as $autowiringType) {
219+
$data['autowiring_types'][] = $autowiringType;
215220
}
216221

217-
$data['abstract'] = $definition->isAbstract();
218-
219-
if (method_exists($definition, 'isAutowired')) {
220-
$data['autowire'] = $definition->isAutowired();
221-
222-
$data['autowiring_types'] = array();
223-
foreach ($definition->getAutowiringTypes() as $autowiringType) {
224-
$data['autowiring_types'][] = $autowiringType;
225-
}
226-
}
227-
228-
$data['file'] = $definition->getFile();
229-
230222
if ($factory = $definition->getFactory()) {
231223
if (is_array($factory)) {
232224
if ($factory[0] instanceof Reference) {
@@ -252,11 +244,9 @@ private function getContainerDefinitionData(Definition $definition, $omitTags =
252244

253245
if (!$omitTags) {
254246
$data['tags'] = array();
255-
if (count($definition->getTags())) {
256-
foreach ($definition->getTags() as $tagName => $tagData) {
257-
foreach ($tagData as $parameters) {
258-
$data['tags'][] = array('name' => $tagName, 'parameters' => $parameters);
259-
}
247+
foreach ($definition->getTags() as $tagName => $tagData) {
248+
foreach ($tagData as $parameters) {
249+
$data['tags'][] = array('name' => $tagName, 'parameters' => $parameters);
260250
}
261251
}
262252
}

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

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

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

198191
if ($definition->getFile()) {
@@ -356,7 +349,7 @@ protected function describeCallable($callable, array $options = array())
356349
*/
357350
private function formatRouterConfig(array $array)
358351
{
359-
if (!count($array)) {
352+
if (!$array) {
360353
return 'NONE';
361354
}
362355

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

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

255-
$tags = $definition->getTags();
256-
if (count($tags)) {
255+
if ($tags = $definition->getTags()) {
257256
$tagInformation = '';
258257
foreach ($tags as $tagName => $tagData) {
259258
foreach ($tagData as $tagParameters) {
@@ -286,23 +285,12 @@ protected function describeContainerDefinition(Definition $definition, array $op
286285
$tableRows[] = array('Public', $definition->isPublic() ? 'yes' : 'no');
287286
$tableRows[] = array('Synthetic', $definition->isSynthetic() ? 'yes' : 'no');
288287
$tableRows[] = array('Lazy', $definition->isLazy() ? 'yes' : 'no');
289-
if (method_exists($definition, 'isShared')) {
290-
$tableRows[] = array('Shared', $definition->isShared() ? 'yes' : 'no');
291-
}
288+
$tableRows[] = array('Shared', $definition->isShared() ? 'yes' : 'no');
292289
$tableRows[] = array('Abstract', $definition->isAbstract() ? 'yes' : 'no');
290+
$tableRows[] = array('Autowired', $definition->isAutowired() ? 'yes' : 'no');
293291

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

307295
if ($definition->getFile()) {
308296
$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
@@ -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'));
@@ -196,16 +196,18 @@ private function getRouteDocument(Route $route, $name = null)
196196
}
197197
}
198198

199-
if (count($route->getRequirements())) {
199+
$originRequirements = $requirements = $route->getRequirements();
200+
unset($requirements['_scheme'], $requirements['_method']);
201+
if ($requirements) {
200202
$routeXML->appendChild($requirementsXML = $dom->createElement('requirements'));
201-
foreach ($route->getRequirements() as $attribute => $pattern) {
203+
foreach ($originRequirements as $attribute => $pattern) {
202204
$requirementsXML->appendChild($requirementXML = $dom->createElement('requirement'));
203205
$requirementXML->setAttribute('key', $attribute);
204206
$requirementXML->appendChild(new \DOMText($pattern));
205207
}
206208
}
207209

208-
if (count($route->getOptions())) {
210+
if ($route->getOptions()) {
209211
$routeXML->appendChild($optionsXML = $dom->createElement('options'));
210212
foreach ($route->getOptions() as $name => $value) {
211213
$optionsXML->appendChild($optionXML = $dom->createElement('option'));
@@ -349,15 +351,9 @@ private function getContainerDefinitionDocument(Definition $definition, $id = nu
349351
$serviceXML->setAttribute('public', $definition->isPublic() ? 'true' : 'false');
350352
$serviceXML->setAttribute('synthetic', $definition->isSynthetic() ? 'true' : 'false');
351353
$serviceXML->setAttribute('lazy', $definition->isLazy() ? 'true' : 'false');
352-
if (method_exists($definition, 'isShared')) {
353-
$serviceXML->setAttribute('shared', $definition->isShared() ? 'true' : 'false');
354-
}
354+
$serviceXML->setAttribute('shared', $definition->isShared() ? 'true' : 'false');
355355
$serviceXML->setAttribute('abstract', $definition->isAbstract() ? 'true' : 'false');
356-
357-
if (method_exists($definition, 'isAutowired')) {
358-
$serviceXML->setAttribute('autowired', $definition->isAutowired() ? 'true' : 'false');
359-
}
360-
356+
$serviceXML->setAttribute('autowired', $definition->isAutowired() ? 'true' : 'false');
361357
$serviceXML->setAttribute('file', $definition->getFile());
362358

363359
$calls = $definition->getMethodCalls();
@@ -370,9 +366,7 @@ private function getContainerDefinitionDocument(Definition $definition, $id = nu
370366
}
371367

372368
if (!$omitTags) {
373-
$tags = $definition->getTags();
374-
375-
if (count($tags) > 0) {
369+
if ($tags = $definition->getTags()) {
376370
$serviceXML->appendChild($tagsXML = $dom->createElement('tags'));
377371
foreach ($tags as $tagName => $tagData) {
378372
foreach ($tagData as $parameters) { 4F6

0 commit comments

Comments
 (0)
0