[Turbo] Fixing a bug where saving a proxy would not trigger Broadcasts

Author: weaverryan

src/Turbo/src/Doctrine/BroadcastListener.php

@@ -13,9 +13,11 @@
 
 use Doctrine\Common\Annotations\Reader;
 use Doctrine\Common\EventArgs;
+use Doctrine\Common\Util\ClassUtils;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Event\OnFlushEventArgs;
 use Doctrine\ORM\Event\PostFlushEventArgs;
+use Symfony\Component\VarExporter\LazyObjectInterface;
 use Symfony\Contracts\Service\ResetInterface;
 use Symfony\UX\Turbo\Attribute\Broadcast;
 use Symfony\UX\Turbo\Broadcaster\BroadcasterInterface;
@@ -126,7 +128,12 @@ public function reset(): void
 
     private function storeEntitiesToPublish(EntityManagerInterface $em, object $entity, string $property): void
     {
-        $class = $entity::class;
+        // handle proxies (both styles)
+        if ($entity instanceof LazyObjectInterface) {
+            $class = get_parent_class($entity);
+        } else {
+            $class = ClassUtils::getClass($entity);
+        }
 
         if (!isset($this->broadcastedClasses[$class])) {
             $this->broadcastedClasses[$class] = [];

src/Turbo/tests/BroadcastTest.php

@@ -88,4 +88,15 @@ public function testExpressionLanguageBroadcast(): void
             'Artist 2 shows a song that does not belong to them'
         );
     }
+
+    public function testBroadcastWithProxy(): void
+    {
+        // testing that Artist is updated, even though it's saved as Proxy
+        ($client = self::createPantherClient())->request('GET', '/artistFromSong');
+
+        $crawler = $client->submitForm('Submit');
+        $this->assertSelectorWillContain('#artists', 'testing artist after change');
+        // this part is from the stream template
+        $this->assertSelectorWillContain('#artists', ', updated)');
+    }
 }

src/Turbo/tests/app/Kernel.php

@@ -117,8 +117,6 @@ protected function configureContainer(ContainerConfigurator $container): void
                 ],
             ],
         ]);
-
-        $container->services()->alias(Hub::class, 'mercure.hub.default'); // FIXME: temporary fix for a bug in https://github.com/symfony/mercure-bundle/pull/42
     }
 
     protected function configureRoutes(RoutingConfigurator $routes): void
@@ -135,6 +133,7 @@ protected function configureRoutes(RoutingConfigurator $routes): void
         $routes->add('songs', '/songs')->controller('kernel::songs');
         $routes->add('artists', '/artists')->controller('kernel::artists');
         $routes->add('artist', '/artists/{id}')->controller('kernel::artist');
+        $routes->add('artist', '/artistFromSong')->controller('kernel::artistFromSong');
     }
 
     public function getProjectDir(): string
@@ -265,4 +264,31 @@ public function artist(Request $request, EntityManagerInterface $doctrine, Envir
 
         return new Response($twig->render('artist.html.twig', ['artist' => $artist]));
     }
+
+    public function artistFromSong(Request $request, EntityManagerInterface $doctrine, Environment $twig): Response
+    {
+        if (!$request->isMethod('POST')) {
+            $artist = new Artist();
+            $artist->name = 'testing artist';
+
+            $song = new Song();
+            $song->artist = $artist;
+            $song->title = 'testing song title';
+
+            $doctrine->persist($artist);
+            $doctrine->persist($song);
+            $doctrine->flush();
+        } else {
+            $id = $request->get('id');
+            $song = $doctrine->find(Song::class, $id);
+            $artist = $song->artist;
+            $artist->name = $artist->name.' after change';
+
+            $doctrine->flush();
+        }
+
+        return new Response($twig->render('artist_from_song.html.twig', [
+            'song' => $song,
+        ]));
+    }
 }

src/Turbo/tests/app/templates/artist_from_song.html.twig

@@ -0,0 +1,12 @@
+{% extends 'base.html.twig' %}
+
+{% block body %}
+    <h1>Update Artist Via Song</h1>
+
+    <div id="artists" {{ turbo_stream_listen('App\\Entity\\Artist') }}></div>
+
+    <form method="post" enctype="application/x-www-form-urlencoded">
+        <input name="id" value="{{ song.id }}">
+        <button>Submit</button>
+    </form>
+{% endblock %}