[DI] PhpDumper. Make generated code compatible with coding standards

symfony · Strate · Oct 11, 2017 · Oct 11, 2017 · Oct 12, 2017 · Oct 12, 2017
commit e6e649b7dc69522be076300dedce305e09d4e6f1
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -1920,7 +1920,7 @@ private function doExport($value)
        if (is_string($value) && false !== strpos($value, "\n")) {
            $cleanParts = explode("\n", $value);
            $cleanParts = array_map(function ($part) { return var_export($part, true); }, $cleanParts);
-            $export = implode(' . "\n" . ', $cleanParts);
+            $export = implode('."\n".', $cleanParts);
        } else {
            $export = var_export($value, true);
        }

diff --git a/...ny/Component/DependencyInjection/Tests/Fixtures/php/container_nl_in_argument_as_files.txt b/...ny/Component/DependencyInjection/Tests/Fixtures/php/container_nl_in_argument_as_files.txt
@@ -1,31 +1,31 @@
 Array
 (
-    [ContainerQug0xcu/removed-ids.php] => <?php
+    [ContainerAx0roru/removed-ids.php] => <?php

 return array(
    'Psr\\Container\\ContainerInterface' => true,
    'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
 );

-    [ContainerQug0xcu/getFooService.php] => <?php
+    [ContainerAx0roru/getFooService.php] => <?php

 use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;

 // This file has been auto-generated by the Symfony Dependency Injection Component for internal use.
 // Returns the public 'foo' shared service.

-return $this->services['foo'] = new \Foo('string with' . "\n" . 'new line');
+return $this->services['foo'] = new \Foo('string with'."\n".'new line');

-    [ContainerQug0xcu/getFoo2Service.php] => <?php
+    [ContainerAx0roru/getFoo2Service.php] => <?php

 use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;

 // This file has been auto-generated by the Symfony Dependency Injection Component for internal use.
 // Returns the public 'foo2' shared service.

-return $this->services['foo2'] = new \Foo('string with' . "\n" . 'nl');
+return $this->services['foo2'] = new \Foo('string with'."\n".'nl');

-    [ContainerQug0xcu/Container.php] => <?php
+    [ContainerAx0roru/Container.php] => <?php

 use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -41,7 +41,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
 *
 * @final since Symfony 3.3
 */
-class ContainerQug0xcu extends Container
+class ContainerAx0roru extends Container
 {
    private $parameters;
    private $targetDirs = array();
@@ -93,14 +93,14 @@ class ContainerQug0xcu extends Container

 // This file has been auto-generated by the Symfony Dependency Injection Component for internal use.

-if (!class_exists(ContainerQug0xcu::class, false)) {
-    require __DIR__.'/ContainerQug0xcu/Container.php';
+if (!class_exists(ContainerAx0roru::class, false)) {
+    require __DIR__.'/ContainerAx0roru/Container.php';
 }

 if (!class_exists(ProjectServiceContainer::class, false)) {
-    class_alias(ContainerQug0xcu::class, ProjectServiceContainer::class, false);
+    class_alias(ContainerAx0roru::class, ProjectServiceContainer::class, false);
 }

-return new ContainerQug0xcu();
+return new ContainerAx0roru();

 )