Skip to content

Commit 75b35ad

Browse files
committed
Merge branch '4.1'
* 4.1: 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 8ca04d8 + 01f4a0c commit 75b35ad

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
@@ -311,15 +311,14 @@ public function setFooterTitle(?string $title): self
311311
* Renders table to output.
312312
*
313313
* Example:
314-
* <code>
315-
* +---------------+-----------------------+------------------+
316-
* | ISBN | Title | Author |
317-
* +---------------+-----------------------+------------------+
318-
* | 99921-58-10-7 | Divine Comedy | Dante Alighieri |
319-
* | 9971-5-0210-0 | A Tale of Two Cities | Charles Dickens |
320-
* | 960-425-059-0 | The Lord of the Rings | J. R. R. Tolkien |
321-
* +---------------+-----------------------+------------------+
322-
* </code>
314+
*
315+
* +---------------+-----------------------+------------------+
316+
* | ISBN | Title | Author |
317+
* +---------------+-----------------------+------------------+
318+
* | 99921-58-10-7 | Divine Comedy | Dante Alighieri |
319+
* | 9971-5-0210-0 | A Tale of Two Cities | Charles Dickens |
320+
* | 960-425-059-0 | The Lord of the Rings | J. R. R. Tolkien |
321+
* +---------------+-----------------------+------------------+
323322
*/
324323
public function render()
325324
{
@@ -367,7 +366,9 @@ public function render()
367366
/**
368367
* Renders horizontal header separator.
369368
*
370-
* Example: <code>+-----+-----------+-------+</code>
369+
* Example:
370+
*
371+
* +-----+-----------+-------+
371372
*/
372373
private function renderRowSeparator(int $type = self::SEPARATOR_MID, string $title = null, string $titleFormat = null)
373374
{
@@ -430,7 +431,10 @@ private function renderColumnSeparator($type = self::BORDER_OUTSIDE)
430431
/**
431432
* Renders table row.
432433
*
433-
* Example: <code>| 9971-5-0210-0 | A Tale of Two Cities | Charles Dickens |</code>
434+
* Example:
435+
*
436+
* | 9971-5-0210-0 | A Tale of Two Cities | Charles Dickens |
437+
*
434438
*/
435439
private function renderRow(array $row, string $cellFormat)
436440
{

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)