fix(.php-cs-fixer): update curly_braces_position

- 'curly_braces_position' changed to 'braces_position'
guanguans · Oct 18, 2023 · ce02d1f · ce02d1f
1 parent fcc499e
commit ce02d1f
Show file tree

Hide file tree

Showing 15 changed files with 35 additions and 52 deletions.
diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
@@ -90,7 +90,7 @@
         // array_notation
 
         // basic
-        'curly_braces_position' => [
+        'braces_position' => [
             'control_structures_opening_brace' => 'same_line',
             'functions_opening_brace' => 'next_line_unless_newline_at_signature_end',
             'anonymous_functions_opening_brace' => 'same_line',
@@ -197,7 +197,7 @@
         // list_notation
 
         // namespace_notation
-        'no_blank_lines_before_namespace' => false,
+        'blank_lines_before_namespace' => true,
 
         // naming
 
@@ -219,6 +219,8 @@
             'methods' => [],
         ],
         'php_unit_test_class_requires_covers' => false,
+        'php_unit_data_provider_name' => true,
+        'php_unit_data_provider_return_type' => true,
 
         // phpdoc
         'phpdoc_align' => [
@@ -259,6 +261,7 @@
                 'var',
             ],
         ],
+        'phpdoc_param_order' => true,
 
         // return_notation
         'simplified_null_return' => true,
@@ -305,8 +308,8 @@
             'functions' => ['print_r', 'var_dump', 'var_export'],
         ],
         // PhpCsFixerCustomFixers\Fixer\ConstructorEmptyBracesFixer::name() => true,
-        PhpCsFixerCustomFixers\Fixer\DataProviderNameFixer::name() => true,
-        PhpCsFixerCustomFixers\Fixer\DataProviderReturnTypeFixer::name() => true,
+        // PhpCsFixerCustomFixers\Fixer\DataProviderNameFixer::name() => true,
+        // PhpCsFixerCustomFixers\Fixer\DataProviderReturnTypeFixer::name() => true,
         // PhpCsFixerCustomFixers\Fixer\DeclareAfterOpeningTagFixer::name() => true,
         // PhpCsFixerCustomFixers\Fixer\EmptyFunctionBodyFixer::name() => true,
         // PhpCsFixerCustomFixers\Fixer\IssetToArrayKeyExistsFixer::name() => true,
@@ -357,7 +360,7 @@
         //         'var',
         //     ],
         // ],
-        PhpCsFixerCustomFixers\Fixer\PhpdocParamOrderFixer::name() => true,
+        // PhpCsFixerCustomFixers\Fixer\PhpdocParamOrderFixer::name() => true,
         PhpCsFixerCustomFixers\Fixer\PhpdocParamTypeFixer::name() => true,
         PhpCsFixerCustomFixers\Fixer\PhpdocSelfAccessorFixer::name() => true,
         PhpCsFixerCustomFixers\Fixer\PhpdocSingleLineVarFixer::name() => true,

diff --git a/_ide_helper.php b/_ide_helper.php
@@ -11,9 +11,7 @@
  */
 
 namespace {
-    class Soar extends \Guanguans\LaravelSoar\Facades\Soar
-    {
-    }
+    class Soar extends \Guanguans\LaravelSoar\Facades\Soar {}
 }
 
 namespace Illuminate\Database\Query {
@@ -34,9 +32,7 @@ class Soar extends \Guanguans\LaravelSoar\Facades\Soar
      * @see \Guanguans\LaravelSoar\Macros\QueryBuilderMacro
      * @see \Illuminate\Database\Query\Builder
      */
-    class Builder
-    {
-    }
+    class Builder {}
 }
 
 namespace Illuminate\Database\Eloquent {
@@ -59,9 +55,7 @@ class Builder
      * @see \Guanguans\LaravelSoar\Macros\QueryBuilderMacro
      * @see \Illuminate\Database\Eloquent\Builder
      */
-    class Builder
-    {
-    }
+    class Builder {}
 }
 
 namespace Illuminate\Database\Eloquent\Relations {
@@ -84,7 +78,5 @@ class Builder
      * @see \Guanguans\LaravelSoar\Macros\QueryBuilderMacro
      * @see \Illuminate\Database\Eloquent\Relations\Relation
      */
-    class Relation
-    {
-    }
+    class Relation {}
 }
diff --git a/src/Contracts/Throwable.php b/src/Contracts/Throwable.php
@@ -12,6 +12,4 @@
 
 namespace Guanguans\LaravelSoar\Contracts;
 
-interface Throwable extends \Throwable
-{
-}
+interface Throwable extends \Throwable {}
diff --git a/src/Exceptions/InvalidArgumentException.php b/src/Exceptions/InvalidArgumentException.php
@@ -14,6 +14,4 @@
 
 use Guanguans\LaravelSoar\Contracts\Throwable;
 
-class InvalidArgumentException extends \InvalidArgumentException implements Throwable
-{
-}
+class InvalidArgumentException extends \InvalidArgumentException implements Throwable {}
diff --git a/src/Facades/Soar.php b/src/Facades/Soar.php
@@ -54,8 +54,6 @@ class Soar extends Facade
 {
     /**
      * @noinspection MissingParentCallInspection
-     *
-     * {@inheritDoc}
      */
     protected static function getFacadeAccessor(): string
     {

diff --git a/src/JavascriptRenderer.php b/src/JavascriptRenderer.php
@@ -192,9 +192,10 @@ protected function getModifiedTime(?string $type): int
     }
 
     /**
-     * {@inheritDoc}
-     *
      * @noinspection MissingParentCallInspection
+     *
+     * @param mixed $uri
+     * @param mixed $root
      */
     protected function makeUriRelativeTo($uri, $root)
     {

diff --git a/src/Outputs/DebugBarOutput.php b/src/Outputs/DebugBarOutput.php
@@ -30,7 +30,7 @@ public function __construct(string $name = 'Soar Scores', string $label = 'warni
     }
 
     /**
-     * {@inheritDoc}
+     * @param mixed $dispatcher
      *
      * @throws \JsonException
      */

diff --git a/src/Outputs/DumpOutput.php b/src/Outputs/DumpOutput.php
@@ -24,11 +24,11 @@ public function __construct(bool $exit = false)
     }
 
     /**
-     * {@inheritDoc}
-     *
      * @noinspection ForgottenDebugOutputInspection
      * @noinspection ClosureToArrowFunctionInspection
      * @noinspection DebugFunctionUsageInspection
+     *
+     * @param mixed $dispatcher
      */
     public function output(Collection $scores, $dispatcher): void
     {

diff --git a/src/Outputs/ErrorLogOutput.php b/src/Outputs/ErrorLogOutput.php
@@ -28,12 +28,12 @@ public function __construct(int $messageType = 0, string $destination = '', stri
     }
 
     /**
-     * {@inheritDoc}
-     *
-     * @throws \JsonException
-     *
      * @noinspection ForgottenDebugOutputInspection
      * @noinspection DebugFunctionUsageInspection
+     *
+     * @param mixed $dispatcher
+     *
+     * @throws \JsonException
      */
     public function output(Collection $scores, $dispatcher): void
     {

diff --git a/src/Outputs/LogOutput.php b/src/Outputs/LogOutput.php
@@ -27,7 +27,7 @@ public function __construct(string $channel = 'daily', string $level = 'warning'
     }
 
     /**
-     * {@inheritDoc}
+     * @param mixed $dispatcher
      *
      * @throws \JsonException
      */

diff --git a/src/Outputs/RayOutput.php b/src/Outputs/RayOutput.php
@@ -24,9 +24,9 @@ public function __construct(string $label = 'Soar Scores')
     }
 
     /**
-     * {@inheritDoc}
-     *
      * @psalm-suppress UndefinedDocblockClass
+     *
+     * @param mixed $dispatcher
      */
     public function output(Collection $scores, $dispatcher): void
     {

diff --git a/src/Outputs/SoarBarOutput.php b/src/Outputs/SoarBarOutput.php
@@ -28,7 +28,7 @@ public function __construct(string $name = 'Scores', string $label = 'warning')
     }
 
     /**
-     * {@inheritDoc}
+     * @param mixed $dispatcher
      *
      * @throws \JsonException
      */

diff --git a/src/Outputs/SyslogOutput.php b/src/Outputs/SyslogOutput.php
@@ -24,7 +24,7 @@ public function __construct(int $priority = LOG_WARNING)
     }
 
     /**
-     * {@inheritDoc}
+     * @param mixed $dispatcher
      *
      * @throws \JsonException
      */

diff --git a/tests/Pest.php b/tests/Pest.php
@@ -13,14 +13,10 @@
 namespace Tests;
 
 uses(TestCase::class)
-    ->beforeAll(function (): void {
-    })
-    ->beforeEach(function (): void {
-    })
-    ->afterEach(function (): void {
-    })
-    ->afterAll(function (): void {
-    })
+    ->beforeAll(function (): void {})
+    ->beforeEach(function (): void {})
+    ->afterEach(function (): void {})
+    ->afterAll(function (): void {})
     ->in(__DIR__);
 
 expect()->extend('between', function (int $min, $max) {

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -101,9 +101,6 @@ protected function getPackageProviders($app)
         ];
     }
 
-    /**
-     * {@inheritDoc}
-     */
     protected function defineEnvironment($app): void
     {
         config()->set('app.key', 'base64:6Cu/ozj4gPtIjmXjr8EdVnGFNsdRqZfHfVjQkmTlg4Y=');
@@ -138,10 +135,10 @@ protected function setUpDatabase(): void
     }
 
     /**
-     * {@inheritDoc}
-     *
      * @noinspection PhpUndefinedMethodInspection
      * @noinspection PhpUndefinedFieldInspection
+     *
+     * @param mixed $router
      */
     protected function defineRoutes($router): void
     {
-Original file line number
+Diff line change
@@ Expand Up / @@ -54,8 +54,6 @@ class Soar extends Facade @@
     {
         /**
          * @noinspection MissingParentCallInspection
-         *
-         * {@inheritDoc}
          */
         protected static function getFacadeAccessor(): string
         {
@@ Expand Down @@