Merge branch '1.10' into 1.11

vjekoslav · Sep 27, 2015 · 8504fed · 8504fed
2 parents 6319fe6 + 29a0909
commit 8504fed
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 0 deletions.
diff --git a/Symfony/CS/Fixer/Contrib/AlignDoubleArrowFixer.php b/Symfony/CS/Fixer/Contrib/AlignDoubleArrowFixer.php
@@ -61,6 +61,15 @@ public function getDescription()
         return 'Align double arrow symbols in consecutive lines.';
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function getPriority()
+    {
+        // should be run after the OperatorsSpacesFixer
+        return -10;
+    }
+
     /**
      * Inject into the text placeholders of candidates of vertical alignment.
      *

diff --git a/Symfony/CS/Fixer/Contrib/AlignEqualsFixer.php b/Symfony/CS/Fixer/Contrib/AlignEqualsFixer.php
@@ -38,6 +38,15 @@ public function getDescription()
         return 'Align equals symbols in consecutive lines.';
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function getPriority()
+    {
+        // should be run after the OperatorsSpacesFixer
+        return -10;
+    }
+
     /**
      * Inject into the text placeholders of candidates of vertical alignment.
      *

diff --git a/Symfony/CS/Tests/FixerTest.php b/Symfony/CS/Tests/FixerTest.php
@@ -182,6 +182,8 @@ public function getFixersPriorityCases()
             array($fixers['standardize_not_equal'], $fixers['strict']),
             array($fixers['double_arrow_multiline_whitespaces'], $fixers['multiline_array_trailing_comma']),
             array($fixers['double_arrow_multiline_whitespaces'], $fixers['align_double_arrow']),
+            array($fixers['operators_spaces'], $fixers['align_double_arrow']),
+            array($fixers['operators_spaces'], $fixers['align_equals']),
             array($fixers['indentation'], $fixers['phpdoc_indent']),
             array($fixers['phpdoc_order'], $fixers['phpdoc_separation']),
             array($fixers['phpdoc_no_access'], $fixers['phpdoc_separation']),