From a3303cd05ee94262da4b40daea2d8d1a2dcc276b Mon Sep 17 00:00:00 2001 From: Mark Baker Date: Fri, 26 Oct 2012 14:56:58 +0100 Subject: [PATCH] Ensure that signature of bindParent() in style class overrides matches the signature of bindParent() in the supervisor --- Classes/PHPExcel/Style/Border.php | 2 +- Classes/PHPExcel/Style/Color.php | 2 +- Classes/PHPExcel/Style/Supervisor.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Classes/PHPExcel/Style/Border.php b/Classes/PHPExcel/Style/Border.php index 52aa76ea..b0e5a9e7 100644 --- a/Classes/PHPExcel/Style/Border.php +++ b/Classes/PHPExcel/Style/Border.php @@ -103,7 +103,7 @@ class PHPExcel_Style_Border extends PHPExcel_Style_Supervisor implements PHPExce * @param string $parentPropertyName * @return PHPExcel_Style_Border */ - public function bindParent($parent, $parentPropertyName) + public function bindParent($parent, $parentPropertyName=NULL) { $this->_parent = $parent; $this->_parentPropertyName = $parentPropertyName; diff --git a/Classes/PHPExcel/Style/Color.php b/Classes/PHPExcel/Style/Color.php index c8607d4f..ac004dba 100644 --- a/Classes/PHPExcel/Style/Color.php +++ b/Classes/PHPExcel/Style/Color.php @@ -98,7 +98,7 @@ class PHPExcel_Style_Color extends PHPExcel_Style_Supervisor implements PHPExcel * @param string $parentPropertyName * @return PHPExcel_Style_Color */ - public function bindParent($parent, $parentPropertyName) + public function bindParent($parent, $parentPropertyName=NULL) { $this->_parent = $parent; $this->_parentPropertyName = $parentPropertyName; diff --git a/Classes/PHPExcel/Style/Supervisor.php b/Classes/PHPExcel/Style/Supervisor.php index 7e6ca1ec..e91f2252 100644 --- a/Classes/PHPExcel/Style/Supervisor.php +++ b/Classes/PHPExcel/Style/Supervisor.php @@ -68,7 +68,7 @@ abstract class PHPExcel_Style_Supervisor * @param PHPExcel $parent * @return PHPExcel_Style_Supervisor */ - public function bindParent($parent) + public function bindParent($parent, $parentPropertyName=NULL) { $this->_parent = $parent; return $this;