Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 4afa6c5

Browse files
94noni94noni
committed
[FrameworkBundle] Add service deprecation on debug:container command output
1 parent 18809d8 commit 4afa6c5

File tree

66 files changed

+98
-29
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+98
-29
lines changed

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

+1
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,7 @@ private function getContainerDefinitionData(Definition $definition, bool $omitTa
228228
'abstract' => $definition->isAbstract(),
229229
'autowire' => $definition->isAutowired(),
230230
'autoconfigure' => $definition->isAutoconfigured(),
231+
'deprecated' => $definition->isDeprecated(),
231232
];
232233

233234
if ('' !== $classDescription = $this->getClassDescription((string) $definition->getClass())) {

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

+1
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,7 @@ protected function describeContainerDefinition(Definition $definition, array $op
209209
."\n".'- Abstract: '.($definition->isAbstract() ? 'yes' : 'no')
210210
."\n".'- Autowired: '.($definition->isAutowired() ? 'yes' : 'no')
211211
."\n".'- Autoconfigured: '.($definition->isAutoconfigured() ? 'yes' : 'no')
212+
."\n".'- Deprecated: '.($definition->isDeprecated() ? 'yes' : 'no')
212213
;
213214

214215
if (isset($options['show_arguments']) && $options['show_arguments']) {

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

+1
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,7 @@ protected function describeContainerDefinition(Definition $definition, array $op
305305
$tableRows[] = ['Abstract', $definition->isAbstract() ? 'yes' : 'no'];
306306
$tableRows[] = ['Autowired', $definition->isAutowired() ? 'yes' : 'no'];
307307
$tableRows[] = ['Autoconfigured', $definition->isAutoconfigured() ? 'yes' : 'no'];
308+
$tableRows[] = ['Deprecated', $definition->isDeprecated() ? 'yes' : 'no'];
308309

309310
if ($definition->getFile()) {
310311
$tableRows[] = ['Required File', $definition->getFile() ?: '-'];

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

+1
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,7 @@ private function getContainerDefinitionDocument(Definition $definition, string $
341341
$serviceXML->setAttribute('abstract', $definition->isAbstract() ? 'true' : 'false');
342342
$serviceXML->setAttribute('autowired', $definition->isAutowired() ? 'true' : 'false');
343343
$serviceXML->setAttribute('autoconfigured', $definition->isAutoconfigured() ? 'true' : 'false');
344+
$serviceXML->setAttribute('deprecated', $definition->isDeprecated() ? 'true' : 'false');
344345
$serviceXML->setAttribute('file', $definition->getFile() ?? '');
345346

346347
$calls = $definition->getMethodCalls();

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

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"abstract": true,
1313
"autowire": false,
1414
"autoconfigure": false,
15+
"deprecated": false,
1516
"file": null,
1617
"factory_class": "Full\\Qualified\\FactoryClass",
1718
"factory_method": "get",

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

+1
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,6 @@
1313
- Abstract: yes
1414
- Autowired: no
1515
- Autoconfigured: no
16+
- Deprecated: no
1617
- Factory Class: `Full\Qualified\FactoryClass`
1718
- Factory Method: `get`

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

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
Abstract yes
1717
Autowired no
1818
Autoconfigured no
19+
Deprecated no
1920
Factory Class Full\Qualified\FactoryClass
2021
Factory Method get
2122
---------------- -----------------------------

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<alias id="alias_1" service="service_1" public="true"/>
3-
<definition id="service_1" class="Full\Qualified\Class1" public="true" synthetic="false" lazy="true" shared="true" abstract="true" autowired="false" autoconfigured="false" file="">
3+
<definition id="service_1" class="Full\Qualified\Class1" public="true" synthetic="false" lazy="true" shared="true" abstract="true" autowired="false" autoconfigured="false" deprecated="false" file="">
44
<factory class="Full\Qualified\FactoryClass" method="get"/>
55
</definition>

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

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"abstract": false,
1313
"autowire": false,
1414
"autoconfigure": false,
15+
"deprecated": false,
1516
"file": "\/path\/to\/file",
1617
"factory_service": "factory.service",
1718
"factory_method": "get",

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

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
- Abstract: no
1414
- Autowired: no
1515
- Autoconfigured: no
16+
- Deprecated: no
1617
- File: `/path/to/file`
1718
- Factory Service: `factory.service`
1819
- Factory Method: `get`

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

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
Abstract no
2020
Autowired no
2121
Autoconfigured no
22+
Deprecated no
2223
Required File /path/to/file
2324
Factory Service factory.service
2425
Factory Method get

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<alias id=".alias_2" service=".service_2" public="false"/>
3-
<definition id=".service_2" class="Full\Qualified\Class2" public="false" synthetic="true" lazy="false" shared="true" abstract="false" autowired="false" autoconfigured="false" file="/path/to/file">
3+
<definition id=".service_2" class="Full\Qualified\Class2" public="false" synthetic="true" lazy="false" shared="true" abstract="false" autowired="false" autoconfigured="false" deprecated="false" file="/path/to/file">
44
<factory service="factory.service" method="get"/>
55
<calls>
66
<call method="setMailer"/>

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

+5
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"abstract": true,
1010
"autowire": false,
1111
"autoconfigure": false,
12+
"deprecated": false,
1213
"arguments": [
1314
{
1415
"type": "service",
@@ -24,6 +25,7 @@
2425
"abstract": false,
2526
"autowire": false,
2627
"autoconfigure": false,
28+
"deprecated": false,
2729
"arguments": [
2830
"arg1",
2931
"arg2"
@@ -46,6 +48,7 @@
4648
"abstract": false,
4749
"autowire": false,
4850
"autoconfigure": false,
51+
"deprecated": false,
4952
"arguments": [],
5053
"file": null,
5154
"tags": []
@@ -80,6 +83,7 @@
8083
"abstract": false,
8184
"autowire": false,
8285
"autoconfigure": false,
86+
"deprecated": false,
8387
"arguments": [],
8488
"file": null,
8589
"tags": []
@@ -93,6 +97,7 @@
9397
"abstract": false,
9498
"autowire": false,
9599
"autoconfigure": false,
100+
"deprecated": false,
96101
"description": "ContainerInterface is the interface implemented by service container classes.",
97102
"arguments": [],
98103
"file": null,

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

+3
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ Definitions
1414
- Abstract: yes
1515
- Autowired: no
1616
- Autoconfigured: no
17+
- Deprecated: no
1718
- Arguments: yes
1819
- Factory Class: `Full\Qualified\FactoryClass`
1920
- Factory Method: `get`
@@ -28,6 +29,7 @@ Definitions
2829
- Abstract: no
2930
- Autowired: no
3031
- Autoconfigured: no
32+
- Deprecated: no
3133
- Arguments: no
3234

3335
### service_container
@@ -41,6 +43,7 @@ Definitions
4143
- Abstract: no
4244
- Autowired: no
4345
- Autoconfigured: no
46+
- Deprecated: no
4447
- Arguments: no
4548

4649

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<container>
33
<alias id="alias_1" service="service_1" public="true"/>
4-
<definition id="definition_1" class="Full\Qualified\Class1" public="true" synthetic="false" lazy="true" shared="true" abstract="true" autowired="false" autoconfigured="false" file="">
4+
<definition id="definition_1" class="Full\Qualified\Class1" public="true" synthetic="false" lazy="true" shared="true" abstract="true" autowired="false" autoconfigured="false" deprecated="false" file="">
55
<factory class="Full\Qualified\FactoryClass" method="get"/>
66
<argument type="service" id=".definition_2"/>
77
<argument>%parameter%</argument>
88
<argument>
9-
<definition class="inline_service" public="false" synthetic="false" lazy="false" shared="true" abstract="false" autowired="false" autoconfigured="false" file="">
9+
<definition class="inline_service" public="false" synthetic="false" lazy="false" shared="true" abstract="false" autowired="false" autoconfigured="false" deprecated="false" file="">
1010
<argument>arg1</argument>
1111
<argument>arg2</argument>
1212
</definition>
@@ -15,7 +15,7 @@
1515
<argument>foo</argument>
1616
<argument type="service" id=".definition_2"/>
1717
<argument>
18-
<definition class="inline_service" public="false" synthetic="false" lazy="false" shared="true" abstract="false" autowired="false" autoconfigured="false" file=""/>
18+
<definition class="inline_service" public="false" synthetic="false" lazy="false" shared="true" abstract="false" autowired="false" autoconfigured="false" deprecated="false" file=""/>
1919
</argument>
2020
</argument>
2121
<argument type="iterator">
@@ -24,8 +24,8 @@
2424
</argument>
2525
<argument type="abstract">placeholder</argument>
2626
</definition>
27-
<definition id="definition_without_class" class="" public="false" synthetic="false" lazy="false" shared="true" abstract="false" autowired="false" autoconfigured="false" file=""/>
28-
<definition id="service_container" class="Symfony\Component\DependencyInjection\ContainerInterface" public="true" synthetic="true" lazy="false" shared="true" abstract="false" autowired="false" autoconfigured="false" file="">
27+
<definition id="definition_without_class" class="" public="false" synthetic="false" lazy="false" shared="true" abstract="false" autowired="false" autoconfigured="false" deprecated="false" file=""/>
28+
<definition id="service_container" class="Symfony\Component\DependencyInjection\ContainerInterface" public="true" synthetic="true" lazy="false" shared="true" abstract="false" autowired="false" autoconfigured="false" deprecated="false" file="">
2929
<description><![CDATA[ContainerInterface is the interface implemented by service container classes.]]></description>
3030
</definition>
3131
</container>

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

+3
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"abstract": true,
1010
"autowire": false,
1111
"autoconfigure": false,
12+
"deprecated": false,
1213
"file": null,
1314
"factory_class": "Full\\Qualified\\FactoryClass",
1415
"factory_method": "get",
@@ -23,6 +24,7 @@
2324
"abstract": false,
2425
"autowire": false,
2526
"autoconfigure": false,
27+
"deprecated": false,
2628
"file": null,
2729
"tags": []
2830
},
@@ -35,6 +37,7 @@
3537
"abstract": false,
3638
"autowire": false,
3739
"autoconfigure": false,
40+
"deprecated": false,
3841
"description": "ContainerInterface is the interface implemented by service container classes.",
3942
"file": null,
4043
"tags": []

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

+3
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ Definitions
1414
- Abstract: yes
1515
- Autowired: no
1616
- Autoconfigured: no
17+
- Deprecated: no
1718
- Factory Class: `Full\Qualified\FactoryClass`
1819
- Factory Method: `get`
1920

@@ -27,6 +28,7 @@ Definitions
2728
- Abstract: no
2829
- Autowired: no
2930
- Autoconfigured: no
31+
- Deprecated: no
3032

3133
### service_container
3234

@@ -39,6 +41,7 @@ Definitions
3941
- Abstract: no
4042
- Autowired: no
4143
- Autoconfigured: no
44+
- Deprecated: no
4245

4346

4447
Aliases

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<container>
33
<alias id="alias_1" service="service_1" public="true"/>
4-
<definition id="definition_1" class="Full\Qualified\Class1" public="true" synthetic="false" lazy="true" shared="true" abstract="true" autowired="false" autoconfigured="false" file="">
4+
<definition id="definition_1" class="Full\Qualified\Class1" public="true" synthetic="false" lazy="true" shared="true" abstract="true" autowired="false" autoconfigured="false" deprecated="false" file="">
55
<factory class="Full\Qualified\FactoryClass" method="get"/>
66
</definition>
7-
<definition id="definition_without_class" class="" public="false" synthetic="false" lazy="false" shared="true" abstract="false" autowired="false" autoconfigured="false" file=""/>
8-
<definition id="service_container" class="Symfony\Component\DependencyInjection\ContainerInterface" public="true" synthetic="true" lazy="false" shared="true" abstract="false" autowired="false" autoconfigured="false" file="">
7+
<definition id="definition_without_class" class="" public="false" synthetic="false" lazy="false" shared="true" abstract="false" autowired="false" autoconfigured="false" deprecated="false" file=""/>
8+
<definition id="service_container" class="Symfony\Component\DependencyInjection\ContainerInterface" public="true" synthetic="true" lazy="false" shared="true" abstract="false" autowired="false" autoconfigured="false" deprecated="false" file="">
99
<description><![CDATA[ContainerInterface is the interface implemented by service container classes.]]></description>
1010
</definition>
1111
</container>

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

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"abstract": false,
1010
"autowire": false,
1111
"autoconfigure": false,
12+
"deprecated": false,
1213
"file": "\/path\/to\/file",
1314
"factory_service": "factory.service",
1415
"factory_method": "get",

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

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ Definitions
1414
- Abstract: no
1515
- Autowired: no
1616
- Autoconfigured: no
17+
- Deprecated: no
1718
- File: `/path/to/file`
1819
- Factory Service: `factory.service`
1920
- Factory Method: `get`

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<container>
33
<alias id=".alias_2" service=".service_2" public="false"/>
4-
<definition id=".definition_2" class="Full\Qualified\Class2" public="false" synthetic="true" lazy="false" shared="true" abstract="false" autowired="false" autoconfigured="false" file="/path/to/file">
4+
<definition id=".definition_2" class="Full\Qualified\Class2" public="false" synthetic="true" lazy="false" shared="true" abstract="false" autowired="false" autoconfigured="false" deprecated="false" file="/path/to/file">
55
<factory service="factory.service" method="get"/>
66
<calls>
77
<call method="setMailer"/>

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

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"abstract": false,
1010
"autowire": false,
1111
"autoconfigure": false,
12+
"deprecated": false,
1213
"file": "\/path\/to\/file",
1314
"factory_service": "factory.service",
1415
"factory_method": "get",

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

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ Definitions
1414
- Abstract: no
1515
- Autowired: no
1616
- Autoconfigured: no
17+
- Deprecated: no
1718
- File: `/path/to/file`
1819
- Factory Service: `factory.service`
1920
- Factory Method: `get`

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<container>
3-
<definition id=".definition_2" class="Full\Qualified\Class2" public="false" synthetic="true" lazy="false" shared="true" abstract="false" autowired="false" autoconfigured="false" file="/path/to/file">
3+
<definition id=".definition_2" class="Full\Qualified\Class2" public="false" synthetic="true" lazy="false" shared="true" abstract="false" autowired="false" autoconfigured="false" deprecated="false" file="/path/to/file">
44
<factory service="factory.service" method="get"/>
55
<calls>
66
<call method="setMailer"/>

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

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"abstract": false,
1010
"autowire": false,
1111
"autoconfigure": false,
12+
"deprecated": false,
1213
"file": "\/path\/to\/file",
1314
"factory_service": "factory.service",
1415
"factory_method": "get",
@@ -27,6 +28,7 @@
2728
"abstract": false,
2829
"autowire": false,
2930
"autoconfigure": false,
31+
"deprecated": false,
3032
"file": "\/path\/to\/file",
3133
"factory_service": "factory.service",
3234
"factory_method": "get",

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

+2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ tag1
1414
- Abstract: no
1515
- Autowired: no
1616
- Autoconfigured: no
17+
- Deprecated: no
1718
- File: `/path/to/file`
1819
- Factory Service: `factory.service`
1920
- Factory Method: `get`
@@ -33,6 +34,7 @@ tag2
3334
- Abstract: no
3435
- Autowired: no
3536
- Autoconfigured: no
37+
- Deprecated: no
3638
- File: `/path/to/file`
3739
- Factory Service: `factory.service`
3840
- Factory Method: `get`

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<container>
33
<tag name="tag1">
4-
<definition id=".definition_2" class="Full\Qualified\Class2" public="false" synthetic="true" lazy="false" shared="true" abstract="false" autowired="false" autoconfigured="false" file="/path/to/file">
4+
<definition id=".definition_2" class="Full\Qualified\Class2" public="false" synthetic="true" lazy="false" shared="true" abstract="false" autowired="false" autoconfigured="false" deprecated="false" file="/path/to/file">
55
<factory service="factory.service" method="get"/>
66
<calls>
77
<call method="setMailer"/>
88
</calls>
99
</definition>
1010
</tag>
1111
<tag name="tag2">
12-
<definition id=".definition_2" class="Full\Qualified\Class2" public="false" synthetic="true" lazy="false" shared="true" abstract="false" autowired="false" autoconfigured="false" file="/path/to/file">
12+
<definition id=".definition_2" class="Full\Qualified\Class2" public="false" synthetic="true" lazy="false" shared="true" abstract="false" autowired="false" autoconfigured="false" deprecated="false" file="/path/to/file">
1313
<factory service="factory.service" method="get"/>
1414
<calls>
1515
<call method="setMailer"/>

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

+4
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"abstract": false,
1010
"autowire": false,
1111
"autoconfigure": false,
12+
"deprecated": false,
1213
"file": "\/path\/to\/file",
1314
"tags": [
1415
{
@@ -37,6 +38,7 @@
3738
"abstract": false,
3839
"autowire": false,
3940
"autoconfigure": false,
41+
"deprecated": false,
4042
"file": "\/path\/to\/file",
4143
"factory_service": "factory.service",
4244
"factory_method": "get",
@@ -72,6 +74,7 @@
7274
"abstract": false,
7375
"autowire": false,
7476
"autoconfigure": false,
77+
"deprecated": false,
7578
"file": "\/path\/to\/file",
7679
"tags": [
7780
{
@@ -91,6 +94,7 @@
9194
"abstract": false,
9295
"autowire": false,
9396
"autoconfigure": false,
97+
"deprecated": false,
9498
"file": "\/path\/to\/file",
9599
"tags": [
96100
{

0 commit comments

Comments
 (0)