Laravel 10 upgrade ongoing

codeeu · Apr 23, 2024 · 0c1263a · 0c1263a
1 parent 050b256
commit 0c1263a
Show file tree

Hide file tree

Showing 9 changed files with 14,742 additions and 11,464 deletions.
diff --git a/app/Event.php b/app/Event.php
@@ -16,13 +16,12 @@
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Str;
-use Laravel\Nova\Actions\Actionable;
 use Spatie\Activitylog\LogOptions;
 use Stevebauman\Purify\Casts\PurifyHtmlOnGet;
 
 class Event extends Model
 {
-    use Actionable, SoftDeletes;
+    use SoftDeletes;
 
     protected $table = 'events';
 

diff --git a/app/Filters/EventFilters.php b/app/Filters/EventFilters.php
@@ -37,7 +37,7 @@ public function __construct(Request $request)
     protected function countries($countries): Builder
     {
         if (empty($countries)) {
-            return;
+            return $this->builder;
         }
 
         $countriesIn = collect($countries)->pluck('iso')->all();

diff --git a/app/Filters/ResourceFilters.php b/app/Filters/ResourceFilters.php
@@ -39,7 +39,7 @@ protected function selectedSection(string $selectedSection): Builder
     protected function searchInput($searchInput): Builder
     {
         if (is_null($searchInput)) {
-            return;
+            return $this->builder;
         }
 
         $result = $this->builder->where(function ($q) use ($searchInput) { // $term is the search term on the query string
@@ -56,7 +56,7 @@ protected function searchInput($searchInput): Builder
     protected function selectedLevels(string $selectedLevels): Builder
     {
         if (count($selectedLevels) == 0) {
-            return;
+            return $this->builder;
         }
         $plucked = collect($selectedLevels)->pluck('id');
 
@@ -73,7 +73,7 @@ protected function selectedLevels(string $selectedLevels): Builder
     protected function selectedTypes(string $selectedTypes): Builder
     {
         if (count($selectedTypes) == 0) {
-            return;
+            return $this->builder;
         }
         $plucked = collect($selectedTypes)->pluck('id');
 
@@ -90,7 +90,7 @@ protected function selectedTypes(string $selectedTypes): Builder
     protected function selectedSubjects(string $selectedSubjects): Builder
     {
         if (count($selectedSubjects) == 0) {
-            return;
+            return $this->builder;
         }
         $plucked = collect($selectedSubjects)->pluck('id');
 
@@ -107,7 +107,7 @@ protected function selectedSubjects(string $selectedSubjects): Builder
     protected function selectedCategories(string $selectedCategories): Builder
     {
         if (count($selectedCategories) == 0) {
-            return;
+            return $this->builder;
         }
         $plucked = collect($selectedCategories)->pluck('id');
 
@@ -125,7 +125,7 @@ protected function selectedLanguages(string $selectedLanguages): Builder
     {
 
         if (count($selectedLanguages) == 0) {
-            return;
+            return $this->builder;
         }
         $plucked = collect($selectedLanguages)->pluck('id');
 
@@ -142,7 +142,7 @@ protected function selectedLanguages(string $selectedLanguages): Builder
     protected function selectedProgrammingLanguages(string $selectedProgrammingLanguages): Builder
     {
         if (count($selectedProgrammingLanguages) == 0) {
-            return;
+            return $this->builder;
         }
         $plucked = collect($selectedProgrammingLanguages)->pluck('id');
 

diff --git a/composer.json b/composer.json
@@ -12,22 +12,21 @@
         "ext-json": "*",
         "ext-zip": "*",
         "aws/aws-sdk-php": "^3.131",
-        "ctessier/nova-advanced-image-field": "^1.3",
         "doctrine/dbal": "^3.5",
         "guzzlehttp/guzzle": "^7.2",
         "intervention/image": "^2.7",
         "laravel-lang/lang": "^12.18",
         "laravel/framework": "^10.48",
         "laravel/helpers": "^1.6",
         "laravel/legacy-factories": "^1.3",
-        "laravel/nova": "^4.0",
         "laravel/sanctum": "^3.3",
         "laravel/socialite": "^5.6",
         "laravel/tinker": "^2.8",
+        "laravel/ui": "^4.5",
         "league/flysystem-aws-s3-v3": "^3.0",
         "livewire/livewire": "^2.11",
         "maatwebsite/excel": "^3.1",
-        "martinlindhe/laravel-vue-i18n-generator": "dev-l9",
+        "martinlindhe/laravel-vue-i18n-generator": "dev-l10",
         "mediconesystems/livewire-datatables": "^0.10",
         "predis/predis": "^1.1",
         "rappasoft/laravel-livewire-tables": "^2.11",