Skip to content

Commit 4a59d3d

Browse files
Merge branch '2.8' into 3.4
* 2.8: Use the real image URL for the filesystem tests [Finder] Update PHPdoc append() [DI] Fix phpdoc Fix code examples in PHPDoc [HttpKernel] Fix inheritdocs
2 parents 6b21759 + 364fb4f commit 4a59d3d

File tree

3 files changed

+18
-15
lines changed

3 files changed

+18
-15
lines changed

Helper/Table.php

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -263,15 +263,14 @@ public function setRow($column, array $row)
263263
* Renders table to output.
264264
*
265265
* Example:
266-
* <code>
267-
* +---------------+-----------------------+------------------+
268-
* | ISBN | Title | Author |
269-
* +---------------+-----------------------+------------------+
270-
* | 99921-58-10-7 | Divine Comedy | Dante Alighieri |
271-
* | 9971-5-0210-0 | A Tale of Two Cities | Charles Dickens |
272-
* | 960-425-059-0 | The Lord of the Rings | J. R. R. Tolkien |
273-
* +---------------+-----------------------+------------------+
274-
* </code>
266+
*
267+
* +---------------+-----------------------+------------------+
268+
* | ISBN | Title | Author |
269+
* +---------------+-----------------------+------------------+
270+
* | 99921-58-10-7 | Divine Comedy | Dante Alighieri |
271+
* | 9971-5-0210-0 | A Tale of Two Cities | Charles Dickens |
272+
* | 960-425-059-0 | The Lord of the Rings | J. R. R. Tolkien |
273+
* +---------------+-----------------------+------------------+
275274
*/
276275
public function render()
277276
{
@@ -305,7 +304,9 @@ public function render()
305304
/**
306305
* Renders horizontal header separator.
307306
*
308-
* Example: <code>+-----+-----------+-------+</code>
307+
* Example:
308+
*
309+
* +-----+-----------+-------+
309310
*/
310311
private function renderRowSeparator()
311312
{
@@ -336,7 +337,9 @@ private function renderColumnSeparator()
336337
/**
337338
* Renders table row.
338339
*
339-
* Example: <code>| 9971-5-0210-0 | A Tale of Two Cities | Charles Dickens |</code>
340+
* Example:
341+
*
342+
* | 9971-5-0210-0 | A Tale of Two Cities | Charles Dickens |
340343
*
341344
* @param array $row
342345
* @param string $cellFormat

Input/InputDefinition.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
* Usage:
2121
*
2222
* $definition = new InputDefinition(array(
23-
* new InputArgument('name', InputArgument::REQUIRED),
24-
* new InputOption('foo', 'f', InputOption::VALUE_REQUIRED),
23+
* new InputArgument('name', InputArgument::REQUIRED),
24+
* new InputOption('foo', 'f', InputOption::VALUE_REQUIRED),
2525
* ));
2626
*
2727
* @author Fabien Potencier <[email protected]>

Output/StreamOutput.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
*
2121
* Usage:
2222
*
23-
* $output = new StreamOutput(fopen('php://stdout', 'w'));
23+
* $output = new StreamOutput(fopen('php://stdout', 'w'));
2424
*
2525
* As `StreamOutput` can use any stream, you can also use a file:
2626
*
27-
* $output = new StreamOutput(fopen('/path/to/output.log', 'a', false));
27+
* $output = new StreamOutput(fopen('/path/to/output.log', 'a', false));
2828
*
2929
* @author Fabien Potencier <[email protected]>
3030
*/

0 commit comments

Comments
 (0)