Merge branch '2.7' into 2.8

* 2.7:
  [Console] Add missing `@require` annotation in test
  Fix merge
  [appveyor] Fix failure reporting
  [#17634] move DebugBundle license file
  backport GlobTest from 2.7 branch
  Move licenses according to new best practices
  [FrameworkBundle] Remove unused code in test
  [2.3] Fixed an undefined variable in Glob::toRegex
  simplified a test
  fix container cache key generation
  [Form] fix option name in changelog
  [Translation] Add resources from fallback locale
  [DependencyInjection] enforce tags to have a name
  [YAML] Refine the return value of Yaml::parse()

Conflicts:
	src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php

Author: nicolas-grekas

Resources/meta/LICENSE renamed to LICENSE

@@ -513,7 +513,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];
         }

Tests/DependencyInjection/FrameworkExtensionTest.php

@@ -28,7 +28,7 @@ protected function loadFromFile(ContainerBuilder $container, $file)
      */
     public function testAssetsCannotHavePathAndUrl()
     {
-        $container = $this->createContainerFromClosure(function ($container) {
+        $this->createContainerFromClosure(function ($container) {
             $container->loadFromExtension('framework', array(
                 'assets' => array(
                     'base_urls' => 'http://cdn.example.com',
@@ -43,7 +43,7 @@ public function testAssetsCannotHavePathAndUrl()
      */
     public function testAssetPackageCannotHavePathAndUrl()
     {
-        $container = $this->createContainerFromClosure(function ($container) {
+        $this->createContainerFromClosure(function ($container) {
             $container->loadFromExtension('framework', array(
                 'assets' => array(
                     'packages' => array(