Merge branch '2.8' into 3.2
* 2.8: [FrameworkBundle] Remove useless checks in descriptors fixed typo
This commit is contained in:
commit
39c81c2dce
@ -208,24 +208,16 @@ class JsonDescriptor extends Descriptor
|
|||||||
'public' => $definition->isPublic(),
|
'public' => $definition->isPublic(),
|
||||||
'synthetic' => $definition->isSynthetic(),
|
'synthetic' => $definition->isSynthetic(),
|
||||||
'lazy' => $definition->isLazy(),
|
'lazy' => $definition->isLazy(),
|
||||||
|
'shared' => $definition->isShared(),
|
||||||
|
'abstract' => $definition->isAbstract(),
|
||||||
|
'autowire' => $definition->isAutowired(),
|
||||||
|
'autowiring_types' => array(),
|
||||||
|
'file' => $definition->getFile(),
|
||||||
);
|
);
|
||||||
|
|
||||||
if (method_exists($definition, 'isShared')) {
|
|
||||||
$data['shared'] = $definition->isShared();
|
|
||||||
}
|
|
||||||
|
|
||||||
$data['abstract'] = $definition->isAbstract();
|
|
||||||
|
|
||||||
if (method_exists($definition, 'isAutowired')) {
|
|
||||||
$data['autowire'] = $definition->isAutowired();
|
|
||||||
|
|
||||||
$data['autowiring_types'] = array();
|
|
||||||
foreach ($definition->getAutowiringTypes() as $autowiringType) {
|
foreach ($definition->getAutowiringTypes() as $autowiringType) {
|
||||||
$data['autowiring_types'][] = $autowiringType;
|
$data['autowiring_types'][] = $autowiringType;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
$data['file'] = $definition->getFile();
|
|
||||||
|
|
||||||
if ($factory = $definition->getFactory()) {
|
if ($factory = $definition->getFactory()) {
|
||||||
if (is_array($factory)) {
|
if (is_array($factory)) {
|
||||||
@ -252,14 +244,12 @@ class JsonDescriptor extends Descriptor
|
|||||||
|
|
||||||
if (!$omitTags) {
|
if (!$omitTags) {
|
||||||
$data['tags'] = array();
|
$data['tags'] = array();
|
||||||
if (count($definition->getTags())) {
|
|
||||||
foreach ($definition->getTags() as $tagName => $tagData) {
|
foreach ($definition->getTags() as $tagName => $tagData) {
|
||||||
foreach ($tagData as $parameters) {
|
foreach ($tagData as $parameters) {
|
||||||
$data['tags'][] = array('name' => $tagName, 'parameters' => $parameters);
|
$data['tags'][] = array('name' => $tagName, 'parameters' => $parameters);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
return $data;
|
return $data;
|
||||||
}
|
}
|
||||||
|
@ -179,20 +179,13 @@ class MarkdownDescriptor extends Descriptor
|
|||||||
."\n".'- Public: '.($definition->isPublic() ? 'yes' : 'no')
|
."\n".'- Public: '.($definition->isPublic() ? 'yes' : 'no')
|
||||||
."\n".'- Synthetic: '.($definition->isSynthetic() ? 'yes' : 'no')
|
."\n".'- Synthetic: '.($definition->isSynthetic() ? 'yes' : 'no')
|
||||||
."\n".'- Lazy: '.($definition->isLazy() ? 'yes' : 'no')
|
."\n".'- Lazy: '.($definition->isLazy() ? 'yes' : 'no')
|
||||||
|
."\n".'- Shared: '.($definition->isShared() ? 'yes' : 'no')
|
||||||
|
."\n".'- Abstract: '.($definition->isAbstract() ? 'yes' : 'no')
|
||||||
|
."\n".'- Autowired: '.($definition->isAutowired() ? 'yes' : 'no')
|
||||||
;
|
;
|
||||||
|
|
||||||
if (method_exists($definition, 'isShared')) {
|
|
||||||
$output .= "\n".'- Shared: '.($definition->isShared() ? 'yes' : 'no');
|
|
||||||
}
|
|
||||||
|
|
||||||
$output .= "\n".'- Abstract: '.($definition->isAbstract() ? 'yes' : 'no');
|
|
||||||
|
|
||||||
if (method_exists($definition, 'isAutowired')) {
|
|
||||||
$output .= "\n".'- Autowired: '.($definition->isAutowired() ? 'yes' : 'no');
|
|
||||||
|
|
||||||
foreach ($definition->getAutowiringTypes() as $autowiringType) {
|
foreach ($definition->getAutowiringTypes() as $autowiringType) {
|
||||||
$output .= "\n".'- Autowiring Type: `'.$autowiringType.'`';
|
$output .= "\n" . '- Autowiring Type: `' . $autowiringType . '`';
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($definition->getFile()) {
|
if ($definition->getFile()) {
|
||||||
@ -356,7 +349,7 @@ class MarkdownDescriptor extends Descriptor
|
|||||||
*/
|
*/
|
||||||
private function formatRouterConfig(array $array)
|
private function formatRouterConfig(array $array)
|
||||||
{
|
{
|
||||||
if (!count($array)) {
|
if (!$array) {
|
||||||
return 'NONE';
|
return 'NONE';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -252,8 +252,7 @@ class TextDescriptor extends Descriptor
|
|||||||
$tableRows[] = array('Service ID', isset($options['id']) ? $options['id'] : '-');
|
$tableRows[] = array('Service ID', isset($options['id']) ? $options['id'] : '-');
|
||||||
$tableRows[] = array('Class', $definition->getClass() ?: '-');
|
$tableRows[] = array('Class', $definition->getClass() ?: '-');
|
||||||
|
|
||||||
$tags = $definition->getTags();
|
if ($tags = $definition->getTags()) {
|
||||||
if (count($tags)) {
|
|
||||||
$tagInformation = '';
|
$tagInformation = '';
|
||||||
foreach ($tags as $tagName => $tagData) {
|
foreach ($tags as $tagName => $tagData) {
|
||||||
foreach ($tagData as $tagParameters) {
|
foreach ($tagData as $tagParameters) {
|
||||||
@ -286,23 +285,12 @@ class TextDescriptor extends Descriptor
|
|||||||
$tableRows[] = array('Public', $definition->isPublic() ? 'yes' : 'no');
|
$tableRows[] = array('Public', $definition->isPublic() ? 'yes' : 'no');
|
||||||
$tableRows[] = array('Synthetic', $definition->isSynthetic() ? 'yes' : 'no');
|
$tableRows[] = array('Synthetic', $definition->isSynthetic() ? 'yes' : 'no');
|
||||||
$tableRows[] = array('Lazy', $definition->isLazy() ? 'yes' : 'no');
|
$tableRows[] = array('Lazy', $definition->isLazy() ? 'yes' : 'no');
|
||||||
if (method_exists($definition, 'isShared')) {
|
|
||||||
$tableRows[] = array('Shared', $definition->isShared() ? 'yes' : 'no');
|
$tableRows[] = array('Shared', $definition->isShared() ? 'yes' : 'no');
|
||||||
}
|
|
||||||
$tableRows[] = array('Abstract', $definition->isAbstract() ? 'yes' : 'no');
|
$tableRows[] = array('Abstract', $definition->isAbstract() ? 'yes' : 'no');
|
||||||
|
|
||||||
if (method_exists($definition, 'isAutowired')) {
|
|
||||||
$tableRows[] = array('Autowired', $definition->isAutowired() ? 'yes' : 'no');
|
$tableRows[] = array('Autowired', $definition->isAutowired() ? 'yes' : 'no');
|
||||||
|
|
||||||
$autowiringTypes = $definition->getAutowiringTypes();
|
$autowiringTypes = $definition->getAutowiringTypes();
|
||||||
if (count($autowiringTypes)) {
|
$tableRows[] = array('Autowiring Types', $autowiringTypes ? implode(', ', $autowiringTypes) : '-');
|
||||||
$autowiringTypesInformation = implode(', ', $autowiringTypes);
|
|
||||||
} else {
|
|
||||||
$autowiringTypesInformation = '-';
|
|
||||||
}
|
|
||||||
|
|
||||||
$tableRows[] = array('Autowiring Types', $autowiringTypesInformation);
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($definition->getFile()) {
|
if ($definition->getFile()) {
|
||||||
$tableRows[] = array('Required File', $definition->getFile() ? $definition->getFile() : '-');
|
$tableRows[] = array('Required File', $definition->getFile() ? $definition->getFile() : '-');
|
||||||
|
@ -187,7 +187,7 @@ class XmlDescriptor extends Descriptor
|
|||||||
$methodXML->appendChild(new \DOMText($method));
|
$methodXML->appendChild(new \DOMText($method));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (count($route->getDefaults())) {
|
if ($route->getDefaults()) {
|
||||||
$routeXML->appendChild($defaultsXML = $dom->createElement('defaults'));
|
$routeXML->appendChild($defaultsXML = $dom->createElement('defaults'));
|
||||||
foreach ($route->getDefaults() as $attribute => $value) {
|
foreach ($route->getDefaults() as $attribute => $value) {
|
||||||
$defaultsXML->appendChild($defaultXML = $dom->createElement('default'));
|
$defaultsXML->appendChild($defaultXML = $dom->createElement('default'));
|
||||||
@ -196,16 +196,18 @@ class XmlDescriptor extends Descriptor
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (count($route->getRequirements())) {
|
$originRequirements = $requirements = $route->getRequirements();
|
||||||
|
unset($requirements['_scheme'], $requirements['_method']);
|
||||||
|
if ($requirements) {
|
||||||
$routeXML->appendChild($requirementsXML = $dom->createElement('requirements'));
|
$routeXML->appendChild($requirementsXML = $dom->createElement('requirements'));
|
||||||
foreach ($route->getRequirements() as $attribute => $pattern) {
|
foreach ($originRequirements as $attribute => $pattern) {
|
||||||
$requirementsXML->appendChild($requirementXML = $dom->createElement('requirement'));
|
$requirementsXML->appendChild($requirementXML = $dom->createElement('requirement'));
|
||||||
$requirementXML->setAttribute('key', $attribute);
|
$requirementXML->setAttribute('key', $attribute);
|
||||||
$requirementXML->appendChild(new \DOMText($pattern));
|
$requirementXML->appendChild(new \DOMText($pattern));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (count($route->getOptions())) {
|
if ($route->getOptions()) {
|
||||||
$routeXML->appendChild($optionsXML = $dom->createElement('options'));
|
$routeXML->appendChild($optionsXML = $dom->createElement('options'));
|
||||||
foreach ($route->getOptions() as $name => $value) {
|
foreach ($route->getOptions() as $name => $value) {
|
||||||
$optionsXML->appendChild($optionXML = $dom->createElement('option'));
|
$optionsXML->appendChild($optionXML = $dom->createElement('option'));
|
||||||
@ -349,15 +351,9 @@ class XmlDescriptor extends Descriptor
|
|||||||
$serviceXML->setAttribute('public', $definition->isPublic() ? 'true' : 'false');
|
$serviceXML->setAttribute('public', $definition->isPublic() ? 'true' : 'false');
|
||||||
$serviceXML->setAttribute('synthetic', $definition->isSynthetic() ? 'true' : 'false');
|
$serviceXML->setAttribute('synthetic', $definition->isSynthetic() ? 'true' : 'false');
|
||||||
$serviceXML->setAttribute('lazy', $definition->isLazy() ? 'true' : 'false');
|
$serviceXML->setAttribute('lazy', $definition->isLazy() ? 'true' : 'false');
|
||||||
if (method_exists($definition, 'isShared')) {
|
|
||||||
$serviceXML->setAttribute('shared', $definition->isShared() ? 'true' : 'false');
|
$serviceXML->setAttribute('shared', $definition->isShared() ? 'true' : 'false');
|
||||||
}
|
|
||||||
$serviceXML->setAttribute('abstract', $definition->isAbstract() ? 'true' : 'false');
|
$serviceXML->setAttribute('abstract', $definition->isAbstract() ? 'true' : 'false');
|
||||||
|
|
||||||
if (method_exists($definition, 'isAutowired')) {
|
|
||||||
$serviceXML->setAttribute('autowired', $definition->isAutowired() ? 'true' : 'false');
|
$serviceXML->setAttribute('autowired', $definition->isAutowired() ? 'true' : 'false');
|
||||||
}
|
|
||||||
|
|
||||||
$serviceXML->setAttribute('file', $definition->getFile());
|
$serviceXML->setAttribute('file', $definition->getFile());
|
||||||
|
|
||||||
$calls = $definition->getMethodCalls();
|
$calls = $definition->getMethodCalls();
|
||||||
@ -370,9 +366,7 @@ class XmlDescriptor extends Descriptor
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!$omitTags) {
|
if (!$omitTags) {
|
||||||
$tags = $definition->getTags();
|
if ($tags = $definition->getTags()) {
|
||||||
|
|
||||||
if (count($tags) > 0) {
|
|
||||||
$serviceXML->appendChild($tagsXML = $dom->createElement('tags'));
|
$serviceXML->appendChild($tagsXML = $dom->createElement('tags'));
|
||||||
foreach ($tags as $tagName => $tagData) {
|
foreach ($tags as $tagName => $tagData) {
|
||||||
foreach ($tagData as $parameters) {
|
foreach ($tagData as $parameters) {
|
||||||
|
Reference in New Issue
Block a user