Skip to content
This repository has been archived by the owner on Jul 28, 2022. It is now read-only.

Commit

Permalink
Merge 75a0bdd into 43c5813
Browse files Browse the repository at this point in the history
  • Loading branch information
jordisala1991 committed Dec 10, 2017
2 parents 43c5813 + 75a0bdd commit 750dac1
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 23 deletions.
26 changes: 4 additions & 22 deletions .php_cs.dist
Original file line number Diff line number Diff line change
Expand Up @@ -33,36 +33,18 @@ $rules = [
'ordered_class_elements' => true,
'ordered_imports' => true,
'phpdoc_order' => true,
'@PHP56Migration' => true,
'@PHP56Migration:risky' => true,
'@PHPUnit57Migration:risky' => true,
// To be tested before insertion:
// 'strict_comparison' => true,
// 'strict_param' => true,
// 'php_unit_strict' => true,
];

if (\PHP_VERSION_ID >= 50600) {
$rules = array_merge($rules, [
'@PHP56Migration' => true,
'@PHP56Migration:risky' => true,
'@PHPUnit57Migration:risky' => true,
]);
}
if (\PHP_VERSION_ID >= 70000) {
$rules = array_merge($rules, [
'@PHP70Migration' => true,
'@PHP70Migration:risky' => true,
'@PHPUnit60Migration:risky' => true,
]);
}
if (\PHP_VERSION_ID >= 70100) {
$rules = array_merge($rules, [
'@PHP71Migration' => true,
'@PHP71Migration:risky' => true,
'compact_nullable_typehint' => true,
]);
}

$finder = PhpCsFixer\Finder::create()
->in(preg_match('/dev-kit\/project$/', __DIR__, $matches) ? __DIR__.'/..' : __DIR__)
->in(__DIR__)
->exclude('Tests/Fixtures')
->exclude('tests/Fixtures')
->exclude('Resources/skeleton')
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ matrix:
include:
- php: '7.2'
env: TARGET=docs
- php: '7.1'
- php: '7.2'
env: TARGET=lint
- php: '7.1'
env: COMPOSER_FLAGS="--prefer-lowest"
Expand Down

0 comments on commit 750dac1

Please sign in to comment.