.docker/base.Dockerfile

@@ -1,4 +1,4 @@
-FROM php:8.3.11-fpm as php
+FROM php:8.1.6-fpm as php
 WORKDIR /app
 RUN ls /app
 RUN apt-get update

.drone.yml

@@ -12,7 +12,7 @@ steps:
           - git submodule update --init --recursive
 
     - name: composer_dev
-      image: composer:2.7.9
+      image: composer:2.2.7
       commands:
           - composer install --ignore-platform-reqs --dev
 
@@ -39,7 +39,6 @@ steps:
     - name: tests
       image: zoomyboy/adrema-base:latest
       commands:
-          - touch .env
           - php artisan migrate
           - php artisan test
           - rm -f .env
@@ -136,7 +135,7 @@ steps:
           event: push
 
     - name: composer_no_dev
-      image: composer:2.7.9
+      image: composer:2.2.7
       commands:
           - composer install --ignore-platform-reqs --no-dev
 

app/Activity.php

@@ -4,14 +4,12 @@ namespace App;
 
 use App\Nami\HasNamiField;
 use Cviebrock\EloquentSluggable\Sluggable;
-use Database\Factories\ActivityFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 
 class Activity extends Model
 {
-    /** @use HasFactory<ActivityFactory> */
     use HasFactory;
     use HasNamiField;
     use Sluggable;

app/Confession.php

@@ -2,13 +2,11 @@
 
 namespace App;
 
-use Database\Factories\ConfessionFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class Confession extends Model
 {
-    /** @use HasFactory<ConfessionFactory> */
     use HasFactory;
 
     public $fillable = ['name', 'nami_id', 'is_null'];

app/Contribution/Data/MemberData.php

@@ -29,7 +29,7 @@ class MemberData extends Data
      */
     public static function fromModels(array $ids): Collection
     {
-        return Member::whereIn('id', $ids)->orderByRaw('lastname, firstname')->get()->map(fn ($member) => self::factory()->withoutMagicalCreation()->from([
+        return Member::whereIn('id', $ids)->orderByRaw('lastname, firstname')->get()->map(fn ($member) => self::withoutMagicalCreationFrom([
             ...$member->toArray(),
             'birthday' => $member->birthday->toAtomString(),
             'isLeader' => $member->isLeader(),
@@ -44,7 +44,7 @@ class MemberData extends Data
      */
     public static function fromApi(array $data): Collection
     {
-        return collect($data)->map(fn ($member) => self::factory()->withoutMagicalCreation()->from([
+        return collect($data)->map(fn ($member) => self::withoutMagicalCreationFrom([
             ...$member,
             'birthday' => Carbon::parse($member['birthday'])->toAtomString(),
             'gender' => Gender::fromString($member['gender']),
@@ -54,22 +54,22 @@ class MemberData extends Data
 
     public function fullname(): string
     {
-        return $this->firstname . ' ' . $this->lastname;
+        return $this->firstname.' '.$this->lastname;
     }
 
     public function separatedName(): string
     {
-        return $this->lastname . ', ' . $this->firstname;
+        return $this->lastname.', '.$this->firstname;
     }
 
     public function fullAddress(): string
     {
-        return $this->address . ', ' . $this->zip . ' ' . $this->location;
+        return $this->address.', '.$this->zip.' '.$this->location;
     }
 
     public function city(): string
     {
-        return $this->zip . ' ' . $this->location;
+        return $this->zip.' '.$this->location;
     }
 
     public function age(): string

app/Contribution/Documents/BdkjHesse.php

@@ -74,7 +74,7 @@ class BdkjHesse extends ContributionDocument
 
     public function durationDays(): int
     {
-        return intVal(Carbon::parse($this->dateUntil)->diffInDays(Carbon::parse($this->dateFrom))) + 1;
+        return Carbon::parse($this->dateUntil)->diffInDays(Carbon::parse($this->dateFrom)) + 1;
     }
 
     /**

app/Country.php

@@ -3,13 +3,11 @@
 namespace App;
 
 use App\Nami\HasNamiField;
-use Database\Factories\CountryFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class Country extends Model
 {
-    /** @use HasFactory<CountryFactory> */
     use HasFactory;
     use HasNamiField;
 

app/Course/Models/Course.php

@@ -3,13 +3,11 @@
 namespace App\Course\Models;
 
 use App\Nami\HasNamiField;
-use Database\Factories\Course\Models\CourseFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class Course extends Model
 {
-    /** @use HasFactory<CourseFactory> */
     use HasFactory;
     use HasNamiField;
 

app/Course/Models/CourseMember.php

@@ -3,14 +3,12 @@
 namespace App\Course\Models;
 
 use App\Member\Member;
-use Database\Factories\Course\Models\CourseMemberFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 class CourseMember extends Model
 {
-    /** @use HasFactory<CourseMemberFactory> */
     use HasFactory;
 
     /** @var array<int, string> */

app/Dashboard/DashboardServiceProvider.php

@@ -2,9 +2,7 @@
 
 namespace App\Dashboard;
 
-use Illuminate\Routing\Router;
 use Illuminate\Support\ServiceProvider;
-use App\Dashboard\Actions\IndexAction as DashboardIndexAction;
 
 class DashboardServiceProvider extends ServiceProvider
 {
@@ -25,8 +23,5 @@ class DashboardServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        app(Router::class)->middleware(['web', 'auth:web'])->group(function ($router) {
-            $router->get('/', DashboardIndexAction::class)->name('home');
-        });
     }
 }

app/Fee.php

@@ -4,14 +4,12 @@ namespace App;
 
 use App\Nami\HasNamiField;
 use App\Payment\Subscription;
-use Database\Factories\FeeFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 
 class Fee extends Model
 {
-    /** @use HasFactory<FeeFactory> */
     use HasFactory;
     use HasNamiField;
 

app/Fileshare/Actions/ListFilesAction.php

@@ -17,6 +17,6 @@ class ListFilesAction
      */
     public function handle(ActionRequest $request, Fileshare $fileshare): DataCollection
     {
-        return ResourceData::collect($fileshare->type->getSubDirectories($request->input('parent')), DataCollection::class)->wrap('data');
+        return ResourceData::collection($fileshare->type->getSubDirectories($request->input('parent')))->wrap('data');
     }
 }

app/Fileshare/Models/Fileshare.php

@@ -3,13 +3,11 @@
 namespace App\Fileshare\Models;
 
 use App\Fileshare\ConnectionTypes\ConnectionType;
-use Database\Factories\Fileshare\Models\FileshareFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class Fileshare extends Model
 {
-    /** @use HasFactory<FileshareFactory> */
     use HasFactory;
 
     public $guarded = [];

app/Form/Casts/CollectionCast.php

@@ -6,7 +6,6 @@ use App\Form\Fields\Field;
 use Illuminate\Support\Collection;
 use Spatie\LaravelData\Casts\Cast;
 use Spatie\LaravelData\Data;
-use Spatie\LaravelData\Support\Creation\CreationContext;
 use Spatie\LaravelData\Support\DataProperty;
 
 class CollectionCast implements Cast
@@ -21,9 +20,10 @@ class CollectionCast implements Cast
 
     /**
      * @param array<int, array<string, mixed>> $value
+     * @param array<string, mixed> $context
      * @return Collection<int, Data>
      */
-    public function cast(DataProperty $property, mixed $value, array $properties, CreationContext $context): mixed
+    public function cast(DataProperty $property, mixed $value, array $context): mixed
     {
         return collect($value)->map(fn ($item) => $this->target::from($item));
     }

app/Form/Casts/FieldCollectionCast.php

@@ -5,16 +5,16 @@ namespace App\Form\Casts;
 use App\Form\Data\FieldCollection;
 use App\Form\Fields\Field;
 use Spatie\LaravelData\Casts\Cast;
-use Spatie\LaravelData\Support\Creation\CreationContext;
 use Spatie\LaravelData\Support\DataProperty;
 
 class FieldCollectionCast implements Cast
 {
     /**
      * @param array<int, array<string, string>> $value
+     * @param array<string, mixed> $context
      * @return FieldCollection
      */
-    public function cast(DataProperty $property, mixed $value, array $properties, CreationContext $context): mixed
+    public function cast(DataProperty $property, mixed $value, array $context): mixed
     {
         return new FieldCollection(collect($value)->map(fn ($value) => Field::classFromType($value['type'])::from($value))->all());
     }

app/Form/Enums/NamiType.php

@@ -48,7 +48,7 @@ enum NamiType: string
             static::LOCATION => $member->location,
             static::NICKNAME => $member->nickname,
             static::GENDER => $member->gender?->name,
-            static::AGE => intVal($member->birthday->diffInYears(now())),
+            static::AGE => $member->birthday->diffInYears(now()),
             static::AGEEVENT => $member->birthday->diffInYears($form->from),
             static::MOBILEPHONE => $member->mobile_phone,
         };

app/Form/Models/Form.php

@@ -8,12 +8,10 @@ use App\Form\Data\FormConfigData;
 use App\Lib\Editor\Condition;
 use App\Lib\Editor\EditorData;
 use Cviebrock\EloquentSluggable\Sluggable;
-use Database\Factories\Form\Models\FormFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Laravel\Scout\Searchable;
-use Spatie\Image\Enums\Fit;
 use Spatie\Image\Manipulations;
 use Spatie\MediaLibrary\HasMedia;
 use Spatie\MediaLibrary\InteractsWithMedia;
@@ -23,7 +21,6 @@ use Zoomyboy\MedialibraryHelper\DefersUploads;
 /** @todo replace editor content with EditorData cast */
 class Form extends Model implements HasMedia
 {
-    /** @use HasFactory<FormFactory> */
     use HasFactory;
     use Sluggable;
     use InteractsWithMedia;
@@ -44,12 +41,11 @@ class Form extends Model implements HasMedia
         'needs_prevention' => 'boolean',
         'prevention_text' => EditorData::class,
         'prevention_conditions' => Condition::class,
-        'from' => 'datetime',
-        'to' => 'datetime',
-        'registration_from' => 'datetime',
-        'registration_until' => 'datetime',
     ];
 
+    /** @var array<int, string> */
+    public $dates = ['from', 'to', 'registration_from', 'registration_until'];
+
     /**
      * @return SluggableConfig
      */
@@ -77,7 +73,7 @@ class Form extends Model implements HasMedia
             ->forceFileName(fn (Form $model, string $name) => $model->slug)
             ->convert(fn () => 'jpg')
             ->registerMediaConversions(function (Media $media) {
-                $this->addMediaConversion('square')->fit(Fit::Crop, 400, 400);
+                $this->addMediaConversion('square')->fit(Manipulations::FIT_CROP, 400, 400);
             });
         $this->addMediaCollection('mailattachments')
             ->withDefaultProperties(fn () => [

app/Form/Models/Formtemplate.php

@@ -4,7 +4,6 @@ namespace App\Form\Models;
 
 use App\Form\Data\FormConfigData;
 use App\Lib\Editor\EditorData;
-use Database\Factories\Form\Models\FormtemplateFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
@@ -13,7 +12,6 @@ use Illuminate\Database\Eloquent\Model;
  */
 class Formtemplate extends Model
 {
-    /** @use HasFactory<FormtemplateFactory> */
     use HasFactory;
 
     public $guarded = [];

app/Form/Models/Participant.php

@@ -8,7 +8,6 @@ use App\Form\Mails\ConfirmRegistrationMail;
 use App\Form\Scopes\ParticipantFilterScope;
 use App\Member\Member;
 use App\Prevention\Contracts\Preventable;
-use Database\Factories\Form\Models\ParticipantFactory;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -19,8 +18,6 @@ use stdClass;
 
 class Participant extends Model implements Preventable
 {
-
-    /** @use HasFactory<ParticipantFactory> */
     use HasFactory;
 
     public $guarded = [];

app/Form/Transformers/CollectionTransformer.php

@@ -5,7 +5,6 @@ namespace App\Form\Transformers;
 use App\Form\Fields\Field;
 use Illuminate\Support\Collection;
 use Spatie\LaravelData\Support\DataProperty;
-use Spatie\LaravelData\Support\Transformation\TransformationContext;
 use Spatie\LaravelData\Transformers\Transformer;
 
 class CollectionTransformer implements Transformer
@@ -19,7 +18,7 @@ class CollectionTransformer implements Transformer
      * @param Collection<int, Field> $value
      * @return array<string, mixed>
      */
-    public function transform(DataProperty $property, mixed $value, TransformationContext $context): mixed
+    public function transform(DataProperty $property, mixed $value): mixed
     {
         return $value->toArray();
     }

app/Form/Transformers/FieldCollectionTransformer.php

@@ -5,7 +5,6 @@ namespace App\Form\Transformers;
 use App\Form\Fields\Field;
 use Illuminate\Support\Collection;
 use Spatie\LaravelData\Support\DataProperty;
-use Spatie\LaravelData\Support\Transformation\TransformationContext;
 use Spatie\LaravelData\Transformers\Transformer;
 
 class FieldCollectionTransformer implements Transformer
@@ -15,7 +14,7 @@ class FieldCollectionTransformer implements Transformer
      * @param Collection<int, Field> $value
      * @return array<string, mixed>
      */
-    public function transform(DataProperty $property, mixed $value, TransformationContext $context): mixed
+    public function transform(DataProperty $property, mixed $value): mixed
     {
         return $value->map(fn ($field) => [
             ...$field->toArray(),

app/Gender.php

@@ -3,15 +3,12 @@
 namespace App;
 
 use App\Nami\HasNamiField;
-use Database\Factories\GenderFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class Gender extends Model
 {
     use HasNamiField;
-
-    /** @use HasFactory<GenderFactory> */
     use HasFactory;
 
     public $fillable = ['name', 'nami_id'];

app/Group.php

@@ -5,7 +5,6 @@ namespace App;
 use App\Fileshare\Data\FileshareResourceData;
 use App\Group\Enums\Level;
 use App\Nami\HasNamiField;
-use Database\Factories\GroupFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -13,7 +12,6 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
 
 class Group extends Model
 {
-    /** @use HasFactory<GroupFactory> */
     use HasFactory;
     use HasNamiField;
 
@@ -26,11 +24,11 @@ class Group extends Model
     ];
 
     /**
-     * @return BelongsTo<self, self>
+     * @return BelongsTo<static, self>
      */
     public function parent(): BelongsTo
     {
-        return $this->belongsTo(self::class, 'parent_id');
+        return $this->belongsTo(static::class, 'parent_id');
     }
 
     /**
@@ -38,7 +36,7 @@ class Group extends Model
      */
     public function children(): HasMany
     {
-        return $this->hasMany(self::class, 'parent_id');
+        return $this->hasMany(static::class, 'parent_id');
     }
 
     public static function booted(): void

app/Invoice/InvoiceDocument.php

@@ -36,7 +36,7 @@ abstract class InvoiceDocument extends Document
 
     public static function fromInvoice(Invoice $invoice): self
     {
-        return static::factory()->withoutMagicalCreation()->from([
+        return static::withoutMagicalCreationFrom([
             'toName' => $invoice->to['name'],
             'toAddress' => $invoice->to['address'],
             'toZip' => $invoice->to['zip'],

app/Invoice/Models/Invoice.php

@@ -11,7 +11,6 @@ use App\Invoice\RememberDocument;
 use App\Invoice\Scopes\InvoiceFilterScope;
 use App\Member\Member;
 use App\Payment\Subscription;
-use Database\Factories\Invoice\Models\InvoiceFactory;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -21,7 +20,6 @@ use stdClass;
 
 class Invoice extends Model
 {
-    /** @use HasFactory<InvoiceFactory> */
     use HasFactory;
 
     public $guarded = [];
@@ -30,8 +28,12 @@ class Invoice extends Model
         'to' => 'json',
         'status' => InvoiceStatus::class,
         'via' => BillKind::class,
-        'sent_at' => 'datetime',
-        'last_remembered_at' => 'datetime',
+    ];
+
+    /** @var array<int, string> */
+    public $dates = [
+        'sent_at',
+        'last_remembered_at',
     ];
 
     /**

app/Invoice/Models/InvoicePosition.php

@@ -3,14 +3,12 @@
 namespace App\Invoice\Models;
 
 use App\Member\Member;
-use Database\Factories\Invoice\Models\InvoicePositionFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 class InvoicePosition extends Model
 {
-    /** @use HasFactory<InvoicePositionFactory> */
     use HasFactory;
 
     public $guarded = [];

app/Lib/Editor/Condition.php

@@ -20,12 +20,12 @@ class Condition extends Data
 
     public static function fromMedia(Media $media): self
     {
-        return $media->getCustomProperty('conditions') ? static::factory()->withoutMagicalCreation()->from($media->getCustomProperty('conditions')) : static::defaults();
+        return $media->getCustomProperty('conditions') ? static::withoutMagicalCreationFrom($media->getCustomProperty('conditions')) : static::defaults();
     }
 
     public static function defaults(): self
     {
-        return static::factory()->withoutMagicalCreation()->from(['mode' => 'any', 'ifs' => []]);
+        return static::withoutMagicalCreationFrom(['mode' => 'any', 'ifs' => []]);
     }
 
     public function hasStatements(): bool

app/Lib/Editor/ConditionResolver.php

@@ -20,7 +20,7 @@ abstract class ConditionResolver
      */
     public function filterBlock(array $block): bool
     {
-        return $this->filterCondition(Condition::factory()->withoutMagicalCreation()->from([
+        return $this->filterCondition(Condition::withoutMagicalCreationFrom([
             'mode' => data_get($block, 'tunes.condition.mode', 'any'),
             'ifs' =>  data_get($block, 'tunes.condition.ifs', []),
         ]));

app/Lib/Filter.php

@@ -36,7 +36,7 @@ abstract class Filter extends Data
      */
     public static function fromPost(?array $post = null): static
     {
-        return static::factory()->withoutMagicalCreation()->from($post ?: [])->toDefault();
+        return static::withoutMagicalCreationFrom($post ?: [])->toDefault();
     }
 
     /**

app/Lib/ScoutFilter.php

@@ -14,11 +14,9 @@ abstract class ScoutFilter extends Data
 {
 
     /**
-     * @return Builder<T>
+     * @return Builder
      */
     abstract public function getQuery(): Builder;
-
-    /** @var Builder<T> */
     protected Builder $query;
 
     /**
@@ -38,6 +36,6 @@ abstract class ScoutFilter extends Data
      */
     public static function fromPost(?array $post = null): static
     {
-        return static::factory()->withoutMagicalCreation()->from($post ?: []);
+        return static::withoutMagicalCreationFrom($post ?: []);
     }
 }

app/Maildispatcher/Models/Localmaildispatcher.php

@@ -8,6 +8,7 @@ use Illuminate\Database\Eloquent\Model;
 
 class Localmaildispatcher extends Model
 {
+    use HasFactory;
     use HasUuids;
 
     public $guarded = [];

app/Maildispatcher/Models/Maildispatcher.php

@@ -3,7 +3,6 @@
 namespace App\Maildispatcher\Models;
 
 use App\Mailgateway\Models\Mailgateway;
-use Database\Factories\Maildispatcher\Models\MaildispatcherFactory;
 use Illuminate\Database\Eloquent\Concerns\HasUuids;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -11,7 +10,6 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 class Maildispatcher extends Model
 {
-    /** @use HasFactory<MaildispatcherFactory> */
     use HasFactory;
     use HasUuids;
 

app/Mailgateway/Models/Mailgateway.php

@@ -3,14 +3,12 @@
 namespace App\Mailgateway\Models;
 
 use App\Mailgateway\Casts\TypeCast;
-use Database\Factories\Mailgateway\Models\MailgatewayFactory;
 use Illuminate\Database\Eloquent\Concerns\HasUuids;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class Mailgateway extends Model
 {
-    /** @use HasFactory<MailgatewayFactory> */
     use HasFactory;
     use HasUuids;
 

app/Mailman/Data/MailingList.php

@@ -26,7 +26,7 @@ class MailingList extends Data
     ) {
     }
 
-    public static function toFactory(): MailinglistFactory
+    public static function factory(): MailinglistFactory
     {
         return MailinglistFactory::new();
     }

app/Member/Data/NestedGroup.php

@@ -5,6 +5,7 @@ namespace App\Member\Data;
 use App\Group;
 use Illuminate\Support\Collection;
 use Spatie\LaravelData\Data;
+use Spatie\LaravelData\DataCollection;
 
 class NestedGroup extends Data
 {
@@ -22,7 +23,7 @@ class NestedGroup extends Data
         $groups = collect([]);
 
         foreach (Group::where('parent_id', $parentId)->orderBy('name')->get()->toBase() as $group) {
-            $groups->push(['name' => str_repeat('- ', $level) . $group->name, 'id' => $group->id]);
+            $groups->push(['name' => str_repeat('- ', $level).$group->name, 'id' => $group->id]);
             $groups = $groups->merge(static::forSelect($group->id, $level + 1));
         }
 
@@ -30,10 +31,10 @@ class NestedGroup extends Data
     }
 
     /**
-     * @return Collection<int, static>
+     * @return DataCollection<int, static>
      */
-    public static function cacheForSelect(): Collection
+    public static function cacheForSelect(): DataCollection
     {
-        return static::collect(static::forSelect());
+        return static::collection(static::forSelect());
     }
 }

app/Member/Member.php

@@ -33,7 +33,6 @@ use Zoomyboy\Osm\Geolocatable;
 use Zoomyboy\Osm\HasGeolocation;
 use Zoomyboy\Phone\HasPhoneNumbers;
 use App\Prevention\Enums\Prevention;
-use Database\Factories\Member\MemberFactory;
 
 /**
  * @property string $subscription_name
@@ -43,7 +42,6 @@ class Member extends Model implements Geolocatable
 {
     use Notifiable;
     use HasNamiField;
-    /** @use HasFactory<MemberFactory> */
     use HasFactory;
     use Sluggable;
     use Searchable;
@@ -60,6 +58,11 @@ class Member extends Model implements Geolocatable
      */
     public static array $namiFields = ['firstname', 'lastname', 'joined_at', 'birthday', 'send_newspaper', 'address', 'zip', 'location', 'nickname', 'other_country', 'further_address', 'main_phone', 'mobile_phone', 'work_phone', 'fax', 'email', 'email_parents', 'gender_id', 'confession_id', 'region_id', 'country_id', 'fee_id', 'nationality_id', 'slug', 'subscription_id'];
 
+    /**
+     * @var array<int, string>
+     */
+    public $dates = ['try_created_at', 'recertified_at', 'joined_at', 'birthday', 'efz', 'ps_at', 'more_ps_at', 'without_education_at', 'without_efz_at'];
+
     /**
      * @var array<string, string>
      */
@@ -79,16 +82,6 @@ class Member extends Model implements Geolocatable
         'is_leader' => 'boolean',
         'bill_kind' => BillKind::class,
         'mitgliedsnr' => 'integer',
-
-        'try_created_at' => 'datetime',
-        'recertified_at' => 'datetime',
-        'joined_at' => 'datetime',
-        'birthday' => 'datetime',
-        'efz' => 'datetime',
-        'ps_at' => 'datetime',
-        'more_ps_at' => 'datetime',
-        'without_education_at' => 'datetime',
-        'without_efz_at' => 'datetime',
     ];
 
     /**
@@ -184,7 +177,7 @@ class Member extends Model implements Geolocatable
 
     public function getAge(): ?int
     {
-        return $this->birthday ? intval($this->birthday->diffInYears(now())) : null;
+        return $this->birthday?->diffInYears(now());
     }
 
     protected function getAusstand(): int
@@ -408,14 +401,14 @@ class Member extends Model implements Geolocatable
         return $query->where('group_id', $group->id);
     }
 
-    public static function fromVcard(string $url, string $data): self
+    public static function fromVcard(string $url, string $data): static
     {
         $settings = app(NamiSettings::class);
         $card = Reader::read($data);
         [$lastname, $firstname] = $card->N->getParts();
         [$deprecated1, $deprecated2, $address, $location, $region, $zip, $country] = $card->ADR->getParts();
 
-        return new self([
+        return new static([
             'joined_at' => now(),
             'send_newspaper' => false,
             'firstname' => $firstname,

app/Member/Membership.php

@@ -6,7 +6,6 @@ use App\Activity;
 use App\Group;
 use App\Nami\HasNamiField;
 use App\Subactivity;
-use Database\Factories\Member\MembershipFactory;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -17,7 +16,6 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
  */
 class Membership extends Model
 {
-    /** @use HasFactory<MembershipFactory> */
     use HasFactory;
     use HasNamiField;
 

app/Nationality.php

@@ -3,13 +3,11 @@
 namespace App;
 
 use App\Nami\HasNamiField;
-use Database\Factories\NationalityFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class Nationality extends Model
 {
-    /** @use HasFactory<NationalityFactory> */
     use HasFactory;
     use HasNamiField;
 

app/Payment/Subscription.php

@@ -3,7 +3,6 @@
 namespace App\Payment;
 
 use App\Fee;
-use Database\Factories\Payment\SubscriptionFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -11,7 +10,6 @@ use Illuminate\Database\Eloquent\Relations\HasMany;
 
 class Subscription extends Model
 {
-    /** @use HasFactory<SubscriptionFactory> */
     use HasFactory;
 
     /**

app/Payment/SubscriptionChild.php

@@ -2,14 +2,12 @@
 
 namespace App\Payment;
 
-use Database\Factories\Payment\SubscriptionChildFactory;
 use Illuminate\Database\Eloquent\Concerns\HasUuids;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class SubscriptionChild extends Model
 {
-    /** @use HasFactory<SubscriptionChildFactory> */
     use HasFactory;
     use HasUuids;
 

app/Providers/AppServiceProvider.php

@@ -21,6 +21,7 @@ class AppServiceProvider extends ServiceProvider
     public function register()
     {
         JsonResource::withoutWrapping();
+        Telescope::ignoreMigrations();
 
         \Inertia::share('search', request()->query('search', ''));
 

app/Region.php

@@ -2,14 +2,12 @@
 
 namespace App;
 
-use Database\Factories\RegionFactory;
 use Illuminate\Support\Collection;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class Region extends Model
 {
-    /** @use HasFactory<RegionFactory> */
     use HasFactory;
     public $timestamps = false;
 

app/Subactivity.php

@@ -4,14 +4,12 @@ namespace App;
 
 use App\Nami\HasNamiField;
 use Cviebrock\EloquentSluggable\Sluggable;
-use Database\Factories\UserFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 
 class Subactivity extends Model
 {
-    /** @use HasFactory<UserFactory> */
     use HasFactory;
     use HasNamiField;
     use Sluggable;

app/User.php

@@ -3,14 +3,12 @@
 namespace App;
 
 use App\Auth\ResetPassword;
-use Database\Factories\UserFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
 
 class User extends Authenticatable
 {
-    /** @use HasFactory<UserFactory> */
     use HasFactory;
     use Notifiable;
 

composer.json

@@ -45,34 +45,35 @@
     ],
     "license": "MIT",
     "require": {
-        "php": "^8.3",
+        "php": "^8.1",
         "barryvdh/laravel-debugbar": "^3.9",
-        "cviebrock/eloquent-sluggable": "^11.0",
+        "beyondcode/laravel-dump-server": "^1.8",
+        "cviebrock/eloquent-sluggable": "^9.0",
         "doctrine/dbal": "^3.1",
         "guzzlehttp/guzzle": "^7.0.1",
-        "inertiajs/inertia-laravel": "^1.0",
-        "laravel/framework": "^11.0",
+        "inertiajs/inertia-laravel": "^0.6.9",
+        "laravel/framework": "^9.0",
         "laravel/horizon": "^5.0",
-        "laravel/pail": "^1.1",
-        "laravel/passport": "^12.8",
-        "laravel/scout": "^10.8",
-        "laravel/telescope": "^5.0",
+        "laravel/passport": "^11.8",
+        "laravel/scout": "^9.8",
+        "laravel/telescope": "^4.13",
         "laravel/tinker": "^2.0",
-        "laravel/ui": "^4.0",
+        "laravel/ui": "^3.0",
         "league/csv": "^9.9",
-        "league/flysystem-webdav": "dev-master as 3.28.0",
         "lorisleiva/laravel-actions": "^2.4",
         "meilisearch/meilisearch-php": "^1.6",
         "monicahq/laravel-sabre": "^1.6",
-        "nunomaduro/collision": "^8.1",
+        "nunomaduro/collision": "^6.1",
         "phake/phake": "^4.2",
         "pusher/pusher-php-server": "^7.2",
-        "spatie/laravel-data": "^4.0",
-        "spatie/laravel-ignition": "^2.0",
-        "spatie/laravel-settings": "^3.0",
-        "worksome/request-factories": "^3.0",
+        "spatie/laravel-data": "^3.0",
+        "spatie/laravel-ignition": "^1.0",
+        "spatie/laravel-medialibrary": "^10.0",
+        "spatie/laravel-settings": "^2.2",
+        "worksome/request-factories": "^2.5",
         "zoomyboy/laravel-nami": "dev-master",
         "zoomyboy/medialibrary-helper": "dev-master as 1.0",
+        "league/flysystem-webdav": "dev-master as 3.28.0",
         "zoomyboy/osm": "1.0.3",
         "zoomyboy/phone": "^1.0",
         "zoomyboy/table-document": "dev-master as 1.0",
@@ -80,12 +81,12 @@
     },
     "require-dev": {
         "fakerphp/faker": "^1.9.1",
-        "larastan/larastan": "^2.0",
         "laravel/envoy": "^2.8",
         "mockery/mockery": "^1.4.4",
-        "orchestra/testbench": "^9.0",
-        "pestphp/pest": "^3.0",
-        "phpstan/phpstan-mockery": "^1.1"
+        "larastan/larastan": "^2.0",
+        "orchestra/testbench": "^7.0",
+        "phpstan/phpstan-mockery": "^1.1",
+        "phpunit/phpunit": "^9.5.10"
     },
     "config": {
         "optimize-autoloader": true,

database/migrations/2024_09_21_222459_update_settings_table.php

@@ -1,36 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        Schema::table('settings', function (Blueprint $table): void {
-            $table->boolean('locked')->default(false)->change();
-
-            $table->unique(['group', 'name']);
-
-            $table->dropIndex(['group']);
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::table('settings', function (Blueprint $table): void {
-            $table->boolean('locked')->default(null)->change();
-
-            $table->dropUnique(['group', 'name']);
-
-            $table->index('group');
-        });
-    }
-};

packages/laravel-nami

@@ -1 +1 @@
-Subproject commit bc61530e510b3d41048984b7cf20b6d82c4f85fb
+Subproject commit 84103d40521d77f936635a7f992cf1ae4b01dafe

packages/medialibrary-helper

@@ -1 +1 @@
-Subproject commit 77cfe9bbc7a11ee6494b205458ac5c75ff5c166d
+Subproject commit 59d7647720ab2791e954944b38c986143db9de8e

packages/table-document

@@ -1 +1 @@
-Subproject commit 7304963370ff64fb5accf08da4864981cc424301
+Subproject commit 8aefd17b06ee3c26d00b472a154a48898b884d15

phpstan.neon

@@ -10,6 +10,7 @@ parameters:
 
     paths:
         - app
+        - tests
         - database
         - packages/tex/src
         - packages/laravel-nami/src
@@ -28,11 +29,6 @@ parameters:
         AddressBookCard: 'array{lastmodified: int, etag: string, uri: string, id: int, size: int}'
 
     ignoreErrors:
-        -
-            message: "#but does not specify its types: TData#"
-
-        -
-            message: "#cast\\(\\) has parameter \\$properties#"
         -
             message: "#^Method App\\\\Activity\\:\\:sluggable\\(\\) return type has no value type specified in iterable type array\\.$#"
             count: 1
@@ -63,6 +59,11 @@ parameters:
             count: 1
             path: app/Member/Member.php
 
+        -
+            message: "#^Unsafe usage of new static\\(\\)\\.$#"
+            count: 1
+            path: app/Member/Member.php
+
         -
             message: "#^Method App\\\\Member\\\\MemberRequest\\:\\:rules\\(\\) return type has no value type specified in iterable type array\\.$#"
             count: 1
@@ -393,6 +394,16 @@ parameters:
             count: 1
             path: tests/Feature/Member/DavTest.php
 
+        -
+            message: "#^Access to an undefined property Illuminate\\\\Database\\\\Eloquent\\\\Model\\:\\:\\$email\\.$#"
+            count: 2
+            path: app/Maildispatcher/Actions/ResyncAction.php
+
+        -
+            message: "#^Access to an undefined property Illuminate\\\\Database\\\\Eloquent\\\\Model\\:\\:\\$email_parents\\.$#"
+            count: 2
+            path: app/Maildispatcher/Actions/ResyncAction.php
+
         -
             message: "#^Unable to resolve the template type TKey in call to function collect$#"
             count: 2
@@ -502,8 +513,3 @@ parameters:
             message: "#^Call to an undefined method Phake\\\\Proxies\\\\VerifierProxy\\:\\:handle\\(\\)\\.$#"
             count: 2
             path: tests/Feature/Member/NamiPutMemberActionTest.php
-
-        -
-            message: "#^Call to an undefined method Illuminate\\\\Database\\\\Eloquent\\\\Relations\\\\Relation\\<\\*, \\*, \\*\\>\\:\\:isTrying\\(\\)\\.$#"
-            count: 1
-            path: app/Membership/TestersBlock.php

phpunit.xml

@@ -1,38 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" bootstrap="vendor/autoload.php" colors="true" cacheDirectory=".phpunit.cache">
-  <testsuites>
-    <testsuite name="Unit">
-      <directory suffix="Test.php">./tests/Unit</directory>
-    </testsuite>
-    <testsuite name="Feature">
-      <directory suffix="Test.php">./tests/Feature</directory>
-    </testsuite>
-    <testsuite name="Fileshare">
-      <directory suffix="Test.php">./tests/Fileshare</directory>
-    </testsuite>
-    <testsuite name="Arch">
-      <file>tests/Arch.php</file>
-    </testsuite>
-    <testsuite name="NamiUnit">
-      <directory suffix="Test.php">./packages/laravel-nami/tests/Unit</directory>
-    </testsuite>
-    <testsuite name="EndToEnd">
-      <directory suffix="Test.php">./tests/EndToEnd</directory>
-    </testsuite>
-  </testsuites>
-  <php>
-    <server name="APP_ENV" value="testing"/>
-    <server name="BCRYPT_ROUNDS" value="4"/>
-    <server name="CACHE_DRIVER" value="array"/>
-    <server name="BROADCAST_DRIVER" value="log"/>
-    <server name="MAIL_MAILER" value="array"/>
-    <server name="QUEUE_CONNECTION" value="sync"/>
-    <server name="SESSION_DRIVER" value="array"/>
-    <server name="TELESCOPE_ENABLED" value="false"/>
-  </php>
-  <source>
-    <include>
-      <directory suffix=".php">./app</directory>
-    </include>
-  </source>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
+         colors="true">
+    <testsuites>
+        <testsuite name="Unit">
+            <directory suffix="Test.php">./tests/Unit</directory>
+        </testsuite>
+        <testsuite name="Feature">
+            <directory suffix="Test.php">./tests/Feature</directory>
+        </testsuite>
+        <testsuite name="Fileshare">
+            <directory suffix="Test.php">./tests/Fileshare</directory>
+        </testsuite>
+        <testsuite name="NamiUnit">
+            <directory suffix="Test.php">./packages/laravel-nami/tests/Unit</directory>
+        </testsuite>
+        <testsuite name="EndToEnd">
+            <directory suffix="Test.php">./tests/EndToEnd</directory>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <whitelist processUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">./app</directory>
+        </whitelist>
+    </filter>
+    <php>
+        <server name="APP_ENV" value="testing"/>
+        <server name="BCRYPT_ROUNDS" value="4"/>
+        <server name="CACHE_DRIVER" value="array"/>
+        <server name="BROADCAST_DRIVER" value="log"/>
+        <server name="MAIL_MAILER" value="array"/>
+        <server name="QUEUE_CONNECTION" value="sync"/>
+        <server name="SESSION_DRIVER" value="array"/>
+        <server name="TELESCOPE_ENABLED" value="false"/>
+    </php>
 </phpunit>

resources/js/views/dashboard/VIndex.vue

@@ -2,7 +2,7 @@
     <page-layout>
         <div class="gap-6 md:grid-cols-2 xl:grid-cols-4 grid p-6">
             <v-block v-for="(block, index) in blocks" :key="index" :title="block.title">
-                <component :is="block.component" :data="block.data"></component>
+                <component :data="block.data" :is="block.component"></component>
             </v-block>
         </div>
     </page-layout>

routes/web.php

@@ -17,6 +17,7 @@ use App\Course\Actions\CourseIndexAction;
 use App\Course\Actions\CourseStoreAction;
 use App\Invoice\Actions\InvoiceStoreAction;
 use App\Course\Actions\CourseUpdateAction;
+use App\Dashboard\Actions\IndexAction as DashboardIndexAction;
 use App\Efz\ShowEfzDocumentAction;
 use App\Fileshare\Actions\FileshareApiIndexAction;
 use App\Fileshare\Actions\FileshareStoreAction;
@@ -83,6 +84,7 @@ Route::group(['namespace' => 'App\\Http\\Controllers'], function (): void {
 });
 
 Route::group(['middleware' => 'auth:web'], function (): void {
+    Route::get('/', DashboardIndexAction::class)->name('home');
     Route::post('/nami/login-check', NamiLoginCheckAction::class)->name('nami.login-check');
     Route::post('/nami/get-search-layer', NamiGetSearchLayerAction::class)->name('nami.get-search-layer');
     Route::post('/nami/search', NamiSearchAction::class)->name('nami.search');

tests/Arch.php

@@ -1,6 +0,0 @@
-<?php
-
-arch()
-    ->expect('App')
-    ->not->toUse(['die', 'dd', 'dump'])
-    ->not->toHaveFileSystemPermissions('0777');

tests/EndToEnd/Form/FormApiListActionTest.php

@@ -3,126 +3,134 @@
 namespace Tests\EndToEnd\Form;
 
 use App\Form\Models\Form;
-use App\Membership\TestersBlock;
 use App\Subactivity;
 use Carbon\Carbon;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Support\Facades\Storage;
 use Tests\Feature\Form\FormtemplateSectionRequest;
 use Tests\RequestFactories\EditorRequestFactory;
-use Tests\TestCase;
 
-uses(FormTestCase::class);
-uses(DatabaseTransactions::class);
+class FormApiListActionTest extends FormTestCase
+{
 
-it('testItDisplaysForms', function () {
-    Carbon::setTestNow(Carbon::parse('2023-03-02'));
-    Storage::fake('temp');
-    $this->loginNami()->withoutExceptionHandling();
-    $form = Form::factory()
-        ->name('lala 2')
-        ->excerpt('fff')
-        ->withImage('headerImage', 'lala-2.jpg')
-        ->description(EditorRequestFactory::new()->text(10, 'desc'))
-        ->from('2023-05-05')
-        ->to('2023-06-07')
-        ->sections([FormtemplateSectionRequest::new()->name('sname')])
-        ->create();
+    use DatabaseTransactions;
 
-    sleep(1);
-    $this->get('/api/form?perPage=15')
-        ->assertOk()
-        ->assertJsonPath('data.0.name', 'lala 2')
-        ->assertJsonPath('data.0.config.sections.0.name', 'sname')
-        ->assertJsonPath('data.0.id', $form->id)
-        ->assertJsonPath('data.0.excerpt', 'fff')
-        ->assertJsonPath('data.0.description.blocks.0.data.text', 'desc')
-        ->assertJsonPath('data.0.slug', 'lala-2')
-        ->assertJsonPath('data.0.image', $form->getMedia('headerImage')->first()->getFullUrl('square'))
-        ->assertJsonPath('data.0.dates', '05.05.2023 - 07.06.2023')
-        ->assertJsonPath('data.0.from_human', '05.05.2023')
-        ->assertJsonPath('data.0.to_human', '07.06.2023')
-        ->assertJsonPath('meta.per_page', 15)
-        ->assertJsonPath('meta.base_url', url(''))
-        ->assertJsonPath('meta.total', 1);
-});
+    public function testItDisplaysForms(): void
+    {
+        Carbon::setTestNow(Carbon::parse('2023-03-02'));
+        Storage::fake('temp');
+        $this->loginNami()->withoutExceptionHandling();
+        $form = Form::factory()
+            ->name('lala 2')
+            ->excerpt('fff')
+            ->withImage('headerImage', 'lala-2.jpg')
+            ->description(EditorRequestFactory::new()->text(10, 'desc'))
+            ->from('2023-05-05')
+            ->to('2023-06-07')
+            ->sections([FormtemplateSectionRequest::new()->name('sname')])
+            ->create();
 
-it('testItDisplaysDefaultValueOfField', function () {
-    Storage::fake('temp');
-    $this->loginNami()->withoutExceptionHandling();
-    Form::factory()->withImage('headerImage', 'lala-2.jpg')
-        ->sections([FormtemplateSectionRequest::new()->fields([$this->textField()])])
-        ->create();
+        sleep(1);
+        $this->get('/api/form?perPage=15')
+            ->assertOk()
+            ->assertJsonPath('data.0.name', 'lala 2')
+            ->assertJsonPath('data.0.config.sections.0.name', 'sname')
+            ->assertJsonPath('data.0.id', $form->id)
+            ->assertJsonPath('data.0.excerpt', 'fff')
+            ->assertJsonPath('data.0.description.blocks.0.data.text', 'desc')
+            ->assertJsonPath('data.0.slug', 'lala-2')
+            ->assertJsonPath('data.0.image', $form->getMedia('headerImage')->first()->getFullUrl('square'))
+            ->assertJsonPath('data.0.dates', '05.05.2023 - 07.06.2023')
+            ->assertJsonPath('data.0.from_human', '05.05.2023')
+            ->assertJsonPath('data.0.to_human', '07.06.2023')
+            ->assertJsonPath('meta.per_page', 15)
+            ->assertJsonPath('meta.base_url', url(''))
+            ->assertJsonPath('meta.total', 1);
+    }
 
-    sleep(1);
-    $this->get('/api/form?perPage=15')->assertJsonPath('data.0.config.sections.0.fields.0.value', null);
-});
+    public function testItDisplaysDefaultValueOfField(): void
+    {
+        Storage::fake('temp');
+        $this->loginNami()->withoutExceptionHandling();
+        Form::factory()->withImage('headerImage', 'lala-2.jpg')
+            ->sections([FormtemplateSectionRequest::new()->fields([$this->textField()])])
+            ->create();
 
-it('testItDisplaysRemoteGroups', function () {
-    $this->loginNami()->withoutExceptionHandling();
-    Subactivity::factory()->inNami(1)->name('Wölfling')->ageGroup(true)->create();
-    Subactivity::factory()->inNami(50)->name('Biber')->ageGroup(false)->create();
-    Subactivity::factory()->name('Lager')->ageGroup(true)->create();
+        sleep(1);
+        $this->get('/api/form?perPage=15')->assertJsonPath('data.0.config.sections.0.fields.0.value', null);
+    }
 
-    sleep(1);
-    $this->get('/api/form?perPage=15')
-        ->assertJsonPath('meta.agegroups.0', ['id' => 1, 'name' => 'Wölfling'])
-        ->assertJsonCount(1, 'meta.agegroups');
-});
+    public function testItDisplaysRemoteGroups(): void
+    {
+        $this->loginNami()->withoutExceptionHandling();
+        Subactivity::factory()->inNami(1)->name('Wölfling')->ageGroup(true)->create();
+        Subactivity::factory()->inNami(50)->name('Biber')->ageGroup(false)->create();
+        Subactivity::factory()->name('Lager')->ageGroup(true)->create();
 
-it('testItDoesntDisplayInactiveForms', function () {
-    $this->loginNami()->withoutExceptionHandling();
+        sleep(1);
+        $this->get('/api/form?perPage=15')
+            ->assertJsonPath('meta.agegroups.0', ['id' => 1, 'name' => 'Wölfling'])
+            ->assertJsonCount(1, 'meta.agegroups');
+    }
 
-    Form::factory()->isActive(false)->withImage('headerImage', 'lala-2.jpg')->count(1)->create();
-    Form::factory()->isActive(true)->withImage('headerImage', 'lala-2.jpg')->count(2)->create();
+    public function testItDoesntDisplayInactiveForms(): void
+    {
+        $this->loginNami()->withoutExceptionHandling();
 
-    sleep(1);
-    $this->get('/api/form?perPage=15&filter=' . $this->filterString(['inactive' => true]))->assertJsonCount(3, 'data');
-    $this->get('/api/form?perPage=15&filter=' . $this->filterString(['inactive' => false]))->assertJsonCount(2, 'data');
-    $this->get('/api/form?perPage=15&filter=' . $this->filterString([]))->assertJsonCount(2, 'data')
-        ->assertJsonPath('data.0.is_active', true)
-        ->assertJsonPath('data.0.is_private', false);
-});
+        Form::factory()->isActive(false)->withImage('headerImage', 'lala-2.jpg')->count(1)->create();
+        Form::factory()->isActive(true)->withImage('headerImage', 'lala-2.jpg')->count(2)->create();
 
-it('testItDisplaysDailyForms', function () {
-    Carbon::setTestNow(Carbon::parse('2023-03-02'));
-    $this->loginNami()->withoutExceptionHandling();
-    Form::factory()
-        ->withImage('headerImage', 'lala-2.jpg')
-        ->from('2023-05-05')
-        ->to('2023-05-05')
-        ->create();
+        sleep(1);
+        $this->get('/api/form?perPage=15&filter=' . $this->filterString(['inactive' => true]))->assertJsonCount(3, 'data');
+        $this->get('/api/form?perPage=15&filter=' . $this->filterString(['inactive' => false]))->assertJsonCount(2, 'data');
+        $this->get('/api/form?perPage=15&filter=' . $this->filterString([]))->assertJsonCount(2, 'data')
+            ->assertJsonPath('data.0.is_active', true)
+            ->assertJsonPath('data.0.is_private', false);
+    }
 
-    sleep(1);
-    $this->get('/api/form')
-        ->assertJsonPath('data.0.dates', '05.05.2023');
-});
+    public function testItDisplaysDailyForms(): void
+    {
+        Carbon::setTestNow(Carbon::parse('2023-03-02'));
+        $this->loginNami()->withoutExceptionHandling();
+        Form::factory()
+            ->withImage('headerImage', 'lala-2.jpg')
+            ->from('2023-05-05')
+            ->to('2023-05-05')
+            ->create();
 
-it('testItDisplaysPastEvents', function () {
-    Carbon::setTestNow(Carbon::parse('2023-05-10'));
-    $this->loginNami()->withoutExceptionHandling();
-    Form::factory()
-        ->withImage('headerImage', 'lala-2.jpg')
-        ->from('2023-05-05')
-        ->to('2023-05-05')
-        ->create();
+        sleep(1);
+        $this->get('/api/form')
+            ->assertJsonPath('data.0.dates', '05.05.2023');
+    }
 
-    sleep(1);
-    $this->get('/api/form?filter=' . $this->filterString(['past' => true]))
-        ->assertJsonCount(1, 'data');
-});
+    public function testItDisplaysPastEvents(): void
+    {
+        Carbon::setTestNow(Carbon::parse('2023-05-10'));
+        $this->loginNami()->withoutExceptionHandling();
+        Form::factory()
+            ->withImage('headerImage', 'lala-2.jpg')
+            ->from('2023-05-05')
+            ->to('2023-05-05')
+            ->create();
 
-it('testItDisplaysAllForms', function () {
-    Carbon::setTestNow(Carbon::parse('2023-03-02'));
-    Storage::fake('temp');
-    $this->loginNami()->withoutExceptionHandling();
-    Form::factory()
-        ->withImage('headerImage', 'lala-2.jpg')
-        ->from('2023-05-05')
-        ->to('2023-06-07')
-        ->count(20)
-        ->create();
+        sleep(1);
+        $this->get('/api/form?filter=' . $this->filterString(['past' => true]))
+            ->assertJsonCount(1, 'data');
+    }
 
-    sleep(1);
-    $this->get('/api/form')->assertJsonCount(20, 'data');
-});
+    public function testItDisplaysAllForms(): void
+    {
+        Carbon::setTestNow(Carbon::parse('2023-03-02'));
+        Storage::fake('temp');
+        $this->loginNami()->withoutExceptionHandling();
+        Form::factory()
+            ->withImage('headerImage', 'lala-2.jpg')
+            ->from('2023-05-05')
+            ->to('2023-06-07')
+            ->count(20)
+            ->create();
+
+        sleep(1);
+        $this->get('/api/form')->assertJsonCount(20, 'data');
+    }
+}

tests/EndToEndTestCase.php

@@ -13,7 +13,7 @@ abstract class EndToEndTestCase extends TestCase
 {
     use DatabaseMigrations;
 
-    protected function setUp(): void
+    public function setUp(): void
     {
         parent::setUp();
 

tests/Feature/Activity/EditTest.php

@@ -5,38 +5,43 @@ namespace Tests\Feature\Activity;
 use App\Activity;
 use App\Subactivity;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Tests\TestCase;
 
-uses(DatabaseTransactions::class);
+class EditTest extends TestCase
+{
+    use DatabaseTransactions;
 
-it('testItEditsAnActivity', function () {
-    $this->login()->loginNami()->withoutExceptionHandling();
-    $activity = Activity::factory()->name('Asas')->hasAttached(Subactivity::factory()->name('Pupu')->filterable())->create();
+    public function testItEditsAnActivity(): void
+    {
+        $this->login()->loginNami()->withoutExceptionHandling();
+        $activity = Activity::factory()->name('Asas')->hasAttached(Subactivity::factory()->name('Pupu')->filterable())->create();
 
-    $response = $this->get(route('activity.edit', ['activity' => $activity]));
+        $response = $this->get(route('activity.edit', ['activity' => $activity]));
 
-    $this->assertInertiaHas([
-        'name' => 'Asas',
-        'is_filterable' => false,
-        'subactivities' => [$activity->subactivities->first()->id],
-        'subactivity_model' => [
-            'activities' => [$activity->id],
-            'is_age_group' => false,
+        $this->assertInertiaHas([
+            'name' => 'Asas',
             'is_filterable' => false,
-            'name' => '',
-        ],
-    ], $response, 'data');
-    $this->assertInertiaHas([
-        'id' => $activity->subactivities->first()->id,
-        'name' => 'Pupu',
-        'is_filterable' => true,
-    ], $response, 'meta.subactivities.0');
-    $this->assertInertiaHas([
-        'id' => $activity->subactivities->first()->id,
-        'name' => 'Pupu',
-        'is_filterable' => true,
-        'links' => [
-            'show' => route('api.subactivity.show', ['subactivity' => $activity->subactivities->first()->id]),
-            'update' => route('api.subactivity.update', ['subactivity' => $activity->subactivities->first()->id]),
-        ],
-    ], $response, 'meta.subactivities.0');
-});
+            'subactivities' => [$activity->subactivities->first()->id],
+            'subactivity_model' => [
+                'activities' => [$activity->id],
+                'is_age_group' => false,
+                'is_filterable' => false,
+                'name' => '',
+            ],
+        ], $response, 'data');
+        $this->assertInertiaHas([
+            'id' => $activity->subactivities->first()->id,
+            'name' => 'Pupu',
+            'is_filterable' => true,
+        ], $response, 'meta.subactivities.0');
+        $this->assertInertiaHas([
+            'id' => $activity->subactivities->first()->id,
+            'name' => 'Pupu',
+            'is_filterable' => true,
+            'links' => [
+                'show' => route('api.subactivity.show', ['subactivity' => $activity->subactivities->first()->id]),
+                'update' => route('api.subactivity.update', ['subactivity' => $activity->subactivities->first()->id]),
+            ],
+        ], $response, 'meta.subactivities.0');
+    }
+}

tests/Feature/Activity/UpdateTest.php

@@ -3,210 +3,178 @@
 namespace Tests\Feature\Activity;
 
 use App\Activity;
-use App\Activity\Actions\ActivityUpdateAction;
 use App\Member\Member;
 use App\Member\Membership;
 use App\Subactivity;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Tests\TestCase;
 
-covers(ActivityUpdateAction::class);
+class UpdateTest extends TestCase
+{
+    use DatabaseTransactions;
 
-uses(DatabaseTransactions::class);
+    public function testItCannotUpdateAnActivityFromNami(): void
+    {
+        $this->login()->loginNami();
+        $activity = Activity::factory()->inNami(67)->name('abc')->create();
 
-it('testItCannotUpdateAnActivityFromNami', function () {
-    $this->login()->loginNami();
-    $activity = Activity::factory()->inNami(67)->name('abc')->create();
+        $response = $this->patch(route('activity.update', ['activity' => $activity]), [
+            'name' => 'Lorem',
+            'is_filterable' => false,
+            'subactivities' => [],
+        ]);
 
-    $response = $this->patch(route('activity.update', ['activity' => $activity]), [
-        'name' => 'Lorem',
-        'is_filterable' => false,
-        'subactivities' => [],
-    ]);
+        $response->assertSessionHasErrors(['nami_id' => 'Aktivität ist in NaMi. Update des Namens nicht möglich.']);
+    }
 
-    $response->assertSessionHasErrors(['nami_id' => 'Aktivität ist in NaMi. Update des Namens nicht möglich.']);
-});
+    public function testItCanUpdateSubactivitiesOfNamiActivity(): void
+    {
+        $this->login()->loginNami();
+        $activity = Activity::factory()->inNami(67)->name('abc')->create();
+        $subactivity = Subactivity::factory()->create();
 
-it('testItCanUpdateSubactivitiesOfNamiActivity', function () {
-    $this->login()->loginNami();
-    $activity = Activity::factory()->inNami(67)->name('abc')->create();
-    $subactivity = Subactivity::factory()->create();
+        $this->patch(route('activity.update', ['activity' => $activity]), [
+            'name' => 'abc',
+            'is_filterable' => false,
+            'subactivities' => [$subactivity->id],
+        ]);
 
-    $this->patch(route('activity.update', ['activity' => $activity]), [
-        'name' => 'abc',
-        'is_filterable' => false,
-        'subactivities' => [$subactivity->id],
-    ]);
+        $this->assertDatabaseHas('activity_subactivity', ['activity_id' => $activity->id, 'subactivity_id' => $subactivity->id]);
+    }
 
-    $this->assertDatabaseHas('activity_subactivity', ['activity_id' => $activity->id, 'subactivity_id' => $subactivity->id]);
-});
+    public function testItCannotRemoveANamiSubactivityFromANamiActivity(): void
+    {
+        $this->login()->loginNami();
+        $activity = Activity::factory()->inNami(67)->name('abc')->has(Subactivity::factory()->inNami(69))->create();
 
-it('testItCannotRemoveANamiSubactivityFromANamiActivity', function () {
-    $this->login()->loginNami();
-    $activity = Activity::factory()->inNami(67)->name('abc')->has(Subactivity::factory()->inNami(69))->create();
+        $response = $this->patch(route('activity.update', ['activity' => $activity]), [
+            'name' => 'abc',
+            'is_filterable' => false,
+            'subactivities' => [],
+        ]);
 
-    $response = $this->patch(route('activity.update', ['activity' => $activity]), [
-        'name' => 'abc',
-        'is_filterable' => false,
-        'subactivities' => [],
-    ]);
+        $response->assertSessionHasErrors(['nami_id' => 'Untertätigkeit kann nicht entfernt werden.']);
+    }
 
-    $response->assertSessionHasErrors(['nami_id' => 'Untertätigkeit kann nicht entfernt werden.']);
-});
+    public function testItCannotAddANamiSubactivityToANamiActivity(): void
+    {
+        $this->login()->loginNami();
+        $activity = Activity::factory()->inNami(67)->name('abc')->create();
+        $subactivity = Subactivity::factory()->inNami(60)->create();
 
-it('testItCannotAddANamiSubactivityToANamiActivity', function () {
-    $this->login()->loginNami();
-    $activity = Activity::factory()->inNami(67)->name('abc')->create();
-    $subactivity = Subactivity::factory()->inNami(60)->create();
+        $response = $this->patch(route('activity.update', ['activity' => $activity]), [
+            'name' => 'abc',
+            'is_filterable' => false,
+            'subactivities' => [$subactivity->id],
+        ]);
 
-    $response = $this->patch(route('activity.update', ['activity' => $activity]), [
-        'name' => 'abc',
-        'is_filterable' => false,
-        'subactivities' => [$subactivity->id],
-    ]);
+        $response->assertSessionHasErrors(['nami_id' => 'Untertätigkeit kann nicht hinzugefügt werden.']);
+    }
 
-    $response->assertSessionHasErrors(['nami_id' => 'Untertätigkeit kann nicht hinzugefügt werden.']);
-});
+    public function testItCannotRemoveANamiSubactivityFromANamiActivityAndSetAnother(): void
+    {
+        $this->login()->loginNami();
+        $activity = Activity::factory()->inNami(67)->name('abc')->has(Subactivity::factory()->inNami(69))->create();
+        $otherSubactivity = Subactivity::factory()->create();
 
-it('test it cannot set subactivity to a string', function () {
-    $this->login()->loginNami();
-    $activity = Activity::factory()->create();
+        $response = $this->patch(route('activity.update', ['activity' => $activity]), [
+            'name' => 'abc',
+            'is_filterable' => false,
+            'subactivities' => [$otherSubactivity->id],
+        ]);
 
-    $this->patch(route('activity.update', ['activity' => $activity]), [
-        'name' => 'abc',
-        'is_filterable' => false,
-        'subactivities' => ['AAA'],
-    ])->assertSessionHasErrors('subactivities.0');
-});
+        $response->assertSessionHasErrors(['nami_id' => 'Untertätigkeit kann nicht entfernt werden.']);
+    }
 
+    public function testNameIsRequired(): void
+    {
+        $this->login()->loginNami();
+        $activity = Activity::factory()->create();
 
-it('testItCannotRemoveANamiSubactivityFromANamiActivityAndSetAnother', function () {
-    $this->login()->loginNami();
-    $activity = Activity::factory()->inNami(67)->name('abc')->has(Subactivity::factory()->inNami(69))->create();
-    $otherSubactivity = Subactivity::factory()->create();
+        $response = $this->patch(route('activity.update', ['activity' => $activity]), [
+            'name' => '',
+            'is_filterable' => true,
+        ]);
 
-    $response = $this->patch(route('activity.update', ['activity' => $activity]), [
-        'name' => 'abc',
-        'is_filterable' => false,
-        'subactivities' => [$otherSubactivity->id],
-    ]);
+        $response->assertSessionHasErrors(['name' => 'Name ist erforderlich.']);
+        $response->assertSessionHasErrors(['subactivities' => 'Untergliederungen muss vorhanden sein.']);
+    }
 
-    $response->assertSessionHasErrors(['nami_id' => 'Untertätigkeit kann nicht entfernt werden.']);
-});
+    public function testItUpdatesName(): void
+    {
+        $this->login()->loginNami();
+        $activity = Activity::factory()->name('UUU')->create();
 
-it('testNameIsRequired', function () {
-    $this->login()->loginNami();
-    $activity = Activity::factory()->create();
+        $response = $this->patch(route('activity.update', ['activity' => $activity]), [
+            'name' => 'Lorem',
+            'is_filterable' => true,
+            'subactivities' => [],
+        ]);
 
-    $response = $this->patch(route('activity.update', ['activity' => $activity]), [
-        'name' => '',
-        'is_filterable' => true,
-    ]);
+        $response->assertRedirect('/activity');
+        $this->assertDatabaseHas('activities', ['name' => 'Lorem', 'is_filterable' => true]);
+    }
 
-    $response->assertSessionHasErrors(['name' => 'Name ist erforderlich.']);
-    $response->assertSessionHasErrors(['subactivities' => 'Untergliederungen muss vorhanden sein.']);
-});
+    public function testItSetsSubactivities(): void
+    {
+        $this->login()->loginNami();
+        $activity = Activity::factory()->create();
+        $subactivity = Subactivity::factory()->create();
 
-it('testItUpdatesName', function () {
-    $this->login()->loginNami();
-    $activity = Activity::factory()->name('UUU')->create();
+        $this->patch(route('activity.update', ['activity' => $activity]), [
+            'name' => 'Lorem',
+            'is_filterable' => false,
+            'subactivities' => [$subactivity->id],
+        ]);
 
-    $response = $this->patch(route('activity.update', ['activity' => $activity]), [
-        'name' => 'Lorem',
-        'is_filterable' => true,
-        'subactivities' => [],
-    ]);
+        $this->assertDatabaseHas('activity_subactivity', ['activity_id' => $activity->id, 'subactivity_id' => $subactivity->id]);
+    }
 
-    $response->assertRedirect('/activity');
-    $this->assertDatabaseHas('activities', ['name' => 'Lorem', 'is_filterable' => true]);
-});
+    public function testItCannotSetNamiId(): void
+    {
+        $this->login()->loginNami();
+        $activity = Activity::factory()->create();
 
-it('testItSetsSubactivities', function () {
-    $this->login()->loginNami();
-    $activity = Activity::factory()->create();
-    $subactivity = Subactivity::factory()->create();
+        $this->patch(route('activity.update', ['activity' => $activity]), [
+            'name' => 'Lorem',
+            'nami_id' => 66,
+            'is_filterable' => false,
+            'subactivities' => [],
+        ]);
 
-    $this->patch(route('activity.update', ['activity' => $activity]), [
-        'name' => 'Lorem',
-        'is_filterable' => false,
-        'subactivities' => [$subactivity->id],
-    ]);
+        $this->assertDatabaseHas('activities', ['nami_id' => null]);
+    }
 
-    $this->assertDatabaseHas('activity_subactivity', ['activity_id' => $activity->id, 'subactivity_id' => $subactivity->id]);
-});
+    public function testItUnsetsSubactivities(): void
+    {
+        $this->login()->loginNami();
+        $activity = Activity::factory()
+            ->hasAttached(Subactivity::factory())
+            ->create();
 
-it('testItCannotSetNamiId', function () {
-    $this->login()->loginNami();
-    $activity = Activity::factory()->create();
+        $this->patch(route('activity.update', ['activity' => $activity]), [
+            'name' => 'Lorem',
+            'is_filterable' => false,
+            'subactivities' => [],
+        ]);
 
-    $this->patch(route('activity.update', ['activity' => $activity]), [
-        'name' => 'Lorem',
-        'nami_id' => 66,
-        'is_filterable' => false,
-        'subactivities' => [],
-    ]);
+        $this->assertDatabaseEmpty('activity_subactivity');
+    }
 
-    $this->assertDatabaseHas('activities', ['nami_id' => null]);
-});
+    public function testItCannotSetSubactivityIfItStillHasMembers(): void
+    {
+        $this->login()->loginNami();
+        $activity = Activity::factory()->create();
+        $subactivity = Subactivity::factory()->hasAttached($activity)->create();
+        $newSubactivity = Subactivity::factory()->create();
+        Member::factory()->defaults()->has(Membership::factory()->for($activity)->for($subactivity))->create();
 
-it('testItUnsetsSubactivities', function () {
-    $this->login()->loginNami();
-    $activity = Activity::factory()
-        ->hasAttached(Subactivity::factory())
-        ->create();
+        $response = $this->patch(route('activity.update', ['activity' => $activity]), [
+            'name' => 'abc',
+            'is_filterable' => false,
+            'subactivities' => [$newSubactivity->id],
+        ]);
 
-    $this->patch(route('activity.update', ['activity' => $activity]), [
-        'name' => 'Lorem',
-        'is_filterable' => false,
-        'subactivities' => [],
-    ]);
-
-    $this->assertDatabaseEmpty('activity_subactivity');
-});
-
-it('testItCannotSetSubactivityIfItStillHasMembers', function () {
-    $this->login()->loginNami();
-    $activity = Activity::factory()
-        ->hasAttached(Subactivity::factory())
-        ->create();
-    Member::factory()->defaults()->has(Membership::factory()->for($activity)->for($activity->subactivities->first()))->create();
-
-    $response = $this->patch(route('activity.update', ['activity' => $activity]), [
-        'name' => 'abc',
-        'is_filterable' => false,
-        'subactivities' => [],
-    ]);
-
-    $response->assertSessionHasErrors(['subactivities' => 'Untergliederung hat noch Mitglieder.']);
-});
-
-it('test it succeeds when membership is not of removing subactivity', function () {
-    $this->login()->loginNami();
-    $activity = Activity::factory()
-        ->hasAttached(Subactivity::factory())
-        ->create();
-    Member::factory()->defaults()->has(Membership::factory()->for($activity)->for(Subactivity::factory()))->create();
-
-    $response = $this->patch(route('activity.update', ['activity' => $activity]), [
-        'name' => 'abc',
-        'is_filterable' => false,
-        'subactivities' => [],
-    ]);
-
-    $response->assertSessionDoesntHaveErrors();
-});
-
-it('test it succeeds when membership is not of removing activity', function () {
-    $this->login()->loginNami();
-    $activity = Activity::factory()
-        ->hasAttached(Subactivity::factory())
-        ->create();
-    Member::factory()->defaults()->has(Membership::factory()->for(Activity::factory())->for($activity->subactivities->first()))->create();
-
-    $response = $this->patch(route('activity.update', ['activity' => $activity]), [
-        'name' => 'abc',
-        'is_filterable' => false,
-        'subactivities' => [],
-    ]);
-
-    $response->assertSessionDoesntHaveErrors();
-});
+        $response->assertSessionHasErrors(['subactivities' => 'Untergliederung hat noch Mitglieder.']);
+    }
+}

tests/Feature/Contribution/StoreTest.php

@@ -13,7 +13,6 @@ use Generator;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Laravel\Passport\Client;
 use Laravel\Passport\Passport;
-use PHPUnit\Framework\Attributes\DataProvider;
 use Tests\RequestFactories\ContributionMemberApiRequestFactory;
 use Tests\RequestFactories\ContributionRequestFactory;
 use Tests\TestCase;
@@ -113,8 +112,8 @@ class StoreTest extends TestCase
     /**
      * @param array<string, string>              $input
      * @param class-string<ContributionDocument> $documentClass
+     * @dataProvider validationDataProvider
      */
-    #[DataProvider('validationDataProvider')]
     public function testItValidatesInput(array $input, string $documentClass, string $errorField): void
     {
         $this->login()->loginNami();
@@ -128,8 +127,8 @@ class StoreTest extends TestCase
     /**
      * @param array<string, string>              $input
      * @param class-string<ContributionDocument> $documentClass
+     * @dataProvider validationDataProvider
      */
-    #[DataProvider('validationDataProvider')]
     public function testItValidatesInputBeforeGeneration(array $input, string $documentClass, string $errorField): void
     {
         $this->login()->loginNami();
@@ -141,7 +140,7 @@ class StoreTest extends TestCase
         ])->assertSessionHasErrors($errorField);
     }
 
-    public static function validationDataProvider(): Generator
+    protected function validationDataProvider(): Generator
     {
         yield [
             ['type' => 'aaa'],

tests/Feature/Course/StoreTest.php

@@ -5,7 +5,6 @@ namespace Tests\Feature\Course;
 use App\Course\Models\Course;
 use App\Member\Member;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
-use PHPUnit\Framework\Attributes\DataProvider;
 use Tests\TestCase;
 use Zoomyboy\LaravelNami\Fakes\CourseFake;
 
@@ -16,7 +15,7 @@ class StoreTest extends TestCase
     /**
      * @return array<string, array{payload: array<string, mixed>, errors: array<string, mixed>}>
      */
-    public static function validationDataProvider(): array
+    public function validationDataProvider(): array
     {
         return [
             'course_id_missing' => [
@@ -49,8 +48,8 @@ class StoreTest extends TestCase
     /**
      * @param array<string, string> $payload
      * @param array<string, string> $errors
+     * @dataProvider validationDataProvider
      */
-    #[DataProvider('validationDataProvider')]
     public function testItValidatesInput(array $payload, array $errors): void
     {
         $this->login()->withNamiSettings();

tests/Feature/Course/UpdateTest.php

@@ -6,7 +6,6 @@ use App\Course\Models\Course;
 use App\Course\Models\CourseMember;
 use App\Member\Member;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
-use PHPUnit\Framework\Attributes\DataProvider;
 use Tests\TestCase;
 use Zoomyboy\LaravelNami\Fakes\CourseFake;
 
@@ -17,7 +16,7 @@ class UpdateTest extends TestCase
     /**
      * @return array<string, array{payload: array<string, mixed>, errors: array<string, mixed>}>
      */
-    public static function validationDataProvider(): array
+    public function validationDataProvider(): array
     {
         return [
             'course_id_missing' => [
@@ -50,8 +49,8 @@ class UpdateTest extends TestCase
     /**
      * @param array<string, string> $payload
      * @param array<string, string> $errors
+     * @dataProvider validationDataProvider
      */
-    #[DataProvider('validationDataProvider')]
     public function testItValidatesInput(array $payload, array $errors): void
     {
         $this->login()->loginNami();

tests/Feature/Form/FormRegisterActionTest.php

@@ -17,7 +17,6 @@ use Generator;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Support\Facades\Mail;
 use Illuminate\Testing\TestResponse;
-use PHPUnit\Framework\Attributes\DataProvider;
 
 class FormRegisterActionTest extends FormTestCase
 {
@@ -87,10 +86,10 @@ class FormRegisterActionTest extends FormTestCase
     }
 
     /**
+     * @dataProvider validationDataProvider
      * @param array<string, mixed> $payload
      * @param ?array<string, mixed> $messages
      */
-    #[DataProvider('validationDataProvider')]
     public function testItValidatesInput(FormtemplateFieldRequest $fieldGenerator, array $payload, ?array $messages): void
     {
         Carbon::setTestNow(Carbon::parse('2024-02-15 06:00:00'));
@@ -106,226 +105,226 @@ class FormRegisterActionTest extends FormTestCase
         }
     }
 
-    public static function validationDataProvider(): Generator
+    public function validationDataProvider(): Generator
     {
         yield [
-            static::dateField('birthday')->name('Geburtsdatum')->maxToday(false),
+            $this->dateField('birthday')->name('Geburtsdatum')->maxToday(false),
             ['birthday' => 'aa'],
             ['birthday' => 'Geburtsdatum muss ein gültiges Datum sein.']
         ];
 
         yield [
-            static::dateField('birthday')->name('Geburtsdatum')->maxToday(false),
+            $this->dateField('birthday')->name('Geburtsdatum')->maxToday(false),
             ['birthday' => '2021-05-06'],
             null,
         ];
 
         yield [
-            static::dateField('birthday')->name('Geburtsdatum')->maxToday(true),
+            $this->dateField('birthday')->name('Geburtsdatum')->maxToday(true),
             ['birthday' => '2024-02-16'],
             ['birthday' => 'Geburtsdatum muss ein Datum vor oder gleich dem 15.02.2024 sein.'],
         ];
 
         yield [
-            static::dateField('birthday')->name('Geburtsdatum')->maxToday(true),
+            $this->dateField('birthday')->name('Geburtsdatum')->maxToday(true),
             ['birthday' => '2024-02-15'],
             null,
         ];
 
         yield [
-            static::textField('vorname')->name('Vorname der Mutter')->required(true),
+            $this->textField('vorname')->name('Vorname der Mutter')->required(true),
             ['vorname' => ''],
             ['vorname' => 'Vorname der Mutter ist erforderlich.']
         ];
 
         yield [
-            static::textField('vorname')->name('Vorname der Mutter')->required(true),
+            $this->textField('vorname')->name('Vorname der Mutter')->required(true),
             ['vorname' => 5],
             ['vorname' => 'Vorname der Mutter muss ein String sein.']
         ];
 
         yield [
-            static::radioField('yes_or_no')->name('Ja oder Nein')->required(true),
+            $this->radioField('yes_or_no')->name('Ja oder Nein')->required(true),
             ['yes_or_no' => null],
             ['yes_or_no' => 'Ja oder Nein ist erforderlich.']
         ];
 
         yield [
-            static::radioField('letter')->name('Buchstabe')->options(['A', 'B'])->required(false)->allowcustom(false),
+            $this->radioField('letter')->name('Buchstabe')->options(['A', 'B'])->required(false)->allowcustom(false),
             ['letter' => 'Z'],
             ['letter' => 'Der gewählte Wert für Buchstabe ist ungültig.']
         ];
 
         yield [
-            static::radioField('letter')->name('Buchstabe')->options(['A', 'B'])->required(true)->allowcustom(false),
+            $this->radioField('letter')->name('Buchstabe')->options(['A', 'B'])->required(true)->allowcustom(false),
             ['letter' => 'Z'],
             ['letter' => 'Der gewählte Wert für Buchstabe ist ungültig.']
         ];
 
         yield [
-            static::radioField('letter')->name('Buchstabe')->options(['A', 'B'])->required(true)->allowcustom(true),
+            $this->radioField('letter')->name('Buchstabe')->options(['A', 'B'])->required(true)->allowcustom(true),
             ['letter' => 'lalalaa'],
             null,
         ];
 
         yield [
-            static::radioField('letter')->name('Buchstabe')->options(['A', 'B'])->required(true)->allowcustom(false),
+            $this->radioField('letter')->name('Buchstabe')->options(['A', 'B'])->required(true)->allowcustom(false),
             ['letter' => 'A'],
             null
         ];
 
         yield [
-            static::checkboxesField('letter')->name('Buchstabe')->options(['A', 'B']),
+            $this->checkboxesField('letter')->name('Buchstabe')->options(['A', 'B']),
             ['letter' => ['Z']],
             ['letter.0' => 'Der gewählte Wert für Buchstabe ist ungültig.'],
         ];
 
         yield [
-            static::dropdownField('letter')->name('Buchstabe')->options(['A', 'B'])->allowcustom(true),
+            $this->dropdownField('letter')->name('Buchstabe')->options(['A', 'B'])->allowcustom(true),
             ['letter' => 'Z'],
             null,
         ];
 
         yield [
-            static::checkboxesField('letter')->name('Buchstabe')->options(['A', 'B']),
+            $this->checkboxesField('letter')->name('Buchstabe')->options(['A', 'B']),
             ['letter' => 77],
             ['letter' => 'Buchstabe muss ein Array sein.'],
         ];
 
         yield [
-            static::checkboxesField('letter')->name('Buchstabe')->options(['A', 'B']),
+            $this->checkboxesField('letter')->name('Buchstabe')->options(['A', 'B']),
             ['letter' => ['A']],
             null,
         ];
 
         yield [
-            static::checkboxesField('letter')->name('Buchstabe')->options(['A', 'B']),
+            $this->checkboxesField('letter')->name('Buchstabe')->options(['A', 'B']),
             ['letter' => []],
             null,
         ];
 
         yield [
-            static::checkboxesField('letter')->name('Buchstabe')->options(['A', 'B', 'C', 'D'])->min(0)->max(2),
+            $this->checkboxesField('letter')->name('Buchstabe')->options(['A', 'B', 'C', 'D'])->min(0)->max(2),
             ['letter' => ['A', 'B', 'C']],
             ['letter' => 'Buchstabe darf maximal 2 Elemente haben.'],
         ];
 
         yield [
-            static::checkboxesField('letter')->name('Buchstabe')->options(['A', 'B', 'C', 'D'])->min(2)->max(0),
+            $this->checkboxesField('letter')->name('Buchstabe')->options(['A', 'B', 'C', 'D'])->min(2)->max(0),
             ['letter' => ['A']],
             ['letter' => 'Buchstabe muss mindestens 2 Elemente haben.'],
         ];
 
         yield [
-            static::checkboxesField('letter')->name('Buchstabe')->options(['A', 'B', 'C', 'D'])->min(1)->max(0),
+            $this->checkboxesField('letter')->name('Buchstabe')->options(['A', 'B', 'C', 'D'])->min(1)->max(0),
             ['letter' => []],
             ['letter' => 'Buchstabe muss mindestens 1 Elemente haben.'],
         ];
 
         yield [
-            static::checkboxesField('letter')->name('Buchstabe')->options(['A', 'B', 'C', 'D'])->min(0)->max(1),
+            $this->checkboxesField('letter')->name('Buchstabe')->options(['A', 'B', 'C', 'D'])->min(0)->max(1),
             ['letter' => ['A', 'B']],
             ['letter' => 'Buchstabe darf maximal 1 Elemente haben.'],
         ];
 
         yield [
-            static::checkboxField('data')->name('Datenschutz')->required(false),
+            $this->checkboxField('data')->name('Datenschutz')->required(false),
             ['data' => 5],
             ['data' => 'Datenschutz muss ein Wahrheitswert sein.'],
         ];
 
         yield [
-            static::checkboxField('data')->name('Datenschutz')->required(false),
+            $this->checkboxField('data')->name('Datenschutz')->required(false),
             ['data' => false],
             null
         ];
 
         yield [
-            static::checkboxField('data')->name('Datenschutz')->required(true),
+            $this->checkboxField('data')->name('Datenschutz')->required(true),
             ['data' => false],
             ['data' => 'Datenschutz muss akzeptiert werden.'],
         ];
 
         yield [
-            static::checkboxField('data')->name('Datenschutz')->required(true),
+            $this->checkboxField('data')->name('Datenschutz')->required(true),
             ['data' => true],
             null,
         ];
 
         yield [
-            static::dropdownField('yes_or_no')->name('Ja oder Nein')->required(true),
+            $this->dropdownField('yes_or_no')->name('Ja oder Nein')->required(true),
             ['yes_or_no' => null],
             ['yes_or_no' => 'Ja oder Nein ist erforderlich.']
         ];
 
         yield [
-            static::dropdownField('letter')->name('Buchstabe')->options(['A', 'B'])->required(false)->allowcustom(false),
+            $this->dropdownField('letter')->name('Buchstabe')->options(['A', 'B'])->required(false)->allowcustom(false),
             ['letter' => 'Z'],
             ['letter' => 'Der gewählte Wert für Buchstabe ist ungültig.']
         ];
 
         yield [
-            static::dropdownField('letter')->name('Buchstabe')->options(['A', 'B'])->required(true)->allowcustom(false),
+            $this->dropdownField('letter')->name('Buchstabe')->options(['A', 'B'])->required(true)->allowcustom(false),
             ['letter' => 'Z'],
             ['letter' => 'Der gewählte Wert für Buchstabe ist ungültig.']
         ];
 
         yield [
-            static::dropdownField('letter')->name('Buchstabe')->options(['A', 'B'])->required(true)->allowcustom(false),
+            $this->dropdownField('letter')->name('Buchstabe')->options(['A', 'B'])->required(true)->allowcustom(false),
             ['letter' => 'A'],
             null
         ];
 
         yield [
-            static::textareaField('vorname')->name('Vorname der Mutter')->required(true),
+            $this->textareaField('vorname')->name('Vorname der Mutter')->required(true),
             ['vorname' => ''],
             ['vorname' => 'Vorname der Mutter ist erforderlich.']
         ];
 
         yield [
-            static::textareaField('vorname')->name('Vorname der Mutter')->required(true),
+            $this->textareaField('vorname')->name('Vorname der Mutter')->required(true),
             ['vorname' => 5],
             ['vorname' => 'Vorname der Mutter muss ein String sein.']
         ];
 
         yield [
-            static::textareaField('vorname')->name('Vorname der Mutter')->required(true),
+            $this->textareaField('vorname')->name('Vorname der Mutter')->required(true),
             ['vorname' => 5],
             ['vorname' => 'Vorname der Mutter muss ein String sein.']
         ];
 
         yield [
-            static::emailField('email')->name('Mail')->required(true),
+            $this->emailField('email')->name('Mail')->required(true),
             ['email' => 'alaaa'],
             ['email' => 'Mail muss eine gültige E-Mail-Adresse sein.']
         ];
 
         yield [
-            static::emailField('email')->name('Mail')->required(false),
+            $this->emailField('email')->name('Mail')->required(false),
             ['email' => 'alaaa'],
             ['email' => 'Mail muss eine gültige E-Mail-Adresse sein.']
         ];
 
         yield [
-            static::numberField('numb')->name('Nummer')->required(false)->min(10)->max(20),
+            $this->numberField('numb')->name('Nummer')->required(false)->min(10)->max(20),
             ['numb' => 21],
             ['numb' => 'Nummer muss kleiner oder gleich 20 sein.']
         ];
 
         yield [
-            static::numberField('numb')->name('Nummer')->required(false)->min(10)->max(20),
+            $this->numberField('numb')->name('Nummer')->required(false)->min(10)->max(20),
             ['numb' => 9],
             ['numb' => 'Nummer muss größer oder gleich 10 sein.']
         ];
 
         yield [
-            static::numberField('numb')->name('Nummer')->required(false)->min(10)->max(20),
+            $this->numberField('numb')->name('Nummer')->required(false)->min(10)->max(20),
             ['numb' => 'asss'],
             ['numb' => 'Nummer muss eine ganze Zahl sein.']
         ];
 
         yield [
-            static::numberField('numb')->name('Nummer')->required(true),
+            $this->numberField('numb')->name('Nummer')->required(true),
             ['numb' => ''],
             ['numb' => 'Nummer ist erforderlich.']
         ];
@@ -457,7 +456,7 @@ class FormRegisterActionTest extends FormTestCase
         $this->assertEquals($form->participants->get(0)->id, $form->participants->get(1)->parent_id);
     }
 
-    public static function memberMatchingDataProvider(): Generator
+    protected function memberMatchingDataProvider(): Generator
     {
         yield [
             ['email' => 'max@muster.de'],
@@ -540,10 +539,10 @@ class FormRegisterActionTest extends FormTestCase
     }
 
     /**
+     * @dataProvider memberMatchingDataProvider
      * @param array<string, string> $memberAttributes
      * @param mixed $participantValue
      */
-    #[DataProvider('memberMatchingDataProvider')]
     public function testItSynchsMemberAttributes(array $memberAttributes, NamiType $type, mixed $participantValue, ?callable $factory = null): void
     {
         Carbon::setTestNow(Carbon::parse('2023-05-04'));

tests/Feature/Form/FormRegisterMailTest.php

@@ -8,7 +8,6 @@ use App\Form\Models\Form;
 use App\Form\Models\Participant;
 use Generator;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
-use PHPUnit\Framework\Attributes\DataProvider;
 use Tests\RequestFactories\EditorRequestFactory;
 
 class FormRegisterMailTest extends FormTestCase
@@ -78,25 +77,25 @@ class FormRegisterMailTest extends FormTestCase
         $mail->assertHasAttachedData('content2', 'beispiel2.pdf', ['mime' => 'application/pdf']);
     }
 
-    public static function blockDataProvider(): Generator
+    public function blockDataProvider(): Generator
     {
         yield [
             ['mode' => 'all', 'ifs' => []],
-            static::dropdownField('fieldkey')->options(['A', 'B']),
+            $this->dropdownField('fieldkey')->options(['A', 'B']),
             ['fieldkey' => 'A'],
             true,
         ];
 
         yield [
             ['mode' => 'any', 'ifs' => []],
-            static::dropdownField('fieldkey')->options(['A', 'B']),
+            $this->dropdownField('fieldkey')->options(['A', 'B']),
             ['fieldkey' => 'A'],
             true,
         ];
 
         yield [
             ['mode' => 'any', 'ifs' => []],
-            static::dropdownField('fieldkey')->options(['A', 'B']),
+            $this->dropdownField('fieldkey')->options(['A', 'B']),
             ['fieldkey' => 'A'],
             true,
         ];
@@ -105,7 +104,7 @@ class FormRegisterMailTest extends FormTestCase
             ['mode' => 'any', 'ifs' => [
                 ['field' => 'fieldkey', 'comparator' => 'isEqual', 'value' => 'A']
             ]],
-            static::dropdownField('fieldkey')->options(['A', 'B']),
+            $this->dropdownField('fieldkey')->options(['A', 'B']),
             ['fieldkey' => 'A'],
             true,
         ];
@@ -114,7 +113,7 @@ class FormRegisterMailTest extends FormTestCase
             ['mode' => 'any', 'ifs' => [
                 ['field' => 'fieldkey', 'comparator' => 'isEqual', 'value' => 'B']
             ]],
-            static::dropdownField('fieldkey')->options(['A', 'B']),
+            $this->dropdownField('fieldkey')->options(['A', 'B']),
             ['fieldkey' => 'A'],
             false,
         ];
@@ -124,7 +123,7 @@ class FormRegisterMailTest extends FormTestCase
                 ['field' => 'fieldkey', 'comparator' => 'isEqual', 'value' => 'B'],
                 ['field' => 'fieldkey', 'comparator' => 'isEqual', 'value' => 'A']
             ]],
-            static::dropdownField('fieldkey')->options(['A', 'B']),
+            $this->dropdownField('fieldkey')->options(['A', 'B']),
             ['fieldkey' => 'A'],
             true,
         ];
@@ -134,7 +133,7 @@ class FormRegisterMailTest extends FormTestCase
                 ['field' => 'fieldkey', 'comparator' => 'isEqual', 'value' => 'B'],
                 ['field' => 'fieldkey', 'comparator' => 'isEqual', 'value' => 'A']
             ]],
-            static::dropdownField('fieldkey')->options(['A', 'B']),
+            $this->dropdownField('fieldkey')->options(['A', 'B']),
             ['fieldkey' => 'B'],
             true,
         ];
@@ -144,7 +143,7 @@ class FormRegisterMailTest extends FormTestCase
                 ['field' => 'fieldkey', 'comparator' => 'isEqual', 'value' => 'B'],
                 ['field' => 'fieldkey', 'comparator' => 'isEqual', 'value' => 'A']
             ]],
-            static::dropdownField('fieldkey')->options(['A', 'B']),
+            $this->dropdownField('fieldkey')->options(['A', 'B']),
             ['fieldkey' => 'B'],
             false,
         ];
@@ -153,7 +152,7 @@ class FormRegisterMailTest extends FormTestCase
             ['mode' => 'all', 'ifs' => [
                 ['field' => 'fieldkey', 'comparator' => 'isEqual', 'value' => 'B']
             ]],
-            static::dropdownField('fieldkey')->options(['A', 'B']),
+            $this->dropdownField('fieldkey')->options(['A', 'B']),
             ['fieldkey' => 'B'],
             true,
         ];
@@ -162,7 +161,7 @@ class FormRegisterMailTest extends FormTestCase
             ['mode' => 'all', 'ifs' => [
                 ['field' => 'fieldkey', 'comparator' => 'isNotEqual', 'value' => 'A']
             ]],
-            static::dropdownField('fieldkey')->options(['A', 'B']),
+            $this->dropdownField('fieldkey')->options(['A', 'B']),
             ['fieldkey' => 'B'],
             true,
         ];
@@ -171,7 +170,7 @@ class FormRegisterMailTest extends FormTestCase
             ['mode' => 'all', 'ifs' => [
                 ['field' => 'fieldkey', 'comparator' => 'isIn', 'value' => ['A']]
             ]],
-            static::dropdownField('fieldkey')->options(['A', 'B']),
+            $this->dropdownField('fieldkey')->options(['A', 'B']),
             ['fieldkey' => 'A'],
             true,
         ];
@@ -180,7 +179,7 @@ class FormRegisterMailTest extends FormTestCase
             ['mode' => 'all', 'ifs' => [
                 ['field' => 'fieldkey', 'comparator' => 'isNotIn', 'value' => ['B']]
             ]],
-            static::dropdownField('fieldkey')->options(['A', 'B']),
+            $this->dropdownField('fieldkey')->options(['A', 'B']),
             ['fieldkey' => 'A'],
             true,
         ];
@@ -189,7 +188,7 @@ class FormRegisterMailTest extends FormTestCase
             ['mode' => 'all', 'ifs' => [
                 ['field' => 'fieldkey', 'comparator' => 'isNotIn', 'value' => ['B']]
             ]],
-            static::radioField('fieldkey')->options(['A', 'B']),
+            $this->radioField('fieldkey')->options(['A', 'B']),
             ['fieldkey' => 'A'],
             true,
         ];
@@ -198,7 +197,7 @@ class FormRegisterMailTest extends FormTestCase
             ['mode' => 'all', 'ifs' => [
                 ['field' => 'fieldkey', 'comparator' => 'isEqual', 'value' => true]
             ]],
-            static::checkboxField('fieldkey'),
+            $this->checkboxField('fieldkey'),
             ['fieldkey' => true],
             true,
         ];
@@ -207,17 +206,17 @@ class FormRegisterMailTest extends FormTestCase
             ['mode' => 'all', 'ifs' => [
                 ['field' => 'fieldkey', 'comparator' => 'isEqual', 'value' => false]
             ]],
-            static::checkboxField('fieldkey'),
+            $this->checkboxField('fieldkey'),
             ['fieldkey' => true],
             false,
         ];
     }
 
     /**
+     * @dataProvider blockDataProvider
      * @param array<string, mixed> $conditions
      * @param array<string, mixed> $participantValues
      */
-    #[DataProvider('blockDataProvider')]
     public function testItFiltersForBlockConditions(array $conditions, FormtemplateFieldRequest $field, array $participantValues, bool $result): void
     {
         $this->login()->loginNami()->withoutExceptionHandling();
@@ -243,10 +242,10 @@ class FormRegisterMailTest extends FormTestCase
     }
 
     /**
+     * @dataProvider blockDataProvider
      * @param array<string, mixed> $conditions
      * @param array<string, mixed> $participantValues
      */
-    #[DataProvider('blockDataProvider')]
     public function testItFiltersForAttachments(array $conditions, FormtemplateFieldRequest $field, array $participantValues, bool $result): void
     {
         $this->login()->loginNami()->withoutExceptionHandling();

tests/Feature/Form/FormStoreActionTest.php

@@ -10,7 +10,6 @@ use App\Lib\Events\Succeeded;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Support\Facades\Event;
 use Generator;
-use PHPUnit\Framework\Attributes\DataProvider;
 use Tests\RequestFactories\EditorRequestFactory;
 
 class FormStoreActionTest extends FormTestCase
@@ -81,7 +80,7 @@ class FormStoreActionTest extends FormTestCase
         $this->assertEquals(2, $form->export->root->connectionId);
     }
 
-    public static function validationDataProvider(): Generator
+    public function validationDataProvider(): Generator
     {
         yield [FormRequest::new()->name(''), ['name' => 'Name ist erforderlich.']];
         yield [FormRequest::new()->excerpt(''), ['excerpt' => 'Auszug ist erforderlich.']];
@@ -93,9 +92,9 @@ class FormStoreActionTest extends FormTestCase
 
 
     /**
+     * @dataProvider validationDataProvider
      * @param array<string, string> $messages
      */
-    #[DataProvider('validationDataProvider')]
     public function testItValidatesRequests(FormRequest $request, array $messages): void
     {
         $this->login()->loginNami();

tests/Feature/Form/FormTestCase.php

@@ -14,7 +14,7 @@ class FormTestCase extends TestCase
 
     private string $clearCacheUrl = 'http://event.com/clear-cache';
 
-    protected function setUp(): void
+    public function setUp(): void
     {
         parent::setUp();
 

tests/Feature/Form/FormtemplateStoreActionTest.php

@@ -10,7 +10,6 @@ use App\Lib\Events\Succeeded;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Support\Facades\Event;
 use Generator;
-use PHPUnit\Framework\Attributes\DataProvider;
 use Tests\RequestFactories\EditorRequestFactory;
 
 class FormtemplateStoreActionTest extends FormTestCase
@@ -52,12 +51,12 @@ class FormtemplateStoreActionTest extends FormTestCase
         Event::assertDispatched(Succeeded::class, fn (Succeeded $event) => $event->message === 'Vorlage gespeichert.');
     }
 
-    public static function validationDataProvider(): Generator
+    public function validationDataProvider(): Generator
     {
         yield [FormtemplateRequest::new()->name(''), ['name' => 'Name ist erforderlich.']];
         yield [FormtemplateRequest::new()->sections([FormtemplateSectionRequest::new()->name('')]), ['config.sections.0.name' => 'Sektionsname ist erforderlich.']];
         yield [FormtemplateRequest::new()->sections([FormtemplateSectionRequest::new()->fields([
-            static::textField()->name(''),
+            $this->textField()->name(''),
         ])]), ['config.sections.0.fields.0.name' => 'Feldname ist erforderlich.']];
         yield [FormtemplateRequest::new()->sections([FormtemplateSectionRequest::new()->fields([
             FormtemplateFieldRequest::type('')
@@ -66,20 +65,20 @@ class FormtemplateStoreActionTest extends FormTestCase
             FormtemplateFieldRequest::type('aaaaa'),
         ])]), ['config.sections.0.fields.0.type' => 'Feldtyp ist ungültig.']];
         yield [FormtemplateRequest::new()->sections([FormtemplateSectionRequest::new()->fields([
-            static::textField(''),
+            $this->textField(''),
         ])]), ['config.sections.0.fields.0.key' => 'Feldkey ist erforderlich.']];
         yield [FormtemplateRequest::new()->sections([FormtemplateSectionRequest::new()->fields([
-            static::textField('a b'),
+            $this->textField('a b'),
         ])]), ['config.sections.0.fields.0.key' => 'Feldkey Format ist ungültig.']];
         yield [FormtemplateRequest::new()->sections([FormtemplateSectionRequest::new()->fields([
-            static::textField()->required('la')
+            $this->textField()->required('la')
         ])]), ['config.sections.0.fields.0.required' => 'Erforderlich muss ein Wahrheitswert sein.']];
     }
 
     /**
+     * @dataProvider validationDataProvider
      * @param array<string, string> $messages
      */
-    #[DataProvider('validationDataProvider')]
     public function testItValidatesRequests(FormtemplateRequest $request, array $messages): void
     {
         $this->login()->loginNami();

tests/Feature/Initialize/InitializeActivitiesTest.php

@@ -8,7 +8,6 @@ use App\Setting\NamiSettings;
 use App\Subactivity;
 use Generator;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
-use PHPUnit\Framework\Attributes\DataProvider;
 use Tests\TestCase;
 use Zoomyboy\LaravelNami\Fakes\ActivityFake;
 use Zoomyboy\LaravelNami\Fakes\GroupFake;
@@ -55,7 +54,7 @@ class InitializeActivitiesTest extends TestCase
         ]);
     }
 
-    public static function activityDataProvider(): Generator
+    public function activityDataProvider(): Generator
     {
         yield [
             fn (ActivityFake $fake) => $fake->fetches(1000, [
@@ -83,10 +82,11 @@ class InitializeActivitiesTest extends TestCase
     }
 
     /**
+     * @dataProvider activityDataProvider
+     *
      * @param array<string, string|null> $activityCheck
      * @param array<string, string|null> $subactivityCheck
      */
-    #[DataProvider('activityDataProvider')]
     public function testItInitsOtherFields(callable $activityFake, array $activityCheck, ?array $subactivityCheck = null): void
     {
         app(GroupFake::class)

tests/Feature/Initialize/InitializeMembersTest.php

@@ -20,7 +20,7 @@ class InitializeMembersTest extends TestCase
         $this->loginNami();
         $api = app(NamiSettings::class)->login();
         app(SearchFake::class)->fetches(1, 0, 100, [
-            MemberEntry::toFactory()->toMember(['groupId' => 100, 'id' => 20]),
+            MemberEntry::factory()->toMember(['groupId' => 100, 'id' => 20]),
         ]);
         FullMemberAction::partialMock()->shouldReceive('configureJob')->once();
         FullMemberAction::partialMock()->shouldReceive('handle')->once();
@@ -32,7 +32,7 @@ class InitializeMembersTest extends TestCase
     {
         $this->loginNami();
         app(SearchFake::class)->fetches(1, 0, 100, [
-            MemberEntry::toFactory()->toMember(['groupId' => 100, 'id' => 20]),
+            MemberEntry::factory()->toMember(['groupId' => 100, 'id' => 20]),
         ]);
         FullMemberAction::partialMock()->shouldReceive('configureJob')->once();
         FullMemberAction::partialMock()->shouldReceive('handle')->once();

tests/Feature/Initializer/SearchTest.php

@@ -23,8 +23,8 @@ class SearchTest extends TestCase
     {
         $this->withoutExceptionHandling();
         app(SearchFake::class)->fetches(1, 0, 10, [
-            MemberEntry::toFactory()->state(['id' => 2, 'groupId' => 100, 'firstname' => 'Max', 'lastname' => 'Muster', 'birthday' => '2013-07-04 00:00:00'])->toMember(),
-            MemberEntry::toFactory()->state(['id' => 2, 'groupId' => 150, 'firstname' => 'Jane', 'lastname' => 'Muster', 'birthday' => '2013-07-04 00:00:00'])->toMember(),
+            MemberEntry::factory()->state(['id' => 2, 'groupId' => 100, 'firstname' => 'Max', 'lastname' => 'Muster', 'birthday' => '2013-07-04 00:00:00'])->toMember(),
+            MemberEntry::factory()->state(['id' => 2, 'groupId' => 150, 'firstname' => 'Jane', 'lastname' => 'Muster', 'birthday' => '2013-07-04 00:00:00'])->toMember(),
         ]);
         Auth::success(333, 'secret');
 
@@ -53,7 +53,7 @@ class SearchTest extends TestCase
     {
         $this->withoutExceptionHandling();
         app(SearchFake::class)->fetches(1, 0, 10, [
-            MemberEntry::toFactory()->noFirstname()->toMember(),
+            MemberEntry::factory()->noFirstname()->toMember(),
         ]);
         Auth::success(333, 'secret');
 
@@ -70,8 +70,8 @@ class SearchTest extends TestCase
     {
         $this->withoutExceptionHandling();
         app(SearchFake::class)->fetches(2, 10, 10, [
-            MemberEntry::toFactory()->toMember(),
-            MemberEntry::toFactory()->toMember(),
+            MemberEntry::factory()->toMember(),
+            MemberEntry::factory()->toMember(),
         ]);
         Auth::success(333, 'secret');
 

tests/Feature/Invoice/InvoiceDestroyActionTest.php

@@ -5,14 +5,20 @@ namespace Tests\Feature\Invoice;
 use App\Invoice\Models\Invoice;
 use App\Invoice\Models\InvoicePosition;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Tests\TestCase;
 
-uses(DatabaseTransactions::class);
+class InvoiceDestroyActionTest extends TestCase
+{
 
-it('testItDestroysInvoice', function () {
-    $this->login()->loginNami()->withoutExceptionHandling();
-    $invoice = Invoice::factory()->has(InvoicePosition::factory()->withMember(), 'positions')->create();
+    use DatabaseTransactions;
 
-    $this->delete(route('invoice.destroy', ['invoice' => $invoice]))->assertOk();
-    $this->assertDatabaseCount('invoices', 0);
-    $this->assertDatabaseCount('invoice_positions', 0);
-});
+    public function testItDestroysInvoice(): void
+    {
+        $this->login()->loginNami()->withoutExceptionHandling();
+        $invoice = Invoice::factory()->has(InvoicePosition::factory()->withMember(), 'positions')->create();
+
+        $this->delete(route('invoice.destroy', ['invoice' => $invoice]))->assertOk();
+        $this->assertDatabaseCount('invoices', 0);
+        $this->assertDatabaseCount('invoice_positions', 0);
+    }
+}

tests/Feature/Invoice/InvoiceIndexActionTest.php

@@ -9,88 +9,96 @@ use App\Invoice\Models\InvoicePosition;
 use App\Member\Member;
 use App\Payment\Subscription;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Tests\TestCase;
 
-uses(DatabaseTransactions::class);
+class InvoiceIndexActionTest extends TestCase
+{
 
-it('testItDisplaysInvoices', function () {
-    $this->login()->loginNami()->withoutExceptionHandling();
-    $subscription = Subscription::factory()->forFee()->name('Beitrag')->create();
-    $member = Member::factory()->defaults()->create(['firstname' => 'Aaaa', 'lastname' => 'Aaab']);
-    $invoice = Invoice::factory()
-        ->has(InvoicePosition::factory()->price(1100)->for($member)->state(['description' => 'lala']), 'positions')
-        ->has(InvoicePosition::factory()->price(2200)->withMember(), 'positions')
-        ->to(ReceiverRequestFactory::new()->name('Familie Blabla'))
-        ->sentAt(now()->subDay())
-        ->via(BillKind::POST)
-        ->status(InvoiceStatus::SENT)
-        ->create(['usage' => 'Usa', 'mail_email' => 'a@b.de']);
+    use DatabaseTransactions;
 
-    test()->get(route('invoice.index'))
-        ->assertInertiaPath('data.data.0.to.name', 'Familie Blabla')
-        ->assertInertiaPath('data.data.0.id', $invoice->id)
-        ->assertInertiaPath('data.data.0.sum_human', '33,00 €')
-        ->assertInertiaPath('data.data.0.sent_at_human', now()->subDay()->format('d.m.Y'))
-        ->assertInertiaPath('data.data.0.status', 'Rechnung gestellt')
-        ->assertInertiaPath('data.data.0.via', 'Post')
-        ->assertInertiaPath('data.data.0.mail_email', 'a@b.de')
-        ->assertInertiaPath('data.data.0.usage', 'Usa')
-        ->assertInertiaPath('data.data.0.greeting', $invoice->greeting)
-        ->assertInertiaPath('data.data.0.positions.0.price', 1100)
-        ->assertInertiaPath('data.data.0.positions.0.member_id', $member->id)
-        ->assertInertiaPath('data.data.0.positions.0.description', 'lala')
-        ->assertInertiaPath('data.data.0.positions.0.id', $invoice->positions->first()->id)
-        ->assertInertiaPath('data.data.0.links.pdf', route('invoice.pdf', ['invoice' => $invoice]))
-        ->assertInertiaPath('data.data.0.links.rememberpdf', route('invoice.rememberpdf', ['invoice' => $invoice]))
-        ->assertInertiaPath('data.data.0.links.update', route('invoice.update', ['invoice' => $invoice]))
-        ->assertInertiaPath('data.data.0.links.destroy', route('invoice.destroy', ['invoice' => $invoice]))
-        ->assertInertiaPath('data.meta.links.mass-store', route('invoice.mass-store'))
-        ->assertInertiaPath('data.meta.links.newInvoiceAttributes', route('invoice.new-invoice-attributes'))
-        ->assertInertiaPath('data.meta.links.store', route('invoice.store'))
-        ->assertInertiaPath('data.meta.links.masspdf', route('invoice.masspdf'))
-        ->assertInertiaPath('data.meta.vias.0', ['id' => 'E-Mail', 'name' => 'E-Mail'])
-        ->assertInertiaPath('data.meta.statuses.0', ['id' => 'Neu', 'name' => 'Neu'])
-        ->assertInertiaPath('data.meta.members.0', ['id' => $member->id, 'name' => 'Aaaa Aaab'])
-        ->assertInertiaPath('data.meta.subscriptions.0', ['name' => 'Beitrag', 'id' => $subscription->id])
-        ->assertInertiaPath('data.meta.filter.statuses', ['Neu', 'Rechnung gestellt'])
-        ->assertInertiaPath('data.meta.default', [
-            'to' => [
-                'name' => '',
-                'address' => '',
-                'zip' => '',
-                'location' => '',
-            ],
-            'positions' => [],
-            'greeting' => '',
-            'status' => InvoiceStatus::NEW->value,
-            'via' => null,
-            'usage' => '',
-            'mail_email' => '',
-        ])
-        ->assertInertiaPath('data.meta.default_position', [
-            'id' => null,
-            'price' => 0,
-            'description' => '',
-            'member_id' => null,
-        ]);
-});
+    public function testItDisplaysInvoices(): void
+    {
+        $this->login()->loginNami()->withoutExceptionHandling();
+        $subscription = Subscription::factory()->forFee()->name('Beitrag')->create();
+        $member = Member::factory()->defaults()->create(['firstname' => 'Aaaa', 'lastname' => 'Aaab']);
+        $invoice = Invoice::factory()
+            ->has(InvoicePosition::factory()->price(1100)->for($member)->state(['description' => 'lala']), 'positions')
+            ->has(InvoicePosition::factory()->price(2200)->withMember(), 'positions')
+            ->to(ReceiverRequestFactory::new()->name('Familie Blabla'))
+            ->sentAt(now()->subDay())
+            ->via(BillKind::POST)
+            ->status(InvoiceStatus::SENT)
+            ->create(['usage' => 'Usa', 'mail_email' => 'a@b.de']);
 
-it('testValuesCanBeNull', function () {
-    test()->login()->loginNami()->withoutExceptionHandling();
-    Invoice::factory()->create();
+        $this->get(route('invoice.index'))
+            ->assertInertiaPath('data.data.0.to.name', 'Familie Blabla')
+            ->assertInertiaPath('data.data.0.id', $invoice->id)
+            ->assertInertiaPath('data.data.0.sum_human', '33,00 €')
+            ->assertInertiaPath('data.data.0.sent_at_human', now()->subDay()->format('d.m.Y'))
+            ->assertInertiaPath('data.data.0.status', 'Rechnung gestellt')
+            ->assertInertiaPath('data.data.0.via', 'Post')
+            ->assertInertiaPath('data.data.0.mail_email', 'a@b.de')
+            ->assertInertiaPath('data.data.0.usage', 'Usa')
+            ->assertInertiaPath('data.data.0.greeting', $invoice->greeting)
+            ->assertInertiaPath('data.data.0.positions.0.price', 1100)
+            ->assertInertiaPath('data.data.0.positions.0.member_id', $member->id)
+            ->assertInertiaPath('data.data.0.positions.0.description', 'lala')
+            ->assertInertiaPath('data.data.0.positions.0.id', $invoice->positions->first()->id)
+            ->assertInertiaPath('data.data.0.links.pdf', route('invoice.pdf', ['invoice' => $invoice]))
+            ->assertInertiaPath('data.data.0.links.rememberpdf', route('invoice.rememberpdf', ['invoice' => $invoice]))
+            ->assertInertiaPath('data.data.0.links.update', route('invoice.update', ['invoice' => $invoice]))
+            ->assertInertiaPath('data.data.0.links.destroy', route('invoice.destroy', ['invoice' => $invoice]))
+            ->assertInertiaPath('data.meta.links.mass-store', route('invoice.mass-store'))
+            ->assertInertiaPath('data.meta.links.newInvoiceAttributes', route('invoice.new-invoice-attributes'))
+            ->assertInertiaPath('data.meta.links.store', route('invoice.store'))
+            ->assertInertiaPath('data.meta.links.masspdf', route('invoice.masspdf'))
+            ->assertInertiaPath('data.meta.vias.0', ['id' => 'E-Mail', 'name' => 'E-Mail'])
+            ->assertInertiaPath('data.meta.statuses.0', ['id' => 'Neu', 'name' => 'Neu'])
+            ->assertInertiaPath('data.meta.members.0', ['id' => $member->id, 'name' => 'Aaaa Aaab'])
+            ->assertInertiaPath('data.meta.subscriptions.0', ['name' => 'Beitrag', 'id' => $subscription->id])
+            ->assertInertiaPath('data.meta.filter.statuses', ['Neu', 'Rechnung gestellt'])
+            ->assertInertiaPath('data.meta.default', [
+                'to' => [
+                    'name' => '',
+                    'address' => '',
+                    'zip' => '',
+                    'location' => '',
+                ],
+                'positions' => [],
+                'greeting' => '',
+                'status' => InvoiceStatus::NEW->value,
+                'via' => null,
+                'usage' => '',
+                'mail_email' => '',
+            ])
+            ->assertInertiaPath('data.meta.default_position', [
+                'id' => null,
+                'price' => 0,
+                'description' => '',
+                'member_id' => null,
+            ]);
+    }
 
-    test()->get(route('invoice.index'))
-        ->assertInertiaPath('data.data.0.sent_at_human', '');
-});
+    public function testValuesCanBeNull(): void
+    {
+        $this->login()->loginNami()->withoutExceptionHandling();
+        Invoice::factory()->create();
 
-it('testItFiltersForInvoiceStatus', function () {
-    test()->login()->loginNami()->withoutExceptionHandling();
-    Invoice::factory()->status(InvoiceStatus::NEW)->create();
-    Invoice::factory()->status(InvoiceStatus::SENT)->count(2)->create();
-    Invoice::factory()->status(InvoiceStatus::PAID)->count(3)->create();
+        $this->get(route('invoice.index'))
+            ->assertInertiaPath('data.data.0.sent_at_human', '');
+    }
 
-    test()->callFilter('invoice.index', [])->assertInertiaCount('data.data', 3);
-    test()->callFilter('invoice.index', ['statuses' => []])->assertInertiaCount('data.data', 0);
-    test()->callFilter('invoice.index', ['statuses' => ['Neu']])->assertInertiaCount('data.data', 1);
-    test()->callFilter('invoice.index', ['statuses' => ['Neu', 'Rechnung beglichen']])->assertInertiaCount('data.data', 4);
-    test()->callFilter('invoice.index', ['statuses' => ['Neu', 'Rechnung beglichen', 'Rechnung gestellt']])->assertInertiaCount('data.data', 6);
-});
+    public function testItFiltersForInvoiceStatus(): void
+    {
+        $this->login()->loginNami()->withoutExceptionHandling();
+        Invoice::factory()->status(InvoiceStatus::NEW)->create();
+        Invoice::factory()->status(InvoiceStatus::SENT)->count(2)->create();
+        Invoice::factory()->status(InvoiceStatus::PAID)->count(3)->create();
+
+        $this->callFilter('invoice.index', [])->assertInertiaCount('data.data', 3);
+        $this->callFilter('invoice.index', ['statuses' => []])->assertInertiaCount('data.data', 0);
+        $this->callFilter('invoice.index', ['statuses' => ['Neu']])->assertInertiaCount('data.data', 1);
+        $this->callFilter('invoice.index', ['statuses' => ['Neu', 'Rechnung beglichen']])->assertInertiaCount('data.data', 4);
+        $this->callFilter('invoice.index', ['statuses' => ['Neu', 'Rechnung beglichen', 'Rechnung gestellt']])->assertInertiaCount('data.data', 6);
+    }
+}

tests/Feature/Invoice/InvoiceStoreActionTest.php

@@ -8,7 +8,6 @@ use App\Invoice\Models\Invoice;
 use App\Member\Member;
 use Generator;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
-use PHPUnit\Framework\Attributes\DataProvider;
 use Tests\TestCase;
 
 class InvoiceStoreActionTest extends TestCase
@@ -56,7 +55,7 @@ class InvoiceStoreActionTest extends TestCase
         ], $invoice->to);
     }
 
-    public static function validationDataProvider(): Generator
+    public function validationDataProvider(): Generator
     {
         yield [
             ['to.address' => ''],
@@ -107,8 +106,8 @@ class InvoiceStoreActionTest extends TestCase
     /**
      * @param array<string, mixed> $input
      * @param array<string, string> $errors
+     * @dataProvider validationDataProvider
      */
-    #[DataProvider('validationDataProvider')]
     public function testItValidatesInput(array $input, array $errors): void
     {
         $this->login()->loginNami();

tests/Feature/Invoice/InvoiceUpdateActionTest.php

@@ -9,7 +9,6 @@ use App\Invoice\Models\InvoicePosition;
 use App\Member\Member;
 use Generator;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
-use PHPUnit\Framework\Attributes\DataProvider;
 use Tests\TestCase;
 
 class InvoiceUpdateActionTest extends TestCase
@@ -99,7 +98,7 @@ class InvoiceUpdateActionTest extends TestCase
         $this->assertDatabaseCount('invoice_positions', 0);
     }
 
-    public static function validationDataProvider(): Generator
+    public function validationDataProvider(): Generator
     {
         yield [
             ['to.address' => ''],
@@ -145,8 +144,8 @@ class InvoiceUpdateActionTest extends TestCase
     /**
      * @param array<string, mixed> $input
      * @param array<string, string> $errors
+     * @dataProvider validationDataProvider
      */
-    #[DataProvider('validationDataProvider')]
     public function testItValidatesInput(array $input, array $errors): void
     {
         $this->login()->loginNami();

tests/Feature/Member/PreventionTest.php

@@ -17,7 +17,6 @@ use App\Prevention\PreventionSettings;
 use Generator;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Support\Facades\Mail;
-use PHPUnit\Framework\Attributes\DataProvider;
 use Tests\Lib\CreatesFormFields;
 use Tests\RequestFactories\EditorRequestFactory;
 use Tests\TestCase;
@@ -109,7 +108,7 @@ class PreventionTest extends TestCase
         $this->assertNotNull($participant->fresh()->last_remembered_at);
     }
 
-    public static function attributes(): Generator
+    protected function attributes(): Generator
     {
         yield [
             'attrs' => ['has_vk' => true, 'efz' => null, 'ps_at' => now()],
@@ -170,14 +169,14 @@ class PreventionTest extends TestCase
     /**
      * @param array<int, Prevention> $preventions
      * @param array<string, mixed> $memberAttributes
+     * @dataProvider attributes
      */
-    #[DataProvider('attributes')]
-    public function testItRemembersMember(array $attrs, array $preventions): void
+    public function testItRemembersMember(array $memberAttributes, array $preventions): void
     {
         Mail::fake();
         $form = $this->createForm();
         $participant = $this->createParticipant($form);
-        $participant->member->update($attrs);
+        $participant->member->update($memberAttributes);
 
         PreventionRememberAction::run();
 

tests/Feature/Member/PullCoursesActionTest.php

@@ -7,6 +7,7 @@ use App\Activity;
 use App\Country;
 use App\Course\Models\Course;
 use App\Course\Models\CourseMember;
+use App\Fee;
 use App\Gender;
 use App\Group;
 use App\Member\Member;
@@ -47,7 +48,7 @@ class PullCoursesActionTest extends TestCase
         $activity = Activity::factory()->inNami(1003)->name('Tätigkeit')->create();
         $member = Member::factory()->defaults()->for(Group::factory()->inNami(1000)->name('SG Wald'))->inNami(1001)->create();
         $course = Course::factory()->name('BS')->inNami(11)->create();
-        app(CourseFake::class)->fetches(1001, [50])->shows(1001, NamiCourse::toFactory()->toCourse([
+        app(CourseFake::class)->fetches(1001, [50])->shows(1001, NamiCourse::factory()->toCourse([
             'courseId' => 11,
             'organizer' => 'TTT',
             'eventName' => 'Schulung',
@@ -92,7 +93,7 @@ class PullCoursesActionTest extends TestCase
             ->has(CourseMember::factory()->for(Course::factory()->inNami(50))->inNami(55), 'courses')
             ->inNami(1001)
             ->create();
-        app(CourseFake::class)->fetches(1001, [55])->shows(1001, NamiCourse::toFactory()->toCourse(['id' => 55, 'courseId' => 50, 'organizer' => 'ZZU']));
+        app(CourseFake::class)->fetches(1001, [55])->shows(1001, NamiCourse::factory()->toCourse(['id' => 55, 'courseId' => 50, 'organizer' => 'ZZU']));
 
         app(PullCoursesAction::class)->handle($member);
 

tests/Feature/Member/ShowTest.php

@@ -17,7 +17,6 @@ use App\Region;
 use Carbon\Carbon;
 use Generator;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
-use PHPUnit\Framework\Attributes\DataProvider;
 use Tests\TestCase;
 
 class ShowTest extends TestCase
@@ -171,14 +170,16 @@ class ShowTest extends TestCase
         ], $response, 'data');
     }
 
-    public static function membershipDataProvider(): Generator
+    public function membershipDataProvider(): Generator
     {
         yield [now()->subMonths(2), null, true];
         yield [now()->subMonths(2), now()->subDay(), false];
         yield [now()->addDays(2), null, false];
     }
 
-    #[DataProvider('membershipDataProvider')]
+    /**
+     * @dataProvider membershipDataProvider
+     */
     public function testItShowsIfMembershipIsActive(Carbon $from, ?Carbon $to, bool $isActive): void
     {
         $this->withoutExceptionHandling()->login()->loginNami();

tests/Feature/Member/StoreTest.php

@@ -62,7 +62,7 @@ class StoreTest extends TestCase
             'address' => 'Bavert 50',
             'bill_kind' => 'Post',
             'birthday' => '2013-02-19',
-            'children_phone' => '+49 176 70512778',
+            'children_phone' => '+49 176 8574112',
             'country_id' => $country->id,
             'email_parents' => 'osloot@aol.com',
             'firstname' => 'Joe',
@@ -71,8 +71,8 @@ class StoreTest extends TestCase
             'lastname' => 'Muster',
             'letter_address' => null,
             'location' => 'Solingen',
-            'main_phone' => '+49 212 337056',
-            'mobile_phone' => '+49 176 70512774',
+            'main_phone' => '+49 212 2334322',
+            'mobile_phone' => '+49 176 3033053',
             'nationality_id' => $nationality->id,
             'region_id' => $region->id,
             'send_newspaper' => '1',
@@ -230,7 +230,7 @@ class StoreTest extends TestCase
         return [
             'address' => 'Bavert 50',
             'birthday' => '2013-02-19',
-            'children_phone' => '+49 176 70512778',
+            'children_phone' => '+49 176 8574112',
             'efz' => '',
             'email' => '',
             'email_parents' => 'osloot@aol.com',
@@ -244,8 +244,8 @@ class StoreTest extends TestCase
             'lastname' => 'Muster',
             'letter_address' => '',
             'location' => 'Solingen',
-            'main_phone' => '+49 212 337056',
-            'mobile_phone' => '+49 176 70512774',
+            'main_phone' => '+49 212 2334322',
+            'mobile_phone' => '+49 176 3033053',
             'more_ps_at' => '',
             'multiply_more_pv' => false,
             'multiply_pv' => false,

tests/Feature/Membership/IndexTest.php

@@ -8,7 +8,6 @@ use App\Member\Membership;
 use Generator;
 use Carbon\Carbon;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
-use PHPUnit\Framework\Attributes\DataProvider;
 use Tests\TestCase;
 
 class IndexTest extends TestCase
@@ -46,14 +45,16 @@ class IndexTest extends TestCase
             ->assertJsonPath('meta.links.store', route('member.membership.store', ['member' => $member]));
     }
 
-    public static function membershipDataProvider(): Generator
+    public function membershipDataProvider(): Generator
     {
         yield [now()->subMonths(2), null, true];
         yield [now()->subMonths(2), now()->subDay(), false];
         yield [now()->addDays(2), null, false];
     }
 
-    #[DataProvider('membershipDataProvider')]
+    /**
+     * @dataProvider membershipDataProvider
+     */
     public function testItShowsIfMembershipIsActive(Carbon $from, ?Carbon $to, bool $isActive): void
     {
         $this->withoutExceptionHandling()->login()->loginNami();

tests/Feature/Remote/RemoteSearchTest.php

@@ -30,7 +30,7 @@ class RemoteSearchTest extends TestCase
     {
         Auth::success(90100, 'secret');
         app(SearchFake::class)->fetches(1, 0, 50, [
-            MemberEntry::toFactory()->toMember(['groupId' => 100, 'id' => 20, 'memberId' => 56, 'firstname' => 'Max', 'lastname' => 'Muster']),
+            MemberEntry::factory()->toMember(['groupId' => 100, 'id' => 20, 'memberId' => 56, 'firstname' => 'Max', 'lastname' => 'Muster']),
         ]);
         $accessToken = $this->loginRemotely()->json('access_token');
 

tests/Lib/CreatesFormFields.php

@@ -18,62 +18,62 @@ use Tests\Feature\Form\FormtemplateFieldRequest;
 
 trait CreatesFormFields
 {
-    protected static function namiField(?string $key = null): FormtemplateFieldRequest
+    protected function namiField(?string $key = null): FormtemplateFieldRequest
     {
-        return FormtemplateFieldRequest::type(NamiField::class)->key($key ?? static::randomKey());
+        return FormtemplateFieldRequest::type(NamiField::class)->key($key ?? $this->randomKey());
     }
 
-    protected static function textField(?string $key = null): FormtemplateFieldRequest
+    protected function textField(?string $key = null): FormtemplateFieldRequest
     {
-        return FormtemplateFieldRequest::type(TextField::class)->key($key ?? static::randomKey());
+        return FormtemplateFieldRequest::type(TextField::class)->key($key ?? $this->randomKey());
     }
 
-    protected static function numberField(?string $key = null): FormtemplateFieldRequest
+    protected function numberField(?string $key = null): FormtemplateFieldRequest
     {
-        return FormtemplateFieldRequest::type(NumberField::class)->key($key ?? static::randomKey());
+        return FormtemplateFieldRequest::type(NumberField::class)->key($key ?? $this->randomKey());
     }
 
-    protected static function emailField(?string $key = null): FormtemplateFieldRequest
+    protected function emailField(?string $key = null): FormtemplateFieldRequest
     {
-        return FormtemplateFieldRequest::type(EmailField::class)->key($key ?? static::randomKey());
+        return FormtemplateFieldRequest::type(EmailField::class)->key($key ?? $this->randomKey());
     }
 
-    protected static function checkboxesField(?string $key = null): FormtemplateFieldRequest
+    protected function checkboxesField(?string $key = null): FormtemplateFieldRequest
     {
-        return FormtemplateFieldRequest::type(CheckboxesField::class)->key($key ?? static::randomKey());
+        return FormtemplateFieldRequest::type(CheckboxesField::class)->key($key ?? $this->randomKey());
     }
 
-    protected static function textareaField(?string $key = null): FormtemplateFieldRequest
+    protected function textareaField(?string $key = null): FormtemplateFieldRequest
     {
-        return FormtemplateFieldRequest::type(TextareaField::class)->key($key ?? static::randomKey());
+        return FormtemplateFieldRequest::type(TextareaField::class)->key($key ?? $this->randomKey());
     }
 
-    protected static function dropdownField(?string $key = null): FormtemplateFieldRequest
+    protected function dropdownField(?string $key = null): FormtemplateFieldRequest
     {
-        return FormtemplateFieldRequest::type(DropdownField::class)->key($key ?? static::randomKey());
+        return FormtemplateFieldRequest::type(DropdownField::class)->key($key ?? $this->randomKey());
     }
 
-    protected static function dateField(?string $key = null): FormtemplateFieldRequest
+    protected function dateField(?string $key = null): FormtemplateFieldRequest
     {
-        return FormtemplateFieldRequest::type(DateField::class)->key($key ?? static::randomKey());
+        return FormtemplateFieldRequest::type(DateField::class)->key($key ?? $this->randomKey());
     }
 
-    protected static function radioField(?string $key = null): FormtemplateFieldRequest
+    protected function radioField(?string $key = null): FormtemplateFieldRequest
     {
-        return FormtemplateFieldRequest::type(RadioField::class)->key($key ?? static::randomKey());
+        return FormtemplateFieldRequest::type(RadioField::class)->key($key ?? $this->randomKey());
     }
 
-    protected static function checkboxField(?string $key = null): FormtemplateFieldRequest
+    protected function checkboxField(?string $key = null): FormtemplateFieldRequest
     {
-        return FormtemplateFieldRequest::type(CheckboxField::class)->key($key ?? static::randomKey());
+        return FormtemplateFieldRequest::type(CheckboxField::class)->key($key ?? $this->randomKey());
     }
 
-    protected static function groupField(?string $key = null): FormtemplateFieldRequest
+    protected function groupField(?string $key = null): FormtemplateFieldRequest
     {
-        return FormtemplateFieldRequest::type(GroupField::class)->key($key ?? static::randomKey());
+        return FormtemplateFieldRequest::type(GroupField::class)->key($key ?? $this->randomKey());
     }
 
-    protected static function randomKey(): string
+    protected function randomKey(): string
     {
         return preg_replace('/[\-0-9]/', '', str()->uuid() . str()->uuid());
     }

tests/Pest.php

@@ -1,54 +0,0 @@
-<?php
-
-/*
-|--------------------------------------------------------------------------
-| Test Case
-|--------------------------------------------------------------------------
-|
-| The closure you provide to your test functions is always bound to a specific PHPUnit test
-| case class. By default, that class is "PHPUnit\Framework\TestCase". Of course, you may
-| need to change it using the "uses()" function to bind a different classes or traits.
-|
-*/
-
-use Symfony\Component\Finder\Finder;
-
-uses(
-    Tests\TestCase::class,
-    // Illuminate\Foundation\Testing\RefreshDatabase::class,
-)->in('Feature');
-
-/*
-|--------------------------------------------------------------------------
-| Expectations
-|--------------------------------------------------------------------------
-|
-| When you're writing tests, you often need to check that values meet certain conditions. The
-| "expect()" function gives you access to a set of "expectations" methods that you can use
-| to assert different things. Of course, you may extend the Expectation API at any time.
-|
-*/
-
-// expect()->extend('toBeOne', function () {
-//     return $this->toBe(1);
-// });
-
-/*
-|--------------------------------------------------------------------------
-| Functions
-|--------------------------------------------------------------------------
-|
-| While Pest is very powerful out-of-the-box, you may have some testing code specific to your
-| project that you don't want to repeat in every file. Here you can also expose helpers as
-| global functions to help you to reduce the number of lines of code in your test files.
-|
-*/
-
-function globArch(string $pattern)
-{
-    $files = iterator_to_array(Finder::create()->files()->in(str($pattern)->replaceStart('App', './app')->replace('\\', '/'))->name('*.php'));
-
-    return collect($files)->map(
-        fn ($file) => str($file->getPathname())->replaceStart('./app', 'App')->replace('/', '\\')->replaceEnd('.php', '')->toString()
-    )->values()->toArray();
-}

tests/TestCase.php

@@ -19,7 +19,7 @@ use Tests\Lib\TestsInertia;
 use Zoomyboy\LaravelNami\Authentication\Auth;
 use Zoomyboy\TableDocument\TestsExcelDocuments;
 
-class TestCase extends BaseTestCase
+abstract class TestCase extends BaseTestCase
 {
     use CreatesApplication;
     use TestsInertia;
@@ -28,7 +28,7 @@ class TestCase extends BaseTestCase
 
     protected User $me;
 
-    protected function setUp(): void
+    public function setUp(): void
     {
         parent::setUp();
         Auth::fake();

tests/Unit/Mailman/ServiceTest.php

@@ -7,7 +7,6 @@ use App\Mailman\Exceptions\MailmanServiceException;
 use App\Mailman\Support\MailmanService;
 use Generator;
 use Illuminate\Support\Facades\Http;
-use PHPUnit\Framework\Attributes\DataProvider;
 use Tests\RequestFactories\MailmanListRequestFactory;
 use Tests\TestCase;
 
@@ -24,7 +23,7 @@ class ServiceTest extends TestCase
         $this->assertTrue($result);
 
         Http::assertSentCount(1);
-        Http::assertSent(fn ($request) => 'GET' === $request->method() && 'http://mailman.test/api/system/versions' === $request->url() && $request->header('Authorization') === ['Basic ' . base64_encode('user:secret')]);
+        Http::assertSent(fn ($request) => 'GET' === $request->method() && 'http://mailman.test/api/system/versions' === $request->url() && $request->header('Authorization') === ['Basic '.base64_encode('user:secret')]);
     }
 
     public function testItFailsWhenChckingCredentials(): void
@@ -38,7 +37,7 @@ class ServiceTest extends TestCase
         $this->assertFalse($result);
 
         Http::assertSentCount(1);
-        Http::assertSent(fn ($request) => 'GET' === $request->method() && 'http://mailman.test/api/system/versions' === $request->url() && $request->header('Authorization') === ['Basic ' . base64_encode('user:secret')]);
+        Http::assertSent(fn ($request) => 'GET' === $request->method() && 'http://mailman.test/api/system/versions' === $request->url() && $request->header('Authorization') === ['Basic '.base64_encode('user:secret')]);
     }
 
     public function testItGetsMembersFromList(): void
@@ -52,12 +51,12 @@ class ServiceTest extends TestCase
             ]), 200),
         ]);
 
-        $result = app(MailmanService::class)->setCredentials('http://mailman.test/api/', 'user', 'secret')->members(MailingList::toFactory()->id('listid')->toData())->first();
+        $result = app(MailmanService::class)->setCredentials('http://mailman.test/api/', 'user', 'secret')->members(MailingList::factory()->id('listid')->toData())->first();
 
         $this->assertEquals(994, $result->memberId);
         $this->assertEquals('test@example.com', $result->email);
         Http::assertSentCount(1);
-        Http::assertSent(fn ($request) => 'GET' === $request->method() && 'http://mailman.test/api/lists/listid/roster/member?page=1&count=10' === $request->url() && $request->header('Authorization') === ['Basic ' . base64_encode('user:secret')]);
+        Http::assertSent(fn ($request) => 'GET' === $request->method() && 'http://mailman.test/api/lists/listid/roster/member?page=1&count=10' === $request->url() && $request->header('Authorization') === ['Basic '.base64_encode('user:secret')]);
     }
 
     public function testItThrowsExceptionWhenLoginFailed(): void
@@ -67,7 +66,7 @@ class ServiceTest extends TestCase
             'http://mailman.test/api/lists/listid/roster/member?page=1&count=10' => Http::response('', 401),
         ]);
 
-        app(MailmanService::class)->setCredentials('http://mailman.test/api/', 'user', 'secret')->members(MailingList::toFactory()->id('listid')->toData())->first();
+        app(MailmanService::class)->setCredentials('http://mailman.test/api/', 'user', 'secret')->members(MailingList::factory()->id('listid')->toData())->first();
     }
 
     public function testItCanGetLists(): void
@@ -90,31 +89,33 @@ class ServiceTest extends TestCase
         $this->assertEquals('Eltern', $lists[0]->displayName);
     }
 
-    public static function listDataProvider(): Generator
+    public function listDataProvider(): Generator
     {
         foreach (range(3, 40) as $i) {
             yield [
                 collect(range(1, $i))
-                    ->map(fn ($num) => ['email' => 'test' . $num . '@example.com', 'self_link' => 'https://example.com/994'])
+                    ->map(fn ($num) => ['email' => 'test'.$num.'@example.com', 'self_link' => 'https://example.com/994'])
                     ->toArray(),
             ];
         }
     }
 
-    #[DataProvider('listDataProvider')]
+    /**
+     * @dataProvider listDataProvider
+     */
     public function testItReturnsMoreThanOneResult(array $totals): void
     {
         $totals = collect($totals);
         foreach ($totals->chunk(10) as $n => $chunk) {
             Http::fake([
-                'http://mailman.test/api/lists/listid/roster/member?page=' . ($n + 1) . '&count=10' => Http::response(json_encode([
+                'http://mailman.test/api/lists/listid/roster/member?page='.($n + 1).'&count=10' => Http::response(json_encode([
                     'entries' => $chunk,
                     'total_size' => $totals->count(),
                 ]), 200),
             ]);
         }
 
-        $result = app(MailmanService::class)->setCredentials('http://mailman.test/api/', 'user', 'secret')->members(MailingList::toFactory()->id('listid')->toData());
+        $result = app(MailmanService::class)->setCredentials('http://mailman.test/api/', 'user', 'secret')->members(MailingList::factory()->id('listid')->toData());
 
         $this->assertCount($totals->count(), $result->toArray());
         Http::assertSentCount($totals->chunk(10)->count());