PHPOffice / PhpSpreadsheet

src/PhpSpreadsheet/Shared/StringHelper.php

Spacing +3 added lines, -3 removed lines

@@ -329,7 +329,7 @@ 
      * Formats a numeric value as a string for output in various output writers forcing
      * point as decimal separator in case locale is other than English.
      */
-    public static function formatNumber(float|int|string|null $numericValue): string
+    public static function formatNumber(float | int | string | null $numericValue): string
     {
         if (is_float($numericValue)) {
             return str_replace(',', '.', (string) $numericValue);
@@ -384,7 +384,7 @@ 
     {
         // characters
         $chars = self::convertEncoding($textValue, 'UTF-16LE', 'UTF-8');
-        $ln = (int) (strlen($chars) / 2);  // N.B. - strlen, not mb_strlen issue #642
+        $ln = (int) (strlen($chars) / 2); // N.B. - strlen, not mb_strlen issue #642
 
         return pack('vC', $ln, 0x0001) . $chars;
     }
@@ -638,7 +638,7 @@ 
      *
      * @return float|string string or only the leading numeric part of the string
      */
-    public static function testStringAsNumeric(string $textValue): float|string
+    public static function testStringAsNumeric(string $textValue): float | string
     {
         if (is_numeric($textValue)) {
             return $textValue;

src/PhpSpreadsheet/Chart/Properties.php

Spacing +10 added lines, -10 removed lines

@@ -178,7 +178,7 @@ 
         return ((float) $value) / self::PERCENTAGE_MULTIPLIER;
     }
 
-    protected function setColorProperties(?string $color, null|float|int|string $alpha, ?string $colorType): array
+    protected function setColorProperties(?string $color, null | float | int | string $alpha, ?string $colorType): array
     {
         return [
             'type' => $colorType,
@@ -403,7 +403,7 @@ 
     /**
      * Get value of array element.
      */
-    protected function getArrayElementsValue(array $properties, array|int|string $elements): mixed
+    protected function getArrayElementsValue(array $properties, array | int | string $elements): mixed
     {
         $reference = &$properties;
         if (!is_array($elements)) {
@@ -437,7 +437,7 @@ 
     /**
      * Get Glow Property.
      */
-    public function getGlowProperty(array|string $property): null|array|float|int|string
+    public function getGlowProperty(array | string $property): null | array | float | int | string
     {
         $retVal = null;
         if ($property === 'size') {
@@ -458,7 +458,7 @@ 
     /**
      * Get Glow Color Property.
      */
-    public function getGlowColor(string $propertyName): null|int|string
+    public function getGlowColor(string $propertyName): null | int | string
     {
         return $this->glowColor->getColorProperty($propertyName);
     }
@@ -522,7 +522,7 @@ 
     /**
      * Set Shadow Properties.
      */
-    public function setShadowProperties(int $presets, ?string $colorValue = null, ?string $colorType = null, null|float|int|string $colorAlpha = null, ?float $blur = null, ?int $angle = null, ?float $distance = null): void
+    public function setShadowProperties(int $presets, ?string $colorValue = null, ?string $colorType = null, null | float | int | string $colorAlpha = null, ?float $blur = null, ?int $angle = null, ?float $distance = null): void
     {
         $this->activateObject()->setShadowPresetsProperties((int) $presets);
         if ($presets === 0) {
@@ -605,7 +605,7 @@ 
      *
      * @return $this
      */
-    protected function setShadowAngle(null|float|int|string $angle)
+    protected function setShadowAngle(null | float | int | string $angle)
     {
         if (is_numeric($angle)) {
             $this->shadowProperties['direction'] = $angle;
@@ -638,7 +638,7 @@ 
      *
      * @param string|string[] $elements
      */
-    public function getShadowProperty($elements): array|string|null
+    public function getShadowProperty($elements): array | string | null
     {
         if ($elements === 'color') {
             return [
@@ -718,7 +718,7 @@ 
     /**
      * Get Line Color Property.
      */
-    public function getLineColorProperty(string $propertyName): null|int|string
+    public function getLineColorProperty(string $propertyName): null | int | string
     {
         return $this->lineColor->getColorProperty($propertyName);
     }
@@ -727,7 +727,7 @@ 
      * Set Line Style Properties.
      */
     public function setLineStyleProperties(
-        null|float|int|string $lineWidth = null,
+        null | float | int | string $lineWidth = null,
         ?string $compoundType = '',
         ?string $dashType = '',
         ?string $capType = '',
@@ -823,7 +823,7 @@ 
     /**
      * Get Line Style Property.
      */
-    public function getLineStyleProperty(array|string $elements): ?string
+    public function getLineStyleProperty(array | string $elements): ?string
     {
         return $this->getArrayElementsValue($this->lineStyleProperties, $elements);
     }

src/PhpSpreadsheet/Helper/Dimension.php

Spacing +2 added lines, -2 removed lines

@@ -48,7 +48,7 @@ 
      *                If this is a height, then size is measured in pixels ()
      *                   or in points () if $unit is null.
      */
-    protected float|int $size;
+    protected float | int $size;
 
     protected ?string $unit = null;
 
@@ -56,7 +56,7 @@ 
      * Phpstan bug has been fixed; this function allows us to
      * pass Phpstan whether fixed or not.
      */
-    private static function stanBugFixed(array|int|null $value): array
+    private static function stanBugFixed(array | int | null $value): array
     {
         return is_array($value) ? $value : [null, null];
     }

src/PhpSpreadsheet/Cell/CellAddress.php

Spacing +2 added lines, -2 removed lines

@@ -34,14 +34,14 @@
      * @phpstan-assert int|numeric-string $columnId
      * @phpstan-assert int|numeric-string $rowId
      */
-    private static function validateColumnAndRow(int|string $columnId, int|string $rowId): void
+    private static function validateColumnAndRow(int | string $columnId, int | string $rowId): void
     {
         if (!is_numeric($columnId) || $columnId <= 0 || !is_numeric($rowId) || $rowId <= 0) {
             throw new Exception('Row and Column Ids must be positive integer values');
         }
     }
 
-    public static function fromColumnAndRow(int|string $columnId, int|string $rowId, ?Worksheet $worksheet = null): self
+    public static function fromColumnAndRow(int | string $columnId, int | string $rowId, ?Worksheet $worksheet = null): self
     {
         self::validateColumnAndRow($columnId, $rowId);
 

src/PhpSpreadsheet/Shared/Date.php

Spacing +5 added lines, -5 removed lines

@@ -160,7 +160,7 @@ 
      *                         serialized timestamp.
      *                     See https://en.wikipedia.org/wiki/ISO_8601 for details of the ISO-8601 standard format.
      */
-    public static function convertIsoDate(mixed $value): float|int
+    public static function convertIsoDate(mixed $value): float | int
     {
         if (!is_string($value)) {
             throw new Exception('Non-string value supplied for Iso Date conversion');
@@ -195,7 +195,7 @@ 
      *
      * @return DateTime PHP date/time object
      */
-    public static function excelToDateTimeObject(float|int $excelTimestamp, null|DateTimeZone|string $timeZone = null): DateTime
+    public static function excelToDateTimeObject(float | int $excelTimestamp, null | DateTimeZone | string $timeZone = null): DateTime
     {
         $timeZone = ($timeZone === null) ? self::getDefaultTimezone() : self::validateTimeZone($timeZone);
         if (Functions::getCompatibilityMode() == Functions::COMPATIBILITY_EXCEL) {
@@ -306,7 +306,7 @@ 
      *
      * @return false|float MS Excel serialized date/time value
      */
-    public static function timestampToExcel($unixTimestamp): bool|float
+    public static function timestampToExcel($unixTimestamp): bool | float
     {
         if (!is_numeric($unixTimestamp)) {
             return false;
@@ -320,7 +320,7 @@ 
      *
      * @return float Excel date/time value
      */
-    public static function formattedPHPToExcel(int $year, int $month, int $day, int $hours = 0, int $minutes = 0, float|int $seconds = 0): float
+    public static function formattedPHPToExcel(int $year, int $month, int $day, int $hours = 0, int $minutes = 0, float | int $seconds = 0): float
     {
         if (self::$excelCalendar == self::CALENDAR_WINDOWS_1900) {
             //
@@ -459,7 +459,7 @@ 
      *
      * @return false|float Excel date/time serial value
      */
-    public static function stringToExcel(string $dateValue): bool|float
+    public static function stringToExcel(string $dateValue): bool | float
     {
         if (strlen($dateValue) < 2) {
             return false;

src/PhpSpreadsheet/Worksheet/Worksheet.php

Spacing +16 added lines, -16 removed lines

@@ -1110,7 +1110,7 @@ 
      *
      * @return $this
      */
-    public function setCellValue(CellAddress|string|array $coordinate, mixed $value, ?IValueBinder $binder = null): static
+    public function setCellValue(CellAddress | string | array $coordinate, mixed $value, ?IValueBinder $binder = null): static
     {
         $cellAddress = Functions::trimSheetFromCellReference(Validations::validateCellAddress($coordinate));
         $this->getCell($cellAddress)->setValue($value, $binder);
@@ -1135,7 +1135,7 @@ 
      *
      * @return $this
      */
-    public function setCellValueExplicit(CellAddress|string|array $coordinate, mixed $value, string $dataType): static
+    public function setCellValueExplicit(CellAddress | string | array $coordinate, mixed $value, string $dataType): static
     {
         $cellAddress = Functions::trimSheetFromCellReference(Validations::validateCellAddress($coordinate));
         $this->getCell($cellAddress)->setValueExplicit($value, $dataType);
@@ -1156,7 +1156,7 @@ 
      *              the "active" cell, and any previous assignment becomes a disconnected reference because
      *              the active cell has changed.
      */
-    public function getCell(CellAddress|string|array $coordinate): Cell
+    public function getCell(CellAddress | string | array $coordinate): Cell
     {
         $cellAddress = Functions::trimSheetFromCellReference(Validations::validateCellAddress($coordinate));
 
@@ -1302,7 +1302,7 @@ 
      * @param array{0: int, 1: int}|CellAddress|string $coordinate Coordinate of the cell as a string, eg: 'C5';
      *               or as an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object.
      */
-    public function cellExists(CellAddress|string|array $coordinate): bool
+    public function cellExists(CellAddress | string | array $coordinate): bool
     {
         $cellAddress = Validations::validateCellAddress($coordinate);
         [$sheet, $finalCoordinate] = $this->getWorksheetAndCoordinate($cellAddress);
@@ -1388,7 +1388,7 @@ 
      *              or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]),
      *              or a CellAddress or AddressRange object.
      */
-    public function getStyle(AddressRange|CellAddress|int|string|array $cellCoordinate): Style
+    public function getStyle(AddressRange | CellAddress | int | string | array $cellCoordinate): Style
     {
         $cellCoordinate = Validations::validateCellOrCellRange($cellCoordinate);
 
@@ -1595,7 +1595,7 @@ 
      *
      * @return $this
      */
-    public function setBreak(CellAddress|string|array $coordinate, int $break, int $max = -1): static
+    public function setBreak(CellAddress | string | array $coordinate, int $break, int $max = -1): static
     {
         $cellAddress = Functions::trimSheetFromCellReference(Validations::validateCellAddress($coordinate));
 
@@ -1692,7 +1692,7 @@ 
      *
      * @return $this
      */
-    public function mergeCells(AddressRange|string|array $range, string $behaviour = self::MERGE_CELL_CONTENT_EMPTY): static
+    public function mergeCells(AddressRange | string | array $range, string $behaviour = self::MERGE_CELL_CONTENT_EMPTY): static
     {
         $range = Functions::trimSheetFromCellReference(Validations::validateCellRange($range));
 
@@ -1812,7 +1812,7 @@ 
      *
      * @return $this
      */
-    public function unmergeCells(AddressRange|string|array $range): static
+    public function unmergeCells(AddressRange | string | array $range): static
     {
         $range = Functions::trimSheetFromCellReference(Validations::validateCellRange($range));
 
@@ -1865,7 +1865,7 @@ 
      *
      * @return $this
      */
-    public function protectCells(AddressRange|CellAddress|int|string|array $range, string $password, bool $alreadyHashed = false): static
+    public function protectCells(AddressRange | CellAddress | int | string | array $range, string $password, bool $alreadyHashed = false): static
     {
         $range = Functions::trimSheetFromCellReference(Validations::validateCellOrCellRange($range));
 
@@ -1886,7 +1886,7 @@ 
      *
      * @return $this
      */
-    public function unprotectCells(AddressRange|CellAddress|int|string|array $range): static
+    public function unprotectCells(AddressRange | CellAddress | int | string | array $range): static
     {
         $range = Functions::trimSheetFromCellReference(Validations::validateCellOrCellRange($range));
 
@@ -1927,7 +1927,7 @@ 
      *
      * @return $this
      */
-    public function setAutoFilter(AddressRange|string|array|AutoFilter $autoFilterOrRange): static
+    public function setAutoFilter(AddressRange | string | array | AutoFilter $autoFilterOrRange): static
     {
         if (is_object($autoFilterOrRange) && ($autoFilterOrRange instanceof AutoFilter)) {
             $this->autoFilter = $autoFilterOrRange;
@@ -2072,7 +2072,7 @@ 
      *
      * @return $this
      */
-    public function freezePane(null|CellAddress|string|array $coordinate, null|CellAddress|string|array $topLeftCell = null, bool $frozenSplit = false): static
+    public function freezePane(null | CellAddress | string | array $coordinate, null | CellAddress | string | array $topLeftCell = null, bool $frozenSplit = false): static
     {
         $this->panes = [
             'bottomRight' => null,
@@ -2582,7 +2582,7 @@ 
      *
      * @return $this
      */
-    public function removeComment(CellAddress|string|array $cellCoordinate): self
+    public function removeComment(CellAddress | string | array $cellCoordinate): self
     {
         $cellAddress = Functions::trimSheetFromCellReference(Validations::validateCellAddress($cellCoordinate));
 
@@ -2607,7 +2607,7 @@ 
      * @param array{0: int, 1: int}|CellAddress|string $cellCoordinate Coordinate of the cell as a string, eg: 'C5';
      *               or as an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object.
      */
-    public function getComment(CellAddress|string|array $cellCoordinate): Comment
+    public function getComment(CellAddress | string | array $cellCoordinate): Comment
     {
         $cellAddress = Functions::trimSheetFromCellReference(Validations::validateCellAddress($cellCoordinate));
 
@@ -2670,7 +2670,7 @@ 
      *
      * @return $this
      */
-    public function setSelectedCells(AddressRange|CellAddress|int|string|array $coordinate): static
+    public function setSelectedCells(AddressRange | CellAddress | int | string | array $coordinate): static
     {
         if (is_string($coordinate)) {
             $coordinate = Validations::definedNameToCoordinate($coordinate, $this);
@@ -3100,7 +3100,7 @@ 
      *
      * @return ($range is non-empty-string ? ($returnRange is true ? array{0: string, 1: string} : string) : ($returnRange is true ? array{0: null, 1: null} : null))
      */
-    public static function extractSheetTitle(?string $range, bool $returnRange = false): array|null|string
+    public static function extractSheetTitle(?string $range, bool $returnRange = false): array | null | string
     {
         if (empty($range)) {
             return $returnRange ? [null, null] : null;

Indentation +2 added lines, -2 removed lines

@@ -318,8 +318,8 @@
      * Create a new worksheet.
      */
     public function __construct(/**
-         * Parent spreadsheet.
-         */
+     * Parent spreadsheet.
+     */
         private ?Spreadsheet $parent = null,
         string $title = 'Worksheet'
     ) {

src/PhpSpreadsheet/Worksheet/Table.php

Spacing +3 added lines, -3 removed lines

@@ -69,7 +69,7 @@ 
      *              or an AddressRange object.
      * @param string $name (e.g. Table1)
      */
-    public function __construct(AddressRange|string|array $range = '', string $name = '')
+    public function __construct(AddressRange | string | array $range = '', string $name = '')
     {
         $this->style = new TableStyle();
         $this->autoFilter = new AutoFilter($range);
@@ -272,7 +272,7 @@ 
      *              or passing in an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 8]),
      *              or an AddressRange object.
      */
-    public function setRange(AddressRange|string|array $range = ''): self
+    public function setRange(AddressRange | string | array $range = ''): self
     {
         // extract coordinate
         if ($range !== '') {
@@ -437,7 +437,7 @@ 
      * @param string|Table\Column $columnObjectOrString
      *            A simple string containing a Column ID like 'A' is permitted
      */
-    public function setColumn(string|Table\Column $columnObjectOrString): self
+    public function setColumn(string | Table\Column $columnObjectOrString): self
     {
         if ((is_string($columnObjectOrString)) && (!empty($columnObjectOrString))) {
             $column = $columnObjectOrString;

src/PhpSpreadsheet/Worksheet/Validations.php

Spacing +3 added lines, -3 removed lines

@@ -15,7 +15,7 @@ 
      * @param null|array{0: int, 1: int}|CellAddress|string $cellAddress Coordinate of the cell as a string, eg: 'C5';
      *               or as an array of [$columnIndex, $row] (e.g. [3, 5]), or a CellAddress object.
      */
-    public static function validateCellAddress(null|CellAddress|string|array $cellAddress): string
+    public static function validateCellAddress(null | CellAddress | string | array $cellAddress): string
     {
         if (is_string($cellAddress)) {
             [$worksheet, $address] = Worksheet::extractSheetTitle($cellAddress, true);
@@ -40,7 +40,7 @@ 
      *               or as an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 12]),
      *               or as a CellAddress or AddressRange object.
      */
-    public static function validateCellOrCellRange(AddressRange|CellAddress|int|string|array $cellRange): string
+    public static function validateCellOrCellRange(AddressRange | CellAddress | int | string | array $cellRange): string
     {
         if (is_string($cellRange) || is_numeric($cellRange)) {
             // Convert a single column reference like 'A' to 'A:A',
@@ -63,7 +63,7 @@ 
      *               or as an array of [$fromColumnIndex, $fromRow, $toColumnIndex, $toRow] (e.g. [3, 5, 6, 12]),
      *               or as an AddressRange object.
      */
-    public static function validateCellRange(AddressRange|string|array $cellRange): string
+    public static function validateCellRange(AddressRange | string | array $cellRange): string
     {
         if (is_string($cellRange)) {
             [$worksheet, $addressRange] = Worksheet::extractSheetTitle($cellRange, true);

tests/PhpSpreadsheetTests/Document/PropertiesTest.php

Spacing +2 added lines, -2 removed lines

@@ -47,7 +47,7 @@ 
     /**
      * @dataProvider providerCreationTime
      */
-    public function testSetCreated(null|int $expectedCreationTime, null|int|string $created): void
+    public function testSetCreated(null | int $expectedCreationTime, null | int | string $created): void
     {
         $expectedCreationTime ??= $this->startTime;
 
@@ -76,7 +76,7 @@ 
     /**
      * @dataProvider providerModifiedTime
      */
-    public function testSetModified(mixed $expectedModifiedTime, null|int|string $modified): void
+    public function testSetModified(mixed $expectedModifiedTime, null | int | string $modified): void
     {
         $expectedModifiedTime ??= $this->startTime;