Skip to content

Commit 07380a8

Browse files
committed
Merge branch '2.3' into 2.7
* 2.3: fix container cache key generation [Translation] Add resources from fallback locale [DependencyInjection] enforce tags to have a name [YAML] Refine the return value of Yaml::parse()
2 parents 013fc00 + 25094c9 commit 07380a8

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Tests/DependencyInjection/FrameworkExtensionTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ protected function createContainer(array $data = array())
472472

473473
protected function createContainerFromFile($file, $data = array())
474474
{
475-
$cacheKey = md5($file.serialize($data));
475+
$cacheKey = md5(get_class($this).$file.serialize($data));
476476
if (isset(self::$containerCache[$cacheKey])) {
477477
return self::$containerCache[$cacheKey];
478478
}

0 commit comments

Comments
 (0)