wip

kasko · May 19, 2023 · d65f933 · d65f933
1 parent ff78059
commit d65f933
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/PhpSpreadsheet/Calculation/Calculation.php b/src/PhpSpreadsheet/Calculation/Calculation.php
@@ -4908,7 +4908,7 @@ private function executeBinaryComparisonOperation($cellID, $operand1, $operand2,
                 } elseif ($useLowercaseFirstComparison) {
                     $result = $this->strcmpLowercaseFirst($operand1, $operand2) >= 0;
                 } else {
-                    $result = strcmp($operand1, $operand2) >= 0;
+                    $result = strcmp("$operand1", "$operand2") >= 0;
                 }
 
                 break;
@@ -4919,7 +4919,7 @@ private function executeBinaryComparisonOperation($cellID, $operand1, $operand2,
                 } elseif ($useLowercaseFirstComparison) {
                     $result = $this->strcmpLowercaseFirst($operand1, $operand2) <= 0;
                 } else {
-                    $result = strcmp($operand1, $operand2) <= 0;
+                    $result = strcmp("$operand1", $operand2) <= 0;
                 }
 
                 break;

diff --git a/src/PhpSpreadsheet/Calculation/Functions.php b/src/PhpSpreadsheet/Calculation/Functions.php
@@ -255,7 +255,7 @@ public static function ifCondition($condition)
 
         if (!is_string($condition) || !in_array($condition[0], ['>', '<', '='])) {
             if (!is_numeric($condition)) {
-                $condition = Calculation::wrapResult(strtoupper($condition));
+                $condition = Calculation::wrapResult(strtoupper("$condition"));
             }
 
             return str_replace('""""', '""', '=' . $condition);

diff --git a/src/PhpSpreadsheet/Shared/StringHelper.php b/src/PhpSpreadsheet/Shared/StringHelper.php
@@ -464,7 +464,7 @@ public static function convertEncoding($value, $to, $from)
      */
     public static function countCharacters($value, $enc = 'UTF-8')
     {
-        return mb_strlen($value, $enc);
+        return mb_strlen("$value", $enc);
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -464,7 +464,7 @@ public static function convertEncoding($value, $to, $from) @@
          */
         public static function countCharacters($value, $enc = 'UTF-8')
         {
-            return mb_strlen($value, $enc);
+            return mb_strlen("$value", $enc);
         }
         /**
@@ Expand Down @@