Merge branch '1.9' into 1.10

vjekoslav · Jun 17, 2015 · fbca259 · fbca259
2 parents 0b0ec89 + e3ccfee
commit fbca259
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/Symfony/CS/Fixer/Symfony/PhpdocScalarFixer.php b/Symfony/CS/Fixer/Symfony/PhpdocScalarFixer.php
@@ -48,6 +48,18 @@ public function getDescription()
         return 'Scalar types should always be written in the same form. "int", not "integer"; "bool", not "boolean"; "float", not "real" or "double".';
     }
 
+    public function getPriority()
+    {
+        /*
+         * Should be run before all other docblock fixers apart from the
+         * phpdoc_to_comment and phpdoc_indent fixer to make sure all fixers apply
+         * correct indentation to new code they add. This should run before
+         * alignment of params is done since this fixer might change the
+         * type and thereby un-aligning the params.
+         */
+        return 15;
+    }
+
     /**
      * {@inheritdoc}
      */

diff --git a/Symfony/CS/Tests/FixerTest.php b/Symfony/CS/Tests/FixerTest.php
@@ -208,15 +208,19 @@ function ($name) {
             }
         );
 
-        // prepare bulk tests for phpdoc fixers to test if:
+        // prepare bulk tests for phpdoc fixers to test that:
         // * `phpdoc_to_comment` is first
         // * `phpdoc_indent` is second
+        // * `phpdoc_scalar` is third
         // * `phpdoc_params` is last
         $cases[] = array($fixers['phpdoc_to_comment'], $fixers['phpdoc_indent']);
+        $cases[] = array($fixers['phpdoc_indent'], $fixers['phpdoc_scalar']);
+
         foreach ($docFixerNames as $docFixerName) {
-            if (!in_array($docFixerName, array('phpdoc_to_comment', 'phpdoc_indent'), true)) {
+            if (!in_array($docFixerName, array('phpdoc_to_comment', 'phpdoc_indent', 'phpdoc_scalar'), true)) {
                 $cases[] = array($fixers['phpdoc_to_comment'], $fixers[$docFixerName]);
                 $cases[] = array($fixers['phpdoc_indent'], $fixers[$docFixerName]);
+                $cases[] = array($fixers['phpdoc_scalar'], $fixers[$docFixerName]);
             }
 
             if ('phpdoc_params' !== $docFixerName) {