updating backend for movement of data and args into JSON body

Author: weaverryan

src/LiveComponent/src/EventListener/LiveComponentSubscriber.php

@@ -118,12 +118,15 @@ public function onKernelController(ControllerEvent $event): void
             return;
         }
 
+        $actionArguments = [];
         if ($request->query->has('data')) {
             // ?data=
             $data = json_decode($request->query->get('data'), true, 512, \JSON_THROW_ON_ERROR);
         } else {
             // OR body of the request is JSON
-            $data = json_decode($request->getContent(), true, 512, \JSON_THROW_ON_ERROR);
+            $requestData = json_decode($request->getContent(), true, 512, \JSON_THROW_ON_ERROR);
+            $data = $requestData['data'] ?? [];
+            $actionArguments = $requestData['args'] ?? [];
         }
 
         if (!\is_array($controller = $event->getController()) || 2 !== \count($controller)) {
@@ -148,17 +151,11 @@ public function onKernelController(ControllerEvent $event): void
 
         $request->attributes->set('_mounted_component', $mounted);
 
-        if (!\is_string($queryString = $request->query->get('args'))) {
-            return;
-        }
-
         // extra variables to be made available to the controller
         // (for "actions" only)
-        parse_str($queryString, $args);
-
         foreach (LiveArg::liveArgs($component, $action) as $parameter => $arg) {
-            if (isset($args[$arg])) {
-                $request->attributes->set($parameter, $args[$arg]);
+            if (isset($actionArguments[$arg])) {
+                $request->attributes->set($parameter, $actionArguments[$arg]);
             }
         }
     }

src/LiveComponent/tests/Functional/EventListener/LiveComponentSubscriberTest.php

@@ -72,7 +72,7 @@ public function testCanExecuteComponentAction(): void
             })
             ->post('/_components/component2/increase', [
                 'headers' => ['X-CSRF-TOKEN' => $token],
-                'body' => json_encode($dehydrated),
+                'body' => json_encode(['data' => $dehydrated]),
             ])
             ->assertSuccessful()
             ->assertHeaderContains('Content-Type', 'html')
@@ -145,7 +145,7 @@ public function testDisabledCsrfTokenForComponentDoesNotFail(): void
             ->assertHeaderContains('Content-Type', 'html')
             ->assertContains('Count: 1')
             ->post('/_components/disabled_csrf/increase', [
-                'body' => json_encode($dehydrated),
+                'body' => json_encode(['data' => $dehydrated]),
             ])
             ->assertSuccessful()
             ->assertHeaderContains('Content-Type', 'html')
@@ -184,7 +184,7 @@ public function testCanRedirectFromComponentAction(): void
             // with no custom header, it redirects like a normal browser
             ->post('/_components/component2/redirect', [
                 'headers' => ['X-CSRF-TOKEN' => $token],
-                'body' => json_encode($dehydrated),
+                'body' => json_encode(['data' => $dehydrated]),
             ])
             ->assertRedirectedTo('/')
 
@@ -194,7 +194,7 @@ public function testCanRedirectFromComponentAction(): void
                     'Accept' => 'application/vnd.live-component+html',
                     'X-CSRF-TOKEN' => $token,
                 ],
-                'body' => json_encode($dehydrated),
+                'body' => json_encode(['data' => $dehydrated]),
             ])
             ->assertStatus(204)
             ->assertHeaderEquals('Location', '/')
@@ -206,10 +206,10 @@ public function testInjectsLiveArgs(): void
         $dehydrated = $this->dehydrateComponent($this->mountComponent('component6'));
         $token = null;
 
-        $argsQueryParams = http_build_query(['args' => http_build_query(['arg1' => 'hello', 'arg2' => 666, 'custom' => '33.3'])]);
+        $arguments = ['arg1' => 'hello', 'arg2' => 666, 'custom' => '33.3'];
         $this->browser()
             ->throwExceptions()
-            ->get('/_components/component6?data='.urlencode(json_encode($dehydrated)).'&'.$argsQueryParams)
+            ->get('/_components/component6?data='.urlencode(json_encode($dehydrated)))
             ->assertSuccessful()
             ->assertHeaderContains('Content-Type', 'html')
             ->assertContains('Arg1: not provided')
@@ -219,9 +219,12 @@ public function testInjectsLiveArgs(): void
                 // get a valid token to use for actions
                 $token = $response->crawler()->filter('div')->first()->attr('data-live-csrf-value');
             })
-            ->post('/_components/component6/inject?'.$argsQueryParams, [
+            ->post('/_components/component6/inject', [
                 'headers' => ['X-CSRF-TOKEN' => $token],
-                'body' => json_encode($dehydrated),
+                'body' => json_encode([
+                    'data' => $dehydrated,
+                    'args' => $arguments,
+                ]),
             ])
             ->assertSuccessful()
             ->assertHeaderContains('Content-Type', 'html')

src/LiveComponent/tests/Functional/Form/ComponentWithFormTest.php

@@ -50,7 +50,7 @@ public function testFormValuesRebuildAfterFormChanges(): void
 
             // post to action, which will add a new embedded comment
             ->post('/_components/form_with_collection_type/addComment', [
-                'body' => json_encode($dehydrated),
+                'body' => json_encode(['data' => $dehydrated]),
                 'headers' => ['X-CSRF-TOKEN' => $token],
             ])
             ->assertStatus(422)
@@ -85,8 +85,8 @@ public function testFormValuesRebuildAfterFormChanges(): void
             })
 
             // post to action, which will remove the original embedded comment
-            ->post('/_components/form_with_collection_type/removeComment?'.http_build_query(['args' => 'index=0']), [
-                'body' => json_encode($dehydrated),
+            ->post('/_components/form_with_collection_type/removeComment', [
+                'body' => json_encode(['data' => $dehydrated, 'args' => ['index' => '0']]),
                 'headers' => ['X-CSRF-TOKEN' => $token],
             ])
             ->assertStatus(422)
@@ -265,8 +265,8 @@ public function testLiveCollectionTypeFieldsAddedAndRemoved(): void
                 $token = $response->crawler()->filter('div')->first()->attr('data-live-csrf-value');
             })
             // post to action, which will add a new embedded comment
-            ->post('/_components/form_with_live_collection_type/addCollectionItem?'.http_build_query(['args' => 'name=blog_post_form[comments]']), [
-                'body' => json_encode($dehydrated),
+            ->post('/_components/form_with_live_collection_type/addCollectionItem', [
+                'body' => json_encode(['data' => $dehydrated, 'args' => ['name' => 'blog_post_form[comments]']]),
                 'headers' => ['X-CSRF-TOKEN' => $token],
             ])
             ->assertStatus(422)
@@ -301,8 +301,8 @@ public function testLiveCollectionTypeFieldsAddedAndRemoved(): void
             })
 
             // post to action, which will remove the original embedded comment
-            ->post('/_components/form_with_live_collection_type/removeCollectionItem?'.http_build_query(['args' => 'name=blog_post_form[comments]&index=0']), [
-                'body' => json_encode($dehydrated),
+            ->post('/_components/form_with_live_collection_type/removeCollectionItem', [
+                'body' => json_encode(['data' => $dehydrated, 'args' => ['name' => 'blog_post_form[comments]', 'index' => '0']]),
                 'headers' => ['X-CSRF-TOKEN' => $token],
             ])
             ->assertStatus(422)