wip

Author: pascalbaljet

src/Commands/CreateMiddleware.php

@@ -63,7 +63,7 @@ protected function getArguments(): array
     /**
      * Get the console command options.
      *
-     * @return array<int, array<int|string, mixed>>
+     * @return array<int, array<int, mixed>>
      */
     protected function getOptions(): array
     {

src/Inertia.php

@@ -20,7 +20,7 @@
  * @method static \Inertia\AlwaysProp always(mixed $value)
  * @method static \Inertia\MergeProp merge(mixed $value)
  * @method static \Inertia\MergeProp deepMerge(mixed $value)
- * @method static \Inertia\Response render(string $component, array<string, mixed>|\Illuminate\Contracts\Support\Arrayable<array-key, mixed> $props = [])
+ * @method static \Inertia\Response render(string $component, array<string, mixed>|\Illuminate\Contracts\Support\Arrayable<array-key, mixed>|\Inertia\ProvidesInertiaProperties $props = [])
  * @method static \Symfony\Component\HttpFoundation\Response location(string|\Symfony\Component\HttpFoundation\RedirectResponse $url)
  * @method static void macro(string $name, object|callable $macro)
  * @method static void mixin(object $mixin, bool $replace = true)

src/ProvidesInertiaProperties.php

@@ -4,5 +4,8 @@
 
 interface ProvidesInertiaProperties
 {
+    /**
+     * @return array<string, mixed>
+     */
     public function toInertiaProperties(RenderContext $context): iterable;
 }

src/Response.php

@@ -84,7 +84,7 @@ class Response implements Responsable
     /**
      * Create a new Inertia response instance.
      *
-     * @param  array<string, mixed>  $props
+     * @param  array<int|string, mixed|\Inertia\ProvidesInertiaProperties>  $props
      */
     public function __construct(
         string $component,
@@ -216,6 +216,9 @@ public function resolveProperties(Request $request, array $props): array
 
     /**
      * Resolve the ProvidesInertiaProperties props.
+     *
+     * @param  array<string, mixed>  $props
+     * @return array<string, mixed>
      */
     public function resolveInertiaPropsProviders(array $props, Request $request): array
     {
@@ -226,10 +229,9 @@ public function resolveInertiaPropsProviders(array $props, Request $request): ar
         foreach ($props as $key => $value) {
             if (is_numeric($key) && $value instanceof ProvidesInertiaProperties) {
                 // Pipe into a Collection to leverage Collection::getArrayableItems()
-                $newProps = array_merge(
-                    $newProps,
-                    collect($value->toInertiaProperties($renderContext))->all()
-                );
+                /** @var array<string, mixed> $inertiaProps */
+                $inertiaProps = collect($value->toInertiaProperties($renderContext))->all();
+                $newProps = array_merge($newProps, $inertiaProps);
             } else {
                 $newProps[$key] = $value;
             }

tests/ResponseFactoryTest.php

@@ -380,11 +380,14 @@ public function toArray()
         ]);
     }
 
-    public function test_will_accept_instances_of_provides_inertia_props()
+    public function test_will_accept_instances_of_provides_inertia_props(): void
     {
         Route::middleware([StartSession::class, ExampleMiddleware::class])->get('/', function () {
             return Inertia::render('User/Edit', new class implements ProvidesInertiaProperties
             {
+                /**
+                 * @return array<string, mixed>
+                 */
                 public function toInertiaProperties(RenderContext $context): iterable
                 {
                     return [

tests/ResponseTest.php

@@ -857,6 +857,9 @@ public function test_inertia_responsable_objects(): void
             'foo' => 'bar',
             new class implements ProvidesInertiaProperties
             {
+                /**
+                 * @return \Illuminate\Support\Collection<string, string>
+                 */
                 public function toInertiaProperties(RenderContext $context): iterable
                 {
                     return collect([
@@ -867,6 +870,7 @@ public function toInertiaProperties(RenderContext $context): iterable
             'quux' => 'corge',
 
         ], 'app', '123');
+        /** @var BaseResponse $response */
         $response = $response->toResponse($request);
         $view = $response->getOriginalContent();
         $page = $view->getData()['page'];
@@ -965,12 +969,16 @@ public function test_props_can_be_added_using_the_with_method(): void
             ->with(['quux' => 'corge'])
             ->with(new class implements ProvidesInertiaProperties
             {
+                /**
+                 * @return \Illuminate\Support\Collection<string, string>
+                 */
                 public function toInertiaProperties(RenderContext $context): iterable
                 {
                     return collect(['grault' => 'garply']);
                 }
             });
 
+        /** @var BaseResponse $response */
         $response = $response->toResponse($request);
         $view = $response->getOriginalContent();
         $page = $view->getData()['page'];