refactor

Author: kbond

src/LiveComponent/src/Test/TestLiveComponent.php

@@ -26,10 +26,6 @@
  */
 final class TestLiveComponent
 {
-    private array $props;
-    private string $csrfToken;
-    private object $component;
-
     /**
      * @internal
      */
@@ -55,11 +51,9 @@ public function __construct(
             $this->metadata->get('route'),
             [
                 '_live_component' => $this->metadata->getName(),
-                'props' => json_encode($props->getProps()),
+                'props' => json_encode($props->getProps(), flags: \JSON_THROW_ON_ERROR),
             ]
         ));
-
-        $this->updateState();
     }
 
     public function render(): RenderedComponent
@@ -69,19 +63,15 @@ public function render(): RenderedComponent
 
     public function component(): object
     {
-        if (isset($this->component)) {
-            return $this->component;
-        }
-
         $component = $this->factory->get($this->metadata->getName());
         $componentAttributes = $this->hydrator->hydrate(
             $component,
-            $this->props,
+            $this->props(),
             [],
             $this->metadataFactory->getMetadata($this->metadata->getName()),
         );
 
-        return $this->component = (new MountedComponent($this->metadata->getName(), $component, $componentAttributes))->getComponent();
+        return (new MountedComponent($this->metadata->getName(), $component, $componentAttributes))->getComponent();
     }
 
     /**
@@ -117,9 +107,7 @@ public function response(): Response
 
     private function request(array $content = [], string $action = null): self
     {
-        if (!isset($this->props)) {
-            throw new \LogicException('A live component action has redirected and you can no longer access the component.');
-        }
+        $csrfToken = $this->csrfToken();
 
         $this->client->request(
             'POST',
@@ -130,31 +118,32 @@ private function request(array $content = [], string $action = null): self
                     '_live_action' => $action,
                 ])
             ),
-            parameters: ['data' => json_encode(array_merge($content, ['props' => $this->props]))],
-            server: ['HTTP_X_CSRF_TOKEN' => $this->csrfToken],
+            parameters: ['data' => json_encode(array_merge($content, ['props' => $this->props()]))],
+            server: $csrfToken ? ['HTTP_X_CSRF_TOKEN' => $csrfToken] : [],
         );
 
-        return $this->updateState();
+        return $this;
     }
 
-    private function updateState(): self
+    private function props(): array
     {
         $crawler = $this->client->getCrawler();
 
-        unset($this->component);
+        if (!count($node = $crawler->filter('[data-live-props-value]'))) {
+            throw new \LogicException('A live component action has redirected and you can no longer access the component.');
+        }
 
-        $props = $crawler->filter('[data-live-props-value]');
-        $csrf = $crawler->filter('[data-live-csrf-value]');
+        return json_decode($node->attr('data-live-props-value'), true, flags: \JSON_THROW_ON_ERROR);
+    }
 
-        if (!\count($props) || !\count($csrf)) {
-            unset($this->props, $this->csrfToken);
+    private function csrfToken(): ?string
+    {
+        $crawler = $this->client->getCrawler();
 
-            return $this;
+        if (!count($node = $crawler->filter('[data-live-csrf-value]'))) {
+            return null;
         }
 
-        $this->props = json_decode($props->attr('data-live-props-value'), true, flags: \JSON_THROW_ON_ERROR);
-        $this->csrfToken = $csrf->attr('data-live-csrf-value');
-
-        return $this;
+        return $node->attr('data-live-csrf-value');
     }
 }