Merge branch '3.1' into 3.2

* 3.1:
  [WebProfilerBundle] Fix whitespace control in layout.html.twig
  [Validator] Fix init of YamlFileLoader::$classes for empty files

src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/layout.html.twig

@@ -113,11 +113,11 @@
                     <ul id="menu-profiler">
                         {% for name, template in templates %}
                             {% set menu -%}
-                                {% if block('menu', template) is defined %}
+                                {%- if block('menu', template) is defined -%}
                                     {% with { collector: profile.getcollector(name), profiler_markup_version: profiler_markup_version } %}
                                         {{- block('menu', template) -}}
                                     {% endwith %}
-                                {% endif %}
+                                {%- endif -%}
                             {%- endset %}
                             {% if menu is not empty %}
                                 <li class="{{ name }} {{ name == panel ? 'selected' : '' }}">

src/Symfony/Component/Validator/Mapping/Loader/YamlFileLoader.php

@@ -107,7 +107,7 @@ class YamlFileLoader extends FileLoader
      *
      * @param string $path The path of the YAML file
      *
-     * @return array|null The class descriptions or null, if the file was empty
+     * @return array The class descriptions
      *
      * @throws \InvalidArgumentException If the file could not be loaded or did
      *                                   not contain a YAML array
@@ -122,7 +122,7 @@ class YamlFileLoader extends FileLoader
 
         // empty file
         if (null === $classes) {
-            return;
+            return array();
         }
 
         // not an array
@@ -139,13 +139,7 @@ class YamlFileLoader extends FileLoader
             $this->yamlParser = new YamlParser();
         }
 
-        // This method may throw an exception. Do not modify the class'
-        // state before it completes
-        if (false === ($classes = $this->parseFile($this->file))) {
-            return;
-        }
-
-        $this->classes = $classes;
+        $this->classes = $this->parseFile($this->file);
 
         if (isset($this->classes['namespaces'])) {
             foreach ($this->classes['namespaces'] as $alias => $namespace) {

src/Symfony/Component/Validator/Tests/Mapping/Loader/YamlFileLoaderTest.php

@@ -31,6 +31,10 @@ class YamlFileLoaderTest extends \PHPUnit_Framework_TestCase
         $metadata = new ClassMetadata('Symfony\Component\Validator\Tests\Fixtures\Entity');
 
         $this->assertFalse($loader->loadClassMetadata($metadata));
+
+        $r = new \ReflectionProperty($loader, 'classes');
+        $r->setAccessible(true);
+        $this->assertSame(array(), $r->getValue($loader));
     }
 
     /**