Merge branch '3.2'

* 3.2:
  use HHVM 3.15 to run tests
  [TwigBridge] fix Twig 2.x compatibility
  removed some PHP CS Fixer rules
  Improve language
  [Console] SymfonyStyle: Escape trailing backslashes in user texts
  Mention the community review guide
  [Form] fix group sequence based validation
  [Console] Fix question formatting using SymfonyStyle::ask()

Author: xabbuh

.php_cs.dist

@@ -5,6 +5,8 @@ return PhpCsFixer\Config::create()
         '@Symfony' => true,
         '@Symfony:risky' => true,
         'array_syntax' => array('syntax' => 'long'),
+        'no_unreachable_default_argument_value' => false,
+        'heredoc_to_nowdoc' => false,
     ))
     ->setRiskyAllowed(true)
     ->setFinder(

.travis.yml

@@ -20,7 +20,7 @@ env:
 matrix:
     include:
         # Use the newer stack for HHVM as HHVM does not support Precise anymore since a long time and so Precise has an outdated version
-        - php: hhvm-stable
+        - php: hhvm-3.15
           sudo: required
           dist: trusty
           group: edge

CONTRIBUTING.md

@@ -5,6 +5,7 @@ Symfony is an open source, community-driven project.
 
 If you'd like to contribute, please read the following documents:
 
+* [Reviewing issues/pull requests][0]
 * [Reporting a Bug][1]
 * [Submitting a Patch][2]
 * [Symfony Core Team][3]
@@ -14,6 +15,7 @@ If you'd like to contribute, please read the following documents:
 * [Coding Standards][7]
 * [Conventions][8]
 
+[0]: https://symfony.com/doc/current/contributing/community/reviews.html
 [1]: https://symfony.com/doc/current/contributing/code/bugs.html
 [2]: https://symfony.com/doc/current/contributing/code/patches.html
 [3]: https://symfony.com/doc/current/contributing/code/core_team.html

README.md

@@ -33,6 +33,14 @@ please read the [Contributing Code][3] part of the documentation. If you're subm
 a pull request, please follow the guidelines in the [Submitting a Patch][4] section
 and use [Pull Request Template][5].
 
+Community Reviews
+-----------------
+
+If you don't feel ready to contribute code or patches, reviewing issues and pull 
+requests can be a great start to get involved and give back. In fact, people who 
+"triage" issues are the backbone to Symfony's success!  
+More information can be found in the [Community Reviews][8] guide.
+
 Running Symfony Tests
 ----------------------
 
@@ -46,3 +54,4 @@ Information on how to run the Symfony test suite can be found in the
 [5]: https://symfony.com/doc/current/contributing/code/patches.html#make-a-pull-request
 [6]: https://symfony.com/doc/master/contributing/code/tests.html
 [7]: https://symfony.com/doc/current/book/installation.html#installing-the-symfony-installer
+[8]: https://symfony.com/doc/current/contributing/community/reviews.html

src/Symfony/Bridge/Twig/Tests/Node/TransNodeTest.php

@@ -49,7 +49,7 @@ protected function getVariableGetterWithoutStrictCheck($name)
     protected function getVariableGetterWithStrictCheck($name)
     {
         if (\Twig_Environment::MAJOR_VERSION >= 2) {
-            return sprintf('(isset($context["%s"]) || array_key_exists("%s", $context) ? $context["%s"] : $this->notFound("%s", 0))', $name, $name, $name, $name);
+            return sprintf('(isset($context["%s"]) || array_key_exists("%s", $context) ? $context["%s"] : (function () { throw new Twig_Error_Runtime(\'Variable "%s" does not exist.\', 0, $this->getSourceContext()); })())', $name, $name, $name, $name);
         }
 
         if (PHP_VERSION_ID >= 70000) {

src/Symfony/Component/Console/Formatter/OutputFormatter.php

@@ -35,6 +35,20 @@ public static function escape($text)
     {
         $text = preg_replace('/([^\\\\]?)</', '$1\\<', $text);
 
+        return self::escapeTrailingBackslash($text);
+    }
+
+    /**
+     * Escapes trailing "\" in given text.
+     *
+     * @param string $text Text to escape
+     *
+     * @return string Escaped text
+     *
+     * @internal
+     */
+    public static function escapeTrailingBackslash($text)
+    {
         if ('\\' === substr($text, -1)) {
             $len = strlen($text);
             $text = rtrim($text, '\\');

src/Symfony/Component/Console/Helper/SymfonyQuestionHelper.php

@@ -54,7 +54,7 @@ public function ask(InputInterface $input, OutputInterface $output, Question $qu
      */
     protected function writePrompt(OutputInterface $output, Question $question)
     {
-        $text = OutputFormatter::escape($question->getQuestion());
+        $text = OutputFormatter::escapeTrailingBackslash($question->getQuestion());
         $default = $question->getDefault();
 
         switch (true) {

src/Symfony/Component/Console/Style/SymfonyStyle.php

@@ -80,7 +80,7 @@ public function title($message)
     {
         $this->autoPrependBlock();
         $this->writeln(array(
-            sprintf('<comment>%s</>', $message),
+            sprintf('<comment>%s</>', OutputFormatter::escapeTrailingBackslash($message)),
             sprintf('<comment>%s</>', str_repeat('=', Helper::strlenWithoutDecoration($this->getFormatter(), $message))),
         ));
         $this->newLine();
@@ -93,7 +93,7 @@ public function section($message)
     {
         $this->autoPrependBlock();
         $this->writeln(array(
-            sprintf('<comment>%s</>', $message),
+            sprintf('<comment>%s</>', OutputFormatter::escapeTrailingBackslash($message)),
             sprintf('<comment>%s</>', str_repeat('-', Helper::strlenWithoutDecoration($this->getFormatter(), $message))),
         ));
         $this->newLine();

src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/command/command_17.php

@@ -0,0 +1,13 @@
+<?php
+
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+
+//Ensure symfony style helper methods handle trailing backslashes properly when decorating user texts
+return function (InputInterface $input, OutputInterface $output) {
+    $output = new SymfonyStyle($input, $output);
+
+    $output->title('Title ending with \\');
+    $output->section('Section ending with \\');
+};

src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/output/output_17.txt

@@ -0,0 +1,7 @@
+
+Title ending with \
+===================
+
+Section ending with \
+---------------------
+