8000 Merge branch '3.4' into 4.1 · symfony/symfony@7efc487 · GitHub
[go: up one dir, main page]
Skip to content

Commit 7efc487

Browse files
xabbuhxabbuh
committed
Merge branch '3.4' into 4.1
* 3.4: Fix docs enabled short array notation in CS [fabbot] enable short arrays bumped Symfony version to 3.4.22 updated VERSION for 3.4.21 update CONTRIBUTORS for 3.4.21 updated CHANGELOG for 3.4.21
2 parents 4ef814a + a5c52b8 commit 7efc487

File tree

4 files changed

+57
-31
lines changed

4 files changed

+57
-31
lines changed

‎.php_cs.dist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ return PhpCsFixer\Config::create()
1010
'@Symfony:risky' => true,
1111
'@PHPUnit48Migration:risky' => true,
1212
'php_unit_no_expectation_annotation' => false, // part of `PHPUnitXYMigration:risky` ruleset, to be enabled when PHPUnit 4.x support will be dropped, as we don't want to rewrite exceptions handling twice
13-
'array_syntax' => array('syntax' => 'long'),
13+
'array_syntax' => array('syntax' => 'short'),
1414
'fopen_flags' => false,
1515
'ordered_imports' => true,
1616
'protected_to_private' => false,

0 commit comments

Comments
 (0)
0