Skip to content

Commit 01f4a0c

Browse files
committed
Merge branch '3.4' into 4.1
* 3.4: Use the real image URL for the filesystem tests [Finder] Update PHPdoc append() [DI] Fix phpdoc Fix code examples in PHPDoc [HttpKernel] Fix inheritdocs bumped Symfony version to 3.4.16 updated VERSION for 3.4.15 updated CHANGELOG for 3.4.15
2 parents ca80b8c + 4a59d3d commit 01f4a0c

File tree

3 files changed

+19
-15
lines changed

3 files changed

+19
-15
lines changed

Helper/Table.php

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -294,15 +294,14 @@ public function setRow($column, array $row)
294294
* Renders table to output.
295295
*
296296
* Example:
297-
* <code>
298-
* +---------------+-----------------------+------------------+
299-
* | ISBN | Title | Author |
300-
* +---------------+-----------------------+------------------+
301-
* | 99921-58-10-7 | Divine Comedy | Dante Alighieri |
302-
* | 9971-5-0210-0 | A Tale of Two Cities | Charles Dickens |
303-
* | 960-425-059-0 | The Lord of the Rings | J. R. R. Tolkien |
304-
* +---------------+-----------------------+------------------+
305-
* </code>
297+
*
298+
* +---------------+-----------------------+------------------+
299+
* | ISBN | Title | Author |
300+
* +---------------+-----------------------+------------------+
301+
* | 99921-58-10-7 | Divine Comedy | Dante Alighieri |
302+
* | 9971-5-0210-0 | A Tale of Two Cities | Charles Dickens |
303+
* | 960-425-059-0 | The Lord of the Rings | J. R. R. Tolkien |
304+
* +---------------+-----------------------+------------------+
306305
*/
307306
public function render()
308307
{
@@ -348,7 +347,9 @@ public function render()
348347
/**
349348
* Renders horizontal header separator.
350349
*
351-
* Example: <code>+-----+-----------+-------+</code>
350+
* Example:
351+
*
352+
* +-----+-----------+-------+
352353
*/
353354
private function renderRowSeparator(int $type = self::SEPARATOR_MID)
354355
{
@@ -394,7 +395,10 @@ private function renderColumnSeparator($type = self::BORDER_OUTSIDE)
394395
/**
395396
* Renders table row.
396397
*
397-
* Example: <code>| 9971-5-0210-0 | A Tale of Two Cities | Charles Dickens |</code>
398+
* Example:
399+
*
400+
* | 9971-5-0210-0 | A Tale of Two Cities | Charles Dickens |
401+
*
398402
*/
399403
private function renderRow(array $row, string $cellFormat)
400404
{

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)