Merge branch '2.6' into 2.7

* 2.6:
  [Routing][DependencyInjection] Support .yaml extension in YAML loaders
  [DX] improve file loader error for router/other resources in bundle
  [FrameworkBundle] Initialize translator with the default locale.
  [FrameworkBundle] Fix Routing\DelegatingLoader resiliency to fatal errors
  [2.6][Translation] remove duplicate code for loading catalogue.
  [HttpKernel] Cleanup ExceptionListener
  CS fixes
  [DependencyInjection] Show better error when the Yaml component is not installed
  [2.3] SCA for Components - reference mismatches
  [Debug] Scream as LogLevel::DEBUG (but for fatal errors / uncaught exceptions)
  [2.3] Static Code Analysis for Components
  [WebProfilerBundle] Fix resiliency to exceptions thrown by the url generator
  [Translation] LoggingTranslator simplifications
  [Translation][fixed test] refresh cache when resources are no longer fresh.
  [FrameworkBundle] Fixed server:start --router relative path issue #14124
  [FrameworkBundle] improve usage of Table helper
  [Validator] Added missing Simplified Chinese (zh_CN) translations
  [FrameworkBundle] Workaround php -S ignoring auto_prepend_file

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php
	src/Symfony/Component/Console/Helper/Table.php
	src/Symfony/Component/Translation/LoggingTranslator.php

Author: nicolas-grekas

Exception/FileLoaderLoadException.php

@@ -58,7 +58,8 @@ public function __construct($resource, $sourceResource = null, $code = null, $pr
         if ('@' === $resource[0]) {
             $parts = explode(DIRECTORY_SEPARATOR, $resource);
             $bundle = substr($parts[0], 1);
-            $message .= ' '.sprintf('Make sure the "%s" bundle is correctly registered and loaded in the application kernel class.', $bundle);
+            $message .= sprintf(' Make sure the "%s" bundle is correctly registered and loaded in the application kernel class.', $bundle);
+            $message .= sprintf(' If the bundle is registered, make sure the bundle path "%s" is not empty.', $resource);
         }
 
         parent::__construct($message, $code, $previous);

Loader/FileLoader.php

@@ -103,7 +103,12 @@ public function import($resource, $type = null, $ignoreErrors = false, $sourceRe
             }
             self::$loading[$resource] = true;
 
-            $ret = $loader->load($resource, $type);
+            try {
+                $ret = $loader->load($resource, $type);
+            } catch (\Exception $e) {
+                unset(self::$loading[$resource]);
+                throw $e;
+            }
 
             unset(self::$loading[$resource]);
 

Tests/Exception/FileLoaderLoadExceptionTest.php

@@ -32,7 +32,8 @@ public function testMessageCannotImportBundleResource()
         $exception = new FileLoaderLoadException('@resource', 'sourceResource');
         $this->assertEquals(
             'Cannot import resource "@resource" from "sourceResource". '.
-            'Make sure the "resource" bundle is correctly registered and loaded in the application kernel class.',
+            'Make sure the "resource" bundle is correctly registered and loaded in the application kernel class. '.
+            'If the bundle is registered, make sure the bundle path "@resource" is not empty.',
             $exception->getMessage()
         );
     }
@@ -76,7 +77,8 @@ public function testMessageHasPreviousErrorAndUnableToLoadBundle()
         $this->assertEquals(
             'There was a previous error with an ending dot in @resource '.
             '(which is loaded in resource "@resource"). '.
-            'Make sure the "resource" bundle is correctly registered and loaded in the application kernel class.',
+            'Make sure the "resource" bundle is correctly registered and loaded in the application kernel class. '.
+            'If the bundle is registered, make sure the bundle path "@resource" is not empty.',
             $exception->getMessage()
         );
     }