Skip to content

Commit 6085995

Browse files
Merge branch '3.1' into 3.2
* 3.1: (28 commits) Fix merge [Validator] add class name to the cache key [Serializer] Remove AbstractObjectNormalizer::isAttributeToNormalize Throw less misleading exception when property access not found [Twig] Fix deprecations with Twig 1.29 Fixed typo [FrameworkBundle] Removed the kernel.debug parameter from the cache pool namespace seed Fix email address fix the docblock in regard to the role argument Don't use the "app" global variable in the profiler [VarDumper] fix tests when xdebug is enabled Fix merge FIXED NON EXISTING TYPE DECLARATION [Cache] Fix dumping SplDoublyLinkedList iter mode [Console] fixed PHP7 Errors when not using Dispatcher Regression test for missing controller arguments (3.1) Regression test for missing controller arguments fix a test checking for a value [Form][DX] FileType "multiple" fixes fixed CS ...
2 parents 8d80628 + e3c97e0 commit 6085995

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

DependencyInjection/Compiler/CachePoolPass.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public function process(ContainerBuilder $container)
3434
} else {
3535
$seed = '_'.$container->getParameter('kernel.root_dir');
3636
}
37-
$seed .= '.'.$container->getParameter('kernel.name').'.'.$container->getParameter('kernel.environment').'.'.$container->getParameter('kernel.debug');
37+
$seed .= '.'.$container->getParameter('kernel.name').'.'.$container->getParameter('kernel.environment');
3838

3939
$aliases = $container->getAliases();
4040
$attributes = array(

Tests/DependencyInjection/Compiler/CachePoolPassTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public function testNamespaceArgumentIsReplaced()
4545

4646
$this->cachePoolPass->process($container);
4747

48-
$this->assertSame('C42Pcl9VBJ', $cachePool->getArgument(0));
48+
$this->assertSame('D07rhFx97S', $cachePool->getArgument(0));
4949
}
5050

5151
public function testArgsAreReplaced()
@@ -69,7 +69,7 @@ public function testArgsAreReplaced()
6969

7070
$this->assertInstanceOf(Reference::class, $cachePool->getArgument(0));
7171
$this->assertSame('foobar', (string) $cachePool->getArgument(0));
72-
$this->assertSame('KO3xHaFEZU', $cachePool->getArgument(1));
72+
$this->assertSame('itantF+pIq', $cachePool->getArgument(1));
7373
$this->assertSame(3, $cachePool->getArgument(2));
7474
}
7575

0 commit comments

Comments
 (0)