diff --git a/Mage/Command/AbstractCommand.php b/Mage/Command/AbstractCommand.php index bc020dc..403b7db 100644 --- a/Mage/Command/AbstractCommand.php +++ b/Mage/Command/AbstractCommand.php @@ -86,20 +86,19 @@ abstract class AbstractCommand if (!empty($this->helpMessage)) { $output .= "\n"; - $output .= $this->helpMessage . "\n"; + $output .= "{$this->helpMessage}\n"; } if (!empty($this->syntaxMessage)) { $output .= "\n"; - $output .= "Syntax:\n"; - $output .= $indent; - $output .= $this->syntaxMessage; + $output .= "Syntax:\n"; + $output .= "$indent{$this->syntaxMessage}"; $output .= "\n"; } if (!empty($this->usageExamples)) { $output .= "\n"; - $output .= "Usage examples:\n"; + $output .= "Usage examples:\n"; foreach ($this->usageExamples as $example) { $snippet = $example[0]; $description = $example[1]; @@ -110,7 +109,7 @@ abstract class AbstractCommand $output .= "\n$indent$indent"; } - $output .= $snippet; + $output .= "$snippet"; $output .= "\n"; } } diff --git a/tests/MageTest/Command/AbstractCommandTest.php b/tests/MageTest/Command/AbstractCommandTest.php index 22a73f6..ebf5af7 100644 --- a/tests/MageTest/Command/AbstractCommandTest.php +++ b/tests/MageTest/Command/AbstractCommandTest.php @@ -62,16 +62,16 @@ class AbstractCommandTest extends BaseTest ], 'syntax' => 'mage example [light]', 'output' => "\n" - . "This command does everything you want to\n" + . "This command does everything you want to\n" . "\n" - . "Syntax:\n" - . " mage example [light]\n" + . "Syntax:\n" + . " mage example [light]\n" . "\n" - . "Usage examples:\n" + . "Usage examples:\n" . " * Default command:\n" - . " mage example\n" + . " mage example\n" . " * Runs the command with lights:\n" - . " mage example light\n" + . " mage example light\n" ], 'no_help_message' => [ 'helpMessage' => '', @@ -87,24 +87,24 @@ class AbstractCommandTest extends BaseTest ], 'syntax' => 'mage example [light]', 'output' => "\n" - . "Syntax:\n" - . " mage example [light]\n" + . "Syntax:\n" + . " mage example [light]\n" . "\n" - . "Usage examples:\n" + . "Usage examples:\n" . " * Default command:\n" - . " mage example\n" + . " mage example\n" . " * Runs the command with lights:\n" - . " mage example light\n" + . " mage example light\n" ], 'no_examples' => [ 'helpMessage' => 'This command does everything you want to', 'examples' => [], 'syntax' => 'mage example [light]', 'output' => "\n" - . "This command does everything you want to\n" + . "This command does everything you want to\n" . "\n" - . "Syntax:\n" - . " mage example [light]\n" + . "Syntax:\n" + . " mage example [light]\n" ], "no_syntax" => [ 'helpMessage' => 'This command does everything you want to', @@ -120,13 +120,13 @@ class AbstractCommandTest extends BaseTest ], 'syntax' => '', 'output' => "\n" - . "This command does everything you want to\n" + . "This command does everything you want to\n" . "\n" - . "Usage examples:\n" + . "Usage examples:\n" . " * Default command:\n" - . " mage example\n" + . " mage example\n" . " * Runs the command with lights:\n" - . " mage example light\n" + . " mage example light\n" ], "stripping_colons" => [ 'helpMessage' => 'This command does everything you want to', @@ -142,23 +142,23 @@ class AbstractCommandTest extends BaseTest ], 'syntax' => 'mage example [light]', 'output' => "\n" - . "This command does everything you want to\n" + . "This command does everything you want to\n" . "\n" - . "Syntax:\n" - . " mage example [light]\n" + . "Syntax:\n" + . " mage example [light]\n" . "\n" - . "Usage examples:\n" + . "Usage examples:\n" . " * Default command:\n" - . " mage example\n" + . " mage example\n" . " * Runs the command with lights:\n" - . " mage example light\n" + . " mage example light\n" ], "only_help" => [ 'helpMessage' => 'This command does everything you want to', 'examples' => [], 'syntax' => '', 'output' => "\n" - . "This command does everything you want to\n" + . "This command does everything you want to\n" ], "only_examples" => [ 'helpMessage' => '', @@ -174,19 +174,19 @@ class AbstractCommandTest extends BaseTest ], 'syntax' => '', 'output' => "\n" - . "Usage examples:\n" + . "Usage examples:\n" . " * Default command:\n" - . " mage example\n" + . " mage example\n" . " * Runs the command with lights:\n" - . " mage example light\n" + . " mage example light\n" ], "only_syntax" => [ 'helpMessage' => '', 'examples' => [], 'syntax' => 'mage example [light]', 'output' => "\n" - . "Syntax:\n" - . " mage example [light]\n" + . "Syntax:\n" + . " mage example [light]\n" ] ]; }