Skip to content

Commit 5f24e95

Browse files
committed
Merge branch '6.4' into 7.0
* 6.4: do not allow version 7 of the HttpKernel component favor Twig's include() function over the include tag add missing class alias to satisfy autoloading remove the .data_collector.command service if its class does not exist [HttpFoundation] Add $flush parameter to Response::send() fix typo DX: PHP CS Fixer - allow for no_superfluous_phpdoc_tags.allow_unused_params
2 parents 4639f4f + 760a80c commit 5f24e95

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

DependencyInjection/FrameworkExtension.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
use Symfony\Component\Config\ResourceCheckerInterface;
5050
use Symfony\Component\Console\Application;
5151
use Symfony\Component\Console\Command\Command;
52+
use Symfony\Component\Console\DataCollector\CommandDataCollector;
5253
use Symfony\Component\Console\Debug\CliRequest;
5354
use Symfony\Component\Console\Messenger\RunCommandMessageHandler;
5455
use Symfony\Component\DependencyInjection\Alias;
@@ -901,6 +902,10 @@ private function registerProfilerConfiguration(array $config, ContainerBuilder $
901902
if (!$container->getParameter('kernel.debug') || !class_exists(CliRequest::class) || !$container->has('debug.stopwatch')) {
902903
$container->removeDefinition('console_profiler_listener');
903904
}
905+
906+
if (!class_exists(CommandDataCollector::class)) {
907+
$container->removeDefinition('.data_collector.command');
908+
}
904909
}
905910

906911
private function registerWorkflowConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader): void

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"symfony/error-handler": "^6.4|^7.0",
2727
"symfony/event-dispatcher": "^6.4|^7.0",
2828
"symfony/http-foundation": "^6.4|^7.0",
29-
"symfony/http-kernel": "^6.4|^7.0",
29+
"symfony/http-kernel": "^6.4",
3030
"symfony/polyfill-mbstring": "~1.0",
3131
"symfony/filesystem": "^6.4|^7.0",
3232
"symfony/finder": "^6.4|^7.0",

0 commit comments

Comments
 (0)