danog/psalm-plugin-laravel
1
0
Fork 0
mirror of https://github.com/danog/psalm-plugin-laravel.git synced 2024-11-30 04:39:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: defensive safety against nulls

Browse Source
This commit is contained in:
Feek 2020-06-06 22:02:15 -07:00
parent 3c837c25e3
commit f996f4d559
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ReturnTypeProvider/RelationReturnTypeProvider.php
View File

@ -52,6 +52,10 @@ final class RelationReturnTypeProvider implements MethodReturnTypeProviderInterf
// If this method name is on the builder object, proxy it over there
if ($source->getCodebase()->methods->methodExists(new MethodIdentifier(Builder::class, $method_name_lowercase))) {
if (!$template_type_parameters) {
return null;
}
$fake_method_call = new MethodCall(
new \PhpParser\Node\Expr\Variable('builder'),
$method_name_lowercase,
@ -65,8 +69,12 @@ final class RelationReturnTypeProvider implements MethodReturnTypeProviderInterf
$type = self::executeFakeCall($source, $fake_method_call, $context, $templateType->getKey());
if (!$type) {
return null;
}
foreach ($type->getAtomicTypes() as $type) {
if ($type->value === Builder::class) {
if ($type instanceof Type\Atomic\TNamedObject && $type->value === Builder::class) {
// ta-da. now we return "this" relation instance
return new Union([
new Type\Atomic\TGenericObject($fq_classlike_name, $template_type_parameters),