PHPOffice / PhpSpreadsheet

src/PhpSpreadsheet/Calculation/Calculation.php

Spacing +11 added lines, -11 removed lines

@@ -161,7 +161,7 @@ 
         return array_key_exists($key, self::EXCEL_CONSTANTS);
     }
 
-    public static function getExcelConstants(string $key): bool|null
+    public static function getExcelConstants(string $key): bool | null
     {
         return self::EXCEL_CONSTANTS[$key];
     }
@@ -528,7 +528,7 @@ 
      *
      * @param string $formula Formula to parse
      */
-    public function parseFormula(string $formula): array|bool
+    public function parseFormula(string $formula): array | bool
     {
         $formula = preg_replace_callback(
             self::CALCULATION_REGEXP_CELLREF_SPILL,
@@ -943,7 +943,7 @@ 
     /**
      * @return false|string False indicates an error
      */
-    private function convertMatrixReferences(string $formula): false|string
+    private function convertMatrixReferences(string $formula): false | string
     {
         static $matrixReplaceFrom = [self::FORMULA_OPEN_MATRIX_BRACE, ';', self::FORMULA_CLOSE_MATRIX_BRACE];
         static $matrixReplaceTo = ['MKMATRIX(MKMATRIX(', '),MKMATRIX(', '))'];
@@ -1022,7 +1022,7 @@ 
     /**
      * @return array<int, mixed>|false
      */
-    private function internalParseFormula(string $formula, ?Cell $cell = null): bool|array
+    private function internalParseFormula(string $formula, ?Cell $cell = null): bool | array
     {
         if (($formula = $this->convertMatrixReferences(trim($formula))) === false) {
             return false;
@@ -1534,7 +1534,7 @@ 
     /**
      * @return array<int, mixed>|false|string
      */
-    private function processTokenStack(false|array $tokens, ?string $cellID = null, ?Cell $cell = null)
+    private function processTokenStack(false | array $tokens, ?string $cellID = null, ?Cell $cell = null)
     {
         if ($tokens === false) {
             return false;
@@ -2180,7 +2180,7 @@ 
         return $output;
     }
 
-    private function validateBinaryOperand(mixed &$operand, Stack &$stack): bool
+    private function validateBinaryOperand(mixed &$operand, Stack & $stack): bool
     {
         if (is_array($operand)) {
             if ((count($operand, COUNT_RECURSIVE) - count($operand)) == 1) {
@@ -2218,7 +2218,7 @@ 
         return true;
     }
 
-    private function executeArrayComparison(mixed $operand1, mixed $operand2, string $operation, Stack &$stack, bool $recursingArrays): array
+    private function executeArrayComparison(mixed $operand1, mixed $operand2, string $operation, Stack & $stack, bool $recursingArrays): array
     {
         $result = [];
         if (!is_array($operand2) && is_array($operand1)) {
@@ -2262,7 +2262,7 @@ 
         return $result;
     }
 
-    private function executeBinaryComparisonOperation(mixed $operand1, mixed $operand2, string $operation, Stack &$stack, bool $recursingArrays = false): array|bool
+    private function executeBinaryComparisonOperation(mixed $operand1, mixed $operand2, string $operation, Stack & $stack, bool $recursingArrays = false): array | bool
     {
         //    If we're dealing with matrix operations, we want a matrix result
         if ((is_array($operand1)) || (is_array($operand2))) {
@@ -2279,7 +2279,7 @@ 
         return $result;
     }
 
-    private function executeNumericBinaryOperation(mixed $operand1, mixed $operand2, string $operation, Stack &$stack): mixed
+    private function executeNumericBinaryOperation(mixed $operand1, mixed $operand2, string $operation, Stack & $stack): mixed
     {
         //    Validate the two operands
         if (
@@ -2502,7 +2502,7 @@ 
      *
      * @return array|string Array of values in range if range contains more than one element. Otherwise, a single value is returned.
      */
-    public function extractNamedRange(string &$range = 'A1', ?Worksheet $worksheet = null, bool $resetLog = true): string|array
+    public function extractNamedRange(string &$range = 'A1', ?Worksheet $worksheet = null, bool $resetLog = true): string | array
     {
         // Return value
         $returnValue = [];
@@ -2637,7 +2637,7 @@ 
     /**
      * Add cell reference if needed while making sure that it is the last argument.
      */
-    private function addCellReference(array $args, bool $passCellReference, array|string $functionCall, ?Cell $cell = null): array
+    private function addCellReference(array $args, bool $passCellReference, array | string $functionCall, ?Cell $cell = null): array
     {
         if ($passCellReference) {
             if (is_array($functionCall)) {

src/PhpSpreadsheet/Writer/Html.php

Spacing +2 added lines, -2 removed lines

@@ -1406,7 +1406,7 @@ 
         }
     }
 
-    private function generateRowCellData(Worksheet $worksheet, null|Cell|string $cell, array|string &$cssClass): string
+    private function generateRowCellData(Worksheet $worksheet, null | Cell | string $cell, array | string &$cssClass): string
     {
         $cellData = ' ';
         if ($cell instanceof Cell) {
@@ -1487,7 +1487,7 @@ 
         string $cellData,
         int $colSpan,
         int $rowSpan,
-        array|string $cssClass,
+        array | string $cssClass,
         int $colNum,
         int $sheetIndex,
         int $row,

src/PhpSpreadsheet/Calculation/Financial/Helpers.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
      *
      * @return int|string Result, or a string containing an error
      */
-    public static function daysPerYear(mixed $year, $basis = 0): string|int
+    public static function daysPerYear(mixed $year, $basis = 0): string | int
     {
         if (!is_int($year) && !is_string($year)) {
             return ExcelError::VALUE();

src/PhpSpreadsheet/Calculation/Financial/CashFlow/Variable/NonPeriodic.php

Spacing +5 added lines, -5 removed lines

@@ -31,7 +31,7 @@ 
      *                                All other dates must be later than this date, but they may occur in any order
      * @param mixed $guess        An optional guess at the expected answer
      */
-    public static function rate(mixed $values, $dates, mixed $guess = self::DEFAULT_GUESS): float|string
+    public static function rate(mixed $values, $dates, mixed $guess = self::DEFAULT_GUESS): float | string
     {
         $rslt = self::xirrPart1($values, $dates);
         /** @var array $dates */
@@ -119,7 +119,7 @@ 
      *                         The first payment date indicates the beginning of the schedule of payments.
      *                         All other dates must be later than this date, but they may occur in any order.
      */
-    public static function presentValue(mixed $rate, mixed $values, mixed $dates): float|string
+    public static function presentValue(mixed $rate, mixed $values, mixed $dates): float | string
     {
         return self::xnpvOrdered($rate, $values, $dates, true);
     }
@@ -178,7 +178,7 @@ 
         return '';
     }
 
-    private static function xirrPart3(array $values, array $dates, float $x1, float $x2): float|string
+    private static function xirrPart3(array $values, array $dates, float $x1, float $x2): float | string
     {
         $f = self::xnpvOrdered($x1, $values, $dates, false);
         if ($f < 0.0) {
@@ -207,7 +207,7 @@ 
         return $rslt;
     }
 
-    private static function xirrBisection(array $values, array $dates, float $x1, float $x2): string|float
+    private static function xirrBisection(array $values, array $dates, float $x1, float $x2): string | float
     {
         $rslt = ExcelError::NAN();
         for ($i = 0; $i < self::FINANCIAL_MAX_ITERATIONS; ++$i) {
@@ -244,7 +244,7 @@ 
     }
 
     /** @param array<int,float|int|numeric-string> $values> */
-    private static function xnpvOrdered(mixed $rate, mixed $values, mixed $dates, bool $ordered = true, bool $capAtNegative1 = false): float|string
+    private static function xnpvOrdered(mixed $rate, mixed $values, mixed $dates, bool $ordered = true, bool $capAtNegative1 = false): float | string
     {
         $rate = Functions::flattenSingleValue($rate);
         if (!is_numeric($rate)) {

src/PhpSpreadsheet/Calculation/DateTimeExcel/Helpers.php

Spacing +8 added lines, -8 removed lines

@@ -17,7 +17,7 @@ 
      *
      * @return bool TRUE if the year is a leap year, otherwise FALSE
      */
-    public static function isLeapYear(int|string $year): bool
+    public static function isLeapYear(int | string $year): bool
     {
         $year = (int) $year;
 
@@ -64,7 +64,7 @@ 
      *
      * @return float|string Excel date/time serial value, or string if error
      */
-    public static function getTimeValue(string $timeValue): string|float
+    public static function getTimeValue(string $timeValue): string | float
     {
         $saveReturnDateType = Functions::getReturnDateType();
         Functions::setReturnDateType(Functions::RETURNDATE_EXCEL);
@@ -132,7 +132,7 @@ 
     /**
      * Return result in one of three formats.
      */
-    public static function returnIn3FormatsArray(array $dateArray, bool $noFrac = false): DateTime|float|int
+    public static function returnIn3FormatsArray(array $dateArray, bool $noFrac = false): DateTime | float | int
     {
         $retType = Functions::getReturnDateType();
         if ($retType === Functions::RETURNDATE_PHP_DATETIME_OBJECT) {
@@ -165,7 +165,7 @@ 
     /**
      * Return result in one of three formats.
      */
-    public static function returnIn3FormatsFloat(float $excelDateValue): float|int|DateTime
+    public static function returnIn3FormatsFloat(float $excelDateValue): float | int | DateTime
     {
         $retType = Functions::getReturnDateType();
         if ($retType === Functions::RETURNDATE_EXCEL) {
@@ -182,7 +182,7 @@ 
     /**
      * Return result in one of three formats.
      */
-    public static function returnIn3FormatsObject(DateTime $PHPDateObject): DateTime|float|int
+    public static function returnIn3FormatsObject(DateTime $PHPDateObject): DateTime | float | int
     {
         $retType = Functions::getReturnDateType();
         if ($retType === Functions::RETURNDATE_PHP_DATETIME_OBJECT) {
@@ -227,7 +227,7 @@ 
     /**
      * Many functions accept null argument treated as 0.
      */
-    public static function validateNumericNull(mixed $number): int|float
+    public static function validateNumericNull(mixed $number): int | float
     {
         $number = Functions::flattenSingleValue($number);
         if ($number === null) {
@@ -284,12 +284,12 @@ 
      *
      * @param array|false $dateArray
      */
-    private static function forceArray(array|bool $dateArray): array
+    private static function forceArray(array | bool $dateArray): array
     {
         return is_array($dateArray) ? $dateArray : ['error_count' => 1];
     }
 
-    public static function floatOrInt(mixed $value): float|int
+    public static function floatOrInt(mixed $value): float | int
     {
         $result = Functions::scalar($value);
 

tests/PhpSpreadsheetTests/Calculation/Functions/DateTime/DateTest.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
     }
 
     #[DataProvider('providerDATE')]
-    public function testDirectCallToDATE(float|string $expectedResult, int|string $year, null|bool|float|int|string $month, float|int|string $day): void
+    public function testDirectCallToDATE(float | string $expectedResult, int | string $year, null | bool | float | int | string $month, float | int | string $day): void
     {
         $result = Date::fromYMD($year, $month, $day);
         self::assertSame($expectedResult, $result);

src/PhpSpreadsheet/Calculation/DateTimeExcel/Date.php

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
      *         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 fromYMD(array|float|int|string $year, null|array|bool|float|int|string $month, array|float|int|string $day): float|int|DateTime|string|array
+    public static function fromYMD(array | float | int | string $year, null | array | bool | float | int | string $month, array | float | int | string $day): float | int | DateTime | string | array
     {
         if (is_array($year) || is_array($month) || is_array($day)) {
             return self::evaluateArrayArguments([self::class, __FUNCTION__], $year, $month, $day);

src/PhpSpreadsheet/Calculation/Functions.php

Spacing +1 added lines, -1 removed lines

@@ -189,7 +189,7 @@
         return str_replace('""""', '""', $operator . $operand);
     }
 
-    private static function operandSpecialHandling(mixed $operand): bool|float|int|string
+    private static function operandSpecialHandling(mixed $operand): bool | float | int | string
     {
         if (is_numeric($operand) || is_bool($operand)) {
             return $operand;

src/PhpSpreadsheet/Calculation/TextData/Concatenate.php

Spacing +4 added lines, -4 removed lines

@@ -49,7 +49,7 @@ 
      *
      * @param array $args data to be concatenated
      */
-    public static function actualCONCATENATE(...$args): array|string
+    public static function actualCONCATENATE(...$args): array | string
     {
         if (Functions::getCompatibilityMode() === Functions::COMPATIBILITY_GNUMERIC) {
             return self::CONCATENATE(...$args);
@@ -65,7 +65,7 @@ 
         return $result;
     }
 
-    private static function concatenate2Args(array|string $operand1, null|array|bool|float|int|string $operand2): array|string
+    private static function concatenate2Args(array | string $operand1, null | array | bool | float | int | string $operand2): array | string
     {
         if (is_array($operand1) || is_array($operand2)) {
             $operand1 = Calculation::boolToString($operand1);
@@ -113,7 +113,7 @@ 
      *         If an array of values is passed for the $delimiter or $ignoreEmpty arguments, then the returned result
      *            will also be an array with matching dimensions
      */
-    public static function TEXTJOIN($delimiter = '', $ignoreEmpty = true, mixed ...$args): array|string
+    public static function TEXTJOIN($delimiter = '', $ignoreEmpty = true, mixed ...$args): array | string
     {
         if (is_array($delimiter) || is_array($ignoreEmpty)) {
             return self::evaluateArrayArgumentsSubset(
@@ -171,7 +171,7 @@ 
      *         If an array of values is passed for the $stringValue or $repeatCount arguments, then the returned result
      *            will also be an array with matching dimensions
      */
-    public static function builtinREPT(mixed $stringValue, mixed $repeatCount): array|string
+    public static function builtinREPT(mixed $stringValue, mixed $repeatCount): array | string
     {
         if (is_array($stringValue) || is_array($repeatCount)) {
             return self::evaluateArrayArguments([self::class, __FUNCTION__], $stringValue, $repeatCount);