Skip to content

Commit 70a39cf

Browse files
alongoszwebhdx
andauthored
Reverted phpdoc_separation config and locked CS Fixer version at 3.9.5 (#3)
* [Composer] Locked PHP CS Fixer version at 3.9.5 * Restored phpdoc_separation config rule for PHP CS Fixer v3.9.5 * [Composer] Bumped extra.branch-alias.dev-main to prepare for 1.2.0 release Co-Authored-By: Maciej Kobus <[email protected]>
1 parent a483c35 commit 70a39cf

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
},
1515
"require": {
1616
"php": ">=7.4",
17-
"friendsofphp/php-cs-fixer": "^3.0",
17+
"friendsofphp/php-cs-fixer": "3.9.5",
1818
"adamwojs/php-cs-fixer-phpdoc-force-fqcn": "^2.0"
1919
},
2020
"require-dev": {
@@ -33,7 +33,7 @@
3333
},
3434
"extra": {
3535
"branch-alias": {
36-
"dev-main": "1.1.x-dev"
36+
"dev-main": "1.2.x-dev"
3737
}
3838
}
3939
}

src/lib/PhpCsFixer/Config.php

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,12 +119,7 @@ public function __construct($name = 'default')
119119
'phpdoc_no_useless_inheritdoc' => true,
120120
'phpdoc_return_self_reference' => true,
121121
'phpdoc_scalar' => true,
122-
'phpdoc_separation' => [
123-
'groups' => [
124-
['Assert\\*'],
125-
['ORM\\*'],
126-
],
127-
],
122+
'phpdoc_separation' => true,
128123
'phpdoc_single_line_var_spacing' => true,
129124
'phpdoc_summary' => true,
130125
'phpdoc_trim' => true,

0 commit comments

Comments
 (0)