Skip to content

Commit 52085a4

Browse files
committed
Refactor toast configuration to use default values and improve readability
1 parent 1ea7072 commit 52085a4

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

config/definition.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
$definition->rootNode()
99
->children()
1010
->arrayNode('toast_container')
11+
->addDefaultsIfNotSet()
1112
->children()
1213
->integerNode('max_toasts')->defaultNull()->end()
1314
->stringNode('position')
@@ -20,11 +21,12 @@
2021
->end()
2122
->end()
2223
->arrayNode('toast_item')
24+
->addDefaultsIfNotSet()
2325
->children()
2426
->integerNode('timer')->defaultValue(5000)->end()
2527
->booleanNode('dismissible')->defaultTrue()->end()
2628
->booleanNode('progress_bar')->defaultFalse()->end()
27-
->stringNode('template')->isRequired()->end()
29+
->stringNode('template')->defaultValue('@AsmittaToast/toast_items/default.html.twig')->end()
2830
->end()
2931
->end()
3032
->end()

src/AsmittaToastBundle.php

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,18 @@ public function loadExtension(array $config, ContainerConfigurator $container, C
3636
{
3737
$container->import('../config/services.php');
3838

39+
$containerConfig = $config['toast_container'] ?? [];
40+
$itemConfig = $config['toast_item'] ?? [];
41+
3942
$container->services()
4043
->get('asmitta_toast.toast_container')
41-
->arg(0, $config['toast_container']['max_toasts'])
42-
->arg(1, $config['toast_container']['position'])
44+
->arg(0, $containerConfig['max_toasts'] ?? null)
45+
->arg(1, $containerConfig['position'] ?? 'bottom-center')
4346
->get('asmitta_toast.toast_item')
44-
->arg(0, $config['toast_item']['timer'])
45-
->arg(1, $config['toast_item']['dismissible'])
46-
->arg(2, $config['toast_item']['progress_bar'])
47-
->arg(3, $config['toast_item']['template'])
47+
->arg(0, $itemConfig['timer'] ?? 5000)
48+
->arg(1, $itemConfig['dismissible'] ?? true)
49+
->arg(2, $itemConfig['progress_bar'] ?? false)
50+
->arg(3, $itemConfig['template'] ?? '@AsmittaToast/toast_items/default.html.twig')
4851
;
4952
}
5053
}

0 commit comments

Comments
 (0)