Skip to content

Commit 1d35357

Browse files
committed
don't make clients explicitly public
1 parent 4f4ce51 commit 1d35357

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

DependencyInjection/HttplugExtension.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
use Http\Message\Authentication\Wsse;
1515
use Psr\Http\Message\UriInterface;
1616
use Symfony\Component\Config\FileLocator;
17-
use Symfony\Component\DependencyInjection\Alias;
1817
use Symfony\Component\DependencyInjection\ChildDefinition;
1918
use Symfony\Component\DependencyInjection\ContainerBuilder;
2019
use Symfony\Component\DependencyInjection\Definition;
@@ -51,7 +50,7 @@ public function load(array $configs, ContainerBuilder $container)
5150

5251
// Set main aliases
5352
foreach ($config['main_alias'] as $type => $id) {
54-
$container->setAlias(sprintf('httplug.%s', $type), new Alias($id, true));
53+
$container->setAlias(sprintf('httplug.%s', $type), $id);
5554
}
5655

5756
// Configure toolbar
@@ -104,7 +103,7 @@ private function configureClients(ContainerBuilder $container, array $config)
104103
// If we do not have a client named 'default'
105104
if (!isset($config['clients']['default'])) {
106105
// Alias the first client to httplug.client.default
107-
$container->setAlias('httplug.client.default', new Alias('httplug.client.'.$first, true));
106+
$container->setAlias('httplug.client.default', 'httplug.client.'.$first);
108107
}
109108
}
110109
}
@@ -298,7 +297,6 @@ private function configureClient(ContainerBuilder $container, $clientName, array
298297

299298
$container
300299
->register($serviceId, PluginClient::class)
301-
->setPublic(true)
302300
->setFactory([new Reference(PluginClientFactory::class), 'createClient'])
303301
->addArgument(new Reference($serviceId.'.client'))
304302
->addArgument(

Tests/Resources/app/AppKernel.php

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,11 +108,22 @@ public function process(ContainerBuilder $container)
108108
'httplug.async_client.default',
109109
'httplug.client.default',
110110
'app.http.plugin.custom',
111+
'httplug.client.acme',
111112
];
112113
foreach ($services as $service) {
113114
if ($container->hasDefinition($service)) {
114115
$container->getDefinition($service)->setPublic(true);
115116
}
117+
118+
}
119+
120+
$aliases = [
121+
'httplug.client',
122+
];
123+
foreach ($aliases as $alias) {
124+
if ($container->hasAlias($alias)) {
125+
$container->getAlias($alias)->setPublic(true);
126+
}
116127
}
117128
}
118129
}

0 commit comments

Comments
 (0)