Merge branch '2.x' into 3.x

lara-zeus · Dec 10, 2023 · c4c18b3 · c4c18b3
2 parents 80d4973 + 82558b0
commit c4c18b3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Filament/Resources/LayoutResource/Pages/CreateLayout.php b/src/Filament/Resources/LayoutResource/Pages/CreateLayout.php
@@ -33,7 +33,7 @@ class CreateLayout extends Page implements Forms\Contracts\HasForms
 
     public array $widgetsData;
 
-    public function mount(int $record = null): void
+    public function mount(?int $record = null): void
     {
         if ($record === null) {
             $layoutModel = RainPlugin::get()->getModel('Layout');

diff --git a/src/Livewire/Layouts.php b/src/Livewire/Layouts.php
@@ -11,7 +11,7 @@ class Layouts extends Component
 {
     public Layout $rainLayout;
 
-    public function mount(string $slug = null): void
+    public function mount(?string $slug = null): void
     {
         $l = $slug ?? RainPlugin::get()->getDefaultLayout();
         $this->rainLayout = RainPlugin::get()->getModel('Layout')::where('layout_slug', $l)->firstOrFail();