Skip to content

Commit caebc88

Browse files
nlemoinenicolas-grekas
authored andcommitted
[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 4fa0d87 commit caebc88

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

Command/DebugCommand.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,12 @@
2121
use Symfony\Component\Console\Input\InputOption;
2222
use Symfony\Component\Console\Output\OutputInterface;
2323
use Symfony\Component\Console\Style\SymfonyStyle;
24+
use Symfony\Component\ErrorHandler\ErrorRenderer\FileLinkFormatter;
2425
use Symfony\Component\Form\Console\Helper\DescriptorHelper;
2526
use Symfony\Component\Form\Extension\Core\CoreExtension;
2627
use Symfony\Component\Form\FormRegistryInterface;
2728
use Symfony\Component\Form\FormTypeInterface;
28-
use Symfony\Component\HttpKernel\Debug\FileLinkFormatter;
29+
use Symfony\Component\HttpKernel\Debug\FileLinkFormatter as LegacyFileLinkFormatter;
2930

3031
/**
3132
* A console command for retrieving information about form types.
@@ -40,9 +41,9 @@ class DebugCommand extends Command
4041
private array $types;
4142
private array $extensions;
4243
private array $guessers;
43-
private ?FileLinkFormatter $fileLinkFormatter;
44+
private FileLinkFormatter|LegacyFileLinkFormatter|null $fileLinkFormatter;
4445

45-
public function __construct(FormRegistryInterface $formRegistry, array $namespaces = ['Symfony\Component\Form\Extension\Core\Type'], array $types = [], array $extensions = [], array $guessers = [], FileLinkFormatter $fileLinkFormatter = null)
46+
public function __construct(FormRegistryInterface $formRegistry, array $namespaces = ['Symfony\Component\Form\Extension\Core\Type'], array $types = [], array $extensions = [], array $guessers = [], FileLinkFormatter|LegacyFileLinkFormatter $fileLinkFormatter = null)
4647
{
4748
parent::__construct();
4849

Console/Descriptor/TextDescriptor.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@
1313

1414
use Symfony\Component\Console\Helper\Dumper;
1515
use Symfony\Component\Console\Helper\TableSeparator;
16+
use Symfony\Component\ErrorHandler\ErrorRenderer\FileLinkFormatter;
1617
use Symfony\Component\Form\ResolvedFormTypeInterface;
17-
use Symfony\Component\HttpKernel\Debug\FileLinkFormatter;
18+
use Symfony\Component\HttpKernel\Debug\FileLinkFormatter as LegacyFileLinkFormatter;
1819
use Symfony\Component\OptionsResolver\OptionsResolver;
1920

2021
/**
@@ -24,9 +25,9 @@
2425
*/
2526
class TextDescriptor extends Descriptor
2627
{
27-
private ?FileLinkFormatter $fileLinkFormatter;
28+
private FileLinkFormatter|LegacyFileLinkFormatter|null $fileLinkFormatter;
2829

29-
public function __construct(FileLinkFormatter $fileLinkFormatter = null)
30+
public function __construct(FileLinkFormatter|LegacyFileLinkFormatter $fileLinkFormatter = null)
3031
{
3132
$this->fileLinkFormatter = $fileLinkFormatter;
3233
}

Console/Helper/DescriptorHelper.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@
1212
namespace Symfony\Component\Form\Console\Helper;
1313

1414
use Symfony\Component\Console\Helper\DescriptorHelper as BaseDescriptorHelper;
15+
use Symfony\Component\ErrorHandler\ErrorRenderer\FileLinkFormatter;
1516
use Symfony\Component\Form\Console\Descriptor\JsonDescriptor;
1617
use Symfony\Component\Form\Console\Descriptor\TextDescriptor;
17-
use Symfony\Component\HttpKernel\Debug\FileLinkFormatter;
18+
use Symfony\Component\HttpKernel\Debug\FileLinkFormatter as LegacyFileLinkFormatter;
1819

1920
/**
2021
* @author Yonel Ceruto <[email protected]>
@@ -23,7 +24,7 @@
2324
*/
2425
class DescriptorHelper extends BaseDescriptorHelper
2526
{
26-
public function __construct(FileLinkFormatter $fileLinkFormatter = null)
27+
public function __construct(FileLinkFormatter|LegacyFileLinkFormatter $fileLinkFormatter = null)
2728
{
2829
$this
2930
->register('txt', new TextDescriptor($fileLinkFormatter))

0 commit comments

Comments
 (0)