Merge branch '6.5' into 7.4

sebastianbergmann · Oct 23, 2018 · 05afe04 · 05afe04
2 parents ce2a61b + b57f1a9
commit 05afe04
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.php_cs.dist b/.php_cs.dist
@@ -156,7 +156,7 @@ return PhpCsFixer\Config::create()
             'phpdoc_to_comment' => true,
             'phpdoc_trim' => true,
             'phpdoc_trim_consecutive_blank_line_separation' => true,
-            'phpdoc_types' => true,
+            'phpdoc_types' => ['groups' => ['simple', 'meta']],
             'phpdoc_types_order' => true,
             'phpdoc_var_without_name' => true,
             'pow_to_exponentiation' => true,