Add HTML entity support for the components properties (#1075)

* [src/Components]: Add HTML entity support for components properties. * [src/Components]: Fix code style.
jeroennoten · Mar 14, 2022 · ad59de6 · ad59de6
1 parent ca44b87
commit ad59de6
Show file tree

Hide file tree

Showing 13 changed files with 49 additions and 20 deletions.
diff --git a/src/Helpers/UtilsHelper.php b/src/Helpers/UtilsHelper.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace JeroenNoten\LaravelAdminLte\Helpers;
+
+class UtilsHelper
+{
+    /**
+     * Apply an HTML entity decoder to the specified string.
+     *
+     * @param  string  $value
+     * @return string
+     */
+    public static function applyHtmlEntityDecoder($value)
+    {
+        return isset($value) ? html_entity_decode($value) : $value;
+    }
+}
diff --git a/src/View/Components/Form/Button.php b/src/View/Components/Form/Button.php
@@ -3,6 +3,7 @@
 namespace JeroenNoten\LaravelAdminLte\View\Components\Form;
 
 use Illuminate\View\Component;
+use JeroenNoten\LaravelAdminLte\Helpers\UtilsHelper;
 
 class Button extends Component
 {
@@ -44,7 +45,7 @@ class Button extends Component
     public function __construct(
         $label = null, $type = 'button', $theme = 'default', $icon = null
     ) {
-        $this->label = $label;
+        $this->label = UtilsHelper::applyHtmlEntityDecoder($label);
         $this->type = $type;
         $this->theme = $theme;
         $this->icon = $icon;

diff --git a/src/View/Components/Form/InputGroupComponent.php b/src/View/Components/Form/InputGroupComponent.php
@@ -3,6 +3,7 @@
 namespace JeroenNoten\LaravelAdminLte\View\Components\Form;
 
 use Illuminate\View\Component;
+use JeroenNoten\LaravelAdminLte\Helpers\UtilsHelper;
 
 class InputGroupComponent extends Component
 {
@@ -97,7 +98,7 @@ public function __construct(
     ) {
         $this->id = $id ?? $name;
         $this->name = $name;
-        $this->label = $label;
+        $this->label = UtilsHelper::applyHtmlEntityDecoder($label);
         $this->size = $igroupSize;
         $this->fgroupClass = $fgroupClass;
         $this->labelClass = $labelClass;

diff --git a/src/View/Components/Form/Options.php b/src/View/Components/Form/Options.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Support\Arr;
 use Illuminate\View\Component;
+use JeroenNoten\LaravelAdminLte\Helpers\UtilsHelper;
 
 class Options extends Component
 {
@@ -65,8 +66,8 @@ public function __construct(
         $this->selected = Arr::wrap($selected);
         $this->disabled = Arr::wrap($disabled);
         $this->strict = isset($strict);
-        $this->emptyOption = $emptyOption;
-        $this->placeholder = $placeholder;
+        $this->emptyOption = UtilsHelper::applyHtmlEntityDecoder($emptyOption);
+        $this->placeholder = UtilsHelper::applyHtmlEntityDecoder($placeholder);
     }
 
     /**

diff --git a/src/View/Components/Tool/Modal.php b/src/View/Components/Tool/Modal.php
@@ -3,6 +3,7 @@
 namespace JeroenNoten\LaravelAdminLte\View\Components\Tool;
 
 use Illuminate\View\Component;
+use JeroenNoten\LaravelAdminLte\Helpers\UtilsHelper;
 
 class Modal extends Component
 {
@@ -90,7 +91,7 @@ public function __construct(
         $disableAnimations = null
     ) {
         $this->id = $id;
-        $this->title = $title;
+        $this->title = UtilsHelper::applyHtmlEntityDecoder($title);
         $this->icon = $icon;
         $this->size = $size;
         $this->theme = $theme;

diff --git a/src/View/Components/Widget/Alert.php b/src/View/Components/Widget/Alert.php
@@ -3,6 +3,7 @@
 namespace JeroenNoten\LaravelAdminLte\View\Components\Widget;
 
 use Illuminate\View\Component;
+use JeroenNoten\LaravelAdminLte\Helpers\UtilsHelper;
 
 class Alert extends Component
 {
@@ -61,7 +62,7 @@ public function __construct(
     ) {
         $this->theme = $theme;
         $this->icon = $icon;
-        $this->title = $title;
+        $this->title = UtilsHelper::applyHtmlEntityDecoder($title);
         $this->dismissable = $dismissable;
 
         // When a theme is provided, use the default theme icon if no other

diff --git a/src/View/Components/Widget/Callout.php b/src/View/Components/Widget/Callout.php
@@ -3,6 +3,7 @@
 namespace JeroenNoten\LaravelAdminLte\View\Components\Widget;
 
 use Illuminate\View\Component;
+use JeroenNoten\LaravelAdminLte\Helpers\UtilsHelper;
 
 class Callout extends Component
 {
@@ -45,7 +46,7 @@ public function __construct(
     ) {
         $this->theme = $theme;
         $this->icon = $icon;
-        $this->title = $title;
+        $this->title = UtilsHelper::applyHtmlEntityDecoder($title);
         $this->titleClass = $titleClass;
     }
 

diff --git a/src/View/Components/Widget/Card.php b/src/View/Components/Widget/Card.php
@@ -3,6 +3,7 @@
 namespace JeroenNoten\LaravelAdminLte\View\Components\Widget;
 
 use Illuminate\View\Component;
+use JeroenNoten\LaravelAdminLte\Helpers\UtilsHelper;
 
 class Card extends Component
 {
@@ -103,7 +104,7 @@ public function __construct(
         $disabled = null, $collapsible = null, $removable = null,
         $maximizable = null
     ) {
-        $this->title = $title;
+        $this->title = UtilsHelper::applyHtmlEntityDecoder($title);
         $this->icon = $icon;
         $this->theme = $theme;
         $this->themeMode = $themeMode;

diff --git a/src/View/Components/Widget/InfoBox.php b/src/View/Components/Widget/InfoBox.php
@@ -3,6 +3,7 @@
 namespace JeroenNoten\LaravelAdminLte\View\Components\Widget;
 
 use Illuminate\View\Component;
+use JeroenNoten\LaravelAdminLte\Helpers\UtilsHelper;
 
 class InfoBox extends Component
 {
@@ -76,10 +77,10 @@ public function __construct(
         $theme = null, $iconTheme = null, $progress = null,
         $progressTheme = 'white'
     ) {
-        $this->title = $title;
-        $this->text = $text;
+        $this->title = UtilsHelper::applyHtmlEntityDecoder($title);
+        $this->text = UtilsHelper::applyHtmlEntityDecoder($text);
         $this->icon = $icon;
-        $this->description = $description;
+        $this->description = UtilsHelper::applyHtmlEntityDecoder($description);
         $this->theme = $theme;
         $this->iconTheme = $iconTheme;
         $this->progress = $progress;

diff --git a/src/View/Components/Widget/ProfileColItem.php b/src/View/Components/Widget/ProfileColItem.php
@@ -3,6 +3,7 @@
 namespace JeroenNoten\LaravelAdminLte\View\Components\Widget;
 
 use Illuminate\View\Component;
+use JeroenNoten\LaravelAdminLte\Helpers\UtilsHelper;
 
 class ProfileColItem extends Component
 {
@@ -61,8 +62,8 @@ public function __construct(
         $title = null, $text = null, $icon = null, $size = 4,
         $badge = null, $url = null
     ) {
-        $this->title = $title;
-        $this->text = $text;
+        $this->title = UtilsHelper::applyHtmlEntityDecoder($title);
+        $this->text = UtilsHelper::applyHtmlEntityDecoder($text);
         $this->icon = $icon;
         $this->size = $size;
         $this->badge = $badge;

diff --git a/src/View/Components/Widget/ProfileRowItem.php b/src/View/Components/Widget/ProfileRowItem.php
@@ -3,6 +3,7 @@
 namespace JeroenNoten\LaravelAdminLte\View\Components\Widget;
 
 use Illuminate\View\Component;
+use JeroenNoten\LaravelAdminLte\Helpers\UtilsHelper;
 
 class ProfileRowItem extends Component
 {
@@ -61,8 +62,8 @@ public function __construct(
         $title = null, $text = null, $icon = null, $size = 12,
         $badge = null, $url = null
     ) {
-        $this->title = $title;
-        $this->text = $text;
+        $this->title = UtilsHelper::applyHtmlEntityDecoder($title);
+        $this->text = UtilsHelper::applyHtmlEntityDecoder($text);
         $this->icon = $icon;
         $this->size = $size;
         $this->badge = $badge;

diff --git a/src/View/Components/Widget/ProfileWidget.php b/src/View/Components/Widget/ProfileWidget.php
@@ -3,6 +3,7 @@
 namespace JeroenNoten\LaravelAdminLte\View\Components\Widget;
 
 use Illuminate\View\Component;
+use JeroenNoten\LaravelAdminLte\Helpers\UtilsHelper;
 
 class ProfileWidget extends Component
 {
@@ -74,8 +75,8 @@ public function __construct(
         $name = null, $desc = null, $img = null, $theme = null, $cover = null,
         $headerClass = null, $footerClass = null, $layoutType = 'modern'
     ) {
-        $this->name = $name;
-        $this->desc = $desc;
+        $this->name = UtilsHelper::applyHtmlEntityDecoder($name);
+        $this->desc = UtilsHelper::applyHtmlEntityDecoder($desc);
         $this->img = $img;
         $this->theme = $theme;
         $this->cover = $cover;

diff --git a/src/View/Components/Widget/SmallBox.php b/src/View/Components/Widget/SmallBox.php
@@ -3,6 +3,7 @@
 namespace JeroenNoten\LaravelAdminLte\View\Components\Widget;
 
 use Illuminate\View\Component;
+use JeroenNoten\LaravelAdminLte\Helpers\UtilsHelper;
 
 class SmallBox extends Component
 {
@@ -67,12 +68,12 @@ public function __construct(
         $title = null, $text = null, $icon = null, $theme = null,
         $url = null, $urlText = null, $loading = null
     ) {
-        $this->title = $title;
-        $this->text = $text;
+        $this->title = UtilsHelper::applyHtmlEntityDecoder($title);
+        $this->text = UtilsHelper::applyHtmlEntityDecoder($text);
         $this->icon = $icon;
         $this->theme = $theme;
         $this->url = $url;
-        $this->urlText = $urlText;
+        $this->urlText = UtilsHelper::applyHtmlEntityDecoder($urlText);
         $this->loading = $loading;
     }