Skip to content

Commit bb9f729

Browse files
committed
Merge branch '2.15' into 2.16
2 parents c586b8c + 0e3bfbf commit bb9f729

File tree

10 files changed

+110
-241
lines changed

10 files changed

+110
-241
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ jobs:
8383
<<: *STANDARD_TEST_JOB
8484
stage: Test
8585
php: 7.1
86-
name: 7.1 | Symfony ~4.1.0
87-
env: SYMFONY_DEPRECATIONS_HELPER=disabled PHP_CS_FIXER_TEST_USE_LEGACY_TOKENIZER=1 SYMFONY_VERSION="~4.1.0"
86+
name: 7.1 | Symfony ~4.4.0
87+
env: SYMFONY_DEPRECATIONS_HELPER=disabled PHP_CS_FIXER_TEST_USE_LEGACY_TOKENIZER=1 SYMFONY_VERSION="~4.4.0"
8888

8989
-
9090
<<: *STANDARD_TEST_JOB

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"composer/xdebug-handler": "^1.2",
2222
"doctrine/annotations": "^1.2",
2323
"php-cs-fixer/diff": "^1.3",
24-
"symfony/console": "^3.4.17 || ^4.1.6 || ^5.0",
24+
"symfony/console": "^3.4.43 || ^4.4.11 || ^5.1.3",
2525
"symfony/event-dispatcher": "^3.0 || ^4.0 || ^5.0",
2626
"symfony/filesystem": "^3.0 || ^4.0 || ^5.0",
2727
"symfony/finder": "^3.0 || ^4.0 || ^5.0",

src/Fixer/CastNotation/NoUnsetCastFixer.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,16 @@ public function isCandidate(Tokens $tokens)
4242
return $tokens->isTokenKindFound(T_UNSET_CAST);
4343
}
4444

45+
/**
46+
* {@inheritdoc}
47+
*
48+
* Must run before BinaryOperatorSpacesFixer.
49+
*/
50+
public function getPriority()
51+
{
52+
return 0;
53+
}
54+
4555
/**
4656
* {@inheritdoc}
4757
*/

src/Fixer/Operator/BinaryOperatorSpacesFixer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ public function getDefinition()
223223
/**
224224
* {@inheritdoc}
225225
*
226-
* Must run after ArrayIndentationFixer, ArraySyntaxFixer, ListSyntaxFixer, NoMultilineWhitespaceAroundDoubleArrowFixer, PowToExponentiationFixer, StandardizeNotEqualsFixer, StrictComparisonFixer.
226+
* Must run after ArrayIndentationFixer, ArraySyntaxFixer, ListSyntaxFixer, NoMultilineWhitespaceAroundDoubleArrowFixer, NoUnsetCastFixer, PowToExponentiationFixer, StandardizeNotEqualsFixer, StrictComparisonFixer.
227227
*/
228228
public function getPriority()
229229
{

0 commit comments

Comments
 (0)