bug #21552 [FrameworkBundle] Fix annotations cache folder path (akeeman)

nicolas-grekas · nicolas-grekas · commit 81ad336a8af8 · 2017-02-07T21:48:38.000+01:00
This PR was submitted for the master branch but it was merged into the 3.2 branch instead (closes #21552). Discussion ---------- [FrameworkBundle] Fix annotations cache folder path | Q | A | ------------- | --- | Branch? | 3.2 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | n/a | Fixed tickets | n/a | License | MIT | Doc PR | n/a The argument at index 2 sets a cache path as it extends the file system adapter by default since e59f0e0, where it did set the version before that. This change now results in annotation cache folders showing up in the project root (because of the overwritten cache root folder). Because cache.annotations has a parent now, this line is not needed anymore and fixes the problem. Commits ------- 8e5cfa7 Fix annotations cache folder path
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -1235,7 +1235,6 @@ private function registerPropertyInfoConfiguration(array $config, ContainerBuild
     private function registerCacheConfiguration(array $config, ContainerBuilder $container)
     {
         $version = substr(str_replace('/', '-', base64_encode(hash('sha256', uniqid(mt_rand(), true), true))), 0, 22);
-        $container->getDefinition('cache.annotations')->replaceArgument(2, $version);
         $container->getDefinition('cache.adapter.apcu')->replaceArgument(2, $version);
         $container->getDefinition('cache.adapter.system')->replaceArgument(2, $version);
         $container->getDefinition('cache.adapter.filesystem')->replaceArgument(2, $config['directory']);

Original file line number	Diff line number	Diff line change
`@@ -1235,7 +1235,6 @@ private function registerPropertyInfoConfiguration(array $config, ContainerBuild`
`1235`	`1235`	`private function registerCacheConfiguration(array $config, ContainerBuilder $container)`
`1236`	`1236`	`{`
`1237`	`1237`	`$version = substr(str_replace('/', '-', base64_encode(hash('sha256', uniqid(mt_rand(), true), true))), 0, 22);`
`1238`		`- $container->getDefinition('cache.annotations')->replaceArgument(2, $version);`
`1239`	`1238`	`$container->getDefinition('cache.adapter.apcu')->replaceArgument(2, $version);`
`1240`	`1239`	`$container->getDefinition('cache.adapter.system')->replaceArgument(2, $version);`
`1241`	`1240`	`$container->getDefinition('cache.adapter.filesystem')->replaceArgument(2, $config['directory']);`