Skip to content

Commit 8f491c3

Browse files
committed
Merge branch '7.1' into 7.2
* 7.1: doc: add missing use statements minor : the process method from CompilerPassInterface should be public
2 parents 4ea105f + 8246839 commit 8f491c3

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

configuration/multiple_kernels.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,9 @@ resources::
117117
// src/Kernel.php
118118
namespace Shared;
119119

120+
use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
120121
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
122+
use Symfony\Component\HttpKernel\Kernel as BaseKernel;
121123
use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
122124

123125
class Kernel extends BaseKernel
@@ -258,6 +260,7 @@ the application ID to run under CLI context::
258260

259261
// bin/console
260262
use Shared\Kernel;
263+
use Symfony\Bundle\FrameworkBundle\Console\Application;
261264
use Symfony\Component\Console\Input\InputInterface;
262265
use Symfony\Component\Console\Input\InputOption;
263266

testing.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,7 @@ to remove the ``kernel.reset`` tag from some services in your test environment::
606606

607607
// ...
608608

609-
protected function process(ContainerBuilder $container): void
609+
public function process(ContainerBuilder $container): void
610610
{
611611
if ('test' === $this->environment) {
612612
// prevents the security token to be cleared

0 commit comments

Comments
 (0)