DashboardAdminController : add ControllerTrait

Controller/Dashboard/DashboardAdminAdminController.php

@@ -6,11 +6,14 @@ use EasyCorp\Bundle\EasyAdminBundle\Config\Assets;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Crud;
 use EasyCorp\Bundle\EasyAdminBundle\Config\MenuItem;
 use EasyCorp\Bundle\EasyAdminBundle\Config\UserMenu;
+use Lc\CaracoleBundle\Controller\ControllerTrait;
 use Lc\SovBundle\Controller\Dashboard\DashboardAdminController as SovDashboardController;
 use Symfony\Component\Security\Core\User\UserInterface;
 
 class DashboardAdminAdminController extends SovDashboardController
 {
+    use ControllerTrait;
+
     public function configureCrud(): Crud
     {
         $crud = parent::configureCrud();

Twig/StoreTwigExtension.php

@@ -139,7 +139,7 @@ class StoreTwigExtension extends AbstractExtension
         return $this->settingSolver->getSettingValue($merchant, $settingName);
     }
 
-    public function getMerchantSettingCurrent(string $settingName): string
+    public function getMerchantSettingCurrent(string $settingName): ?string
     {
         return $this->settingSolver->getSettingValue($this->getMerchantCurrent(), $settingName);
     }