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

Merge branch 'psr2' into develop

This commit is contained in:
MarkBaker 2015-05-20 00:21:04 +01:00
parent f94dcb9852 7cd731e416
commit b394056b56
4 changed files with 335 additions and 345 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

506
Classes/PHPExcel/Worksheet.php
View File

File diff suppressed because it is too large Load Diff

36
Classes/PHPExcel/Worksheet/PageMargins.php
View File

@ -40,42 +40,42 @@ class PHPExcel_Worksheet_PageMargins
* *
* @var double * @var double
*/ */
private $_left = 0.7; private $left = 0.7;
/** /**
* Right * Right
* *
* @var double * @var double
*/ */
private $_right = 0.7; private $right = 0.7;
/** /**
* Top * Top
* *
* @var double * @var double
*/ */
private $_top = 0.75; private $top = 0.75;
/** /**
* Bottom * Bottom
* *
* @var double * @var double
*/ */
private $_bottom = 0.75; private $bottom = 0.75;
/** /**
* Header * Header
* *
* @var double * @var double
*/ */
private $_header = 0.3; private $header = 0.3;
/** /**
* Footer * Footer
* *
* @var double * @var double
*/ */
private $_footer = 0.3; private $footer = 0.3;
/** /**
* Create a new PHPExcel_Worksheet_PageMargins * Create a new PHPExcel_Worksheet_PageMargins
@ -91,7 +91,7 @@ class PHPExcel_Worksheet_PageMargins
*/ */
public function getLeft() public function getLeft()
{ {
return $this->_left; return $this->left;
} }
/** /**
@ -102,7 +102,7 @@ class PHPExcel_Worksheet_PageMargins
*/ */
public function setLeft($pValue) public function setLeft($pValue)
{ {
$this->_left = $pValue; $this->left = $pValue;
return $this; return $this;
} }
@ -113,7 +113,7 @@ class PHPExcel_Worksheet_PageMargins
*/ */
public function getRight() public function getRight()
{ {
return $this->_right; return $this->right;
} }
/** /**
@ -124,7 +124,7 @@ class PHPExcel_Worksheet_PageMargins
*/ */
public function setRight($pValue) public function setRight($pValue)
{ {
$this->_right = $pValue; $this->right = $pValue;
return $this; return $this;
} }
@ -135,7 +135,7 @@ class PHPExcel_Worksheet_PageMargins
*/ */
public function getTop() public function getTop()
{ {
return $this->_top; return $this->top;
} }
/** /**
@ -146,7 +146,7 @@ class PHPExcel_Worksheet_PageMargins
*/ */
public function setTop($pValue) public function setTop($pValue)
{ {
$this->_top = $pValue; $this->top = $pValue;
return $this; return $this;
} }
@ -157,7 +157,7 @@ class PHPExcel_Worksheet_PageMargins
*/ */
public function getBottom() public function getBottom()
{ {
return $this->_bottom; return $this->bottom;
} }
/** /**
@ -168,7 +168,7 @@ class PHPExcel_Worksheet_PageMargins
*/ */
public function setBottom($pValue) public function setBottom($pValue)
{ {
$this->_bottom = $pValue; $this->bottom = $pValue;
return $this; return $this;
} }
@ -179,7 +179,7 @@ class PHPExcel_Worksheet_PageMargins
*/ */
public function getHeader() public function getHeader()
{ {
return $this->_header; return $this->header;
} }
/** /**
@ -190,7 +190,7 @@ class PHPExcel_Worksheet_PageMargins
*/ */
public function setHeader($pValue) public function setHeader($pValue)
{ {
$this->_header = $pValue; $this->header = $pValue;
return $this; return $this;
} }
@ -201,7 +201,7 @@ class PHPExcel_Worksheet_PageMargins
*/ */
public function getFooter() public function getFooter()
{ {
return $this->_footer; return $this->footer;
} }
/** /**
@ -212,7 +212,7 @@ class PHPExcel_Worksheet_PageMargins
*/ */
public function setFooter($pValue) public function setFooter($pValue)
{ {
$this->_footer = $pValue; $this->footer = $pValue;
return $this; return $this;
} }

134
Classes/PHPExcel/Worksheet/Protection.php
View File

@ -40,119 +40,119 @@ class PHPExcel_Worksheet_Protection
* *
* @var boolean * @var boolean
*/ */
private $_sheet = false; private $sheet = false;
/** /**
* Objects * Objects
* *
* @var boolean * @var boolean
*/ */
private $_objects = false; private $objects = false;
/** /**
* Scenarios * Scenarios
* *
* @var boolean * @var boolean
*/ */
private $_scenarios = false; private $scenarios = false;
/** /**
* Format cells * Format cells
* *
* @var boolean * @var boolean
*/ */
private $_formatCells = false; private $formatCells = false;
/** /**
* Format columns * Format columns
* *
* @var boolean * @var boolean
*/ */
private $_formatColumns = false; private $formatColumns = false;
/** /**
* Format rows * Format rows
* *
* @var boolean * @var boolean
*/ */
private $_formatRows = false; private $formatRows = false;
/** /**
* Insert columns * Insert columns
* *
* @var boolean * @var boolean
*/ */
private $_insertColumns = false; private $insertColumns = false;
/** /**
* Insert rows * Insert rows
* *
* @var boolean * @var boolean
*/ */
private $_insertRows = false; private $insertRows = false;
/** /**
* Insert hyperlinks * Insert hyperlinks
* *
* @var boolean * @var boolean
*/ */
private $_insertHyperlinks = false; private $insertHyperlinks = false;
/** /**
* Delete columns * Delete columns
* *
* @var boolean * @var boolean
*/ */
private $_deleteColumns = false; private $deleteColumns = false;
/** /**
* Delete rows * Delete rows
* *
* @var boolean * @var boolean
*/ */
private $_deleteRows = false; private $deleteRows = false;
/** /**
* Select locked cells * Select locked cells
* *
* @var boolean * @var boolean
*/ */
private $_selectLockedCells = false; private $selectLockedCells = false;
/** /**
* Sort * Sort
* *
* @var boolean * @var boolean
*/ */
private $_sort = false; private $sort = false;
/** /**
* AutoFilter * AutoFilter
* *
* @var boolean * @var boolean
*/ */
private $_autoFilter = false; private $autoFilter = false;
/** /**
* Pivot tables * Pivot tables
* *
* @var boolean * @var boolean
*/ */
private $_pivotTables = false; private $pivotTables = false;
/** /**
* Select unlocked cells * Select unlocked cells
* *
* @var boolean * @var boolean
*/ */
private $_selectUnlockedCells = false; private $selectUnlockedCells = false;
/** /**
* Password * Password
* *
* @var string * @var string
*/ */
private $_password = ''; private $password = '';
/** /**
* Create a new PHPExcel_Worksheet_Protection * Create a new PHPExcel_Worksheet_Protection
@ -168,22 +168,22 @@ class PHPExcel_Worksheet_Protection
*/ */
public function isProtectionEnabled() public function isProtectionEnabled()
{ {
return $this->_sheet || return $this->sheet ||
$this->_objects || $this->objects ||
$this->_scenarios || $this->scenarios ||
$this->_formatCells || $this->formatCells ||
$this->_formatColumns || $this->formatColumns ||
$this->_formatRows || $this->formatRows ||
$this->_insertColumns || $this->insertColumns ||
$this->_insertRows || $this->insertRows ||
$this->_insertHyperlinks || $this->insertHyperlinks ||
$this->_deleteColumns || $this->deleteColumns ||
$this->_deleteRows || $this->deleteRows ||
$this->_selectLockedCells || $this->selectLockedCells ||
$this->_sort || $this->sort ||
$this->_autoFilter || $this->autoFilter ||
$this->_pivotTables || $this->pivotTables ||
$this->_selectUnlockedCells; $this->selectUnlockedCells;
} }
/** /**
@ -193,7 +193,7 @@ class PHPExcel_Worksheet_Protection
*/ */
public function getSheet() public function getSheet()
{ {
return $this->_sheet; return $this->sheet;
} }
/** /**
@ -204,7 +204,7 @@ class PHPExcel_Worksheet_Protection
*/ */
public function setSheet($pValue = false) public function setSheet($pValue = false)
{ {
$this->_sheet = $pValue; $this->sheet = $pValue;
return $this; return $this;
} }
@ -215,7 +215,7 @@ class PHPExcel_Worksheet_Protection
*/ */
public function getObjects() public function getObjects()
{ {
return $this->_objects; return $this->objects;
} }
/** /**
@ -226,7 +226,7 @@ class PHPExcel_Worksheet_Protection
*/ */
public function setObjects($pValue = false) public function setObjects($pValue = false)
{ {
$this->_objects = $pValue; $this->objects = $pValue;
return $this; return $this;
} }
@ -237,7 +237,7 @@ class PHPExcel_Worksheet_Protection
*/ */
public function getScenarios() public function getScenarios()
{ {
return $this->_scenarios; return $this->scenarios;
} }
/** /**
@ -248,7 +248,7 @@ class PHPExcel_Worksheet_Protection
*/ */
public function setScenarios($pValue = false) public function setScenarios($pValue = false)
{ {
$this->_scenarios = $pValue; $this->scenarios = $pValue;
return $this; return $this;
} }
@ -259,7 +259,7 @@ class PHPExcel_Worksheet_Protection
*/ */
public function getFormatCells() public function getFormatCells()
{ {
return $this->_formatCells; return $this->formatCells;
} }
/** /**
@ -270,7 +270,7 @@ class PHPExcel_Worksheet_Protection
*/ */
public function setFormatCells($pValue = false) public function setFormatCells($pValue = false)
{ {
$this->_formatCells = $pValue; $this->formatCells = $pValue;
return $this; return $this;
} }
@ -281,7 +281,7 @@ class PHPExcel_Worksheet_Protection
*/ */
public function getFormatColumns() public function getFormatColumns()
{ {
return $this->_formatColumns; return $this->formatColumns;
} }
/** /**
@ -292,7 +292,7 @@ class PHPExcel_Worksheet_Protection
*/ */
public function setFormatColumns($pValue = false) public function setFormatColumns($pValue = false)
{ {
$this->_formatColumns = $pValue; $this->formatColumns = $pValue;
return $this; return $this;
} }
@ -303,7 +303,7 @@ class PHPExcel_Worksheet_Protection
*/ */
public function getFormatRows() public function getFormatRows()
{ {
return $this->_formatRows; return $this->formatRows;
} }
/** /**
@ -314,7 +314,7 @@ class PHPExcel_Worksheet_Protection
*/ */
public function setFormatRows($pValue = false) public function setFormatRows($pValue = false)
{ {
$this->_formatRows = $pValue; $this->formatRows = $pValue;
return $this; return $this;
} }
@ -325,7 +325,7 @@ class PHPExcel_Worksheet_Protection
*/ */
public function getInsertColumns() public function getInsertColumns()
{ {
return $this->_insertColumns; return $this->insertColumns;
} }
/** /**
@ -336,7 +336,7 @@ class PHPExcel_Worksheet_Protection
*/ */
public function setInsertColumns($pValue = false) public function setInsertColumns($pValue = false)
{ {
$this->_insertColumns = $pValue; $this->insertColumns = $pValue;
return $this; return $this;
} }
@ -347,7 +347,7 @@ class PHPExcel_Worksheet_Protection
*/ */
public function getInsertRows() public function getInsertRows()
{ {
return $this->_insertRows; return $this->insertRows;
} }
/** /**
@ -358,7 +358,7 @@ class PHPExcel_Worksheet_Protection
*/ */
public function setInsertRows($pValue = false) public function setInsertRows($pValue = false)
{ {
$this->_insertRows = $pValue; $this->insertRows = $pValue;
return $this; return $this;
} }
@ -369,7 +369,7 @@ class PHPExcel_Worksheet_Protection
*/ */
public function getInsertHyperlinks() public function getInsertHyperlinks()
{ {
return $this->_insertHyperlinks; return $this->insertHyperlinks;
} }
/** /**
@ -380,7 +380,7 @@ class PHPExcel_Worksheet_Protection
*/ */
public function setInsertHyperlinks($pValue = false) public function setInsertHyperlinks($pValue = false)
{ {
$this->_insertHyperlinks = $pValue; $this->insertHyperlinks = $pValue;
return $this; return $this;
} }
@ -391,7 +391,7 @@ class PHPExcel_Worksheet_Protection
*/ */
public function getDeleteColumns() public function getDeleteColumns()
{ {
return $this->_deleteColumns; return $this->deleteColumns;
} }
/** /**
@ -402,7 +402,7 @@ class PHPExcel_Worksheet_Protection
*/ */
public function setDeleteColumns($pValue = false) public function setDeleteColumns($pValue = false)
{ {
$this->_deleteColumns = $pValue; $this->deleteColumns = $pValue;
return $this; return $this;
} }
@ -413,7 +413,7 @@ class PHPExcel_Worksheet_Protection
*/ */
public function getDeleteRows() public function getDeleteRows()
{ {
return $this->_deleteRows; return $this->deleteRows;
} }
/** /**
@ -424,7 +424,7 @@ class PHPExcel_Worksheet_Protection
*/ */
public function setDeleteRows($pValue = false) public function setDeleteRows($pValue = false)
{ {
$this->_deleteRows = $pValue; $this->deleteRows = $pValue;
return $this; return $this;
} }
@ -435,7 +435,7 @@ class PHPExcel_Worksheet_Protection
*/ */
public function getSelectLockedCells() public function getSelectLockedCells()
{ {
return $this->_selectLockedCells; return $this->selectLockedCells;
} }
/** /**
@ -446,7 +446,7 @@ class PHPExcel_Worksheet_Protection
*/ */
public function setSelectLockedCells($pValue = false) public function setSelectLockedCells($pValue = false)
{ {
$this->_selectLockedCells = $pValue; $this->selectLockedCells = $pValue;
return $this; return $this;
} }
@ -457,7 +457,7 @@ class PHPExcel_Worksheet_Protection
*/ */
public function getSort() public function getSort()
{ {
return $this->_sort; return $this->sort;
} }
/** /**
@ -468,7 +468,7 @@ class PHPExcel_Worksheet_Protection
*/ */
public function setSort($pValue = false) public function setSort($pValue = false)
{ {
$this->_sort = $pValue; $this->sort = $pValue;
return $this; return $this;
} }
@ -479,7 +479,7 @@ class PHPExcel_Worksheet_Protection
*/ */
public function getAutoFilter() public function getAutoFilter()
{ {
return $this->_autoFilter; return $this->autoFilter;
} }
/** /**
@ -490,7 +490,7 @@ class PHPExcel_Worksheet_Protection
*/ */
public function setAutoFilter($pValue = false) public function setAutoFilter($pValue = false)
{ {
$this->_autoFilter = $pValue; $this->autoFilter = $pValue;
return $this; return $this;
} }
@ -501,7 +501,7 @@ class PHPExcel_Worksheet_Protection
*/ */
public function getPivotTables() public function getPivotTables()
{ {
return $this->_pivotTables; return $this->pivotTables;
} }
/** /**
@ -512,7 +512,7 @@ class PHPExcel_Worksheet_Protection
*/ */
public function setPivotTables($pValue = false) public function setPivotTables($pValue = false)
{ {
$this->_pivotTables = $pValue; $this->pivotTables = $pValue;
return $this; return $this;
} }
@ -523,7 +523,7 @@ class PHPExcel_Worksheet_Protection
*/ */
public function getSelectUnlockedCells() public function getSelectUnlockedCells()
{ {
return $this->_selectUnlockedCells; return $this->selectUnlockedCells;
} }
/** /**
@ -534,7 +534,7 @@ class PHPExcel_Worksheet_Protection
*/ */
public function setSelectUnlockedCells($pValue = false) public function setSelectUnlockedCells($pValue = false)
{ {
$this->_selectUnlockedCells = $pValue; $this->selectUnlockedCells = $pValue;
return $this; return $this;
} }
@ -545,7 +545,7 @@ class PHPExcel_Worksheet_Protection
*/ */
public function getPassword() public function getPassword()
{ {
return $this->_password; return $this->password;
} }
/** /**
@ -560,7 +560,7 @@ class PHPExcel_Worksheet_Protection
if (!$pAlreadyHashed) { if (!$pAlreadyHashed) {
$pValue = PHPExcel_Shared_PasswordHasher::hashPassword($pValue); $pValue = PHPExcel_Shared_PasswordHasher::hashPassword($pValue);
} }
$this->_password = $pValue; $this->password = $pValue;
return $this; return $this;
} }

4
Classes/PHPExcel/Worksheet/SheetView.php
View File

@ -33,7 +33,7 @@ class PHPExcel_Worksheet_SheetView
const SHEETVIEW_PAGE_LAYOUT = 'pageLayout'; const SHEETVIEW_PAGE_LAYOUT = 'pageLayout';
const SHEETVIEW_PAGE_BREAK_PREVIEW = 'pageBreakPreview'; const SHEETVIEW_PAGE_BREAK_PREVIEW = 'pageBreakPreview';
private static $_sheetViewTypes = array( private static $sheetViewTypes = array(
self::SHEETVIEW_NORMAL, self::SHEETVIEW_NORMAL,
self::SHEETVIEW_PAGE_LAYOUT, self::SHEETVIEW_PAGE_LAYOUT,
self::SHEETVIEW_PAGE_BREAK_PREVIEW, self::SHEETVIEW_PAGE_BREAK_PREVIEW,
@ -161,7 +161,7 @@ class PHPExcel_Worksheet_SheetView
if ($pValue === null) { if ($pValue === null) {
$pValue = self::SHEETVIEW_NORMAL; $pValue = self::SHEETVIEW_NORMAL;
} }
if (in_array($pValue, self::$_sheetViewTypes)) { if (in_array($pValue, self::$sheetViewTypes)) {
$this->sheetviewType = $pValue; $this->sheetviewType = $pValue;
} else { } else {
throw new PHPExcel_Exception("Invalid sheetview layout type."); throw new PHPExcel_Exception("Invalid sheetview layout type.");