8000 minor #47469 [FrameworkBundle] tweak the factory class description fo… · symfony/symfony@6648b82 · GitHub
[go: up one dir, main page]
Skip to content
8000

Commit 6648b82

Browse files
fabpotfabpot
committed
minor #47469 [FrameworkBundle] tweak the factory class description for inlined factory services (xabbuh)
This PR was merged into the 4.4 branch. Discussion ---------- [FrameworkBundle] tweak the factory class description for inlined factory services | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | Fix #47351 (comment) | License | MIT | Doc PR | Commits ------- 5f0a5b4 tweak the factory class description for inlined factory services
2 parents 5dfb353 + 5f0a5b4 commit 6648b82

15 files changed

+47
-47
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ private function getContainerDefinitionData(Definition $definition, bool $omitTa
219219
if ($factory[0] instanceof Reference) {
220220
$data['factory_service'] = (string) $factory[0];
221221
} elseif ($factory[0] instanceof Definition) {
222-
$data['factory_class'] = $factory[0]->getClass() ?? 'not configured';
222+
$data['factory_service'] = sprintf('inline factory service (%s)', $factory[0]->getClass() ?? 'class not configured');
223223
} else {
224224
$data['factory_class'] = $factory[0];
225225
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ protected function describeContainerDefinition(Definition $definition, array $op
196196
if ($factory[0] instanceof Reference) {
197197
$output .= "\n".'- Factory Service: `'.$factory[0].'`';
198198
} elseif ($factory[0] instanceof Definition) {
199-
$output .= "\n".'- Factory Class: `'.($factory[0]->getClass() ?? 'not configured').'`';
199+
$output .= "\n".sprintf('- Factory Service: inline factory service (%s)', $factory[0]->getClass() ? sprintf('`%s`', $factory[0]->getClass()) : 'not configured');
200200
} else {
201201
$output .= "\n".'- Factory Class: `'.$factory[0].'`';
202202
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ protected function describeContainerDefinition(Definition $definition, array $op
309309
if ($factory[0] instanceof Reference) {
310310
$tableRows[] = ['Factory Service', $factory[0]];
311311
} elseif ($factory[0] instanceof Definition) {
312-
$tableRows[] = ['Factory Class', $factory[0]->getClass() ?? 'not configured'];
312+
$tableRows[] = ['Factory Service', sprintf('inline factory service (%s)', $factory[0]->getClass() ?? 'class not configured')];
313313
} else {
314314
$tableRows[] = ['Factory Class', $factory[0]];
315315
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ private function getContainerDefinitionDocument(Definition $definition, string $
294294
if ($factory[0] instanceof Reference) {
295295
$factoryXML->setAttribute('service', (string) $factory[0]);
296296
} elseif ($factory[0] instanceof Definition) {
297-
$factoryXML->setAttribute('class', $factory[0]->getClass() ?? 'not configured');
297+
$factoryXML->setAttribute('service', sprintf('inline factory service (%s)', $factory[0]->getClass() ?? 'not configured'));
298298
} else {
299299
$factoryXML->setAttribute('class', $factory[0]);
300300
}

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"autowire": false,
4646
"autoconfigure": false,
4747
"file": "\/path\/to\/file",
48-
"factory_class": "Full\\Qualified\\FactoryClass",
48+
"factory_service": "inline factory service (Full\\Qualified\\FactoryClass)",
4949
"factory_method": "get",
5050
"tags": []
5151
}

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Definitions
3636
- Autowired: no
3737
- Autoconfigured: no
3838
- File: `/path/to/file`
39-
- Factory Class: `Full\Qualified\FactoryClass`
39+
- Factory Service: inline factory service (`Full\Qualified\FactoryClass`)
4040
- Factory Method: `get`
4141

4242

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@
1818
</tags>
1919
</definition>
2020
<definition id=".definition_3" class="Full\Qualified\Class3" public="false" synthetic="false" lazy="false" shared="true" abstract="false" autowired="false" autoconfigured="false" file="/path/to/file">
21-
<factory class="Full\Qualified\FactoryClass" method="get"/>
21+
<factory service="inline factory service (Full\Qualified\FactoryClass)" method="get"/>
2222
</definition>
2323
</container>

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_3.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"autowire": false,
99
"autoconfigure": false,
1010
"file": "\/path\/to\/file",
11-
"factory_class": "Full\\Qualified\\FactoryClass",
11+
"factory_service": "inline factory service (Full\\Qualified\\FactoryClass)",
1212
"factory_method": "get",
1313
"tags": []
1414
}

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_3.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
- Autowired: no
88
- Autoconfigured: no
99
- File: `/path/to/file`
10-
- Factory Class: `Full\Qualified\FactoryClass`
10+
- Factory Service: inline factory service (`Full\Qualified\FactoryClass`)
1111
- Factory Method: `get`

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_3.txt

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
---------------- -----------------------------
2-
 Option   Value 
3-
---------------- -----------------------------
4-
Service ID -
5-
Class Full\Qualified\Class3
6-
Tags -
7-
Public no
8-
Synthetic no
9-
Lazy no
10-
Shared yes
11-
Abstract no
12-
Autowired no
13-
Autoconfigured no
14-
Required File /path/to/file
15-
Factory Class Full\Qualified\FactoryClass
16-
Factory Method get
17-
---------------- -----------------------------
1+
----------------- ------------------------------------------------------
2+
 Option   Value 
3+
----------------- ------------------------------------------------------
4+
Service ID -
5+
Class Full\Qualified\Class3
6+
Tags -
7+
Public no
8+
Synthetic no
9+
Lazy no
10+
Shared yes
11+
Abstract no
12+
Autowired no
13+
Autoconfigured no
14+
Required File /path/to/file
15+
Factory Service inline factory service (Full\Qualified\FactoryClass)
16+
Factory Method get
17+
----------------- ------------------------------------------------------
1818

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_3.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<definition class="Full\Qualified\Class3" public="false" synthetic="false" lazy="false" shared="true" abstract="false" autowired="false" autoconfigured="false" file="/path/to/file">
3-
<factory class="Full\Qualified\FactoryClass" method="get"/>
3+
<factory service="inline factory service (Full\Qualified\FactoryClass)" method="get"/>
44
</definition>

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_arguments_3.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"autoconfigure": false,
1010
"arguments": [],
1111
"file": "\/path\/to\/file",
12-
"factory_class": "Full\\Qualified\\FactoryClass",
12+
"factory_service": "inline factory service (Full\\Qualified\\FactoryClass)",
1313
"factory_method": "get",
1414
"tags": []
1515
}

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_arguments_3.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88
- Autoconfigured: no
99
- Arguments: no
1010
- File: `/path/to/file`
11-
- Factory Class: `Full\Qualified\FactoryClass`
11+
- Factory Service: inline factory service (`Full\Qualified\ 93C6 FactoryClass`)
1212
- Factory Method: `get`

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_arguments_3.txt

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
---------------- -----------------------------
2-
 Option   Value 
3-
---------------- -----------------------------
4-
Service ID -
5-
Class Full\Qualified\Class3
6-
Tags -
7-
Public no
8-
Synthetic no
9-
Lazy no
10-
Shared yes
11-
Abstract no
12-
Autowired no
13-
Autoconfigured no
14-
Required File /path/to/file
15-
Factory Class Full\Qualified\FactoryClass
16-
Factory Method get
17-
---------------- -----------------------------
1+
----------------- ------------------------------------------------------
2+
 Option   Value 
3+
----------------- ------------------------------------------------------
4+
Service ID -
5+
Class Full\Qualified\Class3
6+
Tags -
7+
Public no
8+
Synthetic no
9+
Lazy no
10+
Shared yes
11+
Abstract no
12+
Autowired no
13+
Autoconfigured no
14+
Required File /path/to/file
15+
Factory Service inline factory service (Full\Qualified\FactoryClass)
16+
Factory Method get
17+
----------------- ------------------------------------------------------
1818

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_arguments_3.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<definition class="Full\Qualified\Class3" public="false" synthetic="false" lazy="false" shared="true" abstract="false" autowired="false" autoconfigured="false" file="/path/to/file">
3-
<factory class="Full\Qualified\FactoryClass" method="get"/>
3+
<factory service="inline factory service (Full\Qualified\FactoryClass)" method="get"/>
44
</definition>

0 commit comments

Comments
 (0)
0