danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-11-30 04:39:00 +01:00
Code Issues Projects Releases Wiki Activity

Fix #38 - emit issue for non-array on right too

Browse Source
This commit is contained in:
Matt Brown 2017-01-13 13:09:52 -05:00
parent 82af023d6f
commit 35c06261b9
2 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -926,6 +926,16 @@ class ExpressionChecker
)) {
// fall through
}
} elseif (!$right_type_part->isArray()) {
if (IssueBuffer::accepts(
new InvalidOperand(
'Cannot add an array to a non-array',
new CodeLocation($statements_checker->getSource(), $right)
),
$statements_checker->getSuppressedIssues()
)) {
// fall through
}
}
$result_type = Type::getArray();

31
tests/BinaryOperationTest.php
View File

@ -30,7 +30,7 @@ class BinaryOperationTest extends PHPUnit_Framework_TestCase
public function testRegularAddition()
{
$stmts = self::$parser->parse('<?php
echo 5 + 4;
$a = 5 + 4;
');
$file_checker = new FileChecker('somefile.php', $this->project_checker, $stmts);
@ -56,7 +56,7 @@ class BinaryOperationTest extends PHPUnit_Framework_TestCase
public function testDifferingNumericTypesAdditionInWeakMode()
{
$stmts = self::$parser->parse('<?php
echo 5 + 4.1;
$a = 5 + 4.1;
');
$file_checker = new FileChecker('somefile.php', $this->project_checker, $stmts);
@ -73,7 +73,7 @@ class BinaryOperationTest extends PHPUnit_Framework_TestCase
Config::getInstance()->strict_binary_operands = true;
$stmts = self::$parser->parse('<?php
echo 5 + 4.1;
$a = 5 + 4.1;
');
$file_checker = new FileChecker('somefile.php', $this->project_checker, $stmts);
@ -87,7 +87,7 @@ class BinaryOperationTest extends PHPUnit_Framework_TestCase
$a = "5";
if (is_numeric($a)) {
echo $a + 4;
$b = $a + 4;
}
');
@ -99,7 +99,7 @@ class BinaryOperationTest extends PHPUnit_Framework_TestCase
public function testConcatenation()
{
$stmts = self::$parser->parse('<?php
echo "Hey " + "Jude,";
$a = "Hey " . "Jude,";
');
$file_checker = new FileChecker('somefile.php', $this->project_checker, $stmts);
@ -110,7 +110,7 @@ class BinaryOperationTest extends PHPUnit_Framework_TestCase
public function testConcatenationWithNumberInWeakMode()
{
$stmts = self::$parser->parse('<?php
echo "hi" . 5;
$a = "hi" . 5;
');
$file_checker = new FileChecker('somefile.php', $this->project_checker, $stmts);
@ -127,7 +127,24 @@ class BinaryOperationTest extends PHPUnit_Framework_TestCase
Config::getInstance()->strict_binary_operands = true;
$stmts = self::$parser->parse('<?php
echo "hi" . 5;
$a = "hi" . 5;
');
$file_checker = new FileChecker('somefile.php', $this->project_checker, $stmts);
$context = new Context('somefile.php');
$file_checker->visitAndAnalyzeMethods($context);
}
/**
* @expectedException \Psalm\Exception\CodeException
* @expectedExceptionMessage InvalidOperand
*/
public function testAddArrayToNumber()
{
Config::getInstance()->strict_binary_operands = true;
$stmts = self::$parser->parse('<?php
$a = [1] + 1;
');
$file_checker = new FileChecker('somefile.php', $this->project_checker, $stmts);