bug #49326 [Notifier] Fix notifier profiler when transport name is null (fabpot)

nicolas-grekas · nicolas-grekas · commit 8cf5f021fae0 · 2023-02-13T16:06:21.000+01:00
This PR was merged into the 5.4 branch. Discussion ---------- [Notifier] Fix notifier profiler when transport name is null | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no  | Deprecations? | no  | Tickets | n/a When the transport name is `null`, the profiler is currently broken (JS error). Commits ------- c6933d0 [Notifier] Fix notifier profiler when transport name is null
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/notifier.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/notifier.html.twig
@@ -17,7 +17,7 @@
 
             {% for transport in events.transports %}
                 <div class="sf-toolbar-info-piece">
-                    <b>{{ transport }}</b>
+                    <b>{{ transport ?: '<em>Empty Transport Name</em>' }}</b>
                     <span class="sf-toolbar-status">{{ events.messages(transport)|length }}</span>
                 </div>
             {% endfor %}
@@ -100,7 +100,7 @@
     </div>
 
     {% for transport in events.transports %}
-        <h3>{{ transport }}</h3>
+        <h3>{{ transport ?: '<em>Empty Transport Name</em>' }}</h3>
 
         <div class="card-block">
             <div class="sf-tabs sf-tabs-sm">
diff --git a/src/Symfony/Component/Notifier/Event/NotificationEvents.php b/src/Symfony/Component/Notifier/Event/NotificationEvents.php
@@ -24,7 +24,7 @@ class NotificationEvents
     public function add(MessageEvent $event): void
     {
         $this->events[] = $event;
-        $this->transports[$event->getMessage()->getTransport()] = true;
+        $this->transports[(string) $event->getMessage()->getTransport()] = true;
     }
 
     public function getTransports(): array
@@ -43,7 +43,7 @@ public function getEvents(string $name = null): array
 
         $events = [];
         foreach ($this->events as $event) {
-            if ($name === $event->getMessage()->getTransport()) {
+            if ($name === (string) $event->getMessage()->getTransport()) {
                 $events[] = $event;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ class NotificationEvents`
`24`	`24`	`public function add(MessageEvent $event): void`
`25`	`25`	`{`
`26`	`26`	`$this->events[] = $event;`
`27`		`- $this->transports[$event->getMessage()->getTransport()] = true;`
	`27`	`+ $this->transports[(string) $event->getMessage()->getTransport()] = true;`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`public function getTransports(): array`
`@@ -43,7 +43,7 @@ public function getEvents(string $name = null): array`
`43`	`43`
`44`	`44`	`$events = [];`
`45`	`45`	`foreach ($this->events as $event) {`
`46`		`- if ($name === $event->getMessage()->getTransport()) {`
	`46`	`+ if ($name === (string) $event->getMessage()->getTransport()) {`
`47`	`47`	`$events[] = $event;`
`48`	`48`	`}`
`49`	`49`	`}`