From 7958227d8b3b7393ef9bfd3cef553a6b1e912ab7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois-Xavier=20de=20Guillebon?= <deguif@gmail.com>
Date: Wed, 4 Sep 2013 16:39:19 +0200
Subject: [PATCH] [Console] Improved xml generated when listing commands

---
 .../Component/Console/Descriptor/XmlDescriptor.php     | 10 +++++++++-
 .../Component/Console/Tests/Fixtures/application_1.xml |  4 ++--
 .../Component/Console/Tests/Fixtures/application_2.xml |  4 ++--
 .../Console/Tests/Fixtures/application_asxml1.txt      |  4 ++--
 .../Console/Tests/Fixtures/application_asxml2.txt      |  4 ++--
 5 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/Symfony/Component/Console/Descriptor/XmlDescriptor.php b/src/Symfony/Component/Console/Descriptor/XmlDescriptor.php
index 8310ee8087..95cb9b0041 100644
--- a/src/Symfony/Component/Console/Descriptor/XmlDescriptor.php
+++ b/src/Symfony/Component/Console/Descriptor/XmlDescriptor.php
@@ -93,7 +93,15 @@ class XmlDescriptor extends Descriptor
     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);
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_1.xml b/src/Symfony/Component/Console/Tests/Fixtures/application_1.xml
index bfe5de0095..68630d07cc 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 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<symfony>
+<application>
   <commands>
     <command id="help" name="help">
       <usage>help [--xml] [--format="..."] [--raw] [command_name]</usage>
@@ -105,4 +105,4 @@
       <command>list</command>
     </namespace>
   </namespaces>
-</symfony>
+</application>
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_2.xml b/src/Symfony/Component/Console/Tests/Fixtures/application_2.xml
index f28ab507e9..e263b9c4fd 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 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<symfony>
+<application name="My Symfony application" version="v1.0">
   <commands>
     <command id="help" name="help">
       <usage>help [--xml] [--format="..."] [--raw] [command_name]</usage>
@@ -182,4 +182,4 @@
       <command>descriptor:command2</command>
     </namespace>
   </namespaces>
-</symfony>
+</application>
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_asxml1.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_asxml1.txt
index 94a68638f5..792ebdc840 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 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<symfony>
+<application>
   <commands>
     <command id="help" name="help">
   <usage>help [--xml] [--format="..."] [--raw] [command_name]</usage>
@@ -141,4 +141,4 @@
       <command>foo:bar</command>
     </namespace>
   </namespaces>
-</symfony>
+</application>
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_asxml2.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_asxml2.txt
index 5d61d2a812..76fb587187 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 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<symfony>
+<application>
   <commands namespace="foo">
     <command id="foo:bar" name="foo:bar">
   <usage>foo:bar</usage>
@@ -34,4 +34,4 @@
     </options>
 </command>
   </commands>
-</symfony>
+</application>