Merge branch 'main' into directory-refactor

# Conflicts:
#	app/Architecture/Providers/AppServiceProvider.php
#	app/Eloquent/Observers/YearPeriodObserver.php
This commit is contained in:
Adrian Hopek
2022-01-26 08:58:57 +01:00
33 changed files with 979 additions and 55 deletions

View File

@@ -4,6 +4,7 @@ declare(strict_types=1);
namespace Toby\Eloquent\Models;
use Database\Factories\UserFactory;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Relations\HasMany;
@@ -34,7 +35,7 @@ class User extends Authenticatable
protected $casts = [
"employment_form" => EmploymentForm::class,
"employment_date" => "datetime",
"employment_date" => "date",
];
protected $hidden = [
@@ -69,4 +70,9 @@ class User extends Authenticatable
{
return "{$this->first_name} {$this->last_name}";
}
protected static function newFactory(): UserFactory
{
return UserFactory::new();
}
}