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

Commit 448d0d6

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '3.4' into 4.3
* 3.4: [DependencyInjection] Fix broken references in tests Avoid using of kernel after shutdown Simplify PHP CS Fixer configuration [FrameworkBundle] [HttpKernel] fixed correct EOL and EOM month Fix MockFileSessionStorageTest::sessionDir being used after it's unset bumped Symfony version to 3.4.34 updated VERSION for 3.4.33 update CONTRIBUTORS for 3.4.33 updated CHANGELOG for 3.4.33 [Stopwatch] Fixed a bug in stopwatch event getStartTime [Stopwatch] Fixed bug in getDuration when counting multiple ongoing periods Adding some validations tags on validators.et.xlf add missing translation for 94 (it)
2 parents 1a573c3 + a2bccc6 commit 448d0d6

File tree

12 files changed

+130
-50
lines changed

12 files changed

+130
-50
lines changed

‎.php_cs.dist

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,9 @@ return PhpCsFixer\Config::create()
1010
'@Symfony:risky' => true,
1111
'@PHPUnit75Migration:risky' => true,
1212
'php_unit_dedicate_assert' => ['target' => '5.6'],
13-
'phpdoc_no_empty_return' => false, // triggers almost always false positive
1413
'array_syntax' => ['syntax' => 'short'],
1514
'fopen_flags' => false,
16-
'ordered_imports' => true,
17-
'phpdoc_trim_consecutive_blank_line_separation' => true,
18-
'no_superfluous_phpdoc_tags' => ['allow_mixed' => true],
1915
'protected_to_private' => false,
20-
// Part of @Symfony:risky in PHP-CS-Fixer 2.13.0. To be removed from the config file once upgrading
21-
'native_function_invocation' => ['include' => ['@compiler_optimized'], 'scope' => 'namespaced', 'strict' => true],
22-
// Part of future @Symfony ruleset in PHP-CS-Fixer To be removed from the config file once upgrading
23-
'phpdoc_types_order' => ['null_adjustment' => 'always_last', 'sort_algorithm' => 'none'],
2416
'combine_nested_dirname' => true,
2517
])
2618
->setRiskyAllowed(true)

0 commit comments

Comments
 (0)
0