simplify building theme independent plugins (#2888)

kimai · Oct 30, 2021 · 40061e4 · 40061e4
1 parent 7ed1998
commit 40061e4
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 10 deletions.
diff --git a/config/packages/twig.yaml b/config/packages/twig.yaml
@@ -7,3 +7,4 @@ twig:
     paths:
         # used in templates/emails/layout.html.twig
         '%kernel.project_dir%/assets/css': css
+        '%kernel.project_dir%/vendor/kevinpapst/adminlte-bundle/Resources/views': theme
diff --git a/config/services.yaml b/config/services.yaml
@@ -108,13 +108,6 @@ services:
         arguments:
             - !service { class: PDO, factory: ['@database_connection', 'getWrappedConnection'] }
 
-    # ================================================================================
-    # THEME
-    # ================================================================================
-
-    KevinPapst\AdminLTEBundle\Helper\ContextHelper:
-        alias: admin_lte_theme.context_helper
-
     # ================================================================================
     # TIMESHEET RECORD CALCULATOR
     # ================================================================================

diff --git a/src/Event/ConfigureMainMenuEvent.php b/src/Event/ConfigureMainMenuEvent.php
@@ -9,8 +9,8 @@
 
 namespace App\Event;
 
+use App\Utils\MenuItemModel;
 use KevinPapst\AdminLTEBundle\Event\SidebarMenuEvent;
-use KevinPapst\AdminLTEBundle\Model\MenuItemModel;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Contracts\EventDispatcher\Event;
 

diff --git a/src/EventSubscriber/MenuBuilderSubscriber.php b/src/EventSubscriber/MenuBuilderSubscriber.php
@@ -10,10 +10,10 @@
 namespace App\EventSubscriber;
 
 use App\Event\ConfigureMainMenuEvent;
+use App\Utils\MenuItemModel;
 use App\Utils\MenuItemModel as KimaiMenuItemModel;
 use KevinPapst\AdminLTEBundle\Event\SidebarMenuEvent;
 use KevinPapst\AdminLTEBundle\Model\MenuItemInterface;
-use KevinPapst\AdminLTEBundle\Model\MenuItemModel;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;

diff --git a/tests/Event/ConfigureMainMenuEventTest.php b/tests/Event/ConfigureMainMenuEventTest.php
@@ -10,8 +10,8 @@
 namespace App\Tests\Event;
 
 use App\Event\ConfigureMainMenuEvent;
+use App\Utils\MenuItemModel;
 use KevinPapst\AdminLTEBundle\Event\SidebarMenuEvent;
-use KevinPapst\AdminLTEBundle\Model\MenuItemModel;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Request;