Skip to content

[FrameworkBundle] tweak the factory class description for inlined factory services #47469

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 2, 2022
Merged

[FrameworkBundle] tweak the factory class description for inlined factory services #47469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ private function getContainerDefinitionData(Definition $definition, bool $omitTa
if ($factory[0] instanceof Reference) {
$data['factory_service'] = (string) $factory[0];
} elseif ($factory[0] instanceof Definition) {
$data['factory_class'] = $factory[0]->getClass() ?? 'not configured';
$data['factory_service'] = sprintf('inline factory service (%s)', $factory[0]->getClass() ?? 'class not configured');
} else {
$data['factory_class'] = $factory[0];
}
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ protected function describeContainerDefinition(Definition $definition, array $op
if ($factory[0] instanceof Reference) {
$output .= "\n".'- Factory Service: `'.$factory[0].'`';
} elseif ($factory[0] instanceof Definition) {
$output .= "\n".'- Factory Class: `'.($factory[0]->getClass() ?? 'not configured').'`';
$output .= "\n".sprintf('- Factory Service: inline factory service (%s)', $factory[0]->getClass() ? sprintf('`%s`', $factory[0]->getClass()) : 'not configured');
} else {
$output .= "\n".'- Factory Class: `'.$factory[0].'`';
}
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ protected function describeContainerDefinition(Definition $definition, array $op
if ($factory[0] instanceof Reference) {
$tableRows[] = ['Factory Service', $factory[0]];
} elseif ($factory[0] instanceof Definition) {
$tableRows[] = ['Factory Class', $factory[0]->getClass() ?? 'not configured'];
$tableRows[] = ['Factory Service', sprintf('inline factory service (%s)', $factory[0]->getClass() ?? 'class not configured')];
} else {
$tableRows[] = ['Factory Class', $factory[0]];
}
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ private function getContainerDefinitionDocument(Definition $definition, string $
if ($factory[0] instanceof Reference) {
$factoryXML->setAttribute('service', (string) $factory[0]);
} elseif ($factory[0] instanceof Definition) {
$factoryXML->setAttribute('class', $factory[0]->getClass() ?? 'not configured');
$factoryXML->setAttribute('service', sprintf('inline factory service (%s)', $factory[0]->getClass() ?? 'not configured'));
} else {
$factoryXML->setAttribute('class', $factory[0]);
}
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"autowire": false,
"autoconfigure": false,
"file": "\/path\/to\/file",
"factory_class": "Full\\Qualified\\FactoryClass",
"factory_service": "inline factory service (Full\\Qualified\\FactoryClass)",
"factory_method": "get",
"tags": []
}
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Definitions
- Autowired: no
- Autoconfigured: no
- File: `/path/to/file`
- Factory Class: `Full\Qualified\FactoryClass`
- Factory Service: inline factory service (`Full\Qualified\FactoryClass`)
- Factory Method: `get`


Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@
</tags>
</definition>
<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">
<factory class="Full\Qualified\FactoryClass" method="get"/>
<factory service="inline factory service (Full\Qualified\FactoryClass)" method="get"/>
</definition>
</container>
2 changes: 1 addition & 1 deletion src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"autowire": false,
"autoconfigure": false,
"file": "\/path\/to\/file",
"factory_class": "Full\\Qualified\\FactoryClass",
"factory_service": "inline factory service (Full\\Qualified\\FactoryClass)",
"factory_method": "get",
"tags": []
}
2 changes: 1 addition & 1 deletion src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_3.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
- Autowired: no
- Autoconfigured: no
- File: `/path/to/file`
- Factory Class: `Full\Qualified\FactoryClass`
- Factory Service: inline factory service (`Full\Qualified\FactoryClass`)
- Factory Method: `get`
34 changes: 17 additions & 17 deletions src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_3.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
---------------- -----------------------------
 Option   Value 
---------------- -----------------------------
Service ID -
Class Full\Qualified\Class3
Tags -
Public no
Synthetic no
Lazy no
Shared yes
Abstract no
Autowired no
Autoconfigured no
Required File /path/to/file
Factory Class Full\Qualified\FactoryClass
Factory Method get
---------------- -----------------------------
----------------- ------------------------------------------------------
 Option   Value 
----------------- ------------------------------------------------------
Service ID -
Class Full\Qualified\Class3
Tags -
Public no
Synthetic no
Lazy no
Shared yes
Abstract no
Autowired no
Autoconfigured no
Required File /path/to/file
Factory Service inline factory service (Full\Qualified\FactoryClass)
Factory Method get
----------------- ------------------------------------------------------

2 changes: 1 addition & 1 deletion src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_3.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<definition class="Full\Qualified\Class3" public="false" synthetic="false" lazy="false" shared="true" abstract="false" autowired="false" autoconfigured="false" file="/path/to/file">
<factory class="Full\Qualified\FactoryClass" method="get"/>
<factory service="inline factory service (Full\Qualified\FactoryClass)" method="get"/>
</definition>
2 changes: 1 addition & 1 deletion src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_arguments_3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"autoconfigure": false,
"arguments": [],
"file": "\/path\/to\/file",
"factory_class": "Full\\Qualified\\FactoryClass",
"factory_service": "inline factory service (Full\\Qualified\\FactoryClass)",
"factory_method": "get",
"tags": []
}
2 changes: 1 addition & 1 deletion ...fony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_arguments_3.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
- Autoconfigured: no
- Arguments: no
- File: `/path/to/file`
- Factory Class: `Full\Qualified\FactoryClass`
- Factory Service: inline factory service (`Full\Qualified\FactoryClass`)
- Factory Method: `get`
34 changes: 17 additions & 17 deletions src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_arguments_3.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
---------------- -----------------------------
 Option   Value 
---------------- -----------------------------
Service ID -
Class Full\Qualified\Class3
Tags -
Public no
Synthetic no
Lazy no
Shared yes
Abstract no
Autowired no
Autoconfigured no
Required File /path/to/file
Factory Class Full\Qualified\FactoryClass
Factory Method get
---------------- -----------------------------
----------------- ------------------------------------------------------
 Option   Value 
----------------- ------------------------------------------------------
Service ID -
Class Full\Qualified\Class3
Tags -
Public no
Synthetic no
Lazy no
Shared yes
Abstract no
Autowired no
Autoconfigured no
Required File /path/to/file
Factory Service inline factory service (Full\Qualified\FactoryClass)
Factory Method get
----------------- ------------------------------------------------------

2 changes: 1 addition & 1 deletion src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_arguments_3.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<definition class="Full\Qualified\Class3" public="false" synthetic="false" lazy="false" shared="true" abstract="false" autowired="false" autoconfigured="false" file="/path/to/file">
<factory class="Full\Qualified\FactoryClass" method="get"/>
<factory service="inline factory service (Full\Qualified\FactoryClass)" method="get"/>
</definition>