From ccd32d599584eb75ef049e5c4a03a2f265d831ba Mon Sep 17 00:00:00 2001
From: Tobias Schultze <webmaster@tubo-world.de>
Date: Tue, 24 Mar 2015 19:34:06 +0100
Subject: [PATCH] Translator component has default domain for null implemented
 no need to have default translation domain logic in 3 different places

---
 .../Bridge/Twig/Extension/TranslationExtension.php        | 8 --------
 .../Component/Form/Extension/Core/Type/BaseType.php       | 6 +-----
 .../Form/Tests/Extension/Core/Type/BaseTypeTest.php       | 2 +-
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php b/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php
index 81316e8fd4..0fde3a675d 100644
--- a/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php
+++ b/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php
@@ -90,19 +90,11 @@ class TranslationExtension extends \Twig_Extension
 
     public function trans($message, array $arguments = array(), $domain = null, $locale = null)
     {
-        if (null === $domain) {
-            $domain = 'messages';
-        }
-
         return $this->translator->trans($message, $arguments, $domain, $locale);
     }
 
     public function transchoice($message, $count, array $arguments = array(), $domain = null, $locale = null)
     {
-        if (null === $domain) {
-            $domain = 'messages';
-        }
-
         return $this->translator->transChoice($message, $count, array_merge(array('%count%' => $count), $arguments), $domain, $locale);
     }
 
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/BaseType.php b/src/Symfony/Component/Form/Extension/Core/Type/BaseType.php
index 66f3641f43..e22bc880e6 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/BaseType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/BaseType.php
@@ -56,7 +56,7 @@ abstract class BaseType extends AbstractType
                 $uniqueBlockPrefix = '_'.$blockName;
             }
 
-            if (!$translationDomain) {
+            if (null === $translationDomain) {
                 $translationDomain = $view->parent->vars['translation_domain'];
             }
         } else {
@@ -76,10 +76,6 @@ abstract class BaseType extends AbstractType
         }
         $blockPrefixes[] = $uniqueBlockPrefix;
 
-        if (!$translationDomain) {
-            $translationDomain = 'messages';
-        }
-
         $view->vars = array_replace($view->vars, array(
             'form' => $view,
             'id' => $id,
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/BaseTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/BaseTypeTest.php
index bfa1e21805..0048cf41c5 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/BaseTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/BaseTypeTest.php
@@ -112,7 +112,7 @@ abstract class BaseTypeTest extends \Symfony\Component\Form\Test\TypeTestCase
             ->getForm()
             ->createView();
 
-        $this->assertEquals('messages', $view['child']->vars['translation_domain']);
+        $this->assertNull($view['child']->vars['translation_domain']);
     }
 
     public function testPassLabelToView()