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

Merge pull request #7872 from hirokinoue/float-template-arithmetics-4.x

Browse Source 
don't emit issues when doing arithmetics on float templates
This commit is contained in:
orklah 2022-04-19 19:35:57 +02:00 committed by GitHub
commit 2724c1dba9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Psalm/Internal/Analyzer/Statements/Expression/BinaryOp/ArithmeticOpAnalyzer.php
View File

@ -445,20 +445,26 @@ class ArithmeticOpAnalyzer
} }
if ($left_type_part instanceof TTemplateParam || $right_type_part instanceof TTemplateParam) { if ($left_type_part instanceof TTemplateParam || $right_type_part instanceof TTemplateParam) {
if ($left_type_part instanceof TTemplateParam && !$left_type_part->as->isInt()) { if ($left_type_part instanceof TTemplateParam
&& !$left_type_part->as->isInt()
&& !$left_type_part->as->isFloat()
) {
if ($statements_source && IssueBuffer::accepts( if ($statements_source && IssueBuffer::accepts(
new MixedOperand( new MixedOperand(
'Left operand cannot be a non-int template', 'Left operand cannot be a non-numeric template',
new CodeLocation($statements_source, $left) new CodeLocation($statements_source, $left)
), ),
$statements_source->getSuppressedIssues() $statements_source->getSuppressedIssues()
)) { )) {
// fall through // fall through
} }
} elseif ($right_type_part instanceof TTemplateParam && !$right_type_part->as->isInt()) { } elseif ($right_type_part instanceof TTemplateParam
&& !$right_type_part->as->isInt()
&& !$right_type_part->as->isFloat()
) {
if ($statements_source && IssueBuffer::accepts( if ($statements_source && IssueBuffer::accepts(
new MixedOperand( new MixedOperand(
'Right operand cannot be a non-int template', 'Right operand cannot be a non-numeric template',
new CodeLocation($statements_source, $right) new CodeLocation($statements_source, $right)
), ),
$statements_source->getSuppressedIssues() $statements_source->getSuppressedIssues()

16
tests/Template/FunctionTemplateTest.php
View File

@ -1603,6 +1603,22 @@ class FunctionTemplateTest extends TestCase
} }
}' }'
], ],
'dontScreamForArithmeticsOnFloatTemplates' => [
'<?php
/**
* @template T of ?float
* @param T $p
* @return (T is null ? null : float)
*/
function foo(?float $p): ?float
{
if ($p === null) {
return null;
}
return $p - 1;
}'
],
]; ];
} }