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

Resources/views/Form/choice_widget_collapsed.html.php

@@ -3,7 +3,7 @@
         $required = false;
     endif; ?>
     <?php echo $view['form']->block($form, 'widget_attributes', array(
-        'required' => $required
+        'required' => $required,
     )) ?>
     <?php if ($multiple): ?> multiple="multiple"<?php endif ?>
 >

Resources/views/Form/hidden_widget.html.php

@@ -1 +1 @@
-<?php echo $view['form']->block($form, 'form_widget_simple', array('type' => isset($type) ? $type : "hidden")) ?>
+<?php echo $view['form']->block($form, 'form_widget_simple', array('type' => isset($type) ? $type : 'hidden')) ?>

Resources/views/Form/integer_widget.html.php

@@ -1 +1 @@
-<?php echo $view['form']->block($form, 'form_widget_simple', array('type' => isset($type) ? $type : "number")) ?>
+<?php echo $view['form']->block($form, 'form_widget_simple', array('type' => isset($type) ? $type : 'number')) ?>

Resources/views/Form/number_widget.html.php

@@ -1 +1 @@
-<?php echo $view['form']->block($form, 'form_widget_simple',  array('type' => isset($type) ? $type : "text")) ?>
+<?php echo $view['form']->block($form, 'form_widget_simple',  array('type' => isset($type) ? $type : 'text')) ?>

Resources/views/Form/password_widget.html.php

@@ -1 +1 @@
-<?php echo $view['form']->block($form, 'form_widget_simple',  array('type' => isset($type) ? $type : "password")) ?>
+<?php echo $view['form']->block($form, 'form_widget_simple',  array('type' => isset($type) ? $type : 'password')) ?>

Resources/views/Form/percent_widget.html.php

@@ -1 +1 @@
-<?php echo $view['form']->block($form, 'form_widget_simple',  array('type' => isset($type) ? $type : "text")) ?> %
+<?php echo $view['form']->block($form, 'form_widget_simple',  array('type' => isset($type) ? $type : 'text')) ?> %

Resources/views/Form/search_widget.html.php

@@ -1 +1 @@
-<?php echo $view['form']->block($form, 'form_widget_simple',  array('type' => isset($type) ? $type : "search")) ?>
+<?php echo $view['form']->block($form, 'form_widget_simple',  array('type' => isset($type) ? $type : 'search')) ?>

Resources/views/Form/url_widget.html.php

@@ -1 +1 @@
-<?php echo $view['form']->block($form, 'form_widget_simple',  array('type' => isset($type) ? $type : "url")) ?>
+<?php echo $view['form']->block($form, 'form_widget_simple',  array('type' => isset($type) ? $type : 'url')) ?>

Tests/Fixtures/Resources/views/translation.html.php

@@ -1,6 +1,6 @@
 This template is used for translation message extraction tests
 <?php echo $view['translator']->trans('single-quoted key') ?>
-<?php echo $view['translator']->trans("double-quoted key") ?>
+<?php echo $view['translator']->trans('double-quoted key') ?>
 <?php echo $view['translator']->trans(<<<EOF
 heredoc key
 EOF
@@ -15,11 +15,11 @@
 <?php echo $view['translator']->trans(
     'single-quoted key with whitespace and nonescaped \$\n\' sequences'
 ) ?>
-<?php echo $view['translator']->trans( <<<EOF
+<?php echo $view['translator']->trans(<<<EOF
 heredoc key with whitespace and escaped \$\n sequences
 EOF
 ) ?>
-<?php echo $view['translator']->trans( <<<'EOF'
+<?php echo $view['translator']->trans(<<<'EOF'
 nowdoc key with whitespace and nonescaped \$\n sequences
 EOF
 ) ?>