disable comment_to_phpdoc fixers, breaks CodeCoverageIgnore comments

moved overwriteRules variable call to the end
narrowspark · Oct 12, 2018 · f661aa5 · f661aa5
1 parent 9efb258
commit f661aa5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/Config.php b/src/Config.php
@@ -60,6 +60,7 @@ public function getRules(): array
             ],
             'phpdoc_no_empty_return'   => false,
             'phpdoc_to_return_type'    => true,
+            'comment_to_phpdoc'        => false,
             'blank_line_before_return' => true,
             'date_time_immutable'      => false,
             'yoda_style'               => false,
@@ -94,8 +95,8 @@ public function getRules(): array
         return \array_merge(
             $this->ruleSet->rules(),
             $overrideRules,
-            $this->overwriteRules,
-            $pedroTrollerRules
+            $pedroTrollerRules,
+            $this->overwriteRules
         );
     }
 }
diff --git a/tests/ConfigTest.php b/tests/ConfigTest.php
@@ -260,7 +260,7 @@ protected function getContribRules(): array
             'class_keyword_remove'                      => false,
             'combine_consecutive_issets'                => true,
             'combine_consecutive_unsets'                => true,
-            'comment_to_phpdoc'                         => true,
+            'comment_to_phpdoc'                         => false,
             'compact_nullable_typehint'                 => true,
             'date_time_immutable'                       => false,
             'declare_strict_types'                      => true,