Merge pull request #21 from biigle/laravel-9

Upgrade to Laravel 9

src/AnanasServiceProvider.php

@@ -5,7 +5,6 @@
 use Biigle\Http\Requests\UpdateUserSettings;
 use Biigle\Modules\Ananas\Observers\AnnotationAssistanceRequestObserver;
 use Biigle\Services\Modules;
-use Illuminate\Database\Eloquent\Factory as EloquentFactory;
 use Illuminate\Routing\Router;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\ServiceProvider;
@@ -71,10 +70,6 @@ public function register()
         });
 
         $this->commands('command.ananas.publish');
-
-        if (config('app.env') === 'testing') {
-            $this->registerEloquentFactoriesFrom(__DIR__.'/database/factories');
-        }
     }
 
     /**
@@ -88,15 +83,4 @@ public function provides()
             'command.ananas.publish',
         ];
     }
-
-    /**
-     * Register factories.
-     *
-     * @param  string  $path
-     * @return void
-     */
-    protected function registerEloquentFactoriesFrom($path)
-    {
-        $this->app->make(EloquentFactory::class)->load($path);
-    }
 }

src/AnnotationAssistanceRequest.php

@@ -3,7 +3,9 @@
 namespace Biigle\Modules\Ananas;
 
 use Biigle\ImageAnnotation;
+use Biigle\Modules\Ananas\Database\Factories\AnnotationAssistanceRequestFactory;
 use Biigle\User;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Str;
 
@@ -13,6 +15,8 @@
  */
 class AnnotationAssistanceRequest extends Model
 {
+    use HasFactory;
+
     /**
      * The attributes that should be casted to native types.
      *
@@ -87,4 +91,14 @@ public function getResponseLabelAttribute()
 
         return;
     }
+
+    /**
+     * Create a new factory instance for the model.
+     *
+     * @return \Illuminate\Database\Eloquent\Factories\Factory
+     */
+    protected static function newFactory()
+    {
+        return AnnotationAssistanceRequestFactory::new();
+    }
 }

src/Database/Factories/AnnotationAssistanceRequestFactory.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace Biigle\Modules\Ananas\Database\Factories;
+
+use Biigle\ImageAnnotation;
+use Biigle\Modules\Ananas\AnnotationAssistanceRequest;
+use Biigle\User;
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+class AnnotationAssistanceRequestFactory extends Factory
+{
+    /**
+     * The name of the factory's corresponding model.
+     *
+     * @var string
+     */
+    protected $model = AnnotationAssistanceRequest::class;
+
+    /**
+     * Define the model's default state.
+     *
+     * @return array
+     */
+    public function definition()
+    {
+        return [
+            'token' => $this->faker->sha256,
+            'request_text' => $this->faker->text,
+            'annotation_id' => ImageAnnotation::factory(),
+            'user_id' => User::factory(),
+        ];
+    }
+}