Skip to content

Commit f64bbf0

Browse files
committed
Store references in plugins array
1 parent fb077ec commit f64bbf0

File tree

1 file changed

+17
-10
lines changed

1 file changed

+17
-10
lines changed

src/DependencyInjection/HttplugExtension.php

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -427,17 +427,29 @@ private function configureClient(ContainerBuilder $container, string $clientName
427427

428428
switch ($pluginName) {
429429
case 'reference':
430-
$plugins[] = $pluginConfig['id'];
430+
$plugins[] = new Reference($pluginConfig['id']);
431431
break;
432432
case 'authentication':
433-
$plugins = array_merge($plugins, $this->configureAuthentication($container, $pluginConfig, $serviceId.'.authentication'));
433+
$plugins = array_merge(
434+
$plugins,
435+
array_map(
436+
fn($id) => new Reference($id),
437+
$this->configureAuthentication($container, $pluginConfig, $serviceId.'.authentication')
438+
)
439+
);
434440
break;
435441
case 'vcr':
436442
$this->useVcrPlugin = true;
437-
$plugins = array_merge($plugins, $this->configureVcrPlugin($container, $pluginConfig, $serviceId.'.vcr'));
443+
$plugins = array_merge(
444+
$plugins,
445+
array_map(
446+
fn ($id) => new Reference($id),
447+
$this->configureVcrPlugin($container, $pluginConfig, $serviceId . '.vcr'),
448+
),
449+
);
438450
break;
439451
default:
440-
$plugins[] = $this->configurePlugin($container, $serviceId, $pluginName, $pluginConfig);
452+
$plugins[] = new Reference($this->configurePlugin($container, $serviceId, $pluginName, $pluginConfig));
441453
}
442454
}
443455

@@ -456,12 +468,7 @@ private function configureClient(ContainerBuilder $container, string $clientName
456468
->register($serviceId, PluginClient::class)
457469
->setFactory([new Reference(PluginClientFactory::class), 'createClient'])
458470
->addArgument(new Reference($serviceId.'.client'))
459-
->addArgument(
460-
array_map(
461-
fn ($id) => new Reference($id),
462-
$plugins
463-
)
464-
)
471+
->addArgument($plugins)
465472
->addArgument([
466473
'client_name' => $clientName,
467474
])

0 commit comments

Comments
 (0)