[FrameworkBundle] Replace PhpFileCache by FilesystemCache

nicolas-grekas · nicolas-grekas · commit fbb5bb8b4617 · 2015-10-08T11:44:44.000+02:00
diff --git a/DependencyInjection/FrameworkExtension.php b/DependencyInjection/FrameworkExtension.php
@@ -849,7 +849,7 @@ private function registerAnnotationsConfiguration(array $config, ContainerBuilde
                 }
 
                 $container
-                    ->getDefinition('annotations.php_file_cache')
+                    ->getDefinition('annotations.filesystem_cache')
                     ->replaceArgument(0, $cacheDir)
                 ;
 
@@ -863,7 +863,7 @@ private function registerAnnotationsConfiguration(array $config, ContainerBuilde
 
             $container
                 ->getDefinition('annotations.cached_reader')
-                ->replaceArgument(1, new Reference('file' !== $config['cache'] ? $config['cache'] : 'annotations.php_file_cache'))
+                ->replaceArgument(1, new Reference('file' !== $config['cache'] ? $config['cache'] : 'annotations.filesystem_cache'))
                 ->replaceArgument(2, $config['debug'])
             ;
             $container->setAlias('annotation_reader', 'annotations.cached_reader');
diff --git a/Resources/config/annotations.xml b/Resources/config/annotations.xml
@@ -19,7 +19,7 @@
             <argument /><!-- Debug-Flag -->
         </service>
 
-        <service id="annotations.php_file_cache" class="Doctrine\Common\Cache\PhpFileCache" public="false">
+        <service id="annotations.filesystem_cache" class="Doctrine\Common\Cache\FilesystemCache" public="false">
             <argument /><!-- Cache-Directory -->
         </service>
 
diff --git a/Tests/DependencyInjection/FrameworkExtensionTest.php b/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -321,9 +321,9 @@ public function testAnnotations()
     {
         $container = $this->createContainerFromFile('full');
 
-        $this->assertEquals($container->getParameter('kernel.cache_dir').'/annotations', $container->getDefinition('annotations.php_file_cache')->getArgument(0));
+        $this->assertEquals($container->getParameter('kernel.cache_dir').'/annotations', $container->getDefinition('annotations.filesystem_cache')->getArgument(0));
         $this->assertSame('annotations.cached_reader', (string) $container->getAlias('annotation_reader'));
-        $this->assertSame('annotations.php_file_cache', (string) $container->getDefinition('annotations.cached_reader')->getArgument(1));
+        $this->assertSame('annotations.filesystem_cache', (string) $container->getDefinition('annotations.cached_reader')->getArgument(1));
     }
 
     public function testFileLinkFormat()

Original file line number	Diff line number	Diff line change
`@@ -849,7 +849,7 @@ private function registerAnnotationsConfiguration(array $config, ContainerBuilde`
`849`	`849`	`}`
`850`	`850`
`851`	`851`	`$container`
`852`		`- ->getDefinition('annotations.php_file_cache')`
	`852`	`+ ->getDefinition('annotations.filesystem_cache')`
`853`	`853`	`->replaceArgument(0, $cacheDir)`
`854`	`854`	`;`
`855`	`855`
`@@ -863,7 +863,7 @@ private function registerAnnotationsConfiguration(array $config, ContainerBuilde`
`863`	`863`
`864`	`864`	`$container`
`865`	`865`	`->getDefinition('annotations.cached_reader')`
`866`		`- ->replaceArgument(1, new Reference('file' !== $config['cache'] ? $config['cache'] : 'annotations.php_file_cache'))`
	`866`	`+ ->replaceArgument(1, new Reference('file' !== $config['cache'] ? $config['cache'] : 'annotations.filesystem_cache'))`
`867`	`867`	`->replaceArgument(2, $config['debug'])`
`868`	`868`	`;`
`869`	`869`	`$container->setAlias('annotation_reader', 'annotations.cached_reader');`
Original file line number	Diff line number	Diff line change
`@@ -321,9 +321,9 @@ public function testAnnotations()`
`321`	`321`	`{`
`322`	`322`	`$container = $this->createContainerFromFile('full');`
`323`	`323`
`324`		`- $this->assertEquals($container->getParameter('kernel.cache_dir').'/annotations', $container->getDefinition('annotations.php_file_cache')->getArgument(0));`
	`324`	`+ $this->assertEquals($container->getParameter('kernel.cache_dir').'/annotations', $container->getDefinition('annotations.filesystem_cache')->getArgument(0));`
`325`	`325`	`$this->assertSame('annotations.cached_reader', (string) $container->getAlias('annotation_reader'));`
`326`		`- $this->assertSame('annotations.php_file_cache', (string) $container->getDefinition('annotations.cached_reader')->getArgument(1));`
	`326`	`+ $this->assertSame('annotations.filesystem_cache', (string) $container->getDefinition('annotations.cached_reader')->getArgument(1));`
`327`	`327`	`}`
`328`	`328`
`329`	`329`	`public function testFileLinkFormat()`