Merge branch '2.16' into master

PHP-CS-Fixer · Aug 8, 2020 · 758091e · 758091e
2 parents e95ca19 + bb9f729
commit 758091e
Show file tree

Hide file tree

Showing 10 changed files with 110 additions and 241 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -83,8 +83,8 @@ jobs:
             <<: *STANDARD_TEST_JOB
             stage: Test
             php: 7.1
-            name: 7.1 | Symfony ~4.1.0
-            env: SYMFONY_DEPRECATIONS_HELPER=disabled PHP_CS_FIXER_TEST_USE_LEGACY_TOKENIZER=1 SYMFONY_VERSION="~4.1.0"
+            name: 7.1 | Symfony ~4.4.0
+            env: SYMFONY_DEPRECATIONS_HELPER=disabled PHP_CS_FIXER_TEST_USE_LEGACY_TOKENIZER=1 SYMFONY_VERSION="~4.4.0"
 
         -
             <<: *STANDARD_TEST_JOB

diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
         "composer/xdebug-handler": "^1.2",
         "doctrine/annotations": "^1.2",
         "php-cs-fixer/diff": "^1.3",
-        "symfony/console": "^3.4.17 || ^4.1.6 || ^5.0",
+        "symfony/console": "^3.4.43 || ^4.4.11 || ^5.1.3",
         "symfony/event-dispatcher": "^3.0 || ^4.0 || ^5.0",
         "symfony/filesystem": "^3.0 || ^4.0 || ^5.0",
         "symfony/finder": "^3.0 || ^4.0 || ^5.0",

diff --git a/src/Fixer/CastNotation/NoUnsetCastFixer.php b/src/Fixer/CastNotation/NoUnsetCastFixer.php
@@ -42,6 +42,16 @@ public function isCandidate(Tokens $tokens)
         return $tokens->isTokenKindFound(T_UNSET_CAST);
     }
 
+    /**
+     * {@inheritdoc}
+     *
+     * Must run before BinaryOperatorSpacesFixer.
+     */
+    public function getPriority()
+    {
+        return 0;
+    }
+
     /**
      * {@inheritdoc}
      */

diff --git a/src/Fixer/Operator/BinaryOperatorSpacesFixer.php b/src/Fixer/Operator/BinaryOperatorSpacesFixer.php
@@ -223,7 +223,7 @@ public function getDefinition()
     /**
      * {@inheritdoc}
      *
-     * Must run after ArrayIndentationFixer, ArraySyntaxFixer, ListSyntaxFixer, NoMultilineWhitespaceAroundDoubleArrowFixer, PowToExponentiationFixer, StandardizeNotEqualsFixer, StrictComparisonFixer.
+     * Must run after ArrayIndentationFixer, ArraySyntaxFixer, ListSyntaxFixer, NoMultilineWhitespaceAroundDoubleArrowFixer, NoUnsetCastFixer, PowToExponentiationFixer, StandardizeNotEqualsFixer, StrictComparisonFixer.
      */
     public function getPriority()
     {