1
0
mirror of https://github.com/danog/psalm.git synced 2025-01-22 05:41:20 +01:00

Fix trait inheritance diff

This commit is contained in:
Matthew Brown 2016-11-04 20:49:04 -04:00
parent b7c20e2a44
commit 299bc45319

View File

@ -239,6 +239,7 @@ abstract class ClassLikeChecker implements StatementsSource
$leftover_stmts = []; $leftover_stmts = [];
/** @var array<MethodChecker> */
$method_checkers = []; $method_checkers = [];
$long_file_name = Config::getInstance()->getBaseDir() . $this->file_name; $long_file_name = Config::getInstance()->getBaseDir() . $this->file_name;
@ -458,7 +459,7 @@ abstract class ClassLikeChecker implements StatementsSource
/** /**
* @param PhpParser\Node\Stmt\ClassMethod $stmt * @param PhpParser\Node\Stmt\ClassMethod $stmt
* @param Context $class_context * @param Context $class_context
* @param array $method_checkers * @param array<MethodChecker> $method_checkers
* @param bool $cache_method_checker * @param bool $cache_method_checker
* @return void * @return void
*/ */
@ -553,7 +554,7 @@ abstract class ClassLikeChecker implements StatementsSource
FileChecker::addFileInheritanceToClass( FileChecker::addFileInheritanceToClass(
Config::getInstance()->getBaseDir() . $this->file_name, Config::getInstance()->getBaseDir() . $this->file_name,
$this->parent_class $trait_name
); );
$trait_checkers[] = $trait_checker; $trait_checkers[] = $trait_checker;