Skip to content

Commit

Permalink
Udated dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
norberttech committed Sep 29, 2021
1 parent 383b393 commit 0bece3f
Show file tree
Hide file tree
Showing 5 changed files with 200 additions and 179 deletions.
33 changes: 33 additions & 0 deletions .github/workflows/dependabot-auto-merge.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: "Dependabot Auto Merge"

on:
workflow_run:
types:
- completed
workflows:
- 'Tests'
- 'Mutation Tests'
- 'Static Analyze'

jobs:
merge-me:
name: Merge me!
runs-on: ubuntu-latest
steps:
- # It is often a desired behavior to merge only when a workflow execution
# succeeds. This can be changed as needed.
if: ${{ github.event.workflow_run.conclusion == 'success' }}
name: Merge me!
uses: ridedott/merge-me-action@v2
with:
# Depending on branch protection rules, a manually populated
# `GITHUB_TOKEN_WORKAROUND` secret with permissions to push to
# a protected branch must be used. This secret can have an arbitrary
# name, as an example, this repository uses `DOTTBOTT_TOKEN`.
#
# When using a custom token, it is recommended to leave the following
# comment for other developers to be aware of the reasoning behind it:
#
# This must be used as GitHub Actions token does not support pushing
# to protected branches.
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
16 changes: 8 additions & 8 deletions .php_cs → .php-cs-fixer.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
$finder = PhpCsFixer\Finder::create()
->files()
->in([
__DIR__ . '/bin',
__DIR__ . '/src',
__DIR__ . '/tests',
])
Expand All @@ -17,7 +16,9 @@
* This configuration was taken from https://github.com/sebastianbergmann/phpunit/blob/master/.php_cs.dist
* and slightly adjusted.
*/
return PhpCsFixer\Config::create()
$config = new PhpCsFixer\Config();

return $config
->setRiskyAllowed(true)
->setCacheFile(__DIR__.'/var/.php_cs.cache')
->setRules([
Expand All @@ -31,7 +32,6 @@
'continue',
'declare',
'default',
'die',
'do',
'exit',
'for',
Expand All @@ -51,7 +51,7 @@
],
'braces' => true,
'cast_spaces' => true,
'class_attributes_separation' => ['elements' => ['const', 'method', 'property']],
'class_attributes_separation' => ['elements' => ['const'=>'one', 'method'=>'one', 'property'=>'one']],
'combine_consecutive_issets' => true,
'combine_consecutive_unsets' => true,
'compact_nullable_typehint' => true,
Expand All @@ -62,6 +62,7 @@
'dir_constant' => true,
'elseif' => true,
'encoding' => true,
'echo_tag_syntax' => true,
'explicit_indirect_variable' => true,
'explicit_string_variable' => true,
'full_opening_tag' => true,
Expand All @@ -86,13 +87,13 @@
'lowercase_static_reference' => true,
'magic_constant_casing' => true,
'magic_method_casing' => true,
'method_argument_space' => ['ensure_fully_multiline' => true],
'method_argument_space' => ['on_multiline' => 'ensure_fully_multiline'],
'modernize_types_casting' => false,
'multiline_comment_opening_closing' => true,
'multiline_whitespace_before_semicolons' => true,
'native_constant_invocation' => false,
'native_function_casing' => false,
'native_function_invocation' => true,
'native_function_invocation' => ['include'=>['@all']],
'native_function_type_declaration_casing' => true,
'new_with_braces' => false,
'no_alias_functions' => true,
Expand All @@ -113,7 +114,6 @@
'no_null_property_initialization' => true,
'no_php4_constructor' => true,
'no_short_bool_cast' => true,
'no_short_echo_tag' => true,
'no_singleline_whitespace_before_semicolons' => true,
'no_spaces_after_function_name' => true,
'no_spaces_around_offset' => true,
Expand Down Expand Up @@ -209,7 +209,7 @@
'standardize_not_equals' => true,
'strict_param' => true,
'ternary_to_null_coalescing' => true,
'trailing_comma_in_multiline_array' => true,
'trailing_comma_in_multiline' => true,
'trim_array_spaces' => true,
'unary_operator_spaces' => true,
'visibility_required' => [
Expand Down
52 changes: 26 additions & 26 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion tools/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
"vimeo/psalm": "^4.6",
"phpstan/phpstan": "^0.12.82",
"infection/infection": "^0.22.1",
"friendsofphp/php-cs-fixer": "^2.18"
"friendsofphp/php-cs-fixer": "^3.1"
}
}
Loading

0 comments on commit 0bece3f

Please sign in to comment.