Fix trim warning in PHP 8 (#291)

lavary · Feb 14, 2022 · 5255e71 · 5255e71
1 parent 4f14cb9
commit 5255e71
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/Lavary/Menu/Builder.php b/src/Lavary/Menu/Builder.php
@@ -300,7 +300,13 @@ protected function prefix($uri)
     public static function formatGroupClass($new, $old)
     {
         if (isset($new['class']) and $new['class'] !== null) {
-            $classes = trim(trim(Arr::get($old, 'class')).' '.trim(Arr::get($new, 'class')));
+            $oldClass = Arr::get($old, 'class');
+
+            if ($oldClass !== null) {
+                $oldClass = trim($oldClass);
+            }
+
+            $classes = trim($oldClass.' '.trim(Arr::get($new, 'class')));
 
             return implode(' ', array_unique(explode(' ', $classes)));
         }