Movatterモバイル変換

Skip to content

symfony/symfonyPublic

NotificationsYou must be signed in to change notification settings
Fork9.7k
Star30.8k

Commit510b77b

nlemoine

nicolas-grekas

authored and

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 parenteadd41a commit510b77bCopy full SHA for 510b77b

File tree

26 files changed

+242

-138

lines changed

UPGRADE-6.4.md
src/Symfony
- Bridge/Twig
  - Command
    - DebugCommand.php
  - Extension
    - CodeExtension.php
  - Tests/Extension
    - CodeExtensionTest.php
- Bundle
  - FrameworkBundle
    - Command
      - DebugAutowiringCommand.php
      - RouterDebugCommand.php
    - Console
      - Descriptor
        TextDescriptor.php
      - Helper
        DescriptorHelper.php
    - Resources/config
      - debug_prod.php
    - Tests/Console/Descriptor
      - TextDescriptorTest.php
  - WebProfilerBundle
    - Resources/config
      - profiler.php
    - composer.json
- Component
  - ErrorHandler
    - ErrorRenderer
      - FileLinkFormatter.php
      - HtmlErrorRenderer.php
    - Tests/ErrorRenderer
      - FileLinkFormatterTest.php
      - HtmlErrorRendererTest.php
  - Form
    - Command
      - DebugCommand.php
    - Console
      - Descriptor
        TextDescriptor.php
      - Helper
        DescriptorHelper.php
  - HttpKernel
    - CHANGELOG.md
    - DataCollector
      - DumpDataCollector.php
    - Debug
      - FileLinkFormatter.php
    - Tests/DataCollector
      - DumpDataCollectorTest.php
    - UriSigner.php
  - VarDumper
    - Dumper/ContextProvider
      - SourceContextProvider.php
    - VarDumper.php

26 files changed

+242

-138

lines changed

`‎UPGRADE-6.4.md‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -152,6 +152,7 @@ HttpKernel`
`152`	`152`	*[BC break] Add native return types to`TraceableEventDispatcher` and to`MergeExtensionConfigurationPass`
`153`	`153`	* Deprecate`Kernel::stripComments()`
`154`	`154`	* Deprecate`UriSigner`, use`UriSigner` from the HttpFoundation component instead
	`155`	+* Deprecate`FileLinkFormatter`, use`FileLinkFormatter` from the ErrorHandler component instead
`155`	`156`
`156`	`157`	`Messenger`
`157`	`158`	`---------`

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,8 @@`
`22`	`22`	`useSymfony\Component\Console\Input\InputOption;`
`23`	`23`	`useSymfony\Component\Console\Output\OutputInterface;`
`24`	`24`	`useSymfony\Component\Console\Style\SymfonyStyle;`
	`25`	`+useSymfony\Component\ErrorHandler\ErrorRenderer\FileLinkFormatter;`
`25`	`26`	`useSymfony\Component\Finder\Finder;`
`26`		`-useSymfony\Component\HttpKernel\Debug\FileLinkFormatter;`
`27`	`27`	`useTwig\Environment;`
`28`	`28`	`useTwig\Loader\ChainLoader;`
`29`	`29`	`useTwig\Loader\FilesystemLoader;`

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`
`12`	`12`	`namespaceSymfony\Bridge\Twig\Extension;`
`13`	`13`
`14`		`-useSymfony\Component\HttpKernel\Debug\FileLinkFormatter;`
	`14`	`+useSymfony\Component\ErrorHandler\ErrorRenderer\FileLinkFormatter;`
`15`	`15`	`useTwig\Extension\AbstractExtension;`
`16`	`16`	`useTwig\TwigFilter;`
`17`	`17`

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`
`14`	`14`	`usePHPUnit\Framework\TestCase;`
`15`	`15`	`useSymfony\Bridge\Twig\Extension\CodeExtension;`
`16`		`-useSymfony\Component\HttpKernel\Debug\FileLinkFormatter;`
	`16`	`+useSymfony\Component\ErrorHandler\ErrorRenderer\FileLinkFormatter;`
`17`	`17`
`18`	`18`	`class CodeExtensionTestextends TestCase`
`19`	`19`	`{`

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`useSymfony\Component\Console\Output\OutputInterface;`
`22`	`22`	`useSymfony\Component\Console\Style\SymfonyStyle;`
`23`	`23`	`useSymfony\Component\DependencyInjection\Attribute\Target;`
`24`		`-useSymfony\Component\HttpKernel\Debug\FileLinkFormatter;`
	`24`	`+useSymfony\Component\ErrorHandler\ErrorRenderer\FileLinkFormatter;`
`25`	`25`
`26`	`26`	`/**`
`27`	`27`	`* A console command for autowiring information.`

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`useSymfony\Component\Console\Input\InputOption;`
`23`	`23`	`useSymfony\Component\Console\Output\OutputInterface;`
`24`	`24`	`useSymfony\Component\Console\Style\SymfonyStyle;`
`25`		`-useSymfony\Component\HttpKernel\Debug\FileLinkFormatter;`
	`25`	`+useSymfony\Component\ErrorHandler\ErrorRenderer\FileLinkFormatter;`
`26`	`26`	`useSymfony\Component\Routing\RouteCollection;`
`27`	`27`	`useSymfony\Component\Routing\RouterInterface;`
`28`	`28`

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,8 @@`
`26`	`26`	`useSymfony\Component\DependencyInjection\Definition;`
`27`	`27`	`useSymfony\Component\DependencyInjection\ParameterBag\ParameterBag;`
`28`	`28`	`useSymfony\Component\DependencyInjection\Reference;`
	`29`	`+useSymfony\Component\ErrorHandler\ErrorRenderer\FileLinkFormatter;`
`29`	`30`	`useSymfony\Component\EventDispatcher\EventDispatcherInterface;`
`30`		`-useSymfony\Component\HttpKernel\Debug\FileLinkFormatter;`
`31`	`31`	`useSymfony\Component\Routing\Route;`
`32`	`32`	`useSymfony\Component\Routing\RouteCollection;`
`33`	`33`

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`useSymfony\Bundle\FrameworkBundle\Console\Descriptor\TextDescriptor;`
`17`	`17`	`useSymfony\Bundle\FrameworkBundle\Console\Descriptor\XmlDescriptor;`
`18`	`18`	`useSymfony\Component\Console\Helper\DescriptorHelperasBaseDescriptorHelper;`
`19`		`-useSymfony\Component\HttpKernel\Debug\FileLinkFormatter;`
	`19`	`+useSymfony\Component\ErrorHandler\ErrorRenderer\FileLinkFormatter;`
`20`	`20`
`21`	`21`	`/**`
`22`	`22`	`* @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 number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@`
`11`	`11`
`12`	`12`	`namespaceSymfony\Component\DependencyInjection\Loader\Configurator;`
`13`	`13`
	`14`	`+useSymfony\Component\ErrorHandler\ErrorRenderer\FileLinkFormatter;`
`14`	`15`	`useSymfony\Component\HttpKernel\Debug\ErrorHandlerConfigurator;`
`15`		`-useSymfony\Component\HttpKernel\Debug\FileLinkFormatter;`
`16`	`16`	`useSymfony\Component\HttpKernel\EventListener\DebugHandlersListener;`
`17`	`17`
`18`	`18`	`returnstaticfunction (ContainerConfigurator$container) {`

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`namespaceSymfony\Bundle\FrameworkBundle\Tests\Console\Descriptor;`
`13`	`13`
`14`	`14`	`useSymfony\Bundle\FrameworkBundle\Console\Descriptor\TextDescriptor;`
`15`		`-useSymfony\Component\HttpKernel\Debug\FileLinkFormatter;`
	`15`	`+useSymfony\Component\ErrorHandler\ErrorRenderer\FileLinkFormatter;`
`16`	`16`	`useSymfony\Component\Routing\Route;`
`17`	`17`
`18`	`18`	`class TextDescriptorTestextends AbstractDescriptorTestCase`

0 commit comments

Comments

(0)

[8]ページ先頭

©2009-2025 Movatter.jp