Merge branch '3.1' into 3.2
* 3.1: tweaked php cs fixer configuration [TwigBundle] fixed typo in composer.json
This commit is contained in:
commit
8dedf9d999
@ -6,6 +6,7 @@ return PhpCsFixer\Config::create()
|
|||||||
'@Symfony:risky' => true,
|
'@Symfony:risky' => true,
|
||||||
'array_syntax' => array('syntax' => 'long'),
|
'array_syntax' => array('syntax' => 'long'),
|
||||||
'no_unreachable_default_argument_value' => false,
|
'no_unreachable_default_argument_value' => false,
|
||||||
|
'braces' => array('allow_single_line_closure' => true),
|
||||||
'heredoc_to_nowdoc' => false,
|
'heredoc_to_nowdoc' => false,
|
||||||
))
|
))
|
||||||
->setRiskyAllowed(true)
|
->setRiskyAllowed(true)
|
||||||
|
Reference in New Issue
Block a user