count,isEmpty,isNotEmptメソッドの追加

citrus-framework · Jun 29, 2024 · c937d45 · c937d45
1 parent 98becdd
commit c937d45
Show file tree

Hide file tree

Showing 12 changed files with 358 additions and 286 deletions.
diff --git a/Makefile b/Makefile
@@ -5,25 +5,23 @@ define highlight
 	@echo "\033[1;32m$1\033[0m"
 endef
 
-.PHONY: test_all
-test_all:
+.PHONY: test
+test:
 	@./vendor/bin/phpunit
 
 .PHONY: composer_reload
 composer_reload:
-	@composer clear-cache --no-interaction
-	@composer update -vv --no-interaction
-	@composer dump-autoload --no-interaction
+	@composer clear-cache
+	@composer update -vv
+	@composer dump-autoload
 
 .PHONY: composer_develop
 composer_develop:
-	@composer clear-cache --no-interaction
-	@composer install -vv --no-interaction --dev --prefer-dist --optimize-autoloader
+	@composer install -vv --dev --prefer-dist --optimize-autoloader
 
 .PHONY: composer_public
 composer_public:
-	@composer clear-cache --no-interaction
-	@composer install -vv --no-interaction --no-dev --prefer-dist --optimize-autoloader
+	@composer install -vv --no-dev --prefer-dist --optimize-autoloader
 
 .PHONY: composer_check
 composer_check:

diff --git a/composer.json b/composer.json
@@ -12,9 +12,9 @@
     ],
     "require": {},
     "require-dev": {
-        "php": "^7.3",
-        "phpunit/phpunit": "^8.4",
-        "nunomaduro/phpinsights": "^v1.13"
+        "php": "^8.3",
+        "phpunit/phpunit": "^10.5",
+        "nunomaduro/phpinsights": "^v2.11"
     },
     "autoload": {
         "psr-4": {

diff --git a/phpinsights.php b/phpinsights.php
@@ -5,60 +5,57 @@
 return [
     'preset' => 'default',
     'exclude' => [
-        //  'path/to/directory-or-file'
     ],
     'add' => [
-        //  ExampleMetric::class => [
-        //      ExampleInsight::class,
-        //  ]
         NunoMaduro\PhpInsights\Domain\Metrics\Code\Code::class => [
+            // Code
             SlevomatCodingStandard\Sniffs\ControlStructures\RequireYodaComparisonSniff::class,
         ],
     ],
     'remove' => [
-        //  ExampleInsight::class,
-        SlevomatCodingStandard\Sniffs\ControlStructures\DisallowShortTernaryOperatorSniff::class,
+        // Code
+        NunoMaduro\PhpInsights\Domain\Insights\ForbiddenGlobals::class,
+        SlevomatCodingStandard\Sniffs\Classes\ForbiddenPublicPropertySniff::class,
+        NunoMaduro\PhpInsights\Domain\Sniffs\ForbiddenSetterSniff::class,
+        PhpCsFixer\Fixer\ControlStructure\NoUnneededControlParenthesesFixer::class,
+        PHP_CodeSniffer\Standards\Generic\Sniffs\CodeAnalysis\UselessOverridingMethodSniff::class,
+        SlevomatCodingStandard\Sniffs\Commenting\UselessInheritDocCommentSniff::class,
         SlevomatCodingStandard\Sniffs\ControlStructures\DisallowYodaComparisonSniff::class,
+        SlevomatCodingStandard\Sniffs\ControlStructures\LanguageConstructWithParenthesesSniff::class,
+        SlevomatCodingStandard\Sniffs\Functions\StaticClosureSniff::class,
         SlevomatCodingStandard\Sniffs\PHP\UselessParenthesesSniff::class,
         SlevomatCodingStandard\Sniffs\TypeHints\DisallowArrayTypeHintSyntaxSniff::class,
-        SlevomatCodingStandard\Sniffs\TypeHints\UselessConstantTypeHintSniff::class,
-        PhpCsFixer\Fixer\ControlStructure\NoUnneededControlParenthesesFixer::class,
-        PhpCsFixer\Fixer\Operator\TernaryOperatorSpacesFixer::class,
-        PhpCsFixer\Fixer\Phpdoc\PhpdocInlineTagFixer::class,
-        PhpCsFixer\Fixer\Phpdoc\PhpdocSeparationFixer::class,
-        PhpCsFixer\Fixer\Phpdoc\AlignMultilineCommentFixer::class,
-        PHP_CodeSniffer\Standards\PSR2\Sniffs\ControlStructures\ElseIfDeclarationSniff::class,
-        PHP_CodeSniffer\Standards\Generic\Sniffs\Formatting\SpaceAfterCastSniff::class,
+        SlevomatCodingStandard\Sniffs\TypeHints\ParameterTypeHintSniff::class,
+        SlevomatCodingStandard\Sniffs\TypeHints\PropertyTypeHintSniff::class,
+        SlevomatCodingStandard\Sniffs\TypeHints\ReturnTypeHintSniff::class,
+
+        //  Architecture
+        NunoMaduro\PhpInsights\Domain\Insights\ForbiddenNormalClasses::class,
         NunoMaduro\PhpInsights\Domain\Insights\ForbiddenTraits::class,
         SlevomatCodingStandard\Sniffs\Classes\SuperfluousExceptionNamingSniff::class,
-        NunoMaduro\PhpInsights\Domain\Insights\ForbiddenNormalClasses::class,
-        SlevomatCodingStandard\Sniffs\Commenting\UselessInheritDocCommentSniff::class,
-        SlevomatCodingStandard\Sniffs\TypeHints\DisallowMixedTypeHintSniff::class,
+
+        // Style
+        PHP_CodeSniffer\Standards\Generic\Sniffs\WhiteSpace\ArbitraryParenthesesSpacingSniff::class,
+        PHP_CodeSniffer\Standards\PSR2\Sniffs\ControlStructures\ElseIfDeclarationSniff::class,
     ],
     'config' => [
-        //  ExampleInsight::class => [
-        //      'key' => 'value',
-        //  ],
-        ObjectCalisthenics\Sniffs\NamingConventions\ElementNameMinimalLengthSniff::class => [
-            'minLength' => 3,
-            'allowedShortNames' => ['i', 'id', 'to', 'up', 'ky', 'vl', 'e'],
-        ],
-        PhpCsFixer\Fixer\CastNotation\CastSpacesFixer::class => [
-            'space' => 'none',
+        // Architecture
+        SlevomatCodingStandard\Sniffs\Functions\FunctionLengthSniff::class => [
+            'maxLinesLength' => 32,
         ],
+
+        // Style
         PhpCsFixer\Fixer\Basic\BracesFixer::class => [
-            'allow_single_line_closure' => true,
+            'allow_single_line_closure' => false,
             'position_after_anonymous_constructs' => 'same',
             'position_after_control_structures' => 'next',
             'position_after_functions_and_oop_constructs' => 'next',
         ],
-        SlevomatCodingStandard\Sniffs\Commenting\DocCommentSpacingSniff::class => [
-            'linesCountBeforeFirstContent' => 0,
-            'linesCountBetweenDescriptionAndAnnotations' => 1,
-            'linesCountBetweenDifferentAnnotationsTypes' => 0,
-            'linesCountBetweenAnnotationsGroups' => 0,
-            'linesCountAfterLastContent' => 0,
-            'annotationsGroups' => [],
+        PhpCsFixer\Fixer\Operator\BinaryOperatorSpacesFixer::class => [
+            'operators' => [
+                '=>' => 'align_single_space',
+            ],
+            'default' => 'single_space', // default fix strategy: possibles values ['align', 'align_single_space', 'align_single_space_minimal', 'single_space', 'no_space', null]
         ],
         PhpCsFixer\Fixer\Whitespace\NoExtraBlankLinesFixer::class => [
             'tokens' => [], // possibles values ['break', 'case', 'continue', 'curly_brace_block', 'default', 'extra', 'parenthesis_brace_block', 'return', 'square_brace_block', 'switch', 'throw', 'use', 'use_trait']
@@ -68,8 +65,13 @@
             'absoluteLineLimit' => 120,
             'ignoreComments' => true,
         ],
-        \ObjectCalisthenics\Sniffs\Files\FunctionLengthSniff::class => [
-            'maxLength' => 32,
-        ]
+        SlevomatCodingStandard\Sniffs\Commenting\DocCommentSpacingSniff::class => [
+            'linesCountBeforeFirstContent' => 0,
+            'linesCountBetweenDescriptionAndAnnotations' => 1,
+            'linesCountBetweenDifferentAnnotationsTypes' => 0,
+            'linesCountBetweenAnnotationsGroups' => 0,
+            'linesCountAfterLastContent' => 0,
+            'annotationsGroups' => [],
+        ],
     ],
 ];