Merge branch '2.0' into 2.1
* 2.0: [Console] Fixed comment Conflicts: src/Symfony/Component/Console/Output/OutputInterface.php
This commit is contained in:
commit
08757db05e
@ -123,7 +123,7 @@ abstract class Output implements OutputInterface
|
||||
/**
|
||||
* Writes a message to the output and adds a newline at the end.
|
||||
*
|
||||
* @param string|array $messages The message as an array of lines of a single string
|
||||
* @param string|array $messages The message as an array of lines or a single string
|
||||
* @param integer $type The type of output
|
||||
*
|
||||
* @api
|
||||
@ -136,7 +136,7 @@ abstract class Output implements OutputInterface
|
||||
/**
|
||||
* Writes a message to the output.
|
||||
*
|
||||
* @param string|array $messages The message as an array of lines of a single string
|
||||
* @param string|array $messages The message as an array of lines or a single string
|
||||
* @param Boolean $newline Whether to add a newline or not
|
||||
* @param integer $type The type of output
|
||||
*
|
||||
|
@ -33,7 +33,7 @@ interface OutputInterface
|
||||
/**
|
||||
* Writes a message to the output.
|
||||
*
|
||||
* @param string|array $messages The message as an array of lines of a single string
|
||||
* @param string|array $messages The message as an array of lines or a single string
|
||||
* @param Boolean $newline Whether to add a newline or not
|
||||
* @param integer $type The type of output (0: normal, 1: raw, 2: plain)
|
||||
*
|
||||
|
Reference in New Issue
Block a user