Skip to content

Commit

Permalink
Merge 13de80b into 2e6c26e
Browse files Browse the repository at this point in the history
  • Loading branch information
soullivaneuh committed Nov 13, 2017
2 parents 2e6c26e + 13de80b commit 7a1be26
Show file tree
Hide file tree
Showing 3 changed files with 53 additions and 7 deletions.
49 changes: 49 additions & 0 deletions .php_cs
@@ -0,0 +1,49 @@
<?php

$finder = \PhpCsFixer\Finder::create()
->in([
__DIR__.'/src',
__DIR__.'/tests',
])
;

$header = <<<HEADER
This file is part of the Nexylan packages.
(c) Nexylan SAS <contact@nexylan.com>
For the full copyright and license information, please view the LICENSE
file that was distributed with this source code.
HEADER;

return \PhpCsFixer\Config::create()
->setRules([
'@PHPUnit57Migration' => true,
'@PHPUnit57Migration:risky' => true,
'@Symfony' => true,
'@Symfony:risky' => true,
'array_syntax' => [
'syntax' => 'short'
],
'combine_consecutive_unsets' => true,
'doctrine_annotation_braces' => true,
'doctrine_annotation_spaces' => true,
'general_phpdoc_annotation_remove' => [
'covers',
],
'linebreak_after_opening_tag' => true,
'modernize_types_casting' => true,
'native_function_invocation' => true,
'no_php4_constructor' => true,
'no_unreachable_default_argument_value' => true,
'ordered_imports' => true,
'php_unit_strict' => true,
'phpdoc_order' => true,
'phpdoc_summary' => false,
'semicolon_after_instruction' => true,
'strict_comparison' => true,
'strict_param' => true,
])
->setRiskyAllowed(true)
->setFinder($finder)
;
6 changes: 0 additions & 6 deletions .styleci.yml

This file was deleted.

5 changes: 4 additions & 1 deletion .travis.yml
Expand Up @@ -21,6 +21,8 @@ matrix:
include:
- php: 5.5
env: COMPOSER_FLAGS="--prefer-lowest"
- php: 7.2
env: LINT="1"
allow_failures:
- php: nightly
- env: SYMFONY_VERSION=dev-master
Expand All @@ -39,7 +41,8 @@ install:
- composer update --prefer-dist --no-interaction $COMPOSER_FLAGS

script:
- composer validate
- if [ "$LINT" = "1" ]; then composer validate; fi;
- if [ "$LINT" = "1" ]; then php-cs-fixer fix --verbose --dry-run; fi;
- phpunit --coverage-clover build/logs/clover.xml

after_script:
Expand Down

0 comments on commit 7a1be26

Please sign in to comment.