Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[8.x] Remove invalid docblock #37077

Merged
merged 1 commit into from
Apr 21, 2021
Merged

[8.x] Remove invalid docblock #37077

merged 1 commit into from
Apr 21, 2021

Conversation

jrmajor
Copy link
Contributor

@jrmajor jrmajor commented Apr 21, 2021

Introduced in #37022.

Now when I call $someModel->restore(), PHPStan uses this docblock:

framework/src/Illuminate/Database/Eloquent/SoftDeletes.php

Line 9 in 68a269a

* @method static static|\Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder restore()

Instead of the correct one:

framework/src/Illuminate/Database/Eloquent/SoftDeletes.php

Lines 102 to 107 in 68a269a

/**
* Restore a soft-deleted model instance.
*
* @return bool|null
*/
public function restore()

PhpStorm also complains about that:

image

@taylorotwell taylorotwell merged commit 597f5ab into laravel:8.x Apr 21, 2021
@jrmajor jrmajor deleted the fix-docblock branch April 21, 2021 22:21
@driesvints driesvints mentioned this pull request Apr 22, 2021
Merged
@jrmajor jrmajor changed the title Remove invalid docblock [8.x] Remove invalid docblock Apr 22, 2021
bert-w pushed a commit to bert-w/framework that referenced this pull request Apr 29, 2021
@jrmajor @bert-w
remove invalid docblock (laravel#37077)
4f816bd
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@jrmajor @taylorotwell