From 764aa6907a83dcd3feb6e2e1e982b415b2141f52 Mon Sep 17 00:00:00 2001 From: prisis Date: Fri, 16 Apr 2021 11:47:09 +0200 Subject: [PATCH 1/3] fix: fixed cs fixes with php-cs-fixer and rector --- .php_cs | 2 + composer.json | 3 +- rector.php | 25 +- src/Config.php | 3 +- tests/Constraint/ArraySubset.php | 9 +- tests/Unit/ConfigTest.php | 609 ++++++++++++++++--------------- 6 files changed, 342 insertions(+), 309 deletions(-) diff --git a/.php_cs b/.php_cs index 09a1957..bffe337 100644 --- a/.php_cs +++ b/.php_cs @@ -28,6 +28,8 @@ $config->getFinder() '.dependabot', '.github', ]) + // php_unit_namespaced rule thinks than the const are some namespaces + ->notPath('rector.php') ->name('*.php') ->ignoreDotFiles(true) ->ignoreVCS(true); diff --git a/composer.json b/composer.json index 9e9aa72..86100e8 100644 --- a/composer.json +++ b/composer.json @@ -36,7 +36,8 @@ "phpstan/phpstan-strict-rules": "^0.12.9", "phpunit/phpunit": "^9.5.2", "psalm/plugin-phpunit": "^0.15.1", - "rector/rector": "^0.9.31", + "rector/rector": "^0.10.6", + "rector/rector-phpunit": "^0.10.6", "slam/phpstan-extensions": "^5.1.0", "symplify/phpstan-rules": "^9.2", "thecodingmachine/phpstan-strict-rules": "^0.12.1", diff --git a/rector.php b/rector.php index 5666f12..78ae3f9 100644 --- a/rector.php +++ b/rector.php @@ -15,6 +15,8 @@ use Nette\Utils\Strings; use Rector\Core\Configuration\Option; use Rector\Core\ValueObject\PhpVersion; +use Rector\PHPUnit\Set\PHPUnitSetList; +use Rector\Set\ValueObject\SetList; use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator; return static function (ContainerConfigurator $containerConfigurator): void { @@ -56,6 +58,27 @@ $parameters->set(Option::PHPSTAN_FOR_RECTOR_PATH, $phpstanPath); $parameters->set(Option::SETS, [ - 'action-injection-to-constructor-injection', 'array-str-functions-to-static-call', 'early-return', 'doctrine-code-quality', 'dead-code', 'code-quality', 'type-declaration', 'order', 'psr4', 'type-declaration', 'type-declaration-strict', 'php71', 'php72', 'php73', 'php74', 'php80', 'phpunit91', 'phpunit-code-quality', 'phpunit-exception', 'phpunit-yield-data-provider', + SetList::CODING_STYLE, + SetList::CODE_QUALITY, + SetList::CODE_QUALITY_STRICT, + SetList::DEAD_CODE, + SetList::PRIVATIZATION, + SetList::NAMING, + SetList::TYPE_DECLARATION, + SetList::ORDER, + PHPUnitSetList::PHPUNIT_CODE_QUALITY, + PHPUnitSetList::PHPUNIT_91, + PHPUnitSetList::PHPUNIT_EXCEPTION, + PHPUnitSetList::PHPUNIT_YIELD_DATA_PROVIDER, + PHPUnitSetList::PHPUNIT_SPECIFIC_METHOD, + SetList::PHP_71, + SetList::PHP_72, + SetList::PHP_73, + SetList::PHP_74, + SetList::PHP_80, + SetList::EARLY_RETURN, + SetList::TYPE_DECLARATION_STRICT, + SetList::PSR_4, + SetList::SAFE_07, ]); }; diff --git a/src/Config.php b/src/Config.php index 3ea058b..7048d4f 100644 --- a/src/Config.php +++ b/src/Config.php @@ -66,6 +66,7 @@ use function is_string; use function trim; +/** @noRector ArgumentAdderRector */ final class Config extends CsConfig { /** @var array> */ @@ -171,7 +172,7 @@ public function getRules(): array } /** - * @return bool[][]|string[][] + * @return array>|array>|array * * @psalm-return array{final_static_access: true, final_public_method_for_abstract_class: true, lowercase_constants: false, global_namespace_import: array{import_classes: true, import_constants: true, import_functions: true}, nullable_type_declaration_for_default_null_value: true, phpdoc_line_span: array{const: string, method: string, property: string}, phpdoc_to_param_type: false, self_static_accessor: true} */ diff --git a/tests/Constraint/ArraySubset.php b/tests/Constraint/ArraySubset.php index 227a34c..bec294e 100644 --- a/tests/Constraint/ArraySubset.php +++ b/tests/Constraint/ArraySubset.php @@ -22,6 +22,7 @@ use SebastianBergmann\RecursionContext\InvalidArgumentException; use Traversable; use function is_array; +use function Safe\array_replace_recursive; /** * Constraint that asserts that the array it is evaluated for has a specified subset. @@ -32,7 +33,7 @@ final class ArraySubset extends Constraint { /** @var mixed[] */ - private array $subset; + private array $subset = []; /** * @param ArrayObject|iterable|mixed[]|Traversable $subset @@ -80,14 +81,14 @@ public function evaluate($other, string $description = '', bool $returnResult = return null; } - $f = new ComparisonFailure( + $comparisonFailure = new ComparisonFailure( $patched, $arr, var_export($patched, true), var_export($arr, true) ); - $this->fail($arr, $description, $f); + $this->fail($arr, $description, $comparisonFailure); } /** @@ -124,7 +125,7 @@ protected function failureDescription($other): string * * @return mixed[] */ - protected function toArray(iterable $other): array + private function toArray(iterable $other): array { if (is_array($other)) { return $other; diff --git a/tests/Unit/ConfigTest.php b/tests/Unit/ConfigTest.php index 344e348..baecaf5 100644 --- a/tests/Unit/ConfigTest.php +++ b/tests/Unit/ConfigTest.php @@ -13,6 +13,7 @@ namespace Narrowspark\CS\Config\Tests\Unit; +use function Safe\sprintf; use ArrayObject; use Exception; use Narrowspark\CS\Config\Config; @@ -70,7 +71,7 @@ use PhpCsFixerCustomFixers\Fixer\PhpUnitNoUselessReturnFixer; use PhpCsFixerCustomFixers\Fixer\SingleSpaceAfterStatementFixer; use PhpCsFixerCustomFixers\Fixer\SingleSpaceBeforeStatementFixer; -use PHPUnit\Framework\Assert as PhpUnitAssert; +use PHPUnit\Framework\Assert; use PHPUnit\Framework\TestCase; use Traversable; use function array_diff; @@ -82,7 +83,6 @@ use function implode; use function is_array; use function is_string; -use function sprintf; use function str_replace; use function trim; use function var_export; @@ -96,6 +96,65 @@ */ final class ConfigTest extends TestCase { + /** @var string */ + private const HEADER = 'foo'; + + /** @var array */ + private const SYMFONY_FIXERS = [ + 'self_accessor' => 'it causes an edge case error', + ]; + + /** @var array|string> */ + private const CONTRIB_FIXERS = [ + 'header_comment' => 'it is not enabled by default', + 'array_syntax' => [ + 'long' => 'it conflicts with short array syntax (which is enabled)', + ], + 'no_php4_constructor' => 'it changes behaviour', + 'not_operator_with_space' => 'we do not need leading and trailing whitespace before !', + 'php_unit_strict' => 'it changes behaviour', + 'psr0' => 'we are using PSR-4', + 'no_homoglyph_names' => 'renames classes and cannot rename the files. You might have string references to renamed code (``$$name``)', + 'simplified_null_return' => 'it changes behaviour on void return', + ]; + + /** @var array */ + private const PHP73_FIXERS = [ + 'heredoc_indentation' => 'Is destroying Heredoc/nowdoc', + ]; + + /** @var array */ + private const VALUES = [ + 'string-empty' => '', + 'string-not-empty' => 'foo', + 'string-with-line-feed-only' => "\n", + 'string-with-spaces-only' => ' ', + 'string-with-tab-only' => "\t", + ]; + + /** @var string[] */ + private const PHP_CS_FIXER_CUSTOM_FIXERS = [ + 'PhpCsFixerCustomFixers/implode_call', + 'PhpCsFixerCustomFixers/no_two_consecutive_empty_lines', + 'PhpCsFixerCustomFixers/no_unneeded_concatenation', + 'PhpCsFixerCustomFixers/no_useless_class_comment', + 'PhpCsFixerCustomFixers/no_useless_constructor_comment', + 'PhpCsFixerCustomFixers/nullable_param_style', + 'PhpCsFixerCustomFixers/single_line_throw', + 'PhpCsFixerCustomFixers/phpdoc_var_annotation_correct_order', + 'PhpCsFixerCustomFixers/no_useless_sprintf', + 'PhpCsFixerCustomFixers/operator_linebreak', + ]; + + /** @var string[] */ + private const PEDRO_TROLLER_FIXERS = [ + 'PedroTroller/single_line_comment', + 'PedroTroller/useless_comment', + 'PedroTroller/ordered_spec_elements', + 'PedroTroller/phpspec_scenario_return_type_declaration', + 'PedroTroller/phpspec_scenario_scope', + ]; + public function testImplementsInterface(): void { self::assertInstanceOf(ConfigInterface::class, new Config()); @@ -305,15 +364,14 @@ public function testDoesNotHaveHeaderCommentFixerByDefault(): void public function testHasHeaderCommentFixerIfProvided(): void { - $header = 'foo'; - $config = new Config($header); + $config = new Config(self::HEADER); $rules = $config->getRules(); self::assertArrayHasKey('header_comment', $rules); $expected = [ 'comment_type' => 'PHPDoc', - 'header' => $header, + 'header' => self::HEADER, 'location' => 'after_declare_strict', 'separate' => 'both', ]; @@ -361,7 +419,7 @@ public function testAllConfiguredRulesAreBuiltIn(): void * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException * @throws Exception */ - public function testDoesNotHaveRulesEnabled(string $fixer, array|string $reason): void + public function testDoesNotHaveRulesEnabled(string $fixer, array | string $reason): void { $config = new Config(); $rule = [ @@ -411,7 +469,7 @@ public function testHeaderCommentFixerIsEnabledIfHeaderIsProvided(string $header } /** - * @return bool[][]|string[][] + * @return array>|array>|array * * @psalm-return array{final_static_access: true, final_public_method_for_abstract_class: true, lowercase_constants: false, global_namespace_import: array{import_classes: true, import_constants: true, import_functions: true}, nullable_type_declaration_for_default_null_value: true, phpdoc_line_span: array{const: string, method: string, property: string}, phpdoc_to_param_type: false, self_static_accessor: true} */ @@ -446,28 +504,7 @@ public function getNoGroupRules(): array */ public static function provideDoesNotHaveRulesEnabledCases(): iterable { - $symfonyFixers = [ - 'self_accessor' => 'it causes an edge case error', - ]; - - $contribFixers = [ - 'header_comment' => 'it is not enabled by default', - 'array_syntax' => [ - 'long' => 'it conflicts with short array syntax (which is enabled)', - ], - 'no_php4_constructor' => 'it changes behaviour', - 'not_operator_with_space' => 'we do not need leading and trailing whitespace before !', - 'php_unit_strict' => 'it changes behaviour', - 'psr0' => 'we are using PSR-4', - 'no_homoglyph_names' => 'renames classes and cannot rename the files. You might have string references to renamed code (``$$name``)', - 'simplified_null_return' => 'it changes behaviour on void return', - ]; - - $php73Fixers = [ - 'heredoc_indentation' => 'Is destroying Heredoc/nowdoc', - ]; - - $fixers = array_merge($contribFixers, $symfonyFixers, $php73Fixers); + $fixers = array_merge(self::CONTRIB_FIXERS, self::SYMFONY_FIXERS, self::PHP73_FIXERS); $data = []; @@ -488,15 +525,7 @@ public static function provideDoesNotHaveRulesEnabledCases(): iterable */ public static function provideHeaderCommentFixerIsEnabledIfHeaderIsProvidedCases(): iterable { - $values = [ - 'string-empty' => '', - 'string-not-empty' => 'foo', - 'string-with-line-feed-only' => "\n", - 'string-with-spaces-only' => ' ', - 'string-with-tab-only' => "\t", - ]; - - foreach ($values as $key => $value) { + foreach (self::VALUES as $key => $value) { yield $key => [ $value, ]; @@ -519,140 +548,7 @@ public static function assertArraySubset( bool $checkForObjectIdentity = false, string $message = '' ): void { - PhpUnitAssert::assertThat($array, new ArraySubset($subset, $checkForObjectIdentity), $message); - } - - /** - * @return ((string|string[])[]|true)[] - * - * @psalm-return array{combine_nested_dirname: true, list_syntax: array{syntax: string}, pow_to_exponentiation: true, random_api_migration: true, return_assignment: true, visibility_required: array{elements: array{0: string, 1: string, 2: string}}, void_return: true} - */ - protected function getPhp71Rules(): array - { - return [ - 'combine_nested_dirname' => true, - 'list_syntax' => [ - 'syntax' => 'short', - ], - 'pow_to_exponentiation' => true, - 'random_api_migration' => true, - 'return_assignment' => true, - 'visibility_required' => [ - 'elements' => [ - 'const', - 'method', - 'property', - ], - ], - 'void_return' => true, - ]; - } - - /** - * @return bool[] - * - * @psalm-return array{heredoc_indentation: false} - */ - protected function getPhp73Rules(): array - { - return ['heredoc_indentation' => false]; - } - - /** - * @return ((bool|string|string[])[]|bool)[] - * - * @psalm-return array{@DoctrineAnnotation: true, align_multiline_comment: array{comment_type: string}, no_binary_string: true, no_unset_on_property: false, array_indentation: true, array_syntax: array{syntax: string}, logical_operators: true, pre_increment: false, backtick_to_shell_exec: true, blank_line_before_return: true, class_keyword_remove: false, combine_consecutive_issets: true, combine_consecutive_unsets: true, comment_to_phpdoc: false, compact_nullable_typehint: true, date_time_immutable: true, declare_strict_types: true, dir_constant: true, ereg_to_preg: true, escape_implicit_backslashes: true, explicit_indirect_variable: true, explicit_string_variable: true, ordered_class_elements: true, ordered_imports: array{importsOrder: array{0: string, 1: string, 2: string}}, final_class: true, final_internal_class: true, fully_qualified_strict_types: true, general_phpdoc_annotation_remove: false, hash_to_slash_comment: true, header_comment: false, linebreak_after_opening_tag: true, magic_constant_casing: true, mb_str_functions: false, method_argument_space: array{ensure_fully_multiline: true, keep_multiple_spaces_after_comma: false}, static_lambda: true, string_line_ending: true, method_chaining_indentation: true, modernize_types_casting: true, multiline_comment_opening_closing: true, multiline_whitespace_before_semicolons: array{strategy: string}, no_alternative_syntax: true, no_blank_lines_before_namespace: false, no_multiline_whitespace_before_semicolons: false, no_php4_constructor: false, no_short_echo_tag: true, no_useless_else: true, no_useless_return: true, no_superfluous_elseif: true, phpdoc_to_return_type: true, phpdoc_var_annotation_correct_order: true, no_superfluous_phpdoc_tags: true, not_operator_with_space: false, not_operator_with_successor_space: true, no_homoglyph_names: false, no_unset_cast: true, ordered_interfaces: true, phpdoc_add_missing_param_annotation: array{only_untyped: true}, phpdoc_order: true, phpdoc_types_order: array{null_adjustment: string, sort_algorithm: string}, protected_to_private: true, psr0: false, psr4: true, semicolon_after_instruction: true, simplified_null_return: false, strict_comparison: true, strict_param: true} - */ - protected function getContribRules(): array - { - return [ - '@DoctrineAnnotation' => true, - 'align_multiline_comment' => [ - 'comment_type' => 'all_multiline', - ], - 'no_binary_string' => true, - 'no_unset_on_property' => false, - 'array_indentation' => true, - 'array_syntax' => [ - 'syntax' => 'short', - ], - 'logical_operators' => true, - 'pre_increment' => false, - 'backtick_to_shell_exec' => true, - 'blank_line_before_return' => true, - 'class_keyword_remove' => false, - 'combine_consecutive_issets' => true, - 'combine_consecutive_unsets' => true, - 'comment_to_phpdoc' => false, - 'compact_nullable_typehint' => true, - 'date_time_immutable' => true, - 'declare_strict_types' => true, - 'dir_constant' => true, - 'ereg_to_preg' => true, - 'escape_implicit_backslashes' => true, - 'explicit_indirect_variable' => true, - 'explicit_string_variable' => true, - 'ordered_class_elements' => true, - 'ordered_imports' => [ - 'importsOrder' => [ - 'class', - 'const', - 'function', - ], - ], - 'final_class' => true, - 'final_internal_class' => true, - 'fully_qualified_strict_types' => true, - 'general_phpdoc_annotation_remove' => false, - 'hash_to_slash_comment' => true, - 'header_comment' => false, - 'linebreak_after_opening_tag' => true, - 'magic_constant_casing' => true, - 'mb_str_functions' => false, - 'method_argument_space' => [ - 'ensure_fully_multiline' => true, - 'keep_multiple_spaces_after_comma' => false, - ], - 'static_lambda' => true, - 'string_line_ending' => true, - 'method_chaining_indentation' => true, - 'modernize_types_casting' => true, - 'multiline_comment_opening_closing' => true, - 'multiline_whitespace_before_semicolons' => [ - 'strategy' => 'no_multi_line', - ], - 'no_alternative_syntax' => true, - 'no_blank_lines_before_namespace' => false, - 'no_multiline_whitespace_before_semicolons' => false, - 'no_php4_constructor' => false, - 'no_short_echo_tag' => true, - 'no_useless_else' => true, - 'no_useless_return' => true, - 'no_superfluous_elseif' => true, - 'phpdoc_to_return_type' => true, - 'phpdoc_var_annotation_correct_order' => true, - 'no_superfluous_phpdoc_tags' => true, - 'not_operator_with_space' => false, - 'not_operator_with_successor_space' => true, - 'no_homoglyph_names' => false, - 'no_unset_cast' => true, - 'ordered_interfaces' => true, - 'phpdoc_add_missing_param_annotation' => [ - 'only_untyped' => true, - ], - 'phpdoc_order' => true, - 'phpdoc_types_order' => [ - 'null_adjustment' => 'always_first', - 'sort_algorithm' => 'alpha', - ], - 'protected_to_private' => true, - 'psr0' => false, - 'psr4' => true, - 'semicolon_after_instruction' => true, - 'simplified_null_return' => false, - 'strict_comparison' => true, - 'strict_param' => true, - ]; + Assert::assertThat($array, new ArraySubset($subset, $checkForObjectIdentity), $message); } /** @@ -660,125 +556,18 @@ protected function getContribRules(): array * * @psalm-return array{@PSR2: true} */ - protected function getPsr2Rules(): array + private function getPsr2Rules(): array { return [ '@PSR2' => true, ]; } - - /** - * @return ((bool|string|string[])[]|bool)[] - * - * @psalm-return array|bool|string>|bool> - */ - protected function getPsr12Rules(): array - { - return [ - 'binary_operator_spaces' => [ - 'default' => 'single_space', - 'operators' => [], - ], // Symfony Rule - 'blank_line_after_opening_tag' => true, // Symfony Rule - 'braces' => [ - 'allow_single_line_closure' => false, - 'position_after_anonymous_constructs' => 'same', - 'position_after_control_structures' => 'same', - 'position_after_functions_and_oop_constructs' => 'next', - ], - 'concat_space' => ['spacing' => 'one'], - 'declare_equal_normalize' => [ - 'space' => 'none', - ], // Symfony Rule - 'lowercase_cast' => true, - 'new_with_braces' => true, - 'no_blank_lines_after_class_opening' => true, - 'no_extra_blank_lines' => [ - 'tokens' => [ - 'break', - 'case', - 'continue', - 'curly_brace_block', - 'default', - 'extra', - 'parenthesis_brace_block', - 'return', - 'square_brace_block', - 'switch', - 'throw', - 'use', - 'use_trait', - ], - ], - 'no_leading_import_slash' => true, - 'no_singleline_whitespace_before_semicolons' => true, - 'no_trailing_whitespace' => true, - 'no_whitespace_before_comma_in_array' => true, - 'return_type_declaration' => true, - 'short_scalar_cast' => true, - 'single_import_per_statement' => false, - 'space_after_semicolon' => [ - 'remove_in_empty_for_expressions' => true, - ], // Symfony Rule - 'ternary_operator_spaces' => true, - 'unary_operator_spaces' => true, - 'visibility_required' => [ - 'elements' => ['const', 'method', 'property'], - ], - 'whitespace_after_comma_in_array' => true, - ]; - } - - /** - * @return ((string|string[]|true)[]|bool)[] - * - * @psalm-return array|bool|string>|bool> - */ - protected function getPHPUnitRules(): array - { - return [ - 'php_unit_expectation' => [ - 'target' => 'newest', - ], - 'php_unit_dedicate_assert_internal_type' => true, - 'php_unit_mock' => true, - 'php_unit_mock_short_will_return' => true, - 'php_unit_namespaced' => [ - 'target' => 'newest', - ], - 'php_unit_no_expectation_annotation' => [ - 'target' => 'newest', - 'use_class_const' => true, - ], - 'php_unit_test_case_static_method_calls' => [ - 'call_type' => 'self', - ], - 'php_unit_internal_class' => [ - 'types' => [ - 'abstract', - 'final', - 'normal', - ], - ], - 'php_unit_ordered_covers' => true, - 'php_unit_set_up_tear_down_visibility' => true, - 'php_unit_strict' => false, - 'php_unit_size_class' => true, - 'php_unit_test_annotation' => true, - 'php_unit_test_class_requires_covers' => true, - 'php_unit_method_casing' => true, - 'php_unit_construct' => true, - 'php_unit_dedicate_assert' => true, - 'php_unit_fqcn_annotation' => true, - ]; - } - /** * @return ((bool|string|string[])[]|bool)[] * * @psalm-return array|bool|string>|bool> */ - protected function getSymfonyRules(): array + private function getSymfonyRules(): array { return [ 'set_type_to_cast' => true, @@ -1221,6 +1010,242 @@ protected function getSymfonyRules(): array 'whitespace_after_comma_in_array' => true, ]; } + /** + * @return ((bool|string|string[])[]|bool)[] + * + * @psalm-return array{@DoctrineAnnotation: true, align_multiline_comment: array{comment_type: string}, no_binary_string: true, no_unset_on_property: false, array_indentation: true, array_syntax: array{syntax: string}, logical_operators: true, pre_increment: false, backtick_to_shell_exec: true, blank_line_before_return: true, class_keyword_remove: false, combine_consecutive_issets: true, combine_consecutive_unsets: true, comment_to_phpdoc: false, compact_nullable_typehint: true, date_time_immutable: true, declare_strict_types: true, dir_constant: true, ereg_to_preg: true, escape_implicit_backslashes: true, explicit_indirect_variable: true, explicit_string_variable: true, ordered_class_elements: true, ordered_imports: array{importsOrder: array{0: string, 1: string, 2: string}}, final_class: true, final_internal_class: true, fully_qualified_strict_types: true, general_phpdoc_annotation_remove: false, hash_to_slash_comment: true, header_comment: false, linebreak_after_opening_tag: true, magic_constant_casing: true, mb_str_functions: false, method_argument_space: array{ensure_fully_multiline: true, keep_multiple_spaces_after_comma: false}, static_lambda: true, string_line_ending: true, method_chaining_indentation: true, modernize_types_casting: true, multiline_comment_opening_closing: true, multiline_whitespace_before_semicolons: array{strategy: string}, no_alternative_syntax: true, no_blank_lines_before_namespace: false, no_multiline_whitespace_before_semicolons: false, no_php4_constructor: false, no_short_echo_tag: true, no_useless_else: true, no_useless_return: true, no_superfluous_elseif: true, phpdoc_to_return_type: true, phpdoc_var_annotation_correct_order: true, no_superfluous_phpdoc_tags: true, not_operator_with_space: false, not_operator_with_successor_space: true, no_homoglyph_names: false, no_unset_cast: true, ordered_interfaces: true, phpdoc_add_missing_param_annotation: array{only_untyped: true}, phpdoc_order: true, phpdoc_types_order: array{null_adjustment: string, sort_algorithm: string}, protected_to_private: true, psr0: false, psr4: true, semicolon_after_instruction: true, simplified_null_return: false, strict_comparison: true, strict_param: true} + */ + private function getContribRules(): array + { + return [ + '@DoctrineAnnotation' => true, + 'align_multiline_comment' => [ + 'comment_type' => 'all_multiline', + ], + 'no_binary_string' => true, + 'no_unset_on_property' => false, + 'array_indentation' => true, + 'array_syntax' => [ + 'syntax' => 'short', + ], + 'logical_operators' => true, + 'pre_increment' => false, + 'backtick_to_shell_exec' => true, + 'blank_line_before_return' => true, + 'class_keyword_remove' => false, + 'combine_consecutive_issets' => true, + 'combine_consecutive_unsets' => true, + 'comment_to_phpdoc' => false, + 'compact_nullable_typehint' => true, + 'date_time_immutable' => true, + 'declare_strict_types' => true, + 'dir_constant' => true, + 'ereg_to_preg' => true, + 'escape_implicit_backslashes' => true, + 'explicit_indirect_variable' => true, + 'explicit_string_variable' => true, + 'ordered_class_elements' => true, + 'ordered_imports' => [ + 'importsOrder' => [ + 'class', + 'const', + 'function', + ], + ], + 'final_class' => true, + 'final_internal_class' => true, + 'fully_qualified_strict_types' => true, + 'general_phpdoc_annotation_remove' => false, + 'hash_to_slash_comment' => true, + 'header_comment' => false, + 'linebreak_after_opening_tag' => true, + 'magic_constant_casing' => true, + 'mb_str_functions' => false, + 'method_argument_space' => [ + 'ensure_fully_multiline' => true, + 'keep_multiple_spaces_after_comma' => false, + ], + 'static_lambda' => true, + 'string_line_ending' => true, + 'method_chaining_indentation' => true, + 'modernize_types_casting' => true, + 'multiline_comment_opening_closing' => true, + 'multiline_whitespace_before_semicolons' => [ + 'strategy' => 'no_multi_line', + ], + 'no_alternative_syntax' => true, + 'no_blank_lines_before_namespace' => false, + 'no_multiline_whitespace_before_semicolons' => false, + 'no_php4_constructor' => false, + 'no_short_echo_tag' => true, + 'no_useless_else' => true, + 'no_useless_return' => true, + 'no_superfluous_elseif' => true, + 'phpdoc_to_return_type' => true, + 'phpdoc_var_annotation_correct_order' => true, + 'no_superfluous_phpdoc_tags' => true, + 'not_operator_with_space' => false, + 'not_operator_with_successor_space' => true, + 'no_homoglyph_names' => false, + 'no_unset_cast' => true, + 'ordered_interfaces' => true, + 'phpdoc_add_missing_param_annotation' => [ + 'only_untyped' => true, + ], + 'phpdoc_order' => true, + 'phpdoc_types_order' => [ + 'null_adjustment' => 'always_first', + 'sort_algorithm' => 'alpha', + ], + 'protected_to_private' => true, + 'psr0' => false, + 'psr4' => true, + 'semicolon_after_instruction' => true, + 'simplified_null_return' => false, + 'strict_comparison' => true, + 'strict_param' => true, + ]; + } + + /** + * @return ((bool|string|string[])[]|bool)[] + * + * @psalm-return array|bool|string>|bool> + */ + private function getPsr12Rules(): array + { + return [ + 'binary_operator_spaces' => [ + 'default' => 'single_space', + 'operators' => [], + ], // Symfony Rule + 'blank_line_after_opening_tag' => true, // Symfony Rule + 'braces' => [ + 'allow_single_line_closure' => false, + 'position_after_anonymous_constructs' => 'same', + 'position_after_control_structures' => 'same', + 'position_after_functions_and_oop_constructs' => 'next', + ], + 'concat_space' => ['spacing' => 'one'], + 'declare_equal_normalize' => [ + 'space' => 'none', + ], // Symfony Rule + 'lowercase_cast' => true, + 'new_with_braces' => true, + 'no_blank_lines_after_class_opening' => true, + 'no_extra_blank_lines' => [ + 'tokens' => [ + 'break', + 'case', + 'continue', + 'curly_brace_block', + 'default', + 'extra', + 'parenthesis_brace_block', + 'return', + 'square_brace_block', + 'switch', + 'throw', + 'use', + 'use_trait', + ], + ], + 'no_leading_import_slash' => true, + 'no_singleline_whitespace_before_semicolons' => true, + 'no_trailing_whitespace' => true, + 'no_whitespace_before_comma_in_array' => true, + 'return_type_declaration' => true, + 'short_scalar_cast' => true, + 'single_import_per_statement' => false, + 'space_after_semicolon' => [ + 'remove_in_empty_for_expressions' => true, + ], // Symfony Rule + 'ternary_operator_spaces' => true, + 'unary_operator_spaces' => true, + 'visibility_required' => [ + 'elements' => ['const', 'method', 'property'], + ], + 'whitespace_after_comma_in_array' => true, + ]; + } + /** + * @return ((string|string[])[]|true)[] + * + * @psalm-return array{combine_nested_dirname: true, list_syntax: array{syntax: string}, pow_to_exponentiation: true, random_api_migration: true, return_assignment: true, visibility_required: array{elements: array{0: string, 1: string, 2: string}}, void_return: true} + */ + private function getPhp71Rules(): array + { + return [ + 'combine_nested_dirname' => true, + 'list_syntax' => [ + 'syntax' => 'short', + ], + 'pow_to_exponentiation' => true, + 'random_api_migration' => true, + 'return_assignment' => true, + 'visibility_required' => [ + 'elements' => [ + 'const', + 'method', + 'property', + ], + ], + 'void_return' => true, + ]; + } + /** + * @return bool[] + * + * @psalm-return array{heredoc_indentation: false} + */ + private function getPhp73Rules(): array + { + return ['heredoc_indentation' => false]; + } + + /** + * @return ((string|string[]|true)[]|bool)[] + * + * @psalm-return array|bool|string>|bool> + */ + private function getPHPUnitRules(): array + { + return [ + 'php_unit_expectation' => [ + 'target' => 'newest', + ], + 'php_unit_dedicate_assert_internal_type' => true, + 'php_unit_mock' => true, + 'php_unit_mock_short_will_return' => true, + 'php_unit_namespaced' => [ + 'target' => 'newest', + ], + 'php_unit_no_expectation_annotation' => [ + 'target' => 'newest', + 'use_class_const' => true, + ], + 'php_unit_test_case_static_method_calls' => [ + 'call_type' => 'self', + ], + 'php_unit_internal_class' => [ + 'types' => [ + 'abstract', + 'final', + 'normal', + ], + ], + 'php_unit_ordered_covers' => true, + 'php_unit_set_up_tear_down_visibility' => true, + 'php_unit_strict' => false, + 'php_unit_size_class' => true, + 'php_unit_test_annotation' => true, + 'php_unit_test_class_requires_covers' => true, + 'php_unit_method_casing' => true, + 'php_unit_construct' => true, + 'php_unit_dedicate_assert' => true, + 'php_unit_fqcn_annotation' => true, + ]; + } /** * @return ((int|true)[]|bool)[] @@ -1298,27 +1323,7 @@ private function getKubawerlosRules(): array */ private function getDeprecatedFixer(): array { - $phpCsFixerCustomFixers = [ - 'PhpCsFixerCustomFixers/implode_call', - 'PhpCsFixerCustomFixers/no_two_consecutive_empty_lines', - 'PhpCsFixerCustomFixers/no_unneeded_concatenation', - 'PhpCsFixerCustomFixers/no_useless_class_comment', - 'PhpCsFixerCustomFixers/no_useless_constructor_comment', - 'PhpCsFixerCustomFixers/nullable_param_style', - 'PhpCsFixerCustomFixers/single_line_throw', - 'PhpCsFixerCustomFixers/phpdoc_var_annotation_correct_order', - 'PhpCsFixerCustomFixers/no_useless_sprintf', - 'PhpCsFixerCustomFixers/operator_linebreak', - ]; - $pedroTrollerFixers = [ - 'PedroTroller/single_line_comment', - 'PedroTroller/useless_comment', - 'PedroTroller/ordered_spec_elements', - 'PedroTroller/phpspec_scenario_return_type_declaration', - 'PedroTroller/phpspec_scenario_scope', - ]; - - return array_merge($phpCsFixerCustomFixers, $pedroTrollerFixers); + return array_merge(self::PHP_CS_FIXER_CUSTOM_FIXERS, self::PEDRO_TROLLER_FIXERS); } /** From ddd3a1c8118f1232e1a23773444cc7b57a520051 Mon Sep 17 00:00:00 2001 From: prisis Date: Fri, 16 Apr 2021 19:03:41 +0200 Subject: [PATCH 2/3] style: cs fixes --- tests/Unit/ConfigTest.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/Unit/ConfigTest.php b/tests/Unit/ConfigTest.php index baecaf5..2f0d0c1 100644 --- a/tests/Unit/ConfigTest.php +++ b/tests/Unit/ConfigTest.php @@ -13,7 +13,6 @@ namespace Narrowspark\CS\Config\Tests\Unit; -use function Safe\sprintf; use ArrayObject; use Exception; use Narrowspark\CS\Config\Config; @@ -83,6 +82,7 @@ use function implode; use function is_array; use function is_string; +use function Safe\sprintf; use function str_replace; use function trim; use function var_export; @@ -562,6 +562,7 @@ private function getPsr2Rules(): array '@PSR2' => true, ]; } + /** * @return ((bool|string|string[])[]|bool)[] * @@ -1010,6 +1011,7 @@ private function getSymfonyRules(): array 'whitespace_after_comma_in_array' => true, ]; } + /** * @return ((bool|string|string[])[]|bool)[] * @@ -1168,6 +1170,7 @@ private function getPsr12Rules(): array 'whitespace_after_comma_in_array' => true, ]; } + /** * @return ((string|string[])[]|true)[] * @@ -1193,6 +1196,7 @@ private function getPhp71Rules(): array 'void_return' => true, ]; } + /** * @return bool[] * From 9a356ec36fa6f345f8394e18afdaf372080c0b36 Mon Sep 17 00:00:00 2001 From: prisis Date: Fri, 16 Apr 2021 19:03:49 +0200 Subject: [PATCH 3/3] fix: fixed cs fixes with php-cs-fixer and rector --- src/Config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Config.php b/src/Config.php index 7048d4f..3aabaa6 100644 --- a/src/Config.php +++ b/src/Config.php @@ -172,7 +172,7 @@ public function getRules(): array } /** - * @return array>|array>|array + * @return array>|array>|array * * @psalm-return array{final_static_access: true, final_public_method_for_abstract_class: true, lowercase_constants: false, global_namespace_import: array{import_classes: true, import_constants: true, import_functions: true}, nullable_type_declaration_for_default_null_value: true, phpdoc_line_span: array{const: string, method: string, property: string}, phpdoc_to_param_type: false, self_static_accessor: true} */