Skip to content

Commit

Permalink
[TASK] Update composer dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
liayn committed Jan 30, 2017
1 parent 2ea9bec commit bcd34c9
Show file tree
Hide file tree
Showing 6 changed files with 337 additions and 259 deletions.
43 changes: 23 additions & 20 deletions .php_cs
Original file line number Diff line number Diff line change
@@ -1,23 +1,26 @@
<?php

$finder = Symfony\CS\Finder\DefaultFinder::create()
->in(array(__DIR__.'/src'))
->exclude(array('Tests/Fixtures'))
;

return Symfony\CS\Config\Config::create()
->level(Symfony\CS\FixerInterface::SYMFONY_LEVEL)
->fixers(array(
'-unalign_double_arrow',
'-unalign_equals',
'align_double_arrow',
'newline_after_open_tag',
'ordered_use',
'short_array_syntax',
'php_unit_construct',
'php_unit_strict',
'linefeed',
'eof_ending'
return PhpCsFixer\Config::create()
->setRiskyAllowed(true)
->setRules(array(
'combine_consecutive_unsets' => true,
'heredoc_to_nowdoc' => true,
'no_extra_consecutive_blank_lines' => array('break', 'continue', 'extra', 'return', 'throw', 'use', 'parenthesis_brace_block', 'square_brace_block', 'curly_brace_block'),
'no_unreachable_default_argument_value' => true,
'no_useless_else' => true,
'no_useless_return' => true,
'ordered_class_elements' => true,
'ordered_imports' => true,
'php_unit_strict' => true,
'phpdoc_add_missing_param_annotation' => true,
'phpdoc_order' => true,
'psr4' => true,
'strict_comparison' => true,
'strict_param' => true,
))
->setUsingCache(true)
->finder($finder);
->setFinder(
PhpCsFixer\Finder::create()
->exclude('tests/Fixtures')
->in(__DIR__ . '/src')
)
;
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cs:
vendor/bin/php-cs-fixer fix --verbose --fixers=-empty_return,-unalign_double_arrow
vendor/bin/php-cs-fixer fix --verbose

cs_dry_run:
vendor/bin/php-cs-fixer fix --verbose --fixers=-empty_return,-unalign_double_arrow --dry-run
vendor/bin/php-cs-fixer fix --verbose --dry-run
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"zendframework/zend-cache": "^2.7"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^1.11",
"friendsofphp/php-cs-fixer": "^2",
"phpunit/phpunit": "^5.3"
},
"config": {
Expand Down
Loading

0 comments on commit bcd34c9

Please sign in to comment.