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

Only make isset $this->property mixed if not already defined

Browse Source
This commit is contained in:
Matt Brown 2017-04-28 16:41:54 -04:00
parent f65c618b2e
commit 9cabf428c4
2 changed files with 39 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Psalm/Checker/Statements/ExpressionChecker.php
View File

@ -1892,8 +1892,11 @@ class ExpressionChecker
is_string($isset_var->name)
) {
$var_id = '$this->' . $isset_var->name;
$context->vars_in_scope[$var_id] = Type::getMixed();
$context->vars_possibly_in_scope[$var_id] = true;
if (!isset($context->vars_in_scope[$var_id])) {
$context->vars_in_scope[$var_id] = Type::getMixed();
$context->vars_possibly_in_scope[$var_id] = true;
}
}
self::analyzeIssetVar($statements_checker, $isset_var, $context);

53
tests/ReturnTypeTest.php
View File

@ -15,19 +15,19 @@ class ReturnTypeTest extends TestCase
'returnTypeAfterUselessNullCheck' => [
'<?php
class One {}
class B {
/**
* @return One|null
*/
public function barBar() {
$baz = rand(0,100) > 50 ? new One() : null;
// should have no effect
if ($baz === null) {
$baz = null;
}
return $baz;
}
}'
@ -195,7 +195,7 @@ class ReturnTypeTest extends TestCase
case 1:
case 2:
return true;
default:
throw new \Exception("badness");
}
@ -210,10 +210,10 @@ class ReturnTypeTest extends TestCase
return new static();
}
}
class B extends A {
}
$b = B::load();',
'assertions' => [
['B' => '$b']
@ -227,10 +227,10 @@ class ReturnTypeTest extends TestCase
return [new static()];
}
}
class B extends A {
}
$bees = B::loadMultiple();',
'assertions' => [
['array<int, B>' => '$bees']
@ -263,14 +263,14 @@ class ReturnTypeTest extends TestCase
return rand(0, 10) === 4 ? "blah" : null;
}
}
class B extends A {
/** @return string */
public function blah() {
return "blah";
}
}
$blah = (new B())->blah();',
'assertions' => [
['string' => '$blah']
@ -282,13 +282,13 @@ class ReturnTypeTest extends TestCase
/** @return string|null */
public function blah();
}
class B implements A {
public function blah() {
return rand(0, 10) === 4 ? "blah" : null;
}
}
$blah = (new B())->blah();',
'assertions' => [
['string|null' => '$blah']
@ -300,16 +300,16 @@ class ReturnTypeTest extends TestCase
/** @return string|null */
abstract public function blah();
}
class B extends A {
}
class C extends B {
public function blah() {
return rand(0, 10) === 4 ? "blahblah" : null;
}
}
$blah = (new C())->blah();',
'assertions' => [
['string|null' => '$blah']
@ -319,11 +319,26 @@ class ReturnTypeTest extends TestCase
'<?php
class A {}
class B extends A {}
/** @return B|A */
function foo() {
return rand(0, 1) ? new A : new B;
}'
],
'issetOnPropertyReturnType' => [
'<?php
class Foo {
/** @var Foo|null */
protected $bar;
/**
* @return ?Foo
*/
function getBarWithIsset() {
if (isset($this->bar)) return $this->bar;
return null;
}
}'
]
];
}
@ -397,7 +412,7 @@ class ReturnTypeTest extends TestCase
'wrongReturnTypeInNamespace1' => [
'<?php
namespace bar;
function fooFoo() : string {
return 5;
}',
@ -406,7 +421,7 @@ class ReturnTypeTest extends TestCase
'wrongReturnTypeInNamespace2' => [
'<?php
namespace bar;
function fooFoo() : string {
return rand(0, 5) ? "hello" : null;
}',
@ -443,7 +458,7 @@ class ReturnTypeTest extends TestCase
function fooFoo() : A {
return array_pop([]);
}
fooFoo()->bar();',
'error_message' => 'UndefinedClass'
]