Skip to content

Commit a415702

Browse files
kubawerloskeradus
authored andcommitted
Update CS (#9)
1 parent 0800c44 commit a415702

File tree

4 files changed

+62
-107
lines changed

4 files changed

+62
-107
lines changed

.php_cs.dist

Lines changed: 3 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -24,56 +24,11 @@ if (PHP_VERSION_ID < 70000) {
2424
return PhpCsFixer\Config::create()
2525
->setRiskyAllowed(true)
2626
->setRules([
27-
'@PHP56Migration' => true,
27+
'@PhpCsFixer' => true,
28+
'@PhpCsFixer:risky' => true,
29+
'@PHP56Migration:risky' => true,
2830
'@PHPUnit60Migration:risky' => true,
29-
'@Symfony' => true,
30-
'@Symfony:risky' => true,
31-
'align_multiline_comment' => true,
32-
'array_indentation' => true,
33-
'array_syntax' => ['syntax' => 'short'],
34-
'blank_line_before_statement' => true,
35-
'combine_consecutive_issets' => true,
36-
'combine_consecutive_unsets' => true,
37-
'comment_to_phpdoc' => true,
38-
'compact_nullable_typehint' => true,
39-
'escape_implicit_backslashes' => true,
40-
'explicit_indirect_variable' => true,
41-
'explicit_string_variable' => true,
42-
'final_internal_class' => true,
43-
'fully_qualified_strict_types' => true,
44-
'function_to_constant' => ['functions' => ['get_class', 'get_called_class', 'php_sapi_name', 'phpversion', 'pi']],
4531
'header_comment' => ['header' => $header],
46-
'heredoc_to_nowdoc' => true,
47-
'list_syntax' => ['syntax' => 'long'],
48-
'method_argument_space' => ['ensure_fully_multiline' => true],
49-
'method_chaining_indentation' => true,
50-
'multiline_comment_opening_closing' => true,
51-
'no_alternative_syntax' => true,
52-
'no_extra_blank_lines' => ['tokens' => ['break', 'continue', 'extra', 'return', 'throw', 'use', 'parenthesis_brace_block', 'square_brace_block', 'curly_brace_block']],
53-
'no_null_property_initialization' => true,
54-
'no_short_echo_tag' => true,
55-
'no_superfluous_elseif' => true,
56-
'no_unneeded_curly_braces' => true,
57-
'no_unneeded_final_method' => true,
58-
'no_unreachable_default_argument_value' => true,
59-
'no_useless_else' => true,
60-
'no_useless_return' => true,
61-
'ordered_class_elements' => true,
62-
'ordered_imports' => true,
63-
'php_unit_ordered_covers' => true,
64-
'php_unit_set_up_tear_down_visibility' => true,
65-
'php_unit_strict' => true,
66-
'php_unit_test_annotation' => true,
67-
'php_unit_test_class_requires_covers' => true,
68-
'phpdoc_add_missing_param_annotation' => true,
69-
'phpdoc_order' => true,
70-
'phpdoc_types_order' => true,
71-
'semicolon_after_instruction' => true,
72-
'single_line_comment_style' => true,
73-
'strict_comparison' => true,
74-
'strict_param' => true,
75-
'string_line_ending' => true,
76-
'yoda_style' => true,
7732
])
7833
->setFinder($finder)
7934
;

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ env:
2323
- COMPOSER_FLAGS=""
2424

2525
stages:
26-
- Static Code Analysis
26+
- Static code analysis
2727
- Test
2828

2929
before_install:
@@ -43,8 +43,8 @@ script:
4343
jobs:
4444
include:
4545
-
46-
stage: Static Code Analysis
47-
php: 7.2
46+
stage: Static code analysis
47+
php: 7.3
4848
install:
4949
- travis_retry composer update -d dev-tools $DEFAULT_COMPOSER_FLAGS
5050
- composer info -d dev-tools -D | sort

composer.json

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,44 @@
11
{
2-
"name": "php-cs-fixer/phpunit-constraint-xmlmatchesxsd",
3-
"type": "library",
4-
"description": "Constraint for testing XML against XSD.",
5-
"license": "MIT",
6-
"authors": [
7-
{
8-
"name": "SpacePossum"
2+
"name": "php-cs-fixer/phpunit-constraint-xmlmatchesxsd",
3+
"type": "library",
4+
"description": "Constraint for testing XML against XSD.",
5+
"license": "MIT",
6+
"authors": [
7+
{
8+
"name": "SpacePossum"
9+
},
10+
{
11+
"name": "Dariusz Rumiński",
12+
"email": "[email protected]"
13+
}
14+
],
15+
"require": {
16+
"php": "^5.5 || ^7.0",
17+
"phpunit/phpunit": "^5.7.23 || ^6.4.3 || ^7.0 || ^8.0",
18+
"phpunitgoodpractices/polyfill": "^1.1"
919
},
10-
{
11-
"name": "Dariusz Rumiński",
12-
"email": "[email protected]"
13-
}
14-
],
15-
"require": {
16-
"php": "^5.5 || ^7.0",
17-
"phpunit/phpunit": "^5.7.23 || ^6.4.3 || ^7.0 || ^8.0",
18-
"phpunitgoodpractices/polyfill": "^1.1"
19-
},
20-
"conflict": {
21-
"hhvm": "*"
22-
},
23-
"require-dev": {
24-
"johnkary/phpunit-speedtrap": "^1.1 || ^2.0 || ^3.0",
25-
"symfony/phpunit-bridge": "^3.2.2 || ^4.0"
26-
},
27-
"config": {
28-
"optimize-autoloader": true,
29-
"sort-packages": true
30-
},
31-
"autoload": {
32-
"psr-4": {
33-
"PhpCsFixer\\PhpunitConstraintXmlMatchesXsd\\": "src/"
20+
"conflict": {
21+
"hhvm": "*"
22+
},
23+
"require-dev": {
24+
"johnkary/phpunit-speedtrap": "^1.1 || ^2.0 || ^3.0",
25+
"symfony/phpunit-bridge": "^3.2.2 || ^4.0"
26+
},
27+
"config": {
28+
"optimize-autoloader": true,
29+
"sort-packages": true
30+
},
31+
"autoload": {
32+
"psr-4": {
33+
"PhpCsFixer\\PhpunitConstraintXmlMatchesXsd\\": "src/"
34+
},
35+
"files": [
36+
"src/Constraint/XmlMatchesXsd.php"
37+
]
3438
},
35-
"files": [
36-
"src/Constraint/XmlMatchesXsd.php"
37-
]
38-
},
39-
"autoload-dev": {
40-
"psr-4": {
41-
"PhpCsFixer\\PhpunitConstraintXmlMatchesXsd\\Tests\\": "tests/"
39+
"autoload-dev": {
40+
"psr-4": {
41+
"PhpCsFixer\\PhpunitConstraintXmlMatchesXsd\\Tests\\": "tests/"
42+
}
4243
}
43-
}
4444
}

dev-tools/composer.json

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
2-
"require": {
3-
"php": "^7.2"
4-
},
5-
"conflict": {
6-
"hhvm": "*"
7-
},
8-
"require-dev": {
9-
"friendsofphp/php-cs-fixer": "^2.11",
10-
"localheinz/composer-normalize": "^0.6.0",
11-
"maglnet/composer-require-checker": "^0.1.6",
12-
"mi-schi/phpmd-extension": "^4.2.1",
13-
"phpmd/phpmd": "^2.6.0"
14-
},
15-
"config": {
16-
"optimize-autoloader": true,
17-
"sort-packages": true
18-
}
2+
"require": {
3+
"php": "^7.3"
4+
},
5+
"conflict": {
6+
"hhvm": "*"
7+
},
8+
"require-dev": {
9+
"friendsofphp/php-cs-fixer": "^2.14",
10+
"localheinz/composer-normalize": "^1.1",
11+
"maglnet/composer-require-checker": "^2.0",
12+
"mi-schi/phpmd-extension": "^4.3",
13+
"phpmd/phpmd": "^2.6"
14+
},
15+
"config": {
16+
"optimize-autoloader": true,
17+
"sort-packages": true
18+
}
1919
}

0 commit comments

Comments
 (0)