From bf0fd65fdf551ef57a470452276e09f7286b2d81 Mon Sep 17 00:00:00 2001 From: Mante Balzaraviciute Date: Tue, 7 Mar 2023 15:26:57 +0000 Subject: [PATCH 1/4] UPDATE: slevomat coding standards --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 08d0a48..bc6551b 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ ], "require": { "php": "^8.0", - "slevomat/coding-standard": "^7.0", + "slevomat/coding-standard": "^8.0", "symplify/easy-coding-standard": "^10.0.6", "nikic/php-parser": "^4.0" }, From 6afa3a22049dccc5897f7476f637d75fb560c8c2 Mon Sep 17 00:00:00 2001 From: Mante Balzaraviciute Date: Thu, 9 Mar 2023 15:20:08 +0000 Subject: [PATCH 2/4] UPDATE: standards --- ecs.php | 58 +++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 38 insertions(+), 20 deletions(-) diff --git a/ecs.php b/ecs.php index 0a07303..477aaf5 100644 --- a/ecs.php +++ b/ecs.php @@ -2,6 +2,7 @@ declare(strict_types=1); +use PHP_CodeSniffer\Standards\Generic\Sniffs\CodeAnalysis\UnusedFunctionParameterSniff; use PHP_CodeSniffer\Standards\Generic\Sniffs\Formatting\SpaceAfterCastSniff; use PHP_CodeSniffer\Standards\Generic\Sniffs\Formatting\SpaceAfterNotSniff; use PHP_CodeSniffer\Standards\Generic\Sniffs\NamingConventions\CamelCapsFunctionNameSniff; @@ -16,7 +17,9 @@ use PhpCsFixer\Fixer\Whitespace\ArrayIndentationFixer; use SlevomatCodingStandard\Sniffs\Arrays\SingleLineArrayWhitespaceSniff; use SlevomatCodingStandard\Sniffs\Arrays\TrailingArrayCommaSniff; +use SlevomatCodingStandard\Sniffs\Classes\BackedEnumTypeSpacingSniff; use SlevomatCodingStandard\Sniffs\Classes\ClassConstantVisibilitySniff; +use SlevomatCodingStandard\Sniffs\Classes\MethodSpacingSniff; use SlevomatCodingStandard\Sniffs\Classes\TraitUseDeclarationSniff; use SlevomatCodingStandard\Sniffs\Commenting\EmptyCommentSniff; use SlevomatCodingStandard\Sniffs\Commenting\UselessFunctionDocCommentSniff; @@ -30,6 +33,7 @@ use SlevomatCodingStandard\Sniffs\Functions\UselessParameterDefaultValueSniff; use SlevomatCodingStandard\Sniffs\Namespaces\AlphabeticallySortedUsesSniff; use SlevomatCodingStandard\Sniffs\Namespaces\MultipleUsesPerLineSniff; +use SlevomatCodingStandard\Sniffs\Namespaces\NamespaceSpacingSniff; use SlevomatCodingStandard\Sniffs\Namespaces\UnusedUsesSniff; use SlevomatCodingStandard\Sniffs\Namespaces\UseFromSameNamespaceSniff; use SlevomatCodingStandard\Sniffs\Operators\DisallowEqualOperatorsSniff; @@ -65,28 +69,34 @@ CamelCapsFunctionNameSniff::class => [ '/tests/**', ], - 'SlevomatCodingStandard\Sniffs\TypeHints\ReturnTypeHintSniff.MissingTraversableTypeHintSpecification' => [ - '*' - ], - 'SlevomatCodingStandard\Sniffs\TypeHints\ParameterTypeHintSniff.MissingTraversableTypeHintSpecification' => [ - '*' - ], + 'SlevomatCodingStandard\Sniffs\TypeHints\ReturnTypeHintSniff.MissingTraversableTypeHintSpecification', + 'SlevomatCodingStandard\Sniffs\TypeHints\ParameterTypeHintSniff.MissingTraversableTypeHintSpecification', + 'SlevomatCodingStandard\Sniffs\TypeHints\ParameterTypeHintSniff.MissingNativeTypeHint', + 'SlevomatCodingStandard\Sniffs\TypeHints\ReturnTypeHintSniff.MissingNativeTypeHint', + 'SlevomatCodingStandard\Sniffs\TypeHints\ParameterTypeHintSniff.UselessAnnotation', + 'SlevomatCodingStandard\Sniffs\TypeHints\ReturnTypeHintSniff.UselessAnnotation', ]); $services = $containerConfigurator->services(); $services->set(CamelCapsFunctionNameSniff::class); - $services->set(SpaceAfterCastSniff::class)->property('spacing', 0); - $services->set(SpaceAfterNotSniff::class)->property('spacing', 0); - $services->set(ForbiddenFunctionsSniff::class)->property('forbiddenFunctions', [ - 'dd' => null, - 'die' => null, - 'var_dump' => null, - 'print_r' => null, - 'ray' => null, - ]); - $services->set(BooleanOperatorPlacementSniff::class)->property('allowOnly', 'first'); + $services->set(SpaceAfterCastSniff::class) + ->property('spacing', 0); + + $services->set(SpaceAfterNotSniff::class) + ->property('spacing', 0); + + $services->set(ForbiddenFunctionsSniff::class) + ->property('forbiddenFunctions', [ + 'dd' => null, + 'die' => null, + 'var_dump' => null, + 'print_r' => null, + 'ray' => null, + ]); + $services->set(BooleanOperatorPlacementSniff::class) + ->property('allowOnly', 'first'); $services->set(TrailingArrayCommaSniff::class); $services->set(ClassConstantVisibilitySniff::class); @@ -111,8 +121,9 @@ $services->set(NullableTypeForNullDefaultValueSniff::class); $services->set(ParameterTypeHintSpacingSniff::class); $services->set(ReturnTypeHintSpacingSniff::class); + $services->set(ControlSignatureSniff::class) + ->property('requiredSpacesBeforeColon', 0); - $services->set(ControlSignatureSniff::class)->property('requiredSpacesBeforeColon', 0); $services->set(CommentedOutCodeSniff::class, '25'); $services->set(ConcatenationSpacingSniff::class) ->property('spacing', 1) @@ -125,10 +136,17 @@ $services->set(ArrayOpenerAndCloserNewlineFixer::class); $services->set(DisallowEqualOperatorsSniff::class); $services->set(TraitUseDeclarationSniff::class); - $services->set(DeclareStrictTypesSniff::class); + $services->set(DeclareStrictTypesSniff::class) + ->property('spacesCountAroundEqualsSign', 0); + $services->set(ReturnTypeHintSniff::class); $services->set(UselessTernaryOperatorSniff::class); - $services->set(DisallowMixedTypeHintSniff::class); - $services->set(ParameterTypeHintSniff::class); + $services->set(ParameterTypeHintSniff::class) + ->property('enableMixedTypeHint', false); + $services->set(SingleLineArrayWhitespaceSniff::class); + $services->set(NamespaceSpacingSniff::class); + $services->set(MethodSpacingSniff::class); + $services->set(BackedEnumTypeSpacingSniff::class); + $services->set(UnusedFunctionParameterSniff::class); }; From a8c96767d031985917540bc175b59f636fb4c85d Mon Sep 17 00:00:00 2001 From: Mante Balzaraviciute Date: Thu, 9 Mar 2023 15:45:57 +0000 Subject: [PATCH 3/4] ADD: myself to authors --- composer.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/composer.json b/composer.json index bc6551b..a46ae02 100644 --- a/composer.json +++ b/composer.json @@ -23,6 +23,12 @@ "email": "steve@jump24.co.uk", "homepage": "https://jump24.co.uk", "role": "Engineering Manager" + }, + { + "name": "Mante Balzaraviciute", + "email": "mante@jump24.co.uk", + "homepage": "https://jump24.co.uk", + "role": "Backend Developer" } ], "require": { From 6ba8ec6342de7ecc80f25efa5f2c43bf7a795868 Mon Sep 17 00:00:00 2001 From: Mante Balzaraviciute Date: Thu, 9 Mar 2023 15:51:59 +0000 Subject: [PATCH 4/4] UPDATE: remove Steve --- composer.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/composer.json b/composer.json index a46ae02..5027228 100644 --- a/composer.json +++ b/composer.json @@ -18,12 +18,6 @@ "homepage": "https://jump24.co.uk", "role": "Senior Developer" }, - { - "name": "Steve McDougall", - "email": "steve@jump24.co.uk", - "homepage": "https://jump24.co.uk", - "role": "Engineering Manager" - }, { "name": "Mante Balzaraviciute", "email": "mante@jump24.co.uk",