danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2025-01-21 21:31:13 +01:00
Code Issues Projects Releases Wiki Activity

Fix #130 - check class exists before checking for __invoke

Browse Source
This commit is contained in:
Matthew Brown 2017-04-08 11:15:17 -04:00
parent a985fd9324
commit 2d454d6e10
2 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Psalm/Checker/Statements/Expression/CallChecker.php
View File

@ -162,6 +162,10 @@ class CallChecker
(!$var_type_part instanceof TNamedObject || $var_type_part->value !== 'Closure') &&
!$var_type_part instanceof TCallable &&
(!$var_type_part instanceof TNamedObject ||
!ClassLikeChecker::classOrInterfaceExists(
$var_type_part->value,
$statements_checker->getFileChecker()
) ||
!MethodChecker::methodExists(
$var_type_part->value . '::__invoke',
$statements_checker->getFileChecker()

36
tests/ClosureTest.php
View File

@ -12,9 +12,6 @@ class ClosureTest extends PHPUnit_Framework_TestCase
/** @var \PhpParser\Parser */
protected static $parser;
/** @var TestConfig */
protected static $config;
/** @var \Psalm\Checker\ProjectChecker */
protected $project_checker;
@ -24,7 +21,6 @@ class ClosureTest extends PHPUnit_Framework_TestCase
public static function setUpBeforeClass()
{
self::$parser = (new ParserFactory)->create(ParserFactory::PREFER_PHP7);
self::$config = new TestConfig();
}
/**
@ -34,7 +30,7 @@ class ClosureTest extends PHPUnit_Framework_TestCase
{
FileChecker::clearCache();
$this->project_checker = new \Psalm\Checker\ProjectChecker();
$this->project_checker->setConfig(self::$config);
$this->project_checker->setConfig(new TestConfig());
}
/**
@ -227,6 +223,36 @@ class ClosureTest extends PHPUnit_Framework_TestCase
$file_checker->visitAndAnalyzeMethods($context);
}
/**
* @expectedException \Psalm\Exception\CodeException
* @expectedExceptionMessage InvalidFunctionCall
* @return void
*/
public function testUndefinedCallableClass()
{
Config::getInstance()->setCustomErrorLevel('UndefinedClass', Config::REPORT_SUPPRESS);
$stmts = self::$parser->parse('<?php
class A {
public function getFoo() : Foo
{
return new Foo([]);
}
public function bar($argOne, $argTwo)
{
$this->getFoo()($argOne, $argTwo);
}
}
');
$file_checker = new FileChecker('somefile.php', $this->project_checker, $stmts);
$context = new Context();
$file_checker->visitAndAnalyzeMethods($context);
}
/**
* @expectedException \Psalm\Exception\CodeException
* @expectedExceptionMessage InvalidFunctionCall