Merge branch '2.8' into 3.0

* 2.8:
  [2.8] [Form] minor fix some tests with placeholder in AbstractLayout
  [DependencyInjection] fix tests
  Validate XLIFF translation files
  [DependencyInjection] replace alias in factories
  replace alias in factory services

Author: fabpot

src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php

@@ -95,6 +95,9 @@ private function updateReferences($container, $currentId, $newId)
             $definition->setProperties(
                 $this->updateArgumentReferences($definition->getProperties(), $currentId, $newId)
             );
+
+            $definition->setFactoryService($this->updateFactoryServiceReference($definition->getFactoryService(false), $currentId, $newId), false);
+            $definition->setFactory($this->updateFactoryReference($definition->getFactory(), $currentId, $newId));
         }
     }
 
@@ -122,4 +125,26 @@ private function updateArgumentReferences(array $arguments, $currentId, $newId)
 
         return $arguments;
     }
+
+    private function updateFactoryServiceReference($factoryService, $currentId, $newId)
+    {
+        if (null === $factoryService) {
+            return;
+        }
+
+        return $currentId === $factoryService ? $newId : $currentId;
+    }
+
+    private function updateFactoryReference($factory, $currentId, $newId)
+    {
+        if (null === $factory || !is_array($factory) || !$factory[0] instanceof Reference) {
+            return $factory;
+        }
+
+        if ($currentId === (string) $factory[0]) {
+            $factory[0] = new Reference($newId, $factory[0]->getInvalidBehavior());
+        }
+
+        return $factory;
+    }
 }

src/Symfony/Component/DependencyInjection/Tests/Compiler/ReplaceAliasByActualDefinitionPassTest.php

@@ -14,14 +14,18 @@
 use Symfony\Component\DependencyInjection\Compiler\ReplaceAliasByActualDefinitionPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Reference;
 
 class ReplaceAliasByActualDefinitionPassTest extends \PHPUnit_Framework_TestCase
 {
     public function testProcess()
     {
         $container = new ContainerBuilder();
 
-        $container->register('a', '\stdClass');
+        $aDefinition = $container->register('a', '\stdClass');
+        $aDefinition->setFactoryService('b', false);
+
+        $aDefinition->setFactory(array(new Reference('b'), 'createA'));
 
         $bDefinition = new Definition('\stdClass');
         $bDefinition->setPublic(false);
@@ -39,6 +43,11 @@ public function testProcess()
             $container->has('b_alias') && !$container->hasAlias('b_alias'),
             '->process() replaces alias to actual.'
         );
+
+        $this->assertSame('b_alias', $aDefinition->getFactoryService(false));
+
+        $resolvedFactory = $aDefinition->getFactory(false);
+        $this->assertSame('b_alias', (string) $resolvedFactory[0]);
     }
 
     /**

src/Symfony/Component/Form/Tests/AbstractBootstrap3LayoutTest.php

@@ -818,7 +818,8 @@ public function testSingleChoiceExpandedWithPlaceholderWithoutTranslation()
             'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
             'multiple' => false,
             'expanded' => true,
-            'translation_domain' => false,
+            'required' => false,
+            'choice_translation_domain' => false,
             'placeholder' => 'Placeholder&Not&Translated',
         ));
 

src/Symfony/Component/Form/Tests/AbstractLayoutTest.php

@@ -963,6 +963,7 @@ public function testSingleChoiceExpandedWithoutTranslation()
             'multiple' => false,
             'expanded' => true,
             'choice_translation_domain' => false,
+            'placeholder' => 'Placeholder&Not&Translated',
         ));
 
         $this->assertWidgetMatchesXpath($form->createView(), array(),
@@ -1034,7 +1035,8 @@ public function testSingleChoiceExpandedWithPlaceholderWithoutTranslation()
             'choices' => array('Choice&A' => '&a', 'Choice&B' => '&b'),
             'multiple' => false,
             'expanded' => true,
-            'translation_domain' => false,
+            'required' => false,
+            'choice_translation_domain' => false,
             'placeholder' => 'Placeholder&Not&Translated',
         ));
 

src/Symfony/Component/Form/Tests/Resources/TranslationFilesTest.php

@@ -0,0 +1,31 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Tests\Resources;
+
+class TranslationFilesTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @dataProvider provideTranslationFiles
+     */
+    public function testTranslationFileIsValid($filePath)
+    {
+        \PHPUnit_Util_XML::loadfile($filePath, false, false, true);
+    }
+
+    public function provideTranslationFiles()
+    {
+        return array_map(
+            function ($filePath) { return (array) $filePath; },
+            glob(dirname(dirname(__DIR__)).'/Resources/translations/*.xlf')
+        );
+    }
+}

src/Symfony/Component/Security/Tests/Resources/TranslationFilesTest.php

@@ -0,0 +1,31 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Security\Tests\Resources;
+
+class TranslationFilesTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @dataProvider provideTranslationFiles
+     */
+    public function testTranslationFileIsValid($filePath)
+    {
+        \PHPUnit_Util_XML::loadfile($filePath, false, false, true);
+    }
+
+    public function provideTranslationFiles()
+    {
+        return array_map(
+            function ($filePath) { return (array) $filePath; },
+            glob(dirname(dirname(__DIR__)).'/Resources/translations/*.xlf')
+        );
+    }
+}

src/Symfony/Component/Validator/Tests/Resources/TranslationFilesTest.php

@@ -0,0 +1,31 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Validator\Tests\Resources;
+
+class TranslationFilesTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @dataProvider provideTranslationFiles
+     */
+    public function testTranslationFileIsValid($filePath)
+    {
+        \PHPUnit_Util_XML::loadfile($filePath, false, false, true);
+    }
+
+    public function provideTranslationFiles()
+    {
+        return array_map(
+            function ($filePath) { return (array) $filePath; },
+            glob(dirname(dirname(__DIR__)).'/Resources/translations/*.xlf')
+        );
+    }
+}