fix: allow to use a Hub argument aliases for a builtin Hub

Author: 7-zete-7

src/DependencyInjection/MercureExtension.php

@@ -169,10 +169,10 @@ public function load(array $configs, ContainerBuilder $container): void
                     ->addTag('mercure.hub');
             }
 
-            if (!$builtinHub) {
-                $container->registerAliasForArgument($hubId, HubInterface::class, "{$name}Hub");
-                $container->registerAliasForArgument($hubId, HubInterface::class, $name);
+            $container->registerAliasForArgument($hubId, HubInterface::class, "{$name}Hub");
+            $container->registerAliasForArgument($hubId, HubInterface::class, $name);
 
+            if (!$builtinHub) {
                 $publisherDefinition = $container->register($publisherId, Publisher::class)
                     ->addArgument($hub['url'])
                     ->addArgument(new Reference($tokenProvider))

tests/DependencyInjection/MercureExtensionTest.php

@@ -92,6 +92,9 @@ public function testExtension()
                             'subscribe' => 'https://example.com/book/1.jsonld',
                         ],
                     ],
+                    'builtin' => [
+                        'public_url' => 'https://example.com/.well-known/mercure',
+                    ],
                 ],
             ],
         ];
@@ -147,6 +150,25 @@ public function testExtension()
         $this->assertArrayHasKey('Symfony\Component\Mercure\Jwt\TokenProviderInterface $managed2TokenProvider', $container->getAliases());
         $this->assertArrayHasKey('Symfony\Component\Mercure\Jwt\TokenFactoryInterface $managed2TokenFactory', $container->getAliases());
 
+        $this->assertTrue($container->hasDefinition('mercure.hub.builtin')); // Hub instance
+        $this->assertFalse($container->hasDefinition('mercure.hub.builtin.publisher')); // Publisher
+        $this->assertFalse($container->hasDefinition('mercure.hub.builtin.jwt.provider'));
+        $this->assertFalse($container->hasDefinition('mercure.hub.builtin.jwt.factory'));
+        $this->assertSame($config['mercure']['hubs']['demo']['public_url'], $container->getDefinition('mercure.hub.builtin')->getArgument(0));
+
+        $this->assertArrayHasKey('Symfony\Component\Mercure\HubInterface $builtin', $container->getAliases());
+        $this->assertArrayNotHasKey('Symfony\Component\Mercure\PublisherInterface $builtin', $container->getAliases());
+        $this->assertArrayNotHasKey('Symfony\Component\Mercure\Jwt\TokenProviderInterface $builtin', $container->getAliases());
+        $this->assertArrayNotHasKey('Symfony\Component\Mercure\Jwt\TokenFactoryInterface $builtin', $container->getAliases());
+
+        $this->assertArrayHasKey('Symfony\Component\Mercure\HubInterface $builtinHub', $container->getAliases());
+        $this->assertArrayNotHasKey('Symfony\Component\Mercure\PublisherInterface $builtinPublisher', $container->getAliases());
+        $this->assertArrayNotHasKey('Symfony\Component\Mercure\Jwt\TokenProviderInterface $builtinProvider', $container->getAliases());
+        $this->assertArrayNotHasKey('Symfony\Component\Mercure\Jwt\TokenFactoryInterface $builtinFactory', $container->getAliases());
+
+        $this->assertArrayNotHasKey('Symfony\Component\Mercure\Jwt\TokenProviderInterface $builtinTokenProvider', $container->getAliases());
+        $this->assertArrayNotHasKey('Symfony\Component\Mercure\Jwt\TokenFactoryInterface $builtinTokenFactory', $container->getAliases());
+
         $this->assertTrue($container->hasDefinition('mercure.hub.demo')); // Hub instance
         $this->assertTrue($container->hasDefinition('mercure.hub.demo.publisher')); // Publisher
         $this->assertTrue($container->hasDefinition('mercure.hub.demo.jwt.provider'));