Skip to content

Commit fdf5590

Browse files
committed
Merge branch '2.13'
# Conflicts: # src/Console/Application.php
2 parents 002f98b + 1c58eff commit fdf5590

File tree

3 files changed

+63
-2
lines changed

3 files changed

+63
-2
lines changed

CHANGELOG.md

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,34 @@ CHANGELOG for PHP CS Fixer
33

44
This file contains changelogs for stable releases only.
55

6+
Changelog for v2.13.3
7+
---------------------
8+
9+
* bug #4216 Psr4Fixer - fix for multiple classy elements in file (keradus, kubawerlos)
10+
* bug #4217 Psr0Fixer - class with anonymous class (kubawerlos)
11+
* bug #4219 NativeFunctionCasingFixer - handle T_RETURN_REF (kubawerlos)
12+
* bug #4224 FunctionToConstantFixer - handle T_RETURN_REF (SpacePossum)
13+
* bug #4229 IsNullFixer - fix parenthesis not closed (guilliamxavier)
14+
* minor #4193 [7.3] CombineNestedDirnameFixer - support PHP 7.3 (kubawerlos)
15+
* minor #4198 [7.3] PowToExponentiationFixer - adding to PHP7.3 integration test (kubawerlos)
16+
* minor #4199 [7.3] MethodChainingIndentationFixer - add tests for PHP 7.3 (kubawerlos)
17+
* minor #4200 [7.3] ModernizeTypesCastingFixer - support PHP 7.3 (kubawerlos)
18+
* minor #4201 [7.3] MultilineWhitespaceBeforeSemicolonsFixer - add tests for PHP 7.3 (kubawerlos)
19+
* minor #4202 [7.3] ErrorSuppressionFixer - support PHP 7.3 (kubawerlos)
20+
* minor #4205 DX: PhpdocAlignFixer - refactor to use DocBlock (kubawerlos)
21+
* minor #4206 DX: enable multiline_whitespace_before_semicolons (keradus)
22+
* minor #4207 [7.3] RandomApiMigrationFixerTest - tests for 7.3 (SpacePossum)
23+
* minor #4208 [7.3] NativeFunctionCasingFixerTest - tests for 7.3 (SpacePossum)
24+
* minor #4209 [7.3] PhpUnitStrictFixerTest - tests for 7.3 (SpacePossum)
25+
* minor #4210 [7.3] PhpUnitConstructFixer - add test for PHP 7.3 (kubawerlos)
26+
* minor #4211 [7.3] PhpUnitDedicateAssertFixer - support PHP 7.3 (kubawerlos)
27+
* minor #4214 [7.3] NoUnsetOnPropertyFixerTest - tests for 7.3 (SpacePossum)
28+
* minor #4222 [7.3] PhpUnitExpectationFixer - support PHP 7.3 (kubawerlos)
29+
* minor #4223 [7.3] PhpUnitMockFixer - add tests for PHP 7.3 (kubawerlos)
30+
* minor #4230 [7.3] IsNullFixer - fix trailing comma (guilliamxavier)
31+
* minor #4232 DX: remove Utils::splitLines (kubawerlos)
32+
* minor #4234 [7.3] Test that "LITERAL instanceof X" is valid (guilliamxavier)
33+
634
Changelog for v2.13.2
735
---------------------
836

@@ -112,6 +140,33 @@ Changelog for v2.13.0
112140
* minor #3873 Add the native_function_invocation fixer in the Symfony:risky ruleset (stof)
113141
* minor #3979 DX: enable php_unit_method_casing (keradus)
114142

143+
Changelog for v2.12.6
144+
---------------------
145+
146+
* bug #4216 Psr4Fixer - fix for multiple classy elements in file (keradus, kubawerlos)
147+
* bug #4217 Psr0Fixer - class with anonymous class (kubawerlos)
148+
* bug #4219 NativeFunctionCasingFixer - handle T_RETURN_REF (kubawerlos)
149+
* bug #4224 FunctionToConstantFixer - handle T_RETURN_REF (SpacePossum)
150+
* bug #4229 IsNullFixer - fix parenthesis not closed (guilliamxavier)
151+
* minor #4198 [7.3] PowToExponentiationFixer - adding to PHP7.3 integration test (kubawerlos)
152+
* minor #4199 [7.3] MethodChainingIndentationFixer - add tests for PHP 7.3 (kubawerlos)
153+
* minor #4200 [7.3] ModernizeTypesCastingFixer - support PHP 7.3 (kubawerlos)
154+
* minor #4201 [7.3] MultilineWhitespaceBeforeSemicolonsFixer - add tests for PHP 7.3 (kubawerlos)
155+
* minor #4202 [7.3] ErrorSuppressionFixer - support PHP 7.3 (kubawerlos)
156+
* minor #4205 DX: PhpdocAlignFixer - refactor to use DocBlock (kubawerlos)
157+
* minor #4206 DX: enable multiline_whitespace_before_semicolons (keradus)
158+
* minor #4207 [7.3] RandomApiMigrationFixerTest - tests for 7.3 (SpacePossum)
159+
* minor #4208 [7.3] NativeFunctionCasingFixerTest - tests for 7.3 (SpacePossum)
160+
* minor #4209 [7.3] PhpUnitStrictFixerTest - tests for 7.3 (SpacePossum)
161+
* minor #4210 [7.3] PhpUnitConstructFixer - add test for PHP 7.3 (kubawerlos)
162+
* minor #4211 [7.3] PhpUnitDedicateAssertFixer - support PHP 7.3 (kubawerlos)
163+
* minor #4214 [7.3] NoUnsetOnPropertyFixerTest - tests for 7.3 (SpacePossum)
164+
* minor #4222 [7.3] PhpUnitExpectationFixer - support PHP 7.3 (kubawerlos)
165+
* minor #4223 [7.3] PhpUnitMockFixer - add tests for PHP 7.3 (kubawerlos)
166+
* minor #4230 [7.3] IsNullFixer - fix trailing comma (guilliamxavier)
167+
* minor #4232 DX: remove Utils::splitLines (kubawerlos)
168+
* minor #4234 [7.3] Test that "LITERAL instanceof X" is valid (guilliamxavier)
169+
115170
Changelog for v2.12.5
116171
---------------------
117172

README.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ or with specified version:
4646

4747
.. code-block:: bash
4848
49-
$ wget https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.13.2/php-cs-fixer.phar -O php-cs-fixer
49+
$ wget https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.13.3/php-cs-fixer.phar -O php-cs-fixer
5050
5151
or with curl:
5252

@@ -1827,7 +1827,7 @@ Config file
18271827

18281828
Instead of using command line options to customize the rule, you can save the
18291829
project configuration in a ``.php_cs.dist`` file in the root directory of your project.
1830-
The file must return an instance of `PhpCsFixer\\ConfigInterface <https://github.com/FriendsOfPHP/PHP-CS-Fixer/blob/v2.13.2/src/ConfigInterface.php>`_
1830+
The file must return an instance of `PhpCsFixer\\ConfigInterface <https://github.com/FriendsOfPHP/PHP-CS-Fixer/blob/v2.13.3/src/ConfigInterface.php>`_
18311831
which lets you configure the rules, the files and directories that
18321832
need to be analyzed. You may also create ``.php_cs`` file, which is
18331833
the local configuration that will be used instead of the project configuration. It

tests/Fixtures/Integration/misc/PHP7_3.test

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ is_countable($foo);
3939
// https://wiki.php.net/rfc/list_reference_assignment
4040
[$a, &$b] = $array; // `list_syntax` rule
4141

42+
// https://github.com/php/php-src/pull/2978 instanceof now allows literals as the first operand (the result is always false).
43+
null instanceof \stdClass;
44+
4245
// https://wiki.php.net/rfc/trailing-comma-function-calls Trailing commas in function and method calls are now allowed.
4346
foo(
4447
$arg,
@@ -104,6 +107,9 @@ IS_COUNTABLE($foo);
104107
// https://wiki.php.net/rfc/list_reference_assignment
105108
list($a, &$b) = $array; // `list_syntax` rule
106109

110+
// https://github.com/php/php-src/pull/2978 instanceof now allows literals as the first operand (the result is always false).
111+
null instanceof \stdClass;
112+
107113
// https://wiki.php.net/rfc/trailing-comma-function-calls Trailing commas in function and method calls are now allowed.
108114
foo(
109115
$arg,

0 commit comments

Comments
 (0)