8000 minor #39398 [ErrorHandler][HttpKernel] Add missing param annotation … · symfony/symfony@0676399 · GitHub
[go: up one dir, main page]

Skip to content

Commit 0676399

Browse files
committed
minor #39398 [ErrorHandler][HttpKernel] Add missing param annotation for $fileLinkFormat (nicolas-grekas)
This PR was merged into the 4.4 branch. Discussion ---------- [ErrorHandler][HttpKernel] Add missing param annotation for $fileLinkFormat | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Commits ------- 32a56a6 Add missing param annotation abouts $fileLinkFormat
2 parents 55d2723 + 32a56a6 commit 0676399

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

src/Symfony/Component/ErrorHandler/ErrorRenderer/HtmlErrorRenderer.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
use Symfony\Component\ErrorHandler\Exception\FlattenException;
1616
use Symfony\Component\HttpFoundation\RequestStack;
1717
use Symfony\Component\HttpFoundation\Response;
18+
use Symfony\Component\HttpKernel\Debug\FileLinkFormatter;
1819
use Symfony\Component\HttpKernel\Log\DebugLoggerInterface;
1920

2021
/**
@@ -40,8 +41,9 @@ class HtmlErrorRenderer implements ErrorRendererInterface
4041
private $logger;
4142

4243
/**
43-
* @param bool|callable $debug The debugging mode as a boolean or a callable that should return it
44-
* @param bool|callable $outputBuffer The output buffer as a string or a callable that should return it
44+
* @param bool|callable $debug The debugging mode as a boolean or a callable that should return it
45+
* @param string|FileLinkFormatter|null $fileLinkFormat
46+
* @param bool|callable $outputBuffer The output buffer as a string or a callable that should return it
4547
*/
4648
public function __construct($debug = false, string $charset = null, $fileLinkFormat = null, string $projectDir = null, $outputBuffer = '', LoggerInterface $logger = null)
4749
{

src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
use Symfony\Component\HttpFoundation\Request;
1515
use Symfony\Component\HttpFoundation\RequestStack;
1616
use Symfony\Component\HttpFoundation\Response;
17+
use Symfony\Component\HttpKernel\Debug\FileLinkFormatter;
1718
use Symfony\Component\Stopwatch\Stopwatch;
1819
use Symfony\Component\VarDumper\Cloner\Data;
1920
use Symfony\Component\VarDumper\Cloner\VarCloner;
@@ -43,6 +44,7 @@ class DumpDataCollector extends DataCollector implements DataDumperInterface
4344
private $sourceContextProvider;
4445

4546
/**
47+
* @param string|FileLinkFormatter|null $fileLinkFormat
4648
* @param DataDumperInterface|Connection|null $dumper
4749
*/
4850
public function __construct(Stopwatch $stopwatch = null, $fileLinkFormat = null, string $charset = null, RequestStack $requestStack = null, $dumper = null)

src/Symfony/Component/Mime/Part/TextPart.php

Lines changed: 1 addition & 1 deletion
5587
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class TextPart extends AbstractPart
3535
/**
3636
* @param resource|string $body
3737
*/
38-
public function __construct($body, ?string $charset = 'utf-8', $subtype = 'plain', string $encoding = null)
38+
public function __construct($body, ?string $charset = 'utf-8', string $subtype = 'plain', string $encoding = null)
3939
{
4040
parent::__construct();
4141

0 commit comments

Comments
 (0)
0