Merge branch '2.7' into 2.8

* 2.7: [Console] Fix whitespaces in fixture
symfony · Sep 19, 2015 · b1e0bd7 · b1e0bd7
2 parents f5d6034 + f64cf23
commit b1e0bd7
Show file tree

Hide file tree

Showing 2 changed files with 137 additions and 137 deletions.
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_asxml1.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_asxml1.txt
@@ -2,11 +2,11 @@
 <symfony>
   <commands>
     <command id="help" name="help">
-    <usages>
-      <usage>help [--xml] [--format FORMAT] [--raw] [--] [&lt;command_name&gt;]</usage>
-    </usages>
-  <description>Displays help for a command</description>
-  <help>The &lt;info&gt;help&lt;/info&gt; command displays help for a given command:
+      <usages>
+        <usage>help [--xml] [--format FORMAT] [--raw] [--] [&lt;command_name&gt;]</usage>
+      </usages>
+      <description>Displays help for a command</description>
+      <help>The &lt;info&gt;help&lt;/info&gt; command displays help for a given command:
 
    &lt;info&gt;php app/console help list&lt;/info&gt;
 
@@ -15,56 +15,56 @@
    &lt;info&gt;php app/console help --format=xml list&lt;/info&gt;
 
  To display the list of available commands, please use the &lt;info&gt;list&lt;/info&gt; command.</help>
-  <arguments>
-    <argument name="command_name" is_required="0" is_array="0">
-      <description>The command name</description>
-      <defaults>
-        <default>help</default>
-      </defaults>
-    </argument>
-  </arguments>
-  <options>
-    <option name="--xml" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
-      <description>To output help as XML</description>
-    </option>
-    <option name="--format" shortcut="" accept_value="1" is_value_required="1" is_multiple="0">
-      <description>The output format (txt, xml, json, or md)</description>
-      <defaults>
-        <default>txt</default>
-      </defaults>
-    </option>
-    <option name="--raw" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
-      <description>To output raw command help</description>
-    </option>
-    <option name="--help" shortcut="-h" accept_value="0" is_value_required="0" is_multiple="0">
-      <description>Display this help message</description>
-    </option>
-    <option name="--quiet" shortcut="-q" accept_value="0" is_value_required="0" is_multiple="0">
-      <description>Do not output any message</description>
-    </option>
-    <option name="--verbose" shortcut="-v" shortcuts="-v|-vv|-vvv" accept_value="0" is_value_required="0" is_multiple="0">
-      <description>Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug</description>
-    </option>
-    <option name="--version" shortcut="-V" accept_value="0" is_value_required="0" is_multiple="0">
-      <description>Display this application version</description>
-    </option>
-    <option name="--ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
-      <description>Force ANSI output</description>
-    </option>
-    <option name="--no-ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
-      <description>Disable ANSI output</description>
-    </option>
-    <option name="--no-interaction" shortcut="-n" accept_value="0" is_value_required="0" is_multiple="0">
-      <description>Do not ask any interactive question</description>
-    </option>
-  </options>
-</command>
+      <arguments>
+        <argument name="command_name" is_required="0" is_array="0">
+          <description>The command name</description>
+          <defaults>
+            <default>help</default>
+          </defaults>
+        </argument>
+      </arguments>
+      <options>
+        <option name="--xml" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>To output help as XML</description>
+        </option>
+        <option name="--format" shortcut="" accept_value="1" is_value_required="1" is_multiple="0">
+          <description>The output format (txt, xml, json, or md)</description>
+          <defaults>
+            <default>txt</default>
+          </defaults>
+        </option>
+        <option name="--raw" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>To output raw command help</description>
+        </option>
+        <option name="--help" shortcut="-h" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Display this help message</description>
+        </option>
+        <option name="--quiet" shortcut="-q" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Do not output any message</description>
+        </option>
+        <option name="--verbose" shortcut="-v" shortcuts="-v|-vv|-vvv" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug</description>
+        </option>
+        <option name="--version" shortcut="-V" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Display this application version</description>
+        </option>
+        <option name="--ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Force ANSI output</description>
+        </option>
+        <option name="--no-ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Disable ANSI output</description>
+        </option>
+        <option name="--no-interaction" shortcut="-n" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Do not ask any interactive question</description>
+        </option>
+      </options>
+    </command>
     <command id="list" name="list">
-    <usages>
-      <usage>list [--xml] [--raw] [--format FORMAT] [--] [&lt;namespace&gt;]</usage>
-    </usages>
-  <description>Lists commands</description>
-  <help>The &lt;info&gt;list&lt;/info&gt; command lists all commands:
+      <usages>
+        <usage>list [--xml] [--raw] [--format FORMAT] [--] [&lt;namespace&gt;]</usage>
+      </usages>
+      <description>Lists commands</description>
+      <help>The &lt;info&gt;list&lt;/info&gt; command lists all commands:
 
    &lt;info&gt;php app/console list&lt;/info&gt;
 
@@ -79,59 +79,59 @@
  It's also possible to get raw list of commands (useful for embedding command runner):
 
    &lt;info&gt;php app/console list --raw&lt;/info&gt;</help>
-  <arguments>
-    <argument name="namespace" is_required="0" is_array="0">
-      <description>The namespace name</description>
-      <defaults/>
-    </argument>
-  </arguments>
-  <options>
-    <option name="--xml" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
-      <description>To output list as XML</description>
-    </option>
-    <option name="--raw" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
-      <description>To output raw command list</description>
-    </option>
-    <option name="--format" shortcut="" accept_value="1" is_value_required="1" is_multiple="0">
-      <description>The output format (txt, xml, json, or md)</description>
-      <defaults>
-        <default>txt</default>
-      </defaults>
-    </option>
-  </options>
-</command>
+      <arguments>
+        <argument name="namespace" is_required="0" is_array="0">
+          <description>The namespace name</description>
+          <defaults/>
+        </argument>
+      </arguments>
+      <options>
+        <option name="--xml" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>To output list as XML</description>
+        </option>
+        <option name="--raw" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>To output raw command list</description>
+        </option>
+        <option name="--format" shortcut="" accept_value="1" is_value_required="1" is_multiple="0">
+          <description>The output format (txt, xml, json, or md)</description>
+          <defaults>
+            <default>txt</default>
+          </defaults>
+        </option>
+      </options>
+    </command>
     <command id="foo:bar" name="foo:bar">
-    <usages>
-      <usage>foo:bar</usage>
-      <usage>afoobar</usage>
-    </usages>
-  <description>The foo:bar command</description>
-  <help>The foo:bar command</help>
-  <arguments/>
-    <options>
-      <option name="--help" shortcut="-h" accept_value="0" is_value_required="0" is_multiple="0">
-        <description>Display this help message</description>
-      </option>
-      <option name="--quiet" shortcut="-q" accept_value="0" is_value_required="0" is_multiple="0">
-        <description>Do not output any message</description>
-      </option>
-      <option name="--verbose" shortcut="-v" shortcuts="-v|-vv|-vvv" accept_value="0" is_value_required="0" is_multiple="0">
-        <description>Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug</description>
-      </option>
-      <option name="--version" shortcut="-V" accept_value="0" is_value_required="0" is_multiple="0">
-        <description>Display this application version</description>
-      </option>
-      <option name="--ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
-        <description>Force ANSI output</description>
-      </option>
-      <option name="--no-ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
-        <description>Disable ANSI output</description>
-      </option>
-      <option name="--no-interaction" shortcut="-n" accept_value="0" is_value_required="0" is_multiple="0">
-        <description>Do not ask any interactive question</description>
-      </option>
-    </options>
-</command>
+      <usages>
+        <usage>foo:bar</usage>
+        <usage>afoobar</usage>
+      </usages>
+      <description>The foo:bar command</description>
+      <help>The foo:bar command</help>
+      <arguments/>
+      <options>
+        <option name="--help" shortcut="-h" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Display this help message</description>
+        </option>
+        <option name="--quiet" shortcut="-q" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Do not output any message</description>
+        </option>
+        <option name="--verbose" shortcut="-v" shortcuts="-v|-vv|-vvv" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug</description>
+        </option>
+        <option name="--version" shortcut="-V" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Display this application version</description>
+        </option>
+        <option name="--ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Force ANSI output</description>
+        </option>
+        <option name="--no-ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Disable ANSI output</description>
+        </option>
+        <option name="--no-interaction" shortcut="-n" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Do not ask any interactive question</description>
+        </option>
+      </options>
+    </command>
   </commands>
   <namespaces>
     <namespace id="_global">

diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_asxml2.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_asxml2.txt
@@ -2,36 +2,36 @@
 <symfony>
   <commands namespace="foo">
     <command id="foo:bar" name="foo:bar">
-    <usages>
-      <usage>foo:bar</usage>
-      <usage>afoobar</usage>
-    </usages>
-  <description>The foo:bar command</description>
-  <help>The foo:bar command</help>
-  <arguments/>
-    <options>
-      <option name="--help" shortcut="-h" accept_value="0" is_value_required="0" is_multiple="0">
-        <description>Display this help message</description>
-      </option>
-      <option name="--quiet" shortcut="-q" accept_value="0" is_value_required="0" is_multiple="0">
-        <description>Do not output any message</description>
-      </option>
-      <option name="--verbose" shortcut="-v" shortcuts="-v|-vv|-vvv" accept_value="0" is_value_required="0" is_multiple="0">
-        <description>Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug</description>
-      </option>
-      <option name="--version" shortcut="-V" accept_value="0" is_value_required="0" is_multiple="0">
-        <description>Display this application version</description>
-      </option>
-      <option name="--ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
-        <description>Force ANSI output</description>
-      </option>
-      <option name="--no-ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
-        <description>Disable ANSI output</description>
-      </option>
-      <option name="--no-interaction" shortcut="-n" accept_value="0" is_value_required="0" is_multiple="0">
-        <description>Do not ask any interactive question</description>
-      </option>
-    </options>
-</command>
+      <usages>
+        <usage>foo:bar</usage>
+        <usage>afoobar</usage>
+      </usages>
+      <description>The foo:bar command</description>
+      <help>The foo:bar command</help>
+      <arguments/>
+      <options>
+        <option name="--help" shortcut="-h" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Display this help message</description>
+        </option>
+        <option name="--quiet" shortcut="-q" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Do not output any message</description>
+        </option>
+        <option name="--verbose" shortcut="-v" shortcuts="-v|-vv|-vvv" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug</description>
+        </option>
+        <option name="--version" shortcut="-V" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Display this application version</description>
+        </option>
+        <option name="--ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Force ANSI output</description>
+        </option>
+        <option name="--no-ansi" shortcut="" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Disable ANSI output</description>
+        </option>
+        <option name="--no-interaction" shortcut="-n" accept_value="0" is_value_required="0" is_multiple="0">
+          <description>Do not ask any interactive question</description>
+        </option>
+      </options>
+    </command>
   </commands>
 </symfony>