Skip to content

Commit 45d4f6a

Browse files
biozshockostrolucky
authored andcommitted
CacheCompatibilityPass will also take care of FileLockRegion.
1 parent 97cea21 commit 45d4f6a

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

DependencyInjection/Compiler/CacheCompatibilityPass.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,11 @@ private function updateSecondLevelCache(ContainerBuilder $container, Definition
6767

6868
$regionDefinition = $container->getDefinition($factoryMethodCall[1][0]);
6969

70+
// Get inner service for FileLock
71+
if ($regionDefinition->getClass() === '%doctrine.orm.second_level_cache.filelock_region.class%') {
72+
$regionDefinition = $container->getDefinition($regionDefinition->getArgument(0));
73+
}
74+
7075
// We don't know how to adjust custom region classes
7176
if ($regionDefinition->getClass() !== '%doctrine.orm.second_level_cache.default_region.class%') {
7277
continue;

Tests/DependencyInjection/Compiler/CacheCompatibilityPassTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ public function registerContainerConfiguration(LoaderInterface $loader): void
5252
'second_level_cache' => [
5353
'enabled' => true,
5454
'regions' => [
55+
'filelock' => ['type' => 'filelock', 'lifetime' => 0, 'cache_driver' => ['type' => 'pool', 'pool' => 'doctrine.system_cache_pool']],
5556
'lifelong' => ['lifetime' => 0, 'cache_driver' => ['type' => 'pool', 'pool' => 'doctrine.system_cache_pool']],
5657
'entity_cache_region' => ['type' => 'service', 'service' => $this->regionClass],
5758
],

0 commit comments

Comments
 (0)