From 734fec146d0291725a83112afa946cb900a645b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois-Xavier=20de=20Guillebon?= Date: Wed, 4 Sep 2013 16:39:19 +0200 Subject: [PATCH 1/2] Renamed symfony node on list --xml command to current application name and added application version --- .../Component/Console/Descriptor/XmlDescriptor.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Component/Console/Descriptor/XmlDescriptor.php b/src/Symfony/Component/Console/Descriptor/XmlDescriptor.php index 8310ee8087e03..95cb9b0041091 100644 --- a/src/Symfony/Component/Console/Descriptor/XmlDescriptor.php +++ b/src/Symfony/Component/Console/Descriptor/XmlDescriptor.php @@ -93,7 +93,15 @@ public function getCommandDocument(Command $command) public function getApplicationDocument(Application $application, $namespace = null) { $dom = new \DOMDocument('1.0', 'UTF-8'); - $dom->appendChild($rootXml = $dom->createElement('symfony')); + $dom->appendChild($rootXml = $dom->createElement('application')); + + if ($application->getName() !== 'UNKNOWN') { + $rootXml->setAttribute('name', $application->getName()); + if ($application->getVersion() !== 'UNKNOWN') { + $rootXml->setAttribute('version', $application->getVersion()); + } + } + $rootXml->appendChild($commandsXML = $dom->createElement('commands')); $description = new ApplicationDescription($application, $namespace); From e8ec093f561e726b6254093343426d851e052f6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois-Xavier=20de=20Guillebon?= Date: Wed, 4 Sep 2013 16:39:39 +0200 Subject: [PATCH 2/2] Fixed tests --- .../Component/Console/Tests/Fixtures/application_1.xml | 4 ++-- .../Component/Console/Tests/Fixtures/application_2.xml | 4 ++-- .../Component/Console/Tests/Fixtures/application_asxml1.txt | 4 ++-- .../Component/Console/Tests/Fixtures/application_asxml2.txt | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_1.xml b/src/Symfony/Component/Console/Tests/Fixtures/application_1.xml index bfe5de0095c4b..68630d07ccfc7 100644 --- a/src/Symfony/Component/Console/Tests/Fixtures/application_1.xml +++ b/src/Symfony/Component/Console/Tests/Fixtures/application_1.xml @@ -1,5 +1,5 @@ - + help [--xml] [--format="..."] [--raw] [command_name] @@ -105,4 +105,4 @@ list - + diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_2.xml b/src/Symfony/Component/Console/Tests/Fixtures/application_2.xml index f28ab507e9119..e263b9c4fdaad 100644 --- a/src/Symfony/Component/Console/Tests/Fixtures/application_2.xml +++ b/src/Symfony/Component/Console/Tests/Fixtures/application_2.xml @@ -1,5 +1,5 @@ - + help [--xml] [--format="..."] [--raw] [command_name] @@ -182,4 +182,4 @@ descriptor:command2 - + diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_asxml1.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_asxml1.txt index 94a68638f56a6..792ebdc840e67 100644 --- a/src/Symfony/Component/Console/Tests/Fixtures/application_asxml1.txt +++ b/src/Symfony/Component/Console/Tests/Fixtures/application_asxml1.txt @@ -1,5 +1,5 @@ - + help [--xml] [--format="..."] [--raw] [command_name] @@ -141,4 +141,4 @@ foo:bar - + diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_asxml2.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_asxml2.txt index 5d61d2a81287d..76fb58718796b 100644 --- a/src/Symfony/Component/Console/Tests/Fixtures/application_asxml2.txt +++ b/src/Symfony/Component/Console/Tests/Fixtures/application_asxml2.txt @@ -1,5 +1,5 @@ - + foo:bar @@ -34,4 +34,4 @@ - +