minor symfony#31737 Disable php_unit_mock_short_will_return rule of php-cs (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 7ae54b43eadd · 2019-05-30T16:14:23.000+02:00
This PR was merged into the 3.4 branch. Discussion ---------- Disable php_unit_mock_short_will_return rule of php-cs | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Commits ------- bf782ec Disable php_unit_mock_short_will_return rule of php-cs
diff --git a/.php_cs.dist b/.php_cs.dist
@@ -18,6 +18,8 @@ return PhpCsFixer\Config::create()
         'native_function_invocation' => ['include' => ['@compiler_optimized'], 'scope' => 'namespaced'],
         // Part of future @Symfony ruleset in PHP-CS-Fixer To be removed from the config file once upgrading
         'phpdoc_types_order' => ['null_adjustment' => 'always_last', 'sort_algorithm' => 'none'],
+        // Part of @Symfony:risky in PHP-CS-Fixer 2.15.0. Incompatible with PHPUnit 4 that is required for Symfony 3.4
+        'php_unit_mock_short_will_return' => false,
     ])
     ->setRiskyAllowed(true)
     ->setFinder(
