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

refactor: extract logic to methods

Browse Source
This commit is contained in:
Feek 2020-05-25 00:18:39 -07:00
parent f5915de4e3
commit a81b4cd990
1 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/PropertyProvider/ModelPropertyProvider.php
View File

@ -39,11 +39,11 @@ class ModelPropertyProvider implements
$class_like_storage = $codebase->classlike_storage_provider->get($fq_classlike_name);
if ($codebase->methodExists($fq_classlike_name . '::' . $property_name)) {
if (self::relationExists($codebase, $fq_classlike_name, $property_name)) {
return true;
}
if ($codebase->methodExists($fq_classlike_name . '::get' . str_replace('_', '', $property_name) . 'Attribute')) {
if (self::accessorExists($codebase, $fq_classlike_name, $property_name)) {
return true;
}
@ -70,14 +70,13 @@ class ModelPropertyProvider implements
}
$codebase = $source->getCodebase();
$class_like_storage = $codebase->classlike_storage_provider->get($fq_classlike_name);
if ($codebase->methodExists($fq_classlike_name . '::' . $property_name)) {
if (self::relationExists($codebase, $fq_classlike_name, $property_name)) {
return true;
}
if ($codebase->methodExists($fq_classlike_name . '::get' . str_replace('_', '', $property_name) . 'Attribute')) {
if (self::accessorExists($codebase, $fq_classlike_name, $property_name)) {
return true;
}
@ -106,16 +105,39 @@ class ModelPropertyProvider implements
$codebase = $source->getCodebase();
$class_like_storage = $codebase->classlike_storage_provider->get($fq_classlike_name);
if ($codebase->methodExists($fq_classlike_name . '::' . $property_name)) {
if (self::relationExists($codebase, $fq_classlike_name, $property_name)) {
return $codebase->getMethodReturnType($fq_classlike_name . '::' . $property_name, $fq_classlike_name)
?: Type::getMixed();
}
if ($codebase->methodExists($fq_classlike_name . '::get' . str_replace('_', '', $property_name) . 'Attribute')) {
if (self::accessorExists($codebase, $fq_classlike_name, $property_name)) {
return $codebase->getMethodReturnType($fq_classlike_name . '::get' . str_replace('_', '', $property_name) . 'Attribute', $fq_classlike_name)
?: Type::getMixed();
}
}
/**
* @param \Psalm\Codebase $codebase
* @param string $fq_classlike_name
* @param string $property_name
*
* @return bool
*/
private static function relationExists(\Psalm\Codebase $codebase, string $fq_classlike_name, string $property_name): bool
{
// @todo: ensure this is a relation method
return $codebase->methodExists($fq_classlike_name . '::' . $property_name);
}
/**
* @param \Psalm\Codebase $codebase
* @param string $fq_classlike_name
* @param string $property_name
*
* @return bool
*/
private static function accessorExists(\Psalm\Codebase $codebase, string $fq_classlike_name, string $property_name): bool
{
return $codebase->methodExists($fq_classlike_name . '::get' . str_replace('_', '', $property_name) . 'Attribute');
}
}