Skip to content

Added docs and renamed configureSharedPlugins #163

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

Merged
merged 2 commits into from
May 11, 2017
Merged

Added docs and renamed configureSharedPlugins #163

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47c60f5
Added docs and renamed configureSharedPlugins
Nyholm May 10, 2017
f6dce22
Merge branch 'master' into Nyholm-patch-31
Nyholm May 11, 2017
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
6 changes: 4 additions & 2 deletions DependencyInjection/HttplugExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public function load(array $configs, ContainerBuilder $container)
}

$this->configureClients($container, $config, $profilingEnabled);
$this->configureSharedPlugins($container, $config['plugins']); // must be after clients, as clients.X.plugins might use plugins as templates that will be removed
$this->configurePlugins($container, $config['plugins']); // must be after clients, as clients.X.plugins might use plugins as templates that will be removed
$this->configureAutoDiscoveryClients($container, $config);
}

Expand Down Expand Up @@ -120,10 +120,12 @@ private function configureClients(ContainerBuilder $container, array $config, $p
}

/**
* Configure all Httplug plugins or remove their service definition.
*
* @param ContainerBuilder $container
* @param array $config
*/
private function configureSharedPlugins(ContainerBuilder $container, array $config)
private function configurePlugins(ContainerBuilder $container, array $config)
{
if (!empty($config['authentication'])) {
$this->configureAuthentication($container, $config['authentication']);
Expand Down