From 5d3efb625477f4412d0360244737a7524e7f5149 Mon Sep 17 00:00:00 2001 From: Igor Scheller Date: Sun, 28 Jul 2019 19:13:05 +0200 Subject: Models: Updated method and property hints --- src/Models/User/Contact.php | 9 ++++--- src/Models/User/HasUserModel.php | 7 +++--- src/Models/User/PasswordReset.php | 12 ++++++--- src/Models/User/PersonalData.php | 24 ++++++++++-------- src/Models/User/Settings.php | 11 ++++++--- src/Models/User/State.php | 28 ++++++++++++--------- src/Models/User/User.php | 52 +++++++++++++++++++++------------------ 7 files changed, 83 insertions(+), 60 deletions(-) (limited to 'src/Models/User') diff --git a/src/Models/User/Contact.php b/src/Models/User/Contact.php index 9b4bdb2b..84c2e8f8 100644 --- a/src/Models/User/Contact.php +++ b/src/Models/User/Contact.php @@ -2,14 +2,17 @@ namespace Engelsystem\Models\User; +use Illuminate\Database\Eloquent\Collection; +use Illuminate\Database\Query\Builder as QueryBuilder; + /** * @property string|null $dect * @property string|null $email * @property string|null $mobile * - * @method static \Illuminate\Database\Query\Builder|\Engelsystem\Models\User\Contact[] whereDect($value) - * @method static \Illuminate\Database\Query\Builder|\Engelsystem\Models\User\Contact[] whereEmail($value) - * @method static \Illuminate\Database\Query\Builder|\Engelsystem\Models\User\Contact[] whereMobile($value) + * @method static QueryBuilder|Collection|Contact[] whereDect($value) + * @method static QueryBuilder|Collection|Contact[] whereEmail($value) + * @method static QueryBuilder|Collection|Contact[] whereMobile($value) */ class Contact extends HasUserModel { diff --git a/src/Models/User/HasUserModel.php b/src/Models/User/HasUserModel.php index 6d1323de..4c2e15b0 100644 --- a/src/Models/User/HasUserModel.php +++ b/src/Models/User/HasUserModel.php @@ -4,13 +4,14 @@ namespace Engelsystem\Models\User; use Engelsystem\Models\BaseModel; use Illuminate\Database\Eloquent\Relations\BelongsTo; +use Illuminate\Database\Query\Builder as QueryBuilder; /** - * @property integer $user_id + * @property integer $user_id * - * @property-read \Illuminate\Database\Query\Builder|\Engelsystem\Models\User\User $user + * @property-read QueryBuilder|User $user * - * @method static \Illuminate\Database\Query\Builder|static whereUserId($value) + * @method static QueryBuilder|static whereUserId($value) */ abstract class HasUserModel extends BaseModel { diff --git a/src/Models/User/PasswordReset.php b/src/Models/User/PasswordReset.php index 5cf66953..6e19a2db 100644 --- a/src/Models/User/PasswordReset.php +++ b/src/Models/User/PasswordReset.php @@ -2,12 +2,16 @@ namespace Engelsystem\Models\User; +use Carbon\Carbon; +use Illuminate\Database\Eloquent\Collection; +use Illuminate\Database\Query\Builder as QueryBuilder; + /** - * @property string $token - * @property \Carbon\Carbon|null $created_at + * @property string $token + * @property Carbon|null $created_at * - * @method static \Illuminate\Database\Query\Builder|\Engelsystem\Models\User\PasswordReset[] whereToken($value) - * @method static \Illuminate\Database\Query\Builder|\Engelsystem\Models\User\PasswordReset[] whereCreatedAt($value) + * @method static QueryBuilder|Collection|PasswordReset[] whereToken($value) + * @method static QueryBuilder|Collection|PasswordReset[] whereCreatedAt($value) */ class PasswordReset extends HasUserModel { diff --git a/src/Models/User/PersonalData.php b/src/Models/User/PersonalData.php index 921e821e..dd5f9646 100644 --- a/src/Models/User/PersonalData.php +++ b/src/Models/User/PersonalData.php @@ -2,18 +2,22 @@ namespace Engelsystem\Models\User; +use Carbon\Carbon; +use Illuminate\Database\Eloquent\Collection; +use Illuminate\Database\Query\Builder as QueryBuilder; + /** - * @property string|null $first_name - * @property string|null $last_name - * @property string|null $shirt_size - * @property \Carbon\Carbon|null $planned_arrival_date - * @property \Carbon\Carbon|null $planned_departure_date + * @property string|null $first_name + * @property string|null $last_name + * @property string|null $shirt_size + * @property Carbon|null $planned_arrival_date + * @property Carbon|null $planned_departure_date * - * @method static \Illuminate\Database\Query\Builder|\Engelsystem\Models\User\PersonalData[] whereFirstName($value) - * @method static \Illuminate\Database\Query\Builder|\Engelsystem\Models\User\PersonalData[] whereLastName($value) - * @method static \Illuminate\Database\Query\Builder|\Engelsystem\Models\User\PersonalData[] whereShirtSize($value) - * @method static \Illuminate\Database\Query\Builder|\Engelsystem\Models\User\PersonalData[] wherePlannedArrivalDate($value) - * @method static \Illuminate\Database\Query\Builder|\Engelsystem\Models\User\PersonalData[] wherePlannedDepartureDate($value) + * @method static QueryBuilder|Collection|PersonalData[] whereFirstName($value) + * @method static QueryBuilder|Collection|PersonalData[] whereLastName($value) + * @method static QueryBuilder|Collection|PersonalData[] whereShirtSize($value) + * @method static QueryBuilder|Collection|PersonalData[] wherePlannedArrivalDate($value) + * @method static QueryBuilder|Collection|PersonalData[] wherePlannedDepartureDate($value) */ class PersonalData extends HasUserModel { diff --git a/src/Models/User/Settings.php b/src/Models/User/Settings.php index d062f902..0fe213eb 100644 --- a/src/Models/User/Settings.php +++ b/src/Models/User/Settings.php @@ -2,16 +2,19 @@ namespace Engelsystem\Models\User; +use Illuminate\Database\Eloquent\Collection; +use Illuminate\Database\Query\Builder as QueryBuilder; + /** * @property string $language * @property int $theme * @property bool $email_human * @property bool $email_shiftinfo * - * @method static \Illuminate\Database\Query\Builder|\Engelsystem\Models\User\Settings[] whereLanguage($value) - * @method static \Illuminate\Database\Query\Builder|\Engelsystem\Models\User\Settings[] whereTheme($value) - * @method static \Illuminate\Database\Query\Builder|\Engelsystem\Models\User\Settings[] whereEmailHuman($value) - * @method static \Illuminate\Database\Query\Builder|\Engelsystem\Models\User\Settings[] whereEmailShiftinfo($value) + * @method static QueryBuilder|Collection|Settings[] whereLanguage($value) + * @method static QueryBuilder|Collection|Settings[] whereTheme($value) + * @method static QueryBuilder|Collection|Settings[] whereEmailHuman($value) + * @method static QueryBuilder|Collection|Settings[] whereEmailShiftinfo($value) */ class Settings extends HasUserModel { diff --git a/src/Models/User/State.php b/src/Models/User/State.php index fbb8ad20..2ccf909f 100644 --- a/src/Models/User/State.php +++ b/src/Models/User/State.php @@ -2,20 +2,24 @@ namespace Engelsystem\Models\User; +use Carbon\Carbon; +use Illuminate\Database\Eloquent\Collection; +use Illuminate\Database\Query\Builder as QueryBuilder; + /** - * @property bool $arrived - * @property \Carbon\Carbon|null $arrival_date - * @property bool $active - * @property bool $force_active - * @property bool $got_shirt - * @property int $got_voucher + * @property bool $arrived + * @property Carbon|null $arrival_date + * @property bool $active + * @property bool $force_active + * @property bool $got_shirt + * @property int $got_voucher * - * @method static \Illuminate\Database\Query\Builder|\Engelsystem\Models\User\State[] whereArrived($value) - * @method static \Illuminate\Database\Query\Builder|\Engelsystem\Models\User\State[] whereArrivalDate($value) - * @method static \Illuminate\Database\Query\Builder|\Engelsystem\Models\User\State[] whereActive($value) - * @method static \Illuminate\Database\Query\Builder|\Engelsystem\Models\User\State[] whereForceActive($value) - * @method static \Illuminate\Database\Query\Builder|\Engelsystem\Models\User\State[] whereGotShirt($value) - * @method static \Illuminate\Database\Query\Builder|\Engelsystem\Models\User\State[] whereGotVoucher($value) + * @method static QueryBuilder|Collection|State[] whereArrived($value) + * @method static QueryBuilder|Collection|State[] whereArrivalDate($value) + * @method static QueryBuilder|Collection|State[] whereActive($value) + * @method static QueryBuilder|Collection|State[] whereForceActive($value) + * @method static QueryBuilder|Collection|State[] whereGotShirt($value) + * @method static QueryBuilder|Collection|State[] whereGotVoucher($value) */ class State extends HasUserModel { diff --git a/src/Models/User/User.php b/src/Models/User/User.php index b92ed5fe..d04693c8 100644 --- a/src/Models/User/User.php +++ b/src/Models/User/User.php @@ -2,40 +2,44 @@ namespace Engelsystem\Models\User; +use Carbon\Carbon; +use Engelsystem\Models\Auth\Permission; use Engelsystem\Models\Auth\Role; use Engelsystem\Models\BaseModel; use Engelsystem\Models\Team; +use Illuminate\Database\Eloquent\Collection; use Illuminate\Database\Eloquent\Relations\BelongsToMany; use Illuminate\Database\Eloquent\Relations\HasOne; +use Illuminate\Database\Query\Builder as QueryBuilder; use Staudenmeir\EloquentHasManyDeep\HasManyDeep; /** - * @property integer $id - * @property string $name - * @property string $email - * @property string $password - * @property string $api_key - * @property \Carbon\Carbon|null $last_login_at - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at + * @property integer $id + * @property string $name + * @property string $email + * @property string $password + * @property string $api_key + * @property Carbon|null $last_login_at + * @property Carbon $created_at + * @property Carbon $updated_at * - * @property-read \Illuminate\Database\Query\Builder|\Engelsystem\Models\User\Contact $contact - * @property-read \Illuminate\Database\Query\Builder|\Engelsystem\Models\User\PersonalData $personalData - * @property-read \Illuminate\Database\Query\Builder|\Engelsystem\Models\User\Settings $settings - * @property-read \Illuminate\Database\Query\Builder|\Engelsystem\Models\User\State $state - * @property-read \Illuminate\Database\Query\Builder|\Engelsystem\Models\Auth\Permission[] $permissions - * @property-read \Illuminate\Database\Query\Builder|\Engelsystem\Models\Auth\Role[] $roles - * @property-read \Illuminate\Database\Query\Builder|\Engelsystem\Models\Team[] $supports - * @property-read \Illuminate\Database\Query\Builder|\Engelsystem\Models\Team[] $teams + * @property-read QueryBuilder|Contact $contact + * @property-read QueryBuilder|PersonalData $personalData + * @property-read QueryBuilder|Settings $settings + * @property-read QueryBuilder|State $state + * @property-read QueryBuilder|Collection|Permission[] $permissions + * @property-read QueryBuilder|Collection|Role[] $roles + * @property-read QueryBuilder|Collection|Team[] $supports + * @property-read QueryBuilder|Collection|Team[] $teams * - * @method static \Illuminate\Database\Query\Builder|\Engelsystem\Models\User\User whereId($value) - * @method static \Illuminate\Database\Query\Builder|\Engelsystem\Models\User\User[] whereName($value) - * @method static \Illuminate\Database\Query\Builder|\Engelsystem\Models\User\User[] whereEmail($value) - * @method static \Illuminate\Database\Query\Builder|\Engelsystem\Models\User\User[] wherePassword($value) - * @method static \Illuminate\Database\Query\Builder|\Engelsystem\Models\User\User[] whereApiKey($value) - * @method static \Illuminate\Database\Query\Builder|\Engelsystem\Models\User\User[] whereLastLoginAt($value) - * @method static \Illuminate\Database\Query\Builder|\Engelsystem\Models\User\User[] whereCreatedAt($value) - * @method static \Illuminate\Database\Query\Builder|\Engelsystem\Models\User\User[] whereUpdatedAt($value) + * @method static QueryBuilder|User whereId($value) + * @method static QueryBuilder|Collection|User[] whereName($value) + * @method static QueryBuilder|Collection|User[] whereEmail($value) + * @method static QueryBuilder|Collection|User[] wherePassword($value) + * @method static QueryBuilder|Collection|User[] whereApiKey($value) + * @method static QueryBuilder|Collection|User[] whereLastLoginAt($value) + * @method static QueryBuilder|Collection|User[] whereCreatedAt($value) + * @method static QueryBuilder|Collection|User[] whereUpdatedAt($value) */ class User extends BaseModel { -- cgit v1.2.3-54-g00ecf