Type and return tpe cleanups

This commit is contained in:
MarkBaker 2022-05-16 15:49:02 +02:00
parent 198878b347
commit 94963f4b97
2 changed files with 41 additions and 88 deletions

View File

@ -1160,76 +1160,6 @@ parameters:
count: 1 count: 1
path: src/PhpSpreadsheet/Chart/Chart.php path: src/PhpSpreadsheet/Chart/Chart.php
-
message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Chart\\:\\:getBottomRightXOffset\\(\\) has no return type specified\\.$#"
count: 1
path: src/PhpSpreadsheet/Chart/Chart.php
-
message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Chart\\:\\:getBottomRightYOffset\\(\\) has no return type specified\\.$#"
count: 1
path: src/PhpSpreadsheet/Chart/Chart.php
-
message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Chart\\:\\:getTopLeftXOffset\\(\\) has no return type specified\\.$#"
count: 1
path: src/PhpSpreadsheet/Chart/Chart.php
-
message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Chart\\:\\:getTopLeftYOffset\\(\\) has no return type specified\\.$#"
count: 1
path: src/PhpSpreadsheet/Chart/Chart.php
-
message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Chart\\:\\:setBottomRightCell\\(\\) has no return type specified\\.$#"
count: 1
path: src/PhpSpreadsheet/Chart/Chart.php
-
message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Chart\\:\\:setBottomRightCell\\(\\) has parameter \\$cell with no type specified\\.$#"
count: 1
path: src/PhpSpreadsheet/Chart/Chart.php
-
message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Chart\\:\\:setBottomRightXOffset\\(\\) has no return type specified\\.$#"
count: 1
path: src/PhpSpreadsheet/Chart/Chart.php
-
message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Chart\\:\\:setBottomRightXOffset\\(\\) has parameter \\$xOffset with no type specified\\.$#"
count: 1
path: src/PhpSpreadsheet/Chart/Chart.php
-
message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Chart\\:\\:setBottomRightYOffset\\(\\) has no return type specified\\.$#"
count: 1
path: src/PhpSpreadsheet/Chart/Chart.php
-
message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Chart\\:\\:setBottomRightYOffset\\(\\) has parameter \\$yOffset with no type specified\\.$#"
count: 1
path: src/PhpSpreadsheet/Chart/Chart.php
-
message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Chart\\:\\:setTopLeftXOffset\\(\\) has no return type specified\\.$#"
count: 1
path: src/PhpSpreadsheet/Chart/Chart.php
-
message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Chart\\:\\:setTopLeftXOffset\\(\\) has parameter \\$xOffset with no type specified\\.$#"
count: 1
path: src/PhpSpreadsheet/Chart/Chart.php
-
message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Chart\\:\\:setTopLeftYOffset\\(\\) has no return type specified\\.$#"
count: 1
path: src/PhpSpreadsheet/Chart/Chart.php
-
message: "#^Method PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Chart\\:\\:setTopLeftYOffset\\(\\) has parameter \\$yOffset with no type specified\\.$#"
count: 1
path: src/PhpSpreadsheet/Chart/Chart.php
- -
message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Chart\\:\\:\\$legend \\(PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Legend\\) does not accept PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Legend\\|null\\.$#" message: "#^Property PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Chart\\:\\:\\$legend \\(PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Legend\\) does not accept PhpOffice\\\\PhpSpreadsheet\\\\Chart\\\\Legend\\|null\\.$#"
count: 1 count: 1

View File

@ -400,15 +400,15 @@ class Chart
/** /**
* Set the Top Left position for the chart. * Set the Top Left position for the chart.
* *
* @param string $cell * @param string $cellAddress
* @param int $xOffset * @param int $xOffset
* @param int $yOffset * @param int $yOffset
* *
* @return $this * @return $this
*/ */
public function setTopLeftPosition($cell, $xOffset = null, $yOffset = null) public function setTopLeftPosition($cellAddress, $xOffset = null, $yOffset = null)
{ {
$this->topLeftCellRef = $cell; $this->topLeftCellRef = $cellAddress;
if ($xOffset !== null) { if ($xOffset !== null) {
$this->setTopLeftXOffset($xOffset); $this->setTopLeftXOffset($xOffset);
} }
@ -446,13 +446,13 @@ class Chart
/** /**
* Set the Top Left cell position for the chart. * Set the Top Left cell position for the chart.
* *
* @param string $cell * @param string $cellAddress
* *
* @return $this * @return $this
*/ */
public function setTopLeftCell($cell) public function setTopLeftCell($cellAddress)
{ {
$this->topLeftCellRef = $cell; $this->topLeftCellRef = $cellAddress;
return $this; return $this;
} }
@ -491,6 +491,11 @@ class Chart
]; ];
} }
/**
* @param int $xOffset
*
* @return $this
*/
public function setTopLeftXOffset($xOffset) public function setTopLeftXOffset($xOffset)
{ {
$this->topLeftXOffset = $xOffset; $this->topLeftXOffset = $xOffset;
@ -498,11 +503,16 @@ class Chart
return $this; return $this;
} }
public function getTopLeftXOffset() public function getTopLeftXOffset(): int
{ {
return $this->topLeftXOffset; return $this->topLeftXOffset;
} }
/**
* @param int $yOffset
*
* @return $this
*/
public function setTopLeftYOffset($yOffset) public function setTopLeftYOffset($yOffset)
{ {
$this->topLeftYOffset = $yOffset; $this->topLeftYOffset = $yOffset;
@ -510,7 +520,7 @@ class Chart
return $this; return $this;
} }
public function getTopLeftYOffset() public function getTopLeftYOffset(): int
{ {
return $this->topLeftYOffset; return $this->topLeftYOffset;
} }
@ -518,15 +528,15 @@ class Chart
/** /**
* Set the Bottom Right position of the chart. * Set the Bottom Right position of the chart.
* *
* @param string $cell * @param string $cellAddress
* @param int $xOffset * @param int $xOffset
* @param int $yOffset * @param int $yOffset
* *
* @return $this * @return $this
*/ */
public function setBottomRightPosition($cell = '', $xOffset = null, $yOffset = null) public function setBottomRightPosition($cellAddress = '', $xOffset = null, $yOffset = null)
{ {
$this->bottomRightCellRef = $cell; $this->bottomRightCellRef = $cellAddress;
if ($xOffset !== null) { if ($xOffset !== null) {
$this->setBottomRightXOffset($xOffset); $this->setBottomRightXOffset($xOffset);
} }
@ -551,19 +561,22 @@ class Chart
]; ];
} }
public function setBottomRightCell($cell) /**
* Set the Bottom Right cell for the chart.
*
* @return $this
*/
public function setBottomRightCell(string $cellAddress = '')
{ {
$this->bottomRightCellRef = $cell; $this->bottomRightCellRef = $cellAddress;
return $this; return $this;
} }
/** /**
* Get the cell address where the bottom right of the chart is fixed. * Get the cell address where the bottom right of the chart is fixed.
*
* @return string
*/ */
public function getBottomRightCell() public function getBottomRightCell(): string
{ {
return $this->bottomRightCellRef; return $this->bottomRightCellRef;
} }
@ -602,6 +615,11 @@ class Chart
]; ];
} }
/**
* @param int $xOffset
*
* @return $this
*/
public function setBottomRightXOffset($xOffset) public function setBottomRightXOffset($xOffset)
{ {
$this->bottomRightXOffset = $xOffset; $this->bottomRightXOffset = $xOffset;
@ -609,11 +627,16 @@ class Chart
return $this; return $this;
} }
public function getBottomRightXOffset() public function getBottomRightXOffset(): int
{ {
return $this->bottomRightXOffset; return $this->bottomRightXOffset;
} }
/**
* @param int $yOffset
*
* @return $this
*/
public function setBottomRightYOffset($yOffset) public function setBottomRightYOffset($yOffset)
{ {
$this->bottomRightYOffset = $yOffset; $this->bottomRightYOffset = $yOffset;
@ -621,7 +644,7 @@ class Chart
return $this; return $this;
} }
public function getBottomRightYOffset() public function getBottomRightYOffset(): int
{ {
return $this->bottomRightYOffset; return $this->bottomRightYOffset;
} }