Merge branch '2.3' into 2.7

nicolas-grekas · nicolas-grekas · commit 2dce15edd5da · 2016-02-04T13:09:54.000+01:00
* 2.3:
  [travis] Add some comments
  changed operator from and to &amp;&amp;

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget_collapsed.html.php
diff --git a/Resources/views/Form/choice_widget_collapsed.html.php b/Resources/views/Form/choice_widget_collapsed.html.php
@@ -7,7 +7,7 @@
     )) ?>
     <?php if ($multiple): ?> multiple="multiple"<?php endif ?>
 >
-    <?php if (null !== $placeholder): ?><option value=""<?php if ($required and empty($value) && '0' !== $value): ?> selected="selected"<?php endif?>><?php echo '' != $placeholder ? $view->escape($view['translator']->trans($placeholder, array(), $translation_domain)) : '' ?></option><?php endif; ?>
+    <?php if (null !== $placeholder): ?><option value=""<?php if ($required && empty($value) && '0' !== $value): ?> selected="selected"<?php endif?>><?php echo '' != $placeholder ? $view->escape($view['translator']->trans($placeholder, array(), $translation_domain)) : '' ?></option><?php endif; ?>
     <?php if (count($preferred_choices) > 0): ?>
         <?php echo $view['form']->block($form, 'choice_widget_options', array('choices' => $preferred_choices)) ?>
         <?php if (count($choices) > 0 && null !== $separator): ?>

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`)) ?>`
`8`	`8`	`<?php if ($multiple): ?> multiple="multiple"<?php endif ?>`
`9`	`9`	`>`
`10`		`- <?php if (null !== $placeholder): ?><option value=""<?php if ($required and empty($value) && '0' !== $value): ?> selected="selected"<?php endif?>><?php echo '' != $placeholder ? $view->escape($view['translator']->trans($placeholder, array(), $translation_domain)) : '' ?></option><?php endif; ?>`
	`10`	`+ <?php if (null !== $placeholder): ?><option value=""<?php if ($required && empty($value) && '0' !== $value): ?> selected="selected"<?php endif?>><?php echo '' != $placeholder ? $view->escape($view['translator']->trans($placeholder, array(), $translation_domain)) : '' ?></option><?php endif; ?>`
`11`	`11`	`<?php if (count($preferred_choices) > 0): ?>`
`12`	`12`	`<?php echo $view['form']->block($form, 'choice_widget_options', array('choices' => $preferred_choices)) ?>`
`13`	`13`	`<?php if (count($choices) > 0 && null !== $separator): ?>`