Merge branch 'main' of https://github.com/square-bit/filament-volition

Author: tiagof

src/Filament/Actions/CreateElementAction.php

@@ -6,7 +6,7 @@
 
 class CreateElementAction extends CreateAction
 {
-    public static function make(string $name = null): static
+    public static function make(?string $name = null): static
     {
         return parent::make($name)
             ->mutateFormDataUsing(ElementPayloadActions::mutateFormDataCallable());

src/Filament/Actions/EditElementAction.php

@@ -6,7 +6,7 @@
 
 class EditElementAction extends EditAction
 {
-    public static function make(string $name = null): static
+    public static function make(?string $name = null): static
     {
         return parent::make($name)
             ->mutateFormDataUsing(ElementPayloadActions::mutateFormDataCallable())

src/FilamentVolition.php

@@ -30,9 +30,9 @@ class FilamentVolition
      * <<<<<<< HEAD
      *
      * @param  array<class-string<Volitional>>|class-string<Volitional>  $volitionals
-     * =======
+     *                                                                                 =======
      * @param  array<class-string<\Squarebit\Volition\Contracts\Volitional>>|class-string<Volitional>  $volitionals
-     * >>>>>>> 232f5c049dfc88686fd26b8f84f817435237c68e
+     *                                                                                                               >>>>>>> 232f5c049dfc88686fd26b8f84f817435237c68e
      * @return $this
      */
     public function registerVolitionals(array|string $volitionals): self