Skip to content

Commit 880281a

Browse files
[HttpKernel] fix kernel.name deprecation
1 parent 0bb202a commit 880281a

File tree

3 files changed

+9
-14
lines changed

3 files changed

+9
-14
lines changed

Resources/config/collectors.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@
1010
<service id="data_collector.config" class="Symfony\Component\HttpKernel\DataCollector\ConfigDataCollector">
1111
<tag name="data_collector" template="@WebProfiler/Collector/config.html.twig" id="config" priority="-255" />
1212
<call method="setKernel"><argument type="service" id="kernel" on-invalid="ignore" /></call>
13+
<argument type="service">
14+
<service class="string">
15+
<factory function="basename" />
16+
<argument>%kernel.project_dir%</argument>
17+
</service>
18+
</argument>
1319
</service>
1420

1521
<service id="data_collector.request" class="Symfony\Component\HttpKernel\DataCollector\RequestDataCollector">

Tests/DependencyInjection/Compiler/CachePoolClearerPassTest.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,7 @@ class CachePoolClearerPassTest extends TestCase
2929
public function testPoolRefsAreWeak()
3030
{
3131
$container = new ContainerBuilder();
32-
$container->setParameter('kernel.debug', false);
3332
$container->setParameter('kernel.container_class', 'app');
34-
$container->setParameter('kernel.environment', 'prod');
3533
$container->setParameter('kernel.project_dir', 'foo');
3634

3735
$globalClearer = new Definition(Psr6CacheClearer::class);

Tests/DependencyInjection/Compiler/CachePoolPassTest.php

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,7 @@ protected function setUp()
3434
public function testNamespaceArgumentIsReplaced()
3535
{
3636
$container = new ContainerBuilder();
37-
$container->setParameter('kernel.debug', false);
3837
$container->setParameter('kernel.container_class', 'app');
39-
$container->setParameter('kernel.environment', 'prod');
4038
$container->setParameter('kernel.project_dir', 'foo');
4139
$adapter = new Definition();
4240
$adapter->setAbstract(true);
@@ -50,13 +48,12 @@ public function testNamespaceArgumentIsReplaced()
5048

5149
$this->cachePoolPass->process($container);
5250

53-
$this->assertSame('D07rhFx97S', $cachePool->getArgument(0));
51+
$this->assertSame('z3X945Jbf5', $cachePool->getArgument(0));
5452
}
5553

5654
public function testNamespaceArgumentIsNotReplacedIfArrayAdapterIsUsed()
5755
{
5856
$container = new ContainerBuilder();
59-
$container->setParameter('kernel.environment', 'prod');
6057
$container->setParameter('kernel.container_class', 'app');
6158
$container->setParameter('kernel.project_dir', 'foo');
6259

@@ -74,9 +71,7 @@ public function testNamespaceArgumentIsNotReplacedIfArrayAdapterIsUsed()
7471
public function testArgsAreReplaced()
7572
{
7673
$container = new ContainerBuilder();
77-
$container->setParameter('kernel.debug', false);
7874
$container->setParameter('kernel.container_class', 'app');
79-
$container->setParameter('kernel.environment', 'prod');
8075
$container->setParameter('cache.prefix.seed', 'foo');
8176
$cachePool = new Definition();
8277
$cachePool->addTag('cache.pool', array(
@@ -92,16 +87,14 @@ public function testArgsAreReplaced()
9287

9388
$this->assertInstanceOf(Reference::class, $cachePool->getArgument(0));
9489
$this->assertSame('foobar', (string) $cachePool->getArgument(0));
95-
$this->assertSame('itantF+pIq', $cachePool->getArgument(1));
90+
$this->assertSame('tQNhcV-8xa', $cachePool->getArgument(1));
9691
$this->assertSame(3, $cachePool->getArgument(2));
9792
}
9893

9994
public function testWithNameAttribute()
10095
{
10196
$container = new ContainerBuilder();
102-
$container->setParameter('kernel.debug', false);
10397
$container->setParameter('kernel.container_class', 'app');
104-
$container->setParameter('kernel.environment', 'prod');
10598
$container->setParameter('cache.prefix.seed', 'foo');
10699
$cachePool = new Definition();
107100
$cachePool->addTag('cache.pool', array(
@@ -115,7 +108,7 @@ public function testWithNameAttribute()
115108

116109
$this->cachePoolPass->process($container);
117110

118-
$this->assertSame('9HvPgAayyh', $cachePool->getArgument(1));
111+
$this->assertSame('+naTpPa4Sm', $cachePool->getArgument(1));
119112
}
120113

121114
/**
@@ -125,9 +118,7 @@ public function testWithNameAttribute()
125118
public function testThrowsExceptionWhenCachePoolTagHasUnknownAttributes()
126119
{
127120
$container = new ContainerBuilder();
128-
$container->setParameter('kernel.debug', false);
129121
$container->setParameter('kernel.container_class', 'app');
130-
$container->setParameter('kernel.environment', 'prod');
131122
$container->setParameter('kernel.project_dir', 'foo');
132123
$adapter = new Definition();
133124
$adapter->setAbstract(true);

0 commit comments

Comments
 (0)