diff --git a/_ide_helper_models.php b/_ide_helper_models.php index f331f884..b514759b 100644 --- a/_ide_helper_models.php +++ b/_ide_helper_models.php @@ -19,19 +19,19 @@ * @property string $first_name * @property string $last_name * @property string|null $orcid + * @property bool|null $orcid_verified + * @property string|null $orcid_access_token * @property string $email * @property int $organization_id * @property int|null $user_id - * @property-read \Illuminate\Database\Eloquent\Collection|\OwenIt\Auditing\Models\Audit[] $audits - * @property-read int|null $audits_count * @property-read string $apa_name * @property-read string $full_name - * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\ManuscriptAuthor[] $manuscriptAuthors + * @property-read \Illuminate\Database\Eloquent\Collection $manuscriptAuthors * @property-read int|null $manuscript_authors_count * @property-read \App\Models\Organization $organization * @property-read \App\Models\User|null $user * - * @method static \Database\Factories\AuthorFactory factory(...$parameters) + * @method static \Database\Factories\AuthorFactory factory($count = null, $state = []) * @method static \Illuminate\Database\Eloquent\Builder|Author newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|Author newQuery() * @method static \Illuminate\Database\Eloquent\Builder|Author query() @@ -41,11 +41,76 @@ * @method static \Illuminate\Database\Eloquent\Builder|Author whereId($value) * @method static \Illuminate\Database\Eloquent\Builder|Author whereLastName($value) * @method static \Illuminate\Database\Eloquent\Builder|Author whereOrcid($value) + * @method static \Illuminate\Database\Eloquent\Builder|Author whereOrcidAccessToken($value) + * @method static \Illuminate\Database\Eloquent\Builder|Author whereOrcidVerified($value) * @method static \Illuminate\Database\Eloquent\Builder|Author whereOrganizationId($value) * @method static \Illuminate\Database\Eloquent\Builder|Author whereUpdatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|Author whereUserId($value) */ - class Author extends \Eloquent implements \OwenIt\Auditing\Contracts\Auditable + class Author extends \Eloquent + { + } +} + +namespace App\Models{ + /** + * App\Models\Funder + * + * @property int $id + * @property \Illuminate\Support\Carbon|null $created_at + * @property \Illuminate\Support\Carbon|null $updated_at + * @property string $name_en + * @property string $name_fr + * @property int|null $organization_id + * @property-read \Illuminate\Database\Eloquent\Collection $fundingSources + * @property-read int|null $funding_sources_count + * @property-read \App\Models\Organization|null $organization + * + * @method static \Database\Factories\FunderFactory factory($count = null, $state = []) + * @method static \Illuminate\Database\Eloquent\Builder|Funder newModelQuery() + * @method static \Illuminate\Database\Eloquent\Builder|Funder newQuery() + * @method static \Illuminate\Database\Eloquent\Builder|Funder query() + * @method static \Illuminate\Database\Eloquent\Builder|Funder whereCreatedAt($value) + * @method static \Illuminate\Database\Eloquent\Builder|Funder whereId($value) + * @method static \Illuminate\Database\Eloquent\Builder|Funder whereNameEn($value) + * @method static \Illuminate\Database\Eloquent\Builder|Funder whereNameFr($value) + * @method static \Illuminate\Database\Eloquent\Builder|Funder whereOrganizationId($value) + * @method static \Illuminate\Database\Eloquent\Builder|Funder whereUpdatedAt($value) + */ + class Funder extends \Eloquent + { + } +} + +namespace App\Models{ + /** + * App\Models\FundingSource + * + * @property int $id + * @property \Illuminate\Support\Carbon|null $created_at + * @property \Illuminate\Support\Carbon|null $updated_at + * @property string $title + * @property string|null $description + * @property int $funder_id + * @property string $fundable_type + * @property int $fundable_id + * @property-read \Illuminate\Database\Eloquent\Model|\Eloquent $fundable + * @property-read \App\Models\Funder $funder + * + * @method static \Database\Factories\FundingSourceFactory factory($count = null, $state = []) + * @method static \Illuminate\Database\Eloquent\Builder|FundingSource newModelQuery() + * @method static \Illuminate\Database\Eloquent\Builder|FundingSource newQuery() + * @method static \Illuminate\Database\Eloquent\Builder|FundingSource query() + * @method static \Illuminate\Database\Eloquent\Builder|FundingSource whereCreatedAt($value) + * @method static \Illuminate\Database\Eloquent\Builder|FundingSource whereDescription($value) + * @method static \Illuminate\Database\Eloquent\Builder|FundingSource whereFundableId($value) + * @method static \Illuminate\Database\Eloquent\Builder|FundingSource whereFundableType($value) + * @method static \Illuminate\Database\Eloquent\Builder|FundingSource whereFunderId($value) + * @method static \Illuminate\Database\Eloquent\Builder|FundingSource whereId($value) + * @method static \Illuminate\Database\Eloquent\Builder|FundingSource whereTitle($value) + * @method static \Illuminate\Database\Eloquent\Builder|FundingSource whereUpdatedAt($value) + */ + class FundingSource extends \Eloquent { } } @@ -60,9 +125,11 @@ class Author extends \Eloquent implements \OwenIt\Auditing\Contracts\Auditable * @property string $invitation_token * @property int $user_id * @property int|null $invited_by - * @property string|null $registered_at + * @property \Illuminate\Support\Carbon|null $registered_at + * @property-read \App\Models\User|null $invitedByUser + * @property-read \App\Models\User $user * - * @method static \Database\Factories\InvitationFactory factory(...$parameters) + * @method static \Database\Factories\InvitationFactory factory($count = null, $state = []) * @method static \Illuminate\Database\Eloquent\Builder|Invitation newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|Invitation newQuery() * @method static \Illuminate\Database\Eloquent\Builder|Invitation query() @@ -92,7 +159,7 @@ class Invitation extends \Eloquent * @property string $publisher * * @method static \Illuminate\Database\Eloquent\Builder|Journal dfoSeries() - * @method static \Database\Factories\JournalFactory factory(...$parameters) + * @method static \Database\Factories\JournalFactory factory($count = null, $state = []) * @method static \Illuminate\Database\Eloquent\Builder|Journal newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|Journal newQuery() * @method static \Illuminate\Database\Eloquent\Builder|Journal query() @@ -123,13 +190,11 @@ class Journal extends \Eloquent * @property string|null $comments * @property \App\Enums\ManagementReviewStepStatus $status * @property \App\Enums\ManagementReviewStepDecision|null $decision - * @property-read \Illuminate\Database\Eloquent\Collection|\OwenIt\Auditing\Models\Audit[] $audits - * @property-read int|null $audits_count * @property-read \App\Models\ManuscriptRecord $manuscriptRecord * @property-read ManagementReviewStep|null $previousStep * @property-read \App\Models\User $user * - * @method static \Database\Factories\ManagementReviewStepFactory factory(...$parameters) + * @method static \Database\Factories\ManagementReviewStepFactory factory($count = null, $state = []) * @method static \Illuminate\Database\Eloquent\Builder|ManagementReviewStep newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|ManagementReviewStep newQuery() * @method static \Illuminate\Database\Eloquent\Builder|ManagementReviewStep query() @@ -144,7 +209,7 @@ class Journal extends \Eloquent * @method static \Illuminate\Database\Eloquent\Builder|ManagementReviewStep whereUpdatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|ManagementReviewStep whereUserId($value) */ - class ManagementReviewStep extends \Eloquent implements \OwenIt\Auditing\Contracts\Auditable + class ManagementReviewStep extends \Eloquent { } } @@ -160,13 +225,11 @@ class ManagementReviewStep extends \Eloquent implements \OwenIt\Auditing\Contrac * @property int $author_id * @property int $organization_id * @property bool $is_corresponding_author - * @property-read \Illuminate\Database\Eloquent\Collection|\OwenIt\Auditing\Models\Audit[] $audits - * @property-read int|null $audits_count * @property-read \App\Models\Author $author * @property-read \App\Models\ManuscriptRecord $manuscriptRecord * @property-read \App\Models\Organization $organization * - * @method static \Database\Factories\ManuscriptAuthorFactory factory(...$parameters) + * @method static \Database\Factories\ManuscriptAuthorFactory factory($count = null, $state = []) * @method static \Illuminate\Database\Eloquent\Builder|ManuscriptAuthor newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|ManuscriptAuthor newQuery() * @method static \Illuminate\Database\Eloquent\Builder|ManuscriptAuthor query() @@ -178,7 +241,7 @@ class ManagementReviewStep extends \Eloquent implements \OwenIt\Auditing\Contrac * @method static \Illuminate\Database\Eloquent\Builder|ManuscriptAuthor whereOrganizationId($value) * @method static \Illuminate\Database\Eloquent\Builder|ManuscriptAuthor whereUpdatedAt($value) */ - class ManuscriptAuthor extends \Eloquent implements \OwenIt\Auditing\Contracts\Auditable + class ManuscriptAuthor extends \Eloquent { } } @@ -207,21 +270,22 @@ class ManuscriptAuthor extends \Eloquent implements \OwenIt\Auditing\Contracts\A * @property string|null $submitted_to_journal_on * @property string|null $accepted_on * @property string|null $withdrawn_on - * @property-read \Illuminate\Database\Eloquent\Collection|\OwenIt\Auditing\Models\Audit[] $audits - * @property-read int|null $audits_count - * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\ManagementReviewStep[] $managementReviewSteps + * @property-read \Illuminate\Database\Eloquent\Collection $fundingSources + * @property-read int|null $funding_sources_count + * @property-read \Illuminate\Database\Eloquent\Collection $managementReviewSteps * @property-read int|null $management_review_steps_count - * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\ManuscriptAuthor[] $manuscriptAuthors + * @property-read \Illuminate\Database\Eloquent\Collection $manuscriptAuthors * @property-read int|null $manuscript_authors_count - * @property-read \Spatie\MediaLibrary\MediaCollections\Models\Collections\MediaCollection|\Spatie\MediaLibrary\MediaCollections\Models\Media[] $media + * @property-read \Spatie\MediaLibrary\MediaCollections\Models\Collections\MediaCollection $media * @property-read int|null $media_count + * @property-read \App\Models\Publication|null $publication * @property-read \App\Models\Region $region * @property-read \App\Models\User $user * - * @method static \Database\Factories\ManuscriptRecordFactory factory(...$parameters) + * @method static \Database\Factories\ManuscriptRecordFactory factory($count = null, $state = []) * @method static \Illuminate\Database\Eloquent\Builder|ManuscriptRecord newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|ManuscriptRecord newQuery() - * @method static \Illuminate\Database\Query\Builder|ManuscriptRecord onlyTrashed() + * @method static \Illuminate\Database\Eloquent\Builder|ManuscriptRecord onlyTrashed() * @method static \Illuminate\Database\Eloquent\Builder|ManuscriptRecord query() * @method static \Illuminate\Database\Eloquent\Builder|ManuscriptRecord whereAbstract($value) * @method static \Illuminate\Database\Eloquent\Builder|ManuscriptRecord whereAcceptedOn($value) @@ -243,10 +307,10 @@ class ManuscriptAuthor extends \Eloquent implements \OwenIt\Auditing\Contracts\A * @method static \Illuminate\Database\Eloquent\Builder|ManuscriptRecord whereUpdatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|ManuscriptRecord whereUserId($value) * @method static \Illuminate\Database\Eloquent\Builder|ManuscriptRecord whereWithdrawnOn($value) - * @method static \Illuminate\Database\Query\Builder|ManuscriptRecord withTrashed() - * @method static \Illuminate\Database\Query\Builder|ManuscriptRecord withoutTrashed() + * @method static \Illuminate\Database\Eloquent\Builder|ManuscriptRecord withTrashed() + * @method static \Illuminate\Database\Eloquent\Builder|ManuscriptRecord withoutTrashed() */ - class ManuscriptRecord extends \Eloquent implements \Spatie\MediaLibrary\HasMedia, \OwenIt\Auditing\Contracts\Auditable + class ManuscriptRecord extends \Eloquent implements \Spatie\MediaLibrary\HasMedia, \App\Contracts\Fundable { } } @@ -263,14 +327,12 @@ class ManuscriptRecord extends \Eloquent implements \Spatie\MediaLibrary\HasMedi * @property string $name_fr * @property string|null $abbr_en * @property string|null $abbr_fr - * @property-read \Illuminate\Database\Eloquent\Collection|\OwenIt\Auditing\Models\Audit[] $audits - * @property-read int|null $audits_count - * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Author[] $authors + * @property-read \Illuminate\Database\Eloquent\Collection $authors * @property-read int|null $authors_count - * @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\ManuscriptAuthor[] $manuscriptAuthors + * @property-read \Illuminate\Database\Eloquent\Collection $manuscriptAuthors * @property-read int|null $manuscript_authors_count * - * @method static \Database\Factories\OrganizationFactory factory(...$parameters) + * @method static \Database\Factories\OrganizationFactory factory($count = null, $state = []) * @method static \Illuminate\Database\Eloquent\Builder|Organization newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|Organization newQuery() * @method static \Illuminate\Database\Eloquent\Builder|Organization query() @@ -283,7 +345,7 @@ class ManuscriptRecord extends \Eloquent implements \Spatie\MediaLibrary\HasMedi * @method static \Illuminate\Database\Eloquent\Builder|Organization whereNameFr($value) * @method static \Illuminate\Database\Eloquent\Builder|Organization whereUpdatedAt($value) */ - class Organization extends \Eloquent implements \OwenIt\Auditing\Contracts\Auditable + class Organization extends \Eloquent { } } @@ -296,6 +358,7 @@ class Organization extends \Eloquent implements \OwenIt\Auditing\Contracts\Audit * @property \Illuminate\Support\Carbon|null $created_at * @property \Illuminate\Support\Carbon|null $updated_at * @property \Illuminate\Support\Carbon|null $deleted_at + * @property \App\Enums\PublicationStatus $status accepted, published, etc. * @property string $title * @property string|null $doi * @property \Illuminate\Support\Carbon|null $accepted_on @@ -305,19 +368,24 @@ class Organization extends \Eloquent implements \OwenIt\Auditing\Contracts\Audit * @property int|null $manuscript_record_id * @property int $journal_id * @property int $user_id - * @property-read \Illuminate\Database\Eloquent\Collection|\OwenIt\Auditing\Models\Audit[] $audits - * @property-read int|null $audits_count + * @property-read \Illuminate\Database\Eloquent\Collection $fundingSources + * @property-read int|null $funding_sources_count * @property-read \App\Models\Journal $journal * @property-read \App\Models\ManuscriptRecord|null $manuscriptRecord + * @property-read \Spatie\MediaLibrary\MediaCollections\Models\Collections\MediaCollection $media + * @property-read int|null $media_count + * @property-read \Illuminate\Database\Eloquent\Collection $publicationAuthors + * @property-read int|null $publication_authors_count * @property-read \App\Models\User $user * - * @method static \Database\Factories\PublicationFactory factory(...$parameters) + * @method static \Database\Factories\PublicationFactory factory($count = null, $state = []) * @method static \Illuminate\Database\Eloquent\Builder|Publication newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|Publication newQuery() * @method static \Illuminate\Database\Eloquent\Builder|Publication notUnderEmbargo() - * @method static \Illuminate\Database\Query\Builder|Publication onlyTrashed() + * @method static \Illuminate\Database\Eloquent\Builder|Publication onlyTrashed() * @method static \Illuminate\Database\Eloquent\Builder|Publication openAccess() * @method static \Illuminate\Database\Eloquent\Builder|Publication query() + * @method static \Illuminate\Database\Eloquent\Builder|Publication secondaryPublication() * @method static \Illuminate\Database\Eloquent\Builder|Publication underEmbargo() * @method static \Illuminate\Database\Eloquent\Builder|Publication whereAcceptedOn($value) * @method static \Illuminate\Database\Eloquent\Builder|Publication whereCreatedAt($value) @@ -329,13 +397,46 @@ class Organization extends \Eloquent implements \OwenIt\Auditing\Contracts\Audit * @method static \Illuminate\Database\Eloquent\Builder|Publication whereJournalId($value) * @method static \Illuminate\Database\Eloquent\Builder|Publication whereManuscriptRecordId($value) * @method static \Illuminate\Database\Eloquent\Builder|Publication wherePublishedOn($value) + * @method static \Illuminate\Database\Eloquent\Builder|Publication whereStatus($value) * @method static \Illuminate\Database\Eloquent\Builder|Publication whereTitle($value) * @method static \Illuminate\Database\Eloquent\Builder|Publication whereUpdatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|Publication whereUserId($value) - * @method static \Illuminate\Database\Query\Builder|Publication withTrashed() - * @method static \Illuminate\Database\Query\Builder|Publication withoutTrashed() + * @method static \Illuminate\Database\Eloquent\Builder|Publication withTrashed() + * @method static \Illuminate\Database\Eloquent\Builder|Publication withoutTrashed() + */ + class Publication extends \Eloquent implements \Spatie\MediaLibrary\HasMedia, \App\Contracts\Fundable + { + } +} + +namespace App\Models{ + /** + * App\Models\PublicationAuthor + * + * @property int $id + * @property \Illuminate\Support\Carbon|null $created_at + * @property \Illuminate\Support\Carbon|null $updated_at + * @property int $publication_id + * @property int $author_id + * @property int $organization_id + * @property bool $is_corresponding_author + * @property-read \App\Models\Author $author + * @property-read \App\Models\Organization $organization + * @property-read \App\Models\Publication $publication + * + * @method static \Database\Factories\PublicationAuthorFactory factory($count = null, $state = []) + * @method static \Illuminate\Database\Eloquent\Builder|PublicationAuthor newModelQuery() + * @method static \Illuminate\Database\Eloquent\Builder|PublicationAuthor newQuery() + * @method static \Illuminate\Database\Eloquent\Builder|PublicationAuthor query() + * @method static \Illuminate\Database\Eloquent\Builder|PublicationAuthor whereAuthorId($value) + * @method static \Illuminate\Database\Eloquent\Builder|PublicationAuthor whereCreatedAt($value) + * @method static \Illuminate\Database\Eloquent\Builder|PublicationAuthor whereId($value) + * @method static \Illuminate\Database\Eloquent\Builder|PublicationAuthor whereIsCorrespondingAuthor($value) + * @method static \Illuminate\Database\Eloquent\Builder|PublicationAuthor whereOrganizationId($value) + * @method static \Illuminate\Database\Eloquent\Builder|PublicationAuthor wherePublicationId($value) + * @method static \Illuminate\Database\Eloquent\Builder|PublicationAuthor whereUpdatedAt($value) */ - class Publication extends \Eloquent implements \OwenIt\Auditing\Contracts\Auditable + class PublicationAuthor extends \Eloquent { } } @@ -373,26 +474,32 @@ class Region extends \Eloquent * @property string $last_name * @property string $email * @property \Illuminate\Support\Carbon|null $email_verified_at - * @property string $password + * @property string|null $email_verification_token + * @property string|null $password + * @property string $locale * @property string|null $remember_token - * @property int $active + * @property bool $active + * @property bool $new_password_required * @property \Illuminate\Support\Carbon|null $created_at * @property \Illuminate\Support\Carbon|null $updated_at - * @property-read \Illuminate\Database\Eloquent\Collection|\OwenIt\Auditing\Models\Audit[] $audits - * @property-read int|null $audits_count + * @property-read \Illuminate\Database\Eloquent\Collection $authentications + * @property-read int|null $authentications_count * @property-read \App\Models\Author|null $author * @property-read string $full_name * @property-read \App\Models\Invitation|null $invitation - * @property-read \Illuminate\Notifications\DatabaseNotificationCollection|\Illuminate\Notifications\DatabaseNotification[] $notifications + * @property-read \Rappasoft\LaravelAuthenticationLog\Models\AuthenticationLog|null $latestAuthentication + * @property-read \Illuminate\Notifications\DatabaseNotificationCollection $notifications * @property-read int|null $notifications_count - * @property-read \Illuminate\Database\Eloquent\Collection|\Spatie\Permission\Models\Permission[] $permissions + * @property-read \Illuminate\Database\Eloquent\Collection $permissions * @property-read int|null $permissions_count - * @property-read \Illuminate\Database\Eloquent\Collection|\Spatie\Permission\Models\Role[] $roles + * @property-read \Illuminate\Database\Eloquent\Collection $roles * @property-read int|null $roles_count - * @property-read \Illuminate\Database\Eloquent\Collection|\Laravel\Sanctum\PersonalAccessToken[] $tokens + * @property-read \Illuminate\Database\Eloquent\Collection $sentInvitations + * @property-read int|null $sent_invitations_count + * @property-read \Illuminate\Database\Eloquent\Collection $tokens * @property-read int|null $tokens_count * - * @method static \Database\Factories\UserFactory factory(...$parameters) + * @method static \Database\Factories\UserFactory factory($count = null, $state = []) * @method static \Illuminate\Database\Eloquent\Builder|User newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|User newQuery() * @method static \Illuminate\Database\Eloquent\Builder|User permission($permissions) @@ -401,15 +508,18 @@ class Region extends \Eloquent * @method static \Illuminate\Database\Eloquent\Builder|User whereActive($value) * @method static \Illuminate\Database\Eloquent\Builder|User whereCreatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|User whereEmail($value) + * @method static \Illuminate\Database\Eloquent\Builder|User whereEmailVerificationToken($value) * @method static \Illuminate\Database\Eloquent\Builder|User whereEmailVerifiedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|User whereFirstName($value) * @method static \Illuminate\Database\Eloquent\Builder|User whereId($value) * @method static \Illuminate\Database\Eloquent\Builder|User whereLastName($value) + * @method static \Illuminate\Database\Eloquent\Builder|User whereLocale($value) + * @method static \Illuminate\Database\Eloquent\Builder|User whereNewPasswordRequired($value) * @method static \Illuminate\Database\Eloquent\Builder|User wherePassword($value) * @method static \Illuminate\Database\Eloquent\Builder|User whereRememberToken($value) * @method static \Illuminate\Database\Eloquent\Builder|User whereUpdatedAt($value) */ - class User extends \Eloquent implements \Illuminate\Contracts\Auth\MustVerifyEmail, \OwenIt\Auditing\Contracts\Auditable + class User extends \Eloquent implements \Illuminate\Contracts\Auth\MustVerifyEmail, \Illuminate\Contracts\Translation\HasLocalePreference { } } diff --git a/app/Http/Controllers/ManuscriptRecordFundingSourceController.php b/app/Http/Controllers/ManuscriptRecordFundingSourceController.php index dc528018..b7bd4e8b 100644 --- a/app/Http/Controllers/ManuscriptRecordFundingSourceController.php +++ b/app/Http/Controllers/ManuscriptRecordFundingSourceController.php @@ -38,7 +38,7 @@ public function store(ManuscriptRecord $manuscriptRecord, Request $request): Jso 'description' => 'nullable|string|max:1500', ]); - $fundingSource = FundingSource::make([ + $fundingSource = new FundingSource([ 'funder_id' => $validated['funder_id'], 'title' => $validated['title'], 'description' => $validated['description'], diff --git a/app/Http/Controllers/PublicationController.php b/app/Http/Controllers/PublicationController.php index 5178e15a..c17f1043 100644 --- a/app/Http/Controllers/PublicationController.php +++ b/app/Http/Controllers/PublicationController.php @@ -59,7 +59,7 @@ public function store(Request $request): JsonResource ]); // create the publication - $publication = Publication::make($validated); + $publication = new Publication($validated); $publication->user_id = $request->user()->id; $publication->save(); diff --git a/app/Http/Controllers/PublicationFundingSourceController.php b/app/Http/Controllers/PublicationFundingSourceController.php index 33f939ec..c61a017e 100644 --- a/app/Http/Controllers/PublicationFundingSourceController.php +++ b/app/Http/Controllers/PublicationFundingSourceController.php @@ -38,7 +38,7 @@ public function store(Publication $publication, Request $request): JsonResource 'description' => 'nullable|string|max:1500', ]); - $fundingSource = FundingSource::make([ + $fundingSource = new FundingSource([ 'funder_id' => $validated['funder_id'], 'title' => $validated['title'], 'description' => $validated['description'], diff --git a/app/Models/Invitation.php b/app/Models/Invitation.php index 6404b97c..66eb85cd 100644 --- a/app/Models/Invitation.php +++ b/app/Models/Invitation.php @@ -4,6 +4,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\Relations\BelongsTo; use Str; use URL; @@ -30,7 +31,7 @@ class Invitation extends Model /** * Get the user that owns the invitation. */ - public function user() + public function user(): BelongsTo { return $this->belongsTo(User::class); } @@ -38,7 +39,7 @@ public function user() /** * Get the user that invited the user. */ - public function invitedByUser() + public function invitedByUser(): BelongsTo { return $this->belongsTo(User::class, 'invited_by'); } diff --git a/composer.json b/composer.json index 1ace9f74..c90b2acb 100644 --- a/composer.json +++ b/composer.json @@ -32,6 +32,7 @@ "laravel/sail": "^1.18.1", "mockery/mockery": "^1.5.1", "nunomaduro/collision": "^6.4.0", + "nunomaduro/larastan": "^2.0", "orangehill/iseed": "^3.0.2", "pestphp/pest": "^1.22.3", "pestphp/pest-plugin-laravel": "^1.4", diff --git a/composer.lock b/composer.lock index b7728236..fde5c0cc 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "1e163bb1528499be2f3f84378ceef672", + "content-hash": "a6f79f643e66aaad2c042d440b64093d", "packages": [ { "name": "brick/math", diff --git a/phpstan.neon b/phpstan.neon new file mode 100644 index 00000000..b05a6c2a --- /dev/null +++ b/phpstan.neon @@ -0,0 +1,19 @@ +includes: + - ./vendor/nunomaduro/larastan/extension.neon + +parameters: + + paths: + - app + - database + + # Level 9 is the highest level + level: 1 + +# ignoreErrors: +# - '#PHPDoc tag @var#' +# +# excludePaths: +# - ./*/*/FileToBeExcluded.php +# +# checkMissingIterableValueType: false \ No newline at end of file