Skip to content

Commit d3e5a29

Browse files
NOISSUE - allow http-kernel version 5.3 (#6)
* NOISSUE - allow http-kernel version 5.3 * NOISSUE - allow http-kernel version ^5.0 * NOISSUE - update csfixer, grumphp
1 parent f933af6 commit d3e5a29

File tree

5 files changed

+24
-8
lines changed

5 files changed

+24
-8
lines changed

.github/workflows/phpunit.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ jobs:
1313
php-version:
1414
- "7.3"
1515
- "7.4"
16+
- "8.0"
1617
deps:
1718
- "normal"
1819
include:

.github/workflows/static-analysis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ jobs:
1212
matrix:
1313
php-version:
1414
- "7.4"
15+
- "8.0"
1516

1617
steps:
1718
- name: "Checkout"

.php_cs renamed to .php-cs-fixer.php

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
11
<?php
22

3-
$finder = PhpCsFixer\Finder::create()
3+
declare(strict_types=1);
4+
5+
$config = new PhpCsFixer\Config();
6+
7+
$finder = $config->getFinder()
48
->exclude(
59
[
610
'vendor',
711
]
812
)
913
->in(__DIR__);
1014

11-
return PhpCsFixer\Config::create()
15+
return $config
16+
->registerCustomFixers([])
1217
->setRules(
1318
[
1419
'@Symfony' => true,
@@ -21,6 +26,15 @@
2126
'phpdoc_var_without_name' => false,
2227
'phpdoc_to_comment' => false,
2328
'single_line_throw' => false,
29+
'modernize_types_casting' => true,
30+
'function_declaration' => false,
31+
'ordered_imports' => [
32+
'imports_order' => [
33+
'class',
34+
'function',
35+
'const',
36+
],
37+
'sort_algorithm' => 'alpha',
38+
],
2439
]
25-
)
26-
->setFinder($finder);
40+
);

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
"php": ">=7.3",
88
"ext-soap": "*",
99
"marc-mabe/php-enum": "^3.0|^4.0",
10-
"symfony/http-kernel": "^4.4",
10+
"symfony/http-kernel": "^4.4 || ^5.0",
1111
"webmozart/assert": "^1.3"
1212
},
1313
"require-dev": {
1414
"roave/security-advisories": "dev-master",
1515
"phpunit/phpunit": "^8.3",
1616
"symfony/phpunit-bridge": "^5.0",
17-
"phpro/grumphp": "^0.20",
18-
"friendsofphp/php-cs-fixer": "^2.16",
17+
"phpro/grumphp": "^1.4.0",
18+
"friendsofphp/php-cs-fixer": "^2.19",
1919
"phpstan/phpstan": "^0.12.32",
2020
"phpstan/phpstan-webmozart-assert": "^0.12.2"
2121
},

grumphp.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ grumphp:
1818
phpcsfixer:
1919
allow_risky: true
2020
cache_file: ~
21-
config: './.php_cs'
21+
config: './.php-cs-fixer.php'
2222
using_cache: true
2323
verbose: true
2424
phpstan:

0 commit comments

Comments
 (0)