Laravel 11 (#84)

* Convert string references to `::class`

PHP 5.5.9 adds the new static `class` property which provides the fully qualified class name. This is preferred over using strings for class names since the `class` property references are checked by PHP.

* Use Faker methods

Accessing Faker properties was deprecated in Faker 1.14.

* Convert route options to fluent methods

Laravel 8 adopts the tuple syntax for controller actions. Since the old options array is incompatible with this syntax, Shift converted them to use modern, fluent methods.

* Adopt class based routes

* Remove default `app` files

* Shift core files

* Streamline config files

* Set new `ENV` variables

* Default new `bootstrap/app.php`

* Re-register HTTP middleware

* Consolidate service providers

* Re-register service providers

* Re-register routes

* Re-register scheduled commands

* Bump Composer dependencies

* Use `<env>` tags for configuration

`<env>` tags have a lower precedence than system environment variables making it easier to overwrite PHPUnit configuration values in additional environments, such a CI.

Review this blog post for more details on configuration precedence when testing Laravel: https://jasonmccreary.me/articles/laravel-testing-configuration-precedence/

* Adopt anonymous migrations

* Rename `password_resets` table

* Convert `$casts` property to method

* Adopt Laravel type hints

* Mark base controller as `abstract`

* Remove `CreatesApplication` testing trait

* Shift cleanup

* Fix shift first issues

* Updating Rules for laravel 11, sanctum config and pint

* Fix Carbon issue on dashboard

* Temporary fix for tests while migration is issue fixed on laravel side

* Carbon needs numerical values, not strings

* Minimum php version

* Fix domain installation step not fetching the correct company_id

* Fix Role Policy wasn't properly registered

---------
This commit is contained in:
mchev
2024-06-05 11:33:52 +02:00
committed by GitHub
parent 72311db1bd
commit 3259173066
656 changed files with 4964 additions and 7944 deletions

View File

@@ -1,15 +1,19 @@
<?php
namespace InvoiceShelf\Models;
namespace App\Models;
use App\Http\Requests\UserRequest;
use App\Notifications\MailResetPasswordNotification;
use App\Traits\HasCustomFieldsTrait;
use Carbon\Carbon;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\Relations\HasOne;
use Illuminate\Foundation\Auth\User as Authenticatable;
use Illuminate\Notifications\Notifiable;
use Illuminate\Support\Facades\Schema;
use InvoiceShelf\Http\Requests\UserRequest;
use InvoiceShelf\Notifications\MailResetPasswordNotification;
use InvoiceShelf\Traits\HasCustomFieldsTrait;
use Laravel\Sanctum\HasApiTokens;
use Silber\Bouncer\BouncerFacade;
use Silber\Bouncer\Database\HasRolesAndAbilities;
@@ -87,77 +91,80 @@ class User extends Authenticatable implements HasMedia
public function getFormattedCreatedAtAttribute($value)
{
$dateFormat = CompanySetting::getSetting('carbon_date_format', request()->header('company'));
$company_id = (CompanySetting::where('company_id', request()->header('company'))->exists())
? request()->header('company')
: $this->companies()->first()->id;
$dateFormat = CompanySetting::getSetting('carbon_date_format', $company_id);
return Carbon::parse($this->created_at)->format($dateFormat);
}
public function estimates()
public function estimates(): HasMany
{
return $this->hasMany(Estimate::class, 'creator_id');
}
public function customers()
public function customers(): HasMany
{
return $this->hasMany(Customer::class, 'creator_id');
}
public function recurringInvoices()
public function recurringInvoices(): HasMany
{
return $this->hasMany(RecurringInvoice::class, 'creator_id');
}
public function currency()
public function currency(): BelongsTo
{
return $this->belongsTo(Currency::class, 'currency_id');
}
public function creator()
public function creator(): BelongsTo
{
return $this->belongsTo('InvoiceShelf\Models\User', 'creator_id');
return $this->belongsTo(\App\Models\User::class, 'creator_id');
}
public function companies()
public function companies(): BelongsToMany
{
return $this->belongsToMany(Company::class, 'user_company', 'user_id', 'company_id');
}
public function expenses()
public function expenses(): HasMany
{
return $this->hasMany(Expense::class, 'creator_id');
}
public function payments()
public function payments(): HasMany
{
return $this->hasMany(Payment::class, 'creator_id');
}
public function invoices()
public function invoices(): HasMany
{
return $this->hasMany(Invoice::class, 'creator_id');
}
public function items()
public function items(): HasMany
{
return $this->hasMany(Item::class, 'creator_id');
}
public function settings()
public function settings(): HasMany
{
return $this->hasMany(UserSetting::class, 'user_id');
}
public function addresses()
public function addresses(): HasMany
{
return $this->hasMany(Address::class);
}
public function billingAddress()
public function billingAddress(): HasOne
{
return $this->hasOne(Address::class)->where('type', Address::BILLING_TYPE);
}
public function shippingAddress()
public function shippingAddress(): HasOne
{
return $this->hasOne(Address::class)->where('type', Address::SHIPPING_TYPE);
}