danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-11-26 12:24:49 +01:00
Code Issues Projects Releases Wiki Activity

Add support for oldstyle constructors

Browse Source
This commit is contained in:
Matthew Brown 2016-11-21 14:36:06 -05:00
parent 72071fb5ec
commit 0cb3b828b8
3 changed files with 76 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Psalm/Checker/FunctionLikeChecker.php
View File

@ -314,7 +314,13 @@ abstract class FunctionLikeChecker extends SourceChecker implements StatementsSo
public function getMethodId()
{
if ($this->function instanceof ClassMethod) {
return $this->fq_class_name . '::' . strtolower($this->function->name);
$function_name = $this->function->name;
if (strtolower($function_name) === strtolower($this->class_name)) {
$function_name = '__construct';
}
return $this->fq_class_name . '::' . strtolower($function_name);
}
if ($this->function instanceof Function_) {

26
src/Psalm/Checker/MethodChecker.php
View File

@ -172,8 +172,14 @@ class MethodChecker extends FunctionLikeChecker
*/
public static function extractReflectionMethodInfo(\ReflectionMethod $method)
{
$method_id = $method->class . '::' . strtolower((string)$method->name);
self::$cased_method_ids[$method_id] = $method->class . '::' . $method->name;
if (strtolower($method->name) === strtolower((string)$method->class)) {
$method_id = $method->class . '::__construct';
self::$cased_method_ids[$method_id] = $method->class . '::__construct';
}
else {
$method_id = $method->class . '::' . strtolower($method->name);
self::$cased_method_ids[$method_id] = $method->class . '::' . $method->name;
}
if (isset(self::$have_reflected[$method_id])) {
return null;
@ -255,7 +261,13 @@ class MethodChecker extends FunctionLikeChecker
*/
protected function registerMethod(PhpParser\Node\Stmt\ClassMethod $method)
{
$method_id = $this->fq_class_name . '::' . strtolower($method->name);
if (strtolower($method->name) === strtolower((string)$this->class_name)) {
$method_id = $this->fq_class_name . '::__construct';
}
else {
$method_id = $this->fq_class_name . '::' . strtolower($method->name);
}
$cased_method_id = self::$cased_method_ids[$method_id] = $this->fq_class_name . '::' . $method->name;
if (isset(self::$have_reflected[$method_id]) || isset(self::$have_registered[$method_id])) {
@ -459,15 +471,19 @@ class MethodChecker extends FunctionLikeChecker
self::registerClassMethod($method_id);
$old_method_id = null;
if (isset(self::$declaring_methods[$method_id])) {
return true;
}
// support checking oldstyle constructors
if ($method_parts[1] === '__construct') {
// @todo ?
$old_constructor_name = array_pop(explode('\\', $method_parts[0]));
$old_method_id = $method_parts[0] . '::' . $old_constructor_name;
}
if (FunctionChecker::inCallMap($method_id)) {
if (FunctionChecker::inCallMap($method_id) || ($old_method_id && FunctionChecker::inCallMap($method_id))) {
return true;
}

48
tests/Php40Test.php Normal file
View File

@ -0,0 +1,48 @@
<?php
namespace Psalm\Tests;
use PhpParser\ParserFactory;
use PHPUnit_Framework_TestCase;
use Psalm\Checker\FileChecker;
use Psalm\Config;
use Psalm\Context;
class Php40Test extends PHPUnit_Framework_TestCase
{
protected static $parser;
public static function setUpBeforeClass()
{
self::$parser = (new ParserFactory)->create(ParserFactory::PREFER_PHP7);
$config = Config::getInstance();
$config->throw_exception = true;
$config->use_docblock_types = true;
}
public function setUp()
{
FileChecker::clearCache();
}
public function testExtendOldStyleConstructor()
{
$stmts = self::$parser->parse('<?php
class A {
public function A() {
}
}
class B extends A {
public function __construct() {
parent::__construct();
}
}
');
$file_checker = new FileChecker('somefile.php', $stmts);
$context = new Context('somefile.php');
$file_checker->check(true, true, $context);
}
}