Use built in method to render a string with Blade (librenms#13688)

digitalwm · Jan 26, 2022 · 1debe5e · 1debe5e
1 parent 7734113
commit 1debe5e
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 82 deletions.
diff --git a/LibreNMS/Alert/Template.php b/LibreNMS/Alert/Template.php
@@ -26,6 +26,7 @@
 namespace LibreNMS\Alert;
 
 use App\Models\AlertTemplate;
+use Illuminate\Support\Facades\Blade;
 use LibreNMS\Enum\AlertState;
 
 class Template
@@ -74,9 +75,9 @@ public function bladeBody($data)
     {
         $alert['alert'] = new AlertData($data['alert']);
         try {
-            return view(['template' => $data['template']->template], $alert)->__toString();
+            return Blade::render($data['template']->template, $alert);
         } catch (\Exception $e) {
-            return view(['template' => $this->getDefaultTemplate()], $alert)->__toString();
+            return Blade::render($this->getDefaultTemplate(), $alert);
         }
     }
 
@@ -90,9 +91,9 @@ public function bladeTitle($data)
     {
         $alert['alert'] = new AlertData($data['alert']);
         try {
-            return view(['template' => $data['title']], $alert)->__toString();
+            return Blade::render($data['title'], $alert);
         } catch (\Exception $e) {
-            return $data['title'] ?: view(['template' => 'Template ' . $data['name']], $alert)->__toString();
+            return $data['title'] ?: Blade::render('Template ' . $data['name'], $alert);
         }
     }
 

diff --git a/app/Http/Controllers/DeviceController.php b/app/Http/Controllers/DeviceController.php
@@ -10,6 +10,7 @@
 use Illuminate\Http\Request;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Blade;
 use LibreNMS\Config;
 use LibreNMS\Util\Debug;
 use LibreNMS\Util\Graph;
@@ -166,7 +167,7 @@ private function deviceLinkMenu(Device $device)
         foreach (array_values(Arr::wrap(Config::get('html.device.links'))) as $index => $link) {
             $device_links['custom' . ($index + 1)] = [
                 'icon' => $link['icon'] ?? 'fa-external-link',
-                'url' => view(['template' => $link['url']], ['device' => $device])->__toString(),
+                'url' => Blade::render($link['url'], ['device' => $device]),
                 'title' => $link['title'],
                 'external' => $link['external'] ?? true,
             ];

diff --git a/app/Http/Controllers/Table/DeviceController.php b/app/Http/Controllers/Table/DeviceController.php
@@ -30,6 +30,7 @@
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Blade;
 use LibreNMS\Config;
 use LibreNMS\Util\Rewrite;
 use LibreNMS\Util\Time;
@@ -341,7 +342,7 @@ private function getActions(Device $device): array
         foreach (array_values(Arr::wrap(Config::get('html.device.links'))) as $index => $custom) {
             if ($custom['action'] ?? false) {
                 $row = $this->isDetailed() ? $index % 2 : 0;
-                $custom['href'] = view(['template' => $custom['url']], ['device' => $device])->__toString(); // @phpstan-ignore-line
+                $custom['href'] = Blade::render($custom['url'], ['device' => $device]);
                 $actions[$row][] = $custom;
             }
         }

diff --git a/composer.json b/composer.json
@@ -52,8 +52,7 @@
         "rmccue/requests": "^1.7",
         "symfony/yaml": "^4.0",
         "tecnickcom/tcpdf": "^6.4",
-        "tightenco/ziggy": "^0.9",
-        "wpb/string-blade-compiler": "^6.0"
+        "tightenco/ziggy": "^0.9"
     },
     "require-dev": {
         "barryvdh/laravel-debugbar": "^3.5",

diff --git a/composer.lock b/composer.lock
diff --git a/includes/html/forms/alert-templates.inc.php b/includes/html/forms/alert-templates.inc.php
@@ -33,7 +33,7 @@
 $create = true;
 
 $name = $vars['name'];
-if (isset($vars['template']) && empty(view(['template' => $vars['template']], [])->__toString())) {
+if (isset($vars['template']) && empty(Blade::render($vars['template']))) {
     $message = 'Template failed to be parsed, please check the syntax';
 } elseif (! empty($name)) {
     if ($vars['template'] && is_numeric($vars['template_id'])) {

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -75,16 +75,6 @@ parameters:
 			count: 1
 			path: LibreNMS/Alert/Template.php
 
-		-
-			message: "#^Parameter \\#1 \\$view of function view expects view\\-string\\|null, array\\<string, mixed\\> given\\.$#"
-			count: 2
-			path: LibreNMS/Alert/Template.php
-
-		-
-			message: "#^Parameter \\#1 \\$view of function view expects view\\-string\\|null, array\\<string, string\\> given\\.$#"
-			count: 2
-			path: LibreNMS/Alert/Template.php
-
 		-
 			message: "#^Property LibreNMS\\\\Alert\\\\Template\\:\\:\\$template has no type specified\\.$#"
 			count: 1
@@ -7810,11 +7800,6 @@ parameters:
 			count: 1
 			path: app/Http/Controllers/DeviceController.php
 
-		-
-			message: "#^Parameter \\#1 \\$view of function view expects view\\-string\\|null, array\\<string, mixed\\> given\\.$#"
-			count: 1
-			path: app/Http/Controllers/DeviceController.php
-
 		-
 			message: "#^Property App\\\\Http\\\\Controllers\\\\DeviceController\\:\\:\\$tabs has no type specified\\.$#"
 			count: 1