From 9c3b9108491d1fc5c1c5055f98da9ae3b5e2e9a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= Date: Tue, 3 Nov 2015 15:44:08 -0800 Subject: [PATCH] [FrameworkBundle] Autowiring support for debug:container --- .../Console/Descriptor/JsonDescriptor.php | 10 ++++++ .../Console/Descriptor/MarkdownDescriptor.php | 8 +++++ .../Console/Descriptor/TextDescriptor.php | 13 +++++++ .../Console/Descriptor/XmlDescriptor.php | 5 +++ .../Fixtures/Descriptor/builder_1_public.json | 4 ++- .../Fixtures/Descriptor/builder_1_public.md | 1 + .../Fixtures/Descriptor/builder_1_public.xml | 2 +- .../Descriptor/builder_1_services.json | 8 +++-- .../Fixtures/Descriptor/builder_1_services.md | 2 ++ .../Descriptor/builder_1_services.xml | 4 +-- .../Fixtures/Descriptor/builder_1_tag1.json | 4 ++- .../Fixtures/Descriptor/builder_1_tag1.md | 1 + .../Fixtures/Descriptor/builder_1_tag1.xml | 2 +- .../Fixtures/Descriptor/builder_1_tags.json | 8 +++-- .../Fixtures/Descriptor/builder_1_tags.md | 2 ++ .../Fixtures/Descriptor/builder_1_tags.xml | 4 +-- .../Fixtures/Descriptor/definition_1.json | 4 ++- .../Tests/Fixtures/Descriptor/definition_1.md | 1 + .../Fixtures/Descriptor/definition_1.txt | 32 +++++++++-------- .../Fixtures/Descriptor/definition_1.xml | 2 +- .../Fixtures/Descriptor/definition_2.json | 4 ++- .../Tests/Fixtures/Descriptor/definition_2.md | 1 + .../Fixtures/Descriptor/definition_2.txt | 34 ++++++++++--------- .../Fixtures/Descriptor/definition_2.xml | 2 +- ...acy_synchronized_service_definition_1.json | 4 ++- ...egacy_synchronized_service_definition_1.md | 1 + ...gacy_synchronized_service_definition_1.txt | 32 +++++++++-------- ...gacy_synchronized_service_definition_1.xml | 2 +- ...acy_synchronized_service_definition_2.json | 4 ++- ...egacy_synchronized_service_definition_2.md | 1 + ...gacy_synchronized_service_definition_2.txt | 34 ++++++++++--------- ...gacy_synchronized_service_definition_2.xml | 2 +- 32 files changed, 156 insertions(+), 82 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php index eacc4587dc17..8ecdead65a62 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php +++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php @@ -228,6 +228,16 @@ private function getContainerDefinitionData(Definition $definition, $omitTags = } $data['abstract'] = $definition->isAbstract(); + + if (method_exists($definition, 'isAutowired')) { + $data['autowire'] = $definition->isAutowired(); + + $data['autowiring_types'] = array(); + foreach ($definition->getAutowiringTypes() as $autowiringType) { + $data['autowiring_types'][] = $autowiringType; + } + } + $data['file'] = $definition->getFile(); if ($definition->getFactoryClass(false)) { diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php index 34ca282be83c..47e46bc8e123 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php +++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php @@ -195,6 +195,14 @@ protected function describeContainerDefinition(Definition $definition, array $op $output .= "\n".'- Abstract: '.($definition->isAbstract() ? 'yes' : 'no'); + if (method_exists($definition, 'isAutowired')) { + $output .= "\n".'- Autowired: '.($definition->isAutowired() ? 'yes' : 'no'); + + foreach ($definition->getAutowiringTypes() as $autowiringType) { + $output .= "\n".'- Autowiring Type: `'.$autowiringType.'`'; + } + } + if ($definition->getFile()) { $output .= "\n".'- File: `'.$definition->getFile().'`'; } diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php index c9186793afbb..4d72a0a85145 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php +++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php @@ -288,6 +288,19 @@ protected function describeContainerDefinition(Definition $definition, array $op } $tableRows[] = array('Abstract', $definition->isAbstract() ? 'yes' : 'no'); + if (method_exists($definition, 'isAutowired')) { + $tableRows[] = array('Autowired', $definition->isAutowired() ? 'yes' : 'no'); + + $autowiringTypes = $definition->getAutowiringTypes(); + if (count($autowiringTypes)) { + $autowiringTypesInformation = implode(', ', $autowiringTypes); + } else { + $autowiringTypesInformation = '-'; + } + + $tableRows[] = array('Autowiring Types', $autowiringTypesInformation); + } + if ($definition->getFile()) { $tableRows[] = array('Required File', $definition->getFile() ? $definition->getFile() : '-'); } diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php index 7137eca2c40d..62fb688e3c06 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php +++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php @@ -373,6 +373,11 @@ private function getContainerDefinitionDocument(Definition $definition, $id = nu $serviceXML->setAttribute('synchronized', $definition->isSynchronized(false) ? 'true' : 'false'); } $serviceXML->setAttribute('abstract', $definition->isAbstract() ? 'true' : 'false'); + + if (method_exists($definition, 'isAutowired')) { + $serviceXML->setAttribute('autowired', $definition->isAutowired() ? 'true' : 'false'); + } + $serviceXML->setAttribute('file', $definition->getFile()); if (!$omitTags) { diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.json b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.json index 9be35dad0705..83a446d7fd91 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.json +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.json @@ -14,7 +14,9 @@ "factory_method": "get", "tags": [ - ] + ], + "autowire": false, + "autowiring_types": [] } }, "aliases": { diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.md b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.md index de404d24d0f5..1a69d2d30cbf 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.md +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.md @@ -15,6 +15,7 @@ definition_1 - Shared: yes - Synchronized: no - Abstract: yes +- Autowired: no - Factory Class: `Full\Qualified\FactoryClass` - Factory Method: `get` diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.xml index 59a1e85c6bb8..d29265535f4a 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.xml +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.xml @@ -2,7 +2,7 @@ - + diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.json b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.json index c76d13ee4234..d64db5253405 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.json +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.json @@ -14,7 +14,9 @@ "factory_method": "get", "tags": [ - ] + ], + "autowire": false, + "autowiring_types": [] }, "definition_2": { "class": "Full\\Qualified\\Class2", @@ -48,7 +50,9 @@ ] } - ] + ], + "autowire": false, + "autowiring_types": [] } }, "aliases": { diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.md b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.md index 3a3de41c409e..f4599d941b8b 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.md +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.md @@ -15,6 +15,7 @@ definition_1 - Shared: yes - Synchronized: no - Abstract: yes +- Autowired: no - Factory Class: `Full\Qualified\FactoryClass` - Factory Method: `get` @@ -29,6 +30,7 @@ definition_2 - Shared: yes - Synchronized: no - Abstract: no +- Autowired: no - File: `/path/to/file` - Factory Service: `factory.service` - Factory Method: `get` diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.xml index 5ceee2772a99..ae4ad244e4ad 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.xml +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.xml @@ -2,10 +2,10 @@ - + - + diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.json b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.json index 40a3da00963a..333f3ee670c0 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.json +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.json @@ -32,7 +32,9 @@ ] } - ] + ], + "autowire": false, + "autowiring_types": [] } }, "aliases": [ diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.md b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.md index c0d4f11e3326..0dbe5226914e 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.md +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.md @@ -15,6 +15,7 @@ definition_2 - Shared: yes - Synchronized: no - Abstract: no +- Autowired: no - File: `/path/to/file` - Factory Service: `factory.service` - Factory Method: `get` diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.xml index 51bb9c254f54..4ca9bff33a37 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.xml +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.xml @@ -1,6 +1,6 @@ - + diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.json b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.json index 6844d2d18076..b1b1fa81485a 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.json +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.json @@ -11,7 +11,9 @@ "abstract": false, "file": "\/path\/to\/file", "factory_service": "factory.service", - "factory_method": "get" + "factory_method": "get", + "autowire": false, + "autowiring_types": [] } ], "tag2": [ @@ -26,7 +28,9 @@ "abstract": false, "file": "\/path\/to\/file", "factory_service": "factory.service", - "factory_method": "get" + "factory_method": "get", + "autowire": false, + "autowiring_types": [] } ] } diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.md b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.md index 551c9cb24b29..5480cb15d53d 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.md +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.md @@ -15,6 +15,7 @@ definition_2 - Shared: yes - Synchronized: no - Abstract: no +- Autowired: no - File: `/path/to/file` - Factory Service: `factory.service` - Factory Method: `get` @@ -34,6 +35,7 @@ definition_2 - Shared: yes - Synchronized: no - Abstract: no +- Autowired: no - File: `/path/to/file` - Factory Service: `factory.service` - Factory Method: `get` diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.xml index 01f324860885..2bb880306679 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.xml +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.xml @@ -1,12 +1,12 @@ - + - + diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.json b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.json index 92f1300b4bd5..888c5acaf560 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.json +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.json @@ -12,5 +12,7 @@ "factory_method": "get", "tags": [ - ] + ], + "autowire": false, + "autowiring_types": [] } diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.md b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.md index 6c18a6c2bbf8..caee1dc28c7d 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.md +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.md @@ -6,5 +6,6 @@ - Shared: yes - Synchronized: no - Abstract: yes +- Autowired: no - Factory Class: `Full\Qualified\FactoryClass` - Factory Method: `get` diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.txt b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.txt index cd7b8d82fdb4..7ab7df60e9a3 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.txt +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.txt @@ -1,15 +1,17 @@ ----------------- ----------------------------- - Option Value - ---------------- ----------------------------- - Service ID - - Class Full\Qualified\Class1 - Tags - - Scope container - Public yes - Synthetic no - Lazy yes - Synchronized no - Abstract yes - Factory Class Full\Qualified\FactoryClass - Factory Method get - ---------------- ----------------------------- \ No newline at end of file +------------------ ----------------------------- + Option Value + ------------------ ----------------------------- + Service ID - + Class Full\Qualified\Class1 + Tags - + Scope container + Public yes + Synthetic no + Lazy yes + Synchronized no + Abstract yes + Autowired no + Autowiring Types - + Factory Class Full\Qualified\FactoryClass + Factory Method get + ------------------ ----------------------------- \ No newline at end of file diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.xml index ec8a8cefa9e4..1e6a6cadfcd8 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.xml +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.xml @@ -1,4 +1,4 @@ - + diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.json b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.json index 22a094928a48..9886aba3d5c9 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.json +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.json @@ -30,5 +30,7 @@ ] } - ] + ], + "autowire": false, + "autowiring_types": [] } diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.md b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.md index 866858799427..3b426441fd15 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.md +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.md @@ -6,6 +6,7 @@ - Shared: yes - Synchronized: no - Abstract: no +- Autowired: no - File: `/path/to/file` - Factory Service: `factory.service` - Factory Method: `get` diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.txt b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.txt index 02f02535ad56..8211241055c9 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.txt +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.txt @@ -1,16 +1,18 @@ - ----------------- ------------------------------------------------------- - Option Value - ----------------- ------------------------------------------------------- - Service ID - - Class Full\Qualified\Class2 - Tags tag1 (attr1: val1, attr2: val2)tag1 (attr3: val3)tag2 - Scope container - Public no - Synthetic yes - Lazy no - Synchronized no - Abstract no - Required File /path/to/file - Factory Service factory.service - Factory Method get - ----------------- ------------------------------------------------------- +------------------ ------------------------------------------------------- + Option Value + ------------------ ------------------------------------------------------- + Service ID - + Class Full\Qualified\Class2 + Tags tag1 (attr1: val1, attr2: val2)tag1 (attr3: val3)tag2 + Scope container + Public no + Synthetic yes + Lazy no + Synchronized no + Abstract no + Autowired no + Autowiring Types - + Required File /path/to/file + Factory Service factory.service + Factory Method get + ------------------ ------------------------------------------------------- \ No newline at end of file diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.xml index ce9b1d05220c..0689cb6cba3c 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.xml +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.xml @@ -1,5 +1,5 @@ - + diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_1.json b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_1.json index b7a5dec87df7..59036bce0d6e 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_1.json +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_1.json @@ -12,5 +12,7 @@ "factory_method": "get", "tags": [ - ] + ], + "autowire": false, + "autowiring_types": [] } diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_1.md b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_1.md index f527ab9ff874..76671ff4fed8 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_1.md +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_1.md @@ -6,5 +6,6 @@ - Shared: yes - Synchronized: yes - Abstract: yes +- Autowired: no - Factory Class: `Full\Qualified\FactoryClass` - Factory Method: `get` diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_1.txt b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_1.txt index 70062016ffb3..6ccc8d9fe682 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_1.txt +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_1.txt @@ -1,15 +1,17 @@ ----------------- ----------------------------- - Option Value - ---------------- ----------------------------- - Service ID - - Class Full\Qualified\Class1 - Tags - - Scope container - Public yes - Synthetic no - Lazy yes - Synchronized yes - Abstract yes - Factory Class Full\Qualified\FactoryClass - Factory Method get - ---------------- ----------------------------- \ No newline at end of file +------------------ ----------------------------- + Option Value + ------------------ ----------------------------- + Service ID - + Class Full\Qualified\Class1 + Tags - + Scope container + Public yes + Synthetic no + Lazy yes + Synchronized yes + Abstract yes + Autowired no + Autowiring Types - + Factory Class Full\Qualified\FactoryClass + Factory Method get + ------------------ ----------------------------- \ No newline at end of file diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_1.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_1.xml index 6088d9a21b5a..cfedcaade90e 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_1.xml +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_1.xml @@ -1,2 +1,2 @@ - + diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_2.json b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_2.json index bb0f5685f36a..d2ece6baa3a5 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_2.json +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_2.json @@ -30,5 +30,7 @@ ] } - ] + ], + "autowire": false, + "autowiring_types": [] } diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_2.md b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_2.md index 43227638d88a..7730f9e7daa8 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_2.md +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_2.md @@ -6,6 +6,7 @@ - Shared: yes - Synchronized: no - Abstract: no +- Autowired: no - File: `/path/to/file` - Factory Service: `factory.service` - Factory Method: `get` diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_2.txt b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_2.txt index d87deef4164b..8211241055c9 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_2.txt +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_2.txt @@ -1,16 +1,18 @@ ------------------ ------------------------------------------------------- - Option Value - ----------------- ------------------------------------------------------- - Service ID - - Class Full\Qualified\Class2 - Tags tag1 (attr1: val1, attr2: val2)tag1 (attr3: val3)tag2 - Scope container - Public no - Synthetic yes - Lazy no - Synchronized no - Abstract no - Required File /path/to/file - Factory Service factory.service - Factory Method get - ----------------- ------------------------------------------------------- \ No newline at end of file +------------------ ------------------------------------------------------- + Option Value + ------------------ ------------------------------------------------------- + Service ID - + Class Full\Qualified\Class2 + Tags tag1 (attr1: val1, attr2: val2)tag1 (attr3: val3)tag2 + Scope container + Public no + Synthetic yes + Lazy no + Synchronized no + Abstract no + Autowired no + Autowiring Types - + Required File /path/to/file + Factory Service factory.service + Factory Method get + ------------------ ------------------------------------------------------- \ No newline at end of file diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_2.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_2.xml index 7a2154487d1e..1f6b7a23767a 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_2.xml +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_2.xml @@ -1,5 +1,5 @@ - + val1