Merge branch '4.3' into 4.4

* 4.3:
  [FrameworkBundle] Fix wrong returned status code in ConfigDebugCommand
  [AnnotationCacheWarmer] add RedirectController to annotation cache
  [DI] add tests loading calls with returns-clone
  [EventDispatcher] Added tests for aliased events.
  [DI] Add CSV env var processor tests

Author: nicolas-grekas

EnvVarProcessor.php

@@ -236,7 +236,7 @@ public function getEnv($prefix, $name, \Closure $getEnv)
         }
 
         if ('csv' === $prefix) {
-            return str_getcsv($env);
+            return str_getcsv($env, ',', '"', \PHP_VERSION_ID >= 70400 ? '' : '\\');
         }
 
         if ('trim' === $prefix) {

Tests/EnvVarProcessorTest.php

@@ -478,4 +478,37 @@ public function testRequireFile()
 
         $this->assertEquals('foo', $result);
     }
+
+    /**
+     * @dataProvider validCsv
+     */
+    public function testGetEnvCsv($value, $processed)
+    {
+        $processor = new EnvVarProcessor(new Container());
+
+        $result = $processor->getEnv('csv', 'foo', function ($name) use ($value) {
+            $this->assertSame('foo', $name);
+
+            return $value;
+        });
+
+        $this->assertSame($processed, $result);
+    }
+
+    public function validCsv()
+    {
+        $complex = <<<'CSV'
+,"""","foo""","\""",\,foo\
+CSV;
+
+        return [
+            ['', [null]],
+            [',', ['', '']],
+            ['1', ['1']],
+            ['1,2," 3 "', ['1', '2', ' 3 ']],
+            ['\\,\\\\', ['\\', '\\\\']],
+            [$complex, \PHP_VERSION_ID >= 70400 ? ['', '"', 'foo"', '\\"', '\\', 'foo\\'] : ['', '"', 'foo"', '\\"",\\,foo\\']],
+            [null, null],
+        ];
+    }
 }

Tests/Fixtures/xml/returns_clone.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd">
+
+    <services>
+        <service id="foo">
+            <call method="bar" returns-clone="true" />
+        </service>
+    </services>
+</container>

Tests/Fixtures/yaml/returns_clone.yaml

@@ -0,0 +1,5 @@
+services:
+    foo:
+        calls:
+            - {method: bar, arguments: [1], returns_clone: true}
+            - [bar, [2], true]

Tests/Loader/XmlFileLoaderTest.php

@@ -904,6 +904,15 @@ public function testOverriddenDefaultsBindings()
         $this->assertSame('overridden', $container->get('bar')->quz);
     }
 
+    public function testReturnsClone()
+    {
+        $container = new ContainerBuilder();
+        $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
+        $loader->load('returns_clone.xml');
+
+        $this->assertSame([['bar', [], true]], $container->getDefinition('foo')->getMethodCalls());
+    }
+
     public function testSinglyImplementedInterfacesInMultipleResources()
     {
         $container = new ContainerBuilder();

Tests/Loader/YamlFileLoaderTest.php

@@ -842,6 +842,19 @@ public function testDefaultValueOfTagged()
         $this->assertNull($iteratorArgument->getIndexAttribute());
     }
 
+    public function testReturnsClone()
+    {
+        $container = new ContainerBuilder();
+        $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
+        $loader->load('returns_clone.yaml');
+
+        $expected = [
+            ['bar', [1], true],
+            ['bar', [2], true],
+        ];
+        $this->assertSame($expected, $container->getDefinition('foo')->getMethodCalls());
+    }
+
     public function testSinglyImplementedInterfacesInMultipleResources()
     {
         $container = new ContainerBuilder();