diff --git a/lib/Cake/Console/Command/CommandListShell.php b/lib/Cake/Console/Command/CommandListShell.php
index a58602f0d58..2c635a686b7 100644
--- a/lib/Cake/Console/Command/CommandListShell.php
+++ b/lib/Cake/Console/Command/CommandListShell.php
@@ -201,6 +201,7 @@ protected function _asXml($shellList) {
$shell->addAttribute('provider', $source);
$shell->addAttribute('help', $callable . ' -h');
}
+ $this->stdout->outputAs(ConsoleOutput::RAW);
$this->out($shells->saveXml());
}
diff --git a/lib/Cake/Test/Case/Console/Command/CommandListShellTest.php b/lib/Cake/Test/Case/Console/Command/CommandListShellTest.php
index c3bc24305c2..8a27b13aea5 100644
--- a/lib/Cake/Test/Case/Console/Command/CommandListShellTest.php
+++ b/lib/Cake/Test/Case/Console/Command/CommandListShellTest.php
@@ -122,16 +122,16 @@ public function testSortPlugin() {
$output = $this->Shell->stdout->output;
- $expected = "/\[.*App.*\]\n[ ]+sample/";
+ $expected = "/\[.*App.*\]\\v*[ ]+sample/";
$this->assertPattern($expected, $output);
- $expected = "/\[.*TestPluginTwo.*\]\n[ ]+example, welcome/";
+ $expected = "/\[.*TestPluginTwo.*\]\\v*[ ]+example, welcome/";
$this->assertPattern($expected, $output);
- $expected = "/\[.*TestPlugin.*\]\n[ ]+example/";
+ $expected = "/\[.*TestPlugin.*\]\\v*[ ]+example/";
$this->assertPattern($expected, $output);
- $expected = "/\[.*Core.*\]\n[ ]+acl, api, bake, command_list, console, i18n, schema, testsuite/";
+ $expected = "/\[.*Core.*\]\\v*[ ]+acl, api, bake, command_list, console, i18n, schema, testsuite/";
$this->assertPattern($expected, $output);
}
@@ -146,7 +146,7 @@ public function testMainXml() {
$output = $this->Shell->stdout->output;
- $find = '';
+ $find = '';
$this->assertContains($find, $output);
$find = '';