diff --git a/app/Contracts/Model.php b/app/Contracts/Model.php index 20e94c97..bb9d0ddc 100644 --- a/app/Contracts/Model.php +++ b/app/Contracts/Model.php @@ -6,25 +6,17 @@ namespace App\Contracts; * @property mixed $id * @property bool $skip_mutator * - * @method static Model create(array $attrs) - * @method static Model find(int $id) - * @method static Model select(array $array) - * @method static Model where(array $array) - * @method static Model firstOrCreate(array $where, array $array) - * @method static Model updateOrCreate(array $array, array $attrs) - * @method static truncate() - * @method Model orderBy(string $column, string $order) - * @method Model limit(int $limit) - * @method Model first() + * @mixin \Illuminate\Database\Eloquent\Builder */ abstract class Model extends \Illuminate\Database\Eloquent\Model { + /** + * Max length of ID for string columns + */ public const ID_MAX_LENGTH = 12; /** * For the factories, skip the mutators. Only apply to one instance - * - * @var bool */ public $skip_mutator = false; } diff --git a/app/Models/Role.php b/app/Models/Role.php index b18a877e..f2684a38 100644 --- a/app/Models/Role.php +++ b/app/Models/Role.php @@ -5,9 +5,7 @@ namespace App\Models; use Laratrust\Models\LaratrustRole; /** - * @method static where(string $string, $group) - * @method static firstOrCreate(array $array, array $array1) - * @method static truncate() + * @mixin \Illuminate\Database\Eloquent\Builder */ class Role extends LaratrustRole { diff --git a/app/Models/User.php b/app/Models/User.php index eae1e6b6..d306a3c8 100755 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -35,9 +35,7 @@ use Laratrust\Traits\LaratrustUserTrait; * @property bool opt_in * @property string last_pirep_id * - * @method static updateOrCreate(array $array, array $attrs) - * @method static where() - * @method static truncate() + * @mixin \Illuminate\Database\Eloquent\Builder * @mixin \Illuminate\Notifications\Notifiable * @mixin \Laratrust\Traits\LaratrustUserTrait */ diff --git a/app/Repositories/AirlineRepository.php b/app/Repositories/AirlineRepository.php index d4581871..896a8123 100644 --- a/app/Repositories/AirlineRepository.php +++ b/app/Repositories/AirlineRepository.php @@ -7,9 +7,6 @@ use App\Models\Airline; use Prettus\Repository\Contracts\CacheableInterface; use Prettus\Repository\Traits\CacheableRepository; -/** - * Class AirlineRepository - */ class AirlineRepository extends Repository implements CacheableInterface { use CacheableRepository; diff --git a/app/Services/UserService.php b/app/Services/UserService.php index 07c2481c..9d46c1ac 100644 --- a/app/Services/UserService.php +++ b/app/Services/UserService.php @@ -92,7 +92,7 @@ class UserService extends Service */ public function addUserToRole(User $user, $roleName): User { - $role = Role::where('name', $roleName)->first(); + $role = Role::where(['name' => $roleName])->first(); $user->attachRole($role); return $user;