Skip to content

Commit c821933

Browse files
Victor Shiostrolucky
authored andcommitted
Fix region_lifetime not applied to explicitly declared SLC regions
1 parent f50315b commit c821933

2 files changed

Lines changed: 6 additions & 3 deletions

File tree

src/DependencyInjection/Configuration.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -604,7 +604,7 @@ private function getOrmEntityManagersNode(): ArrayNodeDefinition
604604
->scalarNode('lock_path')->defaultValue('%kernel.cache_dir%/doctrine/orm/slc/filelock')->end()
605605
->scalarNode('lock_lifetime')->defaultValue(60)->end()
606606
->scalarNode('type')->defaultValue('default')->end()
607-
->scalarNode('lifetime')->defaultValue(0)->end()
607+
->scalarNode('lifetime')->defaultNull()->end()
608608
->scalarNode('service')->end()
609609
->scalarNode('name')->end()
610610
->end()

src/DependencyInjection/DoctrineExtension.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1191,7 +1191,7 @@ private function loadOrmSecondLevelCache(array $entityManager, Definition $ormCo
11911191

11921192
$container
11931193
->setDefinition($regionId, new Definition(DefaultRegion::class))
1194-
->setArguments([$name, new Reference($driverId), $region['lifetime']]);
1194+
->setArguments([$name, new Reference($driverId), $region['lifetime'] ?? $entityManager['second_level_cache']['region_lifetime']]);
11951195
}
11961196

11971197
if ($regionType === 'filelock') {
@@ -1205,7 +1205,10 @@ private function loadOrmSecondLevelCache(array $entityManager, Definition $ormCo
12051205
$regionsDef->addMethodCall('getLockLifetime', [$name, $region['lock_lifetime']]);
12061206
}
12071207

1208-
$regionsDef->addMethodCall('setLifetime', [$name, $region['lifetime']]);
1208+
if ($region['lifetime'] !== null) {
1209+
$regionsDef->addMethodCall('setLifetime', [$name, $region['lifetime']]);
1210+
}
1211+
12091212
$slcFactoryDef->addMethodCall('setRegion', [$regionRef]);
12101213
}
12111214
}

0 commit comments

Comments
 (0)