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

fix: relation class forwarding #15

Merged
merged 2 commits into from
Sep 14, 2024
Merged

fix: relation class forwarding #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6882371
fix: relation class forwarding
calebdw Sep 14, 2024
f0b347b
refactor: use classReflection::is method
calebdw Sep 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Methods/EloquentBuilderForwardsCallsExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public function getMethod(ClassReflection $classReflection, string $methodName):
*/
private function findMethod(ClassReflection $classReflection, string $methodName): MethodReflection|null
{
if ($classReflection->getName() !== EloquentBuilder::class && ! $classReflection->isSubclassOf(EloquentBuilder::class)) {
if (! $classReflection->is(EloquentBuilder::class)) {
return null;
}

Expand Down
5 changes: 2 additions & 3 deletions src/Methods/MacroMethodsClassReflectionExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,8 @@ public function hasMethod(ClassReflection $classReflection, string $methodName):
}
} elseif (
$this->hasIndirectTraitUse($classReflection, Macroable::class) ||
$classReflection->getName() === Builder::class ||
$classReflection->isSubclassOf(Builder::class) ||
$classReflection->getName() === QueryBuilder::class
$classReflection->is(Builder::class) ||
$classReflection->is(QueryBuilder::class)
) {
$classNames = [$classReflection->getName()];
$macroTraitProperty = 'macros';
Expand Down
2 changes: 1 addition & 1 deletion src/Methods/ModelForwardsCallsExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public function getMethod(ClassReflection $classReflection, string $methodName):
*/
private function findMethod(ClassReflection $classReflection, string $methodName): MethodReflection|null
{
if ($classReflection->getName() !== Model::class && ! $classReflection->isSubclassOf(Model::class)) {
if (! $classReflection->is(Model::class)) {
return null;
}

Expand Down
2 changes: 1 addition & 1 deletion src/Methods/RelationForwardsCallsExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public function getMethod(
*/
private function findMethod(ClassReflection $classReflection, string $methodName): MethodReflection|null
{
if (! $classReflection->isSubclassOf(Relation::class)) {
if (! $classReflection->is(Relation::class)) {
return null;
}

Expand Down
2 changes: 1 addition & 1 deletion src/Support/CollectionHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ private function getTypeFromEloquentCollection(ClassReflection $classReflection)

$innerValueType = $classReflection->getActiveTemplateTypeMap()->getType('TModel');

if ($classReflection->getName() === EloquentCollection::class || $classReflection->isSubclassOf(EloquentCollection::class)) {
if ($classReflection->is(EloquentCollection::class)) {
$keyType = new IntegerType();
}

Expand Down
4 changes: 4 additions & 0 deletions tests/Type/data/model.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
use App\User;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\Relation;
use Illuminate\Foundation\Http\FormRequest;

use function PHPStan\Testing\assertType;
Expand Down Expand Up @@ -120,6 +121,9 @@ function test(
assertType('App\User|null', User::firstWhere(['email' => 'foo@bar.com']));
assertType('Illuminate\Database\Eloquent\Builder<App\User>', $user->with('accounts'));
assertType('Illuminate\Database\Eloquent\Builder<App\User>', $user->with('accounts')->with('group'));
assertType('Illuminate\Database\Eloquent\Builder<App\User>', $user->with(['accounts' => function (Relation $relation) {
assertType('Illuminate\Database\Eloquent\Relations\Relation<Illuminate\Database\Eloquent\Model>', $relation->orderBy('id'));
}]));
assertType('Illuminate\Database\Eloquent\Builder<App\User>', User::lockForUpdate());
assertType('Illuminate\Database\Eloquent\Builder<App\User>', User::sharedLock());
assertType('Illuminate\Database\Eloquent\Builder<App\User>', User::query());
Expand Down
Loading