iconTemplate Configuration Added

cesurapp · Apr 26, 2019 · 96c5602 · 96c5602
1 parent 3c48ec9
commit 96c5602
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 28 deletions.
diff --git a/Builder/Item.php b/Builder/Item.php
@@ -23,7 +23,7 @@ class Item implements ItemInterface
     /**
      * @var int
      */
-    private $id = null;
+    private $id;
 
     /**
      * @var string
@@ -38,7 +38,7 @@ class Item implements ItemInterface
     /**
      * @var int
      */
-    private $order = null;
+    private $order;
 
     /**
      * @var array
@@ -83,7 +83,7 @@ class Item implements ItemInterface
     /**
      * @var null | ItemInterface
      */
-    private $parent = null;
+    private $parent;
 
     /**
      * @var bool
@@ -289,7 +289,7 @@ public function getParent()
         return $this->parent;
     }
 
-    public function setParent(ItemInterface $item)
+    public function setParent(self $item)
     {
         if ($item === $this) {
             throw new \InvalidArgumentException('Item cannot be a child of itself');

diff --git a/Builder/ItemProcess.php b/Builder/ItemProcess.php
@@ -48,7 +48,7 @@ class ItemProcess implements ItemProcessInterface
     /**
      * ItemProcess constructor.
      *
-     * @param RouterInterface               $router
+     * @param RouterInterface $router
      * @param AuthorizationCheckerInterface $security
      */
     public function __construct(RouterInterface $router, AuthorizationCheckerInterface $security, EventDispatcherInterface $eventDispatcher)
@@ -62,15 +62,15 @@ public function __construct(RouterInterface $router, AuthorizationCheckerInterfa
      * Menu Processor.
      *
      * @param ItemInterface $menu
-     * @param array         $options
+     * @param array $options
      *
      * @return ItemInterface
      */
     public function processMenu(ItemInterface $menu, array $options = []): ItemInterface
     {
         // Dispatch Event
         if ($menu->isEvent()) {
-            $this->eventDispatcher->dispatch($menu->getId().'.event', new PdMenuEvent($menu));
+            $this->eventDispatcher->dispatch($menu->getId() . '.event', new PdMenuEvent($menu));
         }
 
         // Set Current URI
@@ -88,7 +88,7 @@ public function processMenu(ItemInterface $menu, array $options = []): ItemInter
      * @param ItemInterface $menu
      * @param $options
      */
-    private function recursiveProcess(ItemInterface &$menu, $options)
+    private function recursiveProcess(ItemInterface $menu, $options)
     {
         // Get Child Menus
         $childs = $menu->getChild();
@@ -126,7 +126,7 @@ private function recursiveProcess(ItemInterface &$menu, $options)
                 }
 
                 // Set Child List Class
-                $child->setChildAttr(array_merge_recursive($child->getChildAttr(), ['class' => 'menu_level_'.$child->getLevel()]));
+                $child->setChildAttr(array_merge_recursive($child->getChildAttr(), ['class' => 'menu_level_' . $child->getLevel()]));
 
                 $this->recursiveProcess($child, $options);
             }

diff --git a/README.md b/README.md
@@ -194,10 +194,11 @@ The creation process is very simple. You can specify additional options.
 You can change the default options.
 ```twig
 {{ pd_menu_render('App\\Menu\\FirstMenu', {
-    'template': '@PdMenu/Default/menu.html.twig'
-    'depth': null
-    'currentClass': 'active'
-    'trans_domain': 'admin'
+    'template': '@PdMenu/Default/menu.html.twig',
+    'depth': null,
+    'currentClass': 'active',
+    'trans_domain': 'admin',
+    'iconTemplate' => '<i class="material-icons">itext</i>'
 }) }}
 ```
 

diff --git a/Render/TwigRender.php b/Render/TwigRender.php
@@ -14,6 +14,7 @@
 namespace Pd\MenuBundle\Render;
 
 use Pd\MenuBundle\Builder\ItemInterface;
+use Twig\Environment;
 
 /**
  * Menu Twig Rendering.
@@ -23,30 +24,23 @@
 class TwigRender implements RenderInterface
 {
     /**
-     * @var \Twig_Environment
+     * @var Twig_Environment
      */
     private $engine;
 
     /**
      * TwigRender constructor.
      *
-     * @param \Twig_Environment $engine
+     * @param Twig_Environment $engine
      */
-    public function __construct(\Twig_Environment $engine)
+    public function __construct(Environment $engine)
     {
         $this->engine = $engine;
     }
 
     /**
      * Render Menu.
      *
-     * @param ItemInterface $item
-     * @param array         $options
-     *
-     * @throws \Twig_Error_Loader
-     * @throws \Twig_Error_Runtime
-     * @throws \Twig_Error_Syntax
-     *
      * @return string
      */
     public function render(ItemInterface $item, array $options = []): string

diff --git a/Resources/views/Default/menu.html.twig b/Resources/views/Default/menu.html.twig
@@ -17,15 +17,15 @@
         {% if menu.link %}
             <a href="{{ menu.link }}" {{ arrayToAttr(menu.linkAttr, [], options) }}>
                 {% if menu.extra('label_icon') %}
-                    <i class="material-icons">{{ menu.extra('label_icon') }}</i>
+                    {{ options.iconTemplate|replace({ 'itext': menu.extra('label_icon') })|raw }}
                 {% endif %}
                 <span {{ arrayToAttr(menu.labelAttr, [], options) }}>
-                    {{ menu.extra('label_translate', true) ? menu.label|trans([], options.trans_domain) : menu.label }}
+                    {{ menu.extra('label_translate', true) ? menu.label|trans([], options.trans_domain)|raw : menu.label|raw }}
                 </span>
             </a>
         {% else %}
             {% if menu.extra('label_icon') %}
-                <i class="material-icons">{{ menu.extra('label_icon') }}</i>
+                {{ options.iconTemplate|replace({ 'itext': menu.extra('label_icon') })|raw }}
             {% endif %}
             <span {{ arrayToAttr(menu.labelAttr, [], options) }}>
                 {{ menu.extra('label_translate', true) ? menu.label|trans([], options.trans_domain) : menu.label }}

diff --git a/Twig/MenuExtension.php b/Twig/MenuExtension.php
@@ -58,7 +58,8 @@ class MenuExtension extends AbstractExtension
         'template' => '@PdMenu/Default/menu.html.twig',
         'depth' => null,
         'currentClass' => 'active',
-        'trans_domain' => null
+        'trans_domain' => null,
+        'iconTemplate' => '<i class="material-icons">itext</i>'
     ];
 
     /**

diff --git a/composer.json b/composer.json
@@ -17,7 +17,7 @@
     }
   ],
   "require": {
-    "php": "^7.1.3",
+    "php": "^7.2.1",
     "twig/twig": "~2"
   },
   "autoload": {