Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix class const issue when using floats declared in future consts (fixes #7973). #7992

Merged
merged 1 commit into from May 21, 2022
Merged

Fix class const issue when using floats declared in future consts (fixes #7973). #7992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 18 additions & 2 deletions src/Psalm/Internal/Analyzer/Statements/Expression/BinaryOp/ArithmeticOpAnalyzer.php
View file
Open in desktop
Expand Up @@ -47,6 +47,7 @@
use function array_diff_key;
use function array_values;
use function count;
use function get_class;
use function is_int;
use function is_numeric;
use function max;
Expand Down Expand Up @@ -309,15 +310,30 @@ private static function analyzeOperands(
bool &$has_string_increment,
Union &$result_type = null
): ?Union {
if ($left_type_part instanceof TLiteralInt
&& $right_type_part instanceof TLiteralInt
if (($left_type_part instanceof TLiteralInt || $left_type_part instanceof TLiteralFloat)
&& ($right_type_part instanceof TLiteralInt || $right_type_part instanceof TLiteralFloat)
&& (
//we don't try to do arithmetics on variables in loops
$context === null
|| $context->inside_loop === false
|| (!$left instanceof PhpParser\Node\Expr\Variable && !$right instanceof PhpParser\Node\Expr\Variable)
)
) {
// get_class is fine here because both classes are final.
if ($statements_source !== null
&& $config->strict_binary_operands
&& get_class($left_type_part) !== get_class($right_type_part)
) {
IssueBuffer::maybeAdd(
new InvalidOperand(
'Cannot process numeric types together in strict operands mode, '.
'please cast explicitly',
new CodeLocation($statements_source, $parent)
),
$statements_source->getSuppressedIssues()
);
}

// time for some arithmetic!
$calculated_type = self::arithmeticOperation(
$parent,
Expand Down
1 change: 0 additions & 1 deletion src/Psalm/Internal/Analyzer/Statements/Expression/ClassConstAnalyzer.php
View file
Open in desktop
Expand Up @@ -712,7 +712,6 @@ public static function analyzeAssignment(
"{$class_storage->name}::{$const->name->name}"
),
$const_storage->suppressed_issues,
true
);
}
}
Expand Down
27 changes: 26 additions & 1 deletion tests/BinaryOperationTest.php
View file
Open in desktop
Expand Up @@ -191,7 +191,7 @@ function returnsABool(): bool {
$this->analyzeFile('somefile.php', new Context());
}

public function testDifferingNumericTypesAdditionInStrictMode(): void
public function testDifferingNumericLiteralTypesAdditionInStrictMode(): void
{
$config = Config::getInstance();
$config->strict_binary_operands = true;
Expand All @@ -208,6 +208,25 @@ public function testDifferingNumericTypesAdditionInStrictMode(): void
$this->analyzeFile('somefile.php', new Context());
}

public function testDifferingNumericTypesAdditionInStrictMode(): void
{
$config = Config::getInstance();
$config->strict_binary_operands = true;

$this->addFile(
'somefile.php',
'<?php
/** @var float */
$b = 4.1;
$a = 5 + $b;'
);

$this->expectException(CodeException::class);
$this->expectExceptionMessage('InvalidOperand');

$this->analyzeFile('somefile.php', new Context());
}

public function testConcatenationWithNumberInStrictMode(): void
{
$config = Config::getInstance();
Expand Down Expand Up @@ -852,6 +871,12 @@ function toPositiveInt(int $i): int
return 1;
}',
],
'calculateLiteralResultForFloats' => [
'code' => '<?php
$foo = 1.0 + 2.0;
',
'assertions' => ['$foo===' => 'float(3)'],
],
];
}

Expand Down
9 changes: 9 additions & 0 deletions tests/ConstantTest.php
View file
Open in desktop
Expand Up @@ -1419,6 +1419,15 @@ interface Foo
interface Bar extends Foo {}
',
],
'classConstsUsingFutureFloatDeclarationWithMultipleLevels' => [
'code' => '<?php
class Foo {
public const BAZ = self::BAR + 1.0;
public const BAR = self::FOO + 1.0;
public const FOO = 1.0;
}
',
],
];
}

Expand Down