Permalink
Browse files

Merge branch 'cli-improvements' of git://github.com/dshafik/lithium i…

…nto dshafik
  • Loading branch information...
2 parents ebcbb06 + ed45e5c commit 49f569238b6f51d51f4f3d2880ed681d77e2cfb5 @nateabele nateabele committed Sep 13, 2012
Showing with 6 additions and 5 deletions.
  1. +2 −2 console/Command.php
  2. +2 −1 console/Response.php
  3. +2 −2 console/command/Help.php
View
4 console/Command.php
@@ -247,7 +247,7 @@ public function in($prompt = null, array $options = array()) {
*
* {{{
* -------
- * Lihtium
+ * Lithium
* -------
* }}}
*
@@ -420,4 +420,4 @@ protected function _response($type, $string, $options) {
}
}
-?>
+?>
View
3 console/Response.php
@@ -124,7 +124,8 @@ public function styles($styles = array()) {
'option' => "\033[0;35m",
'command' => "\033[0;35m",
'error' => "\033[0;31m",
- 'success' => "\033[0;32m"
+ 'success' => "\033[0;32m",
+ 'bold' => "\033[1m",
);
if ($styles === false) {
return array_combine(array_keys($defaults), array_pad(array(), count($defaults), null));
View
4 console/command/Help.php
@@ -163,7 +163,7 @@ protected function _methods($class, $options = array()) {
$comment = Docblock::comment($method['docComment']);
$name = $method['name'];
- $description = $comment['description'];
+ $description = trim($comment['description'] . PHP_EOL . $comment['text']);
$args = $method['args'];
$return = null;
@@ -321,4 +321,4 @@ protected function _pad($message, $level = 1) {
}
}
-?>
+?>

0 comments on commit 49f5692

Please sign in to comment.