Formatting cleanups

reinink · reinink · commit 96a9619dc4c8 · 2024-06-12T20:42:44.000-04:00
diff --git a/src/AlwaysProp.php b/src/AlwaysProp.php
@@ -6,12 +6,8 @@
 
 class AlwaysProp
 {
-    /** @var mixed */
     protected $value;
 
-    /**
-     * @param mixed $value
-     */
     public function __construct($value)
     {
         $this->value = $value;
diff --git a/src/Commands/CreateMiddleware.php b/src/Commands/CreateMiddleware.php
@@ -3,8 +3,8 @@
 namespace Inertia\Commands;
 
 use Illuminate\Console\GeneratorCommand;
-use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Attribute\AsCommand;
 
 #[AsCommand(name: 'inertia:middleware')]
 class CreateMiddleware extends GeneratorCommand
diff --git a/src/Commands/StartSsr.php b/src/Commands/StartSsr.php
@@ -5,8 +5,8 @@
 use Inertia\Ssr\SsrException;
 use Illuminate\Console\Command;
 use Inertia\Ssr\BundleDetector;
-use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Process\Process;
+use Symfony\Component\Console\Attribute\AsCommand;
 
 #[AsCommand(name: 'inertia:start-ssr')]
 class StartSsr extends Command
diff --git a/src/Middleware.php b/src/Middleware.php
@@ -3,9 +3,9 @@
 namespace Inertia;
 
 use Closure;
+use Inertia\Support\Header;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Redirect;
-use Inertia\Support\Header;
 use Symfony\Component\HttpFoundation\Response;
 
 class Middleware
diff --git a/src/Response.php b/src/Response.php
@@ -3,19 +3,19 @@
 namespace Inertia;
 
 use Closure;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Str;
+use Inertia\Support\Header;
 use Illuminate\Http\Request;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\App;
-use Illuminate\Support\Str;
 use GuzzleHttp\Promise\PromiseInterface;
 use Illuminate\Support\Traits\Macroable;
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Contracts\Support\Responsable;
 use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Http\Resources\Json\ResourceResponse;
-use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Response as ResponseFactory;
-use Inertia\Support\Header;
 
 class Response implements Responsable
 {
@@ -40,7 +40,6 @@ public function __construct(string $component, array $props, string $rootView =
 
     /**
      * @param string|array $key
-     * @param mixed        $value
      *
      * @return $this
      */
@@ -57,7 +56,6 @@ public function with($key, $value = null): self
 
     /**
      * @param string|array $key
-     * @param mixed        $value
      *
      * @return $this
      */
@@ -111,19 +109,19 @@ public function resolveProperties(Request $request, array $props): array
     {
         $isPartial = $request->header(Header::PARTIAL_COMPONENT) === $this->component;
 
-        if(! $isPartial) {
+        if (! $isPartial) {
             $props = array_filter($this->props, static function ($prop) {
                 return ! ($prop instanceof LazyProp);
             });
         }
 
         $props = $this->resolveArrayableProperties($props, $request);
 
-        if($isPartial && $request->hasHeader(Header::PARTIAL_ONLY)) {
+        if ($isPartial && $request->hasHeader(Header::PARTIAL_ONLY)) {
             $props = $this->resolveOnly($request, $props);
         }
 
-        if($isPartial && $request->hasHeader(Header::PARTIAL_EXCEPT)) {
+        if ($isPartial && $request->hasHeader(Header::PARTIAL_EXCEPT)) {
             $props = $this->resolveExcept($request, $props);
         }
 
@@ -168,7 +166,7 @@ public function resolveOnly(Request $request, array $props): array
 
         $value = [];
 
-        foreach($only as $key) {
+        foreach ($only as $key) {
             Arr::set($value, $key, data_get($props, $key));
         }
 
diff --git a/src/ResponseFactory.php b/src/ResponseFactory.php
@@ -4,13 +4,13 @@
 
 use Closure;
 use Illuminate\Support\Arr;
+use Inertia\Support\Header;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Request;
+use Illuminate\Support\Facades\Redirect;
 use Illuminate\Support\Traits\Macroable;
 use Illuminate\Contracts\Support\Arrayable;
-use Illuminate\Support\Facades\Redirect;
 use Illuminate\Support\Facades\Response as BaseResponse;
-use Inertia\Support\Header;
 use Symfony\Component\HttpFoundation\Response as SymfonyResponse;
 use Symfony\Component\HttpFoundation\RedirectResponse as SymfonyRedirect;
 
@@ -34,7 +34,6 @@ public function setRootView(string $name): void
 
     /**
      * @param string|array|Arrayable $key
-     * @param mixed                  $value
      */
     public function share($key, $value = null): void
     {
@@ -47,11 +46,6 @@ public function share($key, $value = null): void
         }
     }
 
-    /**
-     * @param mixed $default
-     *
-     * @return mixed
-     */
     public function getShared(string $key = null, $default = null)
     {
         if ($key) {
@@ -88,9 +82,6 @@ public function lazy(callable $callback): LazyProp
         return new LazyProp($callback);
     }
 
-    /**
-     * @param mixed $value
-     */
     public function always($value): AlwaysProp
     {
         return new AlwaysProp($value);
diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php
@@ -5,6 +5,7 @@
 use LogicException;
 use Inertia\Ssr\Gateway;
 use ReflectionException;
+use Inertia\Support\Header;
 use Illuminate\Http\Request;
 use Inertia\Ssr\HttpGateway;
 use Illuminate\Routing\Router;
@@ -13,7 +14,6 @@
 use Inertia\Testing\TestResponseMacros;
 use Illuminate\Support\ServiceProvider as BaseServiceProvider;
 use Illuminate\Foundation\Testing\TestResponse as LegacyTestResponse;
-use Inertia\Support\Header;
 
 class ServiceProvider extends BaseServiceProvider
 {
diff --git a/src/Testing/Concerns/Has.php b/src/Testing/Concerns/Has.php
@@ -36,8 +36,6 @@ public function hasAll($key): self
     }
 
     /**
-     * @param mixed $value
-     *
      * @return $this
      */
     public function has(string $key, $value = null, Closure $scope = null): self
diff --git a/tests/AlwaysPropTest.php b/tests/AlwaysPropTest.php
@@ -2,8 +2,8 @@
 
 namespace Inertia\Tests;
 
-use Illuminate\Http\Request;
 use Inertia\AlwaysProp;
+use Illuminate\Http\Request;
 
 class AlwaysPropTest extends TestCase
 {
@@ -25,8 +25,9 @@ public function test_can_accept_scalar_values(): void
 
     public function test_can_accept_callables(): void
     {
-        $callable = new class {
-            public function __invoke() {
+        $callable = new class() {
+            public function __invoke()
+            {
                 return 'An always value';
             }
         };
diff --git a/tests/MiddlewareTest.php b/tests/MiddlewareTest.php
@@ -4,6 +4,7 @@
 
 use LogicException;
 use Inertia\Inertia;
+use Inertia\AlwaysProp;
 use Inertia\Middleware;
 use Illuminate\Http\Request;
 use Illuminate\Support\MessageBag;
@@ -12,7 +13,6 @@
 use Illuminate\Support\Facades\Session;
 use Inertia\Tests\Stubs\ExampleMiddleware;
 use Illuminate\Session\Middleware\StartSession;
-use Inertia\AlwaysProp;
 
 class MiddlewareTest extends TestCase
 {
diff --git a/tests/ResponseFactoryTest.php b/tests/ResponseFactoryTest.php
@@ -4,18 +4,18 @@
 
 use Inertia\Inertia;
 use Inertia\LazyProp;
+use Inertia\AlwaysProp;
 use Inertia\ResponseFactory;
 use Illuminate\Http\Response;
+use Illuminate\Session\Store;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Support\Facades\Route;
 use Illuminate\Support\Facades\Request;
+use Illuminate\Session\NullSessionHandler;
 use Inertia\Tests\Stubs\ExampleMiddleware;
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Http\Request as HttpRequest;
 use Illuminate\Session\Middleware\StartSession;
-use Illuminate\Session\NullSessionHandler;
-use Illuminate\Session\Store;
-use Inertia\AlwaysProp;
 
 class ResponseFactoryTest extends TestCase
 {
@@ -91,8 +91,8 @@ public function test_location_redirects_are_not_modified(): void
     public function test_location_response_for_non_inertia_requests_using_redirect_response_with_existing_session_and_request_properties(): void
     {
         $redirect = new RedirectResponse('https://inertiajs.com');
-        $redirect->setSession($session = new Store('test', new NullSessionHandler));
-        $redirect->setRequest($request = new HttpRequest);
+        $redirect->setSession($session = new Store('test', new NullSessionHandler()));
+        $redirect->setRequest($request = new HttpRequest());
         $response = (new ResponseFactory())->location($redirect);
 
         $this->assertInstanceOf(RedirectResponse::class, $response);
diff --git a/tests/ResponseTest.php b/tests/ResponseTest.php
@@ -5,6 +5,7 @@
 use Mockery;
 use Inertia\LazyProp;
 use Inertia\Response;
+use Inertia\AlwaysProp;
 use Illuminate\View\View;
 use Illuminate\Http\Request;
 use Illuminate\Support\Fluent;
@@ -15,7 +16,6 @@
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Http\Resources\Json\ResourceCollection;
-use Inertia\AlwaysProp;
 
 class ResponseTest extends TestCase
 {
@@ -400,9 +400,9 @@ public function test_always_props_are_included_on_partial_reload(): void
             ],
             'errors' => new AlwaysProp(function () {
                 return [
-                    'name' => 'The email field is required.'
+                    'name' => 'The email field is required.',
                 ];
-            })
+            }),
         ];
 
         $response = new Response('User/Edit', $props, 'app', '123');
diff --git a/tests/Stubs/ExampleMiddleware.php b/tests/Stubs/ExampleMiddleware.php
@@ -9,9 +9,6 @@
 
 class ExampleMiddleware extends Middleware
 {
-    /**
-     * @var mixed
-     */
     protected $version;
 
     /**
diff --git a/tests/Stubs/FakeResource.php b/tests/Stubs/FakeResource.php
@@ -18,7 +18,7 @@ class FakeResource extends JsonResource
      *
      * @var string|null
      */
-    public static $wrap = null;
+    public static $wrap;
 
     public function __construct(array $resource)
     {

Original file line number	Diff line number	Diff line change
`@@ -6,12 +6,8 @@`
`6`	`6`
`7`	`7`	`class AlwaysProp`
`8`	`8`	`{`
`9`		`- /** @var mixed */`
`10`	`9`	`protected $value;`
`11`	`10`
`12`		`- /**`
`13`		`- * @param mixed $value`
`14`		`- */`
`15`	`11`	`public function __construct($value)`
`16`	`12`	`{`
`17`	`13`	`$this->value = $value;`
Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,6 @@ public function hasAll($key): self`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`/**`
`39`		`- * @param mixed $value`
`40`		`- *`
`41`	`39`	`* @return $this`
`42`	`40`	`*/`
`43`	`41`	`public function has(string $key, $value = null, Closure $scope = null): self`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@`
`2`	`2`
`3`	`3`	`namespace Inertia\Tests;`
`4`	`4`
`5`		`-use Illuminate\Http\Request;`
`6`	`5`	`use Inertia\AlwaysProp;`
	`6`	`+use Illuminate\Http\Request;`
`7`	`7`
`8`	`8`	`class AlwaysPropTest extends TestCase`
`9`	`9`	`{`
`@@ -25,8 +25,9 @@ public function test_can_accept_scalar_values(): void`
`25`	`25`
`26`	`26`	`public function test_can_accept_callables(): void`
`27`	`27`	`{`
`28`		`- $callable = new class {`
`29`		`- public function __invoke() {`
	`28`	`+ $callable = new class() {`
	`29`	`+ public function __invoke()`
	`30`	`+ {`
`30`	`31`	`return 'An always value';`
`31`	`32`	`}`
`32`	`33`	`};`