phpdoc_line_span: move to more compact single line

Slamdunk · Mar 16, 2023 · 7cb5cb3 · 7cb5cb3
1 parent a87528d
commit 7cb5cb3
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 21 deletions.
diff --git a/composer.json b/composer.json
@@ -13,13 +13,13 @@
         "php": "~8.1.0 || ~8.2.0",
         "ext-mbstring": "*",
         "ext-tokenizer": "*",
-        "friendsofphp/php-cs-fixer": "^3.14.4"
+        "friendsofphp/php-cs-fixer": "^3.15.1"
     },
     "require-dev": {
-        "phpstan/phpstan": "^1.10.1",
-        "phpstan/phpstan-phpunit": "^1.3.7",
-        "phpunit/phpunit": "^10.0.11",
-        "slam/php-debug-r": "^1.7.0",
+        "phpstan/phpstan": "^1.10.6",
+        "phpstan/phpstan-phpunit": "^1.3.10",
+        "phpunit/phpunit": "^10.0.16",
+        "slam/php-debug-r": "^1.8.0",
         "slam/phpstan-extensions": "^6.0.0"
     },
     "autoload": {

diff --git a/lib/Config.php b/lib/Config.php
@@ -63,7 +63,7 @@ final class Config extends PhpCsFixerConfig
         'php_unit_strict'                                   => false,
         'php_unit_test_class_requires_covers'               => false,
         'phpdoc_add_missing_param_annotation'               => false,
-        'phpdoc_line_span'                                  => true,
+        'phpdoc_line_span'                                  => ['const' => 'single', 'property' => 'single', 'method' => 'single'],
         'phpdoc_tag_casing'                                 => true,
         'phpdoc_to_param_type'                              => false,
         'phpdoc_to_property_type'                           => true,
@@ -84,9 +84,7 @@ final class Config extends PhpCsFixerConfig
         'use_arrow_functions'                               => false,
     ];
 
-    /**
-     * @param array<string, mixed> $overriddenRules
-     */
+    /** @param array<string, mixed> $overriddenRules */
     public function __construct(array $overriddenRules = [])
     {
         parent::__construct(__NAMESPACE__);

diff --git a/tests/FinalAbstractPublicFixerTest.php b/tests/FinalAbstractPublicFixerTest.php
@@ -17,9 +17,7 @@ public function testFix(string $expected, ?string $input = null): void
         $this->doTest($expected, $input);
     }
 
-    /**
-     * @return string[][]
-     */
+    /** @return string[][] */
     public static function provideCases(): array
     {
         $original = '

diff --git a/tests/FinalInternalClassFixerTest.php b/tests/FinalInternalClassFixerTest.php
@@ -17,9 +17,7 @@ public function testFix(string $expected, ?string $input = null): void
         $this->doTest($expected, $input);
     }
 
-    /**
-     * @return string[][]
-     */
+    /** @return string[][] */
     public static function provideCases(): array
     {
         return [

diff --git a/tests/FunctionReferenceSpaceFixerTest.php b/tests/FunctionReferenceSpaceFixerTest.php
@@ -17,9 +17,7 @@ public function testFix(string $expected, ?string $input = null): void
         $this->doTest($expected, $input);
     }
 
-    /**
-     * @return string[][]
-     */
+    /** @return string[][] */
     public static function provideCases(): array
     {
         $same = static function (string $content): string {

diff --git a/tests/InlineCommentSpacerFixerTest.php b/tests/InlineCommentSpacerFixerTest.php
@@ -23,9 +23,7 @@ public function testFix(string $expected, ?string $input = null): void
         $this->doTest($expected, $input);
     }
 
-    /**
-     * @return string[][]
-     */
+    /** @return string[][] */
     public static function provideCases(): array
     {
         return [