Merge branch 'main' of github.com:omnia-digital/catalyst-forms-plugin

# Conflicts: # src/Filament/Resources/FormSubmissionResource.php # src/Policies/FormSubmissionPolicy.php
omnia-digital · Nov 4, 2023 · e0ea53a · e0ea53a
2 parents a4659d9 + ac01bca
commit e0ea53a
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 24 deletions.
diff --git a/src/CatalystFormsPlugin.php b/src/CatalystFormsPlugin.php
@@ -29,7 +29,7 @@ public function register(Panel $panel): void
     {
         $panel->discoverResources(__DIR__ . '/Filament/Resources', 'OmniaDigital\\CatalystForms\\Filament\\Resources')
             ->discoverPages(in: __DIR__ . '/Filament/Pages', for: 'OmniaDigital\\CatalystForms\\Filament\\Pages')
-            ->discoverWidgets(in: __DIR__.'/Filament/Widgets', for: 'OmniaDigital\\CatalystForms\\Filament\\Widgets');
+            ->discoverWidgets(in: __DIR__ . '/Filament/Widgets', for: 'OmniaDigital\\CatalystForms\\Filament\\Widgets');
     }
 
     public function boot(Panel $panel): void

diff --git a/src/CatalystFormsPluginServiceProvider.php b/src/CatalystFormsPluginServiceProvider.php
@@ -89,11 +89,7 @@ public function registerLivewireComponents($package)
     /**
      * Register component directory.
      *
-     * @param string $directory
-     * @param string $namespace
-     * @param string $aliasPrefix
-     *
-     * @return void
+     * @param  string  $aliasPrefix
      */
     protected function registerComponentDirectory(string $directory, string $namespace): void
     {
@@ -102,19 +98,21 @@ protected function registerComponentDirectory(string $directory, string $namespa
         /**
          * Directory doesn't existS.
          */
-        if (!$filesystem->isDirectory($directory)) {
+        if (! $filesystem->isDirectory($directory)) {
             return;
         }
 
         $aliases = collect();
 
         collect($filesystem->allFiles($directory))
-            ->map(fn(SplFileInfo $file) => Str::of($namespace)
+            ->map(fn (SplFileInfo $file) => Str::of($namespace)
                 ->append("\\{$file->getRelativePathname()}")
                 ->replace(['/', '.php'], ['\\', ''])
                 ->toString())
-            ->filter(fn($class) => (is_subclass_of($class,
-                    Component::class) && !(new ReflectionClass($class))->isAbstract()))
+            ->filter(fn ($class) => (is_subclass_of(
+                $class,
+                Component::class
+            ) && ! (new ReflectionClass($class))->isAbstract()))
             ->each(function ($class) use ($namespace, $aliases) {
                 $alias = Str::of($class)
                     ->after($namespace . '\\')
@@ -130,11 +128,7 @@ protected function registerComponentDirectory(string $directory, string $namespa
     /**
      * Register livewire single component.
      *
-     * @param string $class
-     * @param string $namespace
-     * @param string $aliasPrefix
-     *
-     * @return void
+     * @param  string  $aliasPrefix
      */
     private function registerSingleComponent(string $class, string $namespace): void
     {
@@ -153,7 +147,6 @@ private function registerSingleComponent(string $class, string $namespace): void
             : Livewire::component($prefix . $alias, $class);
     }
 
-
     public function packageRegistered(): void
     {
     }
@@ -227,7 +220,7 @@ protected function getIcons(): array
      */
     protected function getRoutes(): array
     {
-        return ['web','api'];
+        return ['web', 'api'];
     }
 
     /**
@@ -247,6 +240,7 @@ protected function getMigrations(): Collection
         foreach (app(Filesystem::class)->files(__DIR__ . '/../database/migrations/') as $file) {
             $migrations->push($file->getBasename(suffix: '.php'));
         }
+
         return $migrations;
     }
 }
diff --git a/src/Filament/Resources/FormSubmissionResource.php b/src/Filament/Resources/FormSubmissionResource.php
@@ -2,7 +2,8 @@
 
 namespace OmniaDigital\CatalystForms\Filament\Resources;
 
-use OmniaDigital\CatalystCore\Models\Team;
+use App\Models\Team;
+use App\Models\User;
 use Closure;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\Textarea;
@@ -23,7 +24,6 @@
 use OmniaDigital\CatalystForms\Filament\Resources\FormSubmissionResource\Pages\ListFormSubmissions;
 use OmniaDigital\CatalystForms\Filament\Resources\FormSubmissionResource\Pages\ViewFormSubmission;
 use OmniaDigital\CatalystForms\Models\FormSubmission;
-use OmniaDigital\CatalystCore\Models\User;
 
 class FormSubmissionResource extends Resource
 {

diff --git a/src/Jobs/SendFormNotificationsJob.php b/src/Jobs/SendFormNotificationsJob.php
@@ -10,8 +10,8 @@
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
-use OmniaDigital\CatalystForms\Notifications\FormReminderNotification;
 use OmniaDigital\CatalystForms\Models\FormNotification;
+use OmniaDigital\CatalystForms\Notifications\FormReminderNotification;
 
 class SendFormNotificationsJob implements ShouldQueue
 {

diff --git a/src/Models/FormAssemblyForm.php b/src/Models/FormAssemblyForm.php
@@ -10,7 +10,8 @@
 
 class FormAssemblyForm extends Model
 {
-    use HasFactory, HasSlug;
+    use HasFactory;
+    use HasSlug;
 
     protected $guarded = [];
 

diff --git a/src/Notifications/FormReminderNotification.php b/src/Notifications/FormReminderNotification.php
@@ -7,8 +7,8 @@
 use Illuminate\Bus\Queueable;
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Notifications\Notification;
-use OmniaDigital\CatalystForms\Models\FormNotification;
 use OmniaDigital\CatalystForms\Facades\Translate;
+use OmniaDigital\CatalystForms\Models\FormNotification;
 
 class FormReminderNotification extends Notification
 {

diff --git a/src/Policies/FormSubmissionPolicy.php b/src/Policies/FormSubmissionPolicy.php
@@ -2,9 +2,10 @@
 
 namespace OmniaDigital\CatalystForms\Policies;
 
+use App\Models\User;
 use Illuminate\Auth\Access\HandlesAuthorization;
 use OmniaDigital\CatalystForms\Models\FormSubmission;
-use OmniaDigital\CatalystCore\Models\User;
+use App\Models\User;
 
 class FormSubmissionPolicy
 {

diff --git a/src/Traits/Livewire/WithFormBuilder.php b/src/Traits/Livewire/WithFormBuilder.php
@@ -13,9 +13,9 @@
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Concerns\InteractsWithForms;
 use Illuminate\Support\Str;
+use OmniaDigital\CatalystForms\Facades\Translate;
 use OmniaDigital\CatalystForms\Models\Form;
 use OmniaDigital\CatalystForms\Models\FormType;
-use OmniaDigital\CatalystForms\Facades\Translate;
 use OmniaDigital\OmniaLibrary\Livewire\WithNotification;
 
 /**