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

don't emit issues when doing arithmetics on float templates
vimeo · Apr 19, 2022 · 2724c1d · 2724c1d
2 parents 55a45a9 + a525342
commit 2724c1d
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 4 deletions.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/BinaryOp/ArithmeticOpAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/BinaryOp/ArithmeticOpAnalyzer.php
@@ -445,20 +445,26 @@ private static function analyzeOperands(
         }
 
         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(
                     new MixedOperand(
-                        'Left operand cannot be a non-int template',
+                        'Left operand cannot be a non-numeric template',
                         new CodeLocation($statements_source, $left)
                     ),
                     $statements_source->getSuppressedIssues()
                 )) {
                     // 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(
                     new MixedOperand(
-                        'Right operand cannot be a non-int template',
+                        'Right operand cannot be a non-numeric template',
                         new CodeLocation($statements_source, $right)
                     ),
                     $statements_source->getSuppressedIssues()

diff --git a/tests/Template/FunctionTemplateTest.php b/tests/Template/FunctionTemplateTest.php
@@ -1603,6 +1603,22 @@ function foo($p): void {
                         }
                     }'
             ],
+            '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;
+                    }'
+            ],
         ];
     }