Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit aa7d6a28a40a · 2016-12-08T16:59:39.000+01:00
* 2.7:
  [WebProfilerBundle] Fix whitespace control in layout.html.twig
  [Validator] Fix init of YamlFileLoader::$classes for empty files
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/layout.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/layout.html.twig
@@ -72,11 +72,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' : '' }}">
diff --git a/src/Symfony/Component/Validator/Mapping/Loader/YamlFileLoader.php b/src/Symfony/Component/Validator/Mapping/Loader/YamlFileLoader.php
@@ -46,13 +46,7 @@ public function loadClassMetadata(ClassMetadata $metadata)
                 $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 false;
-            }
-
-            $this->classes = $classes;
+            $this->classes = $this->parseFile($this->file);
 
             if (isset($this->classes['namespaces'])) {
                 foreach ($this->classes['namespaces'] as $alias => $namespace) {
@@ -111,7 +105,7 @@ protected function parseNodes(array $nodes)
      *
      * @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
@@ -126,7 +120,7 @@ private function parseFile($path)
 
         // empty file
         if (null === $classes) {
-            return;
+            return array();
         }
 
         // not an array
diff --git a/src/Symfony/Component/Validator/Tests/Mapping/Loader/YamlFileLoaderTest.php b/src/Symfony/Component/Validator/Tests/Mapping/Loader/YamlFileLoaderTest.php
@@ -31,6 +31,10 @@ public function testLoadClassMetadataReturnsFalseIfEmpty()
         $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));
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -46,13 +46,7 @@ public function loadClassMetadata(ClassMetadata $metadata)`
`46`	`46`	`$this->yamlParser = new YamlParser();`
`47`	`47`	`}`
`48`	`48`
`49`		`- // This method may throw an exception. Do not modify the class'`
`50`		`- // state before it completes`
`51`		`- if (false === ($classes = $this->parseFile($this->file))) {`
`52`		`- return false;`
`53`		`- }`
`54`		`-`
`55`		`- $this->classes = $classes;`
	`49`	`+ $this->classes = $this->parseFile($this->file);`
`56`	`50`
`57`	`51`	`if (isset($this->classes['namespaces'])) {`
`58`	`52`	`foreach ($this->classes['namespaces'] as $alias => $namespace) {`
`@@ -111,7 +105,7 @@ protected function parseNodes(array $nodes)`
`111`	`105`	`*`
`112`	`106`	`* @param string $path The path of the YAML file`
`113`	`107`	`*`
`114`		`- * @return array\|null The class descriptions or null, if the file was empty`
	`108`	`+ * @return array The class descriptions`
`115`	`109`	`*`
`116`	`110`	`* @throws \InvalidArgumentException If the file could not be loaded or did`
`117`	`111`	`* not contain a YAML array`
`@@ -126,7 +120,7 @@ private function parseFile($path)`
`126`	`120`
`127`	`121`	`// empty file`
`128`	`122`	`if (null === $classes) {`
`129`		`- return;`
	`123`	`+ return array();`
`130`	`124`	`}`
`131`	`125`
`132`	`126`	`// not an array`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,10 @@ public function testLoadClassMetadataReturnsFalseIfEmpty()`
`31`	`31`	`$metadata = new ClassMetadata('Symfony\Component\Validator\Tests\Fixtures\Entity');`
`32`	`32`
`33`	`33`	`$this->assertFalse($loader->loadClassMetadata($metadata));`
	`34`	`+`
	`35`	`+ $r = new \ReflectionProperty($loader, 'classes');`
	`36`	`+ $r->setAccessible(true);`
	`37`	`+ $this->assertSame(array(), $r->getValue($loader));`
`34`	`38`	`}`
`35`	`39`
`36`	`40`	`/**`