Merge branch '2.8' into 3.1

* 2.8:
  tweaked php cs fixer configuration

.php_cs.dist

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