minor #17620 [FrameworkBundle] fix container cache key generation (xabbuh)

fabpot · fabpot · commit 9cdb2074ced6 · 2016-01-31T08:38:33.000+01:00
This PR was merged into the 2.3 branch. Discussion ---------- [FrameworkBundle] fix container cache key generation | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | If the actual class name were not taken into, we would not be able to detect inconsistencies between the different configuration formats (PHP, YAML, and XML) as the container built based on the first evaluated configuration format would be cached and reused by tests for the other formats too. Commits ------- 29750e5 fix container cache key generation
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -309,7 +309,7 @@ protected function createContainer(array $data = array())
 
     protected function createContainerFromFile($file, $data = array())
     {
-        $cacheKey = md5($file.serialize($data));
+        $cacheKey = md5(get_class($this).$file.serialize($data));
         if (isset(self::$containerCache[$cacheKey])) {
             return self::$containerCache[$cacheKey];
         }

Original file line number	Diff line number	Diff line change
`@@ -309,7 +309,7 @@ protected function createContainer(array $data = array())`
`309`	`309`
`310`	`310`	`protected function createContainerFromFile($file, $data = array())`
`311`	`311`	`{`
`312`		`- $cacheKey = md5($file.serialize($data));`
	`312`	`+ $cacheKey = md5(get_class($this).$file.serialize($data));`
`313`	`313`	`if (isset(self::$containerCache[$cacheKey])) {`
`314`	`314`	`return self::$containerCache[$cacheKey];`
`315`	`315`	`}`