Skip to content

Commit a483c35

Browse files
authored
Added configuration for php doc grouping (#2)
* Added configuration for php doc grouping * Dropped support for versions below 7.4
1 parent 517ea32 commit a483c35

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

.github/workflows/ci.yaml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,10 @@ jobs:
1919
matrix:
2020
experimental: [false]
2121
php:
22-
- '7.1'
23-
- '7.2'
24-
- '7.3'
2522
- '7.4'
23+
- '8.0'
24+
- '8.1'
2625
composer_options: [ "" ]
27-
include:
28-
- php: '8.0'
29-
composer_options: "--ignore-platform-req php"
30-
experimental: true
3126

3227
steps:
3328
- uses: actions/checkout@v2

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"ezsystems/ezplatform-code-style": "*"
1414
},
1515
"require": {
16-
"php": ">=7.1",
16+
"php": ">=7.4",
1717
"friendsofphp/php-cs-fixer": "^3.0",
1818
"adamwojs/php-cs-fixer-phpdoc-force-fqcn": "^2.0"
1919
},
@@ -33,7 +33,7 @@
3333
},
3434
"extra": {
3535
"branch-alias": {
36-
"dev-main": "1.0.x-dev"
36+
"dev-main": "1.1.x-dev"
3737
}
3838
}
3939
}

src/lib/PhpCsFixer/Config.php

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

0 commit comments

Comments
 (0)