8000 [ErrorHandler] Improve fileLinkFormat handling · symfony/symfony@3cc9728 · GitHub
[go: up one dir, main page]
Skip to content

Commit 3cc9728

Browse files
nlemoinenicolas-grekas
nlemoine
authored and
nicolas-grekas
committed
[ErrorHandler] Improve fileLinkFormat handling
- Avoid repeating file link format guessing (logic is already in FileLinkFormatter class) - Always set a fileLinkFormat to a FileLinkFormatter object to handle path mappings properly
1 parent f13a4b1 commit 3cc9728

File tree

26 files changed

+241
-129
lines changed

26 files changed

+241
-129
lines changed

‎UPGRADE-6.4.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ HttpKernel
109109
* [BC break] Add native return types to `TraceableEventDispatcher` and to `MergeExtensionConfigurationPass`
110110
* Deprecate `Kernel::stripComments()`
111111
* Deprecate `UriSigner`, use `UriSigner` from the HttpFoundation component instead
112+
* Deprecate `FileLinkFormatter`, use `FileLinkFormatter` from the ErrorHandler component instead
112113

113114
Messenger
114115
---------

‎src/Symfony/Bridge/Twig/Command/DebugCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
use Symfony\Component\Console\Input\InputOption;
2323
use Symfony\Component\Console\Output\OutputInterface;
2424
use Symfony\Component\Console\Style\SymfonyStyle;
25+
use Symfony\Component\ErrorHandler\ErrorRenderer\FileLinkFormatter;
2526
use Symfony\Component\Finder\Finder;
26-
use Symfony\Component\HttpKernel\Debug\FileLinkFormatter;
2727
use Twig\Environment;
2828
use Twig\Loader\ChainLoader;
2929
use Twig\Loader\FilesystemLoader;

‎src/Symfony/Bridge/Twig/Extension/CodeExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace Symfony\Bridge\Twig\Extension;
1313

14-
use Symfony\Component\HttpKernel\Debug\FileLinkFormatter;
14+
use Symfony\Component\ErrorHandler\ErrorRenderer\FileLinkFormatter;
1515
use Twig\Extension\AbstractExtension;
1616
use Twig\TwigFilter;
1717

‎src/Symfony/Bridge/Twig/Tests/Extension/CodeExtensionTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
use PHPUnit\Framework\TestCase;
1515
use Symfony\Bridge\Twig\Extension\CodeExtension;
16-
use Symfony\Component\HttpKernel\Debug\FileLinkFormatter;
16+
use Symfony\Component\ErrorHandler\ErrorRenderer\FileLinkFormatter;
1717

1818
class CodeExtensionTest extends TestCase
1919
{

‎src/Symfony/Bundle/FrameworkBundle/Command/DebugAutowiringCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
use Symfony\Component\Console\Output\OutputInterface;
2222
use Symfony\Component\Console\Style\SymfonyStyle;
2323
use Symfony\Component\DependencyInjection\Attribute\Target;
24-
use Symfony\Component\HttpKernel\Debug\FileLinkFormatter;
24+
use Symfony\Component\ErrorHandler\ErrorRenderer\FileLinkFormatter;
2525

2626
/**
2727
* A console command for autowiring information.

‎src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php

Lines changed: 1 addition & 1 deletion
1C6A
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
use Symfony\Component\Console\Input\InputOption;
2323
use Symfony\Component\Console\Output\OutputInterface;
2424
use Symfony\Component\Console\Style\SymfonyStyle;
25-
use Symfony\Component\HttpKernel\Debug\FileLinkFormatter;
25+
use Symfony\Component\ErrorHandler\ErrorRenderer\FileLinkFormatter;
2626
use Symfony\Component\Routing\RouteCollection;
2727
use Symfony\Component\Routing\RouterInterface;
2828

‎src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
use Symfony\Component\DependencyInjection\Definition;
2727
use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
2828
use Symfony\Component\DependencyInjection\Reference;
29+
use Symfony\Component\ErrorHandler\ErrorRenderer\FileLinkFormatter;
2930
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
30-
use Symfony\Component\HttpKernel\Debug\FileLinkFormatter;
3131
use Symfony\Component\Routing\Route;
3232
use Symfony\Component\Routing\RouteCollection;
3333

‎src/Symfony/Bundle/FrameworkBundle/Console/Helper/DescriptorHelper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
use Symfony\Bundle\FrameworkBundle\Console\Descriptor\TextDescriptor;
1717
use Symfony\Bundle\FrameworkBundle\Console\Descriptor\XmlDescriptor;
1818
use Symfony\Component\Console\Helper\DescriptorHelper as BaseDescriptorHelper;
19-
use Symfony\Component\HttpKernel\Debug\FileLinkFormatter;
19+
use Symfony\Component\ErrorHandler\ErrorRenderer\FileLinkFormatter;
2020

2121
/**
2222
* @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/debug_prod.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
namespace Symfony\Component\DependencyInjection\Loader\Configurator;
1313

14+
use Symfony\Component\ErrorHandler\ErrorRenderer\FileLinkFormatter;
1415
use Symfony\Component\HttpKernel\Debug\ErrorHandlerConfigurator;
15-
use Symfony\Component\HttpKernel\Debug\FileLinkFormatter;
1616
use Symfony\Component\HttpKernel\EventListener\DebugHandlersListener;
1717

1818
return static function (ContainerConfigurator $container) {

‎src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/TextDescriptorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
namespace Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor;
1313

1414
use Symfony\Bundle\FrameworkBundle\Console\Descriptor\TextDescriptor;
15-
use Symfony\Component\HttpKernel\Debug\FileLinkFormatter;
15+
use Symfony\Component\ErrorHandler\ErrorRenderer\FileLinkFormatter;
1616
use Symfony\Component\Routing\Route;
1717

1818
class TextDescriptorTest extends AbstractDescriptorTestCase

0 commit comments

Comments
 (0)
0