8000 Output “not configured” when a factory definition has no class · symfony/symfony@bddd431 · GitHub
[go: up one dir, main page]
Skip to content

Commit bddd431

Browse files
MatTheCatMatTheCat
committed
Output “not configured” when a factory definition has no class
1 parent e756908 commit bddd431

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -218,10 +218,10 @@ private function getContainerDefinitionData(Definition $definition, bool $omitTa
218218
if (\is_array($factory)) {
219219
if ($factory[0] instanceof Reference) {
220220
$data['factory_service'] = (string) $factory[0];
221-
} elseif (!$factory[0] instanceof Definition) {
221+
} elseif ($factory[0] instanceof Definition) {
222+
$data['factory_class'] = $factory[0]->getClass() ?? 'not configured';
223+
} else {
222224
$data['factory_class'] = $factory[0];
223-
} elseif ($factoryClass = $factory[0]->getClass()) {
224-
$data['factory_class'] = $factoryClass;
225225
}
226226
$data['factory_method'] = $factory[1];
227227
} else {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -195,10 +195,10 @@ protected function describeContainerDefinition(Definition $definition, array $op
195195
if (\is_array($factory)) {
196196
if ($factory[0] instanceof Reference) {
197197
$output .= "\n".'- Factory Service: `'.$factory[0].'`';
198-
} elseif (!$factory[0] instanceof Definition) {
198+
} elseif ($factory[0] instanceof Definition) {
199+
$output .= "\n".'- Factory Class: `'.($factory[0]->getClass() ?? 'not configured').'`';
200+
} else {
199201
$output .= "\n".'- Factory Class: `'.$factory[0].'`';
200-
} elseif ($factoryClass = $factory[0]->getClass()) {
201-
$output .= "\n".'- Factory Class: `'.$factoryClass.'`';
202202
}
203203
$output .= "\n".'- Factory Method: `'.$factory[1].'`';
204204
} else {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -308,10 +308,10 @@ protected function describeContainerDefinition(Definition $de 8000 finition, array $op
308308
if (\is_array($factory)) {
309309
if ($factory[0] instanceof Reference) {
310310
$tableRows[] = ['Factory Service', $factory[0]];
311-
} elseif (!$factory[0] instanceof Definition) {
311+
} elseif ($factory[0] instanceof Definition) {
312+
$tableRows[] = ['Factory Class', $factory[0]->getClass() ?? 'not configured'];
313+
} else {
312314
$tableRows[] = ['Factory Class', $factory[0]];
313-
} elseif ($factoryClass = $factory[0]->getClass()) {
314-
$tableRows[] = ['Factory Class', $factoryClass];
315315
}
316316
$tableRows[] = ['Factory Method', $factory[1]];
317317
} else {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -293,10 +293,10 @@ private function getContainerDefinitionDocumen 952B t(Definition $definition, string $
293293
if (\is_array($factory)) {
294294
if ($factory[0] instanceof Reference) {
295295
$factoryXML->setAttribute('service', (string) $factory[0]);
296-
} elseif (!$factory[0] instanceof Definition) {
296+
} elseif ($factory[0] instanceof Definition) {
297+
$factoryXML->setAttribute('class', $factory[0]->getClass() ?? 'not configured');
298+
} else {
297299
$factoryXML->setAttribute('class', $factory[0]);
298-
} elseif ($factoryClass = $factory[0]->getClass()) {
299-
$factoryXML->setAttribute('class', $factoryClass);
300300
}
301301
$factoryXML->setAttribute('method', $factory[1]);
302302
} else {

0 commit comments

Comments
 (0)
0