Skip to content

[Mercure] Add the component #28877

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 13 commits into from
Closed

[Mercure] Add the component #28877

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
af6339b
Initial commit
dunglas Oct 12, 2018
0a10352
Messenger support
dunglas Oct 12, 2018
899d06b
Remove the messenger handler (use Publisher directly)
dunglas Oct 13, 2018
0f6bfde
Handle errors. FWBundle config.
dunglas Oct 14, 2018
c368233
CS
dunglas Oct 15, 2018
cf5273e
Update for Mercure 0.2
dunglas Oct 21, 2018
ce7be48
Review
dunglas Oct 22, 2018
661005b
Fix tests
dunglas Oct 22, 2018
06b812b
Fix CS
dunglas Oct 23, 2018
a381f46
Fix remaining old URLs
dunglas Oct 23, 2018
421279d
Fix tests
dunglas Oct 23, 2018
75b4a9b
Mark the component as experimental
dunglas Oct 23, 2018
0645bcd
Add some useful container's parameters
dunglas Oct 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Add some useful container's parameters
  • Loading branch information
@dunglas
dunglas committed Oct 23, 2018
commit 0645bcd8495adebaf47ee669aafa1ca8bae3c493
6 changes: 6 additions & 0 deletions src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1686,6 +1686,8 @@ private function registerMercureConfiguration(array $config, ContainerBuilder $c
}

$defaultHub = $config['default_hub'] ?? null;
$hubUrls = array();
$defaultHubUrl = null;
foreach ($config['hubs'] as $name => $hub) {
if (isset($hub['jwt'])) {
$jwtProvider = sprintf('mercure.hub.%s.jwt_provider', $name);
Expand All @@ -1694,8 +1696,10 @@ private function registerMercureConfiguration(array $config, ContainerBuilder $c
$jwtProvider = $hub['jwt_provider'];
}

$hubUrls[$name] = $hub['url'];
$hubId = sprintf('mercure.hub.%s.publisher', $name);
if (!$defaultHub) {
$defaultHubUrl = $hub['url'];
$defaultHub = $hubId;
}

Expand All @@ -1711,6 +1715,8 @@ private function registerMercureConfiguration(array $config, ContainerBuilder $c
}

$container->setAlias(Publisher::class, $defaultHub);
$container->setParameter('mercure.hubs', $hubUrls);
$container->setParameter('mercure.default_hub', $defaultHubUrl);
}

/**
Expand Down
2 changes: 2 additions & 0 deletions src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1251,6 +1251,8 @@ public function testMercure()
$this->assertTrue($container->hasDefinition('mercure.hub.default.publisher'));
$this->assertSame('https://demo.mercure.rocks/hub', $container->getDefinition('mercure.hub.default.publisher')->getArgument(0));
$this->assertSame('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.e30.HB0k08BaV8KlLZ3EafCRlTDGbkd9qdznCzJQ_l8ELTU', $container->getDefinition('mercure.hub.default.jwt_provider')->getArgument(0));
$this->assertSame(array('default' => 'https://demo.mercure.rocks/hub'), $container->getParameter('mercure.hubs'));
$this->assertSame('https://demo.mercure.rocks/hub', $container->getParameter('mercure.default_hub'));
}

protected function createContainer(array $data = array())
Expand Down