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 #26 - Allow refinement via type intersection

Browse Source 
Not just via explict subsets
This commit is contained in:
Matt Brown 2016-12-16 17:59:27 -05:00
parent dcec735d11
commit 16e89a8c1c
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Psalm/Checker/TypeChecker.php
View File

@ -1253,7 +1253,9 @@ class TypeChecker
return $new_type;
}
if (!TypeChecker::isContainedBy($new_type, $existing_var_type) && $code_location) {
if (!TypeChecker::isContainedBy($new_type, $existing_var_type) &&
!TypeChecker::isContainedBy($existing_var_type, $new_type) &&
$code_location) {
if (IssueBuffer::accepts(
new TypeDoesNotContainType(
'Cannot resolve types for ' . $key . ' - ' . $existing_var_type . ' does not contain ' . $new_type,

15
tests/TypeTest.php
View File

@ -1660,4 +1660,19 @@ class TypeTest extends PHPUnit_Framework_TestCase
$context = new Context('somefile.php');
$file_checker->check();
}
public function testTypeRefinementWithIsNumeric()
{
$stmts = self::$parser->parse('<?php
function foo(string $a) : void {
if (is_numeric($a)) {
}
}
');
$file_checker = new FileChecker('somefile.php', $stmts);
$context = new Context('somefile.php');
$file_checker->check();
}
}