8000 minor #32153 Make Symfony\Component\Debug\ExceptionHandler::setFileLi… · symfony/symfony@f128aee · GitHub
[go: up one dir, main page]
Skip to content

Commit f128aee

Browse files
fabpotfabpot
committed
minor #32153 Make Symfony\Component\Debug\ExceptionHandler::setFileLinkFormat accept Null as a return type (jls-esokia)
This PR was merged into the 5.0-dev branch. Discussion ---------- Make Symfony\Component\Debug\ExceptionHandler::setFileLinkFormat accept Null as a return type fixes #32150 | Q | A | ------------- | --- | Branch? | master <!-- see below --> | Bug fix? | yes | New feature? | no <!-- please update src/**/CHANGELOG.md files --> | BC breaks? | no <!-- see https://symfony.com/bc --> | Deprecations? | no <!-- please update UPGRADE-*.md and src/**/CHANGELOG.md files --> | Tests pass? | yes <!-- please add some, will be required by reviewers --> | Fixed tickets | #32150 <!-- #-prefixed issue number(s), if any --> | License | MIT | Doc PR | - <!-- required for new features --> <!-- Replace this notice by a short README for your feature/bugfix. This will help people understand your PR and can be used as a start for the documentation. Additionally (see https://symfony.com/roadmap): - Bug fixes must be submitted against the lowest maintained branch where they apply (lowest branches are regularly merged to upper ones so they get the fixes too). - Features and deprecations must be submitted against branch 4.4. - Legacy code removals go to the master branch. --> Make `Symfony\Component\Debug\ExceptionHandler::setFileLinkFormat` accept null as a return type. Since Symfony requires PHP 7.2+ and that PHP feature was introduced in 7.1, I use that feature instead of changing the default value of the variable. Commits ------- e6cb7d8 Remove return type from ExceptionHandler::setFileLinkFormat
2 parents f123436 + e6cb7d8 commit f128aee

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

‎src/Symfony/C 9B93 omponent/Debug/ExceptionHandler.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,9 @@ public function setHandler(callable $handler = null): ?callable
9797
*
9898
* @param string|FileLinkFormatter $fileLinkFormat The format for links to source files
9999
*
100-
* @return string The previous file link format
100+
* @return string|FileLinkFormatter|null The previous file link format
101101
*/
102-
public function setFileLinkFormat($fileLinkFormat): string
102+
public function setFileLinkFormat($fileLinkFormat)
103103
{
104104
$old = $this->fileLinkFormat;
105105
$this->fileLinkFormat = $fileLinkFormat;

0 commit comments

Comments
 (0)
0