Merge branch 'master' into issue3904c

Author: oleibman

README.md

@@ -31,9 +31,6 @@ composer require phpoffice/phpspreadsheet
 If you are building your installation on a development machine that is on a different PHP version to the server where it will be deployed, or if your PHP CLI version is not the same as your run-time such as `php-fpm` or Apache's `mod_php`, then you might want to add the following to your `composer.json` before installing:
 ```json
 {
-    "require": {
-        "phpoffice/phpspreadsheet": "^1.28"
-    },
     "config": {
         "platform": {
             "php": "8.0"

composer.lock

@@ -57,9 +57,6 @@ composer require phpoffice/phpspreadsheet --prefer-source
 If you are building your installation on a development machine that is on a different PHP version to the server where it will be deployed, or if your PHP CLI version is not the same as your run-time such as `php-fpm` or Apache's `mod_php`, then you might want to add the following to your `composer.json` before installing:
 ```json
 {
-    "require": {
-        "phpoffice/phpspreadsheet": "^1.23"
-    },
     "config": {
         "platform": {
             "php": "8.0"

docs/index.md

@@ -1,6 +1,2 @@
 parameters:
 	ignoreErrors:
-		-
-			message: "#^Binary operation \"/\" between float and array\\|float\\|int\\|string results in an error\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Calculation/MathTrig/Combinations.php

phpstan-baseline.neon

@@ -25,7 +25,7 @@ class TimeValue
      * Excel Function:
      *        TIMEVALUE(timeValue)
      *
-     * @param null|array|bool|int|string $timeValue A text string that represents a time in any one of the Microsoft
+     * @param null|array|bool|float|int|string $timeValue A text string that represents a time in any one of the Microsoft
      *                                    Excel time formats; for example, "6:45 PM" and "18:45" text strings
      *                                    within quotation marks that represent time.
      *                                    Date information in time_text is ignored.
@@ -36,7 +36,7 @@ class TimeValue
      *         If an array of numbers is passed as the argument, then the returned result will also be an array
      *            with the same dimensions
      */
-    public static function fromString(null|array|string|int|bool $timeValue): array|string|Datetime|int|float
+    public static function fromString(null|array|string|int|bool|float $timeValue): array|string|Datetime|int|float
     {
         if (is_array($timeValue)) {
             return self::evaluateSingleArgumentArray([self::class, __FUNCTION__], $timeValue);

src/PhpSpreadsheet/Calculation/DateTimeExcel/TimeValue.php

@@ -40,7 +40,14 @@ public static function withoutRepetition(mixed $numObjs, mixed $numInSet): array
             return $e->getMessage();
         }
 
-        return round(Factorial::fact($numObjs) / Factorial::fact($numObjs - $numInSet)) / Factorial::fact($numInSet); // @phpstan-ignore-line
+        /** @var float */
+        $quotient = Factorial::fact($numObjs);
+        /** @var float */
+        $divisor1 = Factorial::fact($numObjs - $numInSet);
+        /** @var float */
+        $divisor2 = Factorial::fact($numInSet);
+
+        return round($quotient / ($divisor1 * $divisor2));
     }
 
     /**
@@ -84,8 +91,13 @@ public static function withRepetition(mixed $numObjs, mixed $numInSet): array|in
             return $e->getMessage();
         }
 
-        return round(
-            Factorial::fact($numObjs + $numInSet - 1) / Factorial::fact($numObjs - 1) // @phpstan-ignore-line
-        ) / Factorial::fact($numInSet);
+        /** @var float */
+        $quotient = Factorial::fact($numObjs + $numInSet - 1);
+        /** @var float */
+        $divisor1 = Factorial::fact($numObjs - 1);
+        /** @var float */
+        $divisor2 = Factorial::fact($numInSet);
+
+        return round($quotient / ($divisor1 * $divisor2));
     }
 }

src/PhpSpreadsheet/Calculation/MathTrig/Combinations.php

@@ -46,16 +46,17 @@ public static function PERMUT(mixed $numObjs, mixed $numInSet)
         if ($numObjs < $numInSet) {
             return ExcelError::NAN();
         }
+        /** @var float|int|string */
         $result1 = MathTrig\Factorial::fact($numObjs);
         if (is_string($result1)) {
             return $result1;
         }
+        /** @var float|int|string */
         $result2 = MathTrig\Factorial::fact($numObjs - $numInSet);
         if (is_string($result2)) {
             return $result2;
         }
-        // phpstan thinks result1 and result2 can be arrays; they can't.
-        $result = round($result1 / $result2); // @phpstan-ignore-line
+        $result = round($result1 / $result2);
 
         return IntOrFloat::evaluate($result);
     }

src/PhpSpreadsheet/Calculation/Statistical/Permutations.php

@@ -148,7 +148,7 @@ public static function FORECAST(mixed $xValue, array $yValues, array $xValues)
      * @param mixed[] $newValues Values of X for which we want to find Y
      * @param mixed $const A logical (boolean) value specifying whether to force the intersect to equal 0 or not
      *
-     * @return float[]
+     * @return array<int, array<int, array<int, float>>>
      */
     public static function GROWTH(array $yValues, array $xValues = [], array $newValues = [], mixed $const = true): array
     {
@@ -167,7 +167,7 @@ public static function GROWTH(array $yValues, array $xValues = [], array $newVal
             $returnArray[0][] = [$bestFitExponential->getValueOfYForX($xValue)];
         }
 
-        return $returnArray; //* @phpstan-ignore-line
+        return $returnArray;
     }
 
     /**
@@ -401,7 +401,7 @@ public static function STEYX(array $yValues, array $xValues): float|string
      * @param mixed[] $newValues Values of X for which we want to find Y
      * @param mixed $const A logical (boolean) value specifying whether to force the intersect to equal 0 or not
      *
-     * @return float[]
+     * @return array<int, array<int, array<int, float>>>
      */
     public static function TREND(array $yValues, array $xValues = [], array $newValues = [], mixed $const = true): array
     {
@@ -420,6 +420,6 @@ public static function TREND(array $yValues, array $xValues = [], array $newValu
             $returnArray[0][] = [$bestFitLinear->getValueOfYForX($xValue)];
         }
 
-        return $returnArray; //* @phpstan-ignore-line
+        return $returnArray;
     }
 }

src/PhpSpreadsheet/Calculation/Statistical/Trends.php

@@ -126,8 +126,9 @@ public static function TEXTFORMAT(mixed $value, mixed $format): array|string
         $format = Helpers::extractString($format);
 
         if (!is_numeric($value) && Date::isDateTimeFormatCode($format)) {
-            // @phpstan-ignore-next-line
-            $value = DateTimeExcel\DateValue::fromString($value) + DateTimeExcel\TimeValue::fromString($value);
+            $value1 = DateTimeExcel\DateValue::fromString($value);
+            $value2 = DateTimeExcel\TimeValue::fromString($value);
+            $value = (is_numeric($value1) && is_numeric($value2)) ? ($value1 + $value2) : (is_numeric($value1) ? $value2 : $value1);
         }
 
         return (string) NumberFormat::toFormattedString($value, $format);

src/PhpSpreadsheet/Calculation/TextData/Format.php

@@ -63,7 +63,9 @@ public function bindValue(Cell $cell, mixed $value = null): bool
                 // Convert value to number
                 $sign = ($matches['PrefixedSign'] ?? $matches['PrefixedSign2'] ?? $matches['PostfixedSign']) ?? null;
                 $currencyCode = $matches['PrefixedCurrency'] ?? $matches['PostfixedCurrency'];
-                $value = (float) ($sign . trim(str_replace([$decimalSeparatorNoPreg, $currencyCode, ' ', '-'], ['.', '', '', ''], preg_replace('/(\d)' . $thousandsSeparator . '(\d)/u', '$1$2', $value)))); // @phpstan-ignore-line
+                /** @var string */
+                $temp = str_replace([$decimalSeparatorNoPreg, $currencyCode, ' ', '-'], ['.', '', '', ''], preg_replace('/(\d)' . $thousandsSeparator . '(\d)/u', '$1$2', $value));
+                $value = (float) ($sign . trim($temp));
 
                 return $this->setCurrency($value, $cell, $currencyCode ?? '');
             }