Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 3 additions & 49 deletions .php_cs.dist
Original file line number Diff line number Diff line change
Expand Up @@ -23,56 +23,10 @@ if (PHP_VERSION_ID < 70000) {
return PhpCsFixer\Config::create()
->setRiskyAllowed(true)
->setRules([
// '@PHP56Migration' => true,
'@PhpCsFixer' => true,
'@PhpCsFixer:risky' => true,
'@PHPUnit60Migration:risky' => true,
'@Symfony' => true,
'@Symfony:risky' => true,
'align_multiline_comment' => true,
'array_indentation' => true,
'array_syntax' => ['syntax' => 'short'],
'blank_line_before_statement' => true,
'combine_consecutive_issets' => true,
'combine_consecutive_unsets' => true,
'comment_to_phpdoc' => true,
'compact_nullable_typehint' => true,
'escape_implicit_backslashes' => true,
'explicit_indirect_variable' => true,
'explicit_string_variable' => true,
'final_internal_class' => true,
'fully_qualified_strict_types' => true,
'function_to_constant' => ['functions' => ['get_class', 'get_called_class', 'php_sapi_name', 'phpversion', 'pi']],
'header_comment' => ['header' => $header],
'heredoc_to_nowdoc' => true,
'list_syntax' => ['syntax' => 'long'],
'method_argument_space' => ['ensure_fully_multiline' => true],
'method_chaining_indentation' => true,
'multiline_comment_opening_closing' => true,
'no_alternative_syntax' => true,
'no_extra_blank_lines' => ['tokens' => ['break', 'continue', 'extra', 'return', 'throw', 'use', 'parenthesis_brace_block', 'square_brace_block', 'curly_brace_block']],
'no_null_property_initialization' => true,
'no_short_echo_tag' => true,
'no_superfluous_elseif' => true,
'no_unneeded_curly_braces' => true,
'no_unneeded_final_method' => true,
'no_unreachable_default_argument_value' => true,
'no_useless_else' => true,
'no_useless_return' => true,
'ordered_class_elements' => true,
'ordered_imports' => true,
'php_unit_ordered_covers' => true,
'php_unit_set_up_tear_down_visibility' => true,
'php_unit_strict' => true,
'php_unit_test_annotation' => true,
'php_unit_test_class_requires_covers' => true,
'phpdoc_add_missing_param_annotation' => true,
'phpdoc_order' => true,
'phpdoc_types_order' => true,
'semicolon_after_instruction' => true,
'single_line_comment_style' => true,
'strict_comparison' => true,
'strict_param' => true,
'string_line_ending' => true,
'yoda_style' => true,
'header_comment' => ['header' => $header],
])
->setFinder($finder)
;
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ env:
- COMPOSER_FLAGS=""

stages:
- Static Code Analysis
- Static code analysis
- Test

before_install:
Expand All @@ -43,8 +43,8 @@ script:
jobs:
include:
-
stage: Static Code Analysis
php: 7.2
stage: Static code analysis
php: 7.3
install:
- travis_retry composer update -d dev-tools $DEFAULT_COMPOSER_FLAGS
- composer info -d dev-tools -D | sort
Expand Down
74 changes: 37 additions & 37 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,41 +1,41 @@
{
"name": "php-cs-fixer/phpunit-constraint-isidenticalstring",
"type": "library",
"description": "Constraint for testing strings considering not-same line endings.",
"license": "MIT",
"authors": [
{
"name": "Dariusz Rumiński",
"email": "[email protected]"
}
],
"require": {
"php": "^5.5 || ^7.0",
"phpunit/phpunit": "^5.7.23 || ^6.4.3 || ^7.0 || ^8.0",
"phpunitgoodpractices/polyfill": "^1.1"
},
"conflict": {
"hhvm": "*"
},
"require-dev": {
"johnkary/phpunit-speedtrap": "^1.1 || ^2.0 || ^3.0",
"symfony/phpunit-bridge": "^3.2.2 || ^4.0"
},
"config": {
"optimize-autoloader": true,
"sort-packages": true
},
"autoload": {
"psr-4": {
"PhpCsFixer\\PhpunitConstraintIsIdenticalString\\": "src/"
"name": "php-cs-fixer/phpunit-constraint-isidenticalstring",
"type": "library",
"description": "Constraint for testing strings considering not-same line endings.",
"license": "MIT",
"authors": [
{
"name": "Dariusz Rumiński",
"email": "[email protected]"
}
],
"require": {
"php": "^5.5 || ^7.0",
"phpunit/phpunit": "^5.7.23 || ^6.4.3 || ^7.0 || ^8.0",
"phpunitgoodpractices/polyfill": "^1.1"
},
"conflict": {
"hhvm": "*"
},
"require-dev": {
"johnkary/phpunit-speedtrap": "^1.1 || ^2.0 || ^3.0",
"symfony/phpunit-bridge": "^3.2.2 || ^4.0"
},
"config": {
"optimize-autoloader": true,
"sort-packages": true
},
"autoload": {
"psr-4": {
"PhpCsFixer\\PhpunitConstraintIsIdenticalString\\": "src/"
},
"files": [
"src/Constraint/IsIdenticalString.php"
]
},
"files": [
"src/Constraint/IsIdenticalString.php"
]
},
"autoload-dev": {
"psr-4": {
"PhpCsFixer\\PhpunitConstraintIsIdenticalString\\Tests\\": "tests/"
"autoload-dev": {
"psr-4": {
"PhpCsFixer\\PhpunitConstraintIsIdenticalString\\Tests\\": "tests/"
}
}
}
}
34 changes: 17 additions & 17 deletions dev-tools/composer.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{
"require": {
"php": "^7.2"
},
"conflict": {
"hhvm": "*"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^2.11",
"localheinz/composer-normalize": "^0.6.0",
"maglnet/composer-require-checker": "^0.1.6",
"mi-schi/phpmd-extension": "^4.2.1",
"phpmd/phpmd": "^2.6.0"
},
"config": {
"optimize-autoloader": true,
"sort-packages": true
}
"require": {
"php": "^7.3"
},
"conflict": {
"hhvm": "*"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^2.14",
"localheinz/composer-normalize": "^1.1",
"maglnet/composer-require-checker": "^2.0",
"mi-schi/phpmd-extension": "^4.3",
"phpmd/phpmd": "^2.6"
},
"config": {
"optimize-autoloader": true,
"sort-packages": true
}
}