Skip to content

Commit

Permalink
Fix running code-style in CI and resolve deprecations (#511)
Browse files Browse the repository at this point in the history
  • Loading branch information
marmichalski authored Aug 14, 2023
1 parent d001baa commit b186f0e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
run: "composer security:check"

- name: "Run coding style"
if: ${{ matrix.dependencies == 'locked' && matrix.php-version == '8.0' }}
if: ${{ matrix.dependencies == 'locked' && matrix.php-version == '8.1' }}
run: "composer code-style:check"

- name: "Run PHPStan"
Expand Down
9 changes: 3 additions & 6 deletions .php-cs-fixer.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,15 @@
return (new PhpCsFixer\Config())
->setRules([
'@PSR12' => true,
'@PHP70Migration' => true,
'@PHP71Migration' => true,
'@PHP73Migration' => true,
'@PHP74Migration' => true,
'@PHP81Migration' => true,
'@DoctrineAnnotation' => true,
'align_multiline_comment' => true,
'array_indentation' => true,
'array_syntax' => ['syntax' => 'short'],
'binary_operator_spaces' => true,
'blank_line_after_opening_tag' => true,
'blank_line_before_statement' => true,
'blank_lines_before_namespace' => true,
'cast_spaces' => ['space' => 'single'],
'class_attributes_separation' => true,
'combine_consecutive_issets' => true,
Expand All @@ -34,7 +32,6 @@
'final_internal_class' => true,
'fully_qualified_strict_types' => true,
'function_to_constant' => true,
'function_typehint_space' => true,
'include' => true,
'is_null' => true,
'linebreak_after_opening_tag' => true,
Expand Down Expand Up @@ -96,7 +93,6 @@
'return_type_declaration' => true,
'semicolon_after_instruction' => true,
'short_scalar_cast' => true,
'single_blank_line_before_namespace' => true,
'single_line_comment_style' => false,
'single_quote' => true,
'space_after_semicolon' => true,
Expand All @@ -107,6 +103,7 @@
'strict_param' => true,
'ternary_operator_spaces' => true,
'trim_array_spaces' => true,
'type_declaration_spaces' => ['elements' => ['function', 'property']],
'unary_operator_spaces' => true,
'void_return' => true,
'whitespace_after_comma_in_array' => true,
Expand Down

0 comments on commit b186f0e

Please sign in to comment.