Rector TypedPropertyFromStrictGetterMethodReturnTypeRector

Author: PowerKiKi

src/PhpSpreadsheet/Calculation/Engine/BranchPruner.php

@@ -47,20 +47,11 @@ class BranchPruner
      */
     protected $braceDepthMap = [];
 
-    /**
-     * @var null|string
-     */
-    protected $currentCondition;
+    protected ?string $currentCondition = null;
 
-    /**
-     * @var null|string
-     */
-    protected $currentOnlyIf;
+    protected ?string $currentOnlyIf = null;
 
-    /**
-     * @var null|string
-     */
-    protected $currentOnlyIfNot;
+    protected ?string $currentOnlyIfNot = null;
 
     /**
      * @var null|string

src/PhpSpreadsheet/Calculation/Financial/CashFlow/Constant/Periodic/InterestAndPrincipal.php

@@ -6,8 +6,7 @@
 
 class InterestAndPrincipal
 {
-    /** @var float */
-    protected $interest;
+    protected float $interest;
 
     protected float $principal;
 

src/PhpSpreadsheet/Cell/CellAddress.php

@@ -9,25 +9,13 @@ class CellAddress
 {
     protected ?\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $worksheet;
 
-    /**
-     * @var string
-     */
-    protected $cellAddress;
+    protected string $cellAddress;
 
-    /**
-     * @var string
-     */
-    protected $columnName;
+    protected string $columnName = '';
 
-    /**
-     * @var int
-     */
-    protected $columnId;
+    protected int $columnId;
 
-    /**
-     * @var int
-     */
-    protected $rowId;
+    protected int $rowId;
 
     public function __construct(string $cellAddress, ?Worksheet $worksheet = null)
     {

src/PhpSpreadsheet/Cell/ColumnRange.php

@@ -8,15 +8,9 @@ class ColumnRange implements AddressRange
 {
     protected ?\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $worksheet;
 
-    /**
-     * @var int
-     */
-    protected $from;
+    protected int $from;
 
-    /**
-     * @var int
-     */
-    protected $to;
+    protected int $to;
 
     public function __construct(string $from, ?string $to = null, ?Worksheet $worksheet = null)
     {

src/PhpSpreadsheet/Cell/DataValidation.php

@@ -480,8 +480,7 @@ public function __clone()
         }
     }
 
-    /** @var ?string */
-    private $sqref;
+    private ?string $sqref = null;
 
     public function getSqref(): ?string
     {

src/PhpSpreadsheet/Cell/RowRange.php

@@ -8,15 +8,9 @@ class RowRange implements AddressRange
 {
     protected ?\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $worksheet;
 
-    /**
-     * @var int
-     */
-    protected $from;
-
-    /**
-     * @var int
-     */
-    protected $to;
+    protected int $from;
+
+    protected int $to;
 
     public function __construct(int $from, ?int $to = null, ?Worksheet $worksheet = null)
     {

src/PhpSpreadsheet/CellReferenceHelper.php

@@ -7,10 +7,7 @@
 
 class CellReferenceHelper
 {
-    /**
-     * @var string
-     */
-    protected $beforeCellAddress;
+    protected string $beforeCellAddress;
 
     protected int $beforeColumn;
 

src/PhpSpreadsheet/Chart/Axis.php

@@ -26,17 +26,13 @@ public function __construct()
 
     /**
      * Chart Major Gridlines as.
-     *
-     * @var ?GridLines
      */
-    private $majorGridlines;
+    private ?\PhpOffice\PhpSpreadsheet\Chart\GridLines $majorGridlines = null;
 
     /**
      * Chart Minor Gridlines as.
-     *
-     * @var ?GridLines
      */
-    private $minorGridlines;
+    private ?\PhpOffice\PhpSpreadsheet\Chart\GridLines $minorGridlines = null;
 
     /**
      * Axis Number.
@@ -49,11 +45,9 @@ public function __construct()
         'numeric' => null,
     ];
 
-    /** @var string */
-    private $axisType = '';
+    private string $axisType = '';
 
-    /** @var ?AxisText */
-    private $axisText;
+    private ?\PhpOffice\PhpSpreadsheet\Chart\AxisText $axisText = null;
 
     /**
      * Axis Options.
@@ -265,8 +259,7 @@ public function getLineProperty($propertyName)
         return $this->getLineColorProperty($propertyName);
     }
 
-    /** @var string */
-    private $crossBetween = ''; // 'between' or 'midCat' might be better
+    private string $crossBetween = ''; // 'between' or 'midCat' might be better
 
     public function setCrossBetween(string $crossBetween): self
     {

src/PhpSpreadsheet/Chart/AxisText.php

@@ -6,8 +6,7 @@
 
 class AxisText extends Properties
 {
-    /** @var ?int */
-    private $rotation;
+    private ?int $rotation = null;
 
     private \PhpOffice\PhpSpreadsheet\Style\Font $font;
 

src/PhpSpreadsheet/Chart/Chart.php

@@ -16,10 +16,8 @@ class Chart
 
     /**
      * Worksheet.
-     *
-     * @var ?Worksheet
      */
-    private $worksheet;
+    private ?\PhpOffice\PhpSpreadsheet\Worksheet\Worksheet $worksheet = null;
 
     /**
      * Chart Title.
@@ -93,10 +91,8 @@ class Chart
 
     /**
      * Bottom-Right Cell Position.
-     *
-     * @var string
      */
-    private $bottomRightCellRef = '';
+    private string $bottomRightCellRef = '';
 
     /**
      * Bottom-Right X-Offset.
@@ -112,17 +108,13 @@ class Chart
      */
     private $bottomRightYOffset = 10;
 
-    /** @var ?int */
-    private $rotX;
+    private ?int $rotX = null;
 
-    /** @var ?int */
-    private $rotY;
+    private ?int $rotY = null;
 
-    /** @var ?int */
-    private $rAngAx;
+    private ?int $rAngAx = null;
 
-    /** @var ?int */
-    private $perspective;
+    private ?int $perspective = null;
 
     /** @var bool */
     private $oneCellAnchor = false;