Skip to content

Commit ca11005

Browse files
committed
Merge branch '6.4' into 7.0
* 6.4: [Security] Add badge resolution to profiler [AssetMapper] Allow specifying packages to update with importmap:update [AssetMapper] Make importmap:install command download the same version Remove unneeded variable [PropertyInfo] Remove checking if AttributeMetadataInterface setIgnore method exist [VarDumper][FrameworkBundle] Remove checking if OutputFormatterStyle setHref method exist [HttpKernel][DebugBundle] Always call CliDumper setDisplayOptions method [DoctrineBridge][Messenger] Always use executeStatement [DoctrineBridge] Remove LazyGhost feature detection [Messenger] Fix PHPDoc template for `TransportFactoryInterface`
2 parents 50d420b + c2fd2df commit ca11005

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

Command/DebugAutowiringCommand.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
use Symfony\Component\Console\Attribute\AsCommand;
1616
use Symfony\Component\Console\Completion\CompletionInput;
1717
use Symfony\Component\Console\Completion\CompletionSuggestions;
18-
use Symfony\Component\Console\Formatter\OutputFormatterStyle;
1918
use Symfony\Component\Console\Input\InputArgument;
2019
use Symfony\Component\Console\Input\InputInterface;
2120
use Symfony\Component\Console\Input\InputOption;
@@ -34,12 +33,10 @@
3433
#[AsCommand(name: 'debug:autowiring', description: 'List classes/interfaces you can use for autowiring')]
3534
class DebugAutowiringCommand extends ContainerDebugCommand
3635
{
37-
private bool $supportsHref;
3836
private ?FileLinkFormatter $fileLinkFormatter;
3937

4038
public function __construct(string $name = null, FileLinkFormatter $fileLinkFormatter = null)
4139
{
42-
$this->supportsHref = method_exists(OutputFormatterStyle::class, 'setHref');
4340
$this->fileLinkFormatter = $fileLinkFormatter;
4441
parent::__construct($name);
4542
}
@@ -124,7 +121,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
124121
}
125122

126123
$serviceLine = sprintf('<fg=yellow>%s</>', $serviceId);
127-
if ($this->supportsHref && '' !== $fileLink = $this->getFileLink($previousId)) {
124+
if ('' !== $fileLink = $this->getFileLink($previousId)) {
128125
$serviceLine = substr($serviceId, \strlen($previousId));
129126
$serviceLine = sprintf('<fg=yellow;href=%s>%s</>', $fileLink, $previousId).('' !== $serviceLine ? sprintf('<fg=yellow>%s</>', $serviceLine) : '');
130127
}

Resources/config/asset_mapper.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@
143143
abstract_arg('importmap.php path'),
144144
abstract_arg('vendor directory'),
145145
service('asset_mapper.importmap.resolver'),
146+
service('http_client'),
146147
])
147148
->alias(ImportMapManager::class, 'asset_mapper.importmap.manager')
148149

0 commit comments

Comments
 (0)