bug #2416 [Icons] Fix LockIconsCommand definition when Iconify disabled (smnandre)

javiereguiluz · javiereguiluz · commit ec4cfa11b95f · 2024-12-02T17:45:08.000+01:00
This PR was squashed before being merged into the 2.x branch. Discussion ---------- [Icons] Fix LockIconsCommand definition when Iconify disabled | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | Issues | Fix #2415 | License | MIT When iconify is disabled, LockIconsCommand definition is accessed without been set first. Commits ------- 6ba36f7 [Icons] Fix LockIconsCommand definition when Iconify disabled
diff --git a/src/Icons/src/DependencyInjection/UXIconsExtension.php b/src/Icons/src/DependencyInjection/UXIconsExtension.php
@@ -173,16 +173,15 @@ protected function loadInternal(array $mergedConfig, ContainerBuilder $container
             $container->getDefinition('.ux_icons.iconify_on_demand_registry')
                 ->setArgument(1, $iconSetAliases);
 
+            $container->getDefinition('.ux_icons.command.lock')
+                ->setArgument(3, $mergedConfig['aliases'])
+                ->setArgument(4, $iconSetAliases);
+
             if (!$mergedConfig['iconify']['on_demand']) {
                 $container->removeDefinition('.ux_icons.iconify_on_demand_registry');
             }
         }
 
-        $container->getDefinition('.ux_icons.command.lock')
-            ->setArgument(3, $mergedConfig['aliases'])
-            ->setArgument(4, $iconSetAliases)
-        ;
-
         if (!$container->getParameter('kernel.debug')) {
             $container->removeDefinition('.ux_icons.command.import');
         }

Original file line number	Diff line number	Diff line change
`@@ -173,16 +173,15 @@ protected function loadInternal(array $mergedConfig, ContainerBuilder $container`
`173`	`173`	`$container->getDefinition('.ux_icons.iconify_on_demand_registry')`
`174`	`174`	`->setArgument(1, $iconSetAliases);`
`175`	`175`
	`176`	`+ $container->getDefinition('.ux_icons.command.lock')`
	`177`	`+ ->setArgument(3, $mergedConfig['aliases'])`
	`178`	`+ ->setArgument(4, $iconSetAliases);`
	`179`	`+`
`176`	`180`	`if (!$mergedConfig['iconify']['on_demand']) {`
`177`	`181`	`$container->removeDefinition('.ux_icons.iconify_on_demand_registry');`
`178`	`182`	`}`
`179`	`183`	`}`
`180`	`184`
`181`		`- $container->getDefinition('.ux_icons.command.lock')`
`182`		`- ->setArgument(3, $mergedConfig['aliases'])`
`183`		`- ->setArgument(4, $iconSetAliases)`
`184`		`- ;`
`185`		`-`
`186`	`185`	`if (!$container->getParameter('kernel.debug')) {`
`187`	`186`	`$container->removeDefinition('.ux_icons.command.import');`
`188`	`187`	`}`