Merge pull request #51 from PrisisForks/feature/normalize-composer

fix : normalized composer.json's

Author: prisis

composer.json

@@ -28,12 +28,19 @@
     },
     "require-dev": {
         "ext-json": "*",
-        "phpunit/phpunit": "^8.5.2",
-        "narrowspark/testing-helper": "^8.0.2"
+        "narrowspark/testing-helper": "^8.0.2",
+        "phpunit/phpunit": "^8.5.2"
     },
     "config": {
         "sort-packages": true
     },
+    "extra": {
+        "prefetcher": {
+            "require": {
+                "phpunit/phpunit": "^8.5"
+            }
+        }
+    },
     "autoload": {
         "psr-4": {
             "Narrowspark\\CS\\Config\\": "src"
@@ -47,29 +54,22 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "scripts": {
+        "post-install-cmd": "composer --working-dir=./.build install",
+        "post-update-cmd": "composer --working-dir=./.build update --lock",
         "coverage": [
             "phpunit --dump-xdebug-filter=./.build/phpunit/.xdebug-filter.php",
             "phpunit --prepend=./.build/phpunit/.xdebug-filter.php --coverage-html=./.build/phpunit/coverage"
         ],
         "cs": "composer --working-dir=./.build cs -- -v",
         "cs:check": "composer --working-dir=./.build cs:check -- -v",
+        "infection": "composer --working-dir=./.build infection -- --min-covered-msi=100 --min-msi=100",
         "phpstan": "composer --working-dir=./.build phpstan -- --memory-limit=-1",
         "psalm": "composer --working-dir=./.build psalm",
         "psalm:fix": "composer --working-dir=./.build psalm:fix",
-        "infection": "composer --working-dir=./.build infection -- --min-covered-msi=100 --min-msi=100",
-        "test": "phpunit",
-        "post-install-cmd": "composer --working-dir=./.build install",
-        "post-update-cmd": "composer --working-dir=./.build update --lock"
+        "test": "phpunit"
     },
     "support": {
         "issues": "https://github.com/narrowspark/php-cs-fixer-config/issues",
         "source": "https://github.com/narrowspark/php-cs-fixer-config"
-    },
-    "extra": {
-        "prefetcher": {
-            "require": {
-                "phpunit/phpunit": "^8.5"
-            }
-        }
     }
 }

package-lock.json

@@ -79,7 +79,6 @@ final class Config extends CsConfig
     /**
      * Create new Config instance.
      *
-     * @param null|string                                     $header
      * @param array<string, array<string, mixed>|bool|string> $overwriteConfig
      */
     public function __construct(?string $header = null, array $overwriteConfig = [])
@@ -307,7 +306,7 @@ public function getPhp73Rules(): array
     /**
      * @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: false, 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: false}, 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}
+     * @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}
      */
     public function getContribRules(): array
     {
@@ -377,14 +376,14 @@ public function getContribRules(): array
             'no_superfluous_elseif' => true,
             'phpdoc_to_return_type' => true,
             'phpdoc_var_annotation_correct_order' => true,
-            'no_superfluous_phpdoc_tags' => false,
+            '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' => false,
+                'only_untyped' => true,
             ],
             'phpdoc_order' => true,
             'phpdoc_types_order' => [

src/Config.php

@@ -57,11 +57,6 @@ public function testBranchAlias(): void
         );
     }
 
-    /**
-     * @param string $version
-     *
-     * @return string
-     */
     private function convertAppVersionToAliasedVersion(string $version): string
     {
         $parts = explode('.', $version, 3);

tests/AutoReview/ComposerTest.php

@@ -346,14 +346,11 @@ public function testAllConfiguredRulesAreBuiltIn(): void
     /**
      * @dataProvider provideDoesNotHaveRulesEnabledCases
      *
-     * @param string                           $fixer
      * @param array<int|string, string>|string $reason
      *
      * @throws \PHPUnit\Framework\ExpectationFailedException
      * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
      * @throws Exception
-     *
-     * @return void
      */
     public function testDoesNotHaveRulesEnabled(string $fixer, $reason): void
     {
@@ -427,8 +424,6 @@ public function testHeaderCommentFixerIsDisabledByDefault(): void
 
     /**
      * @dataProvider provideHeaderCommentFixerIsEnabledIfHeaderIsProvidedCases
-     *
-     * @param string $header
      */
     public function testHeaderCommentFixerIsEnabledIfHeaderIsProvided(string $header): void
     {
@@ -532,7 +527,7 @@ protected function getPhp73Rules(): array
     /**
      * @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: false, 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: false}, 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}
+     * @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
     {
@@ -602,14 +597,14 @@ protected function getContribRules(): array
             'no_superfluous_elseif' => true,
             'phpdoc_to_return_type' => true,
             'phpdoc_var_annotation_correct_order' => true,
-            'no_superfluous_phpdoc_tags' => false,
+            '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' => false,
+                'only_untyped' => true,
             ],
             'phpdoc_order' => true,
             'phpdoc_types_order' => [