merged branch DenisGorbachev/2.0 (PR symfony#7198)

fabpot · fabpot · commit cb2277ac9475 · 2013-02-27T12:39:01.000+01:00
This PR was merged into the 2.0 branch. Commits ------- 3be3dde [Console] Fixed comment Discussion ---------- [Console] Fixed comment | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | -
diff --git a/src/Symfony/Component/Console/Output/Output.php b/src/Symfony/Component/Console/Output/Output.php
@@ -127,7 +127,7 @@ public function getVerbosity()
     /**
      * 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
@@ -140,7 +140,7 @@ public function writeln($messages, $type = 0)
     /**
      * 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
      *
diff --git a/src/Symfony/Component/Console/Output/OutputInterface.php b/src/Symfony/Component/Console/Output/OutputInterface.php
@@ -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
      *
@@ -46,7 +46,7 @@ public function write($messages, $newline = false, $type = 0);
     /**
      * 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

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ public function getVerbosity()`
`127`	`127`	`/**`
`128`	`128`	`* Writes a message to the output and adds a newline at the end.`
`129`	`129`	`*`
`130`		`- * @param string\|array $messages The message as an array of lines of a single string`
	`130`	`+ * @param string\|array $messages The message as an array of lines or a single string`
`131`	`131`	`* @param integer $type The type of output`
`132`	`132`	`*`
`133`	`133`	`* @api`
`@@ -140,7 +140,7 @@ public function writeln($messages, $type = 0)`
`140`	`140`	`/**`
`141`	`141`	`* Writes a message to the output.`
`142`	`142`	`*`
`143`		`- * @param string\|array $messages The message as an array of lines of a single string`
	`143`	`+ * @param string\|array $messages The message as an array of lines or a single string`
`144`	`144`	`* @param Boolean $newline Whether to add a newline or not`
`145`	`145`	`* @param integer $type The type of output`
`146`	`146`	`*`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ interface OutputInterface`
`33`	`33`	`/**`
`34`	`34`	`* Writes a message to the output.`
`35`	`35`	`*`
`36`		`- * @param string\|array $messages The message as an array of lines of a single string`
	`36`	`+ * @param string\|array $messages The message as an array of lines or a single string`
`37`	`37`	`* @param Boolean $newline Whether to add a newline or not`
`38`	`38`	`* @param integer $type The type of output`
`39`	`39`	`*`
`@@ -46,7 +46,7 @@ public function write($messages, $newline = false, $type = 0);`
`46`	`46`	`/**`
`47`	`47`	`* Writes a message to the output and adds a newline at the end.`
`48`	`48`	`*`
`49`		`- * @param string\|array $messages The message as an array of lines of a single string`
	`49`	`+ * @param string\|array $messages The message as an array of lines or a single string`
`50`	`50`	`* @param integer $type The type of output`
`51`	`51`	`*`
`52`	`52`	`* @api`