Merge branch '4.2' into 4.3
* 4.2: Disable php_unit_mock_short_will_return rule of php-cs [github] define 4.4 as the feature branch
This commit is contained in:
commit
c319c5c3e8
5
.github/PULL_REQUEST_TEMPLATE.md
vendored
5
.github/PULL_REQUEST_TEMPLATE.md
vendored
@ -1,6 +1,6 @@
|
|||||||
| Q | A
|
| Q | A
|
||||||
| ------------- | ---
|
| ------------- | ---
|
||||||
| Branch? | master for features / 3.4, 4.2 or 4.3 for bug fixes <!-- see below -->
|
| Branch? | 4.4 for features / 3.4, 4.2 or 4.3 for bug fixes <!-- see below -->
|
||||||
| Bug fix? | yes/no
|
| Bug fix? | yes/no
|
||||||
| New feature? | yes/no <!-- please update src/**/CHANGELOG.md files -->
|
| New feature? | yes/no <!-- please update src/**/CHANGELOG.md files -->
|
||||||
| BC breaks? | no <!-- see https://symfony.com/bc -->
|
| BC breaks? | no <!-- see https://symfony.com/bc -->
|
||||||
@ -17,5 +17,6 @@ understand your PR and can be used as a start for the documentation.
|
|||||||
Additionally (see https://symfony.com/roadmap):
|
Additionally (see https://symfony.com/roadmap):
|
||||||
- Bug fixes must be submitted against the lowest maintained branch where they apply
|
- Bug fixes must be submitted against the lowest maintained branch where they apply
|
||||||
(lowest branches are regularly merged to upper ones so they get the fixes too).
|
(lowest branches are regularly merged to upper ones so they get the fixes too).
|
||||||
- Features and deprecations must be submitted against the master branch.
|
- Features and deprecations must be submitted against branch 4.4.
|
||||||
|
- Legacy code removals go to the master branch.
|
||||||
-->
|
-->
|
||||||
|
@ -18,6 +18,8 @@ return PhpCsFixer\Config::create()
|
|||||||
'native_function_invocation' => ['include' => ['@compiler_optimized'], 'scope' => 'namespaced'],
|
'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
|
// 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'],
|
'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)
|
->setRiskyAllowed(true)
|
||||||
->setFinder(
|
->setFinder(
|
||||||
|
Reference in New Issue
Block a user