Skip to content

upgraded to native enums #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions database/factories/TaskFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

use Carbon\Carbon;
use Illuminate\Database\Eloquent\Factories\Factory;
use LaravelEnso\Tasks\Enums\Flags;
use LaravelEnso\Tasks\Enums\Flag;
use LaravelEnso\Tasks\Models\Task;
use LaravelEnso\Users\Models\User;

Expand All @@ -20,13 +20,17 @@ public function definition()
return [
'name' => $this->faker->name,
'description' => $this->faker->text,
'flag' => $this->faker->boolean ? Flags::keys()->random() : null,
'flag' => $this->faker->boolean
? Flag::random()->value
: null,
'completed' => $this->faker->boolean,
'reminder' => $reminder,
'allocated_to' => $user->id,
'created_by' => $user->id,
'updated_by' => $user->id,
'reminded_at' => $reminder && $this->faker->boolean ? $this->faker->dateTimeBetween($reminder, Carbon::createFromTimestamp($reminder->getTimestamp())->addMinute()) : null,
'reminded_at' => $reminder && $this->faker->boolean
? $this->faker->dateTimeBetween($reminder, Carbon::createFromTimestamp($reminder->getTimestamp())->addMinute())
: null,
];
}
}
4 changes: 2 additions & 2 deletions src/Calendars/TaskCalendar.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
use Carbon\Carbon;
use Illuminate\Support\Collection;
use LaravelEnso\Calendar\Contracts\CustomCalendar;
use LaravelEnso\Calendar\Enums\Colors;
use LaravelEnso\Calendar\Enums\Color;
use LaravelEnso\Tasks\Models\Task;

class TaskCalendar implements CustomCalendar
Expand All @@ -22,7 +22,7 @@ public function name(): string

public function color(): string
{
return Colors::Red;
return Color::Red->value;
}

public function private(): bool
Expand Down
4 changes: 2 additions & 2 deletions src/Calendars/TaskEvent.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
use LaravelEnso\Calendar\Contracts\ProvidesEvent;
use LaravelEnso\Calendar\Contracts\Routable;
use LaravelEnso\Calendar\DTOs\Route;
use LaravelEnso\Calendar\Enums\Frequencies;
use LaravelEnso\Calendar\Enums\Frequency;
use LaravelEnso\Tasks\Models\Task;

class TaskEvent implements ProvidesEvent, Routable
Expand Down Expand Up @@ -53,7 +53,7 @@ public function getCalendar(): Calendar

public function frequency(): int
{
return Frequencies::Once;
return Frequency::Once->value;
}

public function recurrenceEnds(): ?Carbon
Expand Down
5 changes: 1 addition & 4 deletions src/EnumServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,8 @@
namespace LaravelEnso\Tasks;

use LaravelEnso\Enums\EnumServiceProvider as ServiceProvider;
use LaravelEnso\Tasks\Enums\Flags;

class EnumServiceProvider extends ServiceProvider
{
public $register = [
'flags' => Flags::class,
];
public $register = [];
}
18 changes: 18 additions & 0 deletions src/Enums/Flag.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?php

namespace LaravelEnso\Tasks\Enums;

use LaravelEnso\Enums\Contracts\Frontend;

enum Flag: int implements Frontend
{
case Danger = 1;
case Warning = 2;
case Info = 3;
case Success = 4;

public static function registerBy(): string
{
return 'flags';
}
}
13 changes: 0 additions & 13 deletions src/Enums/Flags.php

This file was deleted.

6 changes: 4 additions & 2 deletions src/Http/Requests/ValidateTask.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@

use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Support\Carbon;
use LaravelEnso\Tasks\Enums\Flags;
use Illuminate\Validation\Rule;
use LaravelEnso\Tasks\Enums\Flag;

use LaravelEnso\Tasks\Models\Task;

class ValidateTask extends FormRequest
Expand All @@ -19,7 +21,7 @@ public function rules()
return [
'name' => "{$this->requiredOrFilled()}|string|max:256",
'description' => 'filled|max:4096',
'flag' => 'nullable|in:'.Flags::keys()->implode(','),
'flag' => ['nullable', Rule::in(array_column(Flag::cases(), 'value'))],
'reminder' => 'nullable|date',
'allocated_to' => "{$this->requiredOrFilled()}|exists:users,id",
'completed' => "{$this->requiredOrFilled()}|boolean",
Expand Down
2 changes: 1 addition & 1 deletion src/Tables/Templates/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"sortable",
"slot"
],
"enum": "LaravelEnso\\Tasks\\Enums\\Flags"
"enum": "LaravelEnso\\Tasks\\Enums\\Flag"
}, {
"label": "Reminder",
"name": "reminder",
Expand Down