alex
/
PhpSpreadsheet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove duplicated code and call parent methods where possible

This commit is contained in:
Alessandro Lai 2017-12-22 10:16:00 +01:00 committed by Adrien Crivelli
parent f246ad731d
commit a653e09bf0
No known key found for this signature in database
GPG Key ID: B182FD79DC6DE92E
8 changed files with 3 additions and 401 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/PhpSpreadsheet/RichText/Run.php
View File

@ -21,8 +21,8 @@ class Run extends TextElement implements ITextElement
*/
public function __construct($pText = '')
{
parent::__construct($pText);
// Initialise variables
$this->setText($pText);
$this->font = new Font();
}
@ -65,19 +65,4 @@ class Run extends TextElement implements ITextElement
__CLASS__
);
}
/**
* Implement PHP __clone to create a deep clone, not just a shallow copy.
*/
public function __clone()
{
$vars = get_object_vars($this);
foreach ($vars as $key => $value) {
if (is_object($value)) {
$this->$key = clone $value;
} else {
$this->$key = $value;
}
}
}
}

3
src/PhpSpreadsheet/Shared/Trend/BestFit.php
View File

@ -411,12 +411,9 @@ class BestFit
// Define X Values if necessary
if ($nX == 0) {
$xValues = range(1, $nY);
$nX = $nY;
} elseif ($nY != $nX) {
// Ensure both arrays of points are the same size
$this->error = true;
return false;
}
$this->valueCount = $nY;

3
src/PhpSpreadsheet/Style/Style.php
View File

@ -82,8 +82,7 @@ class Style extends Supervisor
*/
public function __construct($isSupervisor = false, $isConditional = false)
{
// Supervisor?
$this->isSupervisor = $isSupervisor;
parent::__construct($this->isSupervisor);
// Initialise values
$this->conditionalStyles = [];

8
src/PhpSpreadsheet/Worksheet/ColumnCellIterator.php
View File

@ -52,14 +52,6 @@ class ColumnCellIterator extends CellIterator
$this->resetStart($startRow);
}
/**
* Destructor.
*/
public function __destruct()
{
unset($this->worksheet);
}
/**
* (Re)Set the start row and the current row pointer.
*

15
src/PhpSpreadsheet/Worksheet/Drawing.php
View File

@ -113,19 +113,4 @@ class Drawing extends BaseDrawing
__CLASS__
);
}
/**
* Implement PHP __clone to create a deep clone, not just a shallow copy.
*/
public function __clone()
{
$vars = get_object_vars($this);
foreach ($vars as $key => $value) {
if (is_object($value)) {
$this->$key = clone $value;
} else {
$this->$key = $value;
}
}
}
}

335
src/PhpSpreadsheet/Worksheet/HeaderFooterDrawing.php
View File

@ -2,326 +2,8 @@
namespace PhpOffice\PhpSpreadsheet\Worksheet;
use PhpOffice\PhpSpreadsheet\Exception as PhpSpreadsheetException;
class HeaderFooterDrawing extends Drawing
{
/**
* Path.
*
* @var string
*/
private $path;
/**
* Name.
*
* @var string
*/
protected $name;
/**
* Offset X.
*
* @var int
*/
protected $offsetX;
/**
* Offset Y.
*
* @var int
*/
protected $offsetY;
/**
* Width.
*
* @var int
*/
protected $width;
/**
* Height.
*
* @var int
*/
protected $height;
/**
* Proportional resize.
*
* @var bool
*/
protected $resizeProportional;
/**
* Create a new HeaderFooterDrawing.
*/
public function __construct()
{
// Initialise values
$this->path = '';
$this->name = '';
$this->offsetX = 0;
$this->offsetY = 0;
$this->width = 0;
$this->height = 0;
$this->resizeProportional = true;
}
/**
* Get Name.
*
* @return string
*/
public function getName()
{
return $this->name;
}
/**
* Set Name.
*
* @param string $pValue
*
* @return HeaderFooterDrawing
*/
public function setName($pValue)
{
$this->name = $pValue;
return $this;
}
/**
* Get OffsetX.
*
* @return int
*/
public function getOffsetX()
{
return $this->offsetX;
}
/**
* Set OffsetX.
*
* @param int $pValue
*
* @return HeaderFooterDrawing
*/
public function setOffsetX($pValue)
{
$this->offsetX = $pValue;
return $this;
}
/**
* Get OffsetY.
*
* @return int
*/
public function getOffsetY()
{
return $this->offsetY;
}
/**
* Set OffsetY.
*
* @param int $pValue
*
* @return HeaderFooterDrawing
*/
public function setOffsetY($pValue)
{
$this->offsetY = $pValue;
return $this;
}
/**
* Get Width.
*
* @return int
*/
public function getWidth()
{
return $this->width;
}
/**
* Set Width.
*
* @param int $pValue
*
* @return HeaderFooterDrawing
*/
public function setWidth($pValue)
{
// Resize proportional?
if ($this->resizeProportional && $pValue != 0) {
$ratio = $this->width / $this->height;
$this->height = round($ratio * $pValue);
}
// Set width
$this->width = $pValue;
return $this;
}
/**
* Get Height.
*
* @return int
*/
public function getHeight()
{
return $this->height;
}
/**
* Set Height.
*
* @param int $pValue
*
* @return HeaderFooterDrawing
*/
public function setHeight($pValue)
{
// Resize proportional?
if ($this->resizeProportional && $pValue != 0) {
$ratio = $this->width / $this->height;
$this->width = round($ratio * $pValue);
}
// Set height
$this->height = $pValue;
return $this;
}
/**
* Set width and height with proportional resize
* Example:
* <code>
* $objDrawing->setResizeProportional(true);
* $objDrawing->setWidthAndHeight(160,120);
* </code>.
*
* @author Vincent@luo MSN:kele_100@hotmail.com
*
* @param int $width
* @param int $height
*
* @return HeaderFooterDrawing
*/
public function setWidthAndHeight($width, $height)
{
$xratio = $width / $this->width;
$yratio = $height / $this->height;
if ($this->resizeProportional && !($width == 0 || $height == 0)) {
if (($xratio * $this->height) < $height) {
$this->height = ceil($xratio * $this->height);
$this->width = $width;
} else {
$this->width = ceil($yratio * $this->width);
$this->height = $height;
}
}
return $this;
}
/**
* Get ResizeProportional.
*
* @return bool
*/
public function getResizeProportional()
{
return $this->resizeProportional;
}
/**
* Set ResizeProportional.
*
* @param bool $pValue
*
* @return HeaderFooterDrawing
*/
public function setResizeProportional($pValue)
{
$this->resizeProportional = $pValue;
return $this;
}
/**
* Get Filename.
*
* @return string
*/
public function getFilename()
{
return basename($this->path);
}
/**
* Get Extension.
*
* @return string
*/
public function getExtension()
{
$parts = explode('.', basename($this->path));
return end($parts);
}
/**
* Get Path.
*
* @return string
*/
public function getPath()
{
return $this->path;
}
/**
* Set Path.
*
* @param string $pValue File path
* @param bool $pVerifyFile Verify file
*
* @throws PhpSpreadsheetException
*
* @return HeaderFooterDrawing
*/
public function setPath($pValue, $pVerifyFile = true)
{
if ($pVerifyFile) {
if (file_exists($pValue)) {
$this->path = $pValue;
if ($this->width == 0 && $this->height == 0) {
// Get width/height
list($this->width, $this->height) = getimagesize($pValue);
}
} else {
throw new PhpSpreadsheetException("File $pValue not found!");
}
} else {
$this->path = $pValue;
}
return $this;
}
/**
* Get hash code.
*
@ -330,7 +12,7 @@ class HeaderFooterDrawing extends Drawing
public function getHashCode()
{
return md5(
$this->path .
$this->getPath() .
$this->name .
$this->offsetX .
$this->offsetY .
@ -339,19 +21,4 @@ class HeaderFooterDrawing extends Drawing
__CLASS__
);
}
/**
* Implement PHP __clone to create a deep clone, not just a shallow copy.
*/
public function __clone()
{
$vars = get_object_vars($this);
foreach ($vars as $key => $value) {
if (is_object($value)) {
$this->$key = clone $value;
} else {
$this->$key = $value;
}
}
}
}

15
src/PhpSpreadsheet/Worksheet/MemoryDrawing.php
View File

@ -166,19 +166,4 @@ class MemoryDrawing extends BaseDrawing
__CLASS__
);
}
/**
* Implement PHP __clone to create a deep clone, not just a shallow copy.
*/
public function __clone()
{
$vars = get_object_vars($this);
foreach ($vars as $key => $value) {
if (is_object($value)) {
$this->$key = unserialize(serialize($value));
} else {
$this->$key = $value;
}
}
}
}

8
src/PhpSpreadsheet/Worksheet/RowCellIterator.php
View File

@ -52,14 +52,6 @@ class RowCellIterator extends CellIterator
$this->resetStart($startColumn);
}
/**
* Destructor.
*/
public function __destruct()
{
unset($this->worksheet);
}
/**
* (Re)Set the start column and the current column pointer.
*