PHPOffice / PhpSpreadsheet

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);

samples/Chart33a/33_Chart_create_line_dateaxis.php

Spacing +4 added lines, -4 removed lines

@@ -181,7 +181,7 @@ 
     true, // plotVisibleOnly
     DataSeries::EMPTY_AS_GAP, // displayBlanksAs
     null, // xAxisLabel
-    $yAxisLabel,  // yAxisLabel
+    $yAxisLabel, // yAxisLabel
     // added xAxis for correct date display
     $xAxis, // xAxis
     $yAxis, // yAxis
@@ -291,13 +291,13 @@ 
     null, // minor_tick_mark
     $dateMinMax['min'], // minimum calculate this from the earliest data: 'Data!$A$2'
     $dateMinMax['max'], // maximum calculate this from the last data:     'Data!$A$'.($nrows+1)
-    $tickMarkInterval,  // majorUnit determines tickmarks & Gridlines ?
+    $tickMarkInterval, // majorUnit determines tickmarks & Gridlines ?
     null, // minorUnit
     null, // textRotation
     null, // hidden
     'days', // baseTimeUnit
     'months', // majorTimeUnit,
-    'months',   // minorTimeUnit
+    'months', // minorTimeUnit
 );
 
 $yAxisLabel = new Title('Value ($k)');
@@ -317,7 +317,7 @@ 
     true, // plotVisibleOnly
     DataSeries::EMPTY_AS_GAP, // displayBlanksAs
     null, // xAxisLabel
-    $yAxisLabel,  // yAxisLabel
+    $yAxisLabel, // yAxisLabel
     // added xAxis for correct date display
     $xAxis, // xAxis
     $yAxis, // yAxis

samples/Chart33b/33_Chart_create_scatter5_trendlines.php

Spacing +2 added lines, -2 removed lines

@@ -155,7 +155,7 @@ 
     true, // plotVisibleOnly
     DataSeries::EMPTY_AS_GAP, // displayBlanksAs
     null, // xAxisLabel
-    $yAxisLabel,  // yAxisLabel
+    $yAxisLabel, // yAxisLabel
     // added xAxis for correct date display
     $xAxis, // xAxis
     //  $yAxis, // yAxis
@@ -251,7 +251,7 @@ 
     true, // plotVisibleOnly
     DataSeries::EMPTY_AS_GAP, // displayBlanksAs
     null, // xAxisLabel
-    $yAxisLabel,  // yAxisLabel
+    $yAxisLabel, // yAxisLabel
     // added xAxis for correct date display
     $xAxis, // xAxis
     //  $yAxis, // yAxis

samples/Chart33b/33_Chart_create_scatter3.php

Spacing +1 added lines, -1 removed lines

@@ -129,7 +129,7 @@
 
 $yAxis = new ChartAxis();
 $yAxis->setLineStyleProperties(
-    2.5,     // width in points
+    2.5, // width in points
     Properties::LINE_STYLE_COMPOUND_SIMPLE,
     Properties::LINE_STYLE_DASH_DASH_DOT,
     Properties::LINE_STYLE_CAP_FLAT,

samples/Chart33b/33_Chart_create_scatter2.php

Spacing +2 added lines, -2 removed lines

@@ -128,7 +128,7 @@ 
 
 $yAxis = new ChartAxis();
 $yAxis->setLineStyleProperties(
-    2.5,     // width in points
+    2.5, // width in points
     Properties::LINE_STYLE_COMPOUND_SIMPLE,
     Properties::LINE_STYLE_DASH_DASH_DOT,
     Properties::LINE_STYLE_CAP_FLAT,
@@ -166,7 +166,7 @@ 
     true, // plotVisibleOnly
     DataSeries::EMPTY_AS_GAP, // displayBlanksAs
     null, // xAxisLabel
-    $yAxisLabel,  // yAxisLabel
+    $yAxisLabel, // yAxisLabel
     // added xAxis for correct date display
     $xAxis, // xAxis
     $yAxis, // yAxis

src/PhpSpreadsheet/Document/Properties.php

Spacing +38 added lines, -38 removed lines

@@ -36,12 +36,12 @@ 
     /**
      * Created.
      */
-    private float|int $created;
+    private float | int $created;
 
     /**
      * Modified.
      */
-    private float|int $modified;
+    private float | int $modified;
 
     /**
      * Title.
@@ -140,7 +140,7 @@ 
         return $this;
     }
 
-    private static function intOrFloatTimestamp(null|bool|float|int|string $timestamp): float|int
+    private static function intOrFloatTimestamp(null | bool | float | int | string $timestamp): float | int
     {
         if ($timestamp === null || is_bool($timestamp)) {
             $timestamp = (float) (new DateTime())->format('U');
@@ -161,7 +161,7 @@ 
     /**
      * Get Created.
      */
-    public function getCreated(): float|int
+    public function getCreated(): float | int
     {
         return $this->created;
     }
@@ -171,7 +171,7 @@ 
      *
      * @return $this
      */
-    public function setCreated(null|float|int|string $timestamp): self
+    public function setCreated(null | float | int | string $timestamp): self
     {
         $this->created = self::intOrFloatTimestamp($timestamp);
 
@@ -181,7 +181,7 @@ 
     /**
      * Get Modified.
      */
-    public function getModified(): float|int
+    public function getModified(): float | int
     {
         return $this->modified;
     }
@@ -191,7 +191,7 @@ 
      *
      * @return $this
      */
-    public function setModified(null|float|int|string $timestamp): self
+    public function setModified(null | float | int | string $timestamp): self
     {
         $this->modified = self::intOrFloatTimestamp($timestamp);
 
@@ -359,7 +359,7 @@ 
     /**
      * Get a Custom Property Value.
      */
-    public function getCustomPropertyValue(string $propertyName): bool|int|float|string|null
+    public function getCustomPropertyValue(string $propertyName): bool | int | float | string | null
     {
         if (isset($this->customProperties[$propertyName])) {
             return $this->customProperties[$propertyName]['value'];
@@ -376,7 +376,7 @@ 
         return $this->customProperties[$propertyName]['type'] ?? null;
     }
 
-    private function identifyPropertyType(bool|int|float|string|null $propertyValue): string
+    private function identifyPropertyType(bool | int | float | string | null $propertyValue): string
     {
         if (is_float($propertyValue)) {
             return self::PROPERTY_TYPE_FLOAT;
@@ -398,7 +398,7 @@ 
      *
      * @return $this
      */
-    public function setCustomProperty(string $propertyName, bool|int|float|string|null $propertyValue = '', ?string $propertyType = null): self
+    public function setCustomProperty(string $propertyName, bool | int | float | string | null $propertyValue = '', ?string $propertyType = null): self
     {
         if (($propertyType === null) || (!in_array($propertyType, self::VALID_PROPERTY_TYPE_LIST))) {
             $propertyType = $this->identifyPropertyType($propertyValue);
@@ -413,32 +413,32 @@ 
     }
 
     private const PROPERTY_TYPE_ARRAY = [
-        'i' => self::PROPERTY_TYPE_INTEGER,      //    Integer
-        'i1' => self::PROPERTY_TYPE_INTEGER,     //    1-Byte Signed Integer
-        'i2' => self::PROPERTY_TYPE_INTEGER,     //    2-Byte Signed Integer
-        'i4' => self::PROPERTY_TYPE_INTEGER,     //    4-Byte Signed Integer
-        'i8' => self::PROPERTY_TYPE_INTEGER,     //    8-Byte Signed Integer
-        'int' => self::PROPERTY_TYPE_INTEGER,    //    Integer
-        'ui1' => self::PROPERTY_TYPE_INTEGER,    //    1-Byte Unsigned Integer
-        'ui2' => self::PROPERTY_TYPE_INTEGER,    //    2-Byte Unsigned Integer
-        'ui4' => self::PROPERTY_TYPE_INTEGER,    //    4-Byte Unsigned Integer
-        'ui8' => self::PROPERTY_TYPE_INTEGER,    //    8-Byte Unsigned Integer
-        'uint' => self::PROPERTY_TYPE_INTEGER,   //    Unsigned Integer
-        'f' => self::PROPERTY_TYPE_FLOAT,        //    Real Number
-        'r4' => self::PROPERTY_TYPE_FLOAT,       //    4-Byte Real Number
-        'r8' => self::PROPERTY_TYPE_FLOAT,       //    8-Byte Real Number
-        'decimal' => self::PROPERTY_TYPE_FLOAT,  //    Decimal
-        's' => self::PROPERTY_TYPE_STRING,       //    String
-        'empty' => self::PROPERTY_TYPE_STRING,   //    Empty
-        'null' => self::PROPERTY_TYPE_STRING,    //    Null
-        'lpstr' => self::PROPERTY_TYPE_STRING,   //    LPSTR
-        'lpwstr' => self::PROPERTY_TYPE_STRING,  //    LPWSTR
-        'bstr' => self::PROPERTY_TYPE_STRING,    //    Basic String
-        'd' => self::PROPERTY_TYPE_DATE,         //    Date and Time
-        'date' => self::PROPERTY_TYPE_DATE,      //    Date and Time
-        'filetime' => self::PROPERTY_TYPE_DATE,  //    File Time
-        'b' => self::PROPERTY_TYPE_BOOLEAN,      //    Boolean
-        'bool' => self::PROPERTY_TYPE_BOOLEAN,   //    Boolean
+        'i' => self::PROPERTY_TYPE_INTEGER, //    Integer
+        'i1' => self::PROPERTY_TYPE_INTEGER, //    1-Byte Signed Integer
+        'i2' => self::PROPERTY_TYPE_INTEGER, //    2-Byte Signed Integer
+        'i4' => self::PROPERTY_TYPE_INTEGER, //    4-Byte Signed Integer
+        'i8' => self::PROPERTY_TYPE_INTEGER, //    8-Byte Signed Integer
+        'int' => self::PROPERTY_TYPE_INTEGER, //    Integer
+        'ui1' => self::PROPERTY_TYPE_INTEGER, //    1-Byte Unsigned Integer
+        'ui2' => self::PROPERTY_TYPE_INTEGER, //    2-Byte Unsigned Integer
+        'ui4' => self::PROPERTY_TYPE_INTEGER, //    4-Byte Unsigned Integer
+        'ui8' => self::PROPERTY_TYPE_INTEGER, //    8-Byte Unsigned Integer
+        'uint' => self::PROPERTY_TYPE_INTEGER, //    Unsigned Integer
+        'f' => self::PROPERTY_TYPE_FLOAT, //    Real Number
+        'r4' => self::PROPERTY_TYPE_FLOAT, //    4-Byte Real Number
+        'r8' => self::PROPERTY_TYPE_FLOAT, //    8-Byte Real Number
+        'decimal' => self::PROPERTY_TYPE_FLOAT, //    Decimal
+        's' => self::PROPERTY_TYPE_STRING, //    String
+        'empty' => self::PROPERTY_TYPE_STRING, //    Empty
+        'null' => self::PROPERTY_TYPE_STRING, //    Null
+        'lpstr' => self::PROPERTY_TYPE_STRING, //    LPSTR
+        'lpwstr' => self::PROPERTY_TYPE_STRING, //    LPWSTR
+        'bstr' => self::PROPERTY_TYPE_STRING, //    Basic String
+        'd' => self::PROPERTY_TYPE_DATE, //    Date and Time
+        'date' => self::PROPERTY_TYPE_DATE, //    Date and Time
+        'filetime' => self::PROPERTY_TYPE_DATE, //    File Time
+        'b' => self::PROPERTY_TYPE_BOOLEAN, //    Boolean
+        'bool' => self::PROPERTY_TYPE_BOOLEAN, //    Boolean
     ];
 
     private const SPECIAL_TYPES = [
@@ -449,7 +449,7 @@ 
     /**
      * Convert property to form desired by Excel.
      */
-    public static function convertProperty(bool|int|float|string|null $propertyValue, string $propertyType): bool|int|float|string|null
+    public static function convertProperty(bool | int | float | string | null $propertyValue, string $propertyType): bool | int | float | string | null
     {
         return self::SPECIAL_TYPES[$propertyType] ?? self::convertProperty2($propertyValue, $propertyType);
     }
@@ -457,7 +457,7 @@ 
     /**
      * Convert property to form desired by Excel.
      */
-    private static function convertProperty2(bool|int|float|string|null $propertyValue, string $type): bool|int|float|string|null
+    private static function convertProperty2(bool | int | float | string | null $propertyValue, string $type): bool | int | float | string | null
     {
         $propertyType = self::convertPropertyType($type);
         switch ($propertyType) {

src/PhpSpreadsheet/Calculation/DateTimeExcel/TimeValue.php

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,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 fromString(null|array|string|int|bool|float $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/Worksheet/Worksheet.php

Spacing +16 added lines, -16 removed lines

@@ -1111,7 +1111,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);
@@ -1136,7 +1136,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);
@@ -1157,7 +1157,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));
 
@@ -1303,7 +1303,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);
@@ -1389,7 +1389,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);
 
@@ -1596,7 +1596,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));
 
@@ -1693,7 +1693,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));
 
@@ -1813,7 +1813,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));
 
@@ -1866,7 +1866,7 @@ 
      *
      * @return $this
      */
-    public function protectCells(AddressRange|CellAddress|int|string|array $range, string $password = '', bool $alreadyHashed = false, string $name = '', string $securityDescriptor = ''): static
+    public function protectCells(AddressRange | CellAddress | int | string | array $range, string $password = '', bool $alreadyHashed = false, string $name = '', string $securityDescriptor = ''): static
     {
         $range = Functions::trimSheetFromCellReference(Validations::validateCellOrCellRange($range));
 
@@ -1887,7 +1887,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));
 
@@ -1946,7 +1946,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;
@@ -2091,7 +2091,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,
@@ -2601,7 +2601,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));
 
@@ -2626,7 +2626,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, bool $attachNew = true): Comment
+    public function getComment(CellAddress | string | array $cellCoordinate, bool $attachNew = true): Comment
     {
         $cellAddress = Functions::trimSheetFromCellReference(Validations::validateCellAddress($cellCoordinate));
 
@@ -2691,7 +2691,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);
@@ -3150,7 +3150,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;

src/PhpSpreadsheet/Style/NumberFormat/Wizard/DateTime.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
         $this->formatBlocks = array_map([$this, 'mapFormatBlocks'], $formatBlocks);
     }
 
-    private function mapFormatBlocks(DateTimeWizard|string $value): string
+    private function mapFormatBlocks(DateTimeWizard | string $value): string
     {
         // Any date masking codes are returned as lower case values
         if ($value instanceof DateTimeWizard) {