fix: regressions introduced in #5 (symfony#7)

Author: dunglas

src/Broadcaster/TwigMercureBroadcaster.php

@@ -40,8 +40,9 @@ final class TwigMercureBroadcaster implements BroadcasterInterface
 {
     private $twig;
     private $messageBus;
-    private $publisher = null;
-    private $expressionLanguage = null;
+    private $publisher;
+    private $expressionLanguage;
+    private $entityNamespace;
 
     private const OPTIONS = [
         // Twig options
@@ -65,13 +66,15 @@ public function __construct(
             throw new \LogicException('The broadcast feature requires PHP 8.0 or greater, you must either upgrade to PHP 8 or disable it.');
         }
 
-        if (null === $this->messageBus && null === $this->publisher) {
+        if (null === $messageBus && null === $publisher) {
             throw new \InvalidArgumentException('A message bus or a publisher must be provided.');
         }
 
-        if (null === $this->expressionLanguage) {
-            $this->expressionLanguage = new ExpressionLanguage();
-        }
+        $this->twig = $twig;
+        $this->messageBus = $messageBus;
+        $this->publisher = $publisher;
+        $this->expressionLanguage = $expressionLanguage ?? new ExpressionLanguage();
+        $this->entityNamespace = $entityNamespace;
     }
 
     public function broadcast(object $entity, string $action): void
@@ -124,7 +127,7 @@ private function normalizeOptions(object $entity, string $action, array $options
         $options['topics'] = (array) ($options['topics'] ?? $entityClass);
         if (!isset($options['template'])) {
             $dir = $entityClass;
-            if (null !== $this->entityNamespace && 0 !== strpos($entityClass, $this->entityNamespace)) {
+            if (null !== $this->entityNamespace && 0 === strpos($entityClass, $this->entityNamespace)) {
                 $dir = substr($entityClass, strlen($this->entityNamespace));
             }
 

src/Doctrine/BroadcastListener.php

@@ -50,6 +50,8 @@ public function __construct(BroadcasterInterface $broadcaster)
         }
 
         $this->reset();
+
+        $this->broadcaster = $broadcaster;
     }
 
     /**

tests/app/Kernel.php

@@ -60,7 +60,7 @@ public function registerBundles(): iterable
     protected function configureContainer(ContainerConfigurator $container): void
     {
         $container->extension('framework', [
-            'test' => 'test' === $_SERVER['APP_ENV'] ?? 'dev',
+            'test' => 'test' === ($_SERVER['APP_ENV'] ?? 'dev'),
             'router' => [
                 'utf8' => true,
             ],