Merge branch '3.4' into 4.3

* 3.4:
  [DI] Missing test on YamlFileLoader

Author: nicolas-grekas

Tests/Loader/YamlFileLoaderTest.php

@@ -371,6 +371,9 @@ public function testParsesIteratorArgument()
         $lazyDefinition = $container->getDefinition('lazy_context');
 
         $this->assertEquals([new IteratorArgument(['k1' => new Reference('foo.baz'), 'k2' => new Reference('service_container')]), new IteratorArgument([])], $lazyDefinition->getArguments(), '->load() parses lazy arguments');
+
+        $message = 'The "deprecated_service" service is deprecated. You should stop using it, as it will soon be removed.';
+        $this->assertSame($message, $container->getDefinition('deprecated_service')->getDeprecationMessage('deprecated_service'));
     }
 
     public function testAutowire()
@@ -821,6 +824,18 @@ public function testOverriddenDefaultsBindings()
         $this->assertSame('overridden', $container->get('bar')->quz);
     }
 
+    /**
+     * @group legacy
+     * @expectedDeprecation The configuration key "factory" is unsupported for the service "foo" which is defined as an alias in %s.
+     * @expectedDeprecation The configuration key "parent" is unsupported for the service "foo" which is defined as an alias in %s.
+     */
+    public function testAliasDefinitionContainsUnsupportedElements()
+    {
+        $container = new ContainerBuilder();
+        $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
+        $loader->load('legacy_invalid_alias_definition.yml');
+        $this->assertTrue($container->has('foo'));
+
     /**
      * When creating a tagged iterator using the array syntax, all optional parameters should be properly handled.
      */