Merge branch '4.2'

* 4.2: (45 commits)
  [Form] various minor fixes
  Ensure the parent process is always killed
  bugfix: the terminal state was wrong and not reseted
  [Console] Fix inconsistent result for choice questions in non-interactive mode
  Define null return type for Constraint::getDefaultOption()
  [Routing] Fix: annotation loader ignores method's default values
  [HttpKernel] Fix DebugHandlersListener constructor docblock
  Skip Glob brace test when GLOB_BRACE is unavailable
  bumped Symfony version to 4.2.6
  updated VERSION for 4.2.5
  updated CHANGELOG for 4.2.5
  bumped Symfony version to 3.4.25
  updated VERSION for 3.4.24
  update CONTRIBUTORS for 3.4.24
  updated CHANGELOG for 3.4.24
  [EventDispatcher] cleanup
  fix testIgnoredAttributesInContext
  Re-generate icu 64.1 data
  Improve PHPdoc / IDE autocomplete for config tree builder
  [Bridge][Twig] DebugCommand - fix escaping and filter
  ...

Author: fabpot

Dumper/XmlDumper.php

@@ -306,12 +306,12 @@ private function convertParameters(array $parameters, $type, \DOMElement $parent
             } elseif ($value instanceof Reference) {
                 $element->setAttribute('type', 'service');
                 $element->setAttribute('id', (string) $value);
-                $behaviour = $value->getInvalidBehavior();
-                if (ContainerInterface::NULL_ON_INVALID_REFERENCE == $behaviour) {
+                $behavior = $value->getInvalidBehavior();
+                if (ContainerInterface::NULL_ON_INVALID_REFERENCE == $behavior) {
                     $element->setAttribute('on-invalid', 'null');
-                } elseif (ContainerInterface::IGNORE_ON_INVALID_REFERENCE == $behaviour) {
+                } elseif (ContainerInterface::IGNORE_ON_INVALID_REFERENCE == $behavior) {
                     $element->setAttribute('on-invalid', 'ignore');
-                } elseif (ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE == $behaviour) {
+                } elseif (ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE == $behavior) {
                     $element->setAttribute('on-invalid', 'ignore_uninitialized');
                 }
             } elseif ($value instanceof Definition) {

Tests/Fixtures/BarFactory.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures;
+
+class BarFactory
+{
+    /**
+     * @var iterable
+     */
+    private $bars;
+
+    public function __construct(iterable $bars)
+    {
+        $this->bars = \iterator_to_array($bars);
+    }
+
+    public function getDefaultBar(): BarInterface
+    {
+        return reset($this->bars);
+    }
+}

Tests/Fixtures/yaml/service_instanceof_factory.yml

@@ -0,0 +1,14 @@
+services:
+    _instanceof:
+        Symfony\Component\DependencyInjection\Tests\Fixtures\BarInterface:
+            tags:
+                - { name: bar }
+
+    Symfony\Component\DependencyInjection\Tests\Fixtures\Bar:
+        public: true
+
+    Symfony\Component\DependencyInjection\Tests\Fixtures\BarFactory:
+        arguments: [!tagged 'bar']
+
+    Symfony\Component\DependencyInjection\Tests\Fixtures\BarInterface:
+        factory: ['@Symfony\Component\DependencyInjection\Tests\Fixtures\BarFactory', 'getDefaultBar']

Tests/Loader/YamlFileLoaderTest.php

@@ -812,4 +812,15 @@ public function testFqcnLazyProxy()
         $definition = $container->getDefinition('foo');
         $this->assertSame([['interface' => 'SomeInterface']], $definition->getTag('proxy'));
     }
+
+    public function testServiceWithSameNameAsInterfaceAndFactoryIsNotTagged()
+    {
+        $container = new ContainerBuilder();
+        $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
+        $loader->load('service_instanceof_factory.yml');
+        $container->compile();
+
+        $tagged = $container->findTaggedServiceIds('bar');
+        $this->assertCount(1, $tagged);
+    }
 }