Fix PHPStan

Author: chapterjason

src/Turbo/src/Bridge/Mercure/TurboStreamListenRenderer.php

@@ -14,6 +14,7 @@
 use Symfony\Component\Mercure\HubInterface;
 use Symfony\UX\StimulusBundle\Helper\StimulusHelper;
 use Symfony\UX\Turbo\Broadcaster\IdAccessor;
+use Symfony\UX\Turbo\Broadcaster\IdFormatter;
 use Symfony\UX\Turbo\Twig\TurboStreamListenRendererInterface;
 use Symfony\WebpackEncoreBundle\Twig\StimulusTwigExtension;
 use Twig\Environment;
@@ -28,14 +29,16 @@ final class TurboStreamListenRenderer implements TurboStreamListenRendererInterf
     private HubInterface $hub;
     private StimulusHelper $stimulusHelper;
     private IdAccessor $idAccessor;
+    private IdFormatter $idFormatter;
 
     /**
      * @param $stimulus StimulusHelper
      */
-    public function __construct(HubInterface $hub, StimulusHelper|StimulusTwigExtension $stimulus, IdAccessor $idAccessor)
+    public function __construct(HubInterface $hub, StimulusHelper|StimulusTwigExtension $stimulus, IdAccessor $idAccessor, ?IdFormatter $idFormatter = null)
     {
         $this->hub = $hub;
         $this->idAccessor = $idAccessor;
+        $this->idFormatter = $idFormatter ?? new IdFormatter();
 
         if ($stimulus instanceof StimulusTwigExtension) {
             trigger_deprecation('symfony/ux-turbo', '2.9', 'Passing an instance of "%s" as second argument of "%s" is deprecated, pass an instance of "%s" instead.', StimulusTwigExtension::class, __CLASS__, StimulusHelper::class);
@@ -55,7 +58,9 @@ public function renderTurboStreamListen(Environment $env, $topic): string
                 throw new \LogicException(sprintf('Cannot listen to entity of class "%s" as the PropertyAccess component is not installed. Try running "composer require symfony/property-access".', $class));
             }
 
-            $topic = sprintf(Broadcaster::TOPIC_PATTERN, rawurlencode($class), rawurlencode(implode('-', $id)));
+            $formattedId = $this->idFormatter->format($id);
+
+            $topic = sprintf(Broadcaster::TOPIC_PATTERN, rawurlencode($class), rawurlencode($formattedId));
         } elseif (!preg_match('/[^a-zA-Z0-9_\x7f-\xff\\\\]/', $topic) && class_exists($topic)) {
             // Generate a URI template to subscribe to updates for all objects of this class
             $topic = sprintf(Broadcaster::TOPIC_PATTERN, rawurlencode($topic), '{id}');

src/Turbo/src/Broadcaster/BroadcasterInterface.php

@@ -19,7 +19,7 @@
 interface BroadcasterInterface
 {
     /**
-     * @param array{id?: string|string[], transports?: string|string[], topics?: string|string[], template?: string, rendered_action?: string, private?: bool, sse_id?: string, sse_type?: string, sse_retry?: int} $options
+     * @param array{id?: array<string, string>|array<string, array<string, string>>, transports?: string|string[], topics?: string|string[], template?: string, rendered_action?: string, private?: bool, sse_id?: string, sse_type?: string, sse_retry?: int} $options
      */
     public function broadcast(object $entity, string $action, array $options): void;
 }

src/Turbo/src/Broadcaster/DoctrineIdAccessor.php

@@ -27,6 +27,9 @@ public function __construct(?ManagerRegistry $doctrine = null)
         $this->doctrine = $doctrine;
     }
 
+    /**
+     * @return array<string, array<string, string>>|array<string, string>|null
+     */
     public function getEntityId(object $entity): ?array
     {
         $entityClass = $entity::class;
@@ -38,6 +41,9 @@ public function getEntityId(object $entity): ?array
         return null;
     }
 
+    /**
+     * @return array<string, string>|array<string, array<string, string>>
+     */
     private function getIdentifierValues(ObjectManager $em, object $entity): array
     {
         $class = ClassUtil::getEntityClass($entity);

src/Turbo/src/Broadcaster/IdAccessor.php

@@ -26,7 +26,7 @@ public function __construct(?PropertyAccessorInterface $propertyAccessor = null,
     }
 
     /**
-     * @return string[]
+     * @return array<string, array<string, string>>|array<string, string>|null
      */
     public function getEntityId(object $entity): ?array
     {

src/Turbo/src/Broadcaster/IdFormatter.php

@@ -23,8 +23,15 @@
  */
 class IdFormatter
 {
-    public function format(array $id): string
+    /**
+     * @param array<string, array<string, string>>|array<string, string>|string $id
+     */
+    public function format(array|string $id): string
     {
+        if (is_string($id)) {
+            return $id;
+        }
+
         $flatten = [];
 
         array_walk_recursive($id, static function ($item) use (&$flatten) { $flatten[] = $item; });

src/Turbo/tests/app/Kernel.php

@@ -345,8 +345,12 @@ public function cartProducts(Request $request, EntityManagerInterface $doctrine,
 
                 if ($remove = $request->get('remove')) {
                     $doctrine->remove($cartProduct);
-                    $doctrine->remove($cartProduct->product); // for cleanup
-                    $doctrine->remove($cartProduct->cart); // for cleanup
+                    if ($cartProduct->product) {
+                        $doctrine->remove($cartProduct->product); // for cleanup
+                    }
+                    if ($cartProduct->cart) {
+                        $doctrine->remove($cartProduct->cart); // for cleanup
+                    }
                 } else {
                     $doctrine->persist($cartProduct);
                 }