Merge branch '2.7' into 2.8

fabpot · fabpot · commit 6f229d03e96f · 2017-05-07T18:18:23.000-07:00
* 2.7:
  [DI] Fix PhpDumper blank lines around namespace
diff --git a/Dumper/PhpDumper.php b/Dumper/PhpDumper.php
@@ -847,7 +847,7 @@ private function addNewInstance($id, Definition $definition, $return, $instantia
     private function startClass($class, $baseClass, $namespace)
     {
         $bagClass = $this->container->isFrozen() ? 'use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;' : 'use Symfony\Component\DependencyInjection\ParameterBag\\ParameterBag;';
-        $namespaceLine = $namespace ? "namespace $namespace;\n" : '';
+        $namespaceLine = $namespace ? "\nnamespace $namespace;\n" : '';
 
         return <<<EOF
 <?php

Original file line number	Diff line number	Diff line change
`@@ -847,7 +847,7 @@ private function addNewInstance($id, Definition $definition, $return, $instantia`
`847`	`847`	`private function startClass($class, $baseClass, $namespace)`
`848`	`848`	`{`
`849`	`849`	`$bagClass = $this->container->isFrozen() ? 'use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;' : 'use Symfony\Component\DependencyInjection\ParameterBag\\ParameterBag;';`
`850`		`- $namespaceLine = $namespace ? "namespace $namespace;\n" : '';`
	`850`	`+ $namespaceLine = $namespace ? "\nnamespace $namespace;\n" : '';`
`851`	`851`
`852`	`852`	`return <<<EOF`
`853`	`853`	`<?php`