composer update
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
/**
|
||||
* PHPExcel
|
||||
*
|
||||
* Copyright (c) 2006 - 2014 PHPExcel
|
||||
* Copyright (c) 2006 - 2015 PHPExcel
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
@@ -20,8 +20,8 @@
|
||||
*
|
||||
* @category PHPExcel
|
||||
* @package PHPExcel_Style
|
||||
* @copyright Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
|
||||
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
|
||||
* @copyright Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
|
||||
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
|
||||
* @version ##VERSION##, ##DATE##
|
||||
*/
|
||||
|
||||
@@ -31,76 +31,76 @@
|
||||
*
|
||||
* @category PHPExcel
|
||||
* @package PHPExcel_Style
|
||||
* @copyright Copyright (c) 2006 - 2014 PHPExcel (http://www.codeplex.com/PHPExcel)
|
||||
* @copyright Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
|
||||
*/
|
||||
class PHPExcel_Style_Conditional implements PHPExcel_IComparable
|
||||
{
|
||||
/* Condition types */
|
||||
const CONDITION_NONE = 'none';
|
||||
const CONDITION_CELLIS = 'cellIs';
|
||||
const CONDITION_CONTAINSTEXT = 'containsText';
|
||||
const CONDITION_EXPRESSION = 'expression';
|
||||
/* Condition types */
|
||||
const CONDITION_NONE = 'none';
|
||||
const CONDITION_CELLIS = 'cellIs';
|
||||
const CONDITION_CONTAINSTEXT = 'containsText';
|
||||
const CONDITION_EXPRESSION = 'expression';
|
||||
|
||||
/* Operator types */
|
||||
const OPERATOR_NONE = '';
|
||||
const OPERATOR_BEGINSWITH = 'beginsWith';
|
||||
const OPERATOR_ENDSWITH = 'endsWith';
|
||||
const OPERATOR_EQUAL = 'equal';
|
||||
const OPERATOR_GREATERTHAN = 'greaterThan';
|
||||
const OPERATOR_GREATERTHANOREQUAL = 'greaterThanOrEqual';
|
||||
const OPERATOR_LESSTHAN = 'lessThan';
|
||||
const OPERATOR_LESSTHANOREQUAL = 'lessThanOrEqual';
|
||||
const OPERATOR_NOTEQUAL = 'notEqual';
|
||||
const OPERATOR_CONTAINSTEXT = 'containsText';
|
||||
const OPERATOR_NOTCONTAINS = 'notContains';
|
||||
const OPERATOR_BETWEEN = 'between';
|
||||
/* Operator types */
|
||||
const OPERATOR_NONE = '';
|
||||
const OPERATOR_BEGINSWITH = 'beginsWith';
|
||||
const OPERATOR_ENDSWITH = 'endsWith';
|
||||
const OPERATOR_EQUAL = 'equal';
|
||||
const OPERATOR_GREATERTHAN = 'greaterThan';
|
||||
const OPERATOR_GREATERTHANOREQUAL = 'greaterThanOrEqual';
|
||||
const OPERATOR_LESSTHAN = 'lessThan';
|
||||
const OPERATOR_LESSTHANOREQUAL = 'lessThanOrEqual';
|
||||
const OPERATOR_NOTEQUAL = 'notEqual';
|
||||
const OPERATOR_CONTAINSTEXT = 'containsText';
|
||||
const OPERATOR_NOTCONTAINS = 'notContains';
|
||||
const OPERATOR_BETWEEN = 'between';
|
||||
|
||||
/**
|
||||
* Condition type
|
||||
*
|
||||
* @var int
|
||||
*/
|
||||
private $_conditionType;
|
||||
/**
|
||||
* Condition type
|
||||
*
|
||||
* @var int
|
||||
*/
|
||||
private $conditionType;
|
||||
|
||||
/**
|
||||
* Operator type
|
||||
*
|
||||
* @var int
|
||||
*/
|
||||
private $_operatorType;
|
||||
/**
|
||||
* Operator type
|
||||
*
|
||||
* @var int
|
||||
*/
|
||||
private $operatorType;
|
||||
|
||||
/**
|
||||
* Text
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
private $_text;
|
||||
/**
|
||||
* Text
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
private $text;
|
||||
|
||||
/**
|
||||
* Condition
|
||||
*
|
||||
* @var string[]
|
||||
*/
|
||||
private $_condition = array();
|
||||
/**
|
||||
* Condition
|
||||
*
|
||||
* @var string[]
|
||||
*/
|
||||
private $condition = array();
|
||||
|
||||
/**
|
||||
* Style
|
||||
*
|
||||
* @var PHPExcel_Style
|
||||
*/
|
||||
private $_style;
|
||||
/**
|
||||
* Style
|
||||
*
|
||||
* @var PHPExcel_Style
|
||||
*/
|
||||
private $style;
|
||||
|
||||
/**
|
||||
* Create a new PHPExcel_Style_Conditional
|
||||
*/
|
||||
public function __construct()
|
||||
{
|
||||
// Initialise values
|
||||
$this->_conditionType = PHPExcel_Style_Conditional::CONDITION_NONE;
|
||||
$this->_operatorType = PHPExcel_Style_Conditional::OPERATOR_NONE;
|
||||
$this->_text = null;
|
||||
$this->_condition = array();
|
||||
$this->_style = new PHPExcel_Style(FALSE, TRUE);
|
||||
// Initialise values
|
||||
$this->conditionType = PHPExcel_Style_Conditional::CONDITION_NONE;
|
||||
$this->operatorType = PHPExcel_Style_Conditional::OPERATOR_NONE;
|
||||
$this->text = null;
|
||||
$this->condition = array();
|
||||
$this->style = new PHPExcel_Style(false, true);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -108,19 +108,21 @@ class PHPExcel_Style_Conditional implements PHPExcel_IComparable
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
public function getConditionType() {
|
||||
return $this->_conditionType;
|
||||
public function getConditionType()
|
||||
{
|
||||
return $this->conditionType;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set Condition type
|
||||
*
|
||||
* @param string $pValue PHPExcel_Style_Conditional condition type
|
||||
* @param string $pValue PHPExcel_Style_Conditional condition type
|
||||
* @return PHPExcel_Style_Conditional
|
||||
*/
|
||||
public function setConditionType($pValue = PHPExcel_Style_Conditional::CONDITION_NONE) {
|
||||
$this->_conditionType = $pValue;
|
||||
return $this;
|
||||
public function setConditionType($pValue = PHPExcel_Style_Conditional::CONDITION_NONE)
|
||||
{
|
||||
$this->conditionType = $pValue;
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -128,19 +130,21 @@ class PHPExcel_Style_Conditional implements PHPExcel_IComparable
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
public function getOperatorType() {
|
||||
return $this->_operatorType;
|
||||
public function getOperatorType()
|
||||
{
|
||||
return $this->operatorType;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set Operator type
|
||||
*
|
||||
* @param string $pValue PHPExcel_Style_Conditional operator type
|
||||
* @param string $pValue PHPExcel_Style_Conditional operator type
|
||||
* @return PHPExcel_Style_Conditional
|
||||
*/
|
||||
public function setOperatorType($pValue = PHPExcel_Style_Conditional::OPERATOR_NONE) {
|
||||
$this->_operatorType = $pValue;
|
||||
return $this;
|
||||
public function setOperatorType($pValue = PHPExcel_Style_Conditional::OPERATOR_NONE)
|
||||
{
|
||||
$this->operatorType = $pValue;
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -148,8 +152,9 @@ class PHPExcel_Style_Conditional implements PHPExcel_IComparable
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
public function getText() {
|
||||
return $this->_text;
|
||||
public function getText()
|
||||
{
|
||||
return $this->text;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -158,9 +163,10 @@ class PHPExcel_Style_Conditional implements PHPExcel_IComparable
|
||||
* @param string $value
|
||||
* @return PHPExcel_Style_Conditional
|
||||
*/
|
||||
public function setText($value = null) {
|
||||
$this->_text = $value;
|
||||
return $this;
|
||||
public function setText($value = null)
|
||||
{
|
||||
$this->text = $value;
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -169,26 +175,29 @@ class PHPExcel_Style_Conditional implements PHPExcel_IComparable
|
||||
* @deprecated Deprecated, use getConditions instead
|
||||
* @return string
|
||||
*/
|
||||
public function getCondition() {
|
||||
if (isset($this->_condition[0])) {
|
||||
return $this->_condition[0];
|
||||
}
|
||||
public function getCondition()
|
||||
{
|
||||
if (isset($this->condition[0])) {
|
||||
return $this->condition[0];
|
||||
}
|
||||
|
||||
return '';
|
||||
return '';
|
||||
}
|
||||
|
||||
/**
|
||||
* Set Condition
|
||||
*
|
||||
* @deprecated Deprecated, use setConditions instead
|
||||
* @param string $pValue Condition
|
||||
* @param string $pValue Condition
|
||||
* @return PHPExcel_Style_Conditional
|
||||
*/
|
||||
public function setCondition($pValue = '') {
|
||||
if (!is_array($pValue))
|
||||
$pValue = array($pValue);
|
||||
public function setCondition($pValue = '')
|
||||
{
|
||||
if (!is_array($pValue)) {
|
||||
$pValue = array($pValue);
|
||||
}
|
||||
|
||||
return $this->setConditions($pValue);
|
||||
return $this->setConditions($pValue);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -196,33 +205,36 @@ class PHPExcel_Style_Conditional implements PHPExcel_IComparable
|
||||
*
|
||||
* @return string[]
|
||||
*/
|
||||
public function getConditions() {
|
||||
return $this->_condition;
|
||||
public function getConditions()
|
||||
{
|
||||
return $this->condition;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set Conditions
|
||||
*
|
||||
* @param string[] $pValue Condition
|
||||
* @param string[] $pValue Condition
|
||||
* @return PHPExcel_Style_Conditional
|
||||
*/
|
||||
public function setConditions($pValue) {
|
||||
if (!is_array($pValue))
|
||||
$pValue = array($pValue);
|
||||
|
||||
$this->_condition = $pValue;
|
||||
return $this;
|
||||
public function setConditions($pValue)
|
||||
{
|
||||
if (!is_array($pValue)) {
|
||||
$pValue = array($pValue);
|
||||
}
|
||||
$this->condition = $pValue;
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Add Condition
|
||||
*
|
||||
* @param string $pValue Condition
|
||||
* @param string $pValue Condition
|
||||
* @return PHPExcel_Style_Conditional
|
||||
*/
|
||||
public function addCondition($pValue = '') {
|
||||
$this->_condition[] = $pValue;
|
||||
return $this;
|
||||
public function addCondition($pValue = '')
|
||||
{
|
||||
$this->condition[] = $pValue;
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -230,48 +242,52 @@ class PHPExcel_Style_Conditional implements PHPExcel_IComparable
|
||||
*
|
||||
* @return PHPExcel_Style
|
||||
*/
|
||||
public function getStyle() {
|
||||
return $this->_style;
|
||||
public function getStyle()
|
||||
{
|
||||
return $this->style;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set Style
|
||||
*
|
||||
* @param PHPExcel_Style $pValue
|
||||
* @throws PHPExcel_Exception
|
||||
* @param PHPExcel_Style $pValue
|
||||
* @throws PHPExcel_Exception
|
||||
* @return PHPExcel_Style_Conditional
|
||||
*/
|
||||
public function setStyle(PHPExcel_Style $pValue = null) {
|
||||
$this->_style = $pValue;
|
||||
return $this;
|
||||
public function setStyle(PHPExcel_Style $pValue = null)
|
||||
{
|
||||
$this->style = $pValue;
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get hash code
|
||||
*
|
||||
* @return string Hash code
|
||||
*/
|
||||
public function getHashCode() {
|
||||
return md5(
|
||||
$this->_conditionType
|
||||
. $this->_operatorType
|
||||
. implode(';', $this->_condition)
|
||||
. $this->_style->getHashCode()
|
||||
. __CLASS__
|
||||
);
|
||||
/**
|
||||
* Get hash code
|
||||
*
|
||||
* @return string Hash code
|
||||
*/
|
||||
public function getHashCode()
|
||||
{
|
||||
return md5(
|
||||
$this->conditionType .
|
||||
$this->operatorType .
|
||||
implode(';', $this->condition) .
|
||||
$this->style->getHashCode() .
|
||||
__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;
|
||||
}
|
||||
}
|
||||
}
|
||||
/**
|
||||
* 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;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user