Merge branch '2.3' into 2.7

* 2.3:
  [DependencyInjection] fix dumped YAML snytax
  Remove InputOption::VALUE_REQUIRED mode from $default parameter description as InputOption::setDefault() throws an exception only when called in InputOption::VALUE_NONE mode. In practice the $default value could still be accessed in InputOption::VALUE_REQUIRED mode in case InputOption was never set but accessed from InputDefinition::getOption() method
  [Form] Fixed violation mapping if multiple forms are using the same (or part of the same) property path
  [TwigBridge] Symfony 3.1 forward compatibility

Author: fabpot

Dumper/YamlDumper.php

@@ -65,7 +65,7 @@ private function addService($id, $definition)
                 $class = substr($class, 1);
             }
 
-            $code .= sprintf("        class: %s\n", $class);
+            $code .= sprintf("        class: %s\n", $this->dumper->dump($class));
         }
 
         if (!$definition->isPublic()) {
@@ -101,7 +101,7 @@ private function addService($id, $definition)
         }
 
         if ($definition->getFactoryClass(false)) {
-            $code .= sprintf("        factory_class: %s\n", $definition->getFactoryClass(false));
+            $code .= sprintf("        factory_class: %s\n", $this->dumper->dump($definition->getFactoryClass(false)));
         }
 
         if ($definition->isLazy()) {

Tests/Dumper/YamlDumperTest.php

@@ -13,6 +13,7 @@
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Dumper\YamlDumper;
+use Symfony\Component\Yaml\Yaml;
 
 class YamlDumperTest extends \PHPUnit_Framework_TestCase
 {
@@ -27,17 +28,14 @@ public function testDump()
     {
         $dumper = new YamlDumper($container = new ContainerBuilder());
 
-        $this->assertStringEqualsFile(self::$fixturesPath.'/yaml/services1.yml', $dumper->dump(), '->dump() dumps an empty container as an empty YAML file');
-
-        $container = new ContainerBuilder();
-        $dumper = new YamlDumper($container);
+        $this->assertEqualYamlStructure(self::$fixturesPath.'/yaml/services1.yml', $dumper->dump(), '->dump() dumps an empty container as an empty YAML file');
     }
 
     public function testAddParameters()
     {
         $container = include self::$fixturesPath.'/containers/container8.php';
         $dumper = new YamlDumper($container);
-        $this->assertStringEqualsFile(self::$fixturesPath.'/yaml/services8.yml', $dumper->dump(), '->dump() dumps parameters');
+        $this->assertEqualYamlStructure(self::$fixturesPath.'/yaml/services8.yml', $dumper->dump(), '->dump() dumps parameters');
     }
 
     /**
@@ -65,7 +63,7 @@ public function testAddService()
     {
         $container = include self::$fixturesPath.'/containers/container9.php';
         $dumper = new YamlDumper($container);
-        $this->assertEquals(str_replace('%path%', self::$fixturesPath.DIRECTORY_SEPARATOR.'includes'.DIRECTORY_SEPARATOR, file_get_contents(self::$fixturesPath.'/yaml/services9.yml')), $dumper->dump(), '->dump() dumps services');
+        $this->assertEqualYamlStructure(str_replace('%path%', self::$fixturesPath.DIRECTORY_SEPARATOR.'includes'.DIRECTORY_SEPARATOR, file_get_contents(self::$fixturesPath.'/yaml/services9.yml')), $dumper->dump(), '->dump() dumps services');
 
         $dumper = new YamlDumper($container = new ContainerBuilder());
         $container->register('foo', 'FooClass')->addArgument(new \stdClass());
@@ -77,4 +75,9 @@ public function testAddService()
             $this->assertEquals('Unable to dump a service container if a parameter is an object or a resource.', $e->getMessage(), '->dump() throws a RuntimeException if the container to be dumped has reference to objects or resources');
         }
     }
+
+    private function assertEqualYamlStructure($yaml, $expected, $message = '')
+    {
+        $this->assertEquals(Yaml::parse($expected), Yaml::parse($yaml), $message);
+    }
 }

Tests/Fixtures/yaml/legacy-services9.yml

@@ -18,8 +18,8 @@ services:
 
         configurator: sc_configure
     foo.baz:
-        class: %baz_class%
-        factory_class: %baz_class%
+        class: '%baz_class%'
+        factory_class: '%baz_class%'
         factory_method: getInstance
         configurator: ['%baz_class%', configureStatic1]
     factory_service:

Tests/Fixtures/yaml/services10.yml

@@ -6,4 +6,4 @@ services:
         class: BAR
 
 project:
-    test: %project.parameter.foo%
+    test: '%project.parameter.foo%'

Tests/Fixtures/yaml/services6.yml

@@ -4,7 +4,7 @@ services:
     scope.container: { class: FooClass, scope: container }
     scope.custom: { class: FooClass, scope: custom }
     scope.prototype: { class: FooClass, scope: prototype }
-    file: { class: FooClass, file: %path%/foo.php }
+    file: { class: FooClass, file: '%path%/foo.php' }
     arguments: { class: FooClass, arguments: [foo, '@foo', [true, false]] }
     configurator1: { class: FooClass, configurator: sc_configure }
     configurator2: { class: FooClass, configurator: ['@baz', configure] }

Tests/Fixtures/yaml/services9.yml

@@ -18,19 +18,19 @@ services:
         factory: [Bar\FooClass, getInstance]
         configurator: sc_configure
     foo.baz:
-        class: %baz_class%
+        class: '%baz_class%'
         factory: ['%baz_class%', getInstance]
         configurator: ['%baz_class%', configureStatic1]
     bar:
         class: Bar\FooClass
         arguments: [foo, '@foo.baz', '%foo_bar%']
         configurator: ['@foo.baz', configure]
     foo_bar:
-        class: %foo_class%
+        class: '%foo_class%'
         scope: prototype
     method_call1:
         class: Bar\FooClass
-        file: %path%foo.php
+        file: '%path%foo.php'
         calls:
             - [setBar, ['@foo']]
             - [setBar, ['@?foo2']]