Merge branch '2.3' into 2.6

* 2.3:
  CS: fixes
  Translator component has default domain for null implemented no need to have default translation domain logic in 3 different places
  [travis] Kill tests when a new commit has been pushed
  fixed CS
  Change behavior to mirror hash_equals() returning early if there is a length mismatch
  CS fixing
  Prevent modifying secrets as much as possible
  Update StringUtils.php
  Whitespace
  Update StringUtils.php
  CS: general fixes
  [SecurityBundle] removed a duplicated service definition and simplified others.

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget_collapsed.html.php
	src/Symfony/Bundle/SecurityBundle/Resources/config/security_rememberme.xml
	src/Symfony/Component/Console/Tests/Helper/LegacyTableHelperTest.php
	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services11.php

Author: fabpot

Extension/Core/Type/BaseType.php

@@ -57,7 +57,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
                 $uniqueBlockPrefix = '_'.$blockName;
             }
 
-            if (!$translationDomain) {
+            if (null === $translationDomain) {
                 $translationDomain = $view->parent->vars['translation_domain'];
             }
 
@@ -81,10 +81,6 @@ public function buildView(FormView $view, FormInterface $form, array $options)
         }
         $blockPrefixes[] = $uniqueBlockPrefix;
 
-        if (!$translationDomain) {
-            $translationDomain = 'messages';
-        }
-
         $view->vars = array_replace($view->vars, array(
             'form' => $view,
             'id' => $id,

Tests/AbstractFormTest.php

@@ -1,13 +1,13 @@
 <?php
 
-    /*
-    * This file is part of the Symfony package.
-    *
-    * (c) Fabien Potencier <[email protected]>
-    *
-    * For the full copyright and license information, please view the LICENSE
-    * file that was distributed with this source code.
-    */
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
 
 namespace Symfony\Component\Form\Tests;
 

Tests/CallbackTransformerTest.php

@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\Component\Form\Tests;
 
 use Symfony\Component\Form\CallbackTransformer;
@@ -30,8 +39,8 @@ public function testConstructorWithInvalidCallbacks($transformCallback, $reverse
     public function invalidCallbacksProvider()
     {
         return array(
-            array( null, function () {} ),
-            array( function () {}, null ),
+            array(null, function () {}),
+            array(function () {}, null),
         );
     }
 }

Tests/Extension/Core/Type/BaseTypeTest.php

@@ -112,7 +112,7 @@ public function testDefaultTranslationDomain()
             ->getForm()
             ->createView();
 
-        $this->assertEquals('messages', $view['child']->vars['translation_domain']);
+        $this->assertNull($view['child']->vars['translation_domain']);
     }
 
     public function testPassLabelToView()