Fix switch...continue for php 7.3

The project is dead and should not be used anymore.

.gitattributes

@@ -1,4 +1,3 @@
 /Build export-ignore
-/Documentation export-ignore
-/Tests export-ignore
+/unitTests export-ignore
 README.md export-ignore

.travis.yml

@@ -1,12 +1,28 @@
 language: php
 
 php:
-  - 5.2
-  - 5.3.3
-  - 5.3
   - 5.4
+  - 5.5
+  - 5.6
+  - 7.0
+  - hhvm
+ 
+matrix:
+  allow_failures:
+    - php: hhvm
+
+before_script:
+  ## Packages
+  - sudo apt-get -qq update > /dev/null
+  ## Composer
+  - composer self-update
+  - composer install --prefer-source --dev
+  - phpenv global "$TRAVIS_PHP_VERSION"
 
 script:
+  ## PHP_CodeSniffer
+  - ./vendor/bin/phpcs --report-width=200 --report-summary  --report-full Classes/ unitTests/ --standard=PSR2 -n
+  ## PHPUnit
   - phpunit -c ./unitTests/
 
 notifications:

Build/build.xml

@@ -1,7 +1,5 @@
 <?xml version="1.0"?>
 <project name="PHPExcel" default="release-standard" basedir=".">
-    <taskdef classname="phing.tasks.ext.d51PearPkg2Task" name="d51pearpkg2"/>
-
     <target name="gather">
         <if>
 			<isset property="${packageVersion}"/>
@@ -141,7 +139,7 @@
                 <element name="description" value="A pure PHP library for reading and writing spreadsheet files" />
                 <element name="authors">
                     <element name="Mark Baker">
-                        <element name="e-mail" value="mbaker@inviqa.com" />
+                        <element name="e-mail" value="mark@lange.demon.co.uk" />
                     </element>
                 </element>
             </metadata>
@@ -152,6 +150,8 @@
     </target>
 
     <target name="release-pear" depends="versionNumber">
+        <taskdef classname="phing.tasks.ext.d51PearPkg2Task" name="d51pearpkg2"/>
+
         <mkdir dir="${phing.dir}/release"/>
 
         <echo msg="Creating PEAR release package (v${packageVersion})..."/>

Classes/PHPExcel/Autoloader.php

@@ -1,8 +1,19 @@
 <?php
+
+PHPExcel_Autoloader::register();
+//    As we always try to run the autoloader before anything else, we can use it to do a few
+//        simple checks and initialisations
+//PHPExcel_Shared_ZipStreamWrapper::register();
+// check mbstring.func_overload
+if (ini_get('mbstring.func_overload') & 2) {
+    throw new PHPExcel_Exception('Multibyte function overloading in PHP must be disabled for string functions (2).');
+}
+PHPExcel_Shared_String::buildCharacterSets();
+
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2013 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,66 +31,51 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-PHPExcel_Autoloader::Register();
-//    As we always try to run the autoloader before anything else, we can use it to do a few
-//        simple checks and initialisations
-//PHPExcel_Shared_ZipStreamWrapper::register();
-// check mbstring.func_overload
-if (ini_get('mbstring.func_overload') & 2) {
-    throw new PHPExcel_Exception('Multibyte function overloading in PHP must be disabled for string functions (2).');
-}
-PHPExcel_Shared_String::buildCharacterSets();
-
-
-/**
- * PHPExcel_Autoloader
- *
- * @category    PHPExcel
- * @package     PHPExcel
- * @copyright   Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
 class PHPExcel_Autoloader
 {
     /**
      * Register the Autoloader with SPL
      *
      */
-    public static function Register() {
+    public static function register()
+    {
         if (function_exists('__autoload')) {
             // Register any existing autoloader function with SPL, so we don't get any clashes
             spl_autoload_register('__autoload');
         }
         // Register ourselves with SPL
-        return spl_autoload_register(array('PHPExcel_Autoloader', 'Load'));
-    }   //    function Register()
-
+        if (version_compare(PHP_VERSION, '5.3.0') >= 0) {
+            return spl_autoload_register(array('PHPExcel_Autoloader', 'load'), true, true);
+        } else {
+            return spl_autoload_register(array('PHPExcel_Autoloader', 'load'));
+        }
+    }
 
     /**
      * Autoload a class identified by name
      *
      * @param    string    $pClassName        Name of the object to load
      */
-    public static function Load($pClassName){
-        if ((class_exists($pClassName,FALSE)) || (strpos($pClassName, 'PHPExcel') !== 0)) {
+    public static function load($pClassName)
+    {
+        if ((class_exists($pClassName, false)) || (strpos($pClassName, 'PHPExcel') !== 0)) {
             // Either already loaded, or not a PHPExcel class request
-            return FALSE;
+            return false;
         }
 
         $pClassFilePath = PHPEXCEL_ROOT .
             str_replace('_', DIRECTORY_SEPARATOR, $pClassName) .
             '.php';
 
-        if ((file_exists($pClassFilePath) === FALSE) || (is_readable($pClassFilePath) === FALSE)) {
+        if ((file_exists($pClassFilePath) === false) || (is_readable($pClassFilePath) === false)) {
             // Can't load
-            return FALSE;
+            return false;
         }
 
         require($pClassFilePath);
-    }   //    function Load()
-
+    }
 }

Classes/PHPExcel/CachedObjectStorage/APC.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * PHPExcel
+ * PHPExcel_CachedObjectStorage_APC
  *
- * Copyright (c) 2006 - 2013 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,28 +21,19 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-
-/**
- * PHPExcel_CachedObjectStorage_APC
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_CachedObjectStorage_APC extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache {
-
+class PHPExcel_CachedObjectStorage_APC extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache
+{
     /**
      * Prefix used to uniquely identify cache data for this worksheet
      *
      * @access    private
      * @var string
      */
-    private $_cachePrefix = null;
+    private $cachePrefix = null;
 
     /**
      * Cache timeout
@@ -49,8 +41,7 @@ class PHPExcel_CachedObjectStorage_APC extends PHPExcel_CachedObjectStorage_Cach
      * @access    private
      * @var integer
      */
-    private $_cacheTime = 600;
-
+    private $cacheTime = 600;
 
     /**
      * Store cell data in cache for the current cell object if it's "dirty",
@@ -60,19 +51,23 @@ class PHPExcel_CachedObjectStorage_APC extends PHPExcel_CachedObjectStorage_Cach
      * @return  void
      * @throws  PHPExcel_Exception
      */
-    protected function _storeData() {
-        if ($this->_currentCellIsDirty) {
-            $this->_currentObject->detach();
+    protected function storeData()
+    {
+        if ($this->currentCellIsDirty && !empty($this->currentObjectID)) {
+            $this->currentObject->detach();
 
-            if (!apc_store($this->_cachePrefix.$this->_currentObjectID.'.cache',serialize($this->_currentObject),$this->_cacheTime)) {
+            if (!apc_store(
+                $this->cachePrefix . $this->currentObjectID . '.cache',
+                serialize($this->currentObject),
+                $this->cacheTime
+            )) {
                 $this->__destruct();
-                throw new PHPExcel_Exception('Failed to store cell '.$this->_currentObjectID.' in APC');
+                throw new PHPExcel_Exception('Failed to store cell ' . $this->currentObjectID . ' in APC');
             }
-            $this->_currentCellIsDirty = false;
+            $this->currentCellIsDirty = false;
+        }
+        $this->currentObjectID = $this->currentObject = null;
     }
-        $this->_currentObjectID = $this->_currentObject = null;
-    }    //    function _storeData()
-
 
     /**
      * Add or Update a cell in cache identified by coordinate address
@@ -80,40 +75,41 @@ class PHPExcel_CachedObjectStorage_APC extends PHPExcel_CachedObjectStorage_Cach
      * @access  public
      * @param   string         $pCoord  Coordinate address of the cell to update
      * @param   PHPExcel_Cell  $cell    Cell to update
-     * @return  void
+     * @return  PHPExcel_Cell
      * @throws  PHPExcel_Exception
      */
-    public function addCacheData($pCoord, PHPExcel_Cell $cell) {
-        if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
-            $this->_storeData();
+    public function addCacheData($pCoord, PHPExcel_Cell $cell)
+    {
+        if (($pCoord !== $this->currentObjectID) && ($this->currentObjectID !== null)) {
+            $this->storeData();
         }
-        $this->_cellCache[$pCoord] = true;
+        $this->cellCache[$pCoord] = true;
 
-        $this->_currentObjectID = $pCoord;
-        $this->_currentObject = $cell;
-        $this->_currentCellIsDirty = true;
+        $this->currentObjectID = $pCoord;
+        $this->currentObject = $cell;
+        $this->currentCellIsDirty = true;
 
         return $cell;
-    }    //    function addCacheData()
-
+    }
 
     /**
      * Is a value set in the current PHPExcel_CachedObjectStorage_ICache for an indexed cell?
      *
      * @access  public
      * @param   string  $pCoord  Coordinate address of the cell to check
-     * @return  void
+     * @throws  PHPExcel_Exception
      * @return  boolean
      */
-    public function isDataSet($pCoord) {
+    public function isDataSet($pCoord)
+    {
         //    Check if the requested entry is the current object, or exists in the cache
         if (parent::isDataSet($pCoord)) {
-            if ($this->_currentObjectID == $pCoord) {
+            if ($this->currentObjectID == $pCoord) {
                 return true;
             }
             //    Check if the requested entry still exists in apc
-            $success = apc_fetch($this->_cachePrefix.$pCoord.'.cache');
-            if ($success === FALSE) {
+            $success = apc_fetch($this->cachePrefix.$pCoord.'.cache');
+            if ($success === false) {
                 //    Entry no longer exists in APC, so clear it from the cache array
                 parent::deleteCacheData($pCoord);
                 throw new PHPExcel_Exception('Cell entry '.$pCoord.' no longer exists in APC cache');
@@ -121,8 +117,7 @@ class PHPExcel_CachedObjectStorage_APC extends PHPExcel_CachedObjectStorage_Cach
             return true;
         }
         return false;
-    }    //    function isDataSet()
-
+    }
 
     /**
      * Get cell at a specific coordinate
@@ -132,16 +127,17 @@ class PHPExcel_CachedObjectStorage_APC extends PHPExcel_CachedObjectStorage_Cach
      * @throws  PHPExcel_Exception
      * @return  PHPExcel_Cell  Cell that was found, or null if not found
      */
-    public function getCacheData($pCoord) {
-        if ($pCoord === $this->_currentObjectID) {
-            return $this->_currentObject;
+    public function getCacheData($pCoord)
+    {
+        if ($pCoord === $this->currentObjectID) {
+            return $this->currentObject;
         }
-        $this->_storeData();
+        $this->storeData();
 
         //    Check if the entry that has been requested actually exists
         if (parent::isDataSet($pCoord)) {
-            $obj = apc_fetch($this->_cachePrefix.$pCoord.'.cache');
-            if ($obj === FALSE) {
+            $obj = apc_fetch($this->cachePrefix . $pCoord . '.cache');
+            if ($obj === false) {
                 //    Entry no longer exists in APC, so clear it from the cache array
                 parent::deleteCacheData($pCoord);
                 throw new PHPExcel_Exception('Cell entry '.$pCoord.' no longer exists in APC cache');
@@ -152,30 +148,29 @@ class PHPExcel_CachedObjectStorage_APC extends PHPExcel_CachedObjectStorage_Cach
         }
 
         //    Set current entry to the requested entry
-        $this->_currentObjectID = $pCoord;
-        $this->_currentObject = unserialize($obj);
+        $this->currentObjectID = $pCoord;
+        $this->currentObject = unserialize($obj);
         //    Re-attach this as the cell's parent
-        $this->_currentObject->attach($this);
+        $this->currentObject->attach($this);
 
         //    Return requested entry
-        return $this->_currentObject;
-    }    //    function getCacheData()
-
+        return $this->currentObject;
+    }
 
     /**
      * Get a list of all cell addresses currently held in cache
      *
-	 * @return  array of string
+     * @return  string[]
      */
-	public function getCellList() {
-		if ($this->_currentObjectID !== null) {
-			$this->_storeData();
+    public function getCellList()
+    {
+        if ($this->currentObjectID !== null) {
+            $this->storeData();
         }
 
         return parent::getCellList();
     }
 
-
     /**
      * Delete a cell in cache identified by coordinate address
      *
@@ -183,14 +178,14 @@ class PHPExcel_CachedObjectStorage_APC extends PHPExcel_CachedObjectStorage_Cach
      * @param   string  $pCoord  Coordinate address of the cell to delete
      * @throws  PHPExcel_Exception
      */
-    public function deleteCacheData($pCoord) {
+    public function deleteCacheData($pCoord)
+    {
         //    Delete the entry from APC
-        apc_delete($this->_cachePrefix.$pCoord.'.cache');
+        apc_delete($this->cachePrefix.$pCoord.'.cache');
 
         //    Delete the entry from our cell address array
         parent::deleteCacheData($pCoord);
-    }    //    function deleteCacheData()
-
+    }
 
     /**
      * Clone the cell collection
@@ -200,50 +195,50 @@ class PHPExcel_CachedObjectStorage_APC extends PHPExcel_CachedObjectStorage_Cach
      * @throws  PHPExcel_Exception
      * @return  void
      */
-    public function copyCellCollection(PHPExcel_Worksheet $parent) {
+    public function copyCellCollection(PHPExcel_Worksheet $parent)
+    {
         parent::copyCellCollection($parent);
         //    Get a new id for the new file name
-        $baseUnique = $this->_getUniqueID();
+        $baseUnique = $this->getUniqueID();
         $newCachePrefix = substr(md5($baseUnique), 0, 8) . '.';
         $cacheList = $this->getCellList();
         foreach ($cacheList as $cellID) {
-            if ($cellID != $this->_currentObjectID) {
-                $obj = apc_fetch($this->_cachePrefix.$cellID.'.cache');
-                if ($obj === FALSE) {
+            if ($cellID != $this->currentObjectID) {
+                $obj = apc_fetch($this->cachePrefix . $cellID . '.cache');
+                if ($obj === false) {
                     //    Entry no longer exists in APC, so clear it from the cache array
                     parent::deleteCacheData($cellID);
                     throw new PHPExcel_Exception('Cell entry ' . $cellID . ' no longer exists in APC');
                 }
-                if (!apc_store($newCachePrefix.$cellID.'.cache',$obj,$this->_cacheTime)) {
+                if (!apc_store($newCachePrefix . $cellID . '.cache', $obj, $this->cacheTime)) {
                     $this->__destruct();
                     throw new PHPExcel_Exception('Failed to store cell ' . $cellID . ' in APC');
                 }
             }
         }
-        $this->_cachePrefix = $newCachePrefix;
-    }    //    function copyCellCollection()
-
+        $this->cachePrefix = $newCachePrefix;
+    }
 
     /**
      * Clear the cell collection and disconnect from our parent
      *
      * @return  void
      */
-    public function unsetWorksheetCells() {
-        if ($this->_currentObject !== NULL) {
-            $this->_currentObject->detach();
-            $this->_currentObject = $this->_currentObjectID = null;
+    public function unsetWorksheetCells()
+    {
+        if ($this->currentObject !== null) {
+            $this->currentObject->detach();
+            $this->currentObject = $this->currentObjectID = null;
         }
 
         //    Flush the APC cache
         $this->__destruct();
 
-        $this->_cellCache = array();
+        $this->cellCache = array();
 
         //    detach ourself from the worksheet, so that it can then delete this object successfully
-        $this->_parent = null;
-    }    //    function unsetWorksheetCells()
-
+        $this->parent = null;
+    }
 
     /**
      * Initialise this new cell collection
@@ -251,29 +246,29 @@ class PHPExcel_CachedObjectStorage_APC extends PHPExcel_CachedObjectStorage_Cach
      * @param  PHPExcel_Worksheet  $parent     The worksheet for this cell collection
      * @param  array of mixed      $arguments  Additional initialisation arguments
      */
-    public function __construct(PHPExcel_Worksheet $parent, $arguments) {
+    public function __construct(PHPExcel_Worksheet $parent, $arguments)
+    {
         $cacheTime = (isset($arguments['cacheTime'])) ? $arguments['cacheTime'] : 600;
 
-        if ($this->_cachePrefix === NULL) {
-            $baseUnique = $this->_getUniqueID();
-            $this->_cachePrefix = substr(md5($baseUnique),0,8).'.';
-            $this->_cacheTime = $cacheTime;
+        if ($this->cachePrefix === null) {
+            $baseUnique = $this->getUniqueID();
+            $this->cachePrefix = substr(md5($baseUnique), 0, 8) . '.';
+            $this->cacheTime = $cacheTime;
 
             parent::__construct($parent);
         }
-    }    //    function __construct()
-
+    }
 
     /**
      * Destroy this cell collection
      */
-    public function __destruct() {
+    public function __destruct()
+    {
         $cacheList = $this->getCellList();
         foreach ($cacheList as $cellID) {
-            apc_delete($this->_cachePrefix.$cellID.'.cache');
+            apc_delete($this->cachePrefix . $cellID . '.cache');
+        }
     }
-    }    //    function __destruct()
-
 
     /**
      * Identify whether the caching method is currently available
@@ -281,15 +276,15 @@ class PHPExcel_CachedObjectStorage_APC extends PHPExcel_CachedObjectStorage_Cach
      *
      * @return  boolean
      */
-    public static function cacheMethodIsAvailable() {
+    public static function cacheMethodIsAvailable()
+    {
         if (!function_exists('apc_store')) {
-            return FALSE;
+            return false;
         }
-        if (apc_sma_info() === FALSE) {
-            return FALSE;
+        if (apc_sma_info() === false) {
+            return false;
         }
 
-        return TRUE;
+        return true;
     }
-
 }

Classes/PHPExcel/CachedObjectStorage/CacheBase.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * PHPExcel
+ * PHPExcel_CachedObjectStorage_CacheBase
  *
- * Copyright (c) 2006 - 2013 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,49 +21,39 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-
-/**
- * PHPExcel_CachedObjectStorage_CacheBase
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-abstract class PHPExcel_CachedObjectStorage_CacheBase {
-
+abstract class PHPExcel_CachedObjectStorage_CacheBase
+{
     /**
      * Parent worksheet
      *
      * @var PHPExcel_Worksheet
      */
-	protected $_parent;
+    protected $parent;
 
     /**
      * The currently active Cell
      *
      * @var PHPExcel_Cell
      */
-	protected $_currentObject = null;
+    protected $currentObject = null;
 
     /**
      * Coordinate address of the currently active Cell
      *
      * @var string
      */
-	protected $_currentObjectID = null;
-
+    protected $currentObjectID = null;
 
     /**
      * Flag indicating whether the currently active Cell requires saving
      *
      * @var boolean
      */
-	protected $_currentCellIsDirty = true;
+    protected $currentCellIsDirty = true;
 
     /**
      * An array of cells or cell pointers for the worksheet cells held in this cache,
@@ -70,21 +61,20 @@ abstract class PHPExcel_CachedObjectStorage_CacheBase {
      *
      * @var array of mixed
      */
-	protected $_cellCache = array();
-
+    protected $cellCache = array();
 
     /**
      * Initialise this new cell collection
      *
      * @param    PHPExcel_Worksheet    $parent        The worksheet for this cell collection
      */
-	public function __construct(PHPExcel_Worksheet $parent) {
+    public function __construct(PHPExcel_Worksheet $parent)
+    {
         //    Set our parent worksheet.
         //    This is maintained within the cache controller to facilitate re-attaching it to PHPExcel_Cell objects when
         //        they are woken from a serialized state
-		$this->_parent = $parent;
-	}	//	function __construct()
-
+        $this->parent = $parent;
+    }
 
     /**
      * Return the parent worksheet for this cell collection
@@ -93,7 +83,7 @@ abstract class PHPExcel_CachedObjectStorage_CacheBase {
      */
     public function getParent()
     {
-		return $this->_parent;
+        return $this->parent;
     }
 
     /**
@@ -102,14 +92,14 @@ abstract class PHPExcel_CachedObjectStorage_CacheBase {
      * @param    string        $pCoord        Coordinate address of the cell to check
      * @return    boolean
      */
-	public function isDataSet($pCoord) {
-		if ($pCoord === $this->_currentObjectID) {
+    public function isDataSet($pCoord)
+    {
+        if ($pCoord === $this->currentObjectID) {
             return true;
         }
         //    Check if the requested entry exists in the cache
-		return isset($this->_cellCache[$pCoord]);
-	}	//	function isDataSet()
-
+        return isset($this->cellCache[$pCoord]);
+    }
 
     /**
      * Move a cell object from one address to another
@@ -118,31 +108,31 @@ abstract class PHPExcel_CachedObjectStorage_CacheBase {
      * @param    string        $toAddress        Destination address of the cell to move
      * @return    boolean
      */
-	public function moveCell($fromAddress, $toAddress) {
-		if ($fromAddress === $this->_currentObjectID) {
-			$this->_currentObjectID = $toAddress;
+    public function moveCell($fromAddress, $toAddress)
+    {
+        if ($fromAddress === $this->currentObjectID) {
+            $this->currentObjectID = $toAddress;
         }
-		$this->_currentCellIsDirty = true;
-		if (isset($this->_cellCache[$fromAddress])) {
-			$this->_cellCache[$toAddress] = &$this->_cellCache[$fromAddress];
-			unset($this->_cellCache[$fromAddress]);
+        $this->currentCellIsDirty = true;
+        if (isset($this->cellCache[$fromAddress])) {
+            $this->cellCache[$toAddress] = &$this->cellCache[$fromAddress];
+            unset($this->cellCache[$fromAddress]);
         }
 
-		return TRUE;
-	}	//	function moveCell()
-
+        return true;
+    }
 
     /**
      * Add or Update a cell in cache
      *
      * @param    PHPExcel_Cell    $cell        Cell to update
-	 * @return	void
+     * @return    PHPExcel_Cell
      * @throws    PHPExcel_Exception
      */
-	public function updateCacheData(PHPExcel_Cell $cell) {
+    public function updateCacheData(PHPExcel_Cell $cell)
+    {
         return $this->addCacheData($cell->getCoordinate(), $cell);
-	}	//	function updateCacheData()
-
+    }
 
     /**
      * Delete a cell in cache identified by coordinate address
@@ -150,36 +140,37 @@ abstract class PHPExcel_CachedObjectStorage_CacheBase {
      * @param    string            $pCoord        Coordinate address of the cell to delete
      * @throws    PHPExcel_Exception
      */
-	public function deleteCacheData($pCoord) {
-		if ($pCoord === $this->_currentObjectID) {
-			$this->_currentObject->detach();
-			$this->_currentObjectID = $this->_currentObject = null;
+    public function deleteCacheData($pCoord)
+    {
+        if ($pCoord === $this->currentObjectID && !is_null($this->currentObject)) {
+            $this->currentObject->detach();
+            $this->currentObjectID = $this->currentObject = null;
         }
 
-		if (is_object($this->_cellCache[$pCoord])) {
-			$this->_cellCache[$pCoord]->detach();
-			unset($this->_cellCache[$pCoord]);
+        if (is_object($this->cellCache[$pCoord])) {
+            $this->cellCache[$pCoord]->detach();
+            unset($this->cellCache[$pCoord]);
+        }
+        $this->currentCellIsDirty = false;
     }
-		$this->_currentCellIsDirty = false;
-	}	//	function deleteCacheData()
-
 
     /**
      * Get a list of all cell addresses currently held in cache
      *
-	 * @return	array of string
+     * @return    string[]
      */
-	public function getCellList() {
-		return array_keys($this->_cellCache);
-	}	//	function getCellList()
-
+    public function getCellList()
+    {
+        return array_keys($this->cellCache);
+    }
 
     /**
      * Sort the list of all cell addresses currently held in cache by row and column
      *
-	 * @return	void
+     * @return    string[]
      */
-	public function getSortedCellList() {
+    public function getSortedCellList()
+    {
         $sortKeys = array();
         foreach ($this->getCellList() as $coord) {
             sscanf($coord, '%[A-Z]%d', $column, $row);
@@ -188,9 +179,7 @@ abstract class PHPExcel_CachedObjectStorage_CacheBase {
         ksort($sortKeys);
 
         return array_values($sortKeys);
-	}	//	function sortCellList()
-
-
+    }
 
     /**
      * Get highest worksheet column and highest row that have cell records
@@ -213,12 +202,12 @@ abstract class PHPExcel_CachedObjectStorage_CacheBase {
             $highestColumn = substr(max($col), 1);
         }
 
-		return array( 'row'	   => $highestRow,
+        return array(
+            'row'    => $highestRow,
             'column' => $highestColumn
         );
     }
 
-
     /**
      * Return the cell address of the currently active cell object
      *
@@ -226,7 +215,7 @@ abstract class PHPExcel_CachedObjectStorage_CacheBase {
      */
     public function getCurrentAddress()
     {
-		return $this->_currentObjectID;
+        return $this->currentObjectID;
     }
 
     /**
@@ -236,50 +225,79 @@ abstract class PHPExcel_CachedObjectStorage_CacheBase {
      */
     public function getCurrentColumn()
     {
-		sscanf($this->_currentObjectID, '%[A-Z]%d', $column, $row);
+        sscanf($this->currentObjectID, '%[A-Z]%d', $column, $row);
         return $column;
     }
 
     /**
      * Return the row address of the currently active cell object
      *
-	 * @return	string
+     * @return    integer
      */
     public function getCurrentRow()
     {
-		sscanf($this->_currentObjectID, '%[A-Z]%d', $column, $row);
-		return $row;
+        sscanf($this->currentObjectID, '%[A-Z]%d', $column, $row);
+        return (integer) $row;
     }
 
     /**
      * Get highest worksheet column
      *
+     * @param   string     $row        Return the highest column for the specified row,
+     *                                     or the highest column of any row if no row number is passed
      * @return  string     Highest column name
      */
-	public function getHighestColumn()
+    public function getHighestColumn($row = null)
     {
+        if ($row == null) {
             $colRow = $this->getHighestRowAndColumn();
             return $colRow['column'];
         }
 
+        $columnList = array(1);
+        foreach ($this->getCellList() as $coord) {
+            sscanf($coord, '%[A-Z]%d', $c, $r);
+            if ($r != $row) {
+                continue;
+            }
+            $columnList[] = PHPExcel_Cell::columnIndexFromString($c);
+        }
+        return PHPExcel_Cell::stringFromColumnIndex(max($columnList) - 1);
+    }
+
     /**
      * Get highest worksheet row
      *
+     * @param   string     $column     Return the highest row for the specified column,
+     *                                     or the highest row of any column if no column letter is passed
      * @return  int        Highest row number
      */
-	public function getHighestRow()
+    public function getHighestRow($column = null)
     {
+        if ($column == null) {
             $colRow = $this->getHighestRowAndColumn();
             return $colRow['row'];
         }
 
+        $rowList = array(0);
+        foreach ($this->getCellList() as $coord) {
+            sscanf($coord, '%[A-Z]%d', $c, $r);
+            if ($c != $column) {
+                continue;
+            }
+            $rowList[] = $r;
+        }
+
+        return max($rowList);
+    }
 
     /**
      * Generate a unique ID for cache referencing
      *
      * @return string Unique Reference
      */
-	protected function _getUniqueID() {
+    protected function getUniqueID()
+    {
         if (function_exists('posix_getpid')) {
             $baseUnique = posix_getpid();
         } else {
@@ -294,16 +312,48 @@ abstract class PHPExcel_CachedObjectStorage_CacheBase {
      * @param    PHPExcel_Worksheet    $parent        The new worksheet
      * @return    void
      */
-	public function copyCellCollection(PHPExcel_Worksheet $parent) {
-		$this->_currentCellIsDirty;
-        $this->_storeData();
+    public function copyCellCollection(PHPExcel_Worksheet $parent)
+    {
+        $this->currentCellIsDirty;
+        $this->storeData();
 
-		$this->_parent = $parent;
-		if (($this->_currentObject !== NULL) && (is_object($this->_currentObject))) {
-			$this->_currentObject->attach($this);
+        $this->parent = $parent;
+        if (($this->currentObject !== null) && (is_object($this->currentObject))) {
+            $this->currentObject->attach($this);
         }
     }    //    function copyCellCollection()
 
+    /**
+     * Remove a row, deleting all cells in that row
+     *
+     * @param string    $row    Row number to remove
+     * @return void
+     */
+    public function removeRow($row)
+    {
+        foreach ($this->getCellList() as $coord) {
+            sscanf($coord, '%[A-Z]%d', $c, $r);
+            if ($r == $row) {
+                $this->deleteCacheData($coord);
+            }
+        }
+    }
+
+    /**
+     * Remove a column, deleting all cells in that column
+     *
+     * @param string    $column    Column ID to remove
+     * @return void
+     */
+    public function removeColumn($column)
+    {
+        foreach ($this->getCellList() as $coord) {
+            sscanf($coord, '%[A-Z]%d', $c, $r);
+            if ($c == $column) {
+                $this->deleteCacheData($coord);
+            }
+        }
+    }
 
     /**
      * Identify whether the caching method is currently available
@@ -311,8 +361,8 @@ abstract class PHPExcel_CachedObjectStorage_CacheBase {
      *
      * @return    boolean
      */
-	public static function cacheMethodIsAvailable() {
+    public static function cacheMethodIsAvailable()
+    {
         return true;
     }
-
 }

Classes/PHPExcel/CachedObjectStorage/DiscISAM.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * PHPExcel
+ * PHPExcel_CachedObjectStorage_DiscISAM
  *
- * Copyright (c) 2006 - 2013 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,42 +21,32 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-
-/**
- * PHPExcel_CachedObjectStorage_DiscISAM
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_CachedObjectStorage_DiscISAM extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache {
-
+class PHPExcel_CachedObjectStorage_DiscISAM extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache
+{
     /**
      * Name of the file for this cache
      *
      * @var string
      */
-	private $_fileName = NULL;
+    private $fileName = null;
 
     /**
      * File handle for this cache file
      *
      * @var resource
      */
-	private $_fileHandle = NULL;
+    private $fileHandle = null;
 
     /**
      * Directory/Folder where the cache file is located
      *
      * @var string
      */
-	private $_cacheDirectory = NULL;
-
+    private $cacheDirectory = null;
 
     /**
      * Store cell data in cache for the current cell object if it's "dirty",
@@ -64,42 +55,42 @@ class PHPExcel_CachedObjectStorage_DiscISAM extends PHPExcel_CachedObjectStorage
      * @return    void
      * @throws    PHPExcel_Exception
      */
-	protected function _storeData() {
-		if ($this->_currentCellIsDirty) {
-			$this->_currentObject->detach();
+    protected function storeData()
+    {
+        if ($this->currentCellIsDirty && !empty($this->currentObjectID)) {
+            $this->currentObject->detach();
 
-			fseek($this->_fileHandle,0,SEEK_END);
-			$offset = ftell($this->_fileHandle);
-			fwrite($this->_fileHandle, serialize($this->_currentObject));
-			$this->_cellCache[$this->_currentObjectID]	= array('ptr' => $offset,
-																'sz'  => ftell($this->_fileHandle) - $offset
+            fseek($this->fileHandle, 0, SEEK_END);
+
+            $this->cellCache[$this->currentObjectID] = array(
+                'ptr' => ftell($this->fileHandle),
+                'sz'  => fwrite($this->fileHandle, serialize($this->currentObject))
             );
-			$this->_currentCellIsDirty = false;
+            $this->currentCellIsDirty = false;
+        }
+        $this->currentObjectID = $this->currentObject = null;
     }
-		$this->_currentObjectID = $this->_currentObject = null;
-	}	//	function _storeData()
-
 
     /**
      * Add or Update a cell in cache identified by coordinate address
      *
      * @param    string            $pCoord        Coordinate address of the cell to update
      * @param    PHPExcel_Cell    $cell        Cell to update
-	 * @return	void
+     * @return    PHPExcel_Cell
      * @throws    PHPExcel_Exception
      */
-	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
-		if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
-			$this->_storeData();
+    public function addCacheData($pCoord, PHPExcel_Cell $cell)
+    {
+        if (($pCoord !== $this->currentObjectID) && ($this->currentObjectID !== null)) {
+            $this->storeData();
         }
 
-		$this->_currentObjectID = $pCoord;
-		$this->_currentObject = $cell;
-		$this->_currentCellIsDirty = true;
+        $this->currentObjectID = $pCoord;
+        $this->currentObject = $cell;
+        $this->currentCellIsDirty = true;
 
         return $cell;
-	}	//	function addCacheData()
-
+    }
 
     /**
      * Get cell at a specific coordinate
@@ -108,82 +99,80 @@ class PHPExcel_CachedObjectStorage_DiscISAM extends PHPExcel_CachedObjectStorage
      * @throws     PHPExcel_Exception
      * @return     PHPExcel_Cell     Cell that was found, or null if not found
      */
-	public function getCacheData($pCoord) {
-		if ($pCoord === $this->_currentObjectID) {
-			return $this->_currentObject;
+    public function getCacheData($pCoord)
+    {
+        if ($pCoord === $this->currentObjectID) {
+            return $this->currentObject;
         }
-		$this->_storeData();
+        $this->storeData();
 
         //    Check if the entry that has been requested actually exists
-		if (!isset($this->_cellCache[$pCoord])) {
+        if (!isset($this->cellCache[$pCoord])) {
             //    Return null if requested entry doesn't exist in cache
             return null;
         }
 
         //    Set current entry to the requested entry
-		$this->_currentObjectID = $pCoord;
-		fseek($this->_fileHandle,$this->_cellCache[$pCoord]['ptr']);
-		$this->_currentObject = unserialize(fread($this->_fileHandle,$this->_cellCache[$pCoord]['sz']));
+        $this->currentObjectID = $pCoord;
+        fseek($this->fileHandle, $this->cellCache[$pCoord]['ptr']);
+        $this->currentObject = unserialize(fread($this->fileHandle, $this->cellCache[$pCoord]['sz']));
         //    Re-attach this as the cell's parent
-        $this->_currentObject->attach($this);
+        $this->currentObject->attach($this);
 
         //    Return requested entry
-		return $this->_currentObject;
-	}	//	function getCacheData()
-
+        return $this->currentObject;
+    }
 
     /**
      * Get a list of all cell addresses currently held in cache
      *
-	 * @return  array of string
+     * @return  string[]
      */
-	public function getCellList() {
-		if ($this->_currentObjectID !== null) {
-			$this->_storeData();
+    public function getCellList()
+    {
+        if ($this->currentObjectID !== null) {
+            $this->storeData();
         }
 
         return parent::getCellList();
     }
 
-
     /**
      * Clone the cell collection
      *
      * @param    PHPExcel_Worksheet    $parent        The new worksheet
-	 * @return	void
      */
-	public function copyCellCollection(PHPExcel_Worksheet $parent) {
+    public function copyCellCollection(PHPExcel_Worksheet $parent)
+    {
         parent::copyCellCollection($parent);
         //    Get a new id for the new file name
-		$baseUnique = $this->_getUniqueID();
-		$newFileName = $this->_cacheDirectory.'/PHPExcel.'.$baseUnique.'.cache';
+        $baseUnique = $this->getUniqueID();
+        $newFileName = $this->cacheDirectory.'/PHPExcel.'.$baseUnique.'.cache';
         //    Copy the existing cell cache file
-		copy ($this->_fileName,$newFileName);
-		$this->_fileName = $newFileName;
+        copy($this->fileName, $newFileName);
+        $this->fileName = $newFileName;
         //    Open the copied cell cache file
-		$this->_fileHandle = fopen($this->_fileName,'a+');
-	}	//	function copyCellCollection()
-
+        $this->fileHandle = fopen($this->fileName, 'a+');
+    }
 
     /**
      * Clear the cell collection and disconnect from our parent
      *
-	 * @return	void
      */
-	public function unsetWorksheetCells() {
-		if(!is_null($this->_currentObject)) {
-			$this->_currentObject->detach();
-			$this->_currentObject = $this->_currentObjectID = null;
+    public function unsetWorksheetCells()
+    {
+        if (!is_null($this->currentObject)) {
+            $this->currentObject->detach();
+            $this->currentObject = $this->currentObjectID = null;
         }
-		$this->_cellCache = array();
+        $this->cellCache = array();
 
         //    detach ourself from the worksheet, so that it can then delete this object successfully
-		$this->_parent = null;
+        $this->parent = null;
 
         //    Close down the temporary cache file
         $this->__destruct();
-	}	//	function unsetWorksheetCells()
-
+    }
 
     /**
      * Initialise this new cell collection
@@ -191,29 +180,29 @@ class PHPExcel_CachedObjectStorage_DiscISAM extends PHPExcel_CachedObjectStorage
      * @param    PHPExcel_Worksheet    $parent        The worksheet for this cell collection
      * @param    array of mixed        $arguments    Additional initialisation arguments
      */
-	public function __construct(PHPExcel_Worksheet $parent, $arguments) {
-		$this->_cacheDirectory	= ((isset($arguments['dir'])) && ($arguments['dir'] !== NULL))
+    public function __construct(PHPExcel_Worksheet $parent, $arguments)
+    {
+        $this->cacheDirectory    = ((isset($arguments['dir'])) && ($arguments['dir'] !== null))
                                     ? $arguments['dir']
                                     : PHPExcel_Shared_File::sys_get_temp_dir();
 
         parent::__construct($parent);
-		if (is_null($this->_fileHandle)) {
-			$baseUnique = $this->_getUniqueID();
-			$this->_fileName = $this->_cacheDirectory.'/PHPExcel.'.$baseUnique.'.cache';
-			$this->_fileHandle = fopen($this->_fileName,'a+');
+        if (is_null($this->fileHandle)) {
+            $baseUnique = $this->getUniqueID();
+            $this->fileName = $this->cacheDirectory.'/PHPExcel.'.$baseUnique.'.cache';
+            $this->fileHandle = fopen($this->fileName, 'a+');
+        }
     }
-	}	//	function __construct()
-
 
     /**
      * Destroy this cell collection
      */
-	public function __destruct() {
-		if (!is_null($this->_fileHandle)) {
-			fclose($this->_fileHandle);
-			unlink($this->_fileName);
+    public function __destruct()
+    {
+        if (!is_null($this->fileHandle)) {
+            fclose($this->fileHandle);
+            unlink($this->fileName);
+        }
+        $this->fileHandle = null;
     }
-		$this->_fileHandle = null;
-	}	//	function __destruct()
-
 }

Classes/PHPExcel/CachedObjectStorage/ICache.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * PHPExcel
+ * PHPExcel_CachedObjectStorage_ICache
  *
- * Copyright (c) 2006 - 2013 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,19 +21,10 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-
-/**
- * PHPExcel_CachedObjectStorage_ICache
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
 interface PHPExcel_CachedObjectStorage_ICache
 {
     /**
@@ -40,7 +32,7 @@ interface PHPExcel_CachedObjectStorage_ICache
      *
      * @param    string            $pCoord        Coordinate address of the cell to update
      * @param    PHPExcel_Cell    $cell        Cell to update
-	 * @return	void
+     * @return    PHPExcel_Cell
      * @throws    PHPExcel_Exception
      */
     public function addCacheData($pCoord, PHPExcel_Cell $cell);
@@ -49,7 +41,7 @@ interface PHPExcel_CachedObjectStorage_ICache
      * Add or Update a cell in cache
      *
      * @param    PHPExcel_Cell    $cell        Cell to update
-	 * @return	void
+     * @return    PHPExcel_Cell
      * @throws    PHPExcel_Exception
      */
     public function updateCacheData(PHPExcel_Cell $cell);
@@ -82,14 +74,14 @@ interface PHPExcel_CachedObjectStorage_ICache
     /**
      * Get a list of all cell addresses currently held in cache
      *
-	 * @return	array of string
+     * @return    string[]
      */
     public function getCellList();
 
     /**
      * Get the list of all cell addresses currently held in cache sorted by column and row
      *
-	 * @return	void
+     * @return    string[]
      */
     public function getSortedCellList();
 
@@ -108,5 +100,4 @@ interface PHPExcel_CachedObjectStorage_ICache
      * @return    boolean
      */
     public static function cacheMethodIsAvailable();
-
 }

Classes/PHPExcel/CachedObjectStorage/Igbinary.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * PHPExcel
+ * PHPExcel_CachedObjectStorage_Igbinary
  *
- * Copyright (c) 2006 - 2013 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,21 +21,12 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-
-/**
- * PHPExcel_CachedObjectStorage_Igbinary
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_CachedObjectStorage_Igbinary extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache {
-
+class PHPExcel_CachedObjectStorage_Igbinary extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache
+{
     /**
      * Store cell data in cache for the current cell object if it's "dirty",
      *     and the 'nullify' the current cell object
@@ -42,14 +34,15 @@ class PHPExcel_CachedObjectStorage_Igbinary extends PHPExcel_CachedObjectStorage
      * @return    void
      * @throws    PHPExcel_Exception
      */
-	protected function _storeData() {
-		if ($this->_currentCellIsDirty) {
-			$this->_currentObject->detach();
+    protected function storeData()
+    {
+        if ($this->currentCellIsDirty && !empty($this->currentObjectID)) {
+            $this->currentObject->detach();
 
-			$this->_cellCache[$this->_currentObjectID] = igbinary_serialize($this->_currentObject);
-			$this->_currentCellIsDirty = false;
+            $this->cellCache[$this->currentObjectID] = igbinary_serialize($this->currentObject);
+            $this->currentCellIsDirty = false;
         }
-		$this->_currentObjectID = $this->_currentObject = null;
+        $this->currentObjectID = $this->currentObject = null;
     }    //    function _storeData()
 
 
@@ -58,17 +51,18 @@ class PHPExcel_CachedObjectStorage_Igbinary extends PHPExcel_CachedObjectStorage
      *
      * @param    string            $pCoord        Coordinate address of the cell to update
      * @param    PHPExcel_Cell    $cell        Cell to update
-	 * @return	void
+     * @return    PHPExcel_Cell
      * @throws    PHPExcel_Exception
      */
-	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
-		if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
-			$this->_storeData();
+    public function addCacheData($pCoord, PHPExcel_Cell $cell)
+    {
+        if (($pCoord !== $this->currentObjectID) && ($this->currentObjectID !== null)) {
+            $this->storeData();
         }
 
-		$this->_currentObjectID = $pCoord;
-		$this->_currentObject = $cell;
-		$this->_currentCellIsDirty = true;
+        $this->currentObjectID = $pCoord;
+        $this->currentObject = $cell;
+        $this->currentCellIsDirty = true;
 
         return $cell;
     }    //    function addCacheData()
@@ -81,37 +75,39 @@ class PHPExcel_CachedObjectStorage_Igbinary extends PHPExcel_CachedObjectStorage
      * @throws     PHPExcel_Exception
      * @return     PHPExcel_Cell     Cell that was found, or null if not found
      */
-	public function getCacheData($pCoord) {
-		if ($pCoord === $this->_currentObjectID) {
-			return $this->_currentObject;
+    public function getCacheData($pCoord)
+    {
+        if ($pCoord === $this->currentObjectID) {
+            return $this->currentObject;
         }
-		$this->_storeData();
+        $this->storeData();
 
         //    Check if the entry that has been requested actually exists
-		if (!isset($this->_cellCache[$pCoord])) {
+        if (!isset($this->cellCache[$pCoord])) {
             //    Return null if requested entry doesn't exist in cache
             return null;
         }
 
         //    Set current entry to the requested entry
-		$this->_currentObjectID = $pCoord;
-		$this->_currentObject = igbinary_unserialize($this->_cellCache[$pCoord]);
+        $this->currentObjectID = $pCoord;
+        $this->currentObject = igbinary_unserialize($this->cellCache[$pCoord]);
         //    Re-attach this as the cell's parent
-        $this->_currentObject->attach($this);
+        $this->currentObject->attach($this);
 
         //    Return requested entry
-		return $this->_currentObject;
+        return $this->currentObject;
     }    //    function getCacheData()
 
 
     /**
      * Get a list of all cell addresses currently held in cache
      *
-	 * @return  array of string
+     * @return  string[]
      */
-	public function getCellList() {
-		if ($this->_currentObjectID !== null) {
-			$this->_storeData();
+    public function getCellList()
+    {
+        if ($this->currentObjectID !== null) {
+            $this->storeData();
         }
 
         return parent::getCellList();
@@ -123,15 +119,16 @@ class PHPExcel_CachedObjectStorage_Igbinary extends PHPExcel_CachedObjectStorage
      *
      * @return    void
      */
-	public function unsetWorksheetCells() {
-		if(!is_null($this->_currentObject)) {
-			$this->_currentObject->detach();
-			$this->_currentObject = $this->_currentObjectID = null;
+    public function unsetWorksheetCells()
+    {
+        if (!is_null($this->currentObject)) {
+            $this->currentObject->detach();
+            $this->currentObject = $this->currentObjectID = null;
         }
-		$this->_cellCache = array();
+        $this->cellCache = array();
 
         //    detach ourself from the worksheet, so that it can then delete this object successfully
-		$this->_parent = null;
+        $this->parent = null;
     }    //    function unsetWorksheetCells()
 
 
@@ -141,12 +138,12 @@ class PHPExcel_CachedObjectStorage_Igbinary extends PHPExcel_CachedObjectStorage
      *
      * @return    boolean
      */
-	public static function cacheMethodIsAvailable() {
+    public static function cacheMethodIsAvailable()
+    {
         if (!function_exists('igbinary_serialize')) {
             return false;
         }
 
         return true;
     }
-
 }

Classes/PHPExcel/CachedObjectStorage/Memcache.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * PHPExcel
+ * PHPExcel_CachedObjectStorage_Memcache
  *
- * Copyright (c) 2006 - 2013 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,41 +21,32 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-
-/**
- * PHPExcel_CachedObjectStorage_Memcache
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_CachedObjectStorage_Memcache extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache {
-
+class PHPExcel_CachedObjectStorage_Memcache extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache
+{
     /**
      * Prefix used to uniquely identify cache data for this worksheet
      *
      * @var string
      */
-	private $_cachePrefix = null;
+    private $cachePrefix = null;
 
     /**
      * Cache timeout
      *
      * @var integer
      */
-	private $_cacheTime = 600;
+    private $cacheTime = 600;
 
     /**
      * Memcache interface
      *
      * @var resource
      */
-	private $_memcache = null;
+    private $memcache = null;
 
 
     /**
@@ -64,20 +56,21 @@ class PHPExcel_CachedObjectStorage_Memcache extends PHPExcel_CachedObjectStorage
      * @return    void
      * @throws    PHPExcel_Exception
      */
-	protected function _storeData() {
-		if ($this->_currentCellIsDirty) {
-			$this->_currentObject->detach();
+    protected function storeData()
+    {
+        if ($this->currentCellIsDirty && !empty($this->currentObjectID)) {
+            $this->currentObject->detach();
 
-			$obj = serialize($this->_currentObject);
-			if (!$this->_memcache->replace($this->_cachePrefix.$this->_currentObjectID.'.cache',$obj,NULL,$this->_cacheTime)) {
-				if (!$this->_memcache->add($this->_cachePrefix.$this->_currentObjectID.'.cache',$obj,NULL,$this->_cacheTime)) {
+            $obj = serialize($this->currentObject);
+            if (!$this->memcache->replace($this->cachePrefix . $this->currentObjectID . '.cache', $obj, null, $this->cacheTime)) {
+                if (!$this->memcache->add($this->cachePrefix . $this->currentObjectID . '.cache', $obj, null, $this->cacheTime)) {
                     $this->__destruct();
-					throw new PHPExcel_Exception('Failed to store cell '.$this->_currentObjectID.' in MemCache');
+                    throw new PHPExcel_Exception("Failed to store cell {$this->currentObjectID} in MemCache");
                 }
             }
-			$this->_currentCellIsDirty = false;
+            $this->currentCellIsDirty = false;
         }
-		$this->_currentObjectID = $this->_currentObject = null;
+        $this->currentObjectID = $this->currentObject = null;
     }    //    function _storeData()
 
 
@@ -86,18 +79,19 @@ class PHPExcel_CachedObjectStorage_Memcache extends PHPExcel_CachedObjectStorage
      *
      * @param    string            $pCoord        Coordinate address of the cell to update
      * @param    PHPExcel_Cell    $cell        Cell to update
-	 * @return	void
+     * @return    PHPExcel_Cell
      * @throws    PHPExcel_Exception
      */
-	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
-		if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
-			$this->_storeData();
+    public function addCacheData($pCoord, PHPExcel_Cell $cell)
+    {
+        if (($pCoord !== $this->currentObjectID) && ($this->currentObjectID !== null)) {
+            $this->storeData();
         }
-		$this->_cellCache[$pCoord] = true;
+        $this->cellCache[$pCoord] = true;
 
-		$this->_currentObjectID = $pCoord;
-		$this->_currentObject = $cell;
-		$this->_currentCellIsDirty = true;
+        $this->currentObjectID = $pCoord;
+        $this->currentObject = $cell;
+        $this->currentCellIsDirty = true;
 
         return $cell;
     }    //    function addCacheData()
@@ -107,17 +101,18 @@ class PHPExcel_CachedObjectStorage_Memcache extends PHPExcel_CachedObjectStorage
      * Is a value set in the current PHPExcel_CachedObjectStorage_ICache for an indexed cell?
      *
      * @param    string        $pCoord        Coordinate address of the cell to check
-	 * @return	void
+     * @return    boolean
      * @return    boolean
      */
-	public function isDataSet($pCoord) {
+    public function isDataSet($pCoord)
+    {
         //    Check if the requested entry is the current object, or exists in the cache
         if (parent::isDataSet($pCoord)) {
-			if ($this->_currentObjectID == $pCoord) {
+            if ($this->currentObjectID == $pCoord) {
                 return true;
             }
             //    Check if the requested entry still exists in Memcache
-			$success = $this->_memcache->get($this->_cachePrefix.$pCoord.'.cache');
+            $success = $this->memcache->get($this->cachePrefix.$pCoord.'.cache');
             if ($success === false) {
                 //    Entry no longer exists in Memcache, so clear it from the cache array
                 parent::deleteCacheData($pCoord);
@@ -126,7 +121,7 @@ class PHPExcel_CachedObjectStorage_Memcache extends PHPExcel_CachedObjectStorage
             return true;
         }
         return false;
-	}	//	function isDataSet()
+    }
 
 
     /**
@@ -136,19 +131,20 @@ class PHPExcel_CachedObjectStorage_Memcache extends PHPExcel_CachedObjectStorage
      * @throws     PHPExcel_Exception
      * @return     PHPExcel_Cell     Cell that was found, or null if not found
      */
-	public function getCacheData($pCoord) {
-		if ($pCoord === $this->_currentObjectID) {
-			return $this->_currentObject;
+    public function getCacheData($pCoord)
+    {
+        if ($pCoord === $this->currentObjectID) {
+            return $this->currentObject;
         }
-		$this->_storeData();
+        $this->storeData();
 
         //    Check if the entry that has been requested actually exists
         if (parent::isDataSet($pCoord)) {
-			$obj = $this->_memcache->get($this->_cachePrefix.$pCoord.'.cache');
+            $obj = $this->memcache->get($this->cachePrefix . $pCoord . '.cache');
             if ($obj === false) {
                 //    Entry no longer exists in Memcache, so clear it from the cache array
                 parent::deleteCacheData($pCoord);
-				throw new PHPExcel_Exception('Cell entry '.$pCoord.' no longer exists in MemCache');
+                throw new PHPExcel_Exception("Cell entry {$pCoord} no longer exists in MemCache");
             }
         } else {
             //    Return null if requested entry doesn't exist in cache
@@ -156,44 +152,43 @@ class PHPExcel_CachedObjectStorage_Memcache extends PHPExcel_CachedObjectStorage
         }
 
         //    Set current entry to the requested entry
-		$this->_currentObjectID = $pCoord;
-		$this->_currentObject = unserialize($obj);
+        $this->currentObjectID = $pCoord;
+        $this->currentObject = unserialize($obj);
         //    Re-attach this as the cell's parent
-        $this->_currentObject->attach($this);
+        $this->currentObject->attach($this);
 
         //    Return requested entry
-		return $this->_currentObject;
-	}	//	function getCacheData()
-
+        return $this->currentObject;
+    }
 
     /**
      * Get a list of all cell addresses currently held in cache
      *
-	 * @return  array of string
+     * @return  string[]
      */
-	public function getCellList() {
-		if ($this->_currentObjectID !== null) {
-			$this->_storeData();
+    public function getCellList()
+    {
+        if ($this->currentObjectID !== null) {
+            $this->storeData();
         }
 
         return parent::getCellList();
     }
 
-
     /**
      * Delete a cell in cache identified by coordinate address
      *
      * @param    string            $pCoord        Coordinate address of the cell to delete
      * @throws    PHPExcel_Exception
      */
-	public function deleteCacheData($pCoord) {
+    public function deleteCacheData($pCoord)
+    {
         //    Delete the entry from Memcache
-		$this->_memcache->delete($this->_cachePrefix.$pCoord.'.cache');
+        $this->memcache->delete($this->cachePrefix . $pCoord . '.cache');
 
         //    Delete the entry from our cell address array
         parent::deleteCacheData($pCoord);
-	}	//	function deleteCacheData()
-
+    }
 
     /**
      * Clone the cell collection
@@ -201,50 +196,50 @@ class PHPExcel_CachedObjectStorage_Memcache extends PHPExcel_CachedObjectStorage
      * @param    PHPExcel_Worksheet    $parent        The new worksheet
      * @return    void
      */
-	public function copyCellCollection(PHPExcel_Worksheet $parent) {
+    public function copyCellCollection(PHPExcel_Worksheet $parent)
+    {
         parent::copyCellCollection($parent);
         //    Get a new id for the new file name
-		$baseUnique = $this->_getUniqueID();
+        $baseUnique = $this->getUniqueID();
         $newCachePrefix = substr(md5($baseUnique), 0, 8) . '.';
         $cacheList = $this->getCellList();
         foreach ($cacheList as $cellID) {
-			if ($cellID != $this->_currentObjectID) {
-				$obj = $this->_memcache->get($this->_cachePrefix.$cellID.'.cache');
+            if ($cellID != $this->currentObjectID) {
+                $obj = $this->memcache->get($this->cachePrefix.$cellID.'.cache');
                 if ($obj === false) {
                     //    Entry no longer exists in Memcache, so clear it from the cache array
                     parent::deleteCacheData($cellID);
-					throw new PHPExcel_Exception('Cell entry '.$cellID.' no longer exists in MemCache');
+                    throw new PHPExcel_Exception("Cell entry {$cellID} no longer exists in MemCache");
                 }
-				if (!$this->_memcache->add($newCachePrefix.$cellID.'.cache',$obj,NULL,$this->_cacheTime)) {
+                if (!$this->memcache->add($newCachePrefix . $cellID . '.cache', $obj, null, $this->cacheTime)) {
                     $this->__destruct();
-					throw new PHPExcel_Exception('Failed to store cell '.$cellID.' in MemCache');
+                    throw new PHPExcel_Exception("Failed to store cell {$cellID} in MemCache");
                 }
             }
         }
-		$this->_cachePrefix = $newCachePrefix;
-	}	//	function copyCellCollection()
-
+        $this->cachePrefix = $newCachePrefix;
+    }
 
     /**
      * Clear the cell collection and disconnect from our parent
      *
      * @return    void
      */
-	public function unsetWorksheetCells() {
-		if(!is_null($this->_currentObject)) {
-			$this->_currentObject->detach();
-			$this->_currentObject = $this->_currentObjectID = null;
+    public function unsetWorksheetCells()
+    {
+        if (!is_null($this->currentObject)) {
+            $this->currentObject->detach();
+            $this->currentObject = $this->currentObjectID = null;
         }
 
         //    Flush the Memcache cache
         $this->__destruct();
 
-		$this->_cellCache = array();
+        $this->cellCache = array();
 
         //    detach ourself from the worksheet, so that it can then delete this object successfully
-		$this->_parent = null;
-	}	//	function unsetWorksheetCells()
-
+        $this->parent = null;
+    }
 
     /**
      * Initialise this new cell collection
@@ -252,26 +247,26 @@ class PHPExcel_CachedObjectStorage_Memcache extends PHPExcel_CachedObjectStorage
      * @param    PHPExcel_Worksheet    $parent        The worksheet for this cell collection
      * @param    array of mixed        $arguments    Additional initialisation arguments
      */
-	public function __construct(PHPExcel_Worksheet $parent, $arguments) {
+    public function __construct(PHPExcel_Worksheet $parent, $arguments)
+    {
         $memcacheServer = (isset($arguments['memcacheServer'])) ? $arguments['memcacheServer'] : 'localhost';
         $memcachePort = (isset($arguments['memcachePort'])) ? $arguments['memcachePort'] : 11211;
         $cacheTime = (isset($arguments['cacheTime'])) ? $arguments['cacheTime'] : 600;
 
-		if (is_null($this->_cachePrefix)) {
-			$baseUnique = $this->_getUniqueID();
-			$this->_cachePrefix = substr(md5($baseUnique),0,8).'.';
+        if (is_null($this->cachePrefix)) {
+            $baseUnique = $this->getUniqueID();
+            $this->cachePrefix = substr(md5($baseUnique), 0, 8) . '.';
 
             //    Set a new Memcache object and connect to the Memcache server
-			$this->_memcache = new Memcache();
-			if (!$this->_memcache->addServer($memcacheServer, $memcachePort, false, 50, 5, 5, true, array($this, 'failureCallback'))) {
-				throw new PHPExcel_Exception('Could not connect to MemCache server at '.$memcacheServer.':'.$memcachePort);
+            $this->memcache = new Memcache();
+            if (!$this->memcache->addServer($memcacheServer, $memcachePort, false, 50, 5, 5, true, array($this, 'failureCallback'))) {
+                throw new PHPExcel_Exception("Could not connect to MemCache server at {$memcacheServer}:{$memcachePort}");
             }
-			$this->_cacheTime = $cacheTime;
+            $this->cacheTime = $cacheTime;
 
             parent::__construct($parent);
         }
-	}	//	function __construct()
-
+    }
 
     /**
      * Memcache error handler
@@ -280,20 +275,21 @@ class PHPExcel_CachedObjectStorage_Memcache extends PHPExcel_CachedObjectStorage
      * @param    integer    $port        Memcache port
      * @throws    PHPExcel_Exception
      */
-	public function failureCallback($host, $port) {
-		throw new PHPExcel_Exception('memcache '.$host.':'.$port.' failed');
+    public function failureCallback($host, $port)
+    {
+        throw new PHPExcel_Exception("memcache {$host}:{$port} failed");
     }
 
-
     /**
      * Destroy this cell collection
      */
-	public function __destruct() {
+    public function __destruct()
+    {
         $cacheList = $this->getCellList();
         foreach ($cacheList as $cellID) {
-			$this->_memcache->delete($this->_cachePrefix.$cellID.'.cache');
+            $this->memcache->delete($this->cachePrefix.$cellID . '.cache');
+        }
     }
-	}	//	function __destruct()
 
     /**
      * Identify whether the caching method is currently available
@@ -301,12 +297,12 @@ class PHPExcel_CachedObjectStorage_Memcache extends PHPExcel_CachedObjectStorage
      *
      * @return    boolean
      */
-	public static function cacheMethodIsAvailable() {
+    public static function cacheMethodIsAvailable()
+    {
         if (!function_exists('memcache_add')) {
             return false;
         }
 
         return true;
     }
-
 }

Classes/PHPExcel/CachedObjectStorage/Memory.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * PHPExcel
+ * PHPExcel_CachedObjectStorage_Memory
  *
- * Copyright (c) 2006 - 2013 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,28 +21,20 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-
-/**
- * PHPExcel_CachedObjectStorage_Memory
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_CachedObjectStorage_Memory extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache {
-
+class PHPExcel_CachedObjectStorage_Memory extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache
+{
     /**
      * Dummy method callable from CacheBase, but unused by Memory cache
      *
      * @return    void
      */
-	protected function _storeData() {
-	}	//	function _storeData()
+    protected function storeData()
+    {
+    }
 
     /**
      * Add or Update a cell in cache identified by coordinate address
@@ -51,14 +44,15 @@ class PHPExcel_CachedObjectStorage_Memory extends PHPExcel_CachedObjectStorage_C
      * @return    PHPExcel_Cell
      * @throws    PHPExcel_Exception
      */
-	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
-		$this->_cellCache[$pCoord] = $cell;
+    public function addCacheData($pCoord, PHPExcel_Cell $cell)
+    {
+        $this->cellCache[$pCoord] = $cell;
 
         //    Set current entry to the new/updated entry
-		$this->_currentObjectID = $pCoord;
+        $this->currentObjectID = $pCoord;
 
         return $cell;
-	}	//	function addCacheData()
+    }
 
 
     /**
@@ -68,58 +62,57 @@ class PHPExcel_CachedObjectStorage_Memory extends PHPExcel_CachedObjectStorage_C
      * @throws     PHPExcel_Exception
      * @return     PHPExcel_Cell     Cell that was found, or null if not found
      */
-	public function getCacheData($pCoord) {
+    public function getCacheData($pCoord)
+    {
         //    Check if the entry that has been requested actually exists
-		if (!isset($this->_cellCache[$pCoord])) {
-			$this->_currentObjectID = NULL;
+        if (!isset($this->cellCache[$pCoord])) {
+            $this->currentObjectID = null;
             //    Return null if requested entry doesn't exist in cache
             return null;
         }
 
         //    Set current entry to the requested entry
-		$this->_currentObjectID = $pCoord;
+        $this->currentObjectID = $pCoord;
 
         //    Return requested entry
-		return $this->_cellCache[$pCoord];
-	}	//	function getCacheData()
+        return $this->cellCache[$pCoord];
+    }
 
 
     /**
      * Clone the cell collection
      *
      * @param    PHPExcel_Worksheet    $parent        The new worksheet
-	 * @return	void
      */
-	public function copyCellCollection(PHPExcel_Worksheet $parent) {
+    public function copyCellCollection(PHPExcel_Worksheet $parent)
+    {
         parent::copyCellCollection($parent);
 
         $newCollection = array();
-		foreach($this->_cellCache as $k => &$cell) {
+        foreach ($this->cellCache as $k => &$cell) {
             $newCollection[$k] = clone $cell;
-			$newCollection[$k]->attach($parent);
+            $newCollection[$k]->attach($this);
         }
 
-		$this->_cellCache = $newCollection;
+        $this->cellCache = $newCollection;
     }
 
-
     /**
      * Clear the cell collection and disconnect from our parent
      *
-	 * @return	void
      */
-	public function unsetWorksheetCells() {
+    public function unsetWorksheetCells()
+    {
         // Because cells are all stored as intact objects in memory, we need to detach each one from the parent
-		foreach($this->_cellCache as $k => &$cell) {
+        foreach ($this->cellCache as $k => &$cell) {
             $cell->detach();
-			$this->_cellCache[$k] = null;
+            $this->cellCache[$k] = null;
         }
         unset($cell);
 
-		$this->_cellCache = array();
+        $this->cellCache = array();
 
         //    detach ourself from the worksheet, so that it can then delete this object successfully
-		$this->_parent = null;
-	}	//	function unsetWorksheetCells()
-
+        $this->parent = null;
+    }
 }

Classes/PHPExcel/CachedObjectStorage/MemoryGZip.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * PHPExcel
+ * PHPExcel_CachedObjectStorage_MemoryGZip
  *
- * Copyright (c) 2006 - 2013 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,21 +21,12 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-
-/**
- * PHPExcel_CachedObjectStorage_MemoryGZip
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_CachedObjectStorage_MemoryGZip extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache {
-
+class PHPExcel_CachedObjectStorage_MemoryGZip extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache
+{
     /**
      * Store cell data in cache for the current cell object if it's "dirty",
      *     and the 'nullify' the current cell object
@@ -42,15 +34,16 @@ class PHPExcel_CachedObjectStorage_MemoryGZip extends PHPExcel_CachedObjectStora
      * @return    void
      * @throws    PHPExcel_Exception
      */
-	protected function _storeData() {
-		if ($this->_currentCellIsDirty) {
-			$this->_currentObject->detach();
+    protected function storeData()
+    {
+        if ($this->currentCellIsDirty && !empty($this->currentObjectID)) {
+            $this->currentObject->detach();
 
-			$this->_cellCache[$this->_currentObjectID] = gzdeflate(serialize($this->_currentObject));
-			$this->_currentCellIsDirty = false;
+            $this->cellCache[$this->currentObjectID] = gzdeflate(serialize($this->currentObject));
+            $this->currentCellIsDirty = false;
+        }
+        $this->currentObjectID = $this->currentObject = null;
     }
-		$this->_currentObjectID = $this->_currentObject = null;
-	}	//	function _storeData()
 
 
     /**
@@ -58,20 +51,21 @@ class PHPExcel_CachedObjectStorage_MemoryGZip extends PHPExcel_CachedObjectStora
      *
      * @param    string            $pCoord        Coordinate address of the cell to update
      * @param    PHPExcel_Cell    $cell        Cell to update
-	 * @return	void
+     * @return    PHPExcel_Cell
      * @throws    PHPExcel_Exception
      */
-	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
-		if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
-			$this->_storeData();
+    public function addCacheData($pCoord, PHPExcel_Cell $cell)
+    {
+        if (($pCoord !== $this->currentObjectID) && ($this->currentObjectID !== null)) {
+            $this->storeData();
         }
 
-		$this->_currentObjectID = $pCoord;
-		$this->_currentObject = $cell;
-		$this->_currentCellIsDirty = true;
+        $this->currentObjectID = $pCoord;
+        $this->currentObject = $cell;
+        $this->currentCellIsDirty = true;
 
         return $cell;
-	}	//	function addCacheData()
+    }
 
 
     /**
@@ -81,37 +75,39 @@ class PHPExcel_CachedObjectStorage_MemoryGZip extends PHPExcel_CachedObjectStora
      * @throws     PHPExcel_Exception
      * @return     PHPExcel_Cell     Cell that was found, or null if not found
      */
-	public function getCacheData($pCoord) {
-		if ($pCoord === $this->_currentObjectID) {
-			return $this->_currentObject;
+    public function getCacheData($pCoord)
+    {
+        if ($pCoord === $this->currentObjectID) {
+            return $this->currentObject;
         }
-		$this->_storeData();
+        $this->storeData();
 
         //    Check if the entry that has been requested actually exists
-		if (!isset($this->_cellCache[$pCoord])) {
+        if (!isset($this->cellCache[$pCoord])) {
             //    Return null if requested entry doesn't exist in cache
             return null;
         }
 
         //    Set current entry to the requested entry
-		$this->_currentObjectID = $pCoord;
-		$this->_currentObject = unserialize(gzinflate($this->_cellCache[$pCoord]));
+        $this->currentObjectID = $pCoord;
+        $this->currentObject = unserialize(gzinflate($this->cellCache[$pCoord]));
         //    Re-attach this as the cell's parent
-        $this->_currentObject->attach($this);
+        $this->currentObject->attach($this);
 
         //    Return requested entry
-		return $this->_currentObject;
-	}	//	function getCacheData()
+        return $this->currentObject;
+    }
 
 
     /**
      * Get a list of all cell addresses currently held in cache
      *
-	 * @return  array of string
+     * @return  string[]
      */
-	public function getCellList() {
-		if ($this->_currentObjectID !== null) {
-			$this->_storeData();
+    public function getCellList()
+    {
+        if ($this->currentObjectID !== null) {
+            $this->storeData();
         }
 
         return parent::getCellList();
@@ -123,15 +119,15 @@ class PHPExcel_CachedObjectStorage_MemoryGZip extends PHPExcel_CachedObjectStora
      *
      * @return    void
      */
-	public function unsetWorksheetCells() {
-		if(!is_null($this->_currentObject)) {
-			$this->_currentObject->detach();
-			$this->_currentObject = $this->_currentObjectID = null;
+    public function unsetWorksheetCells()
+    {
+        if (!is_null($this->currentObject)) {
+            $this->currentObject->detach();
+            $this->currentObject = $this->currentObjectID = null;
         }
-		$this->_cellCache = array();
+        $this->cellCache = array();
 
         //    detach ourself from the worksheet, so that it can then delete this object successfully
-		$this->_parent = null;
-	}	//	function unsetWorksheetCells()
-
+        $this->parent = null;
+    }
 }

Classes/PHPExcel/CachedObjectStorage/MemorySerialized.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * PHPExcel
+ * PHPExcel_CachedObjectStorage_MemorySerialized
  *
- * Copyright (c) 2006 - 2013 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,21 +21,12 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-
-/**
- * PHPExcel_CachedObjectStorage_MemorySerialized
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_CachedObjectStorage_MemorySerialized extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache {
-
+class PHPExcel_CachedObjectStorage_MemorySerialized extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache
+{
     /**
      * Store cell data in cache for the current cell object if it's "dirty",
      *     and the 'nullify' the current cell object
@@ -42,37 +34,37 @@ class PHPExcel_CachedObjectStorage_MemorySerialized extends PHPExcel_CachedObjec
      * @return    void
      * @throws    PHPExcel_Exception
      */
-	protected function _storeData() {
-		if ($this->_currentCellIsDirty) {
-			$this->_currentObject->detach();
+    protected function storeData()
+    {
+        if ($this->currentCellIsDirty && !empty($this->currentObjectID)) {
+            $this->currentObject->detach();
 
-			$this->_cellCache[$this->_currentObjectID] = serialize($this->_currentObject);
-			$this->_currentCellIsDirty = false;
+            $this->cellCache[$this->currentObjectID] = serialize($this->currentObject);
+            $this->currentCellIsDirty = false;
+        }
+        $this->currentObjectID = $this->currentObject = null;
     }
-		$this->_currentObjectID = $this->_currentObject = null;
-	}	//	function _storeData()
-
 
     /**
      * Add or Update a cell in cache identified by coordinate address
      *
      * @param    string            $pCoord        Coordinate address of the cell to update
      * @param    PHPExcel_Cell    $cell        Cell to update
-	 * @return	void
+     * @return    PHPExcel_Cell
      * @throws    PHPExcel_Exception
      */
-	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
-		if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
-			$this->_storeData();
+    public function addCacheData($pCoord, PHPExcel_Cell $cell)
+    {
+        if (($pCoord !== $this->currentObjectID) && ($this->currentObjectID !== null)) {
+            $this->storeData();
         }
 
-		$this->_currentObjectID = $pCoord;
-		$this->_currentObject = $cell;
-		$this->_currentCellIsDirty = true;
+        $this->currentObjectID = $pCoord;
+        $this->currentObject = $cell;
+        $this->currentCellIsDirty = true;
 
         return $cell;
-	}	//	function addCacheData()
-
+    }
 
     /**
      * Get cell at a specific coordinate
@@ -81,57 +73,57 @@ class PHPExcel_CachedObjectStorage_MemorySerialized extends PHPExcel_CachedObjec
      * @throws     PHPExcel_Exception
      * @return     PHPExcel_Cell     Cell that was found, or null if not found
      */
-	public function getCacheData($pCoord) {
-		if ($pCoord === $this->_currentObjectID) {
-			return $this->_currentObject;
+    public function getCacheData($pCoord)
+    {
+        if ($pCoord === $this->currentObjectID) {
+            return $this->currentObject;
         }
-		$this->_storeData();
+        $this->storeData();
 
         //    Check if the entry that has been requested actually exists
-		if (!isset($this->_cellCache[$pCoord])) {
+        if (!isset($this->cellCache[$pCoord])) {
             //    Return null if requested entry doesn't exist in cache
             return null;
         }
 
         //    Set current entry to the requested entry
-		$this->_currentObjectID = $pCoord;
-		$this->_currentObject = unserialize($this->_cellCache[$pCoord]);
+        $this->currentObjectID = $pCoord;
+        $this->currentObject = unserialize($this->cellCache[$pCoord]);
         //    Re-attach this as the cell's parent
-        $this->_currentObject->attach($this);
+        $this->currentObject->attach($this);
 
         //    Return requested entry
-		return $this->_currentObject;
-	}	//	function getCacheData()
-
+        return $this->currentObject;
+    }
 
     /**
      * Get a list of all cell addresses currently held in cache
      *
-	 * @return  array of string
+     * @return  string[]
      */
-	public function getCellList() {
-		if ($this->_currentObjectID !== null) {
-			$this->_storeData();
+    public function getCellList()
+    {
+        if ($this->currentObjectID !== null) {
+            $this->storeData();
         }
 
         return parent::getCellList();
     }
 
-
     /**
      * Clear the cell collection and disconnect from our parent
      *
      * @return    void
      */
-	public function unsetWorksheetCells() {
-		if(!is_null($this->_currentObject)) {
-			$this->_currentObject->detach();
-			$this->_currentObject = $this->_currentObjectID = null;
+    public function unsetWorksheetCells()
+    {
+        if (!is_null($this->currentObject)) {
+            $this->currentObject->detach();
+            $this->currentObject = $this->currentObjectID = null;
         }
-		$this->_cellCache = array();
+        $this->cellCache = array();
 
         //    detach ourself from the worksheet, so that it can then delete this object successfully
-		$this->_parent = null;
-	}	//	function unsetWorksheetCells()
-
+        $this->parent = null;
+    }
 }

Classes/PHPExcel/CachedObjectStorage/PHPTemp.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * PHPExcel
+ * PHPExcel_CachedObjectStorage_PHPTemp
  *
- * Copyright (c) 2006 - 2013 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,34 +21,25 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-
-/**
- * PHPExcel_CachedObjectStorage_PHPTemp
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_CachedObjectStorage_PHPTemp extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache {
-
+class PHPExcel_CachedObjectStorage_PHPTemp extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache
+{
     /**
      * Name of the file for this cache
      *
      * @var string
      */
-	private $_fileHandle = null;
+    private $fileHandle = null;
 
     /**
      * Memory limit to use before reverting to file cache
      *
      * @var integer
      */
-	private $_memoryCacheSize = null;
+    private $memoryCacheSize = null;
 
     /**
      * Store cell data in cache for the current cell object if it's "dirty",
@@ -56,20 +48,21 @@ class PHPExcel_CachedObjectStorage_PHPTemp extends PHPExcel_CachedObjectStorage_
      * @return    void
      * @throws    PHPExcel_Exception
      */
-	protected function _storeData() {
-		if ($this->_currentCellIsDirty) {
-			$this->_currentObject->detach();
+    protected function storeData()
+    {
+        if ($this->currentCellIsDirty && !empty($this->currentObjectID)) {
+            $this->currentObject->detach();
 
-			fseek($this->_fileHandle,0,SEEK_END);
-			$offset = ftell($this->_fileHandle);
-			fwrite($this->_fileHandle, serialize($this->_currentObject));
-			$this->_cellCache[$this->_currentObjectID]	= array('ptr' => $offset,
-																'sz'  => ftell($this->_fileHandle) - $offset
+            fseek($this->fileHandle, 0, SEEK_END);
+
+            $this->cellCache[$this->currentObjectID] = array(
+                'ptr' => ftell($this->fileHandle),
+                'sz'  => fwrite($this->fileHandle, serialize($this->currentObject))
             );
-			$this->_currentCellIsDirty = false;
+            $this->currentCellIsDirty = false;
+        }
+        $this->currentObjectID = $this->currentObject = null;
     }
-		$this->_currentObjectID = $this->_currentObject = null;
-	}	//	function _storeData()
 
 
     /**
@@ -77,20 +70,21 @@ class PHPExcel_CachedObjectStorage_PHPTemp extends PHPExcel_CachedObjectStorage_
      *
      * @param    string            $pCoord        Coordinate address of the cell to update
      * @param    PHPExcel_Cell    $cell        Cell to update
-	 * @return	void
+     * @return    PHPExcel_Cell
      * @throws    PHPExcel_Exception
      */
-	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
-		if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
-			$this->_storeData();
+    public function addCacheData($pCoord, PHPExcel_Cell $cell)
+    {
+        if (($pCoord !== $this->currentObjectID) && ($this->currentObjectID !== null)) {
+            $this->storeData();
         }
 
-		$this->_currentObjectID = $pCoord;
-		$this->_currentObject = $cell;
-		$this->_currentCellIsDirty = true;
+        $this->currentObjectID = $pCoord;
+        $this->currentObject = $cell;
+        $this->currentCellIsDirty = true;
 
         return $cell;
-	}	//	function addCacheData()
+    }
 
 
     /**
@@ -100,82 +94,82 @@ class PHPExcel_CachedObjectStorage_PHPTemp extends PHPExcel_CachedObjectStorage_
      * @throws     PHPExcel_Exception
      * @return     PHPExcel_Cell     Cell that was found, or null if not found
      */
-	public function getCacheData($pCoord) {
-		if ($pCoord === $this->_currentObjectID) {
-			return $this->_currentObject;
+    public function getCacheData($pCoord)
+    {
+        if ($pCoord === $this->currentObjectID) {
+            return $this->currentObject;
         }
-		$this->_storeData();
+        $this->storeData();
 
         //    Check if the entry that has been requested actually exists
-		if (!isset($this->_cellCache[$pCoord])) {
+        if (!isset($this->cellCache[$pCoord])) {
             //    Return null if requested entry doesn't exist in cache
             return null;
         }
 
         //    Set current entry to the requested entry
-		$this->_currentObjectID = $pCoord;
-		fseek($this->_fileHandle,$this->_cellCache[$pCoord]['ptr']);
-		$this->_currentObject = unserialize(fread($this->_fileHandle,$this->_cellCache[$pCoord]['sz']));
+        $this->currentObjectID = $pCoord;
+        fseek($this->fileHandle, $this->cellCache[$pCoord]['ptr']);
+        $this->currentObject = unserialize(fread($this->fileHandle, $this->cellCache[$pCoord]['sz']));
         //    Re-attach this as the cell's parent
-        $this->_currentObject->attach($this);
+        $this->currentObject->attach($this);
 
         //    Return requested entry
-		return $this->_currentObject;
-	}	//	function getCacheData()
-
+        return $this->currentObject;
+    }
 
     /**
      * Get a list of all cell addresses currently held in cache
      *
-	 * @return  array of string
+     * @return  string[]
      */
-	public function getCellList() {
-		if ($this->_currentObjectID !== null) {
-			$this->_storeData();
+    public function getCellList()
+    {
+        if ($this->currentObjectID !== null) {
+            $this->storeData();
         }
 
         return parent::getCellList();
     }
 
-
     /**
      * Clone the cell collection
      *
      * @param    PHPExcel_Worksheet    $parent        The new worksheet
      * @return    void
      */
-	public function copyCellCollection(PHPExcel_Worksheet $parent) {
+    public function copyCellCollection(PHPExcel_Worksheet $parent)
+    {
         parent::copyCellCollection($parent);
         //    Open a new stream for the cell cache data
-		$newFileHandle = fopen('php://temp/maxmemory:'.$this->_memoryCacheSize,'a+');
+        $newFileHandle = fopen('php://temp/maxmemory:' . $this->memoryCacheSize, 'a+');
         //    Copy the existing cell cache data to the new stream
-		fseek($this->_fileHandle,0);
-		while (!feof($this->_fileHandle)) {
-			fwrite($newFileHandle,fread($this->_fileHandle, 1024));
+        fseek($this->fileHandle, 0);
+        while (!feof($this->fileHandle)) {
+            fwrite($newFileHandle, fread($this->fileHandle, 1024));
+        }
+        $this->fileHandle = $newFileHandle;
     }
-		$this->_fileHandle = $newFileHandle;
-	}	//	function copyCellCollection()
-
 
     /**
      * Clear the cell collection and disconnect from our parent
      *
      * @return    void
      */
-	public function unsetWorksheetCells() {
-		if(!is_null($this->_currentObject)) {
-			$this->_currentObject->detach();
-			$this->_currentObject = $this->_currentObjectID = null;
+    public function unsetWorksheetCells()
+    {
+        if (!is_null($this->currentObject)) {
+            $this->currentObject->detach();
+            $this->currentObject = $this->currentObjectID = null;
         }
-		$this->_cellCache = array();
+        $this->cellCache = array();
 
         //    detach ourself from the worksheet, so that it can then delete this object successfully
-		$this->_parent = null;
+        $this->parent = null;
 
         //    Close down the php://temp file
         $this->__destruct();
-	}	//	function unsetWorksheetCells()
-
+    }
 
     /**
      * Initialise this new cell collection
@@ -183,24 +177,24 @@ class PHPExcel_CachedObjectStorage_PHPTemp extends PHPExcel_CachedObjectStorage_
      * @param    PHPExcel_Worksheet    $parent        The worksheet for this cell collection
      * @param    array of mixed        $arguments    Additional initialisation arguments
      */
-	public function __construct(PHPExcel_Worksheet $parent, $arguments) {
-		$this->_memoryCacheSize	= (isset($arguments['memoryCacheSize']))	? $arguments['memoryCacheSize']	: '1MB';
+    public function __construct(PHPExcel_Worksheet $parent, $arguments)
+    {
+        $this->memoryCacheSize = (isset($arguments['memoryCacheSize'])) ? $arguments['memoryCacheSize'] : '1MB';
 
         parent::__construct($parent);
-		if (is_null($this->_fileHandle)) {
-			$this->_fileHandle = fopen('php://temp/maxmemory:'.$this->_memoryCacheSize,'a+');
+        if (is_null($this->fileHandle)) {
+            $this->fileHandle = fopen('php://temp/maxmemory:' . $this->memoryCacheSize, 'a+');
+        }
     }
-	}	//	function __construct()
-
 
     /**
      * Destroy this cell collection
      */
-	public function __destruct() {
-		if (!is_null($this->_fileHandle)) {
-			fclose($this->_fileHandle);
+    public function __destruct()
+    {
+        if (!is_null($this->fileHandle)) {
+            fclose($this->fileHandle);
+        }
+        $this->fileHandle = null;
     }
-		$this->_fileHandle = null;
-	}	//	function __destruct()
-
 }

Classes/PHPExcel/CachedObjectStorage/SQLite.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * PHPExcel
+ * PHPExcel_CachedObjectStorage_SQLite
  *
- * Copyright (c) 2006 - 2013 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,34 +21,25 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-
-/**
- * PHPExcel_CachedObjectStorage_SQLite
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_CachedObjectStorage_SQLite extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache {
-
+class PHPExcel_CachedObjectStorage_SQLite extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache
+{
     /**
      * Database table name
      *
      * @var string
      */
-	private $_TableName = null;
+    private $TableName = null;
 
     /**
      * Database handle
      *
      * @var resource
      */
-	private $_DBHandle = null;
+    private $DBHandle = null;
 
     /**
      * Store cell data in cache for the current cell object if it's "dirty",
@@ -56,38 +48,39 @@ class PHPExcel_CachedObjectStorage_SQLite extends PHPExcel_CachedObjectStorage_C
      * @return    void
      * @throws    PHPExcel_Exception
      */
-	protected function _storeData() {
-		if ($this->_currentCellIsDirty) {
-			$this->_currentObject->detach();
+    protected function storeData()
+    {
+        if ($this->currentCellIsDirty && !empty($this->currentObjectID)) {
+            $this->currentObject->detach();
 
-			if (!$this->_DBHandle->queryExec("INSERT OR REPLACE INTO kvp_".$this->_TableName." VALUES('".$this->_currentObjectID."','".sqlite_escape_string(serialize($this->_currentObject))."')"))
-				throw new PHPExcel_Exception(sqlite_error_string($this->_DBHandle->lastError()));
-			$this->_currentCellIsDirty = false;
+            if (!$this->DBHandle->queryExec("INSERT OR REPLACE INTO kvp_".$this->TableName." VALUES('".$this->currentObjectID."','".sqlite_escape_string(serialize($this->currentObject))."')")) {
+                throw new PHPExcel_Exception(sqlite_error_string($this->DBHandle->lastError()));
+            }
+            $this->currentCellIsDirty = false;
+        }
+        $this->currentObjectID = $this->currentObject = null;
     }
-		$this->_currentObjectID = $this->_currentObject = null;
-	}	//	function _storeData()
-
 
     /**
      * Add or Update a cell in cache identified by coordinate address
      *
      * @param    string            $pCoord        Coordinate address of the cell to update
      * @param    PHPExcel_Cell    $cell        Cell to update
-	 * @return	void
+     * @return    PHPExcel_Cell
      * @throws    PHPExcel_Exception
      */
-	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
-		if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
-			$this->_storeData();
+    public function addCacheData($pCoord, PHPExcel_Cell $cell)
+    {
+        if (($pCoord !== $this->currentObjectID) && ($this->currentObjectID !== null)) {
+            $this->storeData();
         }
 
-		$this->_currentObjectID = $pCoord;
-		$this->_currentObject = $cell;
-		$this->_currentCellIsDirty = true;
+        $this->currentObjectID = $pCoord;
+        $this->currentObject = $cell;
+        $this->currentCellIsDirty = true;
 
         return $cell;
-	}	//	function addCacheData()
-
+    }
 
     /**
      * Get cell at a specific coordinate
@@ -96,33 +89,33 @@ class PHPExcel_CachedObjectStorage_SQLite extends PHPExcel_CachedObjectStorage_C
      * @throws     PHPExcel_Exception
      * @return     PHPExcel_Cell     Cell that was found, or null if not found
      */
-	public function getCacheData($pCoord) {
-		if ($pCoord === $this->_currentObjectID) {
-			return $this->_currentObject;
+    public function getCacheData($pCoord)
+    {
+        if ($pCoord === $this->currentObjectID) {
+            return $this->currentObject;
         }
-		$this->_storeData();
+        $this->storeData();
 
-		$query = "SELECT value FROM kvp_".$this->_TableName." WHERE id='".$pCoord."'";
-		$cellResultSet = $this->_DBHandle->query($query,SQLITE_ASSOC);
+        $query = "SELECT value FROM kvp_".$this->TableName." WHERE id='".$pCoord."'";
+        $cellResultSet = $this->DBHandle->query($query, SQLITE_ASSOC);
         if ($cellResultSet === false) {
-			throw new PHPExcel_Exception(sqlite_error_string($this->_DBHandle->lastError()));
+            throw new PHPExcel_Exception(sqlite_error_string($this->DBHandle->lastError()));
         } elseif ($cellResultSet->numRows() == 0) {
             //    Return null if requested entry doesn't exist in cache
             return null;
         }
 
         //    Set current entry to the requested entry
-		$this->_currentObjectID = $pCoord;
+        $this->currentObjectID = $pCoord;
 
         $cellResult = $cellResultSet->fetchSingle();
-		$this->_currentObject = unserialize($cellResult);
+        $this->currentObject = unserialize($cellResult);
         //    Re-attach this as the cell's parent
-        $this->_currentObject->attach($this);
+        $this->currentObject->attach($this);
 
         //    Return requested entry
-		return $this->_currentObject;
-	}	//	function getCacheData()
-
+        return $this->currentObject;
+    }
 
     /**
      * Is a value set for an indexed cell?
@@ -130,23 +123,23 @@ class PHPExcel_CachedObjectStorage_SQLite extends PHPExcel_CachedObjectStorage_C
      * @param    string        $pCoord        Coordinate address of the cell to check
      * @return    boolean
      */
-	public function isDataSet($pCoord) {
-		if ($pCoord === $this->_currentObjectID) {
+    public function isDataSet($pCoord)
+    {
+        if ($pCoord === $this->currentObjectID) {
             return true;
         }
 
         //    Check if the requested entry exists in the cache
-		$query = "SELECT id FROM kvp_".$this->_TableName." WHERE id='".$pCoord."'";
-		$cellResultSet = $this->_DBHandle->query($query,SQLITE_ASSOC);
+        $query = "SELECT id FROM kvp_".$this->TableName." WHERE id='".$pCoord."'";
+        $cellResultSet = $this->DBHandle->query($query, SQLITE_ASSOC);
         if ($cellResultSet === false) {
-			throw new PHPExcel_Exception(sqlite_error_string($this->_DBHandle->lastError()));
+            throw new PHPExcel_Exception(sqlite_error_string($this->DBHandle->lastError()));
         } elseif ($cellResultSet->numRows() == 0) {
             //    Return null if requested entry doesn't exist in cache
             return false;
         }
         return true;
-	}	//	function isDataSet()
-
+    }
 
     /**
      * Delete a cell in cache identified by coordinate address
@@ -154,20 +147,21 @@ class PHPExcel_CachedObjectStorage_SQLite extends PHPExcel_CachedObjectStorage_C
      * @param    string            $pCoord        Coordinate address of the cell to delete
      * @throws    PHPExcel_Exception
      */
-	public function deleteCacheData($pCoord) {
-		if ($pCoord === $this->_currentObjectID) {
-			$this->_currentObject->detach();
-			$this->_currentObjectID = $this->_currentObject = null;
+    public function deleteCacheData($pCoord)
+    {
+        if ($pCoord === $this->currentObjectID) {
+            $this->currentObject->detach();
+            $this->currentObjectID = $this->currentObject = null;
         }
 
         //    Check if the requested entry exists in the cache
-		$query = "DELETE FROM kvp_".$this->_TableName." WHERE id='".$pCoord."'";
-		if (!$this->_DBHandle->queryExec($query))
-			throw new PHPExcel_Exception(sqlite_error_string($this->_DBHandle->lastError()));
-
-		$this->_currentCellIsDirty = false;
-	}	//	function deleteCacheData()
+        $query = "DELETE FROM kvp_".$this->TableName." WHERE id='".$pCoord."'";
+        if (!$this->DBHandle->queryExec($query)) {
+            throw new PHPExcel_Exception(sqlite_error_string($this->DBHandle->lastError()));
+        }
 
+        $this->currentCellIsDirty = false;
+    }
 
     /**
      * Move a cell object from one address to another
@@ -176,39 +170,43 @@ class PHPExcel_CachedObjectStorage_SQLite extends PHPExcel_CachedObjectStorage_C
      * @param    string        $toAddress        Destination address of the cell to move
      * @return    boolean
      */
-	public function moveCell($fromAddress, $toAddress) {
-		if ($fromAddress === $this->_currentObjectID) {
-			$this->_currentObjectID = $toAddress;
+    public function moveCell($fromAddress, $toAddress)
+    {
+        if ($fromAddress === $this->currentObjectID) {
+            $this->currentObjectID = $toAddress;
         }
 
-		$query = "DELETE FROM kvp_".$this->_TableName." WHERE id='".$toAddress."'";
-		$result = $this->_DBHandle->exec($query);
-		if ($result === false)
-			throw new PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
+        $query = "DELETE FROM kvp_".$this->TableName." WHERE id='".$toAddress."'";
+        $result = $this->DBHandle->exec($query);
+        if ($result === false) {
+            throw new PHPExcel_Exception($this->DBHandle->lastErrorMsg());
+        }
 
-		$query = "UPDATE kvp_".$this->_TableName." SET id='".$toAddress."' WHERE id='".$fromAddress."'";
-		$result = $this->_DBHandle->exec($query);
-		if ($result === false)
-			throw new PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
-
-		return TRUE;
-	}	//	function moveCell()
+        $query = "UPDATE kvp_".$this->TableName." SET id='".$toAddress."' WHERE id='".$fromAddress."'";
+        $result = $this->DBHandle->exec($query);
+        if ($result === false) {
+            throw new PHPExcel_Exception($this->DBHandle->lastErrorMsg());
+        }
 
+        return true;
+    }
 
     /**
      * Get a list of all cell addresses currently held in cache
      *
-	 * @return	array of string
+     * @return    string[]
      */
-	public function getCellList() {
-		if ($this->_currentObjectID !== null) {
-			$this->_storeData();
+    public function getCellList()
+    {
+        if ($this->currentObjectID !== null) {
+            $this->storeData();
         }
 
-		$query = "SELECT id FROM kvp_".$this->_TableName;
-		$cellIdsResult = $this->_DBHandle->unbufferedQuery($query,SQLITE_ASSOC);
-		if ($cellIdsResult === false)
-			throw new PHPExcel_Exception(sqlite_error_string($this->_DBHandle->lastError()));
+        $query = "SELECT id FROM kvp_".$this->TableName;
+        $cellIdsResult = $this->DBHandle->unbufferedQuery($query, SQLITE_ASSOC);
+        if ($cellIdsResult === false) {
+            throw new PHPExcel_Exception(sqlite_error_string($this->DBHandle->lastError()));
+        }
 
         $cellKeys = array();
         foreach ($cellIdsResult as $row) {
@@ -216,8 +214,7 @@ class PHPExcel_CachedObjectStorage_SQLite extends PHPExcel_CachedObjectStorage_C
         }
 
         return $cellKeys;
-	}	//	function getCellList()
-
+    }
 
     /**
      * Clone the cell collection
@@ -225,69 +222,73 @@ class PHPExcel_CachedObjectStorage_SQLite extends PHPExcel_CachedObjectStorage_C
      * @param    PHPExcel_Worksheet    $parent        The new worksheet
      * @return    void
      */
-	public function copyCellCollection(PHPExcel_Worksheet $parent) {
-		$this->_currentCellIsDirty;
-        $this->_storeData();
+    public function copyCellCollection(PHPExcel_Worksheet $parent)
+    {
+        $this->currentCellIsDirty;
+        $this->storeData();
 
         //    Get a new id for the new table name
-		$tableName = str_replace('.','_',$this->_getUniqueID());
-		if (!$this->_DBHandle->queryExec('CREATE TABLE kvp_'.$tableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)
-													AS SELECT * FROM kvp_'.$this->_TableName))
-			throw new PHPExcel_Exception(sqlite_error_string($this->_DBHandle->lastError()));
+        $tableName = str_replace('.', '_', $this->getUniqueID());
+        if (!$this->DBHandle->queryExec('CREATE TABLE kvp_'.$tableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)
+            AS SELECT * FROM kvp_'.$this->TableName)
+        ) {
+            throw new PHPExcel_Exception(sqlite_error_string($this->DBHandle->lastError()));
+        }
 
         //    Copy the existing cell cache file
-		$this->_TableName = $tableName;
-	}	//	function copyCellCollection()
-
+        $this->TableName = $tableName;
+    }
 
     /**
      * Clear the cell collection and disconnect from our parent
      *
      * @return    void
      */
-	public function unsetWorksheetCells() {
-		if(!is_null($this->_currentObject)) {
-			$this->_currentObject->detach();
-			$this->_currentObject = $this->_currentObjectID = null;
+    public function unsetWorksheetCells()
+    {
+        if (!is_null($this->currentObject)) {
+            $this->currentObject->detach();
+            $this->currentObject = $this->currentObjectID = null;
         }
         //    detach ourself from the worksheet, so that it can then delete this object successfully
-		$this->_parent = null;
+        $this->parent = null;
 
         //    Close down the temporary cache file
         $this->__destruct();
-	}	//	function unsetWorksheetCells()
-
+    }
 
     /**
      * Initialise this new cell collection
      *
      * @param    PHPExcel_Worksheet    $parent        The worksheet for this cell collection
      */
-	public function __construct(PHPExcel_Worksheet $parent) {
+    public function __construct(PHPExcel_Worksheet $parent)
+    {
         parent::__construct($parent);
-		if (is_null($this->_DBHandle)) {
-			$this->_TableName = str_replace('.','_',$this->_getUniqueID());
+        if (is_null($this->DBHandle)) {
+            $this->TableName = str_replace('.', '_', $this->getUniqueID());
             $_DBName = ':memory:';
 
-			$this->_DBHandle = new SQLiteDatabase($_DBName);
-			if ($this->_DBHandle === false)
-				throw new PHPExcel_Exception(sqlite_error_string($this->_DBHandle->lastError()));
-			if (!$this->_DBHandle->queryExec('CREATE TABLE kvp_'.$this->_TableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)'))
-				throw new PHPExcel_Exception(sqlite_error_string($this->_DBHandle->lastError()));
+            $this->DBHandle = new SQLiteDatabase($_DBName);
+            if ($this->DBHandle === false) {
+                throw new PHPExcel_Exception(sqlite_error_string($this->DBHandle->lastError()));
+            }
+            if (!$this->DBHandle->queryExec('CREATE TABLE kvp_'.$this->TableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)')) {
+                throw new PHPExcel_Exception(sqlite_error_string($this->DBHandle->lastError()));
+            }
+        }
     }
-	}	//	function __construct()
-
 
     /**
      * Destroy this cell collection
      */
-	public function __destruct() {
-		if (!is_null($this->_DBHandle)) {
-			$this->_DBHandle->queryExec('DROP TABLE kvp_'.$this->_TableName);
+    public function __destruct()
+    {
+        if (!is_null($this->DBHandle)) {
+            $this->DBHandle->queryExec('DROP TABLE kvp_'.$this->TableName);
+        }
+        $this->DBHandle = null;
     }
-		$this->_DBHandle = null;
-	}	//	function __destruct()
-
 
     /**
      * Identify whether the caching method is currently available
@@ -295,12 +296,12 @@ class PHPExcel_CachedObjectStorage_SQLite extends PHPExcel_CachedObjectStorage_C
      *
      * @return    boolean
      */
-	public static function cacheMethodIsAvailable() {
+    public static function cacheMethodIsAvailable()
+    {
         if (!function_exists('sqlite_open')) {
             return false;
         }
 
         return true;
     }
-
 }

Classes/PHPExcel/CachedObjectStorage/SQLite3.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * PHPExcel
+ * PHPExcel_CachedObjectStorage_SQLite3
  *
- * Copyright (c) 2006 - 2013 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,62 +21,53 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-
-/**
- * PHPExcel_CachedObjectStorage_SQLite3
- *
- * @category   PHPExcel
- * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_CachedObjectStorage_SQLite3 extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache {
-
+class PHPExcel_CachedObjectStorage_SQLite3 extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache
+{
     /**
      * Database table name
      *
      * @var string
      */
-	private $_TableName = null;
+    private $TableName = null;
 
     /**
      * Database handle
      *
      * @var resource
      */
-	private $_DBHandle = null;
+    private $DBHandle = null;
 
     /**
      * Prepared statement for a SQLite3 select query
      *
      * @var SQLite3Stmt
      */
-	private $_selectQuery;
+    private $selectQuery;
 
     /**
      * Prepared statement for a SQLite3 insert query
      *
      * @var SQLite3Stmt
      */
-	private $_insertQuery;
+    private $insertQuery;
 
     /**
      * Prepared statement for a SQLite3 update query
      *
      * @var SQLite3Stmt
      */
-	private $_updateQuery;
+    private $updateQuery;
 
     /**
      * Prepared statement for a SQLite3 delete query
      *
      * @var SQLite3Stmt
      */
-	private $_deleteQuery;
+    private $deleteQuery;
 
     /**
      * Store cell data in cache for the current cell object if it's "dirty",
@@ -84,41 +76,42 @@ class PHPExcel_CachedObjectStorage_SQLite3 extends PHPExcel_CachedObjectStorage_
      * @return    void
      * @throws    PHPExcel_Exception
      */
-	protected function _storeData() {
-		if ($this->_currentCellIsDirty) {
-			$this->_currentObject->detach();
+    protected function storeData()
+    {
+        if ($this->currentCellIsDirty && !empty($this->currentObjectID)) {
+            $this->currentObject->detach();
 
-			$this->_insertQuery->bindValue('id',$this->_currentObjectID,SQLITE3_TEXT);
-			$this->_insertQuery->bindValue('data',serialize($this->_currentObject),SQLITE3_BLOB);
-			$result = $this->_insertQuery->execute();
-			if ($result === false)
-				throw new PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
-			$this->_currentCellIsDirty = false;
+            $this->insertQuery->bindValue('id', $this->currentObjectID, SQLITE3_TEXT);
+            $this->insertQuery->bindValue('data', serialize($this->currentObject), SQLITE3_BLOB);
+            $result = $this->insertQuery->execute();
+            if ($result === false) {
+                throw new PHPExcel_Exception($this->DBHandle->lastErrorMsg());
+            }
+            $this->currentCellIsDirty = false;
+        }
+        $this->currentObjectID = $this->currentObject = null;
     }
-		$this->_currentObjectID = $this->_currentObject = null;
-	}	//	function _storeData()
-
 
     /**
      * Add or Update a cell in cache identified by coordinate address
      *
      * @param    string            $pCoord        Coordinate address of the cell to update
      * @param    PHPExcel_Cell    $cell        Cell to update
-	 * @return	void
+     * @return    PHPExcel_Cell
      * @throws    PHPExcel_Exception
      */
-	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
-		if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
-			$this->_storeData();
+    public function addCacheData($pCoord, PHPExcel_Cell $cell)
+    {
+        if (($pCoord !== $this->currentObjectID) && ($this->currentObjectID !== null)) {
+            $this->storeData();
         }
 
-		$this->_currentObjectID = $pCoord;
-		$this->_currentObject = $cell;
-		$this->_currentCellIsDirty = true;
+        $this->currentObjectID = $pCoord;
+        $this->currentObject = $cell;
+        $this->currentCellIsDirty = true;
 
         return $cell;
-	}	//	function addCacheData()
-
+    }
 
     /**
      * Get cell at a specific coordinate
@@ -127,34 +120,34 @@ class PHPExcel_CachedObjectStorage_SQLite3 extends PHPExcel_CachedObjectStorage_
      * @throws     PHPExcel_Exception
      * @return     PHPExcel_Cell     Cell that was found, or null if not found
      */
-	public function getCacheData($pCoord) {
-		if ($pCoord === $this->_currentObjectID) {
-			return $this->_currentObject;
+    public function getCacheData($pCoord)
+    {
+        if ($pCoord === $this->currentObjectID) {
+            return $this->currentObject;
         }
-		$this->_storeData();
+        $this->storeData();
 
-		$this->_selectQuery->bindValue('id',$pCoord,SQLITE3_TEXT);
-		$cellResult = $this->_selectQuery->execute();
-		if ($cellResult === FALSE) {
-			throw new PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
+        $this->selectQuery->bindValue('id', $pCoord, SQLITE3_TEXT);
+        $cellResult = $this->selectQuery->execute();
+        if ($cellResult === false) {
+            throw new PHPExcel_Exception($this->DBHandle->lastErrorMsg());
         }
         $cellData = $cellResult->fetchArray(SQLITE3_ASSOC);
-		if ($cellData === FALSE) {
+        if ($cellData === false) {
             //    Return null if requested entry doesn't exist in cache
-			return NULL;
+            return null;
         }
 
         //    Set current entry to the requested entry
-		$this->_currentObjectID = $pCoord;
+        $this->currentObjectID = $pCoord;
 
-		$this->_currentObject = unserialize($cellData['value']);
+        $this->currentObject = unserialize($cellData['value']);
         //    Re-attach this as the cell's parent
-        $this->_currentObject->attach($this);
+        $this->currentObject->attach($this);
 
         //    Return requested entry
-		return $this->_currentObject;
-	}	//	function getCacheData()
-
+        return $this->currentObject;
+    }
 
     /**
      *    Is a value set for an indexed cell?
@@ -162,22 +155,22 @@ class PHPExcel_CachedObjectStorage_SQLite3 extends PHPExcel_CachedObjectStorage_
      * @param    string        $pCoord        Coordinate address of the cell to check
      * @return    boolean
      */
-	public function isDataSet($pCoord) {
-		if ($pCoord === $this->_currentObjectID) {
-			return TRUE;
+    public function isDataSet($pCoord)
+    {
+        if ($pCoord === $this->currentObjectID) {
+            return true;
         }
 
         //    Check if the requested entry exists in the cache
-		$this->_selectQuery->bindValue('id',$pCoord,SQLITE3_TEXT);
-		$cellResult = $this->_selectQuery->execute();
-		if ($cellResult === FALSE) {
-			throw new PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
+        $this->selectQuery->bindValue('id', $pCoord, SQLITE3_TEXT);
+        $cellResult = $this->selectQuery->execute();
+        if ($cellResult === false) {
+            throw new PHPExcel_Exception($this->DBHandle->lastErrorMsg());
         }
         $cellData = $cellResult->fetchArray(SQLITE3_ASSOC);
 
-		return ($cellData === FALSE) ? FALSE : TRUE;
-	}	//	function isDataSet()
-
+        return ($cellData === false) ? false : true;
+    }
 
     /**
      *    Delete a cell in cache identified by coordinate address
@@ -185,21 +178,22 @@ class PHPExcel_CachedObjectStorage_SQLite3 extends PHPExcel_CachedObjectStorage_
      * @param    string            $pCoord        Coordinate address of the cell to delete
      * @throws    PHPExcel_Exception
      */
-	public function deleteCacheData($pCoord) {
-		if ($pCoord === $this->_currentObjectID) {
-			$this->_currentObject->detach();
-			$this->_currentObjectID = $this->_currentObject = NULL;
+    public function deleteCacheData($pCoord)
+    {
+        if ($pCoord === $this->currentObjectID) {
+            $this->currentObject->detach();
+            $this->currentObjectID = $this->currentObject = null;
         }
 
         //    Check if the requested entry exists in the cache
-		$this->_deleteQuery->bindValue('id',$pCoord,SQLITE3_TEXT);
-		$result = $this->_deleteQuery->execute();
-		if ($result === FALSE)
-			throw new PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
-
-		$this->_currentCellIsDirty = FALSE;
-	}	//	function deleteCacheData()
+        $this->deleteQuery->bindValue('id', $pCoord, SQLITE3_TEXT);
+        $result = $this->deleteQuery->execute();
+        if ($result === false) {
+            throw new PHPExcel_Exception($this->DBHandle->lastErrorMsg());
+        }
 
+        $this->currentCellIsDirty = false;
+    }
 
     /**
      * Move a cell object from one address to another
@@ -208,40 +202,44 @@ class PHPExcel_CachedObjectStorage_SQLite3 extends PHPExcel_CachedObjectStorage_
      * @param    string        $toAddress        Destination address of the cell to move
      * @return    boolean
      */
-	public function moveCell($fromAddress, $toAddress) {
-		if ($fromAddress === $this->_currentObjectID) {
-			$this->_currentObjectID = $toAddress;
+    public function moveCell($fromAddress, $toAddress)
+    {
+        if ($fromAddress === $this->currentObjectID) {
+            $this->currentObjectID = $toAddress;
         }
 
-		$this->_deleteQuery->bindValue('id',$toAddress,SQLITE3_TEXT);
-		$result = $this->_deleteQuery->execute();
-		if ($result === false)
-			throw new PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
+        $this->deleteQuery->bindValue('id', $toAddress, SQLITE3_TEXT);
+        $result = $this->deleteQuery->execute();
+        if ($result === false) {
+            throw new PHPExcel_Exception($this->DBHandle->lastErrorMsg());
+        }
 
-		$this->_updateQuery->bindValue('toid',$toAddress,SQLITE3_TEXT);
-		$this->_updateQuery->bindValue('fromid',$fromAddress,SQLITE3_TEXT);
-		$result = $this->_updateQuery->execute();
-		if ($result === false)
-			throw new PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
-
-		return TRUE;
-	}	//	function moveCell()
+        $this->updateQuery->bindValue('toid', $toAddress, SQLITE3_TEXT);
+        $this->updateQuery->bindValue('fromid', $fromAddress, SQLITE3_TEXT);
+        $result = $this->updateQuery->execute();
+        if ($result === false) {
+            throw new PHPExcel_Exception($this->DBHandle->lastErrorMsg());
+        }
 
+        return true;
+    }
 
     /**
      * Get a list of all cell addresses currently held in cache
      *
-	 * @return	array of string
+     * @return    string[]
      */
-	public function getCellList() {
-		if ($this->_currentObjectID !== null) {
-			$this->_storeData();
+    public function getCellList()
+    {
+        if ($this->currentObjectID !== null) {
+            $this->storeData();
         }
 
-		$query = "SELECT id FROM kvp_".$this->_TableName;
-		$cellIdsResult = $this->_DBHandle->query($query);
-		if ($cellIdsResult === false)
-			throw new PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
+        $query = "SELECT id FROM kvp_".$this->TableName;
+        $cellIdsResult = $this->DBHandle->query($query);
+        if ($cellIdsResult === false) {
+            throw new PHPExcel_Exception($this->DBHandle->lastErrorMsg());
+        }
 
         $cellKeys = array();
         while ($row = $cellIdsResult->fetchArray(SQLITE3_ASSOC)) {
@@ -249,8 +247,7 @@ class PHPExcel_CachedObjectStorage_SQLite3 extends PHPExcel_CachedObjectStorage_
         }
 
         return $cellKeys;
-	}	//	function getCellList()
-
+    }
 
     /**
      * Clone the cell collection
@@ -258,75 +255,79 @@ class PHPExcel_CachedObjectStorage_SQLite3 extends PHPExcel_CachedObjectStorage_
      * @param    PHPExcel_Worksheet    $parent        The new worksheet
      * @return    void
      */
-	public function copyCellCollection(PHPExcel_Worksheet $parent) {
-		$this->_currentCellIsDirty;
-        $this->_storeData();
+    public function copyCellCollection(PHPExcel_Worksheet $parent)
+    {
+        $this->currentCellIsDirty;
+        $this->storeData();
 
         //    Get a new id for the new table name
-		$tableName = str_replace('.','_',$this->_getUniqueID());
-		if (!$this->_DBHandle->exec('CREATE TABLE kvp_'.$tableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)
-		                                       AS SELECT * FROM kvp_'.$this->_TableName))
-			throw new PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
+        $tableName = str_replace('.', '_', $this->getUniqueID());
+        if (!$this->DBHandle->exec('CREATE TABLE kvp_'.$tableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)
+            AS SELECT * FROM kvp_'.$this->TableName)
+        ) {
+            throw new PHPExcel_Exception($this->DBHandle->lastErrorMsg());
+        }
 
         //    Copy the existing cell cache file
-		$this->_TableName = $tableName;
-	}	//	function copyCellCollection()
-
+        $this->TableName = $tableName;
+    }
 
     /**
      * Clear the cell collection and disconnect from our parent
      *
      * @return    void
      */
-	public function unsetWorksheetCells() {
-		if(!is_null($this->_currentObject)) {
-			$this->_currentObject->detach();
-			$this->_currentObject = $this->_currentObjectID = null;
+    public function unsetWorksheetCells()
+    {
+        if (!is_null($this->currentObject)) {
+            $this->currentObject->detach();
+            $this->currentObject = $this->currentObjectID = null;
         }
         //    detach ourself from the worksheet, so that it can then delete this object successfully
-		$this->_parent = null;
+        $this->parent = null;
 
         //    Close down the temporary cache file
         $this->__destruct();
-	}	//	function unsetWorksheetCells()
-
+    }
 
     /**
      * Initialise this new cell collection
      *
      * @param    PHPExcel_Worksheet    $parent        The worksheet for this cell collection
      */
-	public function __construct(PHPExcel_Worksheet $parent) {
+    public function __construct(PHPExcel_Worksheet $parent)
+    {
         parent::__construct($parent);
-		if (is_null($this->_DBHandle)) {
-			$this->_TableName = str_replace('.','_',$this->_getUniqueID());
+        if (is_null($this->DBHandle)) {
+            $this->TableName = str_replace('.', '_', $this->getUniqueID());
             $_DBName = ':memory:';
 
-			$this->_DBHandle = new SQLite3($_DBName);
-			if ($this->_DBHandle === false)
-				throw new PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
-			if (!$this->_DBHandle->exec('CREATE TABLE kvp_'.$this->_TableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)'))
-				throw new PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
+            $this->DBHandle = new SQLite3($_DBName);
+            if ($this->DBHandle === false) {
+                throw new PHPExcel_Exception($this->DBHandle->lastErrorMsg());
+            }
+            if (!$this->DBHandle->exec('CREATE TABLE kvp_'.$this->TableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)')) {
+                throw new PHPExcel_Exception($this->DBHandle->lastErrorMsg());
+            }
         }
 
-		$this->_selectQuery = $this->_DBHandle->prepare("SELECT value FROM kvp_".$this->_TableName." WHERE id = :id");
-		$this->_insertQuery = $this->_DBHandle->prepare("INSERT OR REPLACE INTO kvp_".$this->_TableName." VALUES(:id,:data)");
-		$this->_updateQuery = $this->_DBHandle->prepare("UPDATE kvp_".$this->_TableName." SET id=:toId WHERE id=:fromId");
-		$this->_deleteQuery = $this->_DBHandle->prepare("DELETE FROM kvp_".$this->_TableName." WHERE id = :id");
-	}	//	function __construct()
-
+        $this->selectQuery = $this->DBHandle->prepare("SELECT value FROM kvp_".$this->TableName." WHERE id = :id");
+        $this->insertQuery = $this->DBHandle->prepare("INSERT OR REPLACE INTO kvp_".$this->TableName." VALUES(:id,:data)");
+        $this->updateQuery = $this->DBHandle->prepare("UPDATE kvp_".$this->TableName." SET id=:toId WHERE id=:fromId");
+        $this->deleteQuery = $this->DBHandle->prepare("DELETE FROM kvp_".$this->TableName." WHERE id = :id");
+    }
 
     /**
      * Destroy this cell collection
      */
-	public function __destruct() {
-		if (!is_null($this->_DBHandle)) {
-			$this->_DBHandle->exec('DROP TABLE kvp_'.$this->_TableName);
-			$this->_DBHandle->close();
+    public function __destruct()
+    {
+        if (!is_null($this->DBHandle)) {
+            $this->DBHandle->exec('DROP TABLE kvp_'.$this->TableName);
+            $this->DBHandle->close();
+        }
+        $this->DBHandle = null;
     }
-		$this->_DBHandle = null;
-	}	//	function __destruct()
-
 
     /**
      * Identify whether the caching method is currently available
@@ -334,12 +335,12 @@ class PHPExcel_CachedObjectStorage_SQLite3 extends PHPExcel_CachedObjectStorage_
      *
      * @return    boolean
      */
-	public static function cacheMethodIsAvailable() {
-		if (!class_exists('SQLite3',FALSE)) {
+    public static function cacheMethodIsAvailable()
+    {
+        if (!class_exists('SQLite3', false)) {
             return false;
         }
 
         return true;
     }
-
 }

Classes/PHPExcel/CachedObjectStorage/Wincache.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * PHPExcel
+ * PHPExcel_CachedObjectStorage_Wincache
  *
- * Copyright (c) 2006 - 2013 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,34 +21,25 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-
-/**
- * PHPExcel_CachedObjectStorage_Wincache
- *
- * @category   PHPExcel
- * @package	PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_CachedObjectStorage_Wincache extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache {
-
+class PHPExcel_CachedObjectStorage_Wincache extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache
+{
     /**
      * Prefix used to uniquely identify cache data for this worksheet
      *
      * @var string
      */
-	private $_cachePrefix = null;
+    private $cachePrefix = null;
 
     /**
      * Cache timeout
      *
      * @var integer
      */
-	private $_cacheTime = 600;
+    private $cacheTime = 600;
 
 
     /**
@@ -57,50 +49,50 @@ class PHPExcel_CachedObjectStorage_Wincache extends PHPExcel_CachedObjectStorage
      * @return    void
      * @throws    PHPExcel_Exception
      */
-	protected function _storeData() {
-		if ($this->_currentCellIsDirty) {
-			$this->_currentObject->detach();
+    protected function storeData()
+    {
+        if ($this->currentCellIsDirty && !empty($this->currentObjectID)) {
+            $this->currentObject->detach();
 
-			$obj = serialize($this->_currentObject);
-			if (wincache_ucache_exists($this->_cachePrefix.$this->_currentObjectID.'.cache')) {
-				if (!wincache_ucache_set($this->_cachePrefix.$this->_currentObjectID.'.cache', $obj, $this->_cacheTime)) {
+            $obj = serialize($this->currentObject);
+            if (wincache_ucache_exists($this->cachePrefix.$this->currentObjectID.'.cache')) {
+                if (!wincache_ucache_set($this->cachePrefix.$this->currentObjectID.'.cache', $obj, $this->cacheTime)) {
                     $this->__destruct();
-					throw new PHPExcel_Exception('Failed to store cell '.$this->_currentObjectID.' in WinCache');
+                    throw new PHPExcel_Exception('Failed to store cell '.$this->currentObjectID.' in WinCache');
                 }
             } else {
-				if (!wincache_ucache_add($this->_cachePrefix.$this->_currentObjectID.'.cache', $obj, $this->_cacheTime)) {
+                if (!wincache_ucache_add($this->cachePrefix.$this->currentObjectID.'.cache', $obj, $this->cacheTime)) {
                     $this->__destruct();
-					throw new PHPExcel_Exception('Failed to store cell '.$this->_currentObjectID.' in WinCache');
+                    throw new PHPExcel_Exception('Failed to store cell '.$this->currentObjectID.' in WinCache');
                 }
             }
-			$this->_currentCellIsDirty = false;
+            $this->currentCellIsDirty = false;
         }
 
-		$this->_currentObjectID = $this->_currentObject = null;
-	}	//	function _storeData()
-
+        $this->currentObjectID = $this->currentObject = null;
+    }
 
     /**
      * Add or Update a cell in cache identified by coordinate address
      *
      * @param    string            $pCoord        Coordinate address of the cell to update
      * @param    PHPExcel_Cell    $cell        Cell to update
-	 * @return	void
+     * @return    PHPExcel_Cell
      * @throws    PHPExcel_Exception
      */
-	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
-		if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
-			$this->_storeData();
+    public function addCacheData($pCoord, PHPExcel_Cell $cell)
+    {
+        if (($pCoord !== $this->currentObjectID) && ($this->currentObjectID !== null)) {
+            $this->storeData();
         }
-		$this->_cellCache[$pCoord] = true;
+        $this->cellCache[$pCoord] = true;
 
-		$this->_currentObjectID = $pCoord;
-		$this->_currentObject = $cell;
-		$this->_currentCellIsDirty = true;
+        $this->currentObjectID = $pCoord;
+        $this->currentObject = $cell;
+        $this->currentCellIsDirty = true;
 
         return $cell;
-	}	//	function addCacheData()
-
+    }
 
     /**
      * Is a value set in the current PHPExcel_CachedObjectStorage_ICache for an indexed cell?
@@ -108,14 +100,15 @@ class PHPExcel_CachedObjectStorage_Wincache extends PHPExcel_CachedObjectStorage
      * @param    string        $pCoord        Coordinate address of the cell to check
      * @return    boolean
      */
-	public function isDataSet($pCoord) {
+    public function isDataSet($pCoord)
+    {
         //    Check if the requested entry is the current object, or exists in the cache
         if (parent::isDataSet($pCoord)) {
-			if ($this->_currentObjectID == $pCoord) {
+            if ($this->currentObjectID == $pCoord) {
                 return true;
             }
             //    Check if the requested entry still exists in cache
-			$success = wincache_ucache_exists($this->_cachePrefix.$pCoord.'.cache');
+            $success = wincache_ucache_exists($this->cachePrefix.$pCoord.'.cache');
             if ($success === false) {
                 //    Entry no longer exists in Wincache, so clear it from the cache array
                 parent::deleteCacheData($pCoord);
@@ -124,7 +117,7 @@ class PHPExcel_CachedObjectStorage_Wincache extends PHPExcel_CachedObjectStorage
             return true;
         }
         return false;
-	}	//	function isDataSet()
+    }
 
 
     /**
@@ -134,17 +127,18 @@ class PHPExcel_CachedObjectStorage_Wincache extends PHPExcel_CachedObjectStorage
      * @throws    PHPExcel_Exception
      * @return    PHPExcel_Cell    Cell that was found, or null if not found
      */
-	public function getCacheData($pCoord) {
-		if ($pCoord === $this->_currentObjectID) {
-			return $this->_currentObject;
+    public function getCacheData($pCoord)
+    {
+        if ($pCoord === $this->currentObjectID) {
+            return $this->currentObject;
         }
-		$this->_storeData();
+        $this->storeData();
 
         //    Check if the entry that has been requested actually exists
         $obj = null;
         if (parent::isDataSet($pCoord)) {
             $success = false;
-			$obj = wincache_ucache_get($this->_cachePrefix.$pCoord.'.cache', $success);
+            $obj = wincache_ucache_get($this->cachePrefix.$pCoord.'.cache', $success);
             if ($success === false) {
                 //    Entry no longer exists in WinCache, so clear it from the cache array
                 parent::deleteCacheData($pCoord);
@@ -156,44 +150,44 @@ class PHPExcel_CachedObjectStorage_Wincache extends PHPExcel_CachedObjectStorage
         }
 
         //    Set current entry to the requested entry
-		$this->_currentObjectID = $pCoord;
-		$this->_currentObject = unserialize($obj);
+        $this->currentObjectID = $pCoord;
+        $this->currentObject = unserialize($obj);
         //    Re-attach this as the cell's parent
-        $this->_currentObject->attach($this);
+        $this->currentObject->attach($this);
 
         //    Return requested entry
-		return $this->_currentObject;
-	}	//	function getCacheData()
+        return $this->currentObject;
+    }
 
 
     /**
      * Get a list of all cell addresses currently held in cache
      *
-	 * @return  array of string
+     * @return  string[]
      */
-	public function getCellList() {
-		if ($this->_currentObjectID !== null) {
-			$this->_storeData();
+    public function getCellList()
+    {
+        if ($this->currentObjectID !== null) {
+            $this->storeData();
         }
 
         return parent::getCellList();
     }
 
-
     /**
      * Delete a cell in cache identified by coordinate address
      *
      * @param    string            $pCoord        Coordinate address of the cell to delete
      * @throws    PHPExcel_Exception
      */
-	public function deleteCacheData($pCoord) {
+    public function deleteCacheData($pCoord)
+    {
         //    Delete the entry from Wincache
-		wincache_ucache_delete($this->_cachePrefix.$pCoord.'.cache');
+        wincache_ucache_delete($this->cachePrefix.$pCoord.'.cache');
 
         //    Delete the entry from our cell address array
         parent::deleteCacheData($pCoord);
-	}	//	function deleteCacheData()
-
+    }
 
     /**
      * Clone the cell collection
@@ -201,29 +195,30 @@ class PHPExcel_CachedObjectStorage_Wincache extends PHPExcel_CachedObjectStorage
      * @param    PHPExcel_Worksheet    $parent        The new worksheet
      * @return    void
      */
-	public function copyCellCollection(PHPExcel_Worksheet $parent) {
+    public function copyCellCollection(PHPExcel_Worksheet $parent)
+    {
         parent::copyCellCollection($parent);
         //    Get a new id for the new file name
-		$baseUnique = $this->_getUniqueID();
+        $baseUnique = $this->getUniqueID();
         $newCachePrefix = substr(md5($baseUnique), 0, 8) . '.';
         $cacheList = $this->getCellList();
         foreach ($cacheList as $cellID) {
-			if ($cellID != $this->_currentObjectID) {
+            if ($cellID != $this->currentObjectID) {
                 $success = false;
-				$obj = wincache_ucache_get($this->_cachePrefix.$cellID.'.cache', $success);
+                $obj = wincache_ucache_get($this->cachePrefix.$cellID.'.cache', $success);
                 if ($success === false) {
                     //    Entry no longer exists in WinCache, so clear it from the cache array
                     parent::deleteCacheData($cellID);
                     throw new PHPExcel_Exception('Cell entry '.$cellID.' no longer exists in Wincache');
                 }
-				if (!wincache_ucache_add($newCachePrefix.$cellID.'.cache', $obj, $this->_cacheTime)) {
+                if (!wincache_ucache_add($newCachePrefix.$cellID.'.cache', $obj, $this->cacheTime)) {
                     $this->__destruct();
                     throw new PHPExcel_Exception('Failed to store cell '.$cellID.' in Wincache');
                 }
             }
         }
-		$this->_cachePrefix = $newCachePrefix;
-	}	//	function copyCellCollection()
+        $this->cachePrefix = $newCachePrefix;
+    }
 
 
     /**
@@ -231,21 +226,21 @@ class PHPExcel_CachedObjectStorage_Wincache extends PHPExcel_CachedObjectStorage
      *
      * @return    void
      */
-	public function unsetWorksheetCells() {
-		if(!is_null($this->_currentObject)) {
-			$this->_currentObject->detach();
-			$this->_currentObject = $this->_currentObjectID = null;
+    public function unsetWorksheetCells()
+    {
+        if (!is_null($this->currentObject)) {
+            $this->currentObject->detach();
+            $this->currentObject = $this->currentObjectID = null;
         }
 
         //    Flush the WinCache cache
         $this->__destruct();
 
-		$this->_cellCache = array();
+        $this->cellCache = array();
 
         //    detach ourself from the worksheet, so that it can then delete this object successfully
-		$this->_parent = null;
-	}	//	function unsetWorksheetCells()
-
+        $this->parent = null;
+    }
 
     /**
      * Initialise this new cell collection
@@ -253,29 +248,29 @@ class PHPExcel_CachedObjectStorage_Wincache extends PHPExcel_CachedObjectStorage
      * @param    PHPExcel_Worksheet    $parent        The worksheet for this cell collection
      * @param    array of mixed        $arguments    Additional initialisation arguments
      */
-	public function __construct(PHPExcel_Worksheet $parent, $arguments) {
+    public function __construct(PHPExcel_Worksheet $parent, $arguments)
+    {
         $cacheTime    = (isset($arguments['cacheTime']))    ? $arguments['cacheTime']    : 600;
 
-		if (is_null($this->_cachePrefix)) {
-			$baseUnique = $this->_getUniqueID();
-			$this->_cachePrefix = substr(md5($baseUnique),0,8).'.';
-			$this->_cacheTime = $cacheTime;
+        if (is_null($this->cachePrefix)) {
+            $baseUnique = $this->getUniqueID();
+            $this->cachePrefix = substr(md5($baseUnique), 0, 8).'.';
+            $this->cacheTime = $cacheTime;
 
             parent::__construct($parent);
         }
-	}	//	function __construct()
-
+    }
 
     /**
      * Destroy this cell collection
      */
-	public function __destruct() {
+    public function __destruct()
+    {
         $cacheList = $this->getCellList();
         foreach ($cacheList as $cellID) {
-			wincache_ucache_delete($this->_cachePrefix.$cellID.'.cache');
+            wincache_ucache_delete($this->cachePrefix.$cellID.'.cache');
+        }
     }
-	}	//	function __destruct()
-
 
     /**
      * Identify whether the caching method is currently available
@@ -283,12 +278,12 @@ class PHPExcel_CachedObjectStorage_Wincache extends PHPExcel_CachedObjectStorage
      *
      * @return    boolean
      */
-	public static function cacheMethodIsAvailable() {
+    public static function cacheMethodIsAvailable()
+    {
         if (!function_exists('wincache_ucache_add')) {
             return false;
         }
 
         return true;
     }
-
 }

Classes/PHPExcel/CachedObjectStorageFactory.php

@@ -1,9 +1,9 @@
 <?php
 
 /**
- * PHPExcel
+ * PHPExcel_CachedObjectStorageFactory
  *
- * Copyright (c) 2006 - 2013 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
@@ -21,19 +21,10 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_CachedObjectStorage
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-
-/**
- * PHPExcel_CachedObjectStorageFactory
- *
- * @category    PHPExcel
- * @package        PHPExcel_CachedObjectStorage
- * @copyright    Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
 class PHPExcel_CachedObjectStorageFactory
 {
     const cache_in_memory               = 'Memory';
@@ -48,28 +39,26 @@ class PHPExcel_CachedObjectStorageFactory
     const cache_to_sqlite               = 'SQLite';
     const cache_to_sqlite3              = 'SQLite3';
 
-
     /**
      * Name of the method used for cell cacheing
      *
      * @var string
      */
-    private static $_cacheStorageMethod = NULL;
+    private static $cacheStorageMethod = null;
 
     /**
      * Name of the class used for cell cacheing
      *
      * @var string
      */
-    private static $_cacheStorageClass = NULL;
-
+    private static $cacheStorageClass = null;
 
     /**
      * List of all possible cache storage methods
      *
      * @var string[]
      */
-    private static $_storageMethods = array(
+    private static $storageMethods = array(
         self::cache_in_memory,
         self::cache_in_memory_gzip,
         self::cache_in_memory_serialized,
@@ -83,13 +72,12 @@ class PHPExcel_CachedObjectStorageFactory
         self::cache_to_sqlite3,
     );
 
-
     /**
      * Default arguments for each cache storage method
      *
      * @var array of mixed array
      */
-    private static $_storageMethodDefaultParameters = array(
+    private static $storageMethodDefaultParameters = array(
         self::cache_in_memory               => array(
                                                     ),
         self::cache_in_memory_gzip          => array(
@@ -100,7 +88,7 @@ class PHPExcel_CachedObjectStorageFactory
                                                     ),
         self::cache_to_phpTemp              => array( 'memoryCacheSize' => '1MB'
                                                     ),
-        self::cache_to_discISAM             => array( 'dir'             => NULL
+        self::cache_to_discISAM             => array( 'dir'             => null
                                                     ),
         self::cache_to_apc                  => array( 'cacheTime'       => 600
                                                     ),
@@ -116,36 +104,32 @@ class PHPExcel_CachedObjectStorageFactory
                                                     ),
     );
 
-
     /**
      * Arguments for the active cache storage method
      *
      * @var array of mixed array
      */
-    private static $_storageMethodParameters = array();
-
+    private static $storageMethodParameters = array();
 
     /**
      * Return the current cache storage method
      *
-     * @return string|NULL
+     * @return string|null
      **/
     public static function getCacheStorageMethod()
     {
-        return self::$_cacheStorageMethod;
-    }   //    function getCacheStorageMethod()
-
+        return self::$cacheStorageMethod;
+    }
 
     /**
      * Return the current cache storage class
      *
-     * @return PHPExcel_CachedObjectStorage_ICache|NULL
+     * @return PHPExcel_CachedObjectStorage_ICache|null
      **/
     public static function getCacheStorageClass()
     {
-        return self::$_cacheStorageClass;
-    }   //    function getCacheStorageClass()
-
+        return self::$cacheStorageClass;
+    }
 
     /**
      * Return the list of all possible cache storage methods
@@ -154,9 +138,8 @@ class PHPExcel_CachedObjectStorageFactory
      **/
     public static function getAllCacheStorageMethods()
     {
-        return self::$_storageMethods;
-    }   //    function getCacheStorageMethods()
-
+        return self::$storageMethods;
+    }
 
     /**
      * Return the list of all available cache storage methods
@@ -166,15 +149,14 @@ class PHPExcel_CachedObjectStorageFactory
     public static function getCacheStorageMethods()
     {
         $activeMethods = array();
-        foreach(self::$_storageMethods as $storageMethod) {
+        foreach (self::$storageMethods as $storageMethod) {
             $cacheStorageClass = 'PHPExcel_CachedObjectStorage_' . $storageMethod;
             if (call_user_func(array($cacheStorageClass, 'cacheMethodIsAvailable'))) {
                 $activeMethods[] = $storageMethod;
             }
         }
         return $activeMethods;
-    }   //    function getCacheStorageMethods()
-
+    }
 
     /**
      * Identify the cache storage method to use
@@ -186,30 +168,29 @@ class PHPExcel_CachedObjectStorageFactory
      **/
     public static function initialize($method = self::cache_in_memory, $arguments = array())
     {
-        if (!in_array($method,self::$_storageMethods)) {
-            return FALSE;
+        if (!in_array($method, self::$storageMethods)) {
+            return false;
         }
 
         $cacheStorageClass = 'PHPExcel_CachedObjectStorage_'.$method;
         if (!call_user_func(array( $cacheStorageClass,
                                    'cacheMethodIsAvailable'))) {
-            return FALSE;
+            return false;
         }
 
-        self::$_storageMethodParameters[$method] = self::$_storageMethodDefaultParameters[$method];
+        self::$storageMethodParameters[$method] = self::$storageMethodDefaultParameters[$method];
         foreach ($arguments as $k => $v) {
-            if (array_key_exists($k, self::$_storageMethodParameters[$method])) {
-                self::$_storageMethodParameters[$method][$k] = $v;
+            if (array_key_exists($k, self::$storageMethodParameters[$method])) {
+                self::$storageMethodParameters[$method][$k] = $v;
             }
         }
 
-        if (self::$_cacheStorageMethod === NULL) {
-            self::$_cacheStorageClass = 'PHPExcel_CachedObjectStorage_' . $method;
-            self::$_cacheStorageMethod = $method;
+        if (self::$cacheStorageMethod === null) {
+            self::$cacheStorageClass = 'PHPExcel_CachedObjectStorage_' . $method;
+            self::$cacheStorageMethod = $method;
+        }
+        return true;
     }
-        return TRUE;
-    }   //    function initialize()
-
 
     /**
      * Initialise the cache storage
@@ -219,23 +200,23 @@ class PHPExcel_CachedObjectStorageFactory
      **/
     public static function getInstance(PHPExcel_Worksheet $parent)
     {
-        $cacheMethodIsAvailable = TRUE;
-        if (self::$_cacheStorageMethod === NULL) {
+        $cacheMethodIsAvailable = true;
+        if (self::$cacheStorageMethod === null) {
             $cacheMethodIsAvailable = self::initialize();
         }
 
         if ($cacheMethodIsAvailable) {
-            $instance = new self::$_cacheStorageClass( $parent,
-                                                       self::$_storageMethodParameters[self::$_cacheStorageMethod]
+            $instance = new self::$cacheStorageClass(
+                $parent,
+                self::$storageMethodParameters[self::$cacheStorageMethod]
             );
-            if ($instance !== NULL) {
+            if ($instance !== null) {
                 return $instance;
             }
         }
 
-        return FALSE;
-    }   //    function getInstance()
-
+        return false;
+    }
 
     /**
      * Clear the cache storage
@@ -243,9 +224,8 @@ class PHPExcel_CachedObjectStorageFactory
      **/
     public static function finalize()
     {
-		self::$_cacheStorageMethod = NULL;
-		self::$_cacheStorageClass = NULL;
-		self::$_storageMethodParameters = array();
+        self::$cacheStorageMethod = null;
+        self::$cacheStorageClass = null;
+        self::$storageMethodParameters = array();
     }
-
 }

Classes/PHPExcel/CalcEngine/CyclicReferenceStack.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * PHPExcel
+ * PHPExcel_CalcEngine_CyclicReferenceStack
  *
- * Copyright (c) 2006 - 2013 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,36 +21,27 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-
-/**
- * PHPExcel_CalcEngine_CyclicReferenceStack
- *
- * @category	PHPExcel_CalcEngine_CyclicReferenceStack
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_CalcEngine_CyclicReferenceStack {
-
+class PHPExcel_CalcEngine_CyclicReferenceStack
+{
     /**
      *  The call stack for calculated cells
      *
      *  @var mixed[]
      */
-	private $_stack = array();
-
+    private $stack = array();
 
     /**
      * Return the number of entries on the stack
      *
      * @return  integer
      */
-	public function count() {
-		return count($this->_stack);
+    public function count()
+    {
+        return count($this->stack);
     }
 
     /**
@@ -57,42 +49,46 @@ class PHPExcel_CalcEngine_CyclicReferenceStack {
      *
      * @param  mixed  $value
      */
-	public function push($value) {
-		$this->_stack[] = $value;
-	}	//	function push()
+    public function push($value)
+    {
+        $this->stack[$value] = $value;
+    }
 
     /**
      * Pop the last entry from the stack
      *
      * @return  mixed
      */
-	public function pop() {
-		return array_pop($this->_stack);
-	}	//	function pop()
+    public function pop()
+    {
+        return array_pop($this->stack);
+    }
 
     /**
      * Test to see if a specified entry exists on the stack
      *
      * @param  mixed  $value  The value to test
      */
-	public function onStack($value) {
-		return in_array($value, $this->_stack);
+    public function onStack($value)
+    {
+        return isset($this->stack[$value]);
     }
 
     /**
      * Clear the stack
      */
-	public function clear() {
-		$this->_stack = array();
-	}	//	function push()
+    public function clear()
+    {
+        $this->stack = array();
+    }
 
     /**
      * Return an array of all entries on the stack
      *
      * @return  mixed[]
      */
-	public function showStack() {
-		return $this->_stack;
+    public function showStack()
+    {
+        return $this->stack;
+    }
 }
-
-}	//	class PHPExcel_CalcEngine_CyclicReferenceStack

Classes/PHPExcel/CalcEngine/Logger.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * PHPExcel
+ * PHPExcel_CalcEngine_Logger
  *
- * Copyright (c) 2006 - 2013 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,20 +21,12 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-/**
- * PHPExcel_CalcEngine_Logger
- *
- * @category	PHPExcel
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_CalcEngine_Logger {
-
+class PHPExcel_CalcEngine_Logger
+{
     /**
      * Flag to determine whether a debug log should be generated by the calculation engine
      *        If true, then a debug log will be generated
@@ -41,7 +34,7 @@ class PHPExcel_CalcEngine_Logger {
      *
      * @var boolean
      */
-	private $_writeDebugLog = FALSE;
+    private $writeDebugLog = false;
 
     /**
      * Flag to determine whether a debug log should be echoed by the calculation engine
@@ -51,30 +44,30 @@ class PHPExcel_CalcEngine_Logger {
      *
      * @var boolean
      */
-	private $_echoDebugLog = FALSE;
+    private $echoDebugLog = false;
 
     /**
      * The debug log generated by the calculation engine
      *
      * @var string[]
      */
-	private $_debugLog = array();
+    private $debugLog = array();
 
     /**
      * The calculation engine cell reference stack
      *
      * @var PHPExcel_CalcEngine_CyclicReferenceStack
      */
-	private $_cellStack;
-
+    private $cellStack;
 
     /**
      * Instantiate a Calculation engine logger
      *
      * @param  PHPExcel_CalcEngine_CyclicReferenceStack $stack
      */
-	public function __construct(PHPExcel_CalcEngine_CyclicReferenceStack $stack) {
-		$this->_cellStack = $stack;
+    public function __construct(PHPExcel_CalcEngine_CyclicReferenceStack $stack)
+    {
+        $this->cellStack = $stack;
     }
 
     /**
@@ -82,8 +75,9 @@ class PHPExcel_CalcEngine_Logger {
      *
      * @param  boolean $pValue
      */
-	public function setWriteDebugLog($pValue = FALSE) {
-		$this->_writeDebugLog = $pValue;
+    public function setWriteDebugLog($pValue = false)
+    {
+        $this->writeDebugLog = $pValue;
     }
 
     /**
@@ -91,8 +85,9 @@ class PHPExcel_CalcEngine_Logger {
      *
      * @return  boolean
      */
-	public function getWriteDebugLog() {
-		return $this->_writeDebugLog;
+    public function getWriteDebugLog()
+    {
+        return $this->writeDebugLog;
     }
 
     /**
@@ -100,8 +95,9 @@ class PHPExcel_CalcEngine_Logger {
      *
      * @param  boolean $pValue
      */
-	public function setEchoDebugLog($pValue = FALSE) {
-		$this->_echoDebugLog = $pValue;
+    public function setEchoDebugLog($pValue = false)
+    {
+        $this->echoDebugLog = $pValue;
     }
 
     /**
@@ -109,45 +105,47 @@ class PHPExcel_CalcEngine_Logger {
      *
      * @return  boolean
      */
-	public function getEchoDebugLog() {
-		return $this->_echoDebugLog;
+    public function getEchoDebugLog()
+    {
+        return $this->echoDebugLog;
     }
 
     /**
      * Write an entry to the calculation engine debug log
      */
-	public function writeDebugLog() {
+    public function writeDebugLog()
+    {
         //    Only write the debug log if logging is enabled
-		if ($this->_writeDebugLog) {
+        if ($this->writeDebugLog) {
             $message = implode(func_get_args());
-			$cellReference = implode(' -> ', $this->_cellStack->showStack());
-			if ($this->_echoDebugLog) {
+            $cellReference = implode(' -> ', $this->cellStack->showStack());
+            if ($this->echoDebugLog) {
                 echo $cellReference,
-					($this->_cellStack->count() > 0 ? ' => ' : ''), 
+                    ($this->cellStack->count() > 0 ? ' => ' : ''),
                     $message,
                     PHP_EOL;
             }
-			$this->_debugLog[] = $cellReference . 
-				($this->_cellStack->count() > 0 ? ' => ' : '') . 
+            $this->debugLog[] = $cellReference .
+                ($this->cellStack->count() > 0 ? ' => ' : '') .
                 $message;
         }
-	}	//	function _writeDebug()
+    }
 
     /**
      * Clear the calculation engine debug log
      */
-	public function clearLog() {
-		$this->_debugLog = array();
-	}	//	function flushLogger()
+    public function clearLog()
+    {
+        $this->debugLog = array();
+    }
 
     /**
      * Return the calculation engine debug log
      *
      * @return  string[]
      */
-	public function getLog() {
-		return $this->_debugLog;
-	}	//	function flushLogger()
-
-}	//	class PHPExcel_CalcEngine_Logger
-
+    public function getLog()
+    {
+        return $this->debugLog;
+    }
+}

Classes/PHPExcel/Calculation/Database.php

@@ -1,8 +1,18 @@
 <?php
+
+/** PHPExcel root directory */
+if (!defined('PHPEXCEL_ROOT')) {
     /**
- * PHPExcel
+     * @ignore
+     */
+    define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
+    require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+}
+
+/**
+ * PHPExcel_Calculation_Database
  *
- * Copyright (c) 2006 - 2013 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,34 +30,14 @@
  *
  * @category    PHPExcel
  * @package        PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
+class PHPExcel_Calculation_Database
+{
     /**
-	 * @ignore
-	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-
-/**
- * PHPExcel_Calculation_Database
- *
- * @category	PHPExcel
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Calculation_Database {
-
-
-	/**
-	 * __fieldExtract
+     * fieldExtract
      *
      * Extracts the column ID to use for the data field.
      *
@@ -64,7 +54,8 @@ class PHPExcel_Calculation_Database {
      * @return    string|NULL
      *
      */
-	private static function __fieldExtract($database,$field) {
+    private static function fieldExtract($database, $field)
+    {
         $field = strtoupper(PHPExcel_Calculation_Functions::flattenSingleValue($field));
         $fieldNames = array_map('strtoupper', array_shift($database));
 
@@ -73,11 +64,11 @@ class PHPExcel_Calculation_Database {
             return $keys[$field-1];
         }
         $key = array_search($field, $fieldNames);
-		return ($key) ? $key : NULL;
+        return ($key) ? $key : null;
     }
 
     /**
-	 * __filter
+     * filter
      *
      * Parses the selection criteria, extracts the database rows that match those criteria, and
      * returns that subset of rows.
@@ -95,7 +86,8 @@ class PHPExcel_Calculation_Database {
      * @return    array of mixed
      *
      */
-	private static function __filter($database,$criteria) {
+    private static function filter($database, $criteria)
+    {
         $fieldNames = array_shift($database);
         $criteriaNames = array_shift($criteria);
 
@@ -107,7 +99,7 @@ class PHPExcel_Calculation_Database {
             $testConditionCount = 0;
             foreach ($criteria as $row => $criterion) {
                 if ($criterion[$key] > '') {
-					$testCondition[] = '[:'.$criteriaName.']'.PHPExcel_Calculation_Functions::_ifCondition($criterion[$key]);
+                    $testCondition[] = '[:'.$criteriaName.']'.PHPExcel_Calculation_Functions::ifCondition($criterion[$key]);
                     $testConditionCount++;
                 }
             }
@@ -134,7 +126,7 @@ class PHPExcel_Calculation_Database {
                 $k = array_search($criteriaName, $fieldNames);
                 if (isset($dataValues[$k])) {
                     $dataValue = $dataValues[$k];
-					$dataValue = (is_string($dataValue)) ? PHPExcel_Calculation::_wrapResult(strtoupper($dataValue)) : $dataValue;
+                    $dataValue = (is_string($dataValue)) ? PHPExcel_Calculation::wrapResult(strtoupper($dataValue)) : $dataValue;
                     $testConditionList = str_replace('[:' . $criteriaName . ']', $dataValue, $testConditionList);
                 }
             }
@@ -150,6 +142,19 @@ class PHPExcel_Calculation_Database {
     }
 
 
+    private static function getFilteredColumn($database, $field, $criteria)
+    {
+        //    reduce the database to a set of rows that match all the criteria
+        $database = self::filter($database, $criteria);
+        //    extract an array of values for the requested column
+        $colData = array();
+        foreach ($database as $row) {
+            $colData[] = $row[$field];
+        }
+        
+        return $colData;
+    }
+
     /**
      * DAVERAGE
      *
@@ -177,22 +182,18 @@ class PHPExcel_Calculation_Database {
      * @return    float
      *
      */
-	public static function DAVERAGE($database,$field,$criteria) {
-		$field = self::__fieldExtract($database,$field);
+    public static function DAVERAGE($database, $field, $criteria)
+    {
+        $field = self::fieldExtract($database, $field);
         if (is_null($field)) {
-			return NULL;
-		}
-		//	reduce the database to a set of rows that match all the criteria
-		$database = self::__filter($database,$criteria);
-		//	extract an array of values for the requested column
-		$colData = array();
-		foreach($database as $row) {
-			$colData[] = $row[$field];
+            return null;
         }
 
         // Return
-		return PHPExcel_Calculation_Statistical::AVERAGE($colData);
-	}	//	function DAVERAGE()
+        return PHPExcel_Calculation_Statistical::AVERAGE(
+            self::getFilteredColumn($database, $field, $criteria)
+        );
+    }
 
 
     /**
@@ -229,23 +230,18 @@ class PHPExcel_Calculation_Database {
      *            database that match the criteria.
      *
      */
-	public static function DCOUNT($database,$field,$criteria) {
-		$field = self::__fieldExtract($database,$field);
+    public static function DCOUNT($database, $field, $criteria)
+    {
+        $field = self::fieldExtract($database, $field);
         if (is_null($field)) {
-			return NULL;
-		}
-
-		//	reduce the database to a set of rows that match all the criteria
-		$database = self::__filter($database,$criteria);
-		//	extract an array of values for the requested column
-		$colData = array();
-		foreach($database as $row) {
-			$colData[] = $row[$field];
+            return null;
         }
 
         // Return
-		return PHPExcel_Calculation_Statistical::COUNT($colData);
-	}	//	function DCOUNT()
+        return PHPExcel_Calculation_Statistical::COUNT(
+            self::getFilteredColumn($database, $field, $criteria)
+        );
+    }
 
 
     /**
@@ -278,14 +274,15 @@ class PHPExcel_Calculation_Database {
      *            database that match the criteria.
      *
      */
-	public static function DCOUNTA($database,$field,$criteria) {
-		$field = self::__fieldExtract($database,$field);
+    public static function DCOUNTA($database, $field, $criteria)
+    {
+        $field = self::fieldExtract($database, $field);
         if (is_null($field)) {
-			return NULL;
+            return null;
         }
 
         //    reduce the database to a set of rows that match all the criteria
-		$database = self::__filter($database,$criteria);
+        $database = self::filter($database, $criteria);
         //    extract an array of values for the requested column
         $colData = array();
         foreach ($database as $row) {
@@ -293,8 +290,10 @@ class PHPExcel_Calculation_Database {
         }
 
         // Return
-		return PHPExcel_Calculation_Statistical::COUNTA($colData);
-	}	//	function DCOUNTA()
+        return PHPExcel_Calculation_Statistical::COUNTA(
+            self::getFilteredColumn($database, $field, $criteria)
+        );
+    }
 
 
     /**
@@ -325,27 +324,21 @@ class PHPExcel_Calculation_Database {
      * @return    mixed
      *
      */
-	public static function DGET($database,$field,$criteria) {
-		$field = self::__fieldExtract($database,$field);
+    public static function DGET($database, $field, $criteria)
+    {
+        $field = self::fieldExtract($database, $field);
         if (is_null($field)) {
-			return NULL;
-		}
-
-		//	reduce the database to a set of rows that match all the criteria
-		$database = self::__filter($database,$criteria);
-		//	extract an array of values for the requested column
-		$colData = array();
-		foreach($database as $row) {
-			$colData[] = $row[$field];
+            return null;
         }
 
         // Return
+        $colData = self::getFilteredColumn($database, $field, $criteria);
         if (count($colData) > 1) {
             return PHPExcel_Calculation_Functions::NaN();
         }
 
         return $colData[0];
-	}	//	function DGET()
+    }
 
 
     /**
@@ -376,23 +369,18 @@ class PHPExcel_Calculation_Database {
      * @return    float
      *
      */
-	public static function DMAX($database,$field,$criteria) {
-		$field = self::__fieldExtract($database,$field);
+    public static function DMAX($database, $field, $criteria)
+    {
+        $field = self::fieldExtract($database, $field);
         if (is_null($field)) {
-			return NULL;
-		}
-
-		//	reduce the database to a set of rows that match all the criteria
-		$database = self::__filter($database,$criteria);
-		//	extract an array of values for the requested column
-		$colData = array();
-		foreach($database as $row) {
-			$colData[] = $row[$field];
+            return null;
         }
 
         // Return
-		return PHPExcel_Calculation_Statistical::MAX($colData);
-	}	//	function DMAX()
+        return PHPExcel_Calculation_Statistical::MAX(
+            self::getFilteredColumn($database, $field, $criteria)
+        );
+    }
 
 
     /**
@@ -423,23 +411,18 @@ class PHPExcel_Calculation_Database {
      * @return    float
      *
      */
-	public static function DMIN($database,$field,$criteria) {
-		$field = self::__fieldExtract($database,$field);
+    public static function DMIN($database, $field, $criteria)
+    {
+        $field = self::fieldExtract($database, $field);
         if (is_null($field)) {
-			return NULL;
-		}
-
-		//	reduce the database to a set of rows that match all the criteria
-		$database = self::__filter($database,$criteria);
-		//	extract an array of values for the requested column
-		$colData = array();
-		foreach($database as $row) {
-			$colData[] = $row[$field];
+            return null;
         }
 
         // Return
-		return PHPExcel_Calculation_Statistical::MIN($colData);
-	}	//	function DMIN()
+        return PHPExcel_Calculation_Statistical::MIN(
+            self::getFilteredColumn($database, $field, $criteria)
+        );
+    }
 
 
     /**
@@ -469,23 +452,18 @@ class PHPExcel_Calculation_Database {
      * @return    float
      *
      */
-	public static function DPRODUCT($database,$field,$criteria) {
-		$field = self::__fieldExtract($database,$field);
+    public static function DPRODUCT($database, $field, $criteria)
+    {
+        $field = self::fieldExtract($database, $field);
         if (is_null($field)) {
-			return NULL;
-		}
-
-		//	reduce the database to a set of rows that match all the criteria
-		$database = self::__filter($database,$criteria);
-		//	extract an array of values for the requested column
-		$colData = array();
-		foreach($database as $row) {
-			$colData[] = $row[$field];
+            return null;
         }
 
         // Return
-		return PHPExcel_Calculation_MathTrig::PRODUCT($colData);
-	}	//	function DPRODUCT()
+        return PHPExcel_Calculation_MathTrig::PRODUCT(
+            self::getFilteredColumn($database, $field, $criteria)
+        );
+    }
 
 
     /**
@@ -516,23 +494,18 @@ class PHPExcel_Calculation_Database {
      * @return    float
      *
      */
-	public static function DSTDEV($database,$field,$criteria) {
-		$field = self::__fieldExtract($database,$field);
+    public static function DSTDEV($database, $field, $criteria)
+    {
+        $field = self::fieldExtract($database, $field);
         if (is_null($field)) {
-			return NULL;
-		}
-
-		//	reduce the database to a set of rows that match all the criteria
-		$database = self::__filter($database,$criteria);
-		//	extract an array of values for the requested column
-		$colData = array();
-		foreach($database as $row) {
-			$colData[] = $row[$field];
+            return null;
         }
 
         // Return
-		return PHPExcel_Calculation_Statistical::STDEV($colData);
-	}	//	function DSTDEV()
+        return PHPExcel_Calculation_Statistical::STDEV(
+            self::getFilteredColumn($database, $field, $criteria)
+        );
+    }
 
 
     /**
@@ -563,23 +536,18 @@ class PHPExcel_Calculation_Database {
      * @return    float
      *
      */
-	public static function DSTDEVP($database,$field,$criteria) {
-		$field = self::__fieldExtract($database,$field);
+    public static function DSTDEVP($database, $field, $criteria)
+    {
+        $field = self::fieldExtract($database, $field);
         if (is_null($field)) {
-			return NULL;
-		}
-
-		//	reduce the database to a set of rows that match all the criteria
-		$database = self::__filter($database,$criteria);
-		//	extract an array of values for the requested column
-		$colData = array();
-		foreach($database as $row) {
-			$colData[] = $row[$field];
+            return null;
         }
 
         // Return
-		return PHPExcel_Calculation_Statistical::STDEVP($colData);
-	}	//	function DSTDEVP()
+        return PHPExcel_Calculation_Statistical::STDEVP(
+            self::getFilteredColumn($database, $field, $criteria)
+        );
+    }
 
 
     /**
@@ -609,23 +577,18 @@ class PHPExcel_Calculation_Database {
      * @return    float
      *
      */
-	public static function DSUM($database,$field,$criteria) {
-		$field = self::__fieldExtract($database,$field);
+    public static function DSUM($database, $field, $criteria)
+    {
+        $field = self::fieldExtract($database, $field);
         if (is_null($field)) {
-			return NULL;
-		}
-
-		//	reduce the database to a set of rows that match all the criteria
-		$database = self::__filter($database,$criteria);
-		//	extract an array of values for the requested column
-		$colData = array();
-		foreach($database as $row) {
-			$colData[] = $row[$field];
+            return null;
         }
 
         // Return
-		return PHPExcel_Calculation_MathTrig::SUM($colData);
-	}	//	function DSUM()
+        return PHPExcel_Calculation_MathTrig::SUM(
+            self::getFilteredColumn($database, $field, $criteria)
+        );
+    }
 
 
     /**
@@ -656,23 +619,18 @@ class PHPExcel_Calculation_Database {
      * @return    float
      *
      */
-	public static function DVAR($database,$field,$criteria) {
-		$field = self::__fieldExtract($database,$field);
+    public static function DVAR($database, $field, $criteria)
+    {
+        $field = self::fieldExtract($database, $field);
         if (is_null($field)) {
-			return NULL;
-		}
-
-		//	reduce the database to a set of rows that match all the criteria
-		$database = self::__filter($database,$criteria);
-		//	extract an array of values for the requested column
-		$colData = array();
-		foreach($database as $row) {
-			$colData[] = $row[$field];
+            return null;
         }
 
         // Return
-		return PHPExcel_Calculation_Statistical::VARFunc($colData);
-	}	//	function DVAR()
+        return PHPExcel_Calculation_Statistical::VARFunc(
+            self::getFilteredColumn($database, $field, $criteria)
+        );
+    }
 
 
     /**
@@ -703,23 +661,16 @@ class PHPExcel_Calculation_Database {
      * @return    float
      *
      */
-	public static function DVARP($database,$field,$criteria) {
-		$field = self::__fieldExtract($database,$field);
+    public static function DVARP($database, $field, $criteria)
+    {
+        $field = self::fieldExtract($database, $field);
         if (is_null($field)) {
-			return NULL;
-		}
-
-		//	reduce the database to a set of rows that match all the criteria
-		$database = self::__filter($database,$criteria);
-		//	extract an array of values for the requested column
-		$colData = array();
-		foreach($database as $row) {
-			$colData[] = $row[$field];
+            return null;
         }
 
         // Return
-		return PHPExcel_Calculation_Statistical::VARP($colData);
-	}	//	function DVARP()
-
-
-}	//	class PHPExcel_Calculation_Database
+        return PHPExcel_Calculation_Statistical::VARP(
+            self::getFilteredColumn($database, $field, $criteria)
+        );
+    }
+}

Classes/PHPExcel/Calculation/DateTime.php

@@ -1,8 +1,18 @@
 <?php
+
+/** PHPExcel root directory */
+if (!defined('PHPEXCEL_ROOT')) {
     /**
- * PHPExcel
+     * @ignore
+     */
+    define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
+    require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+}
+
+/**
+ * PHPExcel_Calculation_DateTime
  *
- * Copyright (c) 2006 - 2013 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,40 +30,22 @@
  *
  * @category    PHPExcel
  * @package        PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-	/**
-	 * @ignore
-	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-
-/**
- * PHPExcel_Calculation_DateTime
- *
- * @category	PHPExcel
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Calculation_DateTime {
-
+class PHPExcel_Calculation_DateTime
+{
     /**
      * Identify if a year is a leap year or not
      *
      * @param    integer    $year    The year to test
      * @return    boolean            TRUE if the year is a leap year, otherwise FALSE
      */
-	public static function _isLeapYear($year) {
+    public static function isLeapYear($year)
+    {
         return ((($year % 4) == 0) && (($year % 100) != 0) || (($year % 400) == 0));
-	}	//	function _isLeapYear()
+    }
 
 
     /**
@@ -68,10 +60,11 @@ class PHPExcel_Calculation_DateTime {
      * @param    boolean $methodUS        Whether to use the US method or the European method of calculation
      * @return    integer    Number of days between the start date and the end date
      */
-	private static function _dateDiff360($startDay, $startMonth, $startYear, $endDay, $endMonth, $endYear, $methodUS) {
+    private static function dateDiff360($startDay, $startMonth, $startYear, $endDay, $endMonth, $endYear, $methodUS)
+    {
         if ($startDay == 31) {
             --$startDay;
-		} elseif ($methodUS && ($startMonth == 2 && ($startDay == 29 || ($startDay == 28 && !self::_isLeapYear($startYear))))) {
+        } elseif ($methodUS && ($startMonth == 2 && ($startDay == 29 || ($startDay == 28 && !self::isLeapYear($startYear))))) {
             $startDay = 30;
         }
         if ($endDay == 31) {
@@ -89,16 +82,17 @@ class PHPExcel_Calculation_DateTime {
         }
 
         return $endDay + $endMonth * 30 + $endYear * 360 - $startDay - $startMonth * 30 - $startYear * 360;
-	}	//	function _dateDiff360()
+    }
 
 
     /**
-	 * _getDateValue
+     * getDateValue
      *
      * @param    string    $dateValue
      * @return    mixed    Excel date/time serial value, or string if error
      */
-	public static function _getDateValue($dateValue) {
+    public static function getDateValue($dateValue)
+    {
         if (!is_numeric($dateValue)) {
             if ((is_string($dateValue)) &&
                 (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_GNUMERIC)) {
@@ -114,25 +108,27 @@ class PHPExcel_Calculation_DateTime {
             }
         }
         return $dateValue;
-	}	//	function _getDateValue()
+    }
 
 
     /**
-	 * _getTimeValue
+     * getTimeValue
      *
      * @param    string    $timeValue
      * @return    mixed    Excel date/time serial value, or string if error
      */
-	private static function _getTimeValue($timeValue) {
+    private static function getTimeValue($timeValue)
+    {
         $saveReturnDateType = PHPExcel_Calculation_Functions::getReturnDateType();
         PHPExcel_Calculation_Functions::setReturnDateType(PHPExcel_Calculation_Functions::RETURNDATE_EXCEL);
         $timeValue = self::TIMEVALUE($timeValue);
         PHPExcel_Calculation_Functions::setReturnDateType($saveReturnDateType);
         return $timeValue;
-	}	//	function _getTimeValue()
+    }
 
 
-	private static function _adjustDateByMonths($dateValue = 0, $adjustmentMonths = 0) {
+    private static function adjustDateByMonths($dateValue = 0, $adjustmentMonths = 0)
+    {
         // Execute function
         $PHPDateObject = PHPExcel_Shared_Date::ExcelToPHPObject($dateValue);
         $oMonth = (int) $PHPDateObject->format('m');
@@ -155,7 +151,7 @@ class PHPExcel_Calculation_DateTime {
             $PHPDateObject->modify($adjustDaysString);
         }
         return $PHPDateObject;
-	}	//	function _adjustDateByMonths()
+    }
 
 
     /**
@@ -177,10 +173,11 @@ class PHPExcel_Calculation_DateTime {
      * @return    mixed    Excel date/time serial value, PHP date/time serial value or PHP date/time object,
      *                        depending on the value of the ReturnDateType flag
      */
-	public static function DATETIMENOW() {
+    public static function DATETIMENOW()
+    {
         $saveTimeZone = date_default_timezone_get();
         date_default_timezone_set('UTC');
-		$retValue = False;
+        $retValue = false;
         switch (PHPExcel_Calculation_Functions::getReturnDateType()) {
             case PHPExcel_Calculation_Functions::RETURNDATE_EXCEL:
                 $retValue = (float) PHPExcel_Shared_Date::PHPToExcel(time());
@@ -195,7 +192,7 @@ class PHPExcel_Calculation_DateTime {
         date_default_timezone_set($saveTimeZone);
 
         return $retValue;
-	}	//	function DATETIMENOW()
+    }
 
 
     /**
@@ -217,10 +214,11 @@ class PHPExcel_Calculation_DateTime {
      * @return    mixed    Excel date/time serial value, PHP date/time serial value or PHP date/time object,
      *                        depending on the value of the ReturnDateType flag
      */
-	public static function DATENOW() {
+    public static function DATENOW()
+    {
         $saveTimeZone = date_default_timezone_get();
         date_default_timezone_set('UTC');
-		$retValue = False;
+        $retValue = false;
         $excelDateTime = floor(PHPExcel_Shared_Date::PHPToExcel(time()));
         switch (PHPExcel_Calculation_Functions::getReturnDateType()) {
             case PHPExcel_Calculation_Functions::RETURNDATE_EXCEL:
@@ -236,7 +234,7 @@ class PHPExcel_Calculation_DateTime {
         date_default_timezone_set($saveTimeZone);
 
         return $retValue;
-	}	//	function DATENOW()
+    }
 
 
     /**
@@ -289,22 +287,23 @@ class PHPExcel_Calculation_DateTime {
      * @return    mixed    Excel date/time serial value, PHP date/time serial value or PHP date/time object,
      *                        depending on the value of the ReturnDateType flag
      */
-	public static function DATE($year = 0, $month = 1, $day = 1) {
+    public static function DATE($year = 0, $month = 1, $day = 1)
+    {
         $year  = PHPExcel_Calculation_Functions::flattenSingleValue($year);
         $month = PHPExcel_Calculation_Functions::flattenSingleValue($month);
         $day   = PHPExcel_Calculation_Functions::flattenSingleValue($day);
 
-		if (($month !== NULL) && (!is_numeric($month))) {
+        if (($month !== null) && (!is_numeric($month))) {
             $month = PHPExcel_Shared_Date::monthStringToNumber($month);
         }
 
-		if (($day !== NULL) && (!is_numeric($day))) {
+        if (($day !== null) && (!is_numeric($day))) {
             $day = PHPExcel_Shared_Date::dayStringToNumber($day);
         }
 
-		$year	= ($year !== NULL)	? PHPExcel_Shared_String::testStringAsNumeric($year) : 0;
-		$month	= ($month !== NULL)	? PHPExcel_Shared_String::testStringAsNumeric($month) : 0;
-		$day	= ($day !== NULL)	? PHPExcel_Shared_String::testStringAsNumeric($day) : 0;
+        $year = ($year !== null) ? PHPExcel_Shared_String::testStringAsNumeric($year) : 0;
+        $month = ($month !== null) ? PHPExcel_Shared_String::testStringAsNumeric($month) : 0;
+        $day = ($day !== null) ? PHPExcel_Shared_String::testStringAsNumeric($day) : 0;
         if ((!is_numeric($year)) ||
             (!is_numeric($month)) ||
             (!is_numeric($day))) {
@@ -353,7 +352,7 @@ class PHPExcel_Calculation_DateTime {
             case PHPExcel_Calculation_Functions::RETURNDATE_PHP_OBJECT:
                 return PHPExcel_Shared_Date::ExcelToPHPObject($excelDateValue);
         }
-	}	//	function DATE()
+    }
 
 
     /**
@@ -383,14 +382,21 @@ class PHPExcel_Calculation_DateTime {
      * @return    mixed    Excel date/time serial value, PHP date/time serial value or PHP date/time object,
      *                        depending on the value of the ReturnDateType flag
      */
-	public static function TIME($hour = 0, $minute = 0, $second = 0) {
+    public static function TIME($hour = 0, $minute = 0, $second = 0)
+    {
         $hour = PHPExcel_Calculation_Functions::flattenSingleValue($hour);
         $minute = PHPExcel_Calculation_Functions::flattenSingleValue($minute);
         $second = PHPExcel_Calculation_Functions::flattenSingleValue($second);
 
-		if ($hour == '') { $hour = 0; }
-		if ($minute == '') { $minute = 0; }
-		if ($second == '') { $second = 0; }
+        if ($hour == '') {
+            $hour = 0;
+        }
+        if ($minute == '') {
+            $minute = 0;
+        }
+        if ($second == '') {
+            $second = 0;
+        }
 
         if ((!is_numeric($hour)) || (!is_numeric($minute)) || (!is_numeric($second))) {
             return PHPExcel_Calculation_Functions::VALUE();
@@ -402,7 +408,9 @@ class PHPExcel_Calculation_DateTime {
         if ($second < 0) {
             $minute += floor($second / 60);
             $second = 60 - abs($second % 60);
-			if ($second == 60) { $second = 0; }
+            if ($second == 60) {
+                $second = 0;
+            }
         } elseif ($second >= 60) {
             $minute += floor($second / 60);
             $second = $second % 60;
@@ -410,7 +418,9 @@ class PHPExcel_Calculation_DateTime {
         if ($minute < 0) {
             $hour += floor($minute / 60);
             $minute = 60 - abs($minute % 60);
-			if ($minute == 60) { $minute = 0; }
+            if ($minute == 60) {
+                $minute = 0;
+            }
         } elseif ($minute >= 60) {
             $hour += floor($minute / 60);
             $minute = $minute % 60;
@@ -438,7 +448,9 @@ class PHPExcel_Calculation_DateTime {
                 if ($hour < 0) {
                     $dayAdjust = floor($hour / 24);
                     $hour = 24 - abs($hour % 24);
-						if ($hour == 24) { $hour = 0; }
+                    if ($hour == 24) {
+                        $hour = 0;
+                    }
                 } elseif ($hour >= 24) {
                     $dayAdjust = floor($hour / 24);
                     $hour = $hour % 24;
@@ -449,7 +461,7 @@ class PHPExcel_Calculation_DateTime {
                 }
                 return $phpDateObject;
         }
-	}	//	function TIME()
+    }
 
 
     /**
@@ -478,7 +490,8 @@ class PHPExcel_Calculation_DateTime {
      * @return    mixed    Excel date/time serial value, PHP date/time serial value or PHP date/time object,
      *                        depending on the value of the ReturnDateType flag
      */
-	public static function DATEVALUE($dateValue = 1) {
+    public static function DATEVALUE($dateValue = 1)
+    {
         $dateValue = trim(PHPExcel_Calculation_Functions::flattenSingleValue($dateValue), '"');
         //    Strip any ordinals because they're allowed in Excel (English only)
         $dateValue = preg_replace('/(\d)(st|nd|rd|th)([ -\/])/Ui', '$1$3', $dateValue);
@@ -492,7 +505,9 @@ class PHPExcel_Calculation_DateTime {
                 if ($yearFound) {
                     return PHPExcel_Calculation_Functions::VALUE();
                 } else {
-					if ($t < 100) { $t += 1900; }
+                    if ($t < 100) {
+                        $t += 1900;
+                    }
                     $yearFound = true;
                 }
             }
@@ -512,13 +527,13 @@ class PHPExcel_Calculation_DateTime {
         $dateValue = implode(' ', $t1);
 
         $PHPDateArray = date_parse($dateValue);
-		if (($PHPDateArray === False) || ($PHPDateArray['error_count'] > 0)) {
+        if (($PHPDateArray === false) || ($PHPDateArray['error_count'] > 0)) {
             $testVal1 = strtok($dateValue, '- ');
-			if ($testVal1 !== False) {
+            if ($testVal1 !== false) {
                 $testVal2 = strtok('- ');
-				if ($testVal2 !== False) {
+                if ($testVal2 !== false) {
                     $testVal3 = strtok('- ');
-					if ($testVal3 === False) {
+                    if ($testVal3 === false) {
                         $testVal3 = strftime('%Y');
                     }
                 } else {
@@ -528,22 +543,38 @@ class PHPExcel_Calculation_DateTime {
                 return PHPExcel_Calculation_Functions::VALUE();
             }
             $PHPDateArray = date_parse($testVal1.'-'.$testVal2.'-'.$testVal3);
-			if (($PHPDateArray === False) || ($PHPDateArray['error_count'] > 0)) {
+            if (($PHPDateArray === false) || ($PHPDateArray['error_count'] > 0)) {
                 $PHPDateArray = date_parse($testVal2.'-'.$testVal1.'-'.$testVal3);
-				if (($PHPDateArray === False) || ($PHPDateArray['error_count'] > 0)) {
+                if (($PHPDateArray === false) || ($PHPDateArray['error_count'] > 0)) {
                     return PHPExcel_Calculation_Functions::VALUE();
                 }
             }
         }
 
-		if (($PHPDateArray !== False) && ($PHPDateArray['error_count'] == 0)) {
+        if (($PHPDateArray !== false) && ($PHPDateArray['error_count'] == 0)) {
             // Execute function
-			if ($PHPDateArray['year'] == '')	{ $PHPDateArray['year'] = strftime('%Y'); }
-			if ($PHPDateArray['year'] < 1900)
+            if ($PHPDateArray['year'] == '') {
+                $PHPDateArray['year'] = strftime('%Y');
+            }
+            if ($PHPDateArray['year'] < 1900) {
                 return PHPExcel_Calculation_Functions::VALUE();
-			if ($PHPDateArray['month'] == '')	{ $PHPDateArray['month'] = strftime('%m'); }
-			if ($PHPDateArray['day'] == '')		{ $PHPDateArray['day'] = strftime('%d'); }
-			$excelDateValue = floor(PHPExcel_Shared_Date::FormattedPHPToExcel($PHPDateArray['year'],$PHPDateArray['month'],$PHPDateArray['day'],$PHPDateArray['hour'],$PHPDateArray['minute'],$PHPDateArray['second']));
+            }
+            if ($PHPDateArray['month'] == '') {
+                $PHPDateArray['month'] = strftime('%m');
+            }
+            if ($PHPDateArray['day'] == '') {
+                $PHPDateArray['day'] = strftime('%d');
+            }
+            $excelDateValue = floor(
+                PHPExcel_Shared_Date::FormattedPHPToExcel(
+                    $PHPDateArray['year'],
+                    $PHPDateArray['month'],
+                    $PHPDateArray['day'],
+                    $PHPDateArray['hour'],
+                    $PHPDateArray['minute'],
+                    $PHPDateArray['second']
+                )
+            );
 
             switch (PHPExcel_Calculation_Functions::getReturnDateType()) {
                 case PHPExcel_Calculation_Functions::RETURNDATE_EXCEL:
@@ -555,7 +586,7 @@ class PHPExcel_Calculation_DateTime {
             }
         }
         return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function DATEVALUE()
+    }
 
 
     /**
@@ -580,14 +611,22 @@ class PHPExcel_Calculation_DateTime {
      * @return    mixed    Excel date/time serial value, PHP date/time serial value or PHP date/time object,
      *                        depending on the value of the ReturnDateType flag
      */
-	public static function TIMEVALUE($timeValue) {
+    public static function TIMEVALUE($timeValue)
+    {
         $timeValue = trim(PHPExcel_Calculation_Functions::flattenSingleValue($timeValue), '"');
         $timeValue = str_replace(array('/', '.'), array('-', '-'), $timeValue);
 
         $PHPDateArray = date_parse($timeValue);
-		if (($PHPDateArray !== False) && ($PHPDateArray['error_count'] == 0)) {
+        if (($PHPDateArray !== false) && ($PHPDateArray['error_count'] == 0)) {
             if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE) {
-				$excelDateValue = PHPExcel_Shared_Date::FormattedPHPToExcel($PHPDateArray['year'],$PHPDateArray['month'],$PHPDateArray['day'],$PHPDateArray['hour'],$PHPDateArray['minute'],$PHPDateArray['second']);
+                $excelDateValue = PHPExcel_Shared_Date::FormattedPHPToExcel(
+                    $PHPDateArray['year'],
+                    $PHPDateArray['month'],
+                    $PHPDateArray['day'],
+                    $PHPDateArray['hour'],
+                    $PHPDateArray['minute'],
+                    $PHPDateArray['second']
+                );
             } else {
                 $excelDateValue = PHPExcel_Shared_Date::FormattedPHPToExcel(1900, 1, 1, $PHPDateArray['hour'], $PHPDateArray['minute'], $PHPDateArray['second']) - 1;
             }
@@ -596,13 +635,13 @@ class PHPExcel_Calculation_DateTime {
                 case PHPExcel_Calculation_Functions::RETURNDATE_EXCEL:
                     return (float) $excelDateValue;
                 case PHPExcel_Calculation_Functions::RETURNDATE_PHP_NUMERIC:
-						return (integer) $phpDateValue = PHPExcel_Shared_Date::ExcelToPHP($excelDateValue+25569) - 3600;;
+                    return (integer) $phpDateValue = PHPExcel_Shared_Date::ExcelToPHP($excelDateValue+25569) - 3600;
                 case PHPExcel_Calculation_Functions::RETURNDATE_PHP_OBJECT:
                     return new DateTime('1900-01-01 '.$PHPDateArray['hour'].':'.$PHPDateArray['minute'].':'.$PHPDateArray['second']);
             }
         }
         return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function TIMEVALUE()
+    }
 
 
     /**
@@ -615,15 +654,16 @@ class PHPExcel_Calculation_DateTime {
      * @param    string    $unit
      * @return    integer    Interval between the dates
      */
-	public static function DATEDIF($startDate = 0, $endDate = 0, $unit = 'D') {
+    public static function DATEDIF($startDate = 0, $endDate = 0, $unit = 'D')
+    {
         $startDate = PHPExcel_Calculation_Functions::flattenSingleValue($startDate);
         $endDate   = PHPExcel_Calculation_Functions::flattenSingleValue($endDate);
         $unit      = strtoupper(PHPExcel_Calculation_Functions::flattenSingleValue($unit));
 
-		if (is_string($startDate = self::_getDateValue($startDate))) {
+        if (is_string($startDate = self::getDateValue($startDate))) {
             return PHPExcel_Calculation_Functions::VALUE();
         }
-		if (is_string($endDate = self::_getDateValue($endDate))) {
+        if (is_string($endDate = self::getDateValue($endDate))) {
             return PHPExcel_Calculation_Functions::VALUE();
         }
 
@@ -680,7 +720,9 @@ class PHPExcel_Calculation_DateTime {
                 break;
             case 'YM':
                 $retVal = intval($endMonths - $startMonths);
-				if ($retVal < 0) $retVal = 12 + $retVal;
+                if ($retVal < 0) {
+                    $retVal += 12;
+                }
                 //    We're only interested in full months
                 if ($endDays < $startDays) {
                     --$retVal;
@@ -694,14 +736,16 @@ class PHPExcel_Calculation_DateTime {
                         $endYears = $PHPEndDateObject->format('Y');
                     }
                     $retVal = $PHPEndDateObject->format('z') - $PHPStartDateObject->format('z');
-					if ($retVal < 0) { $retVal += 365; }
+                    if ($retVal < 0) {
+                        $retVal += 365;
+                    }
                 }
                 break;
             default:
                 $retVal = PHPExcel_Calculation_Functions::NaN();
         }
         return $retVal;
-	}	//	function DATEDIF()
+    }
 
 
     /**
@@ -733,14 +777,15 @@ class PHPExcel_Calculation_DateTime {
      *                                        same month.
      * @return    integer        Number of days between start date and end date
      */
-	public static function DAYS360($startDate = 0, $endDate = 0, $method = false) {
+    public static function DAYS360($startDate = 0, $endDate = 0, $method = false)
+    {
         $startDate    = PHPExcel_Calculation_Functions::flattenSingleValue($startDate);
         $endDate    = PHPExcel_Calculation_Functions::flattenSingleValue($endDate);
 
-		if (is_string($startDate = self::_getDateValue($startDate))) {
+        if (is_string($startDate = self::getDateValue($startDate))) {
             return PHPExcel_Calculation_Functions::VALUE();
         }
-		if (is_string($endDate = self::_getDateValue($endDate))) {
+        if (is_string($endDate = self::getDateValue($endDate))) {
             return PHPExcel_Calculation_Functions::VALUE();
         }
 
@@ -759,8 +804,8 @@ class PHPExcel_Calculation_DateTime {
         $endMonth = $PHPEndDateObject->format('n');
         $endYear = $PHPEndDateObject->format('Y');
 
-		return self::_dateDiff360($startDay, $startMonth, $startYear, $endDay, $endMonth, $endYear, !$method);
-	}	//	function DAYS360()
+        return self::dateDiff360($startDay, $startMonth, $startYear, $endDay, $endMonth, $endYear, !$method);
+    }
 
 
     /**
@@ -788,15 +833,16 @@ class PHPExcel_Calculation_DateTime {
      *                                        4                European 30/360
      * @return    float    fraction of the year
      */
-	public static function YEARFRAC($startDate = 0, $endDate = 0, $method = 0) {
+    public static function YEARFRAC($startDate = 0, $endDate = 0, $method = 0)
+    {
         $startDate    = PHPExcel_Calculation_Functions::flattenSingleValue($startDate);
         $endDate    = PHPExcel_Calculation_Functions::flattenSingleValue($endDate);
         $method        = PHPExcel_Calculation_Functions::flattenSingleValue($method);
 
-		if (is_string($startDate = self::_getDateValue($startDate))) {
+        if (is_string($startDate = self::getDateValue($startDate))) {
             return PHPExcel_Calculation_Functions::VALUE();
         }
-		if (is_string($endDate = self::_getDateValue($endDate))) {
+        if (is_string($endDate = self::getDateValue($endDate))) {
             return PHPExcel_Calculation_Functions::VALUE();
         }
 
@@ -811,7 +857,7 @@ class PHPExcel_Calculation_DateTime {
                     $years = $endYear - $startYear + 1;
                     $leapDays = 0;
                     if ($years == 1) {
-						if (self::_isLeapYear($endYear)) {
+                        if (self::isLeapYear($endYear)) {
                             $startMonth = self::MONTHOFYEAR($startDate);
                             $endMonth = self::MONTHOFYEAR($endDate);
                             $endDay = self::DAYOFMONTH($endDate);
@@ -826,20 +872,20 @@ class PHPExcel_Calculation_DateTime {
                                 $startMonth = self::MONTHOFYEAR($startDate);
                                 $startDay = self::DAYOFMONTH($startDate);
                                 if ($startMonth < 3) {
-									$leapDays += (self::_isLeapYear($year)) ? 1 : 0;
+                                    $leapDays += (self::isLeapYear($year)) ? 1 : 0;
                                 }
                             } elseif ($year == $endYear) {
                                 $endMonth = self::MONTHOFYEAR($endDate);
                                 $endDay = self::DAYOFMONTH($endDate);
                                 if (($endMonth * 100 + $endDay) >= (2 * 100 + 29)) {
-									$leapDays += (self::_isLeapYear($year)) ? 1 : 0;
+                                    $leapDays += (self::isLeapYear($year)) ? 1 : 0;
                                 }
                             } else {
-								$leapDays += (self::_isLeapYear($year)) ? 1 : 0;
+                                $leapDays += (self::isLeapYear($year)) ? 1 : 0;
                             }
                         }
                         if ($years == 2) {
-							if (($leapDays == 0) && (self::_isLeapYear($startYear)) && ($days > 365)) {
+                            if (($leapDays == 0) && (self::isLeapYear($startYear)) && ($days > 365)) {
                                 $leapDays = 1;
                             } elseif ($days < 366) {
                                 $years = 1;
@@ -853,11 +899,11 @@ class PHPExcel_Calculation_DateTime {
                 case 3:
                     return self::DATEDIF($startDate, $endDate) / 365;
                 case 4:
-					return self::DAYS360($startDate,$endDate,True) / 360;
+                    return self::DAYS360($startDate, $endDate, true) / 360;
             }
         }
         return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function YEARFRAC()
+    }
 
 
     /**
@@ -883,7 +929,8 @@ class PHPExcel_Calculation_DateTime {
      *                                            as state and federal holidays and floating holidays.
      * @return    integer            Interval between the dates
      */
-	public static function NETWORKDAYS($startDate,$endDate) {
+    public static function NETWORKDAYS($startDate, $endDate)
+    {
         //    Retrieve the mandatory start and end date that are referenced in the function definition
         $startDate    = PHPExcel_Calculation_Functions::flattenSingleValue($startDate);
         $endDate    = PHPExcel_Calculation_Functions::flattenSingleValue($endDate);
@@ -893,11 +940,11 @@ class PHPExcel_Calculation_DateTime {
         array_shift($dateArgs);
 
         //    Validate the start and end dates
-		if (is_string($startDate = $sDate = self::_getDateValue($startDate))) {
+        if (is_string($startDate = $sDate = self::getDateValue($startDate))) {
             return PHPExcel_Calculation_Functions::VALUE();
         }
         $startDate = (float) floor($startDate);
-		if (is_string($endDate = $eDate = self::_getDateValue($endDate))) {
+        if (is_string($endDate = $eDate = self::getDateValue($endDate))) {
             return PHPExcel_Calculation_Functions::VALUE();
         }
         $endDate = (float) floor($endDate);
@@ -909,9 +956,13 @@ class PHPExcel_Calculation_DateTime {
 
         // Execute function
         $startDoW = 6 - self::DAYOFWEEK($startDate, 2);
-		if ($startDoW < 0) { $startDoW = 0; }
+        if ($startDoW < 0) {
+            $startDoW = 0;
+        }
         $endDoW = self::DAYOFWEEK($endDate, 2);
-		if ($endDoW >= 6) { $endDoW = 0; }
+        if ($endDoW >= 6) {
+            $endDoW = 0;
+        }
 
         $wholeWeekDays = floor(($endDate - $startDate) / 7) * 5;
         $partWeekDays = $endDoW + $startDoW;
@@ -922,7 +973,7 @@ class PHPExcel_Calculation_DateTime {
         //    Test any extra holiday parameters
         $holidayCountedArray = array();
         foreach ($dateArgs as $holidayDate) {
-			if (is_string($holidayDate = self::_getDateValue($holidayDate))) {
+            if (is_string($holidayDate = self::getDateValue($holidayDate))) {
                 return PHPExcel_Calculation_Functions::VALUE();
             }
             if (($holidayDate >= $startDate) && ($holidayDate <= $endDate)) {
@@ -937,7 +988,7 @@ class PHPExcel_Calculation_DateTime {
             return 0 - ($wholeWeekDays + $partWeekDays);
         }
         return $wholeWeekDays + $partWeekDays;
-	}	//	function NETWORKDAYS()
+    }
 
 
     /**
@@ -965,7 +1016,8 @@ class PHPExcel_Calculation_DateTime {
      * @return    mixed    Excel date/time serial value, PHP date/time serial value or PHP date/time object,
      *                        depending on the value of the ReturnDateType flag
      */
-	public static function WORKDAY($startDate,$endDays) {
+    public static function WORKDAY($startDate, $endDays)
+    {
         //    Retrieve the mandatory start date and days that are referenced in the function definition
         $startDate    = PHPExcel_Calculation_Functions::flattenSingleValue($startDate);
         $endDays    = PHPExcel_Calculation_Functions::flattenSingleValue($endDays);
@@ -974,15 +1026,17 @@ class PHPExcel_Calculation_DateTime {
         array_shift($dateArgs);
         array_shift($dateArgs);
 
-		if ((is_string($startDate = self::_getDateValue($startDate))) || (!is_numeric($endDays))) {
+        if ((is_string($startDate = self::getDateValue($startDate))) || (!is_numeric($endDays))) {
             return PHPExcel_Calculation_Functions::VALUE();
         }
         $startDate = (float) floor($startDate);
         $endDays = (int) floor($endDays);
         //    If endDays is 0, we always return startDate
-		if ($endDays == 0) { return $startDate; }
+        if ($endDays == 0) {
+            return $startDate;
+        }
 
-		$decrementing = ($endDays < 0) ? True : False;
+        $decrementing = ($endDays < 0) ? true : false;
 
         //    Adjust the start date if it falls over a weekend
 
@@ -1005,8 +1059,8 @@ class PHPExcel_Calculation_DateTime {
         if (!empty($dateArgs)) {
             $holidayCountedArray = $holidayDates = array();
             foreach ($dateArgs as $holidayDate) {
-				if (($holidayDate !== NULL) && (trim($holidayDate) > '')) {
-					if (is_string($holidayDate = self::_getDateValue($holidayDate))) {
+                if (($holidayDate !== null) && (trim($holidayDate) > '')) {
+                    if (is_string($holidayDate = self::getDateValue($holidayDate))) {
                         return PHPExcel_Calculation_Functions::VALUE();
                     }
                     if (self::DAYOFWEEK($holidayDate, 3) < 5) {
@@ -1040,7 +1094,6 @@ class PHPExcel_Calculation_DateTime {
                 if ($endDoW >= 5) {
                     $endDate += ($decrementing) ? -$endDoW + 4 : 7 - $endDoW;
                 }
-
             }
         }
 
@@ -1052,7 +1105,7 @@ class PHPExcel_Calculation_DateTime {
             case PHPExcel_Calculation_Functions::RETURNDATE_PHP_OBJECT:
                 return PHPExcel_Shared_Date::ExcelToPHPObject($endDate);
         }
-	}	//	function WORKDAY()
+    }
 
 
     /**
@@ -1068,10 +1121,13 @@ class PHPExcel_Calculation_DateTime {
      *                                    PHP DateTime object, or a standard date string
      * @return    int        Day of the month
      */
-	public static function DAYOFMONTH($dateValue = 1) {
+    public static function DAYOFMONTH($dateValue = 1)
+    {
         $dateValue    = PHPExcel_Calculation_Functions::flattenSingleValue($dateValue);
 
-		if (is_string($dateValue = self::_getDateValue($dateValue))) {
+        if ($dateValue === null) {
+            $dateValue = 1;
+        } elseif (is_string($dateValue = self::getDateValue($dateValue))) {
             return PHPExcel_Calculation_Functions::VALUE();
         } elseif ($dateValue == 0.0) {
             return 0;
@@ -1083,7 +1139,7 @@ class PHPExcel_Calculation_DateTime {
         $PHPDateObject = PHPExcel_Shared_Date::ExcelToPHPObject($dateValue);
 
         return (int) $PHPDateObject->format('j');
-	}	//	function DAYOFMONTH()
+    }
 
 
     /**
@@ -1103,7 +1159,8 @@ class PHPExcel_Calculation_DateTime {
      *                                        3                Numbers 0 (Monday) through 6 (Sunday).
      * @return    int        Day of the week value
      */
-	public static function DAYOFWEEK($dateValue = 1, $style = 1) {
+    public static function DAYOFWEEK($dateValue = 1, $style = 1)
+    {
         $dateValue    = PHPExcel_Calculation_Functions::flattenSingleValue($dateValue);
         $style        = PHPExcel_Calculation_Functions::flattenSingleValue($style);
 
@@ -1114,7 +1171,9 @@ class PHPExcel_Calculation_DateTime {
         }
         $style = floor($style);
 
-		if (is_string($dateValue = self::_getDateValue($dateValue))) {
+        if ($dateValue === null) {
+            $dateValue = 1;
+        } elseif (is_string($dateValue = self::getDateValue($dateValue))) {
             return PHPExcel_Calculation_Functions::VALUE();
         } elseif ($dateValue < 0.0) {
             return PHPExcel_Calculation_Functions::NaN();
@@ -1126,11 +1185,18 @@ class PHPExcel_Calculation_DateTime {
 
         $firstDay = 1;
         switch ($style) {
-			case 1: ++$DoW;
+            case 1:
+                ++$DoW;
                 break;
-			case 2: if ($DoW == 0) { $DoW = 7; }
+            case 2:
+                if ($DoW == 0) {
+                    $DoW = 7;
+                }
                 break;
-			case 3: if ($DoW == 0) { $DoW = 7; }
+            case 3:
+                if ($DoW == 0) {
+                    $DoW = 7;
+                }
                 $firstDay = 0;
                 --$DoW;
                 break;
@@ -1146,7 +1212,7 @@ class PHPExcel_Calculation_DateTime {
         }
 
         return (int) $DoW;
-	}	//	function DAYOFWEEK()
+    }
 
 
     /**
@@ -1169,7 +1235,8 @@ class PHPExcel_Calculation_DateTime {
      *                                        2                Week begins on Monday.
      * @return    int        Week Number
      */
-	public static function WEEKOFYEAR($dateValue = 1, $method = 1) {
+    public static function WEEKOFYEAR($dateValue = 1, $method = 1)
+    {
         $dateValue    = PHPExcel_Calculation_Functions::flattenSingleValue($dateValue);
         $method        = PHPExcel_Calculation_Functions::flattenSingleValue($method);
 
@@ -1180,7 +1247,9 @@ class PHPExcel_Calculation_DateTime {
         }
         $method = floor($method);
 
-		if (is_string($dateValue = self::_getDateValue($dateValue))) {
+        if ($dateValue === null) {
+            $dateValue = 1;
+        } elseif (is_string($dateValue = self::getDateValue($dateValue))) {
             return PHPExcel_Calculation_Functions::VALUE();
         } elseif ($dateValue < 0.0) {
             return PHPExcel_Calculation_Functions::NaN();
@@ -1197,7 +1266,7 @@ class PHPExcel_Calculation_DateTime {
         $weekOfYear = ceil($dayOfYear / 7) + 1;
 
         return (int) $weekOfYear;
-	}	//	function WEEKOFYEAR()
+    }
 
 
     /**
@@ -1213,10 +1282,13 @@ class PHPExcel_Calculation_DateTime {
      *                                    PHP DateTime object, or a standard date string
      * @return    int        Month of the year
      */
-	public static function MONTHOFYEAR($dateValue = 1) {
+    public static function MONTHOFYEAR($dateValue = 1)
+    {
         $dateValue    = PHPExcel_Calculation_Functions::flattenSingleValue($dateValue);
 
-		if (is_string($dateValue = self::_getDateValue($dateValue))) {
+        if ($dateValue === null) {
+            $dateValue = 1;
+        } elseif (is_string($dateValue = self::getDateValue($dateValue))) {
             return PHPExcel_Calculation_Functions::VALUE();
         } elseif ($dateValue < 0.0) {
             return PHPExcel_Calculation_Functions::NaN();
@@ -1226,7 +1298,7 @@ class PHPExcel_Calculation_DateTime {
         $PHPDateObject = PHPExcel_Shared_Date::ExcelToPHPObject($dateValue);
 
         return (int) $PHPDateObject->format('n');
-	}	//	function MONTHOFYEAR()
+    }
 
 
     /**
@@ -1242,10 +1314,13 @@ class PHPExcel_Calculation_DateTime {
      *                                    PHP DateTime object, or a standard date string
      * @return    int        Year
      */
-	public static function YEAR($dateValue = 1) {
+    public static function YEAR($dateValue = 1)
+    {
         $dateValue    = PHPExcel_Calculation_Functions::flattenSingleValue($dateValue);
 
-		if (is_string($dateValue = self::_getDateValue($dateValue))) {
+        if ($dateValue === null) {
+            $dateValue = 1;
+        } elseif (is_string($dateValue = self::getDateValue($dateValue))) {
             return PHPExcel_Calculation_Functions::VALUE();
         } elseif ($dateValue < 0.0) {
             return PHPExcel_Calculation_Functions::NaN();
@@ -1255,7 +1330,7 @@ class PHPExcel_Calculation_DateTime {
         $PHPDateObject = PHPExcel_Shared_Date::ExcelToPHPObject($dateValue);
 
         return (int) $PHPDateObject->format('Y');
-	}	//	function YEAR()
+    }
 
 
     /**
@@ -1271,7 +1346,8 @@ class PHPExcel_Calculation_DateTime {
      *                                    PHP DateTime object, or a standard time string
      * @return    int        Hour
      */
-	public static function HOUROFDAY($timeValue = 0) {
+    public static function HOUROFDAY($timeValue = 0)
+    {
         $timeValue    = PHPExcel_Calculation_Functions::flattenSingleValue($timeValue);
 
         if (!is_numeric($timeValue)) {
@@ -1281,7 +1357,7 @@ class PHPExcel_Calculation_DateTime {
                     return PHPExcel_Calculation_Functions::VALUE();
                 }
             }
-			$timeValue = self::_getTimeValue($timeValue);
+            $timeValue = self::getTimeValue($timeValue);
             if (is_string($timeValue)) {
                 return PHPExcel_Calculation_Functions::VALUE();
             }
@@ -1295,7 +1371,7 @@ class PHPExcel_Calculation_DateTime {
         $timeValue = PHPExcel_Shared_Date::ExcelToPHP($timeValue);
 
         return (int) gmdate('G', $timeValue);
-	}	//	function HOUROFDAY()
+    }
 
 
     /**
@@ -1311,7 +1387,8 @@ class PHPExcel_Calculation_DateTime {
      *                                    PHP DateTime object, or a standard time string
      * @return    int        Minute
      */
-	public static function MINUTEOFHOUR($timeValue = 0) {
+    public static function MINUTEOFHOUR($timeValue = 0)
+    {
         $timeValue = $timeTester    = PHPExcel_Calculation_Functions::flattenSingleValue($timeValue);
 
         if (!is_numeric($timeValue)) {
@@ -1321,7 +1398,7 @@ class PHPExcel_Calculation_DateTime {
                     return PHPExcel_Calculation_Functions::VALUE();
                 }
             }
-			$timeValue = self::_getTimeValue($timeValue);
+            $timeValue = self::getTimeValue($timeValue);
             if (is_string($timeValue)) {
                 return PHPExcel_Calculation_Functions::VALUE();
             }
@@ -1335,7 +1412,7 @@ class PHPExcel_Calculation_DateTime {
         $timeValue = PHPExcel_Shared_Date::ExcelToPHP($timeValue);
 
         return (int) gmdate('i', $timeValue);
-	}	//	function MINUTEOFHOUR()
+    }
 
 
     /**
@@ -1351,7 +1428,8 @@ class PHPExcel_Calculation_DateTime {
      *                                    PHP DateTime object, or a standard time string
      * @return    int        Second
      */
-	public static function SECONDOFMINUTE($timeValue = 0) {
+    public static function SECONDOFMINUTE($timeValue = 0)
+    {
         $timeValue    = PHPExcel_Calculation_Functions::flattenSingleValue($timeValue);
 
         if (!is_numeric($timeValue)) {
@@ -1361,7 +1439,7 @@ class PHPExcel_Calculation_DateTime {
                     return PHPExcel_Calculation_Functions::VALUE();
                 }
             }
-			$timeValue = self::_getTimeValue($timeValue);
+            $timeValue = self::getTimeValue($timeValue);
             if (is_string($timeValue)) {
                 return PHPExcel_Calculation_Functions::VALUE();
             }
@@ -1375,7 +1453,7 @@ class PHPExcel_Calculation_DateTime {
         $timeValue = PHPExcel_Shared_Date::ExcelToPHP($timeValue);
 
         return (int) gmdate('s', $timeValue);
-	}	//	function SECONDOFMINUTE()
+    }
 
 
     /**
@@ -1397,7 +1475,8 @@ class PHPExcel_Calculation_DateTime {
      * @return    mixed    Excel date/time serial value, PHP date/time serial value or PHP date/time object,
      *                        depending on the value of the ReturnDateType flag
      */
-	public static function EDATE($dateValue = 1, $adjustmentMonths = 0) {
+    public static function EDATE($dateValue = 1, $adjustmentMonths = 0)
+    {
         $dateValue            = PHPExcel_Calculation_Functions::flattenSingleValue($dateValue);
         $adjustmentMonths    = PHPExcel_Calculation_Functions::flattenSingleValue($adjustmentMonths);
 
@@ -1406,12 +1485,12 @@ class PHPExcel_Calculation_DateTime {
         }
         $adjustmentMonths = floor($adjustmentMonths);
 
-		if (is_string($dateValue = self::_getDateValue($dateValue))) {
+        if (is_string($dateValue = self::getDateValue($dateValue))) {
             return PHPExcel_Calculation_Functions::VALUE();
         }
 
         // Execute function
-		$PHPDateObject = self::_adjustDateByMonths($dateValue,$adjustmentMonths);
+        $PHPDateObject = self::adjustDateByMonths($dateValue, $adjustmentMonths);
 
         switch (PHPExcel_Calculation_Functions::getReturnDateType()) {
             case PHPExcel_Calculation_Functions::RETURNDATE_EXCEL:
@@ -1421,7 +1500,7 @@ class PHPExcel_Calculation_DateTime {
             case PHPExcel_Calculation_Functions::RETURNDATE_PHP_OBJECT:
                 return $PHPDateObject;
         }
-	}	//	function EDATE()
+    }
 
 
     /**
@@ -1442,7 +1521,8 @@ class PHPExcel_Calculation_DateTime {
      * @return    mixed    Excel date/time serial value, PHP date/time serial value or PHP date/time object,
      *                        depending on the value of the ReturnDateType flag
      */
-	public static function EOMONTH($dateValue = 1, $adjustmentMonths = 0) {
+    public static function EOMONTH($dateValue = 1, $adjustmentMonths = 0)
+    {
         $dateValue            = PHPExcel_Calculation_Functions::flattenSingleValue($dateValue);
         $adjustmentMonths    = PHPExcel_Calculation_Functions::flattenSingleValue($adjustmentMonths);
 
@@ -1451,12 +1531,12 @@ class PHPExcel_Calculation_DateTime {
         }
         $adjustmentMonths = floor($adjustmentMonths);
 
-		if (is_string($dateValue = self::_getDateValue($dateValue))) {
+        if (is_string($dateValue = self::getDateValue($dateValue))) {
             return PHPExcel_Calculation_Functions::VALUE();
         }
 
         // Execute function
-		$PHPDateObject = self::_adjustDateByMonths($dateValue,$adjustmentMonths+1);
+        $PHPDateObject = self::adjustDateByMonths($dateValue, $adjustmentMonths+1);
         $adjustDays = (int) $PHPDateObject->format('d');
         $adjustDaysString = '-' . $adjustDays . ' days';
         $PHPDateObject->modify($adjustDaysString);
@@ -1469,7 +1549,5 @@ class PHPExcel_Calculation_DateTime {
             case PHPExcel_Calculation_Functions::RETURNDATE_PHP_OBJECT:
                 return $PHPDateObject;
         }
-	}	//	function EOMONTH()
-
-}	//	class PHPExcel_Calculation_DateTime
-
+    }
+}

Classes/PHPExcel/Calculation/Exception.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * PHPExcel
+ * PHPExcel_Calculation_Exception
  *
- * Copyright (c) 2006 - 2013 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,20 +21,12 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-
-/**
- * PHPExcel_Calculation_Exception
- *
- * @category   PHPExcel
- * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Calculation_Exception extends PHPExcel_Exception {
+class PHPExcel_Calculation_Exception extends PHPExcel_Exception
+{
     /**
      * Error handler callback
      *
@@ -43,7 +36,8 @@ class PHPExcel_Calculation_Exception extends PHPExcel_Exception {
      * @param mixed $line
      * @param mixed $context
      */
-	public static function errorHandlerCallback($code, $string, $file, $line, $context) {
+    public static function errorHandlerCallback($code, $string, $file, $line, $context)
+    {
         $e = new self($string, $code);
         $e->line = $line;
         $e->file = $file;

Classes/PHPExcel/Calculation/ExceptionHandler.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * PHPExcel
+ * PHPExcel_Calculation_ExceptionHandler
  *
- * Copyright (c) 2006 - 2013 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,30 +21,25 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-/**
- * PHPExcel_Calculation_ExceptionHandler
- *
- * @category   PHPExcel
- * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Calculation_ExceptionHandler {
+class PHPExcel_Calculation_ExceptionHandler
+{
     /**
      * Register errorhandler
      */
-	public function __construct() {
+    public function __construct()
+    {
         set_error_handler(array('PHPExcel_Calculation_Exception', 'errorHandlerCallback'), E_ALL);
     }
 
     /**
      * Unregister errorhandler
      */
-	public function __destruct() {
+    public function __destruct()
+    {
         restore_error_handler();
     }
 }

Classes/PHPExcel/Calculation/FormulaParser.php

@@ -1,30 +1,4 @@
 <?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2013 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
 
 /*
 PARTLY BASED ON:
@@ -52,11 +26,32 @@ PARTLY BASED ON:
 /**
  * PHPExcel_Calculation_FormulaParser
  *
+ * 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
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
  * @category   PHPExcel
  * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-class PHPExcel_Calculation_FormulaParser {
+
+
+class PHPExcel_Calculation_FormulaParser
+{
     /* Character constants */
     const QUOTE_DOUBLE  = '"';
     const QUOTE_SINGLE  = '\'';
@@ -80,14 +75,14 @@ class PHPExcel_Calculation_FormulaParser {
      *
      * @var string
      */
-	private $_formula;
+    private $formula;
 
     /**
      * Tokens
      *
      * @var PHPExcel_Calculation_FormulaToken[]
      */
-	private $_tokens = array();
+    private $tokens = array();
 
     /**
      * Create a new PHPExcel_Calculation_FormulaParser
@@ -103,9 +98,9 @@ class PHPExcel_Calculation_FormulaParser {
         }
 
         // Initialise values
-    	$this->_formula = trim($pFormula);
+        $this->formula = trim($pFormula);
         // Parse!
-    	$this->_parseToTokens();
+        $this->parseToTokens();
     }
 
     /**
@@ -113,8 +108,9 @@ class PHPExcel_Calculation_FormulaParser {
      *
      * @return string
      */
-    public function getFormula() {
-    	return $this->_formula;
+    public function getFormula()
+    {
+        return $this->formula;
     }
 
     /**
@@ -124,9 +120,10 @@ class PHPExcel_Calculation_FormulaParser {
      * @return    string
      * @throws  PHPExcel_Calculation_Exception
      */
-    public function getToken($pId = 0) {
-    	if (isset($this->_tokens[$pId])) {
-    		return $this->_tokens[$pId];
+    public function getToken($pId = 0)
+    {
+        if (isset($this->tokens[$pId])) {
+            return $this->tokens[$pId];
         } else {
             throw new PHPExcel_Calculation_Exception("Token with id $pId does not exist.");
         }
@@ -137,8 +134,9 @@ class PHPExcel_Calculation_FormulaParser {
      *
      * @return string
      */
-    public function getTokenCount() {
-    	return count($this->_tokens);
+    public function getTokenCount()
+    {
+        return count($this->tokens);
     }
 
     /**
@@ -146,20 +144,24 @@ class PHPExcel_Calculation_FormulaParser {
      *
      * @return PHPExcel_Calculation_FormulaToken[]
      */
-    public function getTokens() {
-    	return $this->_tokens;
+    public function getTokens()
+    {
+        return $this->tokens;
     }
 
     /**
      * Parse to tokens
      */
-    private function _parseToTokens() {
+    private function parseToTokens()
+    {
         // No attempt is made to verify formulas; assumes formulas are derived from Excel, where
         // they can only exist if valid; stack overflows/underflows sunk as nulls without exceptions.
 
         // Check if the formula has a valid starting =
-		$formulaLength = strlen($this->_formula);
-		if ($formulaLength < 2 || $this->_formula{0} != '=') return;
+        $formulaLength = strlen($this->formula);
+        if ($formulaLength < 2 || $this->formula{0} != '=') {
+            return;
+        }
 
         // Helper variables
         $tokens1    = $tokens2     = $stack = array();
@@ -179,8 +181,8 @@ class PHPExcel_Calculation_FormulaParser {
             // embeds are doubled
             // end marks token
             if ($inString) {
-				if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::QUOTE_DOUBLE) {
-					if ((($index + 2) <= $formulaLength) && ($this->_formula{$index + 1} == PHPExcel_Calculation_FormulaParser::QUOTE_DOUBLE)) {
+                if ($this->formula{$index} == PHPExcel_Calculation_FormulaParser::QUOTE_DOUBLE) {
+                    if ((($index + 2) <= $formulaLength) && ($this->formula{$index + 1} == PHPExcel_Calculation_FormulaParser::QUOTE_DOUBLE)) {
                         $value .= PHPExcel_Calculation_FormulaParser::QUOTE_DOUBLE;
                         ++$index;
                     } else {
@@ -189,7 +191,7 @@ class PHPExcel_Calculation_FormulaParser {
                         $value = "";
                     }
                 } else {
-					$value .= $this->_formula{$index};
+                    $value .= $this->formula{$index};
                 }
                 ++$index;
                 continue;
@@ -199,15 +201,15 @@ class PHPExcel_Calculation_FormulaParser {
             // embeds are double
             // end does not mark a token
             if ($inPath) {
-				if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::QUOTE_SINGLE) {
-					if ((($index + 2) <= $formulaLength) && ($this->_formula{$index + 1} == PHPExcel_Calculation_FormulaParser::QUOTE_SINGLE)) {
+                if ($this->formula{$index} == PHPExcel_Calculation_FormulaParser::QUOTE_SINGLE) {
+                    if ((($index + 2) <= $formulaLength) && ($this->formula{$index + 1} == PHPExcel_Calculation_FormulaParser::QUOTE_SINGLE)) {
                         $value .= PHPExcel_Calculation_FormulaParser::QUOTE_SINGLE;
                         ++$index;
                     } else {
                         $inPath = false;
                     }
                 } else {
-					$value .= $this->_formula{$index};
+                    $value .= $this->formula{$index};
                 }
                 ++$index;
                 continue;
@@ -217,10 +219,10 @@ class PHPExcel_Calculation_FormulaParser {
             // no embeds (changed to "()" by Excel)
             // end does not mark a token
             if ($inRange) {
-				if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::BRACKET_CLOSE) {
+                if ($this->formula{$index} == PHPExcel_Calculation_FormulaParser::BRACKET_CLOSE) {
                     $inRange = false;
                 }
-				$value .= $this->_formula{$index};
+                $value .= $this->formula{$index};
                 ++$index;
                 continue;
             }
@@ -228,7 +230,7 @@ class PHPExcel_Calculation_FormulaParser {
             // error values
             // end marks a token, determined from absolute list of values
             if ($inError) {
-				$value .= $this->_formula{$index};
+                $value .= $this->formula{$index};
                 ++$index;
                 if (in_array($value, $ERRORS)) {
                     $inError = false;
@@ -239,10 +241,10 @@ class PHPExcel_Calculation_FormulaParser {
             }
 
             // scientific notation check
-			if (strpos(PHPExcel_Calculation_FormulaParser::OPERATORS_SN, $this->_formula{$index}) !== false) {
+            if (strpos(PHPExcel_Calculation_FormulaParser::OPERATORS_SN, $this->formula{$index}) !== false) {
                 if (strlen($value) > 1) {
-					if (preg_match("/^[1-9]{1}(\.[0-9]+)?E{1}$/", $this->_formula{$index}) != 0) {
-						$value .= $this->_formula{$index};
+                    if (preg_match("/^[1-9]{1}(\.[0-9]+)?E{1}$/", $this->formula{$index}) != 0) {
+                        $value .= $this->formula{$index};
                         ++$index;
                         continue;
                     }
@@ -252,8 +254,9 @@ class PHPExcel_Calculation_FormulaParser {
             // independent character evaluation (order not important)
 
             // establish state-dependent character evaluations
-			if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::QUOTE_DOUBLE) {
-				if (strlen($value > 0)) {  // unexpected
+            if ($this->formula{$index} == PHPExcel_Calculation_FormulaParser::QUOTE_DOUBLE) {
+                if (strlen($value > 0)) {
+                    // unexpected
                     $tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_UNKNOWN);
                     $value = "";
                 }
@@ -262,8 +265,9 @@ class PHPExcel_Calculation_FormulaParser {
                 continue;
             }
 
-			if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::QUOTE_SINGLE) {
-				if (strlen($value) > 0) { // unexpected
+            if ($this->formula{$index} == PHPExcel_Calculation_FormulaParser::QUOTE_SINGLE) {
+                if (strlen($value) > 0) {
+                    // unexpected
                     $tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_UNKNOWN);
                     $value = "";
                 }
@@ -272,15 +276,16 @@ class PHPExcel_Calculation_FormulaParser {
                 continue;
             }
 
-			if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::BRACKET_OPEN) {
+            if ($this->formula{$index} == PHPExcel_Calculation_FormulaParser::BRACKET_OPEN) {
                 $inRange = true;
                 $value .= PHPExcel_Calculation_FormulaParser::BRACKET_OPEN;
                 ++$index;
                 continue;
             }
 
-			if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::ERROR_START) {
-				if (strlen($value) > 0) { // unexpected
+            if ($this->formula{$index} == PHPExcel_Calculation_FormulaParser::ERROR_START) {
+                if (strlen($value) > 0) {
+                    // unexpected
                     $tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_UNKNOWN);
                     $value = "";
                 }
@@ -291,8 +296,9 @@ class PHPExcel_Calculation_FormulaParser {
             }
 
             // mark start and end of arrays and array rows
-			if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::BRACE_OPEN) {
-				if (strlen($value) > 0) { // unexpected
+            if ($this->formula{$index} == PHPExcel_Calculation_FormulaParser::BRACE_OPEN) {
+                if (strlen($value) > 0) {
+                    // unexpected
                     $tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_UNKNOWN);
                     $value = "";
                 }
@@ -309,7 +315,7 @@ class PHPExcel_Calculation_FormulaParser {
                 continue;
             }
 
-			if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::SEMICOLON) {
+            if ($this->formula{$index} == PHPExcel_Calculation_FormulaParser::SEMICOLON) {
                 if (strlen($value) > 0) {
                     $tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND);
                     $value = "";
@@ -331,7 +337,7 @@ class PHPExcel_Calculation_FormulaParser {
                 continue;
             }
 
-			if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::BRACE_CLOSE) {
+            if ($this->formula{$index} == PHPExcel_Calculation_FormulaParser::BRACE_CLOSE) {
                 if (strlen($value) > 0) {
                     $tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND);
                     $value = "";
@@ -352,14 +358,14 @@ class PHPExcel_Calculation_FormulaParser {
             }
 
             // trim white-space
-			if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::WHITESPACE) {
+            if ($this->formula{$index} == PHPExcel_Calculation_FormulaParser::WHITESPACE) {
                 if (strlen($value) > 0) {
                     $tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND);
                     $value = "";
                 }
                 $tokens1[] = new PHPExcel_Calculation_FormulaToken("", PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_WHITESPACE);
                 ++$index;
-				while (($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::WHITESPACE) && ($index < $formulaLength)) {
+                while (($this->formula{$index} == PHPExcel_Calculation_FormulaParser::WHITESPACE) && ($index < $formulaLength)) {
                     ++$index;
                 }
                 continue;
@@ -367,41 +373,41 @@ class PHPExcel_Calculation_FormulaParser {
 
             // multi-character comparators
             if (($index + 2) <= $formulaLength) {
-				if (in_array(substr($this->_formula, $index, 2), $COMPARATORS_MULTI)) {
+                if (in_array(substr($this->formula, $index, 2), $COMPARATORS_MULTI)) {
                     if (strlen($value) > 0) {
                         $tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND);
                         $value = "";
                     }
-					$tokens1[] = new PHPExcel_Calculation_FormulaToken(substr($this->_formula, $index, 2), PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORINFIX, PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_LOGICAL);
+                    $tokens1[] = new PHPExcel_Calculation_FormulaToken(substr($this->formula, $index, 2), PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORINFIX, PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_LOGICAL);
                     $index += 2;
                     continue;
                 }
             }
 
             // standard infix operators
-			if (strpos(PHPExcel_Calculation_FormulaParser::OPERATORS_INFIX, $this->_formula{$index}) !== false) {
+            if (strpos(PHPExcel_Calculation_FormulaParser::OPERATORS_INFIX, $this->formula{$index}) !== false) {
                 if (strlen($value) > 0) {
                     $tokens1[] =new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND);
                     $value = "";
                 }
-				$tokens1[] = new PHPExcel_Calculation_FormulaToken($this->_formula{$index}, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORINFIX);
+                $tokens1[] = new PHPExcel_Calculation_FormulaToken($this->formula{$index}, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORINFIX);
                 ++$index;
                 continue;
             }
 
             // standard postfix operators (only one)
-			if (strpos(PHPExcel_Calculation_FormulaParser::OPERATORS_POSTFIX, $this->_formula{$index}) !== false) {
+            if (strpos(PHPExcel_Calculation_FormulaParser::OPERATORS_POSTFIX, $this->formula{$index}) !== false) {
                 if (strlen($value) > 0) {
                     $tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND);
                     $value = "";
                 }
-				$tokens1[] = new PHPExcel_Calculation_FormulaToken($this->_formula{$index}, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORPOSTFIX);
+                $tokens1[] = new PHPExcel_Calculation_FormulaToken($this->formula{$index}, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORPOSTFIX);
                 ++$index;
                 continue;
             }
 
             // start subexpression or function
-			if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::PAREN_OPEN) {
+            if ($this->formula{$index} == PHPExcel_Calculation_FormulaParser::PAREN_OPEN) {
                 if (strlen($value) > 0) {
                     $tmp = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_FUNCTION, PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_START);
                     $tokens1[] = $tmp;
@@ -417,7 +423,7 @@ class PHPExcel_Calculation_FormulaParser {
             }
 
             // function, subexpression, or array parameters, or operand unions
-			if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::COMMA) {
+            if ($this->formula{$index} == PHPExcel_Calculation_FormulaParser::COMMA) {
                 if (strlen($value) > 0) {
                     $tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND);
                     $value = "";
@@ -438,7 +444,7 @@ class PHPExcel_Calculation_FormulaParser {
             }
 
             // stop subexpression
-			if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::PAREN_CLOSE) {
+            if ($this->formula{$index} == PHPExcel_Calculation_FormulaParser::PAREN_CLOSE) {
                 if (strlen($value) > 0) {
                     $tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND);
                     $value = "";
@@ -454,7 +460,7 @@ class PHPExcel_Calculation_FormulaParser {
             }
 
             // token accumulation
-			$value .= $this->_formula{$index};
+            $value .= $this->formula{$index};
             ++$index;
         }
 
@@ -516,7 +522,7 @@ class PHPExcel_Calculation_FormulaParser {
 
         // move tokens to final list, switching infix "-" operators to prefix when appropriate, switching infix "+" operators
         // to noop when appropriate, identifying operand and infix-operator subtypes, and pulling "@" from function names
-		$this->_tokens = array();
+        $this->tokens = array();
 
         $tokenCount = count($tokens2);
         for ($i = 0; $i < $tokenCount; ++$i) {
@@ -539,40 +545,41 @@ class PHPExcel_Calculation_FormulaParser {
             if ($token->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORINFIX && $token->getValue() == "-") {
                 if ($i == 0) {
                     $token->setTokenType(PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORPREFIX);
-				} else if (
-							(($previousToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_FUNCTION) && ($previousToken->getTokenSubType() == PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_STOP)) ||
-							(($previousToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_SUBEXPRESSION) && ($previousToken->getTokenSubType() == PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_STOP)) ||
+                } elseif ((($previousToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_FUNCTION) &&
+                    ($previousToken->getTokenSubType() == PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_STOP)) ||
+                    (($previousToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_SUBEXPRESSION) &&
+                    ($previousToken->getTokenSubType() == PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_STOP)) ||
                     ($previousToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORPOSTFIX) ||
-							($previousToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND)
-						) {
+                    ($previousToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND)) {
                     $token->setTokenSubType(PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_MATH);
                 } else {
                     $token->setTokenType(PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORPREFIX);
                 }
 
-				$this->_tokens[] = $token;
+                $this->tokens[] = $token;
                 continue;
             }
 
             if ($token->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORINFIX && $token->getValue() == "+") {
                 if ($i == 0) {
                     continue;
-				} else if (
-							(($previousToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_FUNCTION) && ($previousToken->getTokenSubType() == PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_STOP)) ||
-							(($previousToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_SUBEXPRESSION) && ($previousToken->getTokenSubType() == PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_STOP)) ||
+                } elseif ((($previousToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_FUNCTION) &&
+                    ($previousToken->getTokenSubType() == PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_STOP)) ||
+                    (($previousToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_SUBEXPRESSION) &&
+                    ($previousToken->getTokenSubType() == PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_STOP)) ||
                     ($previousToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORPOSTFIX) ||
-							($previousToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND)
-						) {
+                    ($previousToken->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND)) {
                     $token->setTokenSubType(PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_MATH);
                 } else {
                     continue;
                 }
 
-				$this->_tokens[] = $token;
+                $this->tokens[] = $token;
                 continue;
             }
 
-			if ($token->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORINFIX && $token->getTokenSubType() == PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_NOTHING) {
+            if ($token->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORINFIX &&
+                $token->getTokenSubType() == PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_NOTHING) {
                 if (strpos("<>=", substr($token->getValue(), 0, 1)) !== false) {
                     $token->setTokenSubType(PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_LOGICAL);
                 } elseif ($token->getValue() == "&") {
@@ -581,11 +588,12 @@ class PHPExcel_Calculation_FormulaParser {
                     $token->setTokenSubType(PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_MATH);
                 }
 
-				$this->_tokens[] = $token;
+                $this->tokens[] = $token;
                 continue;
             }
 
-			if ($token->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND && $token->getTokenSubType() == PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_NOTHING) {
+            if ($token->getTokenType() == PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND &&
+                $token->getTokenSubType() == PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_NOTHING) {
                 if (!is_numeric($token->getValue())) {
                     if (strtoupper($token->getValue()) == "TRUE" || strtoupper($token->getValue() == "FALSE")) {
                         $token->setTokenSubType(PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_LOGICAL);
@@ -596,7 +604,7 @@ class PHPExcel_Calculation_FormulaParser {
                     $token->setTokenSubType(PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_NUMBER);
                 }
 
-				$this->_tokens[] = $token;
+                $this->tokens[] = $token;
                 continue;
             }
 
@@ -608,7 +616,7 @@ class PHPExcel_Calculation_FormulaParser {
                 }
             }
 
-        	$this->_tokens[] = $token;
+            $this->tokens[] = $token;
         }
     }
 }

Classes/PHPExcel/Calculation/FormulaToken.php

@@ -1,30 +1,4 @@
 <?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2013 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * @category   PHPExcel
- * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version    ##VERSION##, ##DATE##
- */
-
 
 /*
 PARTLY BASED ON:
@@ -49,15 +23,35 @@ PARTLY BASED ON:
     http://ewbi.blogs.com/develops/2004/12/excel_formula_p.html
 */
 
-
 /**
  * PHPExcel_Calculation_FormulaToken
  *
+ * 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
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
  * @category   PHPExcel
  * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-class PHPExcel_Calculation_FormulaToken {
+
+
+class PHPExcel_Calculation_FormulaToken
+{
     /* Token types */
     const TOKEN_TYPE_NOOP            = 'Noop';
     const TOKEN_TYPE_OPERAND         = 'Operand';
@@ -89,21 +83,21 @@ class PHPExcel_Calculation_FormulaToken {
      *
      * @var string
      */
-	private $_value;
+    private $value;
 
     /**
      * Token Type (represented by TOKEN_TYPE_*)
      *
      * @var string
      */
-	private $_tokenType;
+    private $tokenType;
 
     /**
      * Token SubType (represented by TOKEN_SUBTYPE_*)
      *
      * @var string
      */
-	private $_tokenSubType;
+    private $tokenSubType;
 
     /**
      * Create a new PHPExcel_Calculation_FormulaToken
@@ -115,9 +109,9 @@ class PHPExcel_Calculation_FormulaToken {
     public function __construct($pValue, $pTokenType = PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_UNKNOWN, $pTokenSubType = PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_NOTHING)
     {
         // Initialise values
-    	$this->_value				= $pValue;
-    	$this->_tokenType			= $pTokenType;
-    	$this->_tokenSubType 		= $pTokenSubType;
+        $this->value       = $pValue;
+        $this->tokenType    = $pTokenType;
+        $this->tokenSubType = $pTokenSubType;
     }
 
     /**
@@ -125,8 +119,9 @@ class PHPExcel_Calculation_FormulaToken {
      *
      * @return string
      */
-    public function getValue() {
-    	return $this->_value;
+    public function getValue()
+    {
+        return $this->value;
     }
 
     /**
@@ -134,8 +129,9 @@ class PHPExcel_Calculation_FormulaToken {
      *
      * @param string    $value
      */
-    public function setValue($value) {
-    	$this->_value = $value;
+    public function setValue($value)
+    {
+        $this->value = $value;
     }
 
     /**
@@ -143,8 +139,9 @@ class PHPExcel_Calculation_FormulaToken {
      *
      * @return string
      */
-    public function getTokenType() {
-    	return $this->_tokenType;
+    public function getTokenType()
+    {
+        return $this->tokenType;
     }
 
     /**
@@ -152,8 +149,9 @@ class PHPExcel_Calculation_FormulaToken {
      *
      * @param string    $value
      */
-    public function setTokenType($value = PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_UNKNOWN) {
-    	$this->_tokenType = $value;
+    public function setTokenType($value = PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_UNKNOWN)
+    {
+        $this->tokenType = $value;
     }
 
     /**
@@ -161,8 +159,9 @@ class PHPExcel_Calculation_FormulaToken {
      *
      * @return string
      */
-    public function getTokenSubType() {
-    	return $this->_tokenSubType;
+    public function getTokenSubType()
+    {
+        return $this->tokenSubType;
     }
 
     /**
@@ -170,7 +169,8 @@ class PHPExcel_Calculation_FormulaToken {
      *
      * @param string    $value
      */
-    public function setTokenSubType($value = PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_NOTHING) {
-    	$this->_tokenSubType = $value;
+    public function setTokenSubType($value = PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_NOTHING)
+    {
+        $this->tokenSubType = $value;
     }
 }

Classes/PHPExcel/Calculation/Function.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * PHPExcel
+ * PHPExcel_Calculation_Function
  *
- * Copyright (c) 2006 - 2013 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,20 +21,12 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-
-/**
- * PHPExcel_Calculation_Function
- *
- * @category   PHPExcel
- * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Calculation_Function {
+class PHPExcel_Calculation_Function
+{
     /* Function categories */
     const CATEGORY_CUBE                 = 'Cube';
     const CATEGORY_DATABASE             = 'Database';
@@ -52,21 +45,21 @@ class PHPExcel_Calculation_Function {
      *
      * @var string
      */
-	private $_category;
+    private $category;
 
     /**
      * Excel name
      *
      * @var string
      */
-	private $_excelName;
+    private $excelName;
 
     /**
      * PHPExcel name
      *
      * @var string
      */
-	private $_phpExcelName;
+    private $phpExcelName;
 
     /**
      * Create a new PHPExcel_Calculation_Function
@@ -76,13 +69,13 @@ class PHPExcel_Calculation_Function {
      * @param     string        $pPHPExcelName    PHPExcel function mapping
      * @throws     PHPExcel_Calculation_Exception
      */
-    public function __construct($pCategory = NULL, $pExcelName = NULL, $pPHPExcelName = NULL)
+    public function __construct($pCategory = null, $pExcelName = null, $pPHPExcelName = null)
     {
-    	if (($pCategory !== NULL) && ($pExcelName !== NULL) && ($pPHPExcelName !== NULL)) {
+        if (($pCategory !== null) && ($pExcelName !== null) && ($pPHPExcelName !== null)) {
             // Initialise values
-    		$this->_category 		= $pCategory;
-    		$this->_excelName 		= $pExcelName;
-    		$this->_phpExcelName 	= $pPHPExcelName;
+            $this->category     = $pCategory;
+            $this->excelName    = $pExcelName;
+            $this->phpExcelName = $pPHPExcelName;
         } else {
             throw new PHPExcel_Calculation_Exception("Invalid parameters passed.");
         }
@@ -93,8 +86,9 @@ class PHPExcel_Calculation_Function {
      *
      * @return string
      */
-    public function getCategory() {
-    	return $this->_category;
+    public function getCategory()
+    {
+        return $this->category;
     }
 
     /**
@@ -103,9 +97,10 @@ class PHPExcel_Calculation_Function {
      * @param     string        $value
      * @throws     PHPExcel_Calculation_Exception
      */
-    public function setCategory($value = null) {
+    public function setCategory($value = null)
+    {
         if (!is_null($value)) {
-    		$this->_category = $value;
+            $this->category = $value;
         } else {
             throw new PHPExcel_Calculation_Exception("Invalid parameter passed.");
         }
@@ -116,8 +111,9 @@ class PHPExcel_Calculation_Function {
      *
      * @return string
      */
-    public function getExcelName() {
-    	return $this->_excelName;
+    public function getExcelName()
+    {
+        return $this->excelName;
     }
 
     /**
@@ -125,8 +121,9 @@ class PHPExcel_Calculation_Function {
      *
      * @param string    $value
      */
-    public function setExcelName($value) {
-    	$this->_excelName = $value;
+    public function setExcelName($value)
+    {
+        $this->excelName = $value;
     }
 
     /**
@@ -134,8 +131,9 @@ class PHPExcel_Calculation_Function {
      *
      * @return string
      */
-    public function getPHPExcelName() {
-    	return $this->_phpExcelName;
+    public function getPHPExcelName()
+    {
+        return $this->phpExcelName;
     }
 
     /**
@@ -143,7 +141,8 @@ class PHPExcel_Calculation_Function {
      *
      * @param string    $value
      */
-    public function setPHPExcelName($value) {
-    	$this->_phpExcelName = $value;
+    public function setPHPExcelName($value)
+    {
+        $this->phpExcelName = $value;
     }
 }

Classes/PHPExcel/Calculation/Functions.php

@@ -1,30 +1,4 @@
 <?php
-/**
- * PHPExcel
- *
- * Copyright (c) 2006 - 2013 PHPExcel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * @category	PHPExcel
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- * @license		http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt	LGPL
- * @version		##VERSION##, ##DATE##
- */
-
 
 /** PHPExcel root directory */
 if (!defined('PHPEXCEL_ROOT')) {
@@ -52,11 +26,30 @@ define('PRECISION', 8.88E-016);
 /**
  * PHPExcel_Calculation_Functions
  *
+ * 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
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
  * @category    PHPExcel
  * @package        PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-class PHPExcel_Calculation_Functions {
+class PHPExcel_Calculation_Functions
+{
 
     /** constants */
     const COMPATIBILITY_EXCEL      = 'Excel';
@@ -82,7 +75,7 @@ class PHPExcel_Calculation_Functions {
      * @access    private
      * @var string
      */
-	protected static $ReturnDateType	= self::RETURNDATE_EXCEL;
+    protected static $returnDateType = self::RETURNDATE_EXCEL;
 
     /**
      * List of error codes
@@ -90,7 +83,8 @@ class PHPExcel_Calculation_Functions {
      * @access    private
      * @var array
      */
-	protected static $_errorCodes	= array( 'null'				=> '#NULL!',
+    protected static $errorCodes = array(
+        'null'           => '#NULL!',
         'divisionbyzero' => '#DIV/0!',
         'value'          => '#VALUE!',
         'reference'      => '#REF!',
@@ -113,15 +107,16 @@ class PHPExcel_Calculation_Functions {
      *                                                    PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE    'OpenOfficeCalc'
      * @return     boolean    (Success or Failure)
      */
-	public static function setCompatibilityMode($compatibilityMode) {
+    public static function setCompatibilityMode($compatibilityMode)
+    {
         if (($compatibilityMode == self::COMPATIBILITY_EXCEL) ||
             ($compatibilityMode == self::COMPATIBILITY_GNUMERIC) ||
             ($compatibilityMode == self::COMPATIBILITY_OPENOFFICE)) {
             self::$compatibilityMode = $compatibilityMode;
-			return True;
+            return true;
+        }
+        return false;
     }
-		return False;
-	}	//	function setCompatibilityMode()
 
 
     /**
@@ -135,9 +130,10 @@ class PHPExcel_Calculation_Functions {
      *                                PHPExcel_Calculation_Functions::COMPATIBILITY_GNUMERIC        'Gnumeric'
      *                                PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE    'OpenOfficeCalc'
      */
-	public static function getCompatibilityMode() {
+    public static function getCompatibilityMode()
+    {
         return self::$compatibilityMode;
-	}	//	function getCompatibilityMode()
+    }
 
 
     /**
@@ -152,15 +148,16 @@ class PHPExcel_Calculation_Functions {
      *                                                    PHPExcel_Calculation_Functions::RETURNDATE_EXCEL            'E'
      * @return     boolean                            Success or failure
      */
-	public static function setReturnDateType($returnDateType) {
+    public static function setReturnDateType($returnDateType)
+    {
         if (($returnDateType == self::RETURNDATE_PHP_NUMERIC) ||
             ($returnDateType == self::RETURNDATE_PHP_OBJECT) ||
             ($returnDateType == self::RETURNDATE_EXCEL)) {
-			self::$ReturnDateType = $returnDateType;
-			return True;
+            self::$returnDateType = $returnDateType;
+            return true;
+        }
+        return false;
     }
-		return False;
-	}	//	function setReturnDateType()
 
 
     /**
@@ -174,9 +171,10 @@ class PHPExcel_Calculation_Functions {
      *                                PHPExcel_Calculation_Functions::RETURNDATE_PHP_OBJECT        'O'
      *                                PHPExcel_Calculation_Functions::RETURNDATE_EXCEL            'E'
      */
-	public static function getReturnDateType() {
-		return self::$ReturnDateType;
-	}	//	function getReturnDateType()
+    public static function getReturnDateType()
+    {
+        return self::$returnDateType;
+    }
 
 
     /**
@@ -186,9 +184,10 @@ class PHPExcel_Calculation_Functions {
      * @category Error Returns
      * @return    string    #Not Yet Implemented
      */
-	public static function DUMMY() {
+    public static function DUMMY()
+    {
         return '#Not Yet Implemented';
-	}	//	function DUMMY()
+    }
 
 
     /**
@@ -198,9 +197,10 @@ class PHPExcel_Calculation_Functions {
      * @category Error Returns
      * @return    string    #Not Yet Implemented
      */
-	public static function DIV0() {
-		return self::$_errorCodes['divisionbyzero'];
-	}	//	function DIV0()
+    public static function DIV0()
+    {
+        return self::$errorCodes['divisionbyzero'];
+    }
 
 
     /**
@@ -216,9 +216,10 @@ class PHPExcel_Calculation_Functions {
      * @category Logical Functions
      * @return    string    #N/A!
      */
-	public static function NA() {
-		return self::$_errorCodes['na'];
-	}	//	function NA()
+    public static function NA()
+    {
+        return self::$errorCodes['na'];
+    }
 
 
     /**
@@ -230,9 +231,10 @@ class PHPExcel_Calculation_Functions {
      * @category Error Returns
      * @return    string    #NUM!
      */
-	public static function NaN() {
-		return self::$_errorCodes['num'];
-	}	//	function NaN()
+    public static function NaN()
+    {
+        return self::$errorCodes['num'];
+    }
 
 
     /**
@@ -244,9 +246,10 @@ class PHPExcel_Calculation_Functions {
      * @category Error Returns
      * @return    string    #NAME?
      */
-	public static function NAME() {
-		return self::$_errorCodes['name'];
-	}	//	function NAME()
+    public static function NAME()
+    {
+        return self::$errorCodes['name'];
+    }
 
 
     /**
@@ -258,9 +261,10 @@ class PHPExcel_Calculation_Functions {
      * @category Error Returns
      * @return    string    #REF!
      */
-	public static function REF() {
-		return self::$_errorCodes['reference'];
-	}	//	function REF()
+    public static function REF()
+    {
+        return self::$errorCodes['reference'];
+    }
 
 
     /**
@@ -270,11 +274,12 @@ class PHPExcel_Calculation_Functions {
      *
      * @access    public
      * @category Error Returns
-	 * @return	string	#REF!
+     * @return    string    #NULL!
      */
-	public static function NULL() {
-		return self::$_errorCodes['null'];
-	}	//	function NULL()
+    public static function NULL()
+    {
+        return self::$errorCodes['null'];
+    }
 
 
     /**
@@ -286,41 +291,53 @@ class PHPExcel_Calculation_Functions {
      * @category Error Returns
      * @return    string    #VALUE!
      */
-	public static function VALUE() {
-		return self::$_errorCodes['value'];
-	}	//	function VALUE()
+    public static function VALUE()
+    {
+        return self::$errorCodes['value'];
+    }
 
 
-	public static function isMatrixValue($idx) {
+    public static function isMatrixValue($idx)
+    {
         return ((substr_count($idx, '.') <= 1) || (preg_match('/\.[A-Z]/', $idx) > 0));
     }
 
 
-	public static function isValue($idx) {
+    public static function isValue($idx)
+    {
         return (substr_count($idx, '.') == 0);
     }
 
 
-	public static function isCellValue($idx) {
+    public static function isCellValue($idx)
+    {
         return (substr_count($idx, '.') > 1);
     }
 
 
-	public static function _ifCondition($condition) {
+    public static function ifCondition($condition)
+    {
         $condition    = PHPExcel_Calculation_Functions::flattenSingleValue($condition);
-		if (!isset($condition{0}))
+        if (!isset($condition{0})) {
             $condition = '=""';
+        }
         if (!in_array($condition{0}, array('>', '<', '='))) {
-			if (!is_numeric($condition)) { $condition = PHPExcel_Calculation::_wrapResult(strtoupper($condition)); }
+            if (!is_numeric($condition)) {
+                $condition = PHPExcel_Calculation::wrapResult(strtoupper($condition));
+            }
             return '=' . $condition;
         } else {
             preg_match('/([<>=]+)(.*)/', $condition, $matches);
             list(, $operator, $operand) = $matches;
-			if (!is_numeric($operand)) { $operand = PHPExcel_Calculation::_wrapResult(strtoupper($operand)); }
+
+            if (!is_numeric($operand)) {
+                $operand = str_replace('"', '""', $operand);
+                $operand = PHPExcel_Calculation::wrapResult(strtoupper($operand));
+            }
+
             return $operator.$operand;
         }
-	}	//	function _ifCondition()
-
+    }
 
     /**
      * ERROR_TYPE
@@ -328,18 +345,19 @@ class PHPExcel_Calculation_Functions {
      * @param    mixed    $value    Value to check
      * @return    boolean
      */
-	public static function ERROR_TYPE($value = '') {
+    public static function ERROR_TYPE($value = '')
+    {
         $value = self::flattenSingleValue($value);
 
         $i = 1;
-		foreach(self::$_errorCodes as $errorCode) {
+        foreach (self::$errorCodes as $errorCode) {
             if ($value === $errorCode) {
                 return $i;
             }
             ++$i;
         }
         return self::NA();
-	}	//	function ERROR_TYPE()
+    }
 
 
     /**
@@ -348,13 +366,14 @@ class PHPExcel_Calculation_Functions {
      * @param    mixed    $value    Value to check
      * @return    boolean
      */
-	public static function IS_BLANK($value = NULL) {
+    public static function IS_BLANK($value = null)
+    {
         if (!is_null($value)) {
             $value    = self::flattenSingleValue($value);
         }
 
         return is_null($value);
-	}	//	function IS_BLANK()
+    }
 
 
     /**
@@ -363,11 +382,12 @@ class PHPExcel_Calculation_Functions {
      * @param    mixed    $value    Value to check
      * @return    boolean
      */
-	public static function IS_ERR($value = '') {
+    public static function IS_ERR($value = '')
+    {
         $value = self::flattenSingleValue($value);
 
         return self::IS_ERROR($value) && (!self::IS_NA($value));
-	}	//	function IS_ERR()
+    }
 
 
     /**
@@ -376,13 +396,15 @@ class PHPExcel_Calculation_Functions {
      * @param    mixed    $value    Value to check
      * @return    boolean
      */
-	public static function IS_ERROR($value = '') {
+    public static function IS_ERROR($value = '')
+    {
         $value = self::flattenSingleValue($value);
 
-		if (!is_string($value))
+        if (!is_string($value)) {
             return false;
-		return in_array($value, array_values(self::$_errorCodes));
-	}	//	function IS_ERROR()
+        }
+        return in_array($value, array_values(self::$errorCodes));
+    }
 
 
     /**
@@ -391,11 +413,12 @@ class PHPExcel_Calculation_Functions {
      * @param    mixed    $value    Value to check
      * @return    boolean
      */
-	public static function IS_NA($value = '') {
+    public static function IS_NA($value = '')
+    {
         $value = self::flattenSingleValue($value);
 
         return ($value === self::NA());
-	}	//	function IS_NA()
+    }
 
 
     /**
@@ -404,15 +427,18 @@ class PHPExcel_Calculation_Functions {
      * @param    mixed    $value    Value to check
      * @return    boolean
      */
-	public static function IS_EVEN($value = NULL) {
+    public static function IS_EVEN($value = null)
+    {
         $value = self::flattenSingleValue($value);
 
-		if ($value === NULL)
+        if ($value === null) {
             return self::NAME();
-		if ((is_bool($value)) || ((is_string($value)) && (!is_numeric($value))))
+        } elseif ((is_bool($value)) || ((is_string($value)) && (!is_numeric($value)))) {
             return self::VALUE();
+        }
+
         return ($value % 2 == 0);
-	}	//	function IS_EVEN()
+    }
 
 
     /**
@@ -421,15 +447,18 @@ class PHPExcel_Calculation_Functions {
      * @param    mixed    $value    Value to check
      * @return    boolean
      */
-	public static function IS_ODD($value = NULL) {
+    public static function IS_ODD($value = null)
+    {
         $value = self::flattenSingleValue($value);
 
-		if ($value === NULL)
+        if ($value === null) {
             return self::NAME();
-		if ((is_bool($value)) || ((is_string($value)) && (!is_numeric($value))))
+        } elseif ((is_bool($value)) || ((is_string($value)) && (!is_numeric($value)))) {
             return self::VALUE();
+        }
+
         return (abs($value) % 2 == 1);
-	}	//	function IS_ODD()
+    }
 
 
     /**
@@ -438,14 +467,15 @@ class PHPExcel_Calculation_Functions {
      * @param    mixed    $value        Value to check
      * @return    boolean
      */
-	public static function IS_NUMBER($value = NULL) {
+    public static function IS_NUMBER($value = null)
+    {
         $value = self::flattenSingleValue($value);
 
         if (is_string($value)) {
-			return False;
+            return false;
         }
         return is_numeric($value);
-	}	//	function IS_NUMBER()
+    }
 
 
     /**
@@ -454,11 +484,12 @@ class PHPExcel_Calculation_Functions {
      * @param    mixed    $value        Value to check
      * @return    boolean
      */
-	public static function IS_LOGICAL($value = NULL) {
+    public static function IS_LOGICAL($value = null)
+    {
         $value = self::flattenSingleValue($value);
 
         return is_bool($value);
-	}	//	function IS_LOGICAL()
+    }
 
 
     /**
@@ -467,11 +498,12 @@ class PHPExcel_Calculation_Functions {
      * @param    mixed    $value        Value to check
      * @return    boolean
      */
-	public static function IS_TEXT($value = NULL) {
+    public static function IS_TEXT($value = null)
+    {
         $value = self::flattenSingleValue($value);
 
         return (is_string($value) && !self::IS_ERROR($value));
-	}	//	function IS_TEXT()
+    }
 
 
     /**
@@ -480,9 +512,10 @@ class PHPExcel_Calculation_Functions {
      * @param    mixed    $value        Value to check
      * @return    boolean
      */
-	public static function IS_NONTEXT($value = NULL) {
+    public static function IS_NONTEXT($value = null)
+    {
         return !self::IS_TEXT($value);
-	}	//	function IS_NONTEXT()
+    }
 
 
     /**
@@ -490,9 +523,10 @@ class PHPExcel_Calculation_Functions {
      *
      * @return    string    Version information
      */
-	public static function VERSION() {
+    public static function VERSION()
+    {
         return 'PHPExcel ##VERSION##, ##DATE##';
-	}	//	function VERSION()
+    }
 
 
     /**
@@ -510,7 +544,8 @@ class PHPExcel_Calculation_Functions {
      *        An error value        The error value
      *        Anything else        0
      */
-	public static function N($value = NULL) {
+    public static function N($value = null)
+    {
         while (is_array($value)) {
             $value = array_shift($value);
         }
@@ -520,10 +555,8 @@ class PHPExcel_Calculation_Functions {
             case 'float':
             case 'integer':
                 return $value;
-				break;
             case 'boolean':
                 return (integer) $value;
-				break;
             case 'string':
                 //    Errors
                 if ((strlen($value) > 0) && ($value{0} == '#')) {
@@ -532,7 +565,7 @@ class PHPExcel_Calculation_Functions {
                 break;
         }
         return 0;
-	}	//	function N()
+    }
 
 
     /**
@@ -549,11 +582,12 @@ class PHPExcel_Calculation_Functions {
      *        An error value        16
      *        Array or Matrix        64
      */
-	public static function TYPE($value = NULL) {
+    public static function TYPE($value = null)
+    {
         $value = self::flattenArrayIndexed($value);
         if (is_array($value) && (count($value) > 1)) {
-			$a = array_keys($value);
-			$a = array_pop($a);
+            end($value);
+            $a = key($value);
             //    Range of cells is an error
             if (self::isCellValue($a)) {
                 return 16;
@@ -567,13 +601,12 @@ class PHPExcel_Calculation_Functions {
         }
         $value = self::flattenSingleValue($value);
 
-		if (($value === NULL) || (is_float($value)) || (is_int($value))) {
+        if (($value === null) || (is_float($value)) || (is_int($value))) {
                 return 1;
         } elseif (is_bool($value)) {
                 return 4;
         } elseif (is_array($value)) {
                 return 64;
-				break;
         } elseif (is_string($value)) {
             //    Errors
             if ((strlen($value) > 0) && ($value{0} == '#')) {
@@ -582,7 +615,7 @@ class PHPExcel_Calculation_Functions {
             return 2;
         }
         return 0;
-	}	//	function TYPE()
+    }
 
 
     /**
@@ -591,7 +624,8 @@ class PHPExcel_Calculation_Functions {
      * @param    array    $array    Array to be flattened
      * @return    array    Flattened array
      */
-	public static function flattenArray($array) {
+    public static function flattenArray($array)
+    {
         if (!is_array($array)) {
             return (array) $array;
         }
@@ -614,7 +648,7 @@ class PHPExcel_Calculation_Functions {
         }
 
         return $arrayValues;
-	}	//	function flattenArray()
+    }
 
 
     /**
@@ -623,7 +657,8 @@ class PHPExcel_Calculation_Functions {
      * @param    array    $array    Array to be flattened
      * @return    array    Flattened array
      */
-	public static function flattenArrayIndexed($array) {
+    public static function flattenArrayIndexed($array)
+    {
         if (!is_array($array)) {
             return (array) $array;
         }
@@ -646,7 +681,7 @@ class PHPExcel_Calculation_Functions {
         }
 
         return $arrayValues;
-	}	//	function flattenArrayIndexed()
+    }
 
 
     /**
@@ -655,15 +690,15 @@ class PHPExcel_Calculation_Functions {
      * @param    mixed        $value        Array or scalar value
      * @return    mixed
      */
-	public static function flattenSingleValue($value = '') {
+    public static function flattenSingleValue($value = '')
+    {
         while (is_array($value)) {
             $value = array_pop($value);
         }
 
         return $value;
-	}	//	function flattenSingleValue()
-
-}	//	class PHPExcel_Calculation_Functions
+    }
+}
 
 
 //
@@ -672,117 +707,26 @@ class PHPExcel_Calculation_Functions {
 //    So we test if they do exist for this version of PHP/operating platform; and if not we create them
 //
 if (!function_exists('acosh')) {
-	function acosh($x) {
+    function acosh($x)
+    {
         return 2 * log(sqrt(($x + 1) / 2) + sqrt(($x - 1) / 2));
     }    //    function acosh()
 }
 
 if (!function_exists('asinh')) {
-	function asinh($x) {
+    function asinh($x)
+    {
         return log($x + sqrt(1 + $x * $x));
     }    //    function asinh()
 }
 
 if (!function_exists('atanh')) {
-	function atanh($x) {
+    function atanh($x)
+    {
         return (log(1 + $x) - log(1 - $x)) / 2;
     }    //    function atanh()
 }
 
-if (!function_exists('money_format')) {
-	function money_format($format, $number) {
-		$regex = array( '/%((?:[\^!\-]|\+|\(|\=.)*)([0-9]+)?(?:#([0-9]+))?',
-						 '(?:\.([0-9]+))?([in%])/'
-					  );
-		$regex = implode('', $regex);
-		if (setlocale(LC_MONETARY, null) == '') {
-			setlocale(LC_MONETARY, '');
-		}
-		$locale = localeconv();
-		$number = floatval($number);
-		if (!preg_match($regex, $format, $fmatch)) {
-			trigger_error("No format specified or invalid format", E_USER_WARNING);
-			return $number;
-		}
-		$flags = array( 'fillchar'	=> preg_match('/\=(.)/', $fmatch[1], $match) ? $match[1] : ' ',
-						'nogroup'	=> preg_match('/\^/', $fmatch[1]) > 0,
-						'usesignal'	=> preg_match('/\+|\(/', $fmatch[1], $match) ? $match[0] : '+',
-						'nosimbol'	=> preg_match('/\!/', $fmatch[1]) > 0,
-						'isleft'	=> preg_match('/\-/', $fmatch[1]) > 0
-					  );
-		$width	= trim($fmatch[2]) ? (int)$fmatch[2] : 0;
-		$left	= trim($fmatch[3]) ? (int)$fmatch[3] : 0;
-		$right	= trim($fmatch[4]) ? (int)$fmatch[4] : $locale['int_frac_digits'];
-		$conversion = $fmatch[5];
-		$positive = true;
-		if ($number < 0) {
-			$positive = false;
-			$number *= -1;
-		}
-		$letter = $positive ? 'p' : 'n';
-		$prefix = $suffix = $cprefix = $csuffix = $signal = '';
-		if (!$positive) {
-			$signal = $locale['negative_sign'];
-			switch (true) {
-				case $locale['n_sign_posn'] == 0 || $flags['usesignal'] == '(':
-					$prefix = '(';
-					$suffix = ')';
-					break;
-				case $locale['n_sign_posn'] == 1:
-					$prefix = $signal;
-					break;
-				case $locale['n_sign_posn'] == 2:
-					$suffix = $signal;
-					break;
-				case $locale['n_sign_posn'] == 3:
-					$cprefix = $signal;
-					break;
-				case $locale['n_sign_posn'] == 4:
-					$csuffix = $signal;
-					break;
-			}
-		}
-		if (!$flags['nosimbol']) {
-			$currency = $cprefix;
-			$currency .= ($conversion == 'i' ? $locale['int_curr_symbol'] : $locale['currency_symbol']);
-			$currency .= $csuffix;
-			$currency = iconv('ISO-8859-1','UTF-8',$currency);
-		} else {
-			$currency = '';
-		}
-		$space = $locale["{$letter}_sep_by_space"] ? ' ' : '';
-
-		if (!isset($locale['mon_decimal_point']) || empty($locale['mon_decimal_point'])) {
-			$locale['mon_decimal_point'] = (!isset($locale['decimal_point']) || empty($locale['decimal_point'])) ?
-											$locale['decimal_point'] :
-											'.';
-		}
-
-		$number = number_format($number, $right, $locale['mon_decimal_point'], $flags['nogroup'] ? '' : $locale['mon_thousands_sep'] );
-		$number = explode($locale['mon_decimal_point'], $number);
-
-		$n = strlen($prefix) + strlen($currency);
-		if ($left > 0 && $left > $n) {
-			if ($flags['isleft']) {
-				$number[0] .= str_repeat($flags['fillchar'], $left - $n);
-			} else {
-				$number[0] = str_repeat($flags['fillchar'], $left - $n) . $number[0];
-			}
-		}
-		$number = implode($locale['mon_decimal_point'], $number);
-		if ($locale["{$letter}_cs_precedes"]) {
-			$number = $prefix . $currency . $space . $number . $suffix;
-		} else {
-			$number = $prefix . $number . $space . $currency . $suffix;
-		}
-		if ($width > 0) {
-			$number = str_pad($number, $width, $flags['fillchar'], $flags['isleft'] ? STR_PAD_RIGHT : STR_PAD_LEFT);
-		}
-		$format = str_replace($fmatch[0], $number, $format);
-		return $format;
-	}	//	function money_format()
-}
-
 
 //
 //    Strangely, PHP doesn't have a mb_str_replace multibyte function
@@ -790,7 +734,8 @@ if (!function_exists('money_format')) {
 //
 if ((!function_exists('mb_str_replace')) &&
     (function_exists('mb_substr')) && (function_exists('mb_strlen')) && (function_exists('mb_strpos'))) {
-	function mb_str_replace($search, $replace, $subject) {
+    function mb_str_replace($search, $replace, $subject)
+    {
         if (is_array($subject)) {
             $ret = array();
             foreach ($subject as $key => $val) {
@@ -800,7 +745,7 @@ if ((!function_exists('mb_str_replace')) &&
         }
 
         foreach ((array) $search as $key => $s) {
-			if($s == '') {
+            if ($s == '' && $s !== 0) {
                 continue;
             }
             $r = !is_array($replace) ? $replace : (array_key_exists($key, $replace) ? $replace[$key] : '');

Classes/PHPExcel/Calculation/Logical.php

@@ -1,8 +1,18 @@
 <?php
+
+/** PHPExcel root directory */
+if (!defined('PHPEXCEL_ROOT')) {
     /**
- * PHPExcel
+     * @ignore
+     */
+    define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
+    require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+}
+
+/**
+ * PHPExcel_Calculation_Logical
  *
- * Copyright (c) 2006 - 2013 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,31 +30,12 @@
  *
  * @category    PHPExcel
  * @package        PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-	/**
-	 * @ignore
-	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-
-/**
- * PHPExcel_Calculation_Logical
- *
- * @category	PHPExcel
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Calculation_Logical {
-
+class PHPExcel_Calculation_Logical
+{
     /**
      * TRUE
      *
@@ -57,9 +48,10 @@ class PHPExcel_Calculation_Logical {
      * @category Logical Functions
      * @return    boolean        True
      */
-	public static function TRUE() {
-		return TRUE;
-	}	//	function TRUE()
+    public static function TRUE()
+    {
+        return true;
+    }
 
 
     /**
@@ -74,9 +66,10 @@ class PHPExcel_Calculation_Logical {
      * @category Logical Functions
      * @return    boolean        False
      */
-	public static function FALSE() {
-		return FALSE;
-	}	//	function FALSE()
+    public static function FALSE()
+    {
+        return false;
+    }
 
 
     /**
@@ -100,9 +93,10 @@ class PHPExcel_Calculation_Logical {
      * @param    mixed        $arg,...        Data values
      * @return    boolean        The logical AND of the arguments.
      */
-	public static function LOGICAL_AND() {
+    public static function LOGICAL_AND()
+    {
         // Return value
-		$returnValue = TRUE;
+        $returnValue = true;
 
         // Loop through the arguments
         $aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
@@ -116,9 +110,9 @@ class PHPExcel_Calculation_Logical {
             } elseif (is_string($arg)) {
                 $arg = strtoupper($arg);
                 if (($arg == 'TRUE') || ($arg == PHPExcel_Calculation::getTRUE())) {
-					$arg = TRUE;
+                    $arg = true;
                 } elseif (($arg == 'FALSE') || ($arg == PHPExcel_Calculation::getFALSE())) {
-					$arg = FALSE;
+                    $arg = false;
                 } else {
                     return PHPExcel_Calculation_Functions::VALUE();
                 }
@@ -131,7 +125,7 @@ class PHPExcel_Calculation_Logical {
             return PHPExcel_Calculation_Functions::VALUE();
         }
         return $returnValue;
-	}	//	function LOGICAL_AND()
+    }
 
 
     /**
@@ -155,9 +149,10 @@ class PHPExcel_Calculation_Logical {
      * @param    mixed        $arg,...        Data values
      * @return    boolean        The logical OR of the arguments.
      */
-	public static function LOGICAL_OR() {
+    public static function LOGICAL_OR()
+    {
         // Return value
-		$returnValue = FALSE;
+        $returnValue = false;
 
         // Loop through the arguments
         $aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
@@ -171,9 +166,9 @@ class PHPExcel_Calculation_Logical {
             } elseif (is_string($arg)) {
                 $arg = strtoupper($arg);
                 if (($arg == 'TRUE') || ($arg == PHPExcel_Calculation::getTRUE())) {
-					$arg = TRUE;
+                    $arg = true;
                 } elseif (($arg == 'FALSE') || ($arg == PHPExcel_Calculation::getFALSE())) {
-					$arg = FALSE;
+                    $arg = false;
                 } else {
                     return PHPExcel_Calculation_Functions::VALUE();
                 }
@@ -186,7 +181,7 @@ class PHPExcel_Calculation_Logical {
             return PHPExcel_Calculation_Functions::VALUE();
         }
         return $returnValue;
-	}	//	function LOGICAL_OR()
+    }
 
 
     /**
@@ -209,21 +204,22 @@ class PHPExcel_Calculation_Logical {
      * @param    mixed        $logical    A value or expression that can be evaluated to TRUE or FALSE
      * @return    boolean        The boolean inverse of the argument.
      */
-	public static function NOT($logical=FALSE) {
+    public static function NOT($logical = false)
+    {
         $logical = PHPExcel_Calculation_Functions::flattenSingleValue($logical);
         if (is_string($logical)) {
             $logical = strtoupper($logical);
             if (($logical == 'TRUE') || ($logical == PHPExcel_Calculation::getTRUE())) {
-				return FALSE;
+                return false;
             } elseif (($logical == 'FALSE') || ($logical == PHPExcel_Calculation::getFALSE())) {
-				return TRUE;
+                return true;
             } else {
                 return PHPExcel_Calculation_Functions::VALUE();
             }
         }
 
         return !$logical;
-	}	//	function NOT()
+    }
 
     /**
      * STATEMENT_IF
@@ -257,13 +253,14 @@ class PHPExcel_Calculation_Logical {
      * @param    mixed    $returnIfFalse    Optional value to return when condition is false
      * @return    mixed    The value of returnIfTrue or returnIfFalse determined by condition
      */
-	public static function STATEMENT_IF($condition = TRUE, $returnIfTrue = 0, $returnIfFalse = FALSE) {
-		$condition		= (is_null($condition))		? TRUE :	(boolean) PHPExcel_Calculation_Functions::flattenSingleValue($condition);
+    public static function STATEMENT_IF($condition = true, $returnIfTrue = 0, $returnIfFalse = false)
+    {
+        $condition     = (is_null($condition))     ? true :  (boolean) PHPExcel_Calculation_Functions::flattenSingleValue($condition);
         $returnIfTrue  = (is_null($returnIfTrue))  ? 0 :     PHPExcel_Calculation_Functions::flattenSingleValue($returnIfTrue);
-		$returnIfFalse	= (is_null($returnIfFalse))	? FALSE :	PHPExcel_Calculation_Functions::flattenSingleValue($returnIfFalse);
+        $returnIfFalse = (is_null($returnIfFalse)) ? false : PHPExcel_Calculation_Functions::flattenSingleValue($returnIfFalse);
 
         return ($condition) ? $returnIfTrue : $returnIfFalse;
-	}	//	function STATEMENT_IF()
+    }
 
 
     /**
@@ -278,11 +275,11 @@ class PHPExcel_Calculation_Logical {
      * @param    mixed    $errorpart    Value to return when testValue is an error condition
      * @return    mixed    The value of errorpart or testValue determined by error condition
      */
-	public static function IFERROR($testValue = '', $errorpart = '') {
+    public static function IFERROR($testValue = '', $errorpart = '')
+    {
         $testValue = (is_null($testValue)) ? '' : PHPExcel_Calculation_Functions::flattenSingleValue($testValue);
         $errorpart = (is_null($errorpart)) ? '' : PHPExcel_Calculation_Functions::flattenSingleValue($errorpart);
 
         return self::STATEMENT_IF(PHPExcel_Calculation_Functions::IS_ERROR($testValue), $errorpart, $testValue);
-	}	//	function IFERROR()
-
-}	//	class PHPExcel_Calculation_Logical
+    }
+}

Classes/PHPExcel/Calculation/LookupRef.php

@@ -1,8 +1,18 @@
 <?php
+
+/** PHPExcel root directory */
+if (!defined('PHPEXCEL_ROOT')) {
     /**
- * PHPExcel
+     * @ignore
+     */
+    define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
+    require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+}
+
+/**
+ * PHPExcel_Calculation_LookupRef
  *
- * Copyright (c) 2006 - 2013 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,32 +30,12 @@
  *
  * @category    PHPExcel
  * @package        PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-	/**
-	 * @ignore
-	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-
-/**
- * PHPExcel_Calculation_LookupRef
- *
- * @category	PHPExcel
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Calculation_LookupRef {
-
-
+class PHPExcel_Calculation_LookupRef
+{
     /**
      * CELL_ADDRESS
      *
@@ -67,7 +57,8 @@ class PHPExcel_Calculation_LookupRef {
      * @param    sheetText        Optional Name of worksheet to use
      * @return    string
      */
-	public static function CELL_ADDRESS($row, $column, $relativity=1, $referenceStyle=True, $sheetText='') {
+    public static function CELL_ADDRESS($row, $column, $relativity = 1, $referenceStyle = true, $sheetText = '')
+    {
         $row        = PHPExcel_Calculation_Functions::flattenSingleValue($row);
         $column     = PHPExcel_Calculation_Functions::flattenSingleValue($column);
         $relativity = PHPExcel_Calculation_Functions::flattenSingleValue($relativity);
@@ -78,21 +69,31 @@ class PHPExcel_Calculation_LookupRef {
         }
 
         if ($sheetText > '') {
-			if (strpos($sheetText,' ') !== False) { $sheetText = "'".$sheetText."'"; }
+            if (strpos($sheetText, ' ') !== false) {
+                $sheetText = "'".$sheetText."'";
+            }
             $sheetText .='!';
         }
         if ((!is_bool($referenceStyle)) || $referenceStyle) {
             $rowRelative = $columnRelative = '$';
             $column = PHPExcel_Cell::stringFromColumnIndex($column-1);
-			if (($relativity == 2) || ($relativity == 4)) { $columnRelative = ''; }
-			if (($relativity == 3) || ($relativity == 4)) { $rowRelative = ''; }
+            if (($relativity == 2) || ($relativity == 4)) {
+                $columnRelative = '';
+            }
+            if (($relativity == 3) || ($relativity == 4)) {
+                $rowRelative = '';
+            }
             return $sheetText.$columnRelative.$column.$rowRelative.$row;
         } else {
-			if (($relativity == 2) || ($relativity == 4)) { $column = '['.$column.']'; }
-			if (($relativity == 3) || ($relativity == 4)) { $row = '['.$row.']'; }
+            if (($relativity == 2) || ($relativity == 4)) {
+                $column = '['.$column.']';
+            }
+            if (($relativity == 3) || ($relativity == 4)) {
+                $row = '['.$row.']';
+            }
             return $sheetText.'R'.$row.'C'.$column;
         }
-	}	//	function CELL_ADDRESS()
+    }
 
 
     /**
@@ -109,8 +110,11 @@ class PHPExcel_Calculation_LookupRef {
      * @param    cellAddress        A reference to a range of cells for which you want the column numbers
      * @return    integer or array of integer
      */
-	public static function COLUMN($cellAddress=Null) {
-		if (is_null($cellAddress) || trim($cellAddress) === '') { return 0; }
+    public static function COLUMN($cellAddress = null)
+    {
+        if (is_null($cellAddress) || trim($cellAddress) === '') {
+            return 0;
+        }
 
         if (is_array($cellAddress)) {
             foreach ($cellAddress as $columnKey => $value) {
@@ -135,7 +139,7 @@ class PHPExcel_Calculation_LookupRef {
                 return (integer) PHPExcel_Cell::columnIndexFromString($cellAddress);
             }
         }
-	}	//	function COLUMN()
+    }
 
 
     /**
@@ -149,16 +153,16 @@ class PHPExcel_Calculation_LookupRef {
      * @param    cellAddress        An array or array formula, or a reference to a range of cells for which you want the number of columns
      * @return    integer            The number of columns in cellAddress
      */
-	public static function COLUMNS($cellAddress=Null) {
+    public static function COLUMNS($cellAddress = null)
+    {
         if (is_null($cellAddress) || $cellAddress === '') {
             return 1;
         } elseif (!is_array($cellAddress)) {
             return PHPExcel_Calculation_Functions::VALUE();
         }
 
-		$x = array_keys($cellAddress);
-		$x = array_shift($x);
-		$isMatrix = (is_numeric($x));
+        reset($cellAddress);
+        $isMatrix = (is_numeric(key($cellAddress)));
         list($columns, $rows) = PHPExcel_Calculation::_getMatrixDimensions($cellAddress);
 
         if ($isMatrix) {
@@ -166,7 +170,7 @@ class PHPExcel_Calculation_LookupRef {
         } else {
             return $columns;
         }
-	}	//	function COLUMNS()
+    }
 
 
     /**
@@ -183,8 +187,11 @@ class PHPExcel_Calculation_LookupRef {
      * @param    cellAddress        A reference to a range of cells for which you want the row numbers
      * @return    integer or array of integer
      */
-	public static function ROW($cellAddress=Null) {
-		if (is_null($cellAddress) || trim($cellAddress) === '') { return 0; }
+    public static function ROW($cellAddress = null)
+    {
+        if (is_null($cellAddress) || trim($cellAddress) === '') {
+            return 0;
+        }
 
         if (is_array($cellAddress)) {
             foreach ($cellAddress as $columnKey => $rowValue) {
@@ -210,7 +217,7 @@ class PHPExcel_Calculation_LookupRef {
                 return (integer) preg_replace('/[^0-9]/', '', $cellAddress);
             }
         }
-	}	//	function ROW()
+    }
 
 
     /**
@@ -224,15 +231,16 @@ class PHPExcel_Calculation_LookupRef {
      * @param    cellAddress        An array or array formula, or a reference to a range of cells for which you want the number of rows
      * @return    integer            The number of rows in cellAddress
      */
-	public static function ROWS($cellAddress=Null) {
+    public static function ROWS($cellAddress = null)
+    {
         if (is_null($cellAddress) || $cellAddress === '') {
             return 1;
         } elseif (!is_array($cellAddress)) {
             return PHPExcel_Calculation_Functions::VALUE();
         }
 
-		$i = array_keys($cellAddress);
-		$isMatrix = (is_numeric(array_shift($i)));
+        reset($cellAddress);
+        $isMatrix = (is_numeric(key($cellAddress)));
         list($columns, $rows) = PHPExcel_Calculation::_getMatrixDimensions($cellAddress);
 
         if ($isMatrix) {
@@ -240,7 +248,7 @@ class PHPExcel_Calculation_LookupRef {
         } else {
             return $rows;
         }
-	}	//	function ROWS()
+    }
 
 
     /**
@@ -256,7 +264,8 @@ class PHPExcel_Calculation_LookupRef {
      * @param    PHPExcel_Cell    $pCell            The cell to set the hyperlink in
      * @return    mixed    The value of $displayName (or $linkURL if $displayName was blank)
      */
-	public static function HYPERLINK($linkURL = '', $displayName = null, PHPExcel_Cell $pCell = null) {
+    public static function HYPERLINK($linkURL = '', $displayName = null, PHPExcel_Cell $pCell = null)
+    {
         $args = func_get_args();
         $pCell = array_pop($args);
 
@@ -272,9 +281,10 @@ class PHPExcel_Calculation_LookupRef {
         }
 
         $pCell->getHyperlink()->setUrl($linkURL);
+        $pCell->getHyperlink()->setTooltip($displayName);
 
         return $displayName;
-	}	//	function HYPERLINK()
+    }
 
 
     /**
@@ -295,14 +305,15 @@ class PHPExcel_Calculation_LookupRef {
      * @todo    Support for the optional a1 parameter introduced in Excel 2010
      *
      */
-	public static function INDIRECT($cellAddress = NULL, PHPExcel_Cell $pCell = NULL) {
+    public static function INDIRECT($cellAddress = null, PHPExcel_Cell $pCell = null)
+    {
         $cellAddress    = PHPExcel_Calculation_Functions::flattenSingleValue($cellAddress);
         if (is_null($cellAddress) || $cellAddress === '') {
             return PHPExcel_Calculation_Functions::REF();
         }
 
         $cellAddress1 = $cellAddress;
-		$cellAddress2 = NULL;
+        $cellAddress2 = null;
         if (strpos($cellAddress, ':') !== false) {
             list($cellAddress1, $cellAddress2) = explode(':', $cellAddress);
         }
@@ -313,27 +324,27 @@ class PHPExcel_Calculation_LookupRef {
                 return PHPExcel_Calculation_Functions::REF();
             }
 
-			if (strpos($cellAddress,'!') !== FALSE) {
+            if (strpos($cellAddress, '!') !== false) {
                 list($sheetName, $cellAddress) = explode('!', $cellAddress);
                 $sheetName = trim($sheetName, "'");
-				$pSheet = $pCell->getParent()->getParent()->getSheetByName($sheetName);
+                $pSheet = $pCell->getWorksheet()->getParent()->getSheetByName($sheetName);
             } else {
-				$pSheet = $pCell->getParent();
+                $pSheet = $pCell->getWorksheet();
             }
 
-			return PHPExcel_Calculation::getInstance()->extractNamedRange($cellAddress, $pSheet, FALSE);
+            return PHPExcel_Calculation::getInstance()->extractNamedRange($cellAddress, $pSheet, false);
         }
 
-		if (strpos($cellAddress,'!') !== FALSE) {
+        if (strpos($cellAddress, '!') !== false) {
             list($sheetName, $cellAddress) = explode('!', $cellAddress);
             $sheetName = trim($sheetName, "'");
-			$pSheet = $pCell->getParent()->getParent()->getSheetByName($sheetName);
+            $pSheet = $pCell->getWorksheet()->getParent()->getSheetByName($sheetName);
         } else {
-			$pSheet = $pCell->getParent();
+            $pSheet = $pCell->getWorksheet();
         }
 
-		return PHPExcel_Calculation::getInstance()->extractCellRange($cellAddress, $pSheet, FALSE);
-	}	//	function INDIRECT()
+        return PHPExcel_Calculation::getInstance()->extractCellRange($cellAddress, $pSheet, false);
+    }
 
 
     /**
@@ -361,12 +372,13 @@ class PHPExcel_Calculation_LookupRef {
      * @param    width            The width, in number of columns, that you want the returned reference to be. Width must be a positive number.
      * @return    string            A reference to a cell or range of cells
      */
-	public static function OFFSET($cellAddress=Null,$rows=0,$columns=0,$height=null,$width=null) {
+    public static function OFFSET($cellAddress = null, $rows = 0, $columns = 0, $height = null, $width = null)
+    {
         $rows    = PHPExcel_Calculation_Functions::flattenSingleValue($rows);
         $columns = PHPExcel_Calculation_Functions::flattenSingleValue($columns);
         $height  = PHPExcel_Calculation_Functions::flattenSingleValue($height);
         $width   = PHPExcel_Calculation_Functions::flattenSingleValue($width);
-		if ($cellAddress == Null) {
+        if ($cellAddress == null) {
             return 0;
         }
 
@@ -376,7 +388,7 @@ class PHPExcel_Calculation_LookupRef {
             return PHPExcel_Calculation_Functions::REF();
         }
 
-		$sheetName = NULL;
+        $sheetName = null;
         if (strpos($cellAddress, "!")) {
             list($sheetName, $cellAddress) = explode("!", $cellAddress);
             $sheetName = trim($sheetName, "'");
@@ -420,14 +432,14 @@ class PHPExcel_Calculation_LookupRef {
             $cellAddress .= ':'.$endCellColumn.$endCellRow;
         }
 
-		if ($sheetName !== NULL) {
-			$pSheet = $pCell->getParent()->getParent()->getSheetByName($sheetName);
+        if ($sheetName !== null) {
+            $pSheet = $pCell->getWorksheet()->getParent()->getSheetByName($sheetName);
         } else {
-			$pSheet = $pCell->getParent();
+            $pSheet = $pCell->getWorksheet();
         }
 
-		return PHPExcel_Calculation::getInstance()->extractCellRange($cellAddress, $pSheet, False);
-	}	//	function OFFSET()
+        return PHPExcel_Calculation::getInstance()->extractCellRange($cellAddress, $pSheet, false);
+    }
 
 
     /**
@@ -448,7 +460,8 @@ class PHPExcel_Calculation_LookupRef {
      *                                text.
      * @return    mixed            The selected value
      */
-	public static function CHOOSE() {
+    public static function CHOOSE()
+    {
         $chooseArgs = func_get_args();
         $chosenEntry = PHPExcel_Calculation_Functions::flattenArray(array_shift($chooseArgs));
         $entryCount = count($chooseArgs) - 1;
@@ -462,7 +475,7 @@ class PHPExcel_Calculation_LookupRef {
             return PHPExcel_Calculation_Functions::VALUE();
         }
         $chosenEntry = floor($chosenEntry);
-		if (($chosenEntry <= 0) || ($chosenEntry > $entryCount)) {
+        if (($chosenEntry < 0) || ($chosenEntry > $entryCount)) {
             return PHPExcel_Calculation_Functions::VALUE();
         }
 
@@ -471,7 +484,7 @@ class PHPExcel_Calculation_LookupRef {
         } else {
             return $chooseArgs[$chosenEntry];
         }
-	}	//	function CHOOSE()
+    }
 
 
     /**
@@ -487,7 +500,8 @@ class PHPExcel_Calculation_LookupRef {
      * @param    match_type        The number -1, 0, or 1. -1 means above, 0 means exact match, 1 means below. If match_type is 1 or -1, the list has to be ordered.
      * @return    integer            The relative position of the found item
      */
-	public static function MATCH($lookup_value, $lookup_array, $match_type=1) {
+    public static function MATCH($lookup_value, $lookup_array, $match_type = 1)
+    {
         $lookup_array = PHPExcel_Calculation_Functions::flattenArray($lookup_array);
         $lookup_value = PHPExcel_Calculation_Functions::flattenSingleValue($lookup_value);
         $match_type    = (is_null($match_type)) ? 1 : (int) PHPExcel_Calculation_Functions::flattenSingleValue($match_type);
@@ -538,42 +552,25 @@ class PHPExcel_Calculation_LookupRef {
         // **
         // find the match
         // **
-		// loop on the cells
-//		var_dump($lookup_array);
-//		echo '<br />';
         foreach ($lookup_array as $i => $lookupArrayValue) {
             if (($match_type == 0) && ($lookupArrayValue == $lookup_value)) {
                 //    exact match
                 return ++$i;
             } elseif (($match_type == -1) && ($lookupArrayValue <= $lookup_value)) {
-//				echo '$i = '.$i.' => ';
-//				var_dump($lookupArrayValue);
-//				echo '<br />';
-//				echo 'Keyset = ';
-//				var_dump($keySet);
-//				echo '<br />';
                 $i = array_search($i, $keySet);
-//				echo '$i='.$i.'<br />';
                 // if match_type is -1 <=> find the smallest value that is greater than or equal to lookup_value
                 if ($i < 1) {
-					// 1st cell was allready smaller than the lookup_value
+                    // 1st cell was already smaller than the lookup_value
                     break;
                 } else {
                     // the previous cell was the match
                     return $keySet[$i-1]+1;
                 }
             } elseif (($match_type == 1) && ($lookupArrayValue >= $lookup_value)) {
-//				echo '$i = '.$i.' => ';
-//				var_dump($lookupArrayValue);
-//				echo '<br />';
-//				echo 'Keyset = ';
-//				var_dump($keySet);
-//				echo '<br />';
                 $i = array_search($i, $keySet);
-//				echo '$i='.$i.'<br />';
                 // if match_type is 1 <=> find the largest value that is less than or equal to lookup_value
                 if ($i < 1) {
-					// 1st cell was allready bigger than the lookup_value
+                    // 1st cell was already bigger than the lookup_value
                     break;
                 } else {
                     // the previous cell was the match
@@ -584,7 +581,7 @@ class PHPExcel_Calculation_LookupRef {
 
         //    unsuccessful in finding a match, return #N/A error value
         return PHPExcel_Calculation_Functions::NA();
-	}	//	function MATCH()
+    }
 
 
     /**
@@ -600,8 +597,8 @@ class PHPExcel_Calculation_LookupRef {
      * @param    column_num        The column in array from which to return a value. If column_num is omitted, row_num is required.
      * @return    mixed            the value of a specified cell or array of cells
      */
-	public static function INDEX($arrayValues,$rowNum = 0,$columnNum = 0) {
-
+    public static function INDEX($arrayValues, $rowNum = 0, $columnNum = 0)
+    {
         if (($rowNum < 0) || ($columnNum < 0)) {
             return PHPExcel_Calculation_Functions::VALUE();
         }
@@ -643,7 +640,7 @@ class PHPExcel_Calculation_LookupRef {
         $rowNum = $rowKeys[--$rowNum];
 
         return $arrayValues[$rowNum][$columnNum];
-	}	//	function INDEX()
+    }
 
 
     /**
@@ -654,9 +651,12 @@ class PHPExcel_Calculation_LookupRef {
      *
      * Unlike the Excel TRANSPOSE function, which will only work on a single row or column, this function will transpose a full matrix.
      */
-	public static function TRANSPOSE($matrixData) {
+    public static function TRANSPOSE($matrixData)
+    {
         $returnMatrix = array();
-		if (!is_array($matrixData)) { $matrixData = array(array($matrixData)); }
+        if (!is_array($matrixData)) {
+            $matrixData = array(array($matrixData));
+        }
 
         $column = 0;
         foreach ($matrixData as $matrixRow) {
@@ -668,17 +668,18 @@ class PHPExcel_Calculation_LookupRef {
             ++$column;
         }
         return $returnMatrix;
-	}	//	function TRANSPOSE()
+    }
 
 
-	private static function _vlookupSort($a,$b) {
-		$f = array_keys($a);
-		$firstColumn = array_shift($f);
-		if (strtolower($a[$firstColumn]) == strtolower($b[$firstColumn])) {
+    private static function vlookupSort($a, $b)
+    {
+        reset($a);
+        $firstColumn = key($a);
+        if (($aLower = strtolower($a[$firstColumn])) == ($bLower = strtolower($b[$firstColumn]))) {
             return 0;
         }
-		return (strtolower($a[$firstColumn]) < strtolower($b[$firstColumn])) ? -1 : 1;
-	}	//	function _vlookupSort()
+        return ($aLower < $bLower) ? -1 : 1;
+    }
 
 
     /**
@@ -690,7 +691,8 @@ class PHPExcel_Calculation_LookupRef {
      * @param    not_exact_match    Determines if you are looking for an exact match based on lookup_value.
      * @return    mixed            The value of the found cell
      */
-	public static function VLOOKUP($lookup_value, $lookup_array, $index_number, $not_exact_match=true) {
+    public static function VLOOKUP($lookup_value, $lookup_array, $index_number, $not_exact_match = true)
+    {
         $lookup_value    = PHPExcel_Calculation_Functions::flattenSingleValue($lookup_value);
         $index_number    = PHPExcel_Calculation_Functions::flattenSingleValue($index_number);
         $not_exact_match = PHPExcel_Calculation_Functions::flattenSingleValue($not_exact_match);
@@ -716,12 +718,13 @@ class PHPExcel_Calculation_LookupRef {
         }
 
         if (!$not_exact_match) {
-			uasort($lookup_array,array('self','_vlookupSort'));
+            uasort($lookup_array, array('self', 'vlookupSort'));
         }
 
-		$rowNumber = $rowValue = False;
+        $rowNumber = $rowValue = false;
         foreach ($lookup_array as $rowKey => $rowData) {
-			if (strtolower($rowData[$firstColumn]) > strtolower($lookup_value)) {
+            if ((is_numeric($lookup_value) && is_numeric($rowData[$firstColumn]) && ($rowData[$firstColumn] > $lookup_value)) ||
+                (!is_numeric($lookup_value) && !is_numeric($rowData[$firstColumn]) && (strtolower($rowData[$firstColumn]) > strtolower($lookup_value)))) {
                 break;
             }
             $rowNumber = $rowKey;
@@ -739,7 +742,71 @@ class PHPExcel_Calculation_LookupRef {
         }
 
         return PHPExcel_Calculation_Functions::NA();
-	}	//	function VLOOKUP()
+    }
+
+
+    /**
+     * HLOOKUP
+     * The HLOOKUP function searches for value in the top-most row of lookup_array and returns the value in the same column based on the index_number.
+     * @param    lookup_value    The value that you want to match in lookup_array
+     * @param    lookup_array    The range of cells being searched
+     * @param    index_number    The row number in table_array from which the matching value must be returned. The first row is 1.
+     * @param    not_exact_match Determines if you are looking for an exact match based on lookup_value.
+     * @return   mixed           The value of the found cell
+     */
+    public static function HLOOKUP($lookup_value, $lookup_array, $index_number, $not_exact_match = true)
+    {
+        $lookup_value   = PHPExcel_Calculation_Functions::flattenSingleValue($lookup_value);
+        $index_number   = PHPExcel_Calculation_Functions::flattenSingleValue($index_number);
+        $not_exact_match    = PHPExcel_Calculation_Functions::flattenSingleValue($not_exact_match);
+
+        // index_number must be greater than or equal to 1
+        if ($index_number < 1) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+
+        // index_number must be less than or equal to the number of columns in lookup_array
+        if ((!is_array($lookup_array)) || (empty($lookup_array))) {
+            return PHPExcel_Calculation_Functions::REF();
+        } else {
+            $f = array_keys($lookup_array);
+            $firstRow = array_pop($f);
+            if ((!is_array($lookup_array[$firstRow])) || ($index_number > count($lookup_array[$firstRow]))) {
+                return PHPExcel_Calculation_Functions::REF();
+            } else {
+                $columnKeys = array_keys($lookup_array[$firstRow]);
+                                $firstkey = $f[0] - 1;
+                $returnColumn = $firstkey + $index_number;
+                $firstColumn = array_shift($f);
+            }
+        }
+
+        if (!$not_exact_match) {
+            $firstRowH = asort($lookup_array[$firstColumn]);
+        }
+
+        $rowNumber = $rowValue = false;
+        foreach ($lookup_array[$firstColumn] as $rowKey => $rowData) {
+            if ((is_numeric($lookup_value) && is_numeric($rowData) && ($rowData > $lookup_value)) ||
+                (!is_numeric($lookup_value) && !is_numeric($rowData) && (strtolower($rowData) > strtolower($lookup_value)))) {
+                break;
+            }
+            $rowNumber = $rowKey;
+            $rowValue = $rowData;
+        }
+
+        if ($rowNumber !== false) {
+            if ((!$not_exact_match) && ($rowValue != $lookup_value)) {
+                //  if an exact match is required, we have what we need to return an appropriate response
+                return PHPExcel_Calculation_Functions::NA();
+            } else {
+                //  otherwise return the appropriate value
+                return $lookup_array[$returnColumn][$rowNumber];
+            }
+        }
+
+        return PHPExcel_Calculation_Functions::NA();
+    }
 
 
     /**
@@ -750,7 +817,8 @@ class PHPExcel_Calculation_LookupRef {
      * @param    result_vector    The column from which the matching value must be returned
      * @return    mixed            The value of the found cell
      */
-	public static function LOOKUP($lookup_value, $lookup_vector, $result_vector=null) {
+    public static function LOOKUP($lookup_value, $lookup_vector, $result_vector = null)
+    {
         $lookup_value = PHPExcel_Calculation_Functions::flattenSingleValue($lookup_value);
 
         if (!is_array($lookup_vector)) {
@@ -807,6 +875,5 @@ class PHPExcel_Calculation_LookupRef {
         }
 
         return self::VLOOKUP($lookup_value, $lookup_vector, 2);
- 	}	//	function LOOKUP()
-
-}	//	class PHPExcel_Calculation_LookupRef
+    }
+}

Classes/PHPExcel/Calculation/TextData.php

@@ -1,8 +1,18 @@
 <?php
+
+/** PHPExcel root directory */
+if (!defined('PHPEXCEL_ROOT')) {
     /**
- * PHPExcel
+     * @ignore
+     */
+    define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
+    require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+}
+
+/**
+ * PHPExcel_Calculation_TextData
  *
- * Copyright (c) 2006 - 2013 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,50 +30,34 @@
  *
  * @category    PHPExcel
  * @package        PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
+class PHPExcel_Calculation_TextData
+{
+    private static $invalidChars;
 
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-	/**
-	 * @ignore
-	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-
-/**
- * PHPExcel_Calculation_TextData
- *
- * @category	PHPExcel
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Calculation_TextData {
-
-	private static $_invalidChars = Null;
-
-	private static function _uniord($c) {
-		if (ord($c{0}) >=0 && ord($c{0}) <= 127)
+    private static function unicodeToOrd($c)
+    {
+        if (ord($c{0}) >=0 && ord($c{0}) <= 127) {
             return ord($c{0});
-		if (ord($c{0}) >= 192 && ord($c{0}) <= 223)
+        } elseif (ord($c{0}) >= 192 && ord($c{0}) <= 223) {
             return (ord($c{0})-192)*64 + (ord($c{1})-128);
-		if (ord($c{0}) >= 224 && ord($c{0}) <= 239)
+        } elseif (ord($c{0}) >= 224 && ord($c{0}) <= 239) {
             return (ord($c{0})-224)*4096 + (ord($c{1})-128)*64 + (ord($c{2})-128);
-		if (ord($c{0}) >= 240 && ord($c{0}) <= 247)
+        } elseif (ord($c{0}) >= 240 && ord($c{0}) <= 247) {
             return (ord($c{0})-240)*262144 + (ord($c{1})-128)*4096 + (ord($c{2})-128)*64 + (ord($c{3})-128);
-		if (ord($c{0}) >= 248 && ord($c{0}) <= 251)
+        } elseif (ord($c{0}) >= 248 && ord($c{0}) <= 251) {
             return (ord($c{0})-248)*16777216 + (ord($c{1})-128)*262144 + (ord($c{2})-128)*4096 + (ord($c{3})-128)*64 + (ord($c{4})-128);
-		if (ord($c{0}) >= 252 && ord($c{0}) <= 253)
+        } elseif (ord($c{0}) >= 252 && ord($c{0}) <= 253) {
             return (ord($c{0})-252)*1073741824 + (ord($c{1})-128)*16777216 + (ord($c{2})-128)*262144 + (ord($c{3})-128)*4096 + (ord($c{4})-128)*64 + (ord($c{5})-128);
-		if (ord($c{0}) >= 254 && ord($c{0}) <= 255) //error
+        } elseif (ord($c{0}) >= 254 && ord($c{0}) <= 255) {
+            // error
             return PHPExcel_Calculation_Functions::VALUE();
+        }
         return 0;
-	}	//	function _uniord()
+    }
 
     /**
      * CHARACTER
@@ -71,7 +65,8 @@ class PHPExcel_Calculation_TextData {
      * @param    string    $character    Value
      * @return    int
      */
-	public static function CHARACTER($character) {
+    public static function CHARACTER($character)
+    {
         $character = PHPExcel_Calculation_Functions::flattenSingleValue($character);
 
         if ((!is_numeric($character)) || ($character < 0)) {
@@ -92,22 +87,23 @@ class PHPExcel_Calculation_TextData {
      * @param    mixed    $stringValue    Value to check
      * @return    string
      */
-	public static function TRIMNONPRINTABLE($stringValue = '') {
+    public static function TRIMNONPRINTABLE($stringValue = '')
+    {
         $stringValue    = PHPExcel_Calculation_Functions::flattenSingleValue($stringValue);
 
         if (is_bool($stringValue)) {
             return ($stringValue) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
         }
 
-		if (self::$_invalidChars == Null) {
-			self::$_invalidChars = range(chr(0),chr(31));
+        if (self::$invalidChars == null) {
+            self::$invalidChars = range(chr(0), chr(31));
         }
 
         if (is_string($stringValue) || is_numeric($stringValue)) {
-			return str_replace(self::$_invalidChars,'',trim($stringValue,"\x00..\x1F"));
+            return str_replace(self::$invalidChars, '', trim($stringValue, "\x00..\x1F"));
+        }
+        return null;
     }
-		return NULL;
-	}	//	function TRIMNONPRINTABLE()
 
 
     /**
@@ -116,18 +112,18 @@ class PHPExcel_Calculation_TextData {
      * @param    mixed    $stringValue    Value to check
      * @return    string
      */
-	public static function TRIMSPACES($stringValue = '') {
+    public static function TRIMSPACES($stringValue = '')
+    {
         $stringValue = PHPExcel_Calculation_Functions::flattenSingleValue($stringValue);
-
         if (is_bool($stringValue)) {
             return ($stringValue) ? PHPExcel_Calculation::getTRUE() : PHPExcel_Calculation::getFALSE();
         }
 
         if (is_string($stringValue) || is_numeric($stringValue)) {
-			return trim(preg_replace('/ +/',' ',trim($stringValue,' ')));
+            return trim(preg_replace('/ +/', ' ', trim($stringValue, ' ')), ' ');
+        }
+        return null;
     }
-		return NULL;
-	}	//	function TRIMSPACES()
 
 
     /**
@@ -136,9 +132,11 @@ class PHPExcel_Calculation_TextData {
      * @param    string    $characters        Value
      * @return    int
      */
-	public static function ASCIICODE($characters) {
-		if (($characters === NULL) || ($characters === ''))
+    public static function ASCIICODE($characters)
+    {
+        if (($characters === null) || ($characters === '')) {
             return PHPExcel_Calculation_Functions::VALUE();
+        }
         $characters    = PHPExcel_Calculation_Functions::flattenSingleValue($characters);
         if (is_bool($characters)) {
             if (PHPExcel_Calculation_Functions::getCompatibilityMode() == PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE) {
@@ -150,13 +148,17 @@ class PHPExcel_Calculation_TextData {
 
         $character = $characters;
         if ((function_exists('mb_strlen')) && (function_exists('mb_substr'))) {
-			if (mb_strlen($characters, 'UTF-8') > 1) { $character = mb_substr($characters, 0, 1, 'UTF-8'); }
-			return self::_uniord($character);
+            if (mb_strlen($characters, 'UTF-8') > 1) {
+                $character = mb_substr($characters, 0, 1, 'UTF-8');
+            }
+            return self::unicodeToOrd($character);
         } else {
-			if (strlen($characters) > 0) { $character = substr($characters, 0, 1); }
+            if (strlen($characters) > 0) {
+                $character = substr($characters, 0, 1);
+            }
             return ord($character);
         }
-	}	//	function ASCIICODE()
+    }
 
 
     /**
@@ -164,8 +166,8 @@ class PHPExcel_Calculation_TextData {
      *
      * @return    string
      */
-	public static function CONCATENATE() {
-		// Return value
+    public static function CONCATENATE()
+    {
         $returnValue = '';
 
         // Loop through arguments
@@ -181,9 +183,8 @@ class PHPExcel_Calculation_TextData {
             $returnValue .= $arg;
         }
 
-		// Return
         return $returnValue;
-	}	//	function CONCATENATE()
+    }
 
 
     /**
@@ -198,7 +199,8 @@ class PHPExcel_Calculation_TextData {
      *                                    If you omit decimals, it is assumed to be 2
      * @return    string
      */
-	public static function DOLLAR($value = 0, $decimals = 2) {
+    public static function DOLLAR($value = 0, $decimals = 2)
+    {
         $value        = PHPExcel_Calculation_Functions::flattenSingleValue($value);
         $decimals    = is_null($decimals) ? 0 : PHPExcel_Calculation_Functions::flattenSingleValue($decimals);
 
@@ -208,17 +210,20 @@ class PHPExcel_Calculation_TextData {
         }
         $decimals = floor($decimals);
 
+        $mask = '$#,##0';
         if ($decimals > 0) {
-			return money_format('%.'.$decimals.'n',$value);
+            $mask .= '.' . str_repeat('0', $decimals);
         } else {
             $round = pow(10, abs($decimals));
-			if ($value < 0) { $round = 0-$round; }
-			$value = PHPExcel_Calculation_MathTrig::MROUND($value,$round);
-			//	The implementation of money_format used if the standard PHP function is not available can't handle decimal places of 0,
-			//		so we display to 1 dp and chop off that character and the decimal separator using substr
-			return substr(money_format('%.1n',$value),0,-2);
+            if ($value < 0) {
+                $round = 0-$round;
+            }
+            $value = PHPExcel_Calculation_MathTrig::MROUND($value, $round);
+        }
+
+        return PHPExcel_Style_NumberFormat::toFormattedString($value, $mask);
+
     }
-	}	//	function DOLLAR()
 
 
     /**
@@ -229,7 +234,8 @@ class PHPExcel_Calculation_TextData {
      * @param    int        $offset        Offset within $haystack
      * @return    string
      */
-	public static function SEARCHSENSITIVE($needle,$haystack,$offset=1) {
+    public static function SEARCHSENSITIVE($needle, $haystack, $offset = 1)
+    {
         $needle   = PHPExcel_Calculation_Functions::flattenSingleValue($needle);
         $haystack = PHPExcel_Calculation_Functions::flattenSingleValue($haystack);
         $offset   = PHPExcel_Calculation_Functions::flattenSingleValue($offset);
@@ -254,7 +260,7 @@ class PHPExcel_Calculation_TextData {
             }
         }
         return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function SEARCHSENSITIVE()
+    }
 
 
     /**
@@ -265,7 +271,8 @@ class PHPExcel_Calculation_TextData {
      * @param    int        $offset        Offset within $haystack
      * @return    string
      */
-	public static function SEARCHINSENSITIVE($needle,$haystack,$offset=1) {
+    public static function SEARCHINSENSITIVE($needle, $haystack, $offset = 1)
+    {
         $needle   = PHPExcel_Calculation_Functions::flattenSingleValue($needle);
         $haystack = PHPExcel_Calculation_Functions::flattenSingleValue($haystack);
         $offset   = PHPExcel_Calculation_Functions::flattenSingleValue($offset);
@@ -290,7 +297,7 @@ class PHPExcel_Calculation_TextData {
             }
         }
         return PHPExcel_Calculation_Functions::VALUE();
-	}	//	function SEARCHINSENSITIVE()
+    }
 
 
     /**
@@ -301,7 +308,8 @@ class PHPExcel_Calculation_TextData {
      * @param    boolean        $no_commas
      * @return    boolean
      */
-	public static function FIXEDFORMAT($value, $decimals = 2, $no_commas = FALSE) {
+    public static function FIXEDFORMAT($value, $decimals = 2, $no_commas = false)
+    {
         $value     = PHPExcel_Calculation_Functions::flattenSingleValue($value);
         $decimals  = PHPExcel_Calculation_Functions::flattenSingleValue($decimals);
         $no_commas = PHPExcel_Calculation_Functions::flattenSingleValue($no_commas);
@@ -313,13 +321,15 @@ class PHPExcel_Calculation_TextData {
         $decimals = floor($decimals);
 
         $valueResult = round($value, $decimals);
-		if ($decimals < 0) { $decimals = 0; }
+        if ($decimals < 0) {
+            $decimals = 0;
+        }
         if (!$no_commas) {
             $valueResult = number_format($valueResult, $decimals);
         }
 
         return (string) $valueResult;
-	}	//	function FIXEDFORMAT()
+    }
 
 
     /**
@@ -329,7 +339,8 @@ class PHPExcel_Calculation_TextData {
      * @param    int        $chars    Number of characters
      * @return    string
      */
-	public static function LEFT($value = '', $chars = 1) {
+    public static function LEFT($value = '', $chars = 1)
+    {
         $value = PHPExcel_Calculation_Functions::flattenSingleValue($value);
         $chars = PHPExcel_Calculation_Functions::flattenSingleValue($chars);
 
@@ -346,7 +357,7 @@ class PHPExcel_Calculation_TextData {
         } else {
             return substr($value, 0, $chars);
         }
-	}	//	function LEFT()
+    }
 
 
     /**
@@ -357,7 +368,8 @@ class PHPExcel_Calculation_TextData {
      * @param    int        $chars    Number of characters
      * @return    string
      */
-	public static function MID($value = '', $start = 1, $chars = null) {
+    public static function MID($value = '', $start = 1, $chars = null)
+    {
         $value = PHPExcel_Calculation_Functions::flattenSingleValue($value);
         $start = PHPExcel_Calculation_Functions::flattenSingleValue($start);
         $chars = PHPExcel_Calculation_Functions::flattenSingleValue($chars);
@@ -375,7 +387,7 @@ class PHPExcel_Calculation_TextData {
         } else {
             return substr($value, --$start, $chars);
         }
-	}	//	function MID()
+    }
 
 
     /**
@@ -385,7 +397,8 @@ class PHPExcel_Calculation_TextData {
      * @param    int        $chars    Number of characters
      * @return    string
      */
-	public static function RIGHT($value = '', $chars = 1) {
+    public static function RIGHT($value = '', $chars = 1)
+    {
         $value = PHPExcel_Calculation_Functions::flattenSingleValue($value);
         $chars = PHPExcel_Calculation_Functions::flattenSingleValue($chars);
 
@@ -402,7 +415,7 @@ class PHPExcel_Calculation_TextData {
         } else {
             return substr($value, strlen($value) - $chars);
         }
-	}	//	function RIGHT()
+    }
 
 
     /**
@@ -411,7 +424,8 @@ class PHPExcel_Calculation_TextData {
      * @param    string    $value    Value
      * @return    string
      */
-	public static function STRINGLENGTH($value = '') {
+    public static function STRINGLENGTH($value = '')
+    {
         $value = PHPExcel_Calculation_Functions::flattenSingleValue($value);
 
         if (is_bool($value)) {
@@ -423,7 +437,7 @@ class PHPExcel_Calculation_TextData {
         } else {
             return strlen($value);
         }
-	}	//	function STRINGLENGTH()
+    }
 
 
     /**
@@ -434,7 +448,8 @@ class PHPExcel_Calculation_TextData {
      * @param    string        $mixedCaseString
      * @return    string
      */
-	public static function LOWERCASE($mixedCaseString) {
+    public static function LOWERCASE($mixedCaseString)
+    {
         $mixedCaseString = PHPExcel_Calculation_Functions::flattenSingleValue($mixedCaseString);
 
         if (is_bool($mixedCaseString)) {
@@ -442,7 +457,7 @@ class PHPExcel_Calculation_TextData {
         }
 
         return PHPExcel_Shared_String::StrToLower($mixedCaseString);
-	}	//	function LOWERCASE()
+    }
 
 
     /**
@@ -453,7 +468,8 @@ class PHPExcel_Calculation_TextData {
      * @param    string        $mixedCaseString
      * @return    string
      */
-	public static function UPPERCASE($mixedCaseString) {
+    public static function UPPERCASE($mixedCaseString)
+    {
         $mixedCaseString = PHPExcel_Calculation_Functions::flattenSingleValue($mixedCaseString);
 
         if (is_bool($mixedCaseString)) {
@@ -461,7 +477,7 @@ class PHPExcel_Calculation_TextData {
         }
 
         return PHPExcel_Shared_String::StrToUpper($mixedCaseString);
-	}	//	function UPPERCASE()
+    }
 
 
     /**
@@ -472,7 +488,8 @@ class PHPExcel_Calculation_TextData {
      * @param    string        $mixedCaseString
      * @return    string
      */
-	public static function PROPERCASE($mixedCaseString) {
+    public static function PROPERCASE($mixedCaseString)
+    {
         $mixedCaseString = PHPExcel_Calculation_Functions::flattenSingleValue($mixedCaseString);
 
         if (is_bool($mixedCaseString)) {
@@ -480,7 +497,7 @@ class PHPExcel_Calculation_TextData {
         }
 
         return PHPExcel_Shared_String::StrToTitle($mixedCaseString);
-	}	//	function PROPERCASE()
+    }
 
 
     /**
@@ -492,7 +509,8 @@ class PHPExcel_Calculation_TextData {
      * @param    string    $newText    String to replace in defined position
      * @return    string
      */
-	public static function REPLACE($oldText = '', $start = 1, $chars = null, $newText) {
+    public static function REPLACE($oldText = '', $start = 1, $chars = null, $newText)
+    {
         $oldText = PHPExcel_Calculation_Functions::flattenSingleValue($oldText);
         $start   = PHPExcel_Calculation_Functions::flattenSingleValue($start);
         $chars   = PHPExcel_Calculation_Functions::flattenSingleValue($chars);
@@ -502,7 +520,7 @@ class PHPExcel_Calculation_TextData {
         $right = self::RIGHT($oldText, self::STRINGLENGTH($oldText)-($start+$chars)+1);
 
         return $left.$newText.$right;
-	}	//	function REPLACE()
+    }
 
 
     /**
@@ -514,7 +532,8 @@ class PHPExcel_Calculation_TextData {
      * @param    integer    $instance    Instance Number
      * @return    string
      */
-	public static function SUBSTITUTE($text = '', $fromText = '', $toText = '', $instance = 0) {
+    public static function SUBSTITUTE($text = '', $fromText = '', $toText = '', $instance = 0)
+    {
         $text     = PHPExcel_Calculation_Functions::flattenSingleValue($text);
         $fromText = PHPExcel_Calculation_Functions::flattenSingleValue($fromText);
         $toText   = PHPExcel_Calculation_Functions::flattenSingleValue($toText);
@@ -549,7 +568,7 @@ class PHPExcel_Calculation_TextData {
         }
 
         return $text;
-	}	//	function SUBSTITUTE()
+    }
 
 
     /**
@@ -558,14 +577,15 @@ class PHPExcel_Calculation_TextData {
      * @param    mixed    $testValue    Value to check
      * @return    boolean
      */
-	public static function RETURNSTRING($testValue = '') {
+    public static function RETURNSTRING($testValue = '')
+    {
         $testValue = PHPExcel_Calculation_Functions::flattenSingleValue($testValue);
 
         if (is_string($testValue)) {
             return $testValue;
         }
-		return Null;
-	}	//	function RETURNSTRING()
+        return null;
+    }
 
 
     /**
@@ -575,7 +595,8 @@ class PHPExcel_Calculation_TextData {
      * @param    string    $format    Format mask to use
      * @return    boolean
      */
-	public static function TEXTFORMAT($value,$format) {
+    public static function TEXTFORMAT($value, $format)
+    {
         $value  = PHPExcel_Calculation_Functions::flattenSingleValue($value);
         $format = PHPExcel_Calculation_Functions::flattenSingleValue($format);
 
@@ -584,6 +605,47 @@ class PHPExcel_Calculation_TextData {
         }
 
         return (string) PHPExcel_Style_NumberFormat::toFormattedString($value, $format);
-	}	//	function TEXTFORMAT()
+    }
 
-}	//	class PHPExcel_Calculation_TextData
+    /**
+     * VALUE
+     *
+     * @param    mixed    $value    Value to check
+     * @return    boolean
+     */
+    public static function VALUE($value = '')
+    {
+        $value = PHPExcel_Calculation_Functions::flattenSingleValue($value);
+
+        if (!is_numeric($value)) {
+            $numberValue = str_replace(
+                PHPExcel_Shared_String::getThousandsSeparator(),
+                '',
+                trim($value, " \t\n\r\0\x0B" . PHPExcel_Shared_String::getCurrencyCode())
+            );
+            if (is_numeric($numberValue)) {
+                return (float) $numberValue;
+            }
+
+            $dateSetting = PHPExcel_Calculation_Functions::getReturnDateType();
+            PHPExcel_Calculation_Functions::setReturnDateType(PHPExcel_Calculation_Functions::RETURNDATE_EXCEL);
+
+            if (strpos($value, ':') !== false) {
+                $timeValue = PHPExcel_Calculation_DateTime::TIMEVALUE($value);
+                if ($timeValue !== PHPExcel_Calculation_Functions::VALUE()) {
+                    PHPExcel_Calculation_Functions::setReturnDateType($dateSetting);
+                    return $timeValue;
+                }
+            }
+            $dateValue = PHPExcel_Calculation_DateTime::DATEVALUE($value);
+            if ($dateValue !== PHPExcel_Calculation_Functions::VALUE()) {
+                PHPExcel_Calculation_Functions::setReturnDateType($dateSetting);
+                return $dateValue;
+            }
+            PHPExcel_Calculation_Functions::setReturnDateType($dateSetting);
+
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+        return (float) $value;
+    }
+}

Classes/PHPExcel/Calculation/Token/Stack.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * PHPExcel
+ * PHPExcel_Calculation_Token_Stack
  *
- * Copyright (c) 2006 - 2013 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,44 +21,35 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-
-/**
- * PHPExcel_Calculation_Token_Stack
- *
- * @category	PHPExcel_Calculation_Token_Stack
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Calculation_Token_Stack {
-
+class PHPExcel_Calculation_Token_Stack
+{
     /**
      *  The parser stack for formulae
      *
      *  @var mixed[]
      */
-	private $_stack = array();
+    private $stack = array();
 
     /**
      *  Count of entries in the parser stack
      *
      *  @var integer
      */
-	private $_count = 0;
-
+    private $count = 0;
 
     /**
      * Return the number of entries on the stack
      *
      * @return  integer
      */
-	public function count() {
-		return $this->_count;
-	}	//	function count()
+    public function count()
+    {
+        return $this->count;
+    }
 
     /**
      * Push a new entry onto the stack
@@ -66,30 +58,33 @@ class PHPExcel_Calculation_Token_Stack {
      * @param  mixed  $value
      * @param  mixed  $reference
      */
-	public function push($type, $value, $reference = NULL) {
-		$this->_stack[$this->_count++] = array('type'		=> $type,
+    public function push($type, $value, $reference = null)
+    {
+        $this->stack[$this->count++] = array(
+            'type'      => $type,
             'value'     => $value,
             'reference' => $reference
         );
         if ($type == 'Function') {
-			$localeFunction = PHPExcel_Calculation::_localeFunc($value);
+            $localeFunction = PHPExcel_Calculation::localeFunc($value);
             if ($localeFunction != $value) {
-				$this->_stack[($this->_count - 1)]['localeValue'] = $localeFunction;
+                $this->stack[($this->count - 1)]['localeValue'] = $localeFunction;
+            }
         }
     }
-	}	//	function push()
 
     /**
      * Pop the last entry from the stack
      *
      * @return  mixed
      */
-	public function pop() {
-		if ($this->_count > 0) {
-			return $this->_stack[--$this->_count];
+    public function pop()
+    {
+        if ($this->count > 0) {
+            return $this->stack[--$this->count];
+        }
+        return null;
     }
-		return NULL;
-	}	//	function pop()
 
     /**
      * Return an entry from the stack without removing it
@@ -97,19 +92,20 @@ class PHPExcel_Calculation_Token_Stack {
      * @param   integer  $n  number indicating how far back in the stack we want to look
      * @return  mixed
      */
-	public function last($n = 1) {
-		if ($this->_count - $n < 0) {
-			return NULL;
+    public function last($n = 1)
+    {
+        if ($this->count - $n < 0) {
+            return null;
+        }
+        return $this->stack[$this->count - $n];
     }
-		return $this->_stack[$this->_count - $n];
-	}	//	function last()
 
     /**
      * Clear the stack
      */
-	function clear() {
-		$this->_stack = array();
-		$this->_count = 0;
+    public function clear()
+    {
+        $this->stack = array();
+        $this->count = 0;
+    }
 }
-
-}	//	class PHPExcel_Calculation_Token_Stack

Classes/PHPExcel/Cell.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- *	PHPExcel
+ *    PHPExcel_Cell
  *
- *	Copyright (c) 2006 - 2013 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,22 +21,12 @@
  *
  *    @category    PHPExcel
  *    @package    PHPExcel_Cell
- *	@copyright	Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ *    @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##
  */
-
-
-/**
- *	PHPExcel_Cell
- *
- *	@category   PHPExcel
- *	@package	PHPExcel_Cell
- *	@copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
 class PHPExcel_Cell
 {
-
     /**
      *  Default range variable constant
      *
@@ -48,14 +39,14 @@ class PHPExcel_Cell
      *
      *    @var    PHPExcel_Cell_IValueBinder
      */
-	private static $_valueBinder = NULL;
+    private static $valueBinder;
 
     /**
      *    Value of the cell
      *
      *    @var    mixed
      */
-	private $_value;
+    private $value;
 
     /**
      *    Calculated value of the cell (used for caching)
@@ -67,34 +58,34 @@ class PHPExcel_Cell
      *
      *    @var mixed
      */
-	private $_calculatedValue = NULL;
+    private $calculatedValue;
 
     /**
      *    Type of the cell data
      *
      *    @var    string
      */
-	private $_dataType;
+    private $dataType;
 
     /**
      *    Parent worksheet
      *
      *    @var    PHPExcel_CachedObjectStorage_CacheBase
      */
-	private $_parent;
+    private $parent;
 
     /**
      *    Index to cellXf
      *
      *    @var    int
      */
-	private $_xfIndex;
+    private $xfIndex = 0;
 
     /**
      *    Attributes of the formula
      *
      */
-	private $_formulaAttributes;
+    private $formulaAttributes;
 
 
     /**
@@ -102,20 +93,21 @@ class PHPExcel_Cell
      *
      *    @return void
      **/
-	public function notifyCacheController() {
-		$this->_parent->updateCacheData($this);
+    public function notifyCacheController()
+    {
+        $this->parent->updateCacheData($this);
 
         return $this;
     }
 
-	public function detach() {
-		$this->_parent = NULL;
+    public function detach()
+    {
+        $this->parent = null;
     }
 
-	public function attach(PHPExcel_CachedObjectStorage_CacheBase $parent) {
-
-
-		$this->_parent = $parent;
+    public function attach(PHPExcel_CachedObjectStorage_CacheBase $parent)
+    {
+        $this->parent = $parent;
     }
 
 
@@ -127,29 +119,25 @@ class PHPExcel_Cell
      *    @param    PHPExcel_Worksheet    $pSheet
      *    @throws    PHPExcel_Exception
      */
-	public function __construct($pValue = NULL, $pDataType = NULL, PHPExcel_Worksheet $pSheet = NULL)
+    public function __construct($pValue = null, $pDataType = null, PHPExcel_Worksheet $pSheet = null)
     {
         // Initialise cell value
-		$this->_value = $pValue;
+        $this->value = $pValue;
 
         // Set worksheet cache
-		$this->_parent = $pSheet->getCellCacheController();
+        $this->parent = $pSheet->getCellCacheController();
 
         // Set datatype?
-		if ($pDataType !== NULL) {
-			if ($pDataType == PHPExcel_Cell_DataType::TYPE_STRING2)
+        if ($pDataType !== null) {
+            if ($pDataType == PHPExcel_Cell_DataType::TYPE_STRING2) {
                 $pDataType = PHPExcel_Cell_DataType::TYPE_STRING;
-			$this->_dataType = $pDataType;
-		} else {
-			if (!self::getValueBinder()->bindValue($this, $pValue)) {
+            }
+            $this->dataType = $pDataType;
+        } elseif (!self::getValueBinder()->bindValue($this, $pValue)) {
             throw new PHPExcel_Exception("Value could not be bound to cell.");
         }
     }
 
-		// set default index to cellXf
-		$this->_xfIndex = 0;
-	}
-
     /**
      *    Get cell coordinate column
      *
@@ -157,7 +145,7 @@ class PHPExcel_Cell
      */
     public function getColumn()
     {
-		return $this->_parent->getCurrentColumn();
+        return $this->parent->getCurrentColumn();
     }
 
     /**
@@ -167,7 +155,7 @@ class PHPExcel_Cell
      */
     public function getRow()
     {
-		return $this->_parent->getCurrentRow();
+        return $this->parent->getCurrentRow();
     }
 
     /**
@@ -177,7 +165,7 @@ class PHPExcel_Cell
      */
     public function getCoordinate()
     {
-		return $this->_parent->getCurrentAddress();
+        return $this->parent->getCurrentAddress();
     }
 
     /**
@@ -187,7 +175,7 @@ class PHPExcel_Cell
      */
     public function getValue()
     {
-		return $this->_value;
+        return $this->value;
     }
 
     /**
@@ -199,7 +187,7 @@ class PHPExcel_Cell
     {
         return (string) PHPExcel_Style_NumberFormat::toFormattedString(
             $this->getCalculatedValue(),
-				$this->getWorksheet()->getParent()->getCellXfByIndex($this->getXfIndex())
+            $this->getStyle()
                 ->getNumberFormat()->getFormatCode()
         );
     }
@@ -213,7 +201,7 @@ class PHPExcel_Cell
      *    @return    PHPExcel_Cell
      *    @throws    PHPExcel_Exception
      */
-	public function setValue($pValue = NULL)
+    public function setValue($pValue = null)
     {
         if (!self::getValueBinder()->bindValue($this, $pValue)) {
             throw new PHPExcel_Exception("Value could not be bound to cell.");
@@ -229,28 +217,33 @@ class PHPExcel_Cell
      *    @return    PHPExcel_Cell
      *    @throws    PHPExcel_Exception
      */
-	public function setValueExplicit($pValue = NULL, $pDataType = PHPExcel_Cell_DataType::TYPE_STRING)
+    public function setValueExplicit($pValue = null, $pDataType = PHPExcel_Cell_DataType::TYPE_STRING)
     {
         // set the value according to data type
         switch ($pDataType) {
+            case PHPExcel_Cell_DataType::TYPE_NULL:
+                $this->value = $pValue;
+                break;
             case PHPExcel_Cell_DataType::TYPE_STRING2:
                 $pDataType = PHPExcel_Cell_DataType::TYPE_STRING;
+                // no break
             case PHPExcel_Cell_DataType::TYPE_STRING:
-			case PHPExcel_Cell_DataType::TYPE_NULL:
+                // Synonym for string
             case PHPExcel_Cell_DataType::TYPE_INLINE:
-				$this->_value = PHPExcel_Cell_DataType::checkString($pValue);
+                // Rich text
+                $this->value = PHPExcel_Cell_DataType::checkString($pValue);
                 break;
             case PHPExcel_Cell_DataType::TYPE_NUMERIC:
-				$this->_value = (float)$pValue;
+                $this->value = (float) $pValue;
                 break;
             case PHPExcel_Cell_DataType::TYPE_FORMULA:
-				$this->_value = (string)$pValue;
+                $this->value = (string) $pValue;
                 break;
             case PHPExcel_Cell_DataType::TYPE_BOOL:
-				$this->_value = (bool)$pValue;
+                $this->value = (bool) $pValue;
                 break;
             case PHPExcel_Cell_DataType::TYPE_ERROR:
-				$this->_value = PHPExcel_Cell_DataType::checkErrorCode($pValue);
+                $this->value = PHPExcel_Cell_DataType::checkErrorCode($pValue);
                 break;
             default:
                 throw new PHPExcel_Exception('Invalid datatype: ' . $pDataType);
@@ -258,7 +251,7 @@ class PHPExcel_Cell
         }
 
         // set the datatype
-		$this->_dataType = $pDataType;
+        $this->dataType = $pDataType;
 
         return $this->notifyCacheController();
     }
@@ -272,10 +265,10 @@ class PHPExcel_Cell
      *    @return    mixed
      *    @throws    PHPExcel_Exception
      */
-	public function getCalculatedValue($resetLog = TRUE)
+    public function getCalculatedValue($resetLog = true)
     {
-//echo 'Cell '.$this->getCoordinate().' value is a '.$this->_dataType.' with a value of '.$this->getValue().PHP_EOL;
-		if ($this->_dataType == PHPExcel_Cell_DataType::TYPE_FORMULA) {
+//echo 'Cell '.$this->getCoordinate().' value is a '.$this->dataType.' with a value of '.$this->getValue().PHP_EOL;
+        if ($this->dataType == PHPExcel_Cell_DataType::TYPE_FORMULA) {
             try {
 //echo 'Cell value for '.$this->getCoordinate().' is a formula: Calculating value'.PHP_EOL;
                 $result = PHPExcel_Calculation::getInstance(
@@ -289,9 +282,9 @@ class PHPExcel_Cell
                     }
                 }
             } catch (PHPExcel_Exception $ex) {
-				if (($ex->getMessage() === 'Unable to access External Workbook') && ($this->_calculatedValue !== NULL)) {
-//echo 'Returning fallback value of '.$this->_calculatedValue.' for cell '.$this->getCoordinate().PHP_EOL;
-					return $this->_calculatedValue; // Fallback for calculations referencing external files.
+                if (($ex->getMessage() === 'Unable to access External Workbook') && ($this->calculatedValue !== null)) {
+//echo 'Returning fallback value of '.$this->calculatedValue.' for cell '.$this->getCoordinate().PHP_EOL;
+                    return $this->calculatedValue; // Fallback for calculations referencing external files.
                 }
 //echo 'Calculation Exception: '.$ex->getMessage().PHP_EOL;
                 $result = '#N/A';
@@ -301,17 +294,17 @@ class PHPExcel_Cell
             }
 
             if ($result === '#Not Yet Implemented') {
-//echo 'Returning fallback value of '.$this->_calculatedValue.' for cell '.$this->getCoordinate().PHP_EOL;
-				return $this->_calculatedValue; // Fallback if calculation engine does not support the formula.
+//echo 'Returning fallback value of '.$this->calculatedValue.' for cell '.$this->getCoordinate().PHP_EOL;
+                return $this->calculatedValue; // Fallback if calculation engine does not support the formula.
             }
 //echo 'Returning calculated value of '.$result.' for cell '.$this->getCoordinate().PHP_EOL;
             return $result;
-		} elseif($this->_value instanceof PHPExcel_RichText) {
-//		echo 'Cell value for '.$this->getCoordinate().' is rich text: Returning data value of '.$this->_value.'<br />';
-			return $this->_value->getPlainText();
+        } elseif ($this->value instanceof PHPExcel_RichText) {
+//        echo 'Cell value for '.$this->getCoordinate().' is rich text: Returning data value of '.$this->value.'<br />';
+            return $this->value->getPlainText();
         }
-//		echo 'Cell value for '.$this->getCoordinate().' is not a formula: Returning data value of '.$this->_value.'<br />';
-		return $this->_value;
+//        echo 'Cell value for '.$this->getCoordinate().' is not a formula: Returning data value of '.$this->value.'<br />';
+        return $this->value;
     }
 
     /**
@@ -320,10 +313,10 @@ class PHPExcel_Cell
      *    @param    mixed $pValue    Value
      *    @return    PHPExcel_Cell
      */
-	public function setCalculatedValue($pValue = NULL)
+    public function setCalculatedValue($pValue = null)
     {
-		if ($pValue !== NULL) {
-			$this->_calculatedValue = (is_numeric($pValue)) ? (float) $pValue : $pValue;
+        if ($pValue !== null) {
+            $this->calculatedValue = (is_numeric($pValue)) ? (float) $pValue : $pValue;
         }
 
         return $this->notifyCacheController();
@@ -341,7 +334,7 @@ class PHPExcel_Cell
      */
     public function getOldCalculatedValue()
     {
-		return $this->_calculatedValue;
+        return $this->calculatedValue;
     }
 
     /**
@@ -351,7 +344,7 @@ class PHPExcel_Cell
      */
     public function getDataType()
     {
-		return $this->_dataType;
+        return $this->dataType;
     }
 
     /**
@@ -362,14 +355,24 @@ class PHPExcel_Cell
      */
     public function setDataType($pDataType = PHPExcel_Cell_DataType::TYPE_STRING)
     {
-		if ($pDataType == PHPExcel_Cell_DataType::TYPE_STRING2)
+        if ($pDataType == PHPExcel_Cell_DataType::TYPE_STRING2) {
             $pDataType = PHPExcel_Cell_DataType::TYPE_STRING;
-
-		$this->_dataType = $pDataType;
+        }
+        $this->dataType = $pDataType;
 
         return $this->notifyCacheController();
     }
 
+    /**
+     *  Identify if the cell contains a formula
+     *
+     *  @return boolean
+     */
+    public function isFormula()
+    {
+        return $this->dataType == PHPExcel_Cell_DataType::TYPE_FORMULA;
+    }
+
     /**
      *    Does this cell contain Data validation rules?
      *
@@ -378,7 +381,7 @@ class PHPExcel_Cell
      */
     public function hasDataValidation()
     {
-		if (!isset($this->_parent)) {
+        if (!isset($this->parent)) {
             throw new PHPExcel_Exception('Cannot check for data validation when cell is not bound to a worksheet');
         }
 
@@ -393,7 +396,7 @@ class PHPExcel_Cell
      */
     public function getDataValidation()
     {
-		if (!isset($this->_parent)) {
+        if (!isset($this->parent)) {
             throw new PHPExcel_Exception('Cannot get data validation for cell that is not bound to a worksheet');
         }
 
@@ -407,9 +410,9 @@ class PHPExcel_Cell
      *    @return    PHPExcel_Cell
      *    @throws    PHPExcel_Exception
      */
-	public function setDataValidation(PHPExcel_Cell_DataValidation $pDataValidation = NULL)
+    public function setDataValidation(PHPExcel_Cell_DataValidation $pDataValidation = null)
     {
-		if (!isset($this->_parent)) {
+        if (!isset($this->parent)) {
             throw new PHPExcel_Exception('Cannot set data validation for cell that is not bound to a worksheet');
         }
 
@@ -426,7 +429,7 @@ class PHPExcel_Cell
      */
     public function hasHyperlink()
     {
-		if (!isset($this->_parent)) {
+        if (!isset($this->parent)) {
             throw new PHPExcel_Exception('Cannot check for hyperlink when cell is not bound to a worksheet');
         }
 
@@ -441,7 +444,7 @@ class PHPExcel_Cell
      */
     public function getHyperlink()
     {
-		if (!isset($this->_parent)) {
+        if (!isset($this->parent)) {
             throw new PHPExcel_Exception('Cannot get hyperlink for cell that is not bound to a worksheet');
         }
 
@@ -455,9 +458,9 @@ class PHPExcel_Cell
      *    @return    PHPExcel_Cell
      *    @throws    PHPExcel_Exception
      */
-	public function setHyperlink(PHPExcel_Cell_Hyperlink $pHyperlink = NULL)
+    public function setHyperlink(PHPExcel_Cell_Hyperlink $pHyperlink = null)
     {
-		if (!isset($this->_parent)) {
+        if (!isset($this->parent)) {
             throw new PHPExcel_Exception('Cannot set hyperlink for cell that is not bound to a worksheet');
         }
 
@@ -469,10 +472,11 @@ class PHPExcel_Cell
     /**
      *    Get parent worksheet
      *
-	 *	@return PHPExcel_Worksheet
+     *    @return PHPExcel_CachedObjectStorage_CacheBase
      */
-	public function getParent() {
-		return $this->_parent;
+    public function getParent()
+    {
+        return $this->parent;
     }
 
     /**
@@ -480,8 +484,51 @@ class PHPExcel_Cell
      *
      *    @return PHPExcel_Worksheet
      */
-	public function getWorksheet() {
-		return $this->_parent->getParent();
+    public function getWorksheet()
+    {
+        return $this->parent->getParent();
+    }
+
+    /**
+     *    Is this cell in a merge range
+     *
+     *    @return boolean
+     */
+    public function isInMergeRange()
+    {
+        return (boolean) $this->getMergeRange();
+    }
+
+    /**
+     *    Is this cell the master (top left cell) in a merge range (that holds the actual data value)
+     *
+     *    @return boolean
+     */
+    public function isMergeRangeValueCell()
+    {
+        if ($mergeRange = $this->getMergeRange()) {
+            $mergeRange = PHPExcel_Cell::splitRange($mergeRange);
+            list($startCell) = $mergeRange[0];
+            if ($this->getCoordinate() === $startCell) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    If this cell is in a merge range, then return the range
+     *
+     *    @return string
+     */
+    public function getMergeRange()
+    {
+        foreach ($this->getWorksheet()->getMergeCells() as $mergeRange) {
+            if ($this->isInRange($mergeRange)) {
+                return $mergeRange;
+            }
+        }
+        return false;
     }
 
     /**
@@ -491,7 +538,7 @@ class PHPExcel_Cell
      */
     public function getStyle()
     {
-		return $this->getWorksheet()->getParent()->getCellXfByIndex($this->getXfIndex());
+        return $this->getWorksheet()->getStyle($this->getCoordinate());
     }
 
     /**
@@ -500,8 +547,9 @@ class PHPExcel_Cell
      *    @param    PHPExcel_Worksheet $parent
      *    @return    PHPExcel_Cell
      */
-	public function rebindParent(PHPExcel_Worksheet $parent) {
-		$this->_parent = $parent->getCellCacheController();
+    public function rebindParent(PHPExcel_Worksheet $parent)
+    {
+        $this->parent = $parent->getCellCacheController();
 
         return $this->notifyCacheController();
     }
@@ -537,7 +585,7 @@ class PHPExcel_Cell
     {
         if (preg_match("/^([$]?[A-Z]{1,3})([$]?\d{1,7})$/", $pCoordinateString, $matches)) {
             return array($matches[1],$matches[2]);
-		} elseif ((strpos($pCoordinateString,':') !== FALSE) || (strpos($pCoordinateString,',') !== FALSE)) {
+        } elseif ((strpos($pCoordinateString, ':') !== false) || (strpos($pCoordinateString, ',') !== false)) {
             throw new PHPExcel_Exception('Cell coordinate string can not be a range of cells');
         } elseif ($pCoordinateString == '') {
             throw new PHPExcel_Exception('Cell coordinate can not be zero-length string');
@@ -556,14 +604,16 @@ class PHPExcel_Cell
      */
     public static function absoluteReference($pCoordinateString = 'A1')
     {
-		if (strpos($pCoordinateString,':') === FALSE && strpos($pCoordinateString,',') === FALSE) {
+        if (strpos($pCoordinateString, ':') === false && strpos($pCoordinateString, ',') === false) {
             // Split out any worksheet name from the reference
             $worksheet = '';
             $cellAddress = explode('!', $pCoordinateString);
             if (count($cellAddress) > 1) {
                 list($worksheet, $pCoordinateString) = $cellAddress;
             }
-			if ($worksheet > '')	$worksheet .= '!';
+            if ($worksheet > '') {
+                $worksheet .= '!';
+            }
 
             // Create absolute coordinate
             if (ctype_digit($pCoordinateString)) {
@@ -586,14 +636,16 @@ class PHPExcel_Cell
      */
     public static function absoluteCoordinate($pCoordinateString = 'A1')
     {
-		if (strpos($pCoordinateString,':') === FALSE && strpos($pCoordinateString,',') === FALSE) {
+        if (strpos($pCoordinateString, ':') === false && strpos($pCoordinateString, ',') === false) {
             // Split out any worksheet name from the coordinate
             $worksheet = '';
             $cellAddress = explode('!', $pCoordinateString);
             if (count($cellAddress) > 1) {
                 list($worksheet, $pCoordinateString) = $cellAddress;
             }
-			if ($worksheet > '')	$worksheet .= '!';
+            if ($worksheet > '') {
+                $worksheet .= '!';
+            }
 
             // Create absolute coordinate
             list($column, $row) = self::coordinateFromString($pCoordinateString);
@@ -671,7 +723,7 @@ class PHPExcel_Cell
         $pRange = strtoupper($pRange);
 
         // Extract range
-		if (strpos($pRange, ':') === FALSE) {
+        if (strpos($pRange, ':') === false) {
             $rangeA = $rangeB = $pRange;
         } else {
             list($rangeA, $rangeB) = explode(':', $pRange);
@@ -720,7 +772,7 @@ class PHPExcel_Cell
         $pRange = strtoupper($pRange);
 
         // Extract range
-		if (strpos($pRange, ':') === FALSE) {
+        if (strpos($pRange, ':') === false) {
             $rangeA = $rangeB = $pRange;
         } else {
             list($rangeA, $rangeB) = explode(':', $pRange);
@@ -742,9 +794,9 @@ class PHPExcel_Cell
         //        though it's additional memory overhead
         static $_indexCache = array();
 
-		if (isset($_indexCache[$pString]))
+        if (isset($_indexCache[$pString])) {
             return $_indexCache[$pString];
-
+        }
         //    It's surprising how costly the strtoupper() and ord() calls actually are, so we use a lookup array rather than use ord()
         //        and make it case insensitive to get rid of the strtoupper() as well. Because it's a static, there's no significant
         //        memory overhead either
@@ -807,7 +859,8 @@ class PHPExcel_Cell
      *    @param    string    $pRange        Range (e.g. A1 or A1:C10 or A1:E10 A20:E25)
      *    @return    array    Array containing single cell references
      */
-	public static function extractAllCellReferencesInRange($pRange = 'A1') {
+    public static function extractAllCellReferencesInRange($pRange = 'A1')
+    {
         // Returnvalue
         $returnValue = array();
 
@@ -815,7 +868,7 @@ class PHPExcel_Cell
         $cellBlocks = explode(' ', str_replace('$', '', strtoupper($pRange)));
         foreach ($cellBlocks as $cellBlock) {
             // Single cell?
-			if (strpos($cellBlock,':') === FALSE && strpos($cellBlock,',') === FALSE) {
+            if (strpos($cellBlock, ':') === false && strpos($cellBlock, ',') === false) {
                 $returnValue[] = $cellBlock;
                 continue;
             }
@@ -833,7 +886,7 @@ class PHPExcel_Cell
                 list($rangeStart, $rangeEnd)    = $range;
                 sscanf($rangeStart, '%[A-Z]%d', $startCol, $startRow);
                 sscanf($rangeEnd, '%[A-Z]%d', $endCol, $endRow);
-				$endCol++;
+                ++$endCol;
 
                 // Current data
                 $currentCol = $startCol;
@@ -888,12 +941,13 @@ class PHPExcel_Cell
      *
      * @return PHPExcel_Cell_IValueBinder
      */
-	public static function getValueBinder() {
-		if (self::$_valueBinder === NULL) {
-			self::$_valueBinder = new PHPExcel_Cell_DefaultValueBinder();
+    public static function getValueBinder()
+    {
+        if (self::$valueBinder === null) {
+            self::$valueBinder = new PHPExcel_Cell_DefaultValueBinder();
         }
 
-		return self::$_valueBinder;
+        return self::$valueBinder;
     }
 
     /**
@@ -902,21 +956,23 @@ class PHPExcel_Cell
      * @param PHPExcel_Cell_IValueBinder $binder
      * @throws PHPExcel_Exception
      */
-	public static function setValueBinder(PHPExcel_Cell_IValueBinder $binder = NULL) {
-		if ($binder === NULL) {
+    public static function setValueBinder(PHPExcel_Cell_IValueBinder $binder = null)
+    {
+        if ($binder === null) {
             throw new PHPExcel_Exception("A PHPExcel_Cell_IValueBinder is required for PHPExcel to function correctly.");
         }
 
-		self::$_valueBinder = $binder;
+        self::$valueBinder = $binder;
     }
 
     /**
      * Implement PHP __clone to create a deep clone, not just a shallow copy.
      */
-	public function __clone() {
+    public function __clone()
+    {
         $vars = get_object_vars($this);
         foreach ($vars as $key => $value) {
-			if ((is_object($value)) && ($key != '_parent')) {
+            if ((is_object($value)) && ($key != 'parent')) {
                 $this->$key = clone $value;
             } else {
                 $this->$key = $value;
@@ -931,7 +987,7 @@ class PHPExcel_Cell
      */
     public function getXfIndex()
     {
-		return $this->_xfIndex;
+        return $this->xfIndex;
     }
 
     /**
@@ -942,7 +998,7 @@ class PHPExcel_Cell
      */
     public function setXfIndex($pValue = 0)
     {
-		$this->_xfIndex = $pValue;
+        $this->xfIndex = $pValue;
 
         return $this->notifyCacheController();
     }
@@ -952,7 +1008,7 @@ class PHPExcel_Cell
      */
     public function setFormulaAttributes($pAttributes)
     {
-		$this->_formulaAttributes = $pAttributes;
+        $this->formulaAttributes = $pAttributes;
         return $this;
     }
 
@@ -961,7 +1017,7 @@ class PHPExcel_Cell
      */
     public function getFormulaAttributes()
     {
-		return $this->_formulaAttributes;
+        return $this->formulaAttributes;
     }
 
     /**
@@ -973,6 +1029,4 @@ class PHPExcel_Cell
     {
         return (string) $this->getValue();
     }
-
 }
-

Classes/PHPExcel/Cell/AdvancedValueBinder.php

@@ -1,8 +1,18 @@
 <?php
+
+/** PHPExcel root directory */
+if (!defined('PHPEXCEL_ROOT')) {
     /**
- * PHPExcel
+     * @ignore
+     */
+    define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
+    require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+}
+
+/**
+ * PHPExcel_Cell_AdvancedValueBinder
  *
- * Copyright (c) 2006 - 2013 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,29 +30,10 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Cell
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-    /**
-     * @ignore
-     */
-    define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-    require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-
-/**
- * PHPExcel_Cell_AdvancedValueBinder
- *
- * @category   PHPExcel
- * @package    PHPExcel_Cell
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
 class PHPExcel_Cell_AdvancedValueBinder extends PHPExcel_Cell_DefaultValueBinder implements PHPExcel_Cell_IValueBinder
 {
     /**
@@ -66,10 +57,10 @@ class PHPExcel_Cell_AdvancedValueBinder extends PHPExcel_Cell_DefaultValueBinder
         if ($dataType === PHPExcel_Cell_DataType::TYPE_STRING && !$value instanceof PHPExcel_RichText) {
             //    Test for booleans using locale-setting
             if ($value == PHPExcel_Calculation::getTRUE()) {
-                $cell->setValueExplicit( TRUE, PHPExcel_Cell_DataType::TYPE_BOOL);
+                $cell->setValueExplicit(true, PHPExcel_Cell_DataType::TYPE_BOOL);
                 return true;
             } elseif ($value == PHPExcel_Calculation::getFALSE()) {
-                $cell->setValueExplicit( FALSE, PHPExcel_Cell_DataType::TYPE_BOOL);
+                $cell->setValueExplicit(false, PHPExcel_Cell_DataType::TYPE_BOOL);
                 return true;
             }
 
@@ -80,10 +71,12 @@ class PHPExcel_Cell_AdvancedValueBinder extends PHPExcel_Cell_DefaultValueBinder
             }
 
             // Check for fraction
-            if (preg_match('/^([+-]?) *([0-9]*)\s?\/\s*([0-9]*)$/', $value, $matches)) {
+            if (preg_match('/^([+-]?)\s*([0-9]+)\s?\/\s*([0-9]+)$/', $value, $matches)) {
                 // Convert value to number
                 $value = $matches[2] / $matches[3];
-                if ($matches[1] == '-') $value = 0 - $value;
+                if ($matches[1] == '-') {
+                    $value = 0 - $value;
+                }
                 $cell->setValueExplicit((float) $value, PHPExcel_Cell_DataType::TYPE_NUMERIC);
                 // Set style
                 $cell->getWorksheet()->getStyle($cell->getCoordinate())
@@ -92,7 +85,9 @@ class PHPExcel_Cell_AdvancedValueBinder extends PHPExcel_Cell_DefaultValueBinder
             } elseif (preg_match('/^([+-]?)([0-9]*) +([0-9]*)\s?\/\s*([0-9]*)$/', $value, $matches)) {
                 // Convert value to number
                 $value = $matches[2] + ($matches[3] / $matches[4]);
-                if ($matches[1] == '-') $value = 0 - $value;
+                if ($matches[1] == '-') {
+                    $value = 0 - $value;
+                }
                 $cell->setValueExplicit((float) $value, PHPExcel_Cell_DataType::TYPE_NUMERIC);
                 // Set style
                 $cell->getWorksheet()->getStyle($cell->getCoordinate())
@@ -176,12 +171,12 @@ class PHPExcel_Cell_AdvancedValueBinder extends PHPExcel_Cell_DefaultValueBinder
             }
 
             // Check for newline character "\n"
-            if (strpos($value, "\n") !== FALSE) {
+            if (strpos($value, "\n") !== false) {
                 $value = PHPExcel_Shared_String::SanitizeUTF8($value);
                 $cell->setValueExplicit($value, PHPExcel_Cell_DataType::TYPE_STRING);
                 // Set style
                 $cell->getWorksheet()->getStyle($cell->getCoordinate())
-                    ->getAlignment()->setWrapText(TRUE);
+                    ->getAlignment()->setWrapText(true);
                 return true;
             }
         }

Classes/PHPExcel/Cell/DataType.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * PHPExcel
+ * PHPExcel_Cell_DataType
  *
- * Copyright (c) 2006 - 2013 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,19 +21,10 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Cell
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-
-/**
- * PHPExcel_Cell_DataType
- *
- * @category   PHPExcel
- * @package    PHPExcel_Cell
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
 class PHPExcel_Cell_DataType
 {
     /* Data types */
@@ -50,7 +42,7 @@ class PHPExcel_Cell_DataType
      *
      * @var array
      */
-    private static $_errorCodes = array(
+    private static $errorCodes = array(
         '#NULL!'  => 0,
         '#DIV/0!' => 1,
         '#VALUE!' => 2,
@@ -65,8 +57,9 @@ class PHPExcel_Cell_DataType
      *
      * @return array
      */
-    public static function getErrorCodes() {
-        return self::$_errorCodes;
+    public static function getErrorCodes()
+    {
+        return self::$errorCodes;
     }
 
     /**
@@ -76,7 +69,8 @@ class PHPExcel_Cell_DataType
      * @param       mixed  $pValue
      * @return      string
      */
-    public static function dataTypeForValue($pValue = null) {
+    public static function dataTypeForValue($pValue = null)
+    {
         return PHPExcel_Cell_DefaultValueBinder::dataTypeForValue($pValue);
     }
 
@@ -112,11 +106,10 @@ class PHPExcel_Cell_DataType
     {
         $pValue = (string) $pValue;
 
-        if ( !array_key_exists($pValue, self::$_errorCodes) ) {
+        if (!array_key_exists($pValue, self::$errorCodes)) {
             $pValue = '#NULL!';
         }
 
         return $pValue;
     }
-
 }

Classes/PHPExcel/Cell/DataValidation.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * PHPExcel
+ * PHPExcel_Cell_DataValidation
  *
- * Copyright (c) 2006 - 2013 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,19 +21,10 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Cell
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-
-/**
- * PHPExcel_Cell_DataValidation
- *
- * @category   PHPExcel
- * @package    PHPExcel_Cell
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
 class PHPExcel_Cell_DataValidation
 {
     /* Data validation types */
@@ -65,91 +57,91 @@ class PHPExcel_Cell_DataValidation
      *
      * @var string
      */
-    private $_formula1;
+    private $formula1;
 
     /**
      * Formula 2
      *
      * @var string
      */
-    private $_formula2;
+    private $formula2;
 
     /**
      * Type
      *
      * @var string
      */
-    private $_type = PHPExcel_Cell_DataValidation::TYPE_NONE;
+    private $type = PHPExcel_Cell_DataValidation::TYPE_NONE;
 
     /**
      * Error style
      *
      * @var string
      */
-    private $_errorStyle = PHPExcel_Cell_DataValidation::STYLE_STOP;
+    private $errorStyle = PHPExcel_Cell_DataValidation::STYLE_STOP;
 
     /**
      * Operator
      *
      * @var string
      */
-    private $_operator;
+    private $operator;
 
     /**
      * Allow Blank
      *
      * @var boolean
      */
-    private $_allowBlank;
+    private $allowBlank;
 
     /**
      * Show DropDown
      *
      * @var boolean
      */
-    private $_showDropDown;
+    private $showDropDown;
 
     /**
      * Show InputMessage
      *
      * @var boolean
      */
-    private $_showInputMessage;
+    private $showInputMessage;
 
     /**
      * Show ErrorMessage
      *
      * @var boolean
      */
-    private $_showErrorMessage;
+    private $showErrorMessage;
 
     /**
      * Error title
      *
      * @var string
      */
-    private $_errorTitle;
+    private $errorTitle;
 
     /**
      * Error
      *
      * @var string
      */
-    private $_error;
+    private $error;
 
     /**
      * Prompt title
      *
      * @var string
      */
-    private $_promptTitle;
+    private $promptTitle;
 
     /**
      * Prompt
      *
      * @var string
      */
-    private $_prompt;
+    private $prompt;
 
     /**
      * Create a new PHPExcel_Cell_DataValidation
@@ -157,19 +149,19 @@ class PHPExcel_Cell_DataValidation
     public function __construct()
     {
         // Initialise member variables
-        $this->_formula1          = '';
-        $this->_formula2          = '';
-        $this->_type              = PHPExcel_Cell_DataValidation::TYPE_NONE;
-        $this->_errorStyle        = PHPExcel_Cell_DataValidation::STYLE_STOP;
-        $this->_operator          = '';
-        $this->_allowBlank        = FALSE;
-        $this->_showDropDown      = FALSE;
-        $this->_showInputMessage  = FALSE;
-        $this->_showErrorMessage  = FALSE;
-        $this->_errorTitle        = '';
-        $this->_error             = '';
-        $this->_promptTitle       = '';
-        $this->_prompt            = '';
+        $this->formula1          = '';
+        $this->formula2          = '';
+        $this->type              = PHPExcel_Cell_DataValidation::TYPE_NONE;
+        $this->errorStyle        = PHPExcel_Cell_DataValidation::STYLE_STOP;
+        $this->operator          = '';
+        $this->allowBlank        = false;
+        $this->showDropDown      = false;
+        $this->showInputMessage  = false;
+        $this->showErrorMessage  = false;
+        $this->errorTitle        = '';
+        $this->error             = '';
+        $this->promptTitle       = '';
+        $this->prompt            = '';
     }
 
     /**
@@ -177,8 +169,9 @@ class PHPExcel_Cell_DataValidation
      *
      * @return string
      */
-    public function getFormula1() {
-        return $this->_formula1;
+    public function getFormula1()
+    {
+        return $this->formula1;
     }
 
     /**
@@ -187,8 +180,9 @@ class PHPExcel_Cell_DataValidation
      * @param  string    $value
      * @return PHPExcel_Cell_DataValidation
      */
-    public function setFormula1($value = '') {
-        $this->_formula1 = $value;
+    public function setFormula1($value = '')
+    {
+        $this->formula1 = $value;
         return $this;
     }
 
@@ -197,8 +191,9 @@ class PHPExcel_Cell_DataValidation
      *
      * @return string
      */
-    public function getFormula2() {
-        return $this->_formula2;
+    public function getFormula2()
+    {
+        return $this->formula2;
     }
 
     /**
@@ -207,8 +202,9 @@ class PHPExcel_Cell_DataValidation
      * @param  string    $value
      * @return PHPExcel_Cell_DataValidation
      */
-    public function setFormula2($value = '') {
-        $this->_formula2 = $value;
+    public function setFormula2($value = '')
+    {
+        $this->formula2 = $value;
         return $this;
     }
 
@@ -217,8 +213,9 @@ class PHPExcel_Cell_DataValidation
      *
      * @return string
      */
-    public function getType() {
-        return $this->_type;
+    public function getType()
+    {
+        return $this->type;
     }
 
     /**
@@ -227,8 +224,9 @@ class PHPExcel_Cell_DataValidation
      * @param  string    $value
      * @return PHPExcel_Cell_DataValidation
      */
-    public function setType($value = PHPExcel_Cell_DataValidation::TYPE_NONE) {
-        $this->_type = $value;
+    public function setType($value = PHPExcel_Cell_DataValidation::TYPE_NONE)
+    {
+        $this->type = $value;
         return $this;
     }
 
@@ -237,8 +235,9 @@ class PHPExcel_Cell_DataValidation
      *
      * @return string
      */
-    public function getErrorStyle() {
-        return $this->_errorStyle;
+    public function getErrorStyle()
+    {
+        return $this->errorStyle;
     }
 
     /**
@@ -247,8 +246,9 @@ class PHPExcel_Cell_DataValidation
      * @param  string    $value
      * @return PHPExcel_Cell_DataValidation
      */
-    public function setErrorStyle($value = PHPExcel_Cell_DataValidation::STYLE_STOP) {
-        $this->_errorStyle = $value;
+    public function setErrorStyle($value = PHPExcel_Cell_DataValidation::STYLE_STOP)
+    {
+        $this->errorStyle = $value;
         return $this;
     }
 
@@ -257,8 +257,9 @@ class PHPExcel_Cell_DataValidation
      *
      * @return string
      */
-    public function getOperator() {
-        return $this->_operator;
+    public function getOperator()
+    {
+        return $this->operator;
     }
 
     /**
@@ -267,8 +268,9 @@ class PHPExcel_Cell_DataValidation
      * @param  string    $value
      * @return PHPExcel_Cell_DataValidation
      */
-    public function setOperator($value = '') {
-        $this->_operator = $value;
+    public function setOperator($value = '')
+    {
+        $this->operator = $value;
         return $this;
     }
 
@@ -277,8 +279,9 @@ class PHPExcel_Cell_DataValidation
      *
      * @return boolean
      */
-    public function getAllowBlank() {
-        return $this->_allowBlank;
+    public function getAllowBlank()
+    {
+        return $this->allowBlank;
     }
 
     /**
@@ -287,8 +290,9 @@ class PHPExcel_Cell_DataValidation
      * @param  boolean    $value
      * @return PHPExcel_Cell_DataValidation
      */
-    public function setAllowBlank($value = false) {
-        $this->_allowBlank = $value;
+    public function setAllowBlank($value = false)
+    {
+        $this->allowBlank = $value;
         return $this;
     }
 
@@ -297,8 +301,9 @@ class PHPExcel_Cell_DataValidation
      *
      * @return boolean
      */
-    public function getShowDropDown() {
-        return $this->_showDropDown;
+    public function getShowDropDown()
+    {
+        return $this->showDropDown;
     }
 
     /**
@@ -307,8 +312,9 @@ class PHPExcel_Cell_DataValidation
      * @param  boolean    $value
      * @return PHPExcel_Cell_DataValidation
      */
-    public function setShowDropDown($value = false) {
-        $this->_showDropDown = $value;
+    public function setShowDropDown($value = false)
+    {
+        $this->showDropDown = $value;
         return $this;
     }
 
@@ -317,8 +323,9 @@ class PHPExcel_Cell_DataValidation
      *
      * @return boolean
      */
-    public function getShowInputMessage() {
-        return $this->_showInputMessage;
+    public function getShowInputMessage()
+    {
+        return $this->showInputMessage;
     }
 
     /**
@@ -327,8 +334,9 @@ class PHPExcel_Cell_DataValidation
      * @param  boolean    $value
      * @return PHPExcel_Cell_DataValidation
      */
-    public function setShowInputMessage($value = false) {
-        $this->_showInputMessage = $value;
+    public function setShowInputMessage($value = false)
+    {
+        $this->showInputMessage = $value;
         return $this;
     }
 
@@ -337,8 +345,9 @@ class PHPExcel_Cell_DataValidation
      *
      * @return boolean
      */
-    public function getShowErrorMessage() {
-        return $this->_showErrorMessage;
+    public function getShowErrorMessage()
+    {
+        return $this->showErrorMessage;
     }
 
     /**
@@ -347,8 +356,9 @@ class PHPExcel_Cell_DataValidation
      * @param  boolean    $value
      * @return PHPExcel_Cell_DataValidation
      */
-    public function setShowErrorMessage($value = false) {
-        $this->_showErrorMessage = $value;
+    public function setShowErrorMessage($value = false)
+    {
+        $this->showErrorMessage = $value;
         return $this;
     }
 
@@ -357,8 +367,9 @@ class PHPExcel_Cell_DataValidation
      *
      * @return string
      */
-    public function getErrorTitle() {
-        return $this->_errorTitle;
+    public function getErrorTitle()
+    {
+        return $this->errorTitle;
     }
 
     /**
@@ -367,8 +378,9 @@ class PHPExcel_Cell_DataValidation
      * @param  string    $value
      * @return PHPExcel_Cell_DataValidation
      */
-    public function setErrorTitle($value = '') {
-        $this->_errorTitle = $value;
+    public function setErrorTitle($value = '')
+    {
+        $this->errorTitle = $value;
         return $this;
     }
 
@@ -377,8 +389,9 @@ class PHPExcel_Cell_DataValidation
      *
      * @return string
      */
-    public function getError() {
-        return $this->_error;
+    public function getError()
+    {
+        return $this->error;
     }
 
     /**
@@ -387,8 +400,9 @@ class PHPExcel_Cell_DataValidation
      * @param  string    $value
      * @return PHPExcel_Cell_DataValidation
      */
-    public function setError($value = '') {
-        $this->_error = $value;
+    public function setError($value = '')
+    {
+        $this->error = $value;
         return $this;
     }
 
@@ -397,8 +411,9 @@ class PHPExcel_Cell_DataValidation
      *
      * @return string
      */
-    public function getPromptTitle() {
-        return $this->_promptTitle;
+    public function getPromptTitle()
+    {
+        return $this->promptTitle;
     }
 
     /**
@@ -407,8 +422,9 @@ class PHPExcel_Cell_DataValidation
      * @param  string    $value
      * @return PHPExcel_Cell_DataValidation
      */
-    public function setPromptTitle($value = '') {
-        $this->_promptTitle = $value;
+    public function setPromptTitle($value = '')
+    {
+        $this->promptTitle = $value;
         return $this;
     }
 
@@ -417,8 +433,9 @@ class PHPExcel_Cell_DataValidation
      *
      * @return string
      */
-    public function getPrompt() {
-        return $this->_prompt;
+    public function getPrompt()
+    {
+        return $this->prompt;
     }
 
     /**
@@ -427,8 +444,9 @@ class PHPExcel_Cell_DataValidation
      * @param  string    $value
      * @return PHPExcel_Cell_DataValidation
      */
-    public function setPrompt($value = '') {
-        $this->_prompt = $value;
+    public function setPrompt($value = '')
+    {
+        $this->prompt = $value;
         return $this;
     }
 
@@ -437,29 +455,31 @@ class PHPExcel_Cell_DataValidation
      *
      * @return string    Hash code
      */
-    public function getHashCode() {
+    public function getHashCode()
+    {
         return md5(
-              $this->_formula1
-            . $this->_formula2
-            . $this->_type = PHPExcel_Cell_DataValidation::TYPE_NONE
-            . $this->_errorStyle = PHPExcel_Cell_DataValidation::STYLE_STOP
-            . $this->_operator
-            . ($this->_allowBlank ? 't' : 'f')
-            . ($this->_showDropDown ? 't' : 'f')
-            . ($this->_showInputMessage ? 't' : 'f')
-            . ($this->_showErrorMessage ? 't' : 'f')
-            . $this->_errorTitle
-            . $this->_error
-            . $this->_promptTitle
-            . $this->_prompt
-            . __CLASS__
+            $this->formula1 .
+            $this->formula2 .
+            $this->type = PHPExcel_Cell_DataValidation::TYPE_NONE .
+            $this->errorStyle = PHPExcel_Cell_DataValidation::STYLE_STOP .
+            $this->operator .
+            ($this->allowBlank ? 't' : 'f') .
+            ($this->showDropDown ? 't' : 'f') .
+            ($this->showInputMessage ? 't' : 'f') .
+            ($this->showErrorMessage ? 't' : 'f') .
+            $this->errorTitle .
+            $this->error .
+            $this->promptTitle .
+            $this->prompt .
+            __CLASS__
         );
     }
 
     /**
      * Implement PHP __clone to create a deep clone, not just a shallow copy.
      */
-    public function __clone() {
+    public function __clone()
+    {
         $vars = get_object_vars($this);
         foreach ($vars as $key => $value) {
             if (is_object($value)) {

Classes/PHPExcel/Cell/DefaultValueBinder.php

@@ -1,8 +1,18 @@
 <?php
+
+/** PHPExcel root directory */
+if (!defined('PHPEXCEL_ROOT')) {
     /**
- * PHPExcel
+     * @ignore
+     */
+    define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
+    require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+}
+
+/**
+ * PHPExcel_Cell_DefaultValueBinder
  *
- * Copyright (c) 2006 - 2013 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,29 +30,10 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Cell
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-    /**
-     * @ignore
-     */
-    define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-    require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-
-/**
- * PHPExcel_Cell_DefaultValueBinder
- *
- * @category   PHPExcel
- * @package    PHPExcel_Cell
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
 class PHPExcel_Cell_DefaultValueBinder implements PHPExcel_Cell_IValueBinder
 {
     /**
@@ -57,13 +48,20 @@ class PHPExcel_Cell_DefaultValueBinder implements PHPExcel_Cell_IValueBinder
         // sanitize UTF-8 strings
         if (is_string($value)) {
             $value = PHPExcel_Shared_String::SanitizeUTF8($value);
+        } elseif (is_object($value)) {
+            // Handle any objects that might be injected
+            if ($value instanceof DateTime) {
+                $value = $value->format('Y-m-d H:i:s');
+            } elseif (!($value instanceof PHPExcel_RichText)) {
+                $value = (string) $value;
+            }
         }
 
         // Set value explicit
         $cell->setValueExplicit($value, self::dataTypeForValue($value));
 
         // Done!
-        return TRUE;
+        return true;
     }
 
     /**
@@ -72,35 +70,33 @@ class PHPExcel_Cell_DefaultValueBinder implements PHPExcel_Cell_IValueBinder
      * @param   mixed  $pValue
      * @return  string
      */
-    public static function dataTypeForValue($pValue = null) {
+    public static function dataTypeForValue($pValue = null)
+    {
         // Match the value against a few data types
-        if (is_null($pValue)) {
+        if ($pValue === null) {
             return PHPExcel_Cell_DataType::TYPE_NULL;
-
         } elseif ($pValue === '') {
             return PHPExcel_Cell_DataType::TYPE_STRING;
-
         } elseif ($pValue instanceof PHPExcel_RichText) {
             return PHPExcel_Cell_DataType::TYPE_INLINE;
-
         } elseif ($pValue{0} === '=' && strlen($pValue) > 1) {
             return PHPExcel_Cell_DataType::TYPE_FORMULA;
-
         } elseif (is_bool($pValue)) {
             return PHPExcel_Cell_DataType::TYPE_BOOL;
-
         } elseif (is_float($pValue) || is_int($pValue)) {
             return PHPExcel_Cell_DataType::TYPE_NUMERIC;
-
-        } elseif (preg_match('/^\-?([0-9]+\\.?[0-9]*|[0-9]*\\.?[0-9]+)$/', $pValue)) {
+        } elseif (preg_match('/^[\+\-]?([0-9]+\\.?[0-9]*|[0-9]*\\.?[0-9]+)([Ee][\-\+]?[0-2]?\d{1,3})?$/', $pValue)) {
+            $tValue = ltrim($pValue, '+-');
+            if (is_string($pValue) && $tValue{0} === '0' && strlen($tValue) > 1 && $tValue{1} !== '.') {
+                return PHPExcel_Cell_DataType::TYPE_STRING;
+            } elseif ((strpos($pValue, '.') === false) && ($pValue > PHP_INT_MAX)) {
+                return PHPExcel_Cell_DataType::TYPE_STRING;
+            }
             return PHPExcel_Cell_DataType::TYPE_NUMERIC;
-
         } elseif (is_string($pValue) && array_key_exists($pValue, PHPExcel_Cell_DataType::getErrorCodes())) {
             return PHPExcel_Cell_DataType::TYPE_ERROR;
+        }
 
-        } else {
         return PHPExcel_Cell_DataType::TYPE_STRING;
-
-        }
     }
 }

Classes/PHPExcel/Cell/Hyperlink.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * PHPExcel
+ * PHPExcel_Cell_Hyperlink
  *
- * Copyright (c) 2006 - 2013 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,19 +21,10 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Cell
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-
-/**
- * PHPExcel_Cell_Hyperlink
- *
- * @category   PHPExcel
- * @package    PHPExcel_Cell
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
 class PHPExcel_Cell_Hyperlink
 {
     /**
@@ -40,14 +32,14 @@ class PHPExcel_Cell_Hyperlink
      *
      * @var string
      */
-    private $_url;
+    private $url;
 
     /**
      * Tooltip to display on the hyperlink
      *
      * @var string
      */
-    private $_tooltip;
+    private $tooltip;
 
     /**
      * Create a new PHPExcel_Cell_Hyperlink
@@ -58,8 +50,8 @@ class PHPExcel_Cell_Hyperlink
     public function __construct($pUrl = '', $pTooltip = '')
     {
         // Initialise member variables
-        $this->_url         = $pUrl;
-        $this->_tooltip     = $pTooltip;
+        $this->url     = $pUrl;
+        $this->tooltip = $pTooltip;
     }
 
     /**
@@ -67,8 +59,9 @@ class PHPExcel_Cell_Hyperlink
      *
      * @return string
      */
-    public function getUrl() {
-        return $this->_url;
+    public function getUrl()
+    {
+        return $this->url;
     }
 
     /**
@@ -77,8 +70,9 @@ class PHPExcel_Cell_Hyperlink
      * @param  string    $value
      * @return PHPExcel_Cell_Hyperlink
      */
-    public function setUrl($value = '') {
-        $this->_url = $value;
+    public function setUrl($value = '')
+    {
+        $this->url = $value;
         return $this;
     }
 
@@ -87,8 +81,9 @@ class PHPExcel_Cell_Hyperlink
      *
      * @return string
      */
-    public function getTooltip() {
-        return $this->_tooltip;
+    public function getTooltip()
+    {
+        return $this->tooltip;
     }
 
     /**
@@ -97,8 +92,9 @@ class PHPExcel_Cell_Hyperlink
      * @param  string    $value
      * @return PHPExcel_Cell_Hyperlink
      */
-    public function setTooltip($value = '') {
-        $this->_tooltip = $value;
+    public function setTooltip($value = '')
+    {
+        $this->tooltip = $value;
         return $this;
     }
 
@@ -107,8 +103,9 @@ class PHPExcel_Cell_Hyperlink
      *
      * @return boolean
      */
-    public function isInternal() {
-        return strpos($this->_url, 'sheet://') !== false;
+    public function isInternal()
+    {
+        return strpos($this->url, 'sheet://') !== false;
     }
 
     /**
@@ -116,11 +113,12 @@ class PHPExcel_Cell_Hyperlink
      *
      * @return string    Hash code
      */
-    public function getHashCode() {
+    public function getHashCode()
+    {
         return md5(
-              $this->_url
-            . $this->_tooltip
-            . __CLASS__
+            $this->url .
+            $this->tooltip .
+            __CLASS__
         );
     }
 }

Classes/PHPExcel/Cell/IValueBinder.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2013 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,7 +21,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Cell
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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,7 +32,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Cell
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 interface PHPExcel_Cell_IValueBinder
 {
@@ -42,5 +43,5 @@ interface PHPExcel_Cell_IValueBinder
      * @param  mixed $value           Value to bind in cell
      * @return boolean
      */
-    public function bindValue(PHPExcel_Cell $cell, $value = NULL);
+    public function bindValue(PHPExcel_Cell $cell, $value = null);
 }

Classes/PHPExcel/Chart.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * PHPExcel
+ * PHPExcel_Chart
  *
- * Copyright (c) 2006 - 2013 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,19 +21,10 @@
  *
  * @category    PHPExcel
  * @package        PHPExcel_Chart
- * @copyright	Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-
-/**
- * PHPExcel_Chart
- *
- * @category	PHPExcel
- * @package		PHPExcel_Chart
- * @copyright	Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
 class PHPExcel_Chart
 {
     /**
@@ -40,71 +32,98 @@ class PHPExcel_Chart
      *
      * @var string
      */
-	private $_name = '';
+    private $name = '';
 
     /**
      * Worksheet
      *
      * @var PHPExcel_Worksheet
      */
-	private $_worksheet = null;
+    private $worksheet;
 
     /**
      * Chart Title
      *
      * @var PHPExcel_Chart_Title
      */
-	private $_title = null;
+    private $title;
 
     /**
      * Chart Legend
      *
      * @var PHPExcel_Chart_Legend
      */
-	private $_legend = null;
+    private $legend;
 
     /**
      * X-Axis Label
      *
      * @var PHPExcel_Chart_Title
      */
-	private $_xAxisLabel = null;
+    private $xAxisLabel;
 
     /**
      * Y-Axis Label
      *
      * @var PHPExcel_Chart_Title
      */
-	private $_yAxisLabel = null;
+    private $yAxisLabel;
 
     /**
      * Chart Plot Area
      *
      * @var PHPExcel_Chart_PlotArea
      */
-	private $_plotArea = null;
+    private $plotArea;
 
     /**
      * Plot Visible Only
      *
      * @var boolean
      */
-	private $_plotVisibleOnly = true;
+    private $plotVisibleOnly = true;
 
     /**
      * Display Blanks as
      *
      * @var string
      */
-	private $_displayBlanksAs = '0';
+    private $displayBlanksAs = '0';
 
+    /**
+     * Chart Asix Y as
+     *
+     * @var PHPExcel_Chart_Axis
+     */
+    private $yAxis;
+
+    /**
+     * Chart Asix X as
+     *
+     * @var PHPExcel_Chart_Axis
+     */
+    private $xAxis;
+
+    /**
+     * Chart Major Gridlines as
+     *
+     * @var PHPExcel_Chart_GridLines
+     */
+    private $majorGridlines;
+
+    /**
+     * Chart Minor Gridlines as
+     *
+     * @var PHPExcel_Chart_GridLines
+     */
+    private $minorGridlines;
 
     /**
      * Top-Left Cell Position
      *
      * @var string
      */
-	private $_topLeftCellRef = 'A1';
+    private $topLeftCellRef = 'A1';
 
 
     /**
@@ -112,7 +131,7 @@ class PHPExcel_Chart
      *
      * @var integer
      */
-	private $_topLeftXOffset = 0;
+    private $topLeftXOffset = 0;
 
 
     /**
@@ -120,7 +139,7 @@ class PHPExcel_Chart
      *
      * @var integer
      */
-	private $_topLeftYOffset = 0;
+    private $topLeftYOffset = 0;
 
 
     /**
@@ -128,7 +147,7 @@ class PHPExcel_Chart
      *
      * @var string
      */
-	private $_bottomRightCellRef = 'A1';
+    private $bottomRightCellRef = 'A1';
 
 
     /**
@@ -136,7 +155,7 @@ class PHPExcel_Chart
      *
      * @var integer
      */
-	private $_bottomRightXOffset = 10;
+    private $bottomRightXOffset = 10;
 
 
     /**
@@ -144,22 +163,26 @@ class PHPExcel_Chart
      *
      * @var integer
      */
-	private $_bottomRightYOffset = 10;
+    private $bottomRightYOffset = 10;
 
 
     /**
      * Create a new PHPExcel_Chart
      */
-	public function __construct($name, PHPExcel_Chart_Title $title = null, PHPExcel_Chart_Legend $legend = null, PHPExcel_Chart_PlotArea $plotArea = null, $plotVisibleOnly = true, $displayBlanksAs = '0', PHPExcel_Chart_Title $xAxisLabel = null, PHPExcel_Chart_Title $yAxisLabel = null)
+    public function __construct($name, PHPExcel_Chart_Title $title = null, PHPExcel_Chart_Legend $legend = null, PHPExcel_Chart_PlotArea $plotArea = null, $plotVisibleOnly = true, $displayBlanksAs = '0', PHPExcel_Chart_Title $xAxisLabel = null, PHPExcel_Chart_Title $yAxisLabel = null, PHPExcel_Chart_Axis $xAxis = null, PHPExcel_Chart_Axis $yAxis = null, PHPExcel_Chart_GridLines $majorGridlines = null, PHPExcel_Chart_GridLines $minorGridlines = null)
     {
-		$this->_name = $name;
-		$this->_title = $title;
-		$this->_legend = $legend;
-		$this->_xAxisLabel = $xAxisLabel;
-		$this->_yAxisLabel = $yAxisLabel;
-		$this->_plotArea = $plotArea;
-		$this->_plotVisibleOnly = $plotVisibleOnly;
-		$this->_displayBlanksAs = $displayBlanksAs;
+        $this->name = $name;
+        $this->title = $title;
+        $this->legend = $legend;
+        $this->xAxisLabel = $xAxisLabel;
+        $this->yAxisLabel = $yAxisLabel;
+        $this->plotArea = $plotArea;
+        $this->plotVisibleOnly = $plotVisibleOnly;
+        $this->displayBlanksAs = $displayBlanksAs;
+        $this->xAxis = $xAxis;
+        $this->yAxis = $yAxis;
+        $this->majorGridlines = $majorGridlines;
+        $this->minorGridlines = $minorGridlines;
     }
 
     /**
@@ -167,8 +190,9 @@ class PHPExcel_Chart
      *
      * @return string
      */
-	public function getName() {
-		return $this->_name;
+    public function getName()
+    {
+        return $this->name;
     }
 
     /**
@@ -176,8 +200,9 @@ class PHPExcel_Chart
      *
      * @return PHPExcel_Worksheet
      */
-	public function getWorksheet() {
-		return $this->_worksheet;
+    public function getWorksheet()
+    {
+        return $this->worksheet;
     }
 
     /**
@@ -187,8 +212,9 @@ class PHPExcel_Chart
      * @throws    PHPExcel_Chart_Exception
      * @return PHPExcel_Chart
      */
-	public function setWorksheet(PHPExcel_Worksheet $pValue = null) {
-		$this->_worksheet = $pValue;
+    public function setWorksheet(PHPExcel_Worksheet $pValue = null)
+    {
+        $this->worksheet = $pValue;
 
         return $this;
     }
@@ -198,8 +224,9 @@ class PHPExcel_Chart
      *
      * @return PHPExcel_Chart_Title
      */
-	public function getTitle() {
-		return $this->_title;
+    public function getTitle()
+    {
+        return $this->title;
     }
 
     /**
@@ -208,8 +235,9 @@ class PHPExcel_Chart
      * @param    PHPExcel_Chart_Title $title
      * @return    PHPExcel_Chart
      */
-	public function setTitle(PHPExcel_Chart_Title $title) {
-		$this->_title = $title;
+    public function setTitle(PHPExcel_Chart_Title $title)
+    {
+        $this->title = $title;
 
         return $this;
     }
@@ -219,8 +247,9 @@ class PHPExcel_Chart
      *
      * @return PHPExcel_Chart_Legend
      */
-	public function getLegend() {
-		return $this->_legend;
+    public function getLegend()
+    {
+        return $this->legend;
     }
 
     /**
@@ -229,8 +258,9 @@ class PHPExcel_Chart
      * @param    PHPExcel_Chart_Legend $legend
      * @return    PHPExcel_Chart
      */
-	public function setLegend(PHPExcel_Chart_Legend $legend) {
-		$this->_legend = $legend;
+    public function setLegend(PHPExcel_Chart_Legend $legend)
+    {
+        $this->legend = $legend;
 
         return $this;
     }
@@ -240,8 +270,9 @@ class PHPExcel_Chart
      *
      * @return PHPExcel_Chart_Title
      */
-	public function getXAxisLabel() {
-		return $this->_xAxisLabel;
+    public function getXAxisLabel()
+    {
+        return $this->xAxisLabel;
     }
 
     /**
@@ -250,8 +281,9 @@ class PHPExcel_Chart
      * @param    PHPExcel_Chart_Title $label
      * @return    PHPExcel_Chart
      */
-	public function setXAxisLabel(PHPExcel_Chart_Title $label) {
-		$this->_xAxisLabel = $label;
+    public function setXAxisLabel(PHPExcel_Chart_Title $label)
+    {
+        $this->xAxisLabel = $label;
 
         return $this;
     }
@@ -261,8 +293,9 @@ class PHPExcel_Chart
      *
      * @return PHPExcel_Chart_Title
      */
-	public function getYAxisLabel() {
-		return $this->_yAxisLabel;
+    public function getYAxisLabel()
+    {
+        return $this->yAxisLabel;
     }
 
     /**
@@ -271,8 +304,9 @@ class PHPExcel_Chart
      * @param    PHPExcel_Chart_Title $label
      * @return    PHPExcel_Chart
      */
-	public function setYAxisLabel(PHPExcel_Chart_Title $label) {
-		$this->_yAxisLabel = $label;
+    public function setYAxisLabel(PHPExcel_Chart_Title $label)
+    {
+        $this->yAxisLabel = $label;
 
         return $this;
     }
@@ -282,8 +316,9 @@ class PHPExcel_Chart
      *
      * @return PHPExcel_Chart_PlotArea
      */
-	public function getPlotArea() {
-		return $this->_plotArea;
+    public function getPlotArea()
+    {
+        return $this->plotArea;
     }
 
     /**
@@ -291,8 +326,9 @@ class PHPExcel_Chart
      *
      * @return boolean
      */
-	public function getPlotVisibleOnly() {
-		return $this->_plotVisibleOnly;
+    public function getPlotVisibleOnly()
+    {
+        return $this->plotVisibleOnly;
     }
 
     /**
@@ -301,8 +337,9 @@ class PHPExcel_Chart
      * @param boolean $plotVisibleOnly
      * @return PHPExcel_Chart
      */
-	public function setPlotVisibleOnly($plotVisibleOnly = true) {
-		$this->_plotVisibleOnly = $plotVisibleOnly;
+    public function setPlotVisibleOnly($plotVisibleOnly = true)
+    {
+        $this->plotVisibleOnly = $plotVisibleOnly;
 
         return $this;
     }
@@ -312,8 +349,9 @@ class PHPExcel_Chart
      *
      * @return string
      */
-	public function getDisplayBlanksAs() {
-		return $this->_displayBlanksAs;
+    public function getDisplayBlanksAs()
+    {
+        return $this->displayBlanksAs;
     }
 
     /**
@@ -322,8 +360,66 @@ class PHPExcel_Chart
      * @param string $displayBlanksAs
      * @return PHPExcel_Chart
      */
-	public function setDisplayBlanksAs($displayBlanksAs = '0') {
-		$this->_displayBlanksAs = $displayBlanksAs;
+    public function setDisplayBlanksAs($displayBlanksAs = '0')
+    {
+        $this->displayBlanksAs = $displayBlanksAs;
+    }
+
+
+    /**
+     * Get yAxis
+     *
+     * @return PHPExcel_Chart_Axis
+     */
+    public function getChartAxisY()
+    {
+        if ($this->yAxis !== null) {
+            return $this->yAxis;
+        }
+
+        return new PHPExcel_Chart_Axis();
+    }
+
+    /**
+     * Get xAxis
+     *
+     * @return PHPExcel_Chart_Axis
+     */
+    public function getChartAxisX()
+    {
+        if ($this->xAxis !== null) {
+            return $this->xAxis;
+        }
+
+        return new PHPExcel_Chart_Axis();
+    }
+
+    /**
+     * Get Major Gridlines
+     *
+     * @return PHPExcel_Chart_GridLines
+     */
+    public function getMajorGridlines()
+    {
+        if ($this->majorGridlines !== null) {
+            return $this->majorGridlines;
+        }
+
+        return new PHPExcel_Chart_GridLines();
+    }
+
+    /**
+     * Get Minor Gridlines
+     *
+     * @return PHPExcel_Chart_GridLines
+     */
+    public function getMinorGridlines()
+    {
+        if ($this->minorGridlines !== null) {
+            return $this->minorGridlines;
+        }
+
+        return new PHPExcel_Chart_GridLines();
     }
 
 
@@ -335,12 +431,15 @@ class PHPExcel_Chart
      * @param    integer    $yOffset
      * @return PHPExcel_Chart
      */
-	public function setTopLeftPosition($cell, $xOffset=null, $yOffset=null) {
-		$this->_topLeftCellRef = $cell;
-		if (!is_null($xOffset))
+    public function setTopLeftPosition($cell, $xOffset = null, $yOffset = null)
+    {
+        $this->topLeftCellRef = $cell;
+        if (!is_null($xOffset)) {
             $this->setTopLeftXOffset($xOffset);
-		if (!is_null($yOffset))
+        }
+        if (!is_null($yOffset)) {
             $this->setTopLeftYOffset($yOffset);
+        }
 
         return $this;
     }
@@ -350,10 +449,12 @@ class PHPExcel_Chart
      *
      * @return array    an associative array containing the cell address, X-Offset and Y-Offset from the top left of that cell
      */
-	public function getTopLeftPosition() {
-		return array( 'cell'	=> $this->_topLeftCellRef,
-					  'xOffset'	=> $this->_topLeftXOffset,
-					  'yOffset'	=> $this->_topLeftYOffset
+    public function getTopLeftPosition()
+    {
+        return array(
+            'cell'    => $this->topLeftCellRef,
+            'xOffset' => $this->topLeftXOffset,
+            'yOffset' => $this->topLeftYOffset
         );
     }
 
@@ -362,8 +463,9 @@ class PHPExcel_Chart
      *
      * @return string
      */
-	public function getTopLeftCell() {
-		return $this->_topLeftCellRef;
+    public function getTopLeftCell()
+    {
+        return $this->topLeftCellRef;
     }
 
     /**
@@ -372,8 +474,9 @@ class PHPExcel_Chart
      * @param    string    $cell
      * @return PHPExcel_Chart
      */
-	public function setTopLeftCell($cell) {
-		$this->_topLeftCellRef = $cell;
+    public function setTopLeftCell($cell)
+    {
+        $this->topLeftCellRef = $cell;
 
         return $this;
     }
@@ -385,11 +488,14 @@ class PHPExcel_Chart
      * @param    integer    $yOffset
      * @return PHPExcel_Chart
      */
-	public function setTopLeftOffset($xOffset=null,$yOffset=null) {
-		if (!is_null($xOffset))
+    public function setTopLeftOffset($xOffset = null, $yOffset = null)
+    {
+        if (!is_null($xOffset)) {
             $this->setTopLeftXOffset($xOffset);
-		if (!is_null($yOffset))
+        }
+        if (!is_null($yOffset)) {
             $this->setTopLeftYOffset($yOffset);
+        }
 
         return $this;
     }
@@ -399,30 +505,36 @@ class PHPExcel_Chart
      *
      * @return integer[]
      */
-	public function getTopLeftOffset() {
-		return array( 'X' => $this->_topLeftXOffset,
-					  'Y' => $this->_topLeftYOffset
+    public function getTopLeftOffset()
+    {
+        return array(
+            'X' => $this->topLeftXOffset,
+            'Y' => $this->topLeftYOffset
         );
     }
 
-	public function setTopLeftXOffset($xOffset) {
-		$this->_topLeftXOffset = $xOffset;
+    public function setTopLeftXOffset($xOffset)
+    {
+        $this->topLeftXOffset = $xOffset;
 
         return $this;
     }
 
-	public function getTopLeftXOffset() {
-		return $this->_topLeftXOffset;
+    public function getTopLeftXOffset()
+    {
+        return $this->topLeftXOffset;
     }
 
-	public function setTopLeftYOffset($yOffset) {
-		$this->_topLeftYOffset = $yOffset;
+    public function setTopLeftYOffset($yOffset)
+    {
+        $this->topLeftYOffset = $yOffset;
 
         return $this;
     }
 
-	public function getTopLeftYOffset() {
-		return $this->_topLeftYOffset;
+    public function getTopLeftYOffset()
+    {
+        return $this->topLeftYOffset;
     }
 
     /**
@@ -433,12 +545,15 @@ class PHPExcel_Chart
      * @param    integer    $yOffset
      * @return PHPExcel_Chart
      */
-	public function setBottomRightPosition($cell, $xOffset=null, $yOffset=null) {
-		$this->_bottomRightCellRef = $cell;
-		if (!is_null($xOffset))
+    public function setBottomRightPosition($cell, $xOffset = null, $yOffset = null)
+    {
+        $this->bottomRightCellRef = $cell;
+        if (!is_null($xOffset)) {
             $this->setBottomRightXOffset($xOffset);
-		if (!is_null($yOffset))
+        }
+        if (!is_null($yOffset)) {
             $this->setBottomRightYOffset($yOffset);
+        }
 
         return $this;
     }
@@ -448,15 +563,18 @@ class PHPExcel_Chart
      *
      * @return array    an associative array containing the cell address, X-Offset and Y-Offset from the top left of that cell
      */
-	public function getBottomRightPosition() {
-		return array( 'cell'	=> $this->_bottomRightCellRef,
-					  'xOffset'	=> $this->_bottomRightXOffset,
-					  'yOffset'	=> $this->_bottomRightYOffset
+    public function getBottomRightPosition()
+    {
+        return array(
+            'cell'    => $this->bottomRightCellRef,
+            'xOffset' => $this->bottomRightXOffset,
+            'yOffset' => $this->bottomRightYOffset
         );
     }
 
-	public function setBottomRightCell($cell) {
-		$this->_bottomRightCellRef = $cell;
+    public function setBottomRightCell($cell)
+    {
+        $this->bottomRightCellRef = $cell;
 
         return $this;
     }
@@ -466,8 +584,9 @@ class PHPExcel_Chart
      *
      * @return string
      */
-	public function getBottomRightCell() {
-		return $this->_bottomRightCellRef;
+    public function getBottomRightCell()
+    {
+        return $this->bottomRightCellRef;
     }
 
     /**
@@ -477,11 +596,14 @@ class PHPExcel_Chart
      * @param    integer    $yOffset
      * @return PHPExcel_Chart
      */
-	public function setBottomRightOffset($xOffset=null,$yOffset=null) {
-		if (!is_null($xOffset))
+    public function setBottomRightOffset($xOffset = null, $yOffset = null)
+    {
+        if (!is_null($xOffset)) {
             $this->setBottomRightXOffset($xOffset);
-		if (!is_null($yOffset))
+        }
+        if (!is_null($yOffset)) {
             $this->setBottomRightYOffset($yOffset);
+        }
 
         return $this;
     }
@@ -491,40 +613,48 @@ class PHPExcel_Chart
      *
      * @return integer[]
      */
-	public function getBottomRightOffset() {
-		return array( 'X' => $this->_bottomRightXOffset,
-					  'Y' => $this->_bottomRightYOffset
+    public function getBottomRightOffset()
+    {
+        return array(
+            'X' => $this->bottomRightXOffset,
+            'Y' => $this->bottomRightYOffset
         );
     }
 
-	public function setBottomRightXOffset($xOffset) {
-		$this->_bottomRightXOffset = $xOffset;
+    public function setBottomRightXOffset($xOffset)
+    {
+        $this->bottomRightXOffset = $xOffset;
 
         return $this;
     }
 
-	public function getBottomRightXOffset() {
-		return $this->_bottomRightXOffset;
+    public function getBottomRightXOffset()
+    {
+        return $this->bottomRightXOffset;
     }
 
-	public function setBottomRightYOffset($yOffset) {
-		$this->_bottomRightYOffset = $yOffset;
+    public function setBottomRightYOffset($yOffset)
+    {
+        $this->bottomRightYOffset = $yOffset;
 
         return $this;
     }
 
-	public function getBottomRightYOffset() {
-		return $this->_bottomRightYOffset;
+    public function getBottomRightYOffset()
+    {
+        return $this->bottomRightYOffset;
     }
 
 
-	public function refresh() {
-		if ($this->_worksheet !== NULL) {
-			$this->_plotArea->refresh($this->_worksheet);
+    public function refresh()
+    {
+        if ($this->worksheet !== null) {
+            $this->plotArea->refresh($this->worksheet);
         }
     }
 
-	public function render($outputDestination = null) {
+    public function render($outputDestination = null)
+    {
         $libraryName = PHPExcel_Settings::getChartRendererName();
         if (is_null($libraryName)) {
             return false;
@@ -547,5 +677,4 @@ class PHPExcel_Chart
         }
         return $renderer->render($outputDestination);
     }
-
 }

Classes/PHPExcel/Chart/Axis.php

@@ -0,0 +1,561 @@
+<?php
+
+/**
+ * Created by PhpStorm.
+ * User: Wiktor Trzonkowski
+ * Date: 6/17/14
+ * Time: 12:11 PM
+ */
+
+class PHPExcel_Chart_Axis extends PHPExcel_Chart_Properties
+{
+    /**
+     * Axis Number
+     *
+     * @var  array of mixed
+     */
+    private $axisNumber = array(
+        'format' => self::FORMAT_CODE_GENERAL,
+        'source_linked' => 1
+    );
+
+    /**
+     * Axis Options
+     *
+     * @var  array of mixed
+     */
+    private $axisOptions = array(
+        'minimum' => null,
+        'maximum' => null,
+        'major_unit' => null,
+        'minor_unit' => null,
+        'orientation' => self::ORIENTATION_NORMAL,
+        'minor_tick_mark' => self::TICK_MARK_NONE,
+        'major_tick_mark' => self::TICK_MARK_NONE,
+        'axis_labels' => self::AXIS_LABELS_NEXT_TO,
+        'horizontal_crosses' => self::HORIZONTAL_CROSSES_AUTOZERO,
+        'horizontal_crosses_value' => null
+    );
+
+    /**
+     * Fill Properties
+     *
+     * @var  array of mixed
+     */
+    private $fillProperties = array(
+        'type' => self::EXCEL_COLOR_TYPE_ARGB,
+        'value' => null,
+        'alpha' => 0
+    );
+
+    /**
+     * Line Properties
+     *
+     * @var  array of mixed
+     */
+    private $lineProperties = array(
+        'type' => self::EXCEL_COLOR_TYPE_ARGB,
+        'value' => null,
+        'alpha' => 0
+    );
+
+    /**
+     * Line Style Properties
+     *
+     * @var  array of mixed
+     */
+    private $lineStyleProperties = array(
+        'width' => '9525',
+        'compound' => self::LINE_STYLE_COMPOUND_SIMPLE,
+        'dash' => self::LINE_STYLE_DASH_SOLID,
+        'cap' => self::LINE_STYLE_CAP_FLAT,
+        'join' => self::LINE_STYLE_JOIN_BEVEL,
+        'arrow' => array(
+            'head' => array(
+                'type' => self::LINE_STYLE_ARROW_TYPE_NOARROW,
+                'size' => self::LINE_STYLE_ARROW_SIZE_5
+            ),
+            'end' => array(
+                'type' => self::LINE_STYLE_ARROW_TYPE_NOARROW,
+                'size' => self::LINE_STYLE_ARROW_SIZE_8
+            ),
+        )
+    );
+
+    /**
+     * Shadow Properties
+     *
+     * @var  array of mixed
+     */
+    private $shadowProperties = array(
+        'presets' => self::SHADOW_PRESETS_NOSHADOW,
+        'effect' => null,
+        'color' => array(
+            'type' => self::EXCEL_COLOR_TYPE_STANDARD,
+            'value' => 'black',
+            'alpha' => 40,
+        ),
+        'size' => array(
+            'sx' => null,
+            'sy' => null,
+            'kx' => null
+        ),
+        'blur' => null,
+        'direction' => null,
+        'distance' => null,
+        'algn' => null,
+        'rotWithShape' => null
+    );
+
+    /**
+     * Glow Properties
+     *
+     * @var  array of mixed
+     */
+    private $glowProperties = array(
+        'size' => null,
+        'color' => array(
+            'type' => self::EXCEL_COLOR_TYPE_STANDARD,
+            'value' => 'black',
+            'alpha' => 40
+        )
+    );
+
+    /**
+     * Soft Edge Properties
+     *
+     * @var  array of mixed
+     */
+    private $softEdges = array(
+        'size' => null
+    );
+
+    /**
+     * Get Series Data Type
+     *
+     * @return  string
+     */
+    public function setAxisNumberProperties($format_code)
+    {
+        $this->axisNumber['format'] = (string) $format_code;
+        $this->axisNumber['source_linked'] = 0;
+    }
+
+    /**
+     * Get Axis Number Format Data Type
+     *
+     * @return  string
+     */
+    public function getAxisNumberFormat()
+    {
+        return $this->axisNumber['format'];
+    }
+
+    /**
+     * Get Axis Number Source Linked
+     *
+     * @return  string
+     */
+    public function getAxisNumberSourceLinked()
+    {
+        return (string) $this->axisNumber['source_linked'];
+    }
+
+    /**
+     * Set Axis Options Properties
+     *
+     * @param string $axis_labels
+     * @param string $horizontal_crosses_value
+     * @param string $horizontal_crosses
+     * @param string $axis_orientation
+     * @param string $major_tmt
+     * @param string $minor_tmt
+     * @param string $minimum
+     * @param string $maximum
+     * @param string $major_unit
+     * @param string $minor_unit
+     *
+     */
+    public function setAxisOptionsProperties($axis_labels, $horizontal_crosses_value = null, $horizontal_crosses = null, $axis_orientation = null, $major_tmt = null, $minor_tmt = null, $minimum = null, $maximum = null, $major_unit = null, $minor_unit = null)
+    {
+        $this->axisOptions['axis_labels'] = (string) $axis_labels;
+        ($horizontal_crosses_value !== null) ? $this->axisOptions['horizontal_crosses_value'] = (string) $horizontal_crosses_value : null;
+        ($horizontal_crosses !== null) ? $this->axisOptions['horizontal_crosses'] = (string) $horizontal_crosses : null;
+        ($axis_orientation !== null) ? $this->axisOptions['orientation'] = (string) $axis_orientation : null;
+        ($major_tmt !== null) ? $this->axisOptions['major_tick_mark'] = (string) $major_tmt : null;
+        ($minor_tmt !== null) ? $this->axisOptions['minor_tick_mark'] = (string) $minor_tmt : null;
+        ($minor_tmt !== null) ? $this->axisOptions['minor_tick_mark'] = (string) $minor_tmt : null;
+        ($minimum !== null) ? $this->axisOptions['minimum'] = (string) $minimum : null;
+        ($maximum !== null) ? $this->axisOptions['maximum'] = (string) $maximum : null;
+        ($major_unit !== null) ? $this->axisOptions['major_unit'] = (string) $major_unit : null;
+        ($minor_unit !== null) ? $this->axisOptions['minor_unit'] = (string) $minor_unit : null;
+    }
+
+    /**
+     * Get Axis Options Property
+     *
+     * @param string $property
+     *
+     * @return string
+     */
+    public function getAxisOptionsProperty($property)
+    {
+        return $this->axisOptions[$property];
+    }
+
+    /**
+     * Set Axis Orientation Property
+     *
+     * @param string $orientation
+     *
+     */
+    public function setAxisOrientation($orientation)
+    {
+        $this->orientation = (string) $orientation;
+    }
+
+    /**
+     * Set Fill Property
+     *
+     * @param string $color
+     * @param int $alpha
+     * @param string $type
+     *
+     */
+    public function setFillParameters($color, $alpha = 0, $type = self::EXCEL_COLOR_TYPE_ARGB)
+    {
+        $this->fillProperties = $this->setColorProperties($color, $alpha, $type);
+    }
+
+    /**
+     * Set Line Property
+     *
+     * @param string $color
+     * @param int $alpha
+     * @param string $type
+     *
+     */
+    public function setLineParameters($color, $alpha = 0, $type = self::EXCEL_COLOR_TYPE_ARGB)
+    {
+        $this->lineProperties = $this->setColorProperties($color, $alpha, $type);
+    }
+
+    /**
+     * Get Fill Property
+     *
+     * @param string $property
+     *
+     * @return string
+     */
+    public function getFillProperty($property)
+    {
+        return $this->fillProperties[$property];
+    }
+
+    /**
+     * Get Line Property
+     *
+     * @param string $property
+     *
+     * @return string
+     */
+    public function getLineProperty($property)
+    {
+        return $this->lineProperties[$property];
+    }
+
+    /**
+     * Set Line Style Properties
+     *
+     * @param float $line_width
+     * @param string $compound_type
+     * @param string $dash_type
+     * @param string $cap_type
+     * @param string $join_type
+     * @param string $head_arrow_type
+     * @param string $head_arrow_size
+     * @param string $end_arrow_type
+     * @param string $end_arrow_size
+     *
+     */
+    public function setLineStyleProperties($line_width = null, $compound_type = null, $dash_type = null, $cap_type = null, $join_type = null, $head_arrow_type = null, $head_arrow_size = null, $end_arrow_type = null, $end_arrow_size = null)
+    {
+        (!is_null($line_width)) ? $this->lineStyleProperties['width'] = $this->getExcelPointsWidth((float) $line_width) : null;
+        (!is_null($compound_type)) ? $this->lineStyleProperties['compound'] = (string) $compound_type : null;
+        (!is_null($dash_type)) ? $this->lineStyleProperties['dash'] = (string) $dash_type : null;
+        (!is_null($cap_type)) ? $this->lineStyleProperties['cap'] = (string) $cap_type : null;
+        (!is_null($join_type)) ? $this->lineStyleProperties['join'] = (string) $join_type : null;
+        (!is_null($head_arrow_type)) ? $this->lineStyleProperties['arrow']['head']['type'] = (string) $head_arrow_type : null;
+        (!is_null($head_arrow_size)) ? $this->lineStyleProperties['arrow']['head']['size'] = (string) $head_arrow_size : null;
+        (!is_null($end_arrow_type)) ? $this->lineStyleProperties['arrow']['end']['type'] = (string) $end_arrow_type : null;
+        (!is_null($end_arrow_size)) ? $this->lineStyleProperties['arrow']['end']['size'] = (string) $end_arrow_size : null;
+    }
+
+    /**
+     * Get Line Style Property
+     *
+     * @param array|string $elements
+     *
+     * @return string
+     */
+    public function getLineStyleProperty($elements)
+    {
+        return $this->getArrayElementsValue($this->lineStyleProperties, $elements);
+    }
+
+    /**
+     * Get Line Style Arrow Excel Width
+     *
+     * @param string $arrow
+     *
+     * @return string
+     */
+    public function getLineStyleArrowWidth($arrow)
+    {
+        return $this->getLineStyleArrowSize($this->lineStyleProperties['arrow'][$arrow]['size'], 'w');
+    }
+
+    /**
+     * Get Line Style Arrow Excel Length
+     *
+     * @param string $arrow
+     *
+     * @return string
+     */
+    public function getLineStyleArrowLength($arrow)
+    {
+        return $this->getLineStyleArrowSize($this->lineStyleProperties['arrow'][$arrow]['size'], 'len');
+    }
+
+    /**
+     * Set Shadow Properties
+     *
+     * @param int $shadow_presets
+     * @param string $sh_color_value
+     * @param string $sh_color_type
+     * @param string $sh_color_alpha
+     * @param float $sh_blur
+     * @param int $sh_angle
+     * @param float $sh_distance
+     *
+     */
+    public function setShadowProperties($sh_presets, $sh_color_value = null, $sh_color_type = null, $sh_color_alpha = null, $sh_blur = null, $sh_angle = null, $sh_distance = null)
+    {
+        $this->setShadowPresetsProperties((int) $sh_presets)
+            ->setShadowColor(
+                is_null($sh_color_value) ? $this->shadowProperties['color']['value'] : $sh_color_value,
+                is_null($sh_color_alpha) ? (int) $this->shadowProperties['color']['alpha'] : $sh_color_alpha,
+                is_null($sh_color_type) ? $this->shadowProperties['color']['type'] : $sh_color_type
+            )
+            ->setShadowBlur($sh_blur)
+            ->setShadowAngle($sh_angle)
+            ->setShadowDistance($sh_distance);
+    }
+
+    /**
+     * Set Shadow Color
+     *
+     * @param int $shadow_presets
+     *
+     * @return PHPExcel_Chart_Axis
+     */
+    private function setShadowPresetsProperties($shadow_presets)
+    {
+        $this->shadowProperties['presets'] = $shadow_presets;
+        $this->setShadowProperiesMapValues($this->getShadowPresetsMap($shadow_presets));
+
+        return $this;
+    }
+
+    /**
+     * Set Shadow Properties from Maped Values
+     *
+     * @param array $properties_map
+     * @param * $reference
+     *
+     * @return PHPExcel_Chart_Axis
+     */
+    private function setShadowProperiesMapValues(array $properties_map, &$reference = null)
+    {
+        $base_reference = $reference;
+        foreach ($properties_map as $property_key => $property_val) {
+            if (is_array($property_val)) {
+                if ($reference === null) {
+                    $reference = & $this->shadowProperties[$property_key];
+                } else {
+                    $reference = & $reference[$property_key];
+                }
+                $this->setShadowProperiesMapValues($property_val, $reference);
+            } else {
+                if ($base_reference === null) {
+                    $this->shadowProperties[$property_key] = $property_val;
+                } else {
+                    $reference[$property_key] = $property_val;
+                }
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set Shadow Color
+     *
+     * @param string $color
+     * @param int $alpha
+     * @param string $type
+     *
+     * @return PHPExcel_Chart_Axis
+     */
+    private function setShadowColor($color, $alpha, $type)
+    {
+        $this->shadowProperties['color'] = $this->setColorProperties($color, $alpha, $type);
+
+        return $this;
+    }
+
+    /**
+     * Set Shadow Blur
+     *
+     * @param float $blur
+     *
+     * @return PHPExcel_Chart_Axis
+     */
+    private function setShadowBlur($blur)
+    {
+        if ($blur !== null) {
+            $this->shadowProperties['blur'] = (string) $this->getExcelPointsWidth($blur);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set Shadow Angle
+     *
+     * @param int $angle
+     *
+     * @return PHPExcel_Chart_Axis
+     */
+    private function setShadowAngle($angle)
+    {
+        if ($angle !== null) {
+            $this->shadowProperties['direction'] = (string) $this->getExcelPointsAngle($angle);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set Shadow Distance
+     *
+     * @param float $distance
+     *
+     * @return PHPExcel_Chart_Axis
+     */
+    private function setShadowDistance($distance)
+    {
+        if ($distance !== null) {
+            $this->shadowProperties['distance'] = (string) $this->getExcelPointsWidth($distance);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get Glow Property
+     *
+     * @param float $size
+     * @param string $color_value
+     * @param int $color_alpha
+     * @param string $color_type
+     */
+    public function getShadowProperty($elements)
+    {
+        return $this->getArrayElementsValue($this->shadowProperties, $elements);
+    }
+
+    /**
+     * Set Glow Properties
+     *
+     * @param float $size
+     * @param string $color_value
+     * @param int $color_alpha
+     * @param string $color_type
+     */
+    public function setGlowProperties($size, $color_value = null, $color_alpha = null, $color_type = null)
+    {
+        $this->setGlowSize($size)
+            ->setGlowColor(
+                is_null($color_value) ? $this->glowProperties['color']['value'] : $color_value,
+                is_null($color_alpha) ? (int) $this->glowProperties['color']['alpha'] : $color_alpha,
+                is_null($color_type) ? $this->glowProperties['color']['type'] : $color_type
+            );
+    }
+
+    /**
+     * Get Glow Property
+     *
+     * @param array|string $property
+     *
+     * @return string
+     */
+    public function getGlowProperty($property)
+    {
+        return $this->getArrayElementsValue($this->glowProperties, $property);
+    }
+
+    /**
+     * Set Glow Color
+     *
+     * @param float $size
+     *
+     * @return PHPExcel_Chart_Axis
+     */
+    private function setGlowSize($size)
+    {
+        if (!is_null($size)) {
+            $this->glowProperties['size'] = $this->getExcelPointsWidth($size);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set Glow Color
+     *
+     * @param string $color
+     * @param int $alpha
+     * @param string $type
+     *
+     * @return PHPExcel_Chart_Axis
+     */
+    private function setGlowColor($color, $alpha, $type)
+    {
+        $this->glowProperties['color'] = $this->setColorProperties($color, $alpha, $type);
+
+        return $this;
+    }
+
+    /**
+     * Set Soft Edges Size
+     *
+     * @param float $size
+     */
+    public function setSoftEdges($size)
+    {
+        if (!is_null($size)) {
+            $softEdges['size'] = (string) $this->getExcelPointsWidth($size);
+        }
+    }
+
+    /**
+     * Get Soft Edges Size
+     *
+     * @return string
+     */
+    public function getSoftEdgesSize()
+    {
+        return $this->softEdges['size'];
+    }
+}

Classes/PHPExcel/Chart/DataSeries.php

@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2013 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,7 +20,7 @@
  *
  * @category    PHPExcel
  * @package        PHPExcel_Chart
- * @copyright	Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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,11 +31,10 @@
  *
  * @category    PHPExcel
  * @package        PHPExcel_Chart
- * @copyright	Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright    Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Chart_DataSeries
 {
-
     const TYPE_BARCHART        = 'barChart';
     const TYPE_BARCHART_3D     = 'bar3DChart';
     const TYPE_LINECHART       = 'lineChart';
@@ -52,6 +51,7 @@ class PHPExcel_Chart_DataSeries
     const TYPE_RADARCHART      = 'radarChart';
     const TYPE_BUBBLECHART     = 'bubbleChart';
     const TYPE_STOCKCHART      = 'stockChart';
+    const TYPE_CANDLECHART     = self::TYPE_STOCKCHART;       //    Synonym
 
     const GROUPING_CLUSTERED       = 'clustered';
     const GROUPING_STACKED         = 'stacked';
@@ -75,85 +75,90 @@ class PHPExcel_Chart_DataSeries
      *
      * @var string
      */
-	private $_plotType = null;
+    private $plotType;
 
     /**
      * Plot Grouping Type
      *
      * @var boolean
      */
-	private $_plotGrouping = null;
+    private $plotGrouping;
 
     /**
      * Plot Direction
      *
      * @var boolean
      */
-	private $_plotDirection = null;
+    private $plotDirection;
 
     /**
      * Plot Style
      *
      * @var string
      */
-	private $_plotStyle = null;
+    private $plotStyle;
 
     /**
      * Order of plots in Series
      *
      * @var array of integer
      */
-	private $_plotOrder = array();
+    private $plotOrder = array();
 
     /**
      * Plot Label
      *
      * @var array of PHPExcel_Chart_DataSeriesValues
      */
-	private $_plotLabel = array();
+    private $plotLabel = array();
 
     /**
      * Plot Category
      *
      * @var array of PHPExcel_Chart_DataSeriesValues
      */
-	private $_plotCategory = array();
+    private $plotCategory = array();
 
     /**
      * Smooth Line
      *
      * @var string
      */
-	private $_smoothLine = null;
+    private $smoothLine;
 
     /**
      * Plot Values
      *
      * @var array of PHPExcel_Chart_DataSeriesValues
      */
-	private $_plotValues = array();
+    private $plotValues = array();
 
     /**
      * Create a new PHPExcel_Chart_DataSeries
      */
-	public function __construct($plotType = null, $plotGrouping = null, $plotOrder = array(), $plotLabel = array(), $plotCategory = array(), $plotValues = array(), $smoothLine = null, $plotStyle = null)
+    public function __construct($plotType = null, $plotGrouping = null, $plotOrder = array(), $plotLabel = array(), $plotCategory = array(), $plotValues = array(), $plotDirection = null, $smoothLine = null, $plotStyle = null)
     {
-		$this->_plotType = $plotType;
-		$this->_plotGrouping = $plotGrouping;
-		$this->_plotOrder = $plotOrder;
+        $this->plotType = $plotType;
+        $this->plotGrouping = $plotGrouping;
+        $this->plotOrder = $plotOrder;
         $keys = array_keys($plotValues);
-		$this->_plotValues = $plotValues;
+        $this->plotValues = $plotValues;
         if ((count($plotLabel) == 0) || (is_null($plotLabel[$keys[0]]))) {
             $plotLabel[$keys[0]] = new PHPExcel_Chart_DataSeriesValues();
         }
 
-		$this->_plotLabel = $plotLabel;
+        $this->plotLabel = $plotLabel;
         if ((count($plotCategory) == 0) || (is_null($plotCategory[$keys[0]]))) {
             $plotCategory[$keys[0]] = new PHPExcel_Chart_DataSeriesValues();
         }
-		$this->_plotCategory = $plotCategory;
-		$this->_smoothLine = $smoothLine;
-		$this->_plotStyle = $plotStyle;
+        $this->plotCategory = $plotCategory;
+        $this->smoothLine = $smoothLine;
+        $this->plotStyle = $plotStyle;
+        
+        if (is_null($plotDirection)) {
+            $plotDirection = self::DIRECTION_COL;
+        }
+        $this->plotDirection = $plotDirection;
     }
 
     /**
@@ -161,17 +166,21 @@ class PHPExcel_Chart_DataSeries
      *
      * @return string
      */
-	public function getPlotType() {
-		return $this->_plotType;
+    public function getPlotType()
+    {
+        return $this->plotType;
     }
 
     /**
      * Set Plot Type
      *
      * @param string $plotType
+     * @return PHPExcel_Chart_DataSeries
      */
-	public function setPlotType($plotType = '') {
-		$this->_plotType = $plotType;
+    public function setPlotType($plotType = '')
+    {
+        $this->plotType = $plotType;
+        return $this;
     }
 
     /**
@@ -179,17 +188,21 @@ class PHPExcel_Chart_DataSeries
      *
      * @return string
      */
-	public function getPlotGrouping() {
-		return $this->_plotGrouping;
+    public function getPlotGrouping()
+    {
+        return $this->plotGrouping;
     }
 
     /**
      * Set Plot Grouping Type
      *
      * @param string $groupingType
+     * @return PHPExcel_Chart_DataSeries
      */
-	public function setPlotGrouping($groupingType = null) {
-		$this->_plotGrouping = $groupingType;
+    public function setPlotGrouping($groupingType = null)
+    {
+        $this->plotGrouping = $groupingType;
+        return $this;
     }
 
     /**
@@ -197,17 +210,21 @@ class PHPExcel_Chart_DataSeries
      *
      * @return string
      */
-	public function getPlotDirection() {
-		return $this->_plotDirection;
+    public function getPlotDirection()
+    {
+        return $this->plotDirection;
     }
 
     /**
      * Set Plot Direction
      *
      * @param string $plotDirection
+     * @return PHPExcel_Chart_DataSeries
      */
-	public function setPlotDirection($plotDirection = null) {
-		$this->_plotDirection = $plotDirection;
+    public function setPlotDirection($plotDirection = null)
+    {
+        $this->plotDirection = $plotDirection;
+        return $this;
     }
 
     /**
@@ -215,8 +232,9 @@ class PHPExcel_Chart_DataSeries
      *
      * @return string
      */
-	public function getPlotOrder() {
-		return $this->_plotOrder;
+    public function getPlotOrder()
+    {
+        return $this->plotOrder;
     }
 
     /**
@@ -224,8 +242,9 @@ class PHPExcel_Chart_DataSeries
      *
      * @return array of PHPExcel_Chart_DataSeriesValues
      */
-	public function getPlotLabels() {
-		return $this->_plotLabel;
+    public function getPlotLabels()
+    {
+        return $this->plotLabel;
     }
 
     /**
@@ -233,12 +252,13 @@ class PHPExcel_Chart_DataSeries
      *
      * @return PHPExcel_Chart_DataSeriesValues
      */
-	public function getPlotLabelByIndex($index) {
-		$keys = array_keys($this->_plotLabel);
+    public function getPlotLabelByIndex($index)
+    {
+        $keys = array_keys($this->plotLabel);
         if (in_array($index, $keys)) {
-			return $this->_plotLabel[$index];
+            return $this->plotLabel[$index];
         } elseif (isset($keys[$index])) {
-			return $this->_plotLabel[$keys[$index]];
+            return $this->plotLabel[$keys[$index]];
         }
         return false;
     }
@@ -248,8 +268,9 @@ class PHPExcel_Chart_DataSeries
      *
      * @return array of PHPExcel_Chart_DataSeriesValues
      */
-	public function getPlotCategories() {
-		return $this->_plotCategory;
+    public function getPlotCategories()
+    {
+        return $this->plotCategory;
     }
 
     /**
@@ -257,12 +278,13 @@ class PHPExcel_Chart_DataSeries
      *
      * @return PHPExcel_Chart_DataSeriesValues
      */
-	public function getPlotCategoryByIndex($index) {
-		$keys = array_keys($this->_plotCategory);
+    public function getPlotCategoryByIndex($index)
+    {
+        $keys = array_keys($this->plotCategory);
         if (in_array($index, $keys)) {
-			return $this->_plotCategory[$index];
+            return $this->plotCategory[$index];
         } elseif (isset($keys[$index])) {
-			return $this->_plotCategory[$keys[$index]];
+            return $this->plotCategory[$keys[$index]];
         }
         return false;
     }
@@ -272,17 +294,21 @@ class PHPExcel_Chart_DataSeries
      *
      * @return string
      */
-	public function getPlotStyle() {
-		return $this->_plotStyle;
+    public function getPlotStyle()
+    {
+        return $this->plotStyle;
     }
 
     /**
      * Set Plot Style
      *
      * @param string $plotStyle
+     * @return PHPExcel_Chart_DataSeries
      */
-	public function setPlotStyle($plotStyle = null) {
-		$this->_plotStyle = $plotStyle;
+    public function setPlotStyle($plotStyle = null)
+    {
+        $this->plotStyle = $plotStyle;
+        return $this;
     }
 
     /**
@@ -290,8 +316,9 @@ class PHPExcel_Chart_DataSeries
      *
      * @return array of PHPExcel_Chart_DataSeriesValues
      */
-	public function getPlotValues() {
-		return $this->_plotValues;
+    public function getPlotValues()
+    {
+        return $this->plotValues;
     }
 
     /**
@@ -299,12 +326,13 @@ class PHPExcel_Chart_DataSeries
      *
      * @return PHPExcel_Chart_DataSeriesValues
      */
-	public function getPlotValuesByIndex($index) {
-		$keys = array_keys($this->_plotValues);
+    public function getPlotValuesByIndex($index)
+    {
+        $keys = array_keys($this->plotValues);
         if (in_array($index, $keys)) {
-			return $this->_plotValues[$index];
+            return $this->plotValues[$index];
         } elseif (isset($keys[$index])) {
-			return $this->_plotValues[$keys[$index]];
+            return $this->plotValues[$keys[$index]];
         }
         return false;
     }
@@ -314,8 +342,9 @@ class PHPExcel_Chart_DataSeries
      *
      * @return integer
      */
-	public function getPlotSeriesCount() {
-		return count($this->_plotValues);
+    public function getPlotSeriesCount()
+    {
+        return count($this->plotValues);
     }
 
     /**
@@ -323,32 +352,39 @@ class PHPExcel_Chart_DataSeries
      *
      * @return boolean
      */
-	public function getSmoothLine() {
-		return $this->_smoothLine;
+    public function getSmoothLine()
+    {
+        return $this->smoothLine;
     }
 
     /**
      * Set Smooth Line
      *
      * @param boolean $smoothLine
+     * @return PHPExcel_Chart_DataSeries
      */
-	public function setSmoothLine($smoothLine = TRUE) {
-		$this->_smoothLine = $smoothLine;
+    public function setSmoothLine($smoothLine = true)
+    {
+        $this->smoothLine = $smoothLine;
+        return $this;
     }
 
-	public function refresh(PHPExcel_Worksheet $worksheet) {
-	    foreach($this->_plotValues as $plotValues) {
-			if ($plotValues !== NULL)
-				$plotValues->refresh($worksheet, TRUE);
-		}
-		foreach($this->_plotLabel as $plotValues) {
-			if ($plotValues !== NULL)
-				$plotValues->refresh($worksheet, TRUE);
-		}
-		foreach($this->_plotCategory as $plotValues) {
-			if ($plotValues !== NULL)
-				$plotValues->refresh($worksheet, FALSE);
+    public function refresh(PHPExcel_Worksheet $worksheet)
+    {
+        foreach ($this->plotValues as $plotValues) {
+            if ($plotValues !== null) {
+                $plotValues->refresh($worksheet, true);
+            }
+        }
+        foreach ($this->plotLabel as $plotValues) {
+            if ($plotValues !== null) {
+                $plotValues->refresh($worksheet, true);
+            }
+        }
+        foreach ($this->plotCategory as $plotValues) {
+            if ($plotValues !== null) {
+                $plotValues->refresh($worksheet, false);
+            }
         }
     }
-
 }

Classes/PHPExcel/Chart/DataSeriesValues.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * PHPExcel
+ * PHPExcel_Chart_DataSeriesValues
  *
- * Copyright (c) 2006 - 2013 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,26 +21,17 @@
  *
  * @category    PHPExcel
  * @package        PHPExcel_Chart
- * @copyright	Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-
-/**
- * PHPExcel_Chart_DataSeriesValues
- *
- * @category	PHPExcel
- * @package		PHPExcel_Chart
- * @copyright	Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
 class PHPExcel_Chart_DataSeriesValues
 {
 
     const DATASERIES_TYPE_STRING    = 'String';
     const DATASERIES_TYPE_NUMBER    = 'Number';
 
-	private static $_dataTypeValues = array(
+    private static $dataTypeValues = array(
         self::DATASERIES_TYPE_STRING,
         self::DATASERIES_TYPE_NUMBER,
     );
@@ -49,42 +41,42 @@ class PHPExcel_Chart_DataSeriesValues
      *
      * @var    string
      */
-	private $_dataType = null;
+    private $dataType;
 
     /**
      * Series Data Source
      *
      * @var    string
      */
-	private $_dataSource = null;
+    private $dataSource;
 
     /**
      * Format Code
      *
      * @var    string
      */
-	private $_formatCode = null;
+    private $formatCode;
 
     /**
      * Series Point Marker
      *
      * @var    string
      */
-	private $_marker = null;
+    private $pointMarker;
 
     /**
      * Point Count (The number of datapoints in the dataseries)
      *
      * @var    integer
      */
-	private $_pointCount = 0;
+    private $pointCount = 0;
 
     /**
      * Data Values
      *
      * @var    array of mixed
      */
-	private $_dataValues = array();
+    private $dataValues = array();
 
     /**
      * Create a new PHPExcel_Chart_DataSeriesValues object
@@ -92,11 +84,11 @@ class PHPExcel_Chart_DataSeriesValues
     public function __construct($dataType = self::DATASERIES_TYPE_NUMBER, $dataSource = null, $formatCode = null, $pointCount = 0, $dataValues = array(), $marker = null)
     {
         $this->setDataType($dataType);
-		$this->_dataSource = $dataSource;
-		$this->_formatCode = $formatCode;
-		$this->_pointCount = $pointCount;
-		$this->_dataValues = $dataValues;
-		$this->_marker = $marker;
+        $this->dataSource = $dataSource;
+        $this->formatCode = $formatCode;
+        $this->pointCount = $pointCount;
+        $this->dataValues = $dataValues;
+        $this->pointMarker = $marker;
     }
 
     /**
@@ -104,8 +96,9 @@ class PHPExcel_Chart_DataSeriesValues
      *
      * @return    string
      */
-	public function getDataType() {
-		return $this->_dataType;
+    public function getDataType()
+    {
+        return $this->dataType;
     }
 
     /**
@@ -119,11 +112,12 @@ class PHPExcel_Chart_DataSeriesValues
      *                                        Normally used for chart data values
      * @return    PHPExcel_Chart_DataSeriesValues
      */
-	public function setDataType($dataType = self::DATASERIES_TYPE_NUMBER) {
-		if (!in_array($dataType, self::$_dataTypeValues)) {
+    public function setDataType($dataType = self::DATASERIES_TYPE_NUMBER)
+    {
+        if (!in_array($dataType, self::$dataTypeValues)) {
             throw new PHPExcel_Chart_Exception('Invalid datatype for chart data series values');
         }
-		$this->_dataType = $dataType;
+        $this->dataType = $dataType;
 
         return $this;
     }
@@ -133,8 +127,9 @@ class PHPExcel_Chart_DataSeriesValues
      *
      * @return    string
      */
-	public function getDataSource() {
-		return $this->_dataSource;
+    public function getDataSource()
+    {
+        return $this->dataSource;
     }
 
     /**
@@ -143,8 +138,9 @@ class PHPExcel_Chart_DataSeriesValues
      * @param    string    $dataSource
      * @return    PHPExcel_Chart_DataSeriesValues
      */
-	public function setDataSource($dataSource = null, $refreshDataValues = true) {
-		$this->_dataSource = $dataSource;
+    public function setDataSource($dataSource = null, $refreshDataValues = true)
+    {
+        $this->dataSource = $dataSource;
 
         if ($refreshDataValues) {
             //    TO DO
@@ -158,8 +154,9 @@ class PHPExcel_Chart_DataSeriesValues
      *
      * @return string
      */
-	public function getPointMarker() {
-		return $this->_marker;
+    public function getPointMarker()
+    {
+        return $this->pointMarker;
     }
 
     /**
@@ -168,8 +165,9 @@ class PHPExcel_Chart_DataSeriesValues
      * @param    string    $marker
      * @return    PHPExcel_Chart_DataSeriesValues
      */
-	public function setPointMarker($marker = null) {
-		$this->_marker = $marker;
+    public function setPointMarker($marker = null)
+    {
+        $this->pointMarker = $marker;
 
         return $this;
     }
@@ -179,8 +177,9 @@ class PHPExcel_Chart_DataSeriesValues
      *
      * @return    string
      */
-	public function getFormatCode() {
-		return $this->_formatCode;
+    public function getFormatCode()
+    {
+        return $this->formatCode;
     }
 
     /**
@@ -189,8 +188,9 @@ class PHPExcel_Chart_DataSeriesValues
      * @param    string    $formatCode
      * @return    PHPExcel_Chart_DataSeriesValues
      */
-	public function setFormatCode($formatCode = null) {
-		$this->_formatCode = $formatCode;
+    public function setFormatCode($formatCode = null)
+    {
+        $this->formatCode = $formatCode;
 
         return $this;
     }
@@ -200,8 +200,9 @@ class PHPExcel_Chart_DataSeriesValues
      *
      * @return    integer
      */
-	public function getPointCount() {
-		return $this->_pointCount;
+    public function getPointCount()
+    {
+        return $this->pointCount;
     }
 
     /**
@@ -209,9 +210,10 @@ class PHPExcel_Chart_DataSeriesValues
      *
      * @return    boolean
      */
-	public function isMultiLevelSeries() {
-		if (count($this->_dataValues) > 0) {
-			return is_array($this->_dataValues[0]);
+    public function isMultiLevelSeries()
+    {
+        if (count($this->dataValues) > 0) {
+            return is_array($this->dataValues[0]);
         }
         return null;
     }
@@ -221,9 +223,10 @@ class PHPExcel_Chart_DataSeriesValues
      *
      * @return    boolean
      */
-	public function multiLevelCount() {
+    public function multiLevelCount()
+    {
         $levelCount = 0;
-		foreach($this->_dataValues as $dataValueSet) {
+        foreach ($this->dataValues as $dataValueSet) {
             $levelCount = max($levelCount, count($dataValueSet));
         }
         return $levelCount;
@@ -234,8 +237,9 @@ class PHPExcel_Chart_DataSeriesValues
      *
      * @return    array of mixed
      */
-	public function getDataValues() {
-		return $this->_dataValues;
+    public function getDataValues()
+    {
+        return $this->dataValues;
     }
 
     /**
@@ -243,14 +247,15 @@ class PHPExcel_Chart_DataSeriesValues
      *
      * @return    mixed
      */
-	public function getDataValue() {
-		$count = count($this->_dataValues);
+    public function getDataValue()
+    {
+        $count = count($this->dataValues);
         if ($count == 0) {
             return null;
         } elseif ($count == 1) {
-			return $this->_dataValues[0];
+            return $this->dataValues[0];
         }
-		return $this->_dataValues;
+        return $this->dataValues;
     }
 
     /**
@@ -258,13 +263,14 @@ class PHPExcel_Chart_DataSeriesValues
      *
      * @param    array    $dataValues
      * @param    boolean    $refreshDataSource
-	 *					TRUE - refresh the value of _dataSource based on the values of $dataValues
-	 *					FALSE - don't change the value of _dataSource
+     *                    TRUE - refresh the value of dataSource based on the values of $dataValues
+     *                    FALSE - don't change the value of dataSource
      * @return    PHPExcel_Chart_DataSeriesValues
      */
-	public function setDataValues($dataValues = array(), $refreshDataSource = TRUE) {
-		$this->_dataValues = PHPExcel_Calculation_Functions::flattenArray($dataValues);
-		$this->_pointCount = count($dataValues);
+    public function setDataValues($dataValues = array(), $refreshDataSource = true)
+    {
+        $this->dataValues = PHPExcel_Calculation_Functions::flattenArray($dataValues);
+        $this->pointCount = count($dataValues);
 
         if ($refreshDataSource) {
             //    TO DO
@@ -273,37 +279,39 @@ class PHPExcel_Chart_DataSeriesValues
         return $this;
     }
 
-	private function _stripNulls($var) {
-		return $var !== NULL;
+    private function stripNulls($var)
+    {
+        return $var !== null;
     }
 
-	public function refresh(PHPExcel_Worksheet $worksheet, $flatten = TRUE) {
-        if ($this->_dataSource !== NULL) {
+    public function refresh(PHPExcel_Worksheet $worksheet, $flatten = true)
+    {
+        if ($this->dataSource !== null) {
             $calcEngine = PHPExcel_Calculation::getInstance($worksheet->getParent());
-			$newDataValues = PHPExcel_Calculation::_unwrapResult(
+            $newDataValues = PHPExcel_Calculation::unwrapResult(
                 $calcEngine->_calculateFormulaValue(
-			        '='.$this->_dataSource,
-			        NULL,
+                    '='.$this->dataSource,
+                    null,
                     $worksheet->getCell('A1')
                 )
             );
             if ($flatten) {
-				$this->_dataValues = PHPExcel_Calculation_Functions::flattenArray($newDataValues);
-				foreach($this->_dataValues as &$dataValue) {
+                $this->dataValues = PHPExcel_Calculation_Functions::flattenArray($newDataValues);
+                foreach ($this->dataValues as &$dataValue) {
                     if ((!empty($dataValue)) && ($dataValue[0] == '#')) {
                         $dataValue = 0.0;
                     }
                 }
                 unset($dataValue);
             } else {
-				$cellRange = explode('!',$this->_dataSource);
+                $cellRange = explode('!', $this->dataSource);
                 if (count($cellRange) > 1) {
                     list(, $cellRange) = $cellRange;
                 }
 
                 $dimensions = PHPExcel_Cell::rangeDimension(str_replace('$', '', $cellRange));
                 if (($dimensions[0] == 1) || ($dimensions[1] == 1)) {
-					$this->_dataValues = PHPExcel_Calculation_Functions::flattenArray($newDataValues);
+                    $this->dataValues = PHPExcel_Calculation_Functions::flattenArray($newDataValues);
                 } else {
                     $newArray = array_values(array_shift($newDataValues));
                     foreach ($newArray as $i => $newDataSet) {
@@ -316,12 +324,10 @@ class PHPExcel_Chart_DataSeriesValues
                             array_unshift($newArray[$i++], $newDataVal);
                         }
                     }
-					$this->_dataValues = $newArray;
+                    $this->dataValues = $newArray;
                 }
             }
-			$this->_pointCount = count($this->_dataValues);
+            $this->pointCount = count($this->dataValues);
         }
-
     }
-
 }

Classes/PHPExcel/Chart/Exception.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * PHPExcel
+ * PHPExcel_Chart_Exception
  *
- * Copyright (c) 2006 - 2013 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,20 +21,12 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Chart
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-
-/**
- * PHPExcel_Chart_Exception
- *
- * @category   PHPExcel
- * @package    PHPExcel_Chart
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Chart_Exception extends PHPExcel_Exception {
+class PHPExcel_Chart_Exception extends PHPExcel_Exception
+{
     /**
      * Error handler callback
      *
@@ -43,7 +36,8 @@ class PHPExcel_Chart_Exception extends PHPExcel_Exception {
      * @param mixed $line
      * @param mixed $context
      */
-	public static function errorHandlerCallback($code, $string, $file, $line, $context) {
+    public static function errorHandlerCallback($code, $string, $file, $line, $context)
+    {
         $e = new self($string, $code);
         $e->line = $line;
         $e->file = $file;

Classes/PHPExcel/Chart/GridLines.php

@@ -0,0 +1,472 @@
+<?php
+
+/**
+ * Created by PhpStorm.
+ * User: Wiktor Trzonkowski
+ * Date: 7/2/14
+ * Time: 2:36 PM
+ */
+
+class PHPExcel_Chart_GridLines extends PHPExcel_Chart_Properties
+{
+
+  /**
+   * Properties of Class:
+   * Object State (State for Minor Tick Mark) @var bool
+   * Line Properties @var  array of mixed
+   * Shadow Properties @var  array of mixed
+   * Glow Properties @var  array of mixed
+   * Soft Properties @var  array of mixed
+   *
+   */
+
+    private $objectState = false;
+
+    private $lineProperties = array(
+        'color' => array(
+            'type' => self::EXCEL_COLOR_TYPE_STANDARD,
+            'value' => null,
+            'alpha' => 0
+        ),
+        'style' => array(
+            'width' => '9525',
+            'compound' => self::LINE_STYLE_COMPOUND_SIMPLE,
+            'dash' => self::LINE_STYLE_DASH_SOLID,
+            'cap' => self::LINE_STYLE_CAP_FLAT,
+            'join' => self::LINE_STYLE_JOIN_BEVEL,
+            'arrow' => array(
+                'head' => array(
+                    'type' => self::LINE_STYLE_ARROW_TYPE_NOARROW,
+                    'size' => self::LINE_STYLE_ARROW_SIZE_5
+                ),
+                'end' => array(
+                    'type' => self::LINE_STYLE_ARROW_TYPE_NOARROW,
+                    'size' => self::LINE_STYLE_ARROW_SIZE_8
+                ),
+            )
+        )
+    );
+
+    private $shadowProperties = array(
+        'presets' => self::SHADOW_PRESETS_NOSHADOW,
+        'effect' => null,
+        'color' => array(
+            'type' => self::EXCEL_COLOR_TYPE_STANDARD,
+            'value' => 'black',
+            'alpha' => 85,
+        ),
+        'size' => array(
+            'sx' => null,
+            'sy' => null,
+            'kx' => null
+        ),
+        'blur' => null,
+        'direction' => null,
+        'distance' => null,
+        'algn' => null,
+        'rotWithShape' => null
+    );
+
+    private $glowProperties = array(
+        'size' => null,
+        'color' => array(
+            'type' => self::EXCEL_COLOR_TYPE_STANDARD,
+            'value' => 'black',
+            'alpha' => 40
+        )
+    );
+
+    private $softEdges = array(
+        'size' => null
+     );
+
+    /**
+     * Get Object State
+     *
+     * @return bool
+     */
+
+    public function getObjectState()
+    {
+        return $this->objectState;
+    }
+
+    /**
+     * Change Object State to True
+     *
+     * @return PHPExcel_Chart_GridLines
+     */
+
+    private function activateObject()
+    {
+        $this->objectState = true;
+
+        return $this;
+    }
+
+    /**
+     * Set Line Color Properties
+     *
+     * @param string $value
+     * @param int $alpha
+     * @param string $type
+     */
+
+    public function setLineColorProperties($value, $alpha = 0, $type = self::EXCEL_COLOR_TYPE_STANDARD)
+    {
+        $this->activateObject()
+            ->lineProperties['color'] = $this->setColorProperties(
+                $value,
+                $alpha,
+                $type
+            );
+    }
+
+    /**
+     * Set Line Color Properties
+     *
+     * @param float $line_width
+     * @param string $compound_type
+     * @param string $dash_type
+     * @param string $cap_type
+     * @param string $join_type
+     * @param string $head_arrow_type
+     * @param string $head_arrow_size
+     * @param string $end_arrow_type
+     * @param string $end_arrow_size
+     */
+
+    public function setLineStyleProperties($line_width = null, $compound_type = null, $dash_type = null, $cap_type = null, $join_type = null, $head_arrow_type = null, $head_arrow_size = null, $end_arrow_type = null, $end_arrow_size = null)
+    {
+        $this->activateObject();
+        (!is_null($line_width))
+                ? $this->lineProperties['style']['width'] = $this->getExcelPointsWidth((float) $line_width)
+                : null;
+        (!is_null($compound_type))
+                ? $this->lineProperties['style']['compound'] = (string) $compound_type
+                : null;
+        (!is_null($dash_type))
+                ? $this->lineProperties['style']['dash'] = (string) $dash_type
+                : null;
+        (!is_null($cap_type))
+                ? $this->lineProperties['style']['cap'] = (string) $cap_type
+                : null;
+        (!is_null($join_type))
+                ? $this->lineProperties['style']['join'] = (string) $join_type
+                : null;
+        (!is_null($head_arrow_type))
+                ? $this->lineProperties['style']['arrow']['head']['type'] = (string) $head_arrow_type
+                : null;
+        (!is_null($head_arrow_size))
+                ? $this->lineProperties['style']['arrow']['head']['size'] = (string) $head_arrow_size
+                : null;
+        (!is_null($end_arrow_type))
+                ? $this->lineProperties['style']['arrow']['end']['type'] = (string) $end_arrow_type
+                : null;
+        (!is_null($end_arrow_size))
+                ? $this->lineProperties['style']['arrow']['end']['size'] = (string) $end_arrow_size
+                : null;
+    }
+
+    /**
+     * Get Line Color Property
+     *
+     * @param string $parameter
+     *
+     * @return string
+     */
+
+    public function getLineColorProperty($parameter)
+    {
+        return $this->lineProperties['color'][$parameter];
+    }
+
+    /**
+     * Get Line Style Property
+     *
+     * @param    array|string $elements
+     *
+     * @return string
+     */
+
+    public function getLineStyleProperty($elements)
+    {
+        return $this->getArrayElementsValue($this->lineProperties['style'], $elements);
+    }
+
+    /**
+     * Set Glow Properties
+     *
+     * @param    float $size
+     * @param    string $color_value
+     * @param    int $color_alpha
+     * @param    string $color_type
+     *
+     */
+
+    public function setGlowProperties($size, $color_value = null, $color_alpha = null, $color_type = null)
+    {
+        $this
+                ->activateObject()
+                ->setGlowSize($size)
+                ->setGlowColor($color_value, $color_alpha, $color_type);
+    }
+
+    /**
+     * Get Glow Color Property
+     *
+     * @param string $property
+     *
+     * @return string
+     */
+
+    public function getGlowColor($property)
+    {
+        return $this->glowProperties['color'][$property];
+    }
+
+    /**
+     * Get Glow Size
+     *
+     * @return string
+     */
+
+    public function getGlowSize()
+    {
+        return $this->glowProperties['size'];
+    }
+
+    /**
+     * Set Glow Size
+     *
+     * @param float $size
+     *
+     * @return PHPExcel_Chart_GridLines
+     */
+
+    private function setGlowSize($size)
+    {
+        $this->glowProperties['size'] = $this->getExcelPointsWidth((float) $size);
+
+        return $this;
+    }
+
+    /**
+     * Set Glow Color
+     *
+     * @param string $color
+     * @param int $alpha
+     * @param string $type
+     *
+     * @return PHPExcel_Chart_GridLines
+     */
+
+    private function setGlowColor($color, $alpha, $type)
+    {
+        if (!is_null($color)) {
+            $this->glowProperties['color']['value'] = (string) $color;
+        }
+        if (!is_null($alpha)) {
+            $this->glowProperties['color']['alpha'] = $this->getTrueAlpha((int) $alpha);
+        }
+        if (!is_null($type)) {
+            $this->glowProperties['color']['type'] = (string) $type;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get Line Style Arrow Parameters
+     *
+     * @param string $arrow_selector
+     * @param string $property_selector
+     *
+     * @return string
+     */
+
+    public function getLineStyleArrowParameters($arrow_selector, $property_selector)
+    {
+        return $this->getLineStyleArrowSize($this->lineProperties['style']['arrow'][$arrow_selector]['size'], $property_selector);
+    }
+
+    /**
+     * Set Shadow Properties
+     *
+     * @param int $sh_presets
+     * @param string $sh_color_value
+     * @param string $sh_color_type
+     * @param int $sh_color_alpha
+     * @param string $sh_blur
+     * @param int $sh_angle
+     * @param float $sh_distance
+     *
+     */
+
+    public function setShadowProperties($sh_presets, $sh_color_value = null, $sh_color_type = null, $sh_color_alpha = null, $sh_blur = null, $sh_angle = null, $sh_distance = null)
+    {
+        $this->activateObject()
+            ->setShadowPresetsProperties((int) $sh_presets)
+            ->setShadowColor(
+                is_null($sh_color_value) ? $this->shadowProperties['color']['value'] : $sh_color_value,
+                is_null($sh_color_alpha) ? (int) $this->shadowProperties['color']['alpha'] : $this->getTrueAlpha($sh_color_alpha),
+                is_null($sh_color_type) ? $this->shadowProperties['color']['type'] : $sh_color_type
+            )
+            ->setShadowBlur($sh_blur)
+            ->setShadowAngle($sh_angle)
+            ->setShadowDistance($sh_distance);
+    }
+
+    /**
+     * Set Shadow Presets Properties
+     *
+     * @param int $shadow_presets
+     *
+     * @return PHPExcel_Chart_GridLines
+     */
+
+    private function setShadowPresetsProperties($shadow_presets)
+    {
+        $this->shadowProperties['presets'] = $shadow_presets;
+        $this->setShadowProperiesMapValues($this->getShadowPresetsMap($shadow_presets));
+
+        return $this;
+    }
+
+    /**
+     * Set Shadow Properties Values
+     *
+     * @param array $properties_map
+     * @param * $reference
+     *
+     * @return PHPExcel_Chart_GridLines
+     */
+
+    private function setShadowProperiesMapValues(array $properties_map, &$reference = null)
+    {
+        $base_reference = $reference;
+        foreach ($properties_map as $property_key => $property_val) {
+            if (is_array($property_val)) {
+                if ($reference === null) {
+                    $reference = & $this->shadowProperties[$property_key];
+                } else {
+                    $reference = & $reference[$property_key];
+                }
+                $this->setShadowProperiesMapValues($property_val, $reference);
+            } else {
+                if ($base_reference === null) {
+                    $this->shadowProperties[$property_key] = $property_val;
+                } else {
+                    $reference[$property_key] = $property_val;
+                }
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set Shadow Color
+     *
+     * @param string $color
+     * @param int $alpha
+     * @param string $type
+     * @return PHPExcel_Chart_GridLines
+     */
+    private function setShadowColor($color, $alpha, $type)
+    {
+        if (!is_null($color)) {
+            $this->shadowProperties['color']['value'] = (string) $color;
+        }
+        if (!is_null($alpha)) {
+            $this->shadowProperties['color']['alpha'] = $this->getTrueAlpha((int) $alpha);
+        }
+        if (!is_null($type)) {
+            $this->shadowProperties['color']['type'] = (string) $type;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set Shadow Blur
+     *
+     * @param float $blur
+     *
+     * @return PHPExcel_Chart_GridLines
+     */
+    private function setShadowBlur($blur)
+    {
+        if ($blur !== null) {
+            $this->shadowProperties['blur'] = (string) $this->getExcelPointsWidth($blur);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set Shadow Angle
+     *
+     * @param int $angle
+     * @return PHPExcel_Chart_GridLines
+     */
+
+    private function setShadowAngle($angle)
+    {
+        if ($angle !== null) {
+            $this->shadowProperties['direction'] = (string) $this->getExcelPointsAngle($angle);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set Shadow Distance
+     *
+     * @param float $distance
+     * @return PHPExcel_Chart_GridLines
+     */
+    private function setShadowDistance($distance)
+    {
+        if ($distance !== null) {
+            $this->shadowProperties['distance'] = (string) $this->getExcelPointsWidth($distance);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get Shadow Property
+     *
+     * @param string $elements
+     * @param array $elements
+     * @return string
+     */
+    public function getShadowProperty($elements)
+    {
+        return $this->getArrayElementsValue($this->shadowProperties, $elements);
+    }
+
+    /**
+     * Set Soft Edges Size
+     *
+     * @param float $size
+     */
+    public function setSoftEdgesSize($size)
+    {
+        if (!is_null($size)) {
+            $this->activateObject();
+            $softEdges['size'] = (string) $this->getExcelPointsWidth($size);
+        }
+    }
+
+    /**
+     * Get Soft Edges Size
+     *
+     * @return string
+     */
+    public function getSoftEdgesSize()
+    {
+        return $this->softEdges['size'];
+    }
+}

Classes/PHPExcel/Chart/Layout.php

@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2013 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,7 +20,7 @@
  *
  * @category    PHPExcel
  * @package        PHPExcel_Chart
- * @copyright	Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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,7 +31,7 @@
  *
  * @category    PHPExcel
  * @package        PHPExcel_Chart
- * @copyright	Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright    Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Chart_Layout
 {
@@ -40,49 +40,49 @@ class PHPExcel_Chart_Layout
      *
      * @var string
      */
-	private $_layoutTarget = NULL;
+    private $layoutTarget;
 
     /**
      * X Mode
      *
      * @var string
      */
-	private $_xMode		= NULL;
+    private $xMode;
 
     /**
      * Y Mode
      *
      * @var string
      */
-	private $_yMode		= NULL;
+    private $yMode;
 
     /**
      * X-Position
      *
      * @var float
      */
-	private $_xPos		= NULL;
+    private $xPos;
 
     /**
      * Y-Position
      *
      * @var float
      */
-	private $_yPos		= NULL;
+    private $yPos;
 
     /**
      * width
      *
      * @var float
      */
-	private $_width		= NULL;
+    private $width;
 
     /**
      * height
      *
      * @var float
      */
-	private $_height	= NULL;
+    private $height;
 
     /**
      * show legend key
@@ -90,7 +90,7 @@ class PHPExcel_Chart_Layout
      *
      * @var boolean
      */
-	private $_showLegendKey	= NULL;
+    private $showLegendKey;
 
     /**
      * show value
@@ -98,7 +98,7 @@ class PHPExcel_Chart_Layout
      *
      * @var boolean
      */
-	private $_showVal	= NULL;
+    private $showVal;
 
     /**
      * show category name
@@ -106,7 +106,7 @@ class PHPExcel_Chart_Layout
      *
      * @var boolean
      */
-	private $_showCatName	= NULL;
+    private $showCatName;
 
     /**
      * show data series name
@@ -114,7 +114,7 @@ class PHPExcel_Chart_Layout
      *
      * @var boolean
      */
-	private $_showSerName	= NULL;
+    private $showSerName;
 
     /**
      * show percentage
@@ -122,14 +122,14 @@ class PHPExcel_Chart_Layout
      *
      * @var boolean
      */
-	private $_showPercent	= NULL;
+    private $showPercent;
 
     /**
      * show bubble size
      *
      * @var boolean
      */
-	private $_showBubbleSize	= NULL;
+    private $showBubbleSize;
 
     /**
      * show leader lines
@@ -137,7 +137,7 @@ class PHPExcel_Chart_Layout
      *
      * @var boolean
      */
-	private $_showLeaderLines	= NULL;
+    private $showLeaderLines;
 
 
     /**
@@ -145,13 +145,27 @@ class PHPExcel_Chart_Layout
      */
     public function __construct($layout = array())
     {
-		if (isset($layout['layoutTarget']))	{ $this->_layoutTarget	= $layout['layoutTarget'];	}
-		if (isset($layout['xMode']))		{ $this->_xMode			= $layout['xMode'];			}
-		if (isset($layout['yMode']))		{ $this->_yMode			= $layout['yMode'];			}
-		if (isset($layout['x']))			{ $this->_xPos			= (float) $layout['x'];		}
-		if (isset($layout['y']))			{ $this->_yPos			= (float) $layout['y'];		}
-		if (isset($layout['w']))			{ $this->_width			= (float) $layout['w'];		}
-		if (isset($layout['h']))			{ $this->_height		= (float) $layout['h'];		}
+        if (isset($layout['layoutTarget'])) {
+            $this->layoutTarget = $layout['layoutTarget'];
+        }
+        if (isset($layout['xMode'])) {
+            $this->xMode = $layout['xMode'];
+        }
+        if (isset($layout['yMode'])) {
+            $this->yMode = $layout['yMode'];
+        }
+        if (isset($layout['x'])) {
+            $this->xPos = (float) $layout['x'];
+        }
+        if (isset($layout['y'])) {
+            $this->yPos = (float) $layout['y'];
+        }
+        if (isset($layout['w'])) {
+            $this->width = (float) $layout['w'];
+        }
+        if (isset($layout['h'])) {
+            $this->height = (float) $layout['h'];
+        }
     }
 
     /**
@@ -159,17 +173,21 @@ class PHPExcel_Chart_Layout
      *
      * @return string
      */
-	public function getLayoutTarget() {
-		return $this->_layoutTarget;
+    public function getLayoutTarget()
+    {
+        return $this->layoutTarget;
     }
 
     /**
      * Set Layout Target
      *
      * @param Layout Target $value
+     * @return PHPExcel_Chart_Layout
      */
-	public function setLayoutTarget($value) {
-		$this->_layoutTarget = $value;
+    public function setLayoutTarget($value)
+    {
+        $this->layoutTarget = $value;
+        return $this;
     }
 
     /**
@@ -177,17 +195,21 @@ class PHPExcel_Chart_Layout
      *
      * @return string
      */
-	public function getXMode() {
-		return $this->_xMode;
+    public function getXMode()
+    {
+        return $this->xMode;
     }
 
     /**
      * Set X-Mode
      *
      * @param X-Mode $value
+     * @return PHPExcel_Chart_Layout
      */
-	public function setXMode($value) {
-		$this->_xMode = $value;
+    public function setXMode($value)
+    {
+        $this->xMode = $value;
+        return $this;
     }
 
     /**
@@ -195,17 +217,21 @@ class PHPExcel_Chart_Layout
      *
      * @return string
      */
-	public function getYMode() {
-		return $this->_xMode;
+    public function getYMode()
+    {
+        return $this->yMode;
     }
 
     /**
      * Set Y-Mode
      *
      * @param Y-Mode $value
+     * @return PHPExcel_Chart_Layout
      */
-	public function setYMode($value) {
-		$this->_xMode = $value;
+    public function setYMode($value)
+    {
+        $this->yMode = $value;
+        return $this;
     }
 
     /**
@@ -213,17 +239,21 @@ class PHPExcel_Chart_Layout
      *
      * @return number
      */
-	public function getXPosition() {
-		return $this->_xPos;
+    public function getXPosition()
+    {
+        return $this->xPos;
     }
 
     /**
      * Set X-Position
      *
      * @param X-Position $value
+     * @return PHPExcel_Chart_Layout
      */
-	public function setXPosition($value) {
-		$this->_xPos = $value;
+    public function setXPosition($value)
+    {
+        $this->xPos = $value;
+        return $this;
     }
 
     /**
@@ -231,17 +261,21 @@ class PHPExcel_Chart_Layout
      *
      * @return number
      */
-	public function getYPosition() {
-		return $this->_yPos;
+    public function getYPosition()
+    {
+        return $this->yPos;
     }
 
     /**
      * Set Y-Position
      *
      * @param Y-Position $value
+     * @return PHPExcel_Chart_Layout
      */
-	public function setYPosition($value) {
-		$this->_yPos = $value;
+    public function setYPosition($value)
+    {
+        $this->yPos = $value;
+        return $this;
     }
 
     /**
@@ -249,17 +283,21 @@ class PHPExcel_Chart_Layout
      *
      * @return number
      */
-	public function getWidth() {
-		return $this->_width;
+    public function getWidth()
+    {
+        return $this->width;
     }
 
     /**
      * Set Width
      *
      * @param Width $value
+     * @return PHPExcel_Chart_Layout
      */
-	public function setWidth($value) {
-		$this->_width = $value;
+    public function setWidth($value)
+    {
+        $this->width = $value;
+        return $this;
     }
 
     /**
@@ -267,17 +305,21 @@ class PHPExcel_Chart_Layout
      *
      * @return number
      */
-	public function getHeight() {
-		return $this->_height;
+    public function getHeight()
+    {
+        return $this->height;
     }
 
     /**
      * Set Height
      *
      * @param Height $value
+     * @return PHPExcel_Chart_Layout
      */
-	public function setHeight($value) {
-		$this->_height = $value;
+    public function setHeight($value)
+    {
+        $this->height = $value;
+        return $this;
     }
 
 
@@ -286,8 +328,9 @@ class PHPExcel_Chart_Layout
      *
      * @return boolean
      */
-	public function getShowLegendKey() {
-		return $this->_showLegendKey;
+    public function getShowLegendKey()
+    {
+        return $this->showLegendKey;
     }
 
     /**
@@ -295,9 +338,12 @@ class PHPExcel_Chart_Layout
      * Specifies that legend keys should be shown in data labels.
      *
      * @param boolean $value        Show legend key
+     * @return PHPExcel_Chart_Layout
      */
-	public function setShowLegendKey($value) {
-		$this->_showLegendKey = $value;
+    public function setShowLegendKey($value)
+    {
+        $this->showLegendKey = $value;
+        return $this;
     }
 
     /**
@@ -305,8 +351,9 @@ class PHPExcel_Chart_Layout
      *
      * @return boolean
      */
-	public function getShowVal() {
-		return $this->_showVal;
+    public function getShowVal()
+    {
+        return $this->showVal;
     }
 
     /**
@@ -314,9 +361,12 @@ class PHPExcel_Chart_Layout
      * Specifies that the value should be shown in data labels.
      *
      * @param boolean $value        Show val
+     * @return PHPExcel_Chart_Layout
      */
-	public function setShowVal($value) {
-		$this->_showVal = $value;
+    public function setShowVal($value)
+    {
+        $this->showVal = $value;
+        return $this;
     }
 
     /**
@@ -324,8 +374,9 @@ class PHPExcel_Chart_Layout
      *
      * @return boolean
      */
-	public function getShowCatName() {
-		return $this->_showCatName;
+    public function getShowCatName()
+    {
+        return $this->showCatName;
     }
 
     /**
@@ -333,9 +384,12 @@ class PHPExcel_Chart_Layout
      * Specifies that the category name should be shown in data labels.
      *
      * @param boolean $value        Show cat name
+     * @return PHPExcel_Chart_Layout
      */
-	public function setShowCatName($value) {
-		$this->_showCatName = $value;
+    public function setShowCatName($value)
+    {
+        $this->showCatName = $value;
+        return $this;
     }
 
     /**
@@ -343,18 +397,22 @@ class PHPExcel_Chart_Layout
      *
      * @return boolean
      */
-	public function getShowSerName() {
-		return $this->_showSerName;
+    public function getShowSerName()
+    {
+        return $this->showSerName;
     }
 
     /**
      * Set show ser name
      * Specifies that the series name should be shown in data labels.
      *
-	 * @param boolean $value		Show ser name
+     * @param boolean $value        Show series name
+     * @return PHPExcel_Chart_Layout
      */
-	public function setShowSerName($value) {
-		$this->_showSerName = $value;
+    public function setShowSerName($value)
+    {
+        $this->showSerName = $value;
+        return $this;
     }
 
     /**
@@ -362,8 +420,9 @@ class PHPExcel_Chart_Layout
      *
      * @return boolean
      */
-	public function getShowPercent() {
-		return $this->_showPercent;
+    public function getShowPercent()
+    {
+        return $this->showPercent;
     }
 
     /**
@@ -371,9 +430,12 @@ class PHPExcel_Chart_Layout
      * Specifies that the percentage should be shown in data labels.
      *
      * @param boolean $value        Show percentage
+     * @return PHPExcel_Chart_Layout
      */
-	public function setShowPercent($value) {
-		$this->_showPercent = $value;
+    public function setShowPercent($value)
+    {
+        $this->showPercent = $value;
+        return $this;
     }
 
     /**
@@ -381,8 +443,9 @@ class PHPExcel_Chart_Layout
      *
      * @return boolean
      */
-	public function getShowBubbleSize() {
-		return $this->_showBubbleSize;
+    public function getShowBubbleSize()
+    {
+        return $this->showBubbleSize;
     }
 
     /**
@@ -390,9 +453,12 @@ class PHPExcel_Chart_Layout
      * Specifies that the bubble size should be shown in data labels.
      *
      * @param boolean $value        Show bubble size
+     * @return PHPExcel_Chart_Layout
      */
-	public function setShowBubbleSize($value) {
-		$this->_showBubbleSize = $value;
+    public function setShowBubbleSize($value)
+    {
+        $this->showBubbleSize = $value;
+        return $this;
     }
 
     /**
@@ -400,8 +466,9 @@ class PHPExcel_Chart_Layout
      *
      * @return boolean
      */
-	public function getShowLeaderLines() {
-		return $this->_showLeaderLines;
+    public function getShowLeaderLines()
+    {
+        return $this->showLeaderLines;
     }
 
     /**
@@ -409,9 +476,11 @@ class PHPExcel_Chart_Layout
      * Specifies that leader lines should be shown in data labels.
      *
      * @param boolean $value        Show leader lines
+     * @return PHPExcel_Chart_Layout
      */
-	public function setShowLeaderLines($value) {
-		$this->_showLeaderLines = $value;
+    public function setShowLeaderLines($value)
+    {
+        $this->showLeaderLines = $value;
+        return $this;
     }
-
 }

Classes/PHPExcel/Chart/Legend.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * PHPExcel
+ * PHPExcel_Chart_Legend
  *
- * Copyright (c) 2006 - 2013 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,19 +21,10 @@
  *
  * @category    PHPExcel
  * @package        PHPExcel_Chart
- * @copyright	Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-
-/**
- * PHPExcel_Chart_Legend
- *
- * @category	PHPExcel
- * @package		PHPExcel_Chart
- * @copyright	Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
 class PHPExcel_Chart_Legend
 {
     /** Legend positions */
@@ -49,7 +41,8 @@ class PHPExcel_Chart_Legend
     const POSITION_TOP      = 't';
     const POSITION_TOPRIGHT = 'tr';
 
-	private static $_positionXLref = array( self::xlLegendPositionBottom	=> self::POSITION_BOTTOM,
+    private static $positionXLref = array(
+        self::xlLegendPositionBottom => self::POSITION_BOTTOM,
         self::xlLegendPositionCorner => self::POSITION_TOPRIGHT,
         self::xlLegendPositionCustom => '??',
         self::xlLegendPositionLeft   => self::POSITION_LEFT,
@@ -62,30 +55,30 @@ class PHPExcel_Chart_Legend
      *
      * @var    string
      */
-	private $_position = self::POSITION_RIGHT;
+    private $position = self::POSITION_RIGHT;
 
     /**
      * Allow overlay of other elements?
      *
      * @var    boolean
      */
-	private $_overlay = TRUE;
+    private $overlay = true;
 
     /**
      * Legend Layout
      *
      * @var    PHPExcel_Chart_Layout
      */
-	private $_layout = NULL;
+    private $layout = null;
 
 
     /**
      *    Create a new PHPExcel_Chart_Legend
      */
-	public function __construct($position = self::POSITION_RIGHT, PHPExcel_Chart_Layout $layout = NULL, $overlay = FALSE)
+    public function __construct($position = self::POSITION_RIGHT, PHPExcel_Chart_Layout $layout = null, $overlay = false)
     {
         $this->setPosition($position);
-		$this->_layout = $layout;
+        $this->layout = $layout;
         $this->setOverlay($overlay);
     }
 
@@ -94,8 +87,9 @@ class PHPExcel_Chart_Legend
      *
      * @return    string
      */
-	public function getPosition() {
-		return $this->_position;
+    public function getPosition()
+    {
+        return $this->position;
     }
 
     /**
@@ -103,12 +97,13 @@ class PHPExcel_Chart_Legend
      *
      * @param    string    $position
      */
-	public function setPosition($position = self::POSITION_RIGHT) {
-		if (!in_array($position,self::$_positionXLref)) {
+    public function setPosition($position = self::POSITION_RIGHT)
+    {
+        if (!in_array($position, self::$positionXLref)) {
             return false;
         }
 
-		$this->_position = $position;
+        $this->position = $position;
         return true;
     }
 
@@ -117,8 +112,9 @@ class PHPExcel_Chart_Legend
      *
      * @return    number
      */
-	public function getPositionXL() {
-		return array_search($this->_position,self::$_positionXLref);
+    public function getPositionXL()
+    {
+        return array_search($this->position, self::$positionXLref);
     }
 
     /**
@@ -126,12 +122,13 @@ class PHPExcel_Chart_Legend
      *
      * @param    number    $positionXL
      */
-	public function setPositionXL($positionXL = self::xlLegendPositionRight) {
-		if (!array_key_exists($positionXL,self::$_positionXLref)) {
+    public function setPositionXL($positionXL = self::xlLegendPositionRight)
+    {
+        if (!array_key_exists($positionXL, self::$positionXLref)) {
             return false;
         }
 
-		$this->_position = self::$_positionXLref[$positionXL];
+        $this->position = self::$positionXLref[$positionXL];
         return true;
     }
 
@@ -140,8 +137,9 @@ class PHPExcel_Chart_Legend
      *
      * @return    boolean
      */
-	public function getOverlay() {
-		return $this->_overlay;
+    public function getOverlay()
+    {
+        return $this->overlay;
     }
 
     /**
@@ -150,12 +148,13 @@ class PHPExcel_Chart_Legend
      * @param    boolean    $overlay
      * @return    boolean
      */
-	public function setOverlay($overlay = FALSE) {
+    public function setOverlay($overlay = false)
+    {
         if (!is_bool($overlay)) {
             return false;
         }
 
-		$this->_overlay = $overlay;
+        $this->overlay = $overlay;
         return true;
     }
 
@@ -164,8 +163,8 @@ class PHPExcel_Chart_Legend
      *
      * @return PHPExcel_Chart_Layout
      */
-	public function getLayout() {
-		return $this->_layout;
+    public function getLayout()
+    {
+        return $this->layout;
     }
-
 }

Classes/PHPExcel/Chart/PlotArea.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * PHPExcel
+ * PHPExcel_Chart_PlotArea
  *
- * Copyright (c) 2006 - 2013 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,19 +21,10 @@
  *
  * @category    PHPExcel
  * @package        PHPExcel_Chart
- * @copyright	Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-
-/**
- * PHPExcel_Chart_PlotArea
- *
- * @category	PHPExcel
- * @package		PHPExcel_Chart
- * @copyright	Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
 class PHPExcel_Chart_PlotArea
 {
     /**
@@ -40,22 +32,22 @@ class PHPExcel_Chart_PlotArea
      *
      * @var PHPExcel_Chart_Layout
      */
-	private $_layout = null;
+    private $layout = null;
 
     /**
      * Plot Series
      *
      * @var array of PHPExcel_Chart_DataSeries
      */
-	private $_plotSeries = array();
+    private $plotSeries = array();
 
     /**
      * Create a new PHPExcel_Chart_PlotArea
      */
     public function __construct(PHPExcel_Chart_Layout $layout = null, $plotSeries = array())
     {
-		$this->_layout = $layout;
-		$this->_plotSeries = $plotSeries;
+        $this->layout = $layout;
+        $this->plotSeries = $plotSeries;
     }
 
     /**
@@ -63,8 +55,9 @@ class PHPExcel_Chart_PlotArea
      *
      * @return PHPExcel_Chart_Layout
      */
-	public function getLayout() {
-		return $this->_layout;
+    public function getLayout()
+    {
+        return $this->layout;
     }
 
     /**
@@ -72,8 +65,9 @@ class PHPExcel_Chart_PlotArea
      *
      * @return array of PHPExcel_Chart_DataSeries
      */
-	public function getPlotGroupCount() {
-		return count($this->_plotSeries);
+    public function getPlotGroupCount()
+    {
+        return count($this->plotSeries);
     }
 
     /**
@@ -81,9 +75,10 @@ class PHPExcel_Chart_PlotArea
      *
      * @return integer
      */
-	public function getPlotSeriesCount() {
+    public function getPlotSeriesCount()
+    {
         $seriesCount = 0;
-		foreach($this->_plotSeries as $plot) {
+        foreach ($this->plotSeries as $plot) {
             $seriesCount += $plot->getPlotSeriesCount();
         }
         return $seriesCount;
@@ -94,8 +89,9 @@ class PHPExcel_Chart_PlotArea
      *
      * @return array of PHPExcel_Chart_DataSeries
      */
-	public function getPlotGroup() {
-		return $this->_plotSeries;
+    public function getPlotGroup()
+    {
+        return $this->plotSeries;
     }
 
     /**
@@ -103,23 +99,28 @@ class PHPExcel_Chart_PlotArea
      *
      * @return PHPExcel_Chart_DataSeries
      */
-	public function getPlotGroupByIndex($index) {
-		return $this->_plotSeries[$index];
+    public function getPlotGroupByIndex($index)
+    {
+        return $this->plotSeries[$index];
     }
 
     /**
      * Set Plot Series
      *
      * @param [PHPExcel_Chart_DataSeries]
+     * @return PHPExcel_Chart_PlotArea
      */
-	public function setPlotSeries($plotSeries = array()) {
-		$this->_plotSeries = $plotSeries;
+    public function setPlotSeries($plotSeries = array())
+    {
+        $this->plotSeries = $plotSeries;
+        
+        return $this;
     }
 
-	public function refresh(PHPExcel_Worksheet $worksheet) {
-	    foreach($this->_plotSeries as $plotSeries) {
+    public function refresh(PHPExcel_Worksheet $worksheet)
+    {
+        foreach ($this->plotSeries as $plotSeries) {
             $plotSeries->refresh($worksheet);
         }
     }
-
 }

Classes/PHPExcel/Chart/Properties.php

@@ -0,0 +1,363 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: nhw2h8s
+ * Date: 7/2/14
+ * Time: 5:45 PM
+ */
+
+abstract class PHPExcel_Chart_Properties
+{
+    const
+        EXCEL_COLOR_TYPE_STANDARD = 'prstClr',
+        EXCEL_COLOR_TYPE_SCHEME = 'schemeClr',
+        EXCEL_COLOR_TYPE_ARGB = 'srgbClr';
+
+    const
+        AXIS_LABELS_LOW = 'low',
+        AXIS_LABELS_HIGH = 'high',
+        AXIS_LABELS_NEXT_TO = 'nextTo',
+        AXIS_LABELS_NONE = 'none';
+
+    const
+        TICK_MARK_NONE = 'none',
+        TICK_MARK_INSIDE = 'in',
+        TICK_MARK_OUTSIDE = 'out',
+        TICK_MARK_CROSS = 'cross';
+
+    const
+        HORIZONTAL_CROSSES_AUTOZERO = 'autoZero',
+        HORIZONTAL_CROSSES_MAXIMUM = 'max';
+
+    const
+        FORMAT_CODE_GENERAL = 'General',
+        FORMAT_CODE_NUMBER = '#,##0.00',
+        FORMAT_CODE_CURRENCY = '$#,##0.00',
+        FORMAT_CODE_ACCOUNTING = '_($* #,##0.00_);_($* (#,##0.00);_($* "-"??_);_(@_)',
+        FORMAT_CODE_DATE = 'm/d/yyyy',
+        FORMAT_CODE_TIME = '[$-F400]h:mm:ss AM/PM',
+        FORMAT_CODE_PERCENTAGE = '0.00%',
+        FORMAT_CODE_FRACTION = '# ?/?',
+        FORMAT_CODE_SCIENTIFIC = '0.00E+00',
+        FORMAT_CODE_TEXT = '@',
+        FORMAT_CODE_SPECIAL = '00000';
+
+    const
+        ORIENTATION_NORMAL = 'minMax',
+        ORIENTATION_REVERSED = 'maxMin';
+
+    const
+        LINE_STYLE_COMPOUND_SIMPLE = 'sng',
+        LINE_STYLE_COMPOUND_DOUBLE = 'dbl',
+        LINE_STYLE_COMPOUND_THICKTHIN = 'thickThin',
+        LINE_STYLE_COMPOUND_THINTHICK = 'thinThick',
+        LINE_STYLE_COMPOUND_TRIPLE = 'tri',
+
+        LINE_STYLE_DASH_SOLID = 'solid',
+        LINE_STYLE_DASH_ROUND_DOT = 'sysDot',
+        LINE_STYLE_DASH_SQUERE_DOT = 'sysDash',
+        LINE_STYPE_DASH_DASH = 'dash',
+        LINE_STYLE_DASH_DASH_DOT = 'dashDot',
+        LINE_STYLE_DASH_LONG_DASH = 'lgDash',
+        LINE_STYLE_DASH_LONG_DASH_DOT = 'lgDashDot',
+        LINE_STYLE_DASH_LONG_DASH_DOT_DOT = 'lgDashDotDot',
+
+        LINE_STYLE_CAP_SQUARE = 'sq',
+        LINE_STYLE_CAP_ROUND = 'rnd',
+        LINE_STYLE_CAP_FLAT = 'flat',
+
+        LINE_STYLE_JOIN_ROUND = 'bevel',
+        LINE_STYLE_JOIN_MITER = 'miter',
+        LINE_STYLE_JOIN_BEVEL = 'bevel',
+
+        LINE_STYLE_ARROW_TYPE_NOARROW = null,
+        LINE_STYLE_ARROW_TYPE_ARROW = 'triangle',
+        LINE_STYLE_ARROW_TYPE_OPEN = 'arrow',
+        LINE_STYLE_ARROW_TYPE_STEALTH = 'stealth',
+        LINE_STYLE_ARROW_TYPE_DIAMOND = 'diamond',
+        LINE_STYLE_ARROW_TYPE_OVAL = 'oval',
+
+        LINE_STYLE_ARROW_SIZE_1 = 1,
+        LINE_STYLE_ARROW_SIZE_2 = 2,
+        LINE_STYLE_ARROW_SIZE_3 = 3,
+        LINE_STYLE_ARROW_SIZE_4 = 4,
+        LINE_STYLE_ARROW_SIZE_5 = 5,
+        LINE_STYLE_ARROW_SIZE_6 = 6,
+        LINE_STYLE_ARROW_SIZE_7 = 7,
+        LINE_STYLE_ARROW_SIZE_8 = 8,
+        LINE_STYLE_ARROW_SIZE_9 = 9;
+
+    const
+        SHADOW_PRESETS_NOSHADOW = null,
+        SHADOW_PRESETS_OUTER_BOTTTOM_RIGHT = 1,
+        SHADOW_PRESETS_OUTER_BOTTOM = 2,
+        SHADOW_PRESETS_OUTER_BOTTOM_LEFT = 3,
+        SHADOW_PRESETS_OUTER_RIGHT = 4,
+        SHADOW_PRESETS_OUTER_CENTER = 5,
+        SHADOW_PRESETS_OUTER_LEFT = 6,
+        SHADOW_PRESETS_OUTER_TOP_RIGHT = 7,
+        SHADOW_PRESETS_OUTER_TOP = 8,
+        SHADOW_PRESETS_OUTER_TOP_LEFT = 9,
+        SHADOW_PRESETS_INNER_BOTTTOM_RIGHT = 10,
+        SHADOW_PRESETS_INNER_BOTTOM = 11,
+        SHADOW_PRESETS_INNER_BOTTOM_LEFT = 12,
+        SHADOW_PRESETS_INNER_RIGHT = 13,
+        SHADOW_PRESETS_INNER_CENTER = 14,
+        SHADOW_PRESETS_INNER_LEFT = 15,
+        SHADOW_PRESETS_INNER_TOP_RIGHT = 16,
+        SHADOW_PRESETS_INNER_TOP = 17,
+        SHADOW_PRESETS_INNER_TOP_LEFT = 18,
+        SHADOW_PRESETS_PERSPECTIVE_BELOW = 19,
+        SHADOW_PRESETS_PERSPECTIVE_UPPER_RIGHT = 20,
+        SHADOW_PRESETS_PERSPECTIVE_UPPER_LEFT = 21,
+        SHADOW_PRESETS_PERSPECTIVE_LOWER_RIGHT = 22,
+        SHADOW_PRESETS_PERSPECTIVE_LOWER_LEFT = 23;
+
+    protected function getExcelPointsWidth($width)
+    {
+        return $width * 12700;
+    }
+
+    protected function getExcelPointsAngle($angle)
+    {
+        return $angle * 60000;
+    }
+
+    protected function getTrueAlpha($alpha)
+    {
+        return (string) 100 - $alpha . '000';
+    }
+
+    protected function setColorProperties($color, $alpha, $type)
+    {
+        return array(
+            'type' => (string) $type,
+            'value' => (string) $color,
+            'alpha' => (string) $this->getTrueAlpha($alpha)
+        );
+    }
+
+    protected function getLineStyleArrowSize($array_selector, $array_kay_selector)
+    {
+        $sizes = array(
+            1 => array('w' => 'sm', 'len' => 'sm'),
+            2 => array('w' => 'sm', 'len' => 'med'),
+            3 => array('w' => 'sm', 'len' => 'lg'),
+            4 => array('w' => 'med', 'len' => 'sm'),
+            5 => array('w' => 'med', 'len' => 'med'),
+            6 => array('w' => 'med', 'len' => 'lg'),
+            7 => array('w' => 'lg', 'len' => 'sm'),
+            8 => array('w' => 'lg', 'len' => 'med'),
+            9 => array('w' => 'lg', 'len' => 'lg')
+        );
+
+        return $sizes[$array_selector][$array_kay_selector];
+    }
+
+    protected function getShadowPresetsMap($shadow_presets_option)
+    {
+        $presets_options = array(
+            //OUTER
+            1 => array(
+                'effect' => 'outerShdw',
+                'blur' => '50800',
+                'distance' => '38100',
+                'direction' => '2700000',
+                'algn' => 'tl',
+                'rotWithShape' => '0'
+            ),
+            2 => array(
+                'effect' => 'outerShdw',
+                'blur' => '50800',
+                'distance' => '38100',
+                'direction' => '5400000',
+                'algn' => 't',
+                'rotWithShape' => '0'
+            ),
+            3 => array(
+                'effect' => 'outerShdw',
+                'blur' => '50800',
+                'distance' => '38100',
+                'direction' => '8100000',
+                'algn' => 'tr',
+                'rotWithShape' => '0'
+            ),
+            4 => array(
+                'effect' => 'outerShdw',
+                'blur' => '50800',
+                'distance' => '38100',
+                'algn' => 'l',
+                'rotWithShape' => '0'
+            ),
+            5 => array(
+                'effect' => 'outerShdw',
+                'size' => array(
+                    'sx' => '102000',
+                    'sy' => '102000'
+                )
+                ,
+                'blur' => '63500',
+                'distance' => '38100',
+                'algn' => 'ctr',
+                'rotWithShape' => '0'
+            ),
+            6 => array(
+                'effect' => 'outerShdw',
+                'blur' => '50800',
+                'distance' => '38100',
+                'direction' => '10800000',
+                'algn' => 'r',
+                'rotWithShape' => '0'
+            ),
+            7 => array(
+                'effect' => 'outerShdw',
+                'blur' => '50800',
+                'distance' => '38100',
+                'direction' => '18900000',
+                'algn' => 'bl',
+                'rotWithShape' => '0'
+            ),
+            8 => array(
+                'effect' => 'outerShdw',
+                'blur' => '50800',
+                'distance' => '38100',
+                'direction' => '16200000',
+                'rotWithShape' => '0'
+            ),
+            9 => array(
+                'effect' => 'outerShdw',
+                'blur' => '50800',
+                'distance' => '38100',
+                'direction' => '13500000',
+                'algn' => 'br',
+                'rotWithShape' => '0'
+            ),
+            //INNER
+            10 => array(
+                'effect' => 'innerShdw',
+                'blur' => '63500',
+                'distance' => '50800',
+                'direction' => '2700000',
+            ),
+            11 => array(
+                'effect' => 'innerShdw',
+                'blur' => '63500',
+                'distance' => '50800',
+                'direction' => '5400000',
+            ),
+            12 => array(
+                'effect' => 'innerShdw',
+                'blur' => '63500',
+                'distance' => '50800',
+                'direction' => '8100000',
+            ),
+            13 => array(
+                'effect' => 'innerShdw',
+                'blur' => '63500',
+                'distance' => '50800',
+            ),
+            14 => array(
+                'effect' => 'innerShdw',
+                'blur' => '114300',
+            ),
+            15 => array(
+                'effect' => 'innerShdw',
+                'blur' => '63500',
+                'distance' => '50800',
+                'direction' => '10800000',
+            ),
+            16 => array(
+                'effect' => 'innerShdw',
+                'blur' => '63500',
+                'distance' => '50800',
+                'direction' => '18900000',
+            ),
+            17 => array(
+                'effect' => 'innerShdw',
+                'blur' => '63500',
+                'distance' => '50800',
+                'direction' => '16200000',
+            ),
+            18 => array(
+                'effect' => 'innerShdw',
+                'blur' => '63500',
+                'distance' => '50800',
+                'direction' => '13500000',
+            ),
+            //perspective
+            19 => array(
+                'effect' => 'outerShdw',
+                'blur' => '152400',
+                'distance' => '317500',
+                'size' => array(
+                    'sx' => '90000',
+                    'sy' => '-19000',
+                ),
+                'direction' => '5400000',
+                'rotWithShape' => '0',
+            ),
+            20 => array(
+                'effect' => 'outerShdw',
+                'blur' => '76200',
+                'direction' => '18900000',
+                'size' => array(
+                    'sy' => '23000',
+                    'kx' => '-1200000',
+                ),
+                'algn' => 'bl',
+                'rotWithShape' => '0',
+            ),
+            21 => array(
+                'effect' => 'outerShdw',
+                'blur' => '76200',
+                'direction' => '13500000',
+                'size' => array(
+                    'sy' => '23000',
+                    'kx' => '1200000',
+                ),
+                'algn' => 'br',
+                'rotWithShape' => '0',
+            ),
+            22 => array(
+                'effect' => 'outerShdw',
+                'blur' => '76200',
+                'distance' => '12700',
+                'direction' => '2700000',
+                'size' => array(
+                    'sy' => '-23000',
+                    'kx' => '-800400',
+                ),
+                'algn' => 'bl',
+                'rotWithShape' => '0',
+            ),
+            23 => array(
+                'effect' => 'outerShdw',
+                'blur' => '76200',
+                'distance' => '12700',
+                'direction' => '8100000',
+                'size' => array(
+                    'sy' => '-23000',
+                    'kx' => '800400',
+                ),
+                'algn' => 'br',
+                'rotWithShape' => '0',
+            ),
+        );
+
+        return $presets_options[$shadow_presets_option];
+    }
+
+    protected function getArrayElementsValue($properties, $elements)
+    {
+        $reference = & $properties;
+        if (!is_array($elements)) {
+            return $reference[$elements];
+        } else {
+            foreach ($elements as $keys) {
+                $reference = & $reference[$keys];
+            }
+            return $reference;
+        }
+        return $this;
+    }
+}

Classes/PHPExcel/Chart/Renderer/PHP Charting Libraries.txt

@@ -15,3 +15,6 @@ pChart
 
 TeeChart
 	http://www.steema.com/products/teechart/overview.html
+
+PHPGraphLib
+    http://www.ebrueggeman.com/phpgraphlib

Classes/PHPExcel/Chart/Title.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * PHPExcel
+ * PHPExcel_Chart_Title
  *
- * Copyright (c) 2006 - 2013 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,19 +21,10 @@
  *
  * @category    PHPExcel
  * @package        PHPExcel_Chart
- * @copyright	Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-
-/**
- * PHPExcel_Chart_Title
- *
- * @category	PHPExcel
- * @package		PHPExcel_Chart
- * @copyright	Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
 class PHPExcel_Chart_Title
 {
 
@@ -41,22 +33,22 @@ class PHPExcel_Chart_Title
      *
      * @var string
      */
-	private $_caption = null;
+    private $caption = null;
 
     /**
      * Title Layout
      *
      * @var PHPExcel_Chart_Layout
      */
-	private $_layout = null;
+    private $layout = null;
 
     /**
      * Create a new PHPExcel_Chart_Title
      */
     public function __construct($caption = null, PHPExcel_Chart_Layout $layout = null)
     {
-		$this->_caption = $caption;
-		$this->_layout = $layout;
+        $this->caption = $caption;
+        $this->layout = $layout;
     }
 
     /**
@@ -64,17 +56,22 @@ class PHPExcel_Chart_Title
      *
      * @return string
      */
-	public function getCaption() {
-		return $this->_caption;
+    public function getCaption()
+    {
+        return $this->caption;
     }
 
     /**
      * Set caption
      *
      * @param string $caption
+     * @return PHPExcel_Chart_Title
      */
-	public function setCaption($caption = null) {
-		$this->_caption = $caption;
+    public function setCaption($caption = null)
+    {
+        $this->caption = $caption;
+        
+        return $this;
     }
 
     /**
@@ -82,8 +79,8 @@ class PHPExcel_Chart_Title
      *
      * @return PHPExcel_Chart_Layout
      */
-	public function getLayout() {
-		return $this->_layout;
+    public function getLayout()
+    {
+        return $this->layout;
     }
-
 }

Classes/PHPExcel/Comment.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * PHPExcel
+ * PHPExcel_Comment
  *
- * Copyright (c) 2006 - 2013 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,19 +21,10 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-
-/**
- * PHPExcel_Comment
- *
- * @category   PHPExcel
- * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
 class PHPExcel_Comment implements PHPExcel_IComparable
 {
     /**
@@ -40,63 +32,63 @@ class PHPExcel_Comment implements PHPExcel_IComparable
      *
      * @var string
      */
-    private $_author;
+    private $author;
 
     /**
      * Rich text comment
      *
      * @var PHPExcel_RichText
      */
-    private $_text;
+    private $text;
 
     /**
      * Comment width (CSS style, i.e. XXpx or YYpt)
      *
      * @var string
      */
-    private $_width = '96pt';
+    private $width = '96pt';
 
     /**
      * Left margin (CSS style, i.e. XXpx or YYpt)
      *
      * @var string
      */
-    private $_marginLeft = '59.25pt';
+    private $marginLeft = '59.25pt';
 
     /**
      * Top margin (CSS style, i.e. XXpx or YYpt)
      *
      * @var string
      */
-    private $_marginTop = '1.5pt';
+    private $marginTop = '1.5pt';
 
     /**
      * Visible
      *
      * @var boolean
      */
-    private $_visible = false;
+    private $visible = false;
 
     /**
      * Comment height (CSS style, i.e. XXpx or YYpt)
      *
      * @var string
      */
-    private $_height = '55.5pt';
+    private $height = '55.5pt';
 
     /**
      * Comment fill color
      *
      * @var PHPExcel_Style_Color
      */
-    private $_fillColor;
+    private $fillColor;
 
     /**
      * Alignment
      *
      * @var string
      */
-    private $_alignment;
+    private $alignment;
 
     /**
      * Create a new PHPExcel_Comment
@@ -106,10 +98,10 @@ class PHPExcel_Comment implements PHPExcel_IComparable
     public function __construct()
     {
         // Initialise variables
-        $this->_author		= 'Author';
-        $this->_text		= new PHPExcel_RichText();
-        $this->_fillColor	= new PHPExcel_Style_Color('FFFFFFE1');
-        $this->_alignment	= PHPExcel_Style_Alignment::HORIZONTAL_GENERAL;
+        $this->author    = 'Author';
+        $this->text      = new PHPExcel_RichText();
+        $this->fillColor = new PHPExcel_Style_Color('FFFFFFE1');
+        $this->alignment = PHPExcel_Style_Alignment::HORIZONTAL_GENERAL;
     }
 
     /**
@@ -117,8 +109,9 @@ class PHPExcel_Comment implements PHPExcel_IComparable
      *
      * @return string
      */
-    public function getAuthor() {
-        return $this->_author;
+    public function getAuthor()
+    {
+        return $this->author;
     }
 
     /**
@@ -127,8 +120,9 @@ class PHPExcel_Comment implements PHPExcel_IComparable
      * @param string $pValue
      * @return PHPExcel_Comment
      */
-    public function setAuthor($pValue = '') {
-        $this->_author = $pValue;
+    public function setAuthor($pValue = '')
+    {
+        $this->author = $pValue;
         return $this;
     }
 
@@ -137,8 +131,9 @@ class PHPExcel_Comment implements PHPExcel_IComparable
      *
      * @return PHPExcel_RichText
      */
-    public function getText() {
-        return $this->_text;
+    public function getText()
+    {
+        return $this->text;
     }
 
     /**
@@ -147,8 +142,9 @@ class PHPExcel_Comment implements PHPExcel_IComparable
      * @param PHPExcel_RichText $pValue
      * @return PHPExcel_Comment
      */
-    public function setText(PHPExcel_RichText $pValue) {
-        $this->_text = $pValue;
+    public function setText(PHPExcel_RichText $pValue)
+    {
+        $this->text = $pValue;
         return $this;
     }
 
@@ -157,8 +153,9 @@ class PHPExcel_Comment implements PHPExcel_IComparable
      *
      * @return string
      */
-    public function getWidth() {
-        return $this->_width;
+    public function getWidth()
+    {
+        return $this->width;
     }
 
     /**
@@ -167,8 +164,9 @@ class PHPExcel_Comment implements PHPExcel_IComparable
      * @param string $value
      * @return PHPExcel_Comment
      */
-    public function setWidth($value = '96pt') {
-        $this->_width = $value;
+    public function setWidth($value = '96pt')
+    {
+        $this->width = $value;
         return $this;
     }
 
@@ -177,8 +175,9 @@ class PHPExcel_Comment implements PHPExcel_IComparable
      *
      * @return string
      */
-    public function getHeight() {
-        return $this->_height;
+    public function getHeight()
+    {
+        return $this->height;
     }
 
     /**
@@ -187,8 +186,9 @@ class PHPExcel_Comment implements PHPExcel_IComparable
      * @param string $value
      * @return PHPExcel_Comment
      */
-    public function setHeight($value = '55.5pt') {
-        $this->_height = $value;
+    public function setHeight($value = '55.5pt')
+    {
+        $this->height = $value;
         return $this;
     }
 
@@ -197,8 +197,9 @@ class PHPExcel_Comment implements PHPExcel_IComparable
      *
      * @return string
      */
-    public function getMarginLeft() {
-        return $this->_marginLeft;
+    public function getMarginLeft()
+    {
+        return $this->marginLeft;
     }
 
     /**
@@ -207,8 +208,9 @@ class PHPExcel_Comment implements PHPExcel_IComparable
      * @param string $value
      * @return PHPExcel_Comment
      */
-    public function setMarginLeft($value = '59.25pt') {
-        $this->_marginLeft = $value;
+    public function setMarginLeft($value = '59.25pt')
+    {
+        $this->marginLeft = $value;
         return $this;
     }
 
@@ -217,8 +219,9 @@ class PHPExcel_Comment implements PHPExcel_IComparable
      *
      * @return string
      */
-    public function getMarginTop() {
-        return $this->_marginTop;
+    public function getMarginTop()
+    {
+        return $this->marginTop;
     }
 
     /**
@@ -227,8 +230,9 @@ class PHPExcel_Comment implements PHPExcel_IComparable
      * @param string $value
      * @return PHPExcel_Comment
      */
-    public function setMarginTop($value = '1.5pt') {
-        $this->_marginTop = $value;
+    public function setMarginTop($value = '1.5pt')
+    {
+        $this->marginTop = $value;
         return $this;
     }
 
@@ -237,8 +241,9 @@ class PHPExcel_Comment implements PHPExcel_IComparable
      *
      * @return boolean
      */
-    public function getVisible() {
-        return $this->_visible;
+    public function getVisible()
+    {
+        return $this->visible;
     }
 
     /**
@@ -247,8 +252,9 @@ class PHPExcel_Comment implements PHPExcel_IComparable
      * @param boolean $value
      * @return PHPExcel_Comment
      */
-    public function setVisible($value = false) {
-        $this->_visible = $value;
+    public function setVisible($value = false)
+    {
+        $this->visible = $value;
         return $this;
     }
 
@@ -257,8 +263,9 @@ class PHPExcel_Comment implements PHPExcel_IComparable
      *
      * @return PHPExcel_Style_Color
      */
-    public function getFillColor() {
-        return $this->_fillColor;
+    public function getFillColor()
+    {
+        return $this->fillColor;
     }
 
     /**
@@ -267,8 +274,9 @@ class PHPExcel_Comment implements PHPExcel_IComparable
      * @param string $pValue
      * @return PHPExcel_Comment
      */
-    public function setAlignment($pValue = PHPExcel_Style_Alignment::HORIZONTAL_GENERAL) {
-        $this->_alignment = $pValue;
+    public function setAlignment($pValue = PHPExcel_Style_Alignment::HORIZONTAL_GENERAL)
+    {
+        $this->alignment = $pValue;
         return $this;
     }
 
@@ -277,8 +285,9 @@ class PHPExcel_Comment implements PHPExcel_IComparable
      *
      * @return string
      */
-    public function getAlignment() {
-        return $this->_alignment;
+    public function getAlignment()
+    {
+        return $this->alignment;
     }
 
     /**
@@ -286,25 +295,27 @@ class PHPExcel_Comment implements PHPExcel_IComparable
      *
      * @return string    Hash code
      */
-    public function getHashCode() {
+    public function getHashCode()
+    {
         return md5(
-              $this->_author
-            . $this->_text->getHashCode()
-            . $this->_width
-            . $this->_height
-            . $this->_marginLeft
-            . $this->_marginTop
-            . ($this->_visible ? 1 : 0)
-            . $this->_fillColor->getHashCode()
-            . $this->_alignment
-            . __CLASS__
+            $this->author .
+            $this->text->getHashCode() .
+            $this->width .
+            $this->height .
+            $this->marginLeft .
+            $this->marginTop .
+            ($this->visible ? 1 : 0) .
+            $this->fillColor->getHashCode() .
+            $this->alignment .
+            __CLASS__
         );
     }
 
     /**
      * Implement PHP __clone to create a deep clone, not just a shallow copy.
      */
-    public function __clone() {
+    public function __clone()
+    {
         $vars = get_object_vars($this);
         foreach ($vars as $key => $value) {
             if (is_object($value)) {
@@ -320,8 +331,8 @@ class PHPExcel_Comment implements PHPExcel_IComparable
      *
      * @return string
      */
-    public function __toString() {
-        return $this->_text->getPlainText();
+    public function __toString()
+    {
+        return $this->text->getPlainText();
     }
-
 }

Classes/PHPExcel/DocumentProperties.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * PHPExcel
+ * PHPExcel_DocumentProperties
  *
- * Copyright (c) 2006 - 2013 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,19 +21,10 @@
  *
  * @category    PHPExcel
  * @package    PHPExcel
- * @copyright    Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-
-/**
- * PHPExcel_DocumentProperties
- *
- * @category    PHPExcel
- * @package        PHPExcel
- * @copyright    Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
 class PHPExcel_DocumentProperties
 {
     /** constants */
@@ -48,84 +40,84 @@ class PHPExcel_DocumentProperties
      *
      * @var string
      */
-    private $_creator    = 'Unknown Creator';
+    private $creator = 'Unknown Creator';
 
     /**
      * LastModifiedBy
      *
      * @var string
      */
-    private $_lastModifiedBy;
+    private $lastModifiedBy;
 
     /**
      * Created
      *
      * @var datetime
      */
-    private $_created;
+    private $created;
 
     /**
      * Modified
      *
      * @var datetime
      */
-    private $_modified;
+    private $modified;
 
     /**
      * Title
      *
      * @var string
      */
-    private $_title            = 'Untitled Spreadsheet';
+    private $title = 'Untitled Spreadsheet';
 
     /**
      * Description
      *
      * @var string
      */
-    private $_description    = '';
+    private $description = '';
 
     /**
      * Subject
      *
      * @var string
      */
-    private $_subject        = '';
+    private $subject = '';
 
     /**
      * Keywords
      *
      * @var string
      */
-    private $_keywords        = '';
+    private $keywords = '';
 
     /**
      * Category
      *
      * @var string
      */
-    private $_category        = '';
+    private $category = '';
 
     /**
      * Manager
      *
      * @var string
      */
-    private $_manager        = '';
+    private $manager = '';
 
     /**
      * Company
      *
      * @var string
      */
-    private $_company        = 'Microsoft Corporation';
+    private $company = 'Microsoft Corporation';
 
     /**
      * Custom Properties
      *
      * @var string
      */
-    private $_customProperties    = array();
+    private $customProperties = array();
 
 
     /**
@@ -134,9 +126,9 @@ class PHPExcel_DocumentProperties
     public function __construct()
     {
         // Initialise values
-        $this->_lastModifiedBy    = $this->_creator;
-        $this->_created        = time();
-        $this->_modified    = time();
+        $this->lastModifiedBy = $this->creator;
+        $this->created  = time();
+        $this->modified = time();
     }
 
     /**
@@ -144,8 +136,9 @@ class PHPExcel_DocumentProperties
      *
      * @return string
      */
-    public function getCreator() {
-        return $this->_creator;
+    public function getCreator()
+    {
+        return $this->creator;
     }
 
     /**
@@ -154,8 +147,9 @@ class PHPExcel_DocumentProperties
      * @param string $pValue
      * @return PHPExcel_DocumentProperties
      */
-    public function setCreator($pValue = '') {
-        $this->_creator = $pValue;
+    public function setCreator($pValue = '')
+    {
+        $this->creator = $pValue;
         return $this;
     }
 
@@ -164,8 +158,9 @@ class PHPExcel_DocumentProperties
      *
      * @return string
      */
-    public function getLastModifiedBy() {
-        return $this->_lastModifiedBy;
+    public function getLastModifiedBy()
+    {
+        return $this->lastModifiedBy;
     }
 
     /**
@@ -174,8 +169,9 @@ class PHPExcel_DocumentProperties
      * @param string $pValue
      * @return PHPExcel_DocumentProperties
      */
-    public function setLastModifiedBy($pValue = '') {
-        $this->_lastModifiedBy = $pValue;
+    public function setLastModifiedBy($pValue = '')
+    {
+        $this->lastModifiedBy = $pValue;
         return $this;
     }
 
@@ -184,8 +180,9 @@ class PHPExcel_DocumentProperties
      *
      * @return datetime
      */
-    public function getCreated() {
-        return $this->_created;
+    public function getCreated()
+    {
+        return $this->created;
     }
 
     /**
@@ -194,8 +191,9 @@ class PHPExcel_DocumentProperties
      * @param datetime $pValue
      * @return PHPExcel_DocumentProperties
      */
-    public function setCreated($pValue = null) {
-        if ($pValue === NULL) {
+    public function setCreated($pValue = null)
+    {
+        if ($pValue === null) {
             $pValue = time();
         } elseif (is_string($pValue)) {
             if (is_numeric($pValue)) {
@@ -205,7 +203,7 @@ class PHPExcel_DocumentProperties
             }
         }
 
-        $this->_created = $pValue;
+        $this->created = $pValue;
         return $this;
     }
 
@@ -214,8 +212,9 @@ class PHPExcel_DocumentProperties
      *
      * @return datetime
      */
-    public function getModified() {
-        return $this->_modified;
+    public function getModified()
+    {
+        return $this->modified;
     }
 
     /**
@@ -224,8 +223,9 @@ class PHPExcel_DocumentProperties
      * @param datetime $pValue
      * @return PHPExcel_DocumentProperties
      */
-    public function setModified($pValue = null) {
-        if ($pValue === NULL) {
+    public function setModified($pValue = null)
+    {
+        if ($pValue === null) {
             $pValue = time();
         } elseif (is_string($pValue)) {
             if (is_numeric($pValue)) {
@@ -235,7 +235,7 @@ class PHPExcel_DocumentProperties
             }
         }
 
-        $this->_modified = $pValue;
+        $this->modified = $pValue;
         return $this;
     }
 
@@ -244,8 +244,9 @@ class PHPExcel_DocumentProperties
      *
      * @return string
      */
-    public function getTitle() {
-        return $this->_title;
+    public function getTitle()
+    {
+        return $this->title;
     }
 
     /**
@@ -254,8 +255,9 @@ class PHPExcel_DocumentProperties
      * @param string $pValue
      * @return PHPExcel_DocumentProperties
      */
-    public function setTitle($pValue = '') {
-        $this->_title = $pValue;
+    public function setTitle($pValue = '')
+    {
+        $this->title = $pValue;
         return $this;
     }
 
@@ -264,8 +266,9 @@ class PHPExcel_DocumentProperties
      *
      * @return string
      */
-    public function getDescription() {
-        return $this->_description;
+    public function getDescription()
+    {
+        return $this->description;
     }
 
     /**
@@ -274,8 +277,9 @@ class PHPExcel_DocumentProperties
      * @param string $pValue
      * @return PHPExcel_DocumentProperties
      */
-    public function setDescription($pValue = '') {
-        $this->_description = $pValue;
+    public function setDescription($pValue = '')
+    {
+        $this->description = $pValue;
         return $this;
     }
 
@@ -284,8 +288,9 @@ class PHPExcel_DocumentProperties
      *
      * @return string
      */
-    public function getSubject() {
-        return $this->_subject;
+    public function getSubject()
+    {
+        return $this->subject;
     }
 
     /**
@@ -294,8 +299,9 @@ class PHPExcel_DocumentProperties
      * @param string $pValue
      * @return PHPExcel_DocumentProperties
      */
-    public function setSubject($pValue = '') {
-        $this->_subject = $pValue;
+    public function setSubject($pValue = '')
+    {
+        $this->subject = $pValue;
         return $this;
     }
 
@@ -304,8 +310,9 @@ class PHPExcel_DocumentProperties
      *
      * @return string
      */
-    public function getKeywords() {
-        return $this->_keywords;
+    public function getKeywords()
+    {
+        return $this->keywords;
     }
 
     /**
@@ -314,8 +321,9 @@ class PHPExcel_DocumentProperties
      * @param string $pValue
      * @return PHPExcel_DocumentProperties
      */
-    public function setKeywords($pValue = '') {
-        $this->_keywords = $pValue;
+    public function setKeywords($pValue = '')
+    {
+        $this->keywords = $pValue;
         return $this;
     }
 
@@ -324,8 +332,9 @@ class PHPExcel_DocumentProperties
      *
      * @return string
      */
-    public function getCategory() {
-        return $this->_category;
+    public function getCategory()
+    {
+        return $this->category;
     }
 
     /**
@@ -334,8 +343,9 @@ class PHPExcel_DocumentProperties
      * @param string $pValue
      * @return PHPExcel_DocumentProperties
      */
-    public function setCategory($pValue = '') {
-        $this->_category = $pValue;
+    public function setCategory($pValue = '')
+    {
+        $this->category = $pValue;
         return $this;
     }
 
@@ -344,8 +354,9 @@ class PHPExcel_DocumentProperties
      *
      * @return string
      */
-    public function getCompany() {
-        return $this->_company;
+    public function getCompany()
+    {
+        return $this->company;
     }
 
     /**
@@ -354,8 +365,9 @@ class PHPExcel_DocumentProperties
      * @param string $pValue
      * @return PHPExcel_DocumentProperties
      */
-    public function setCompany($pValue = '') {
-        $this->_company = $pValue;
+    public function setCompany($pValue = '')
+    {
+        $this->company = $pValue;
         return $this;
     }
 
@@ -364,8 +376,9 @@ class PHPExcel_DocumentProperties
      *
      * @return string
      */
-    public function getManager() {
-        return $this->_manager;
+    public function getManager()
+    {
+        return $this->manager;
     }
 
     /**
@@ -374,8 +387,9 @@ class PHPExcel_DocumentProperties
      * @param string $pValue
      * @return PHPExcel_DocumentProperties
      */
-    public function setManager($pValue = '') {
-        $this->_manager = $pValue;
+    public function setManager($pValue = '')
+    {
+        $this->manager = $pValue;
         return $this;
     }
 
@@ -384,8 +398,9 @@ class PHPExcel_DocumentProperties
      *
      * @return array of string
      */
-    public function getCustomProperties() {
-        return array_keys($this->_customProperties);
+    public function getCustomProperties()
+    {
+        return array_keys($this->customProperties);
     }
 
     /**
@@ -394,8 +409,9 @@ class PHPExcel_DocumentProperties
      * @param string $propertyName
      * @return boolean
      */
-    public function isCustomPropertySet($propertyName) {
-        return isset($this->_customProperties[$propertyName]);
+    public function isCustomPropertySet($propertyName)
+    {
+        return isset($this->customProperties[$propertyName]);
     }
 
     /**
@@ -404,9 +420,10 @@ class PHPExcel_DocumentProperties
      * @param string $propertyName
      * @return string
      */
-    public function getCustomPropertyValue($propertyName) {
-        if (isset($this->_customProperties[$propertyName])) {
-            return $this->_customProperties[$propertyName]['value'];
+    public function getCustomPropertyValue($propertyName)
+    {
+        if (isset($this->customProperties[$propertyName])) {
+            return $this->customProperties[$propertyName]['value'];
         }
 
     }
@@ -417,9 +434,10 @@ class PHPExcel_DocumentProperties
      * @param string $propertyName
      * @return string
      */
-    public function getCustomPropertyType($propertyName) {
-        if (isset($this->_customProperties[$propertyName])) {
-            return $this->_customProperties[$propertyName]['type'];
+    public function getCustomPropertyType($propertyName)
+    {
+        if (isset($this->customProperties[$propertyName])) {
+            return $this->customProperties[$propertyName]['type'];
         }
 
     }
@@ -437,13 +455,14 @@ class PHPExcel_DocumentProperties
      *   'b' : Boolean
      * @return PHPExcel_DocumentProperties
      */
-    public function setCustomProperty($propertyName,$propertyValue='',$propertyType=NULL) {
-        if (($propertyType === NULL) || (!in_array($propertyType,array(self::PROPERTY_TYPE_INTEGER,
+    public function setCustomProperty($propertyName, $propertyValue = '', $propertyType = null)
+    {
+        if (($propertyType === null) || (!in_array($propertyType, array(self::PROPERTY_TYPE_INTEGER,
                                                                         self::PROPERTY_TYPE_FLOAT,
                                                                         self::PROPERTY_TYPE_STRING,
                                                                         self::PROPERTY_TYPE_DATE,
                                                                         self::PROPERTY_TYPE_BOOLEAN)))) {
-            if ($propertyValue === NULL) {
+            if ($propertyValue === null) {
                 $propertyType = self::PROPERTY_TYPE_STRING;
             } elseif (is_float($propertyValue)) {
                 $propertyType = self::PROPERTY_TYPE_FLOAT;
@@ -456,14 +475,18 @@ class PHPExcel_DocumentProperties
             }
         }
 
-        $this->_customProperties[$propertyName] = array('value' => $propertyValue, 'type' => $propertyType);
+        $this->customProperties[$propertyName] = array(
+            'value' => $propertyValue,
+            'type' => $propertyType
+        );
         return $this;
     }
 
     /**
      * Implement PHP __clone to create a deep clone, not just a shallow copy.
      */
-    public function __clone() {
+    public function __clone()
+    {
         $vars = get_object_vars($this);
         foreach ($vars as $key => $value) {
             if (is_object($value)) {
@@ -474,13 +497,14 @@ class PHPExcel_DocumentProperties
         }
     }
 
-    public static function convertProperty($propertyValue,$propertyType) {
+    public static function convertProperty($propertyValue, $propertyType)
+    {
         switch ($propertyType) {
             case 'empty':     //    Empty
                 return '';
                 break;
             case 'null':      //    Null
-                return NULL;
+                return null;
                 break;
             case 'i1':        //    1-Byte Signed Integer
             case 'i2':        //    2-Byte Signed Integer
@@ -511,7 +535,7 @@ class PHPExcel_DocumentProperties
                 return strtotime($propertyValue);
                 break;
             case 'bool':     //    Boolean
-                return ($propertyValue == 'true') ? True : False;
+                return ($propertyValue == 'true') ? true : false;
                 break;
             case 'cy':       //    Currency
             case 'error':    //    Error Status Code
@@ -532,7 +556,8 @@ class PHPExcel_DocumentProperties
         return $propertyValue;
     }
 
-    public static function convertPropertyType($propertyType) {
+    public static function convertPropertyType($propertyType)
+    {
         switch ($propertyType) {
             case 'i1':       //    1-Byte Signed Integer
             case 'i2':       //    2-Byte Signed Integer
@@ -583,5 +608,4 @@ class PHPExcel_DocumentProperties
         }
         return self::PROPERTY_TYPE_UNKNOWN;
     }
-
 }

Classes/PHPExcel/DocumentSecurity.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * PHPExcel
+ * PHPExcel_DocumentSecurity
  *
- * Copyright (c) 2006 - 2013 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,19 +21,10 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-
-/**
- * PHPExcel_DocumentSecurity
- *
- * @category   PHPExcel
- * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
 class PHPExcel_DocumentSecurity
 {
     /**
@@ -40,35 +32,35 @@ class PHPExcel_DocumentSecurity
      *
      * @var boolean
      */
-	private $_lockRevision;
+    private $lockRevision;
 
     /**
      * LockStructure
      *
      * @var boolean
      */
-	private $_lockStructure;
+    private $lockStructure;
 
     /**
      * LockWindows
      *
      * @var boolean
      */
-	private $_lockWindows;
+    private $lockWindows;
 
     /**
      * RevisionsPassword
      *
      * @var string
      */
-	private $_revisionsPassword;
+    private $revisionsPassword;
 
     /**
      * WorkbookPassword
      *
      * @var string
      */
-	private $_workbookPassword;
+    private $workbookPassword;
 
     /**
      * Create a new PHPExcel_DocumentSecurity
@@ -76,22 +68,23 @@ class PHPExcel_DocumentSecurity
     public function __construct()
     {
         // Initialise values
-    	$this->_lockRevision		= false;
-    	$this->_lockStructure		= false;
-    	$this->_lockWindows			= false;
-    	$this->_revisionsPassword	= '';
-    	$this->_workbookPassword	= '';
+        $this->lockRevision      = false;
+        $this->lockStructure     = false;
+        $this->lockWindows       = false;
+        $this->revisionsPassword = '';
+        $this->workbookPassword  = '';
     }
 
     /**
-     * Is some sort of dcument security enabled?
+     * Is some sort of document security enabled?
      *
      * @return boolean
      */
-    function isSecurityEnabled() {
-    	return 	$this->_lockRevision ||
-		    	$this->_lockStructure ||
-		    	$this->_lockWindows;
+    public function isSecurityEnabled()
+    {
+        return  $this->lockRevision ||
+                $this->lockStructure ||
+                $this->lockWindows;
     }
 
     /**
@@ -99,8 +92,9 @@ class PHPExcel_DocumentSecurity
      *
      * @return boolean
      */
-    function getLockRevision() {
-    	return $this->_lockRevision;
+    public function getLockRevision()
+    {
+        return $this->lockRevision;
     }
 
     /**
@@ -109,8 +103,9 @@ class PHPExcel_DocumentSecurity
      * @param boolean $pValue
      * @return PHPExcel_DocumentSecurity
      */
-    function setLockRevision($pValue = false) {
-    	$this->_lockRevision = $pValue;
+    public function setLockRevision($pValue = false)
+    {
+        $this->lockRevision = $pValue;
         return $this;
     }
 
@@ -119,8 +114,9 @@ class PHPExcel_DocumentSecurity
      *
      * @return boolean
      */
-    function getLockStructure() {
-    	return $this->_lockStructure;
+    public function getLockStructure()
+    {
+        return $this->lockStructure;
     }
 
     /**
@@ -129,8 +125,9 @@ class PHPExcel_DocumentSecurity
      * @param boolean $pValue
      * @return PHPExcel_DocumentSecurity
      */
-    function setLockStructure($pValue = false) {
-		$this->_lockStructure = $pValue;
+    public function setLockStructure($pValue = false)
+    {
+        $this->lockStructure = $pValue;
         return $this;
     }
 
@@ -139,8 +136,9 @@ class PHPExcel_DocumentSecurity
      *
      * @return boolean
      */
-    function getLockWindows() {
-    	return $this->_lockWindows;
+    public function getLockWindows()
+    {
+        return $this->lockWindows;
     }
 
     /**
@@ -149,8 +147,9 @@ class PHPExcel_DocumentSecurity
      * @param boolean $pValue
      * @return PHPExcel_DocumentSecurity
      */
-    function setLockWindows($pValue = false) {
-    	$this->_lockWindows = $pValue;
+    public function setLockWindows($pValue = false)
+    {
+        $this->lockWindows = $pValue;
         return $this;
     }
 
@@ -159,8 +158,9 @@ class PHPExcel_DocumentSecurity
      *
      * @return string
      */
-    function getRevisionsPassword() {
-    	return $this->_revisionsPassword;
+    public function getRevisionsPassword()
+    {
+        return $this->revisionsPassword;
     }
 
     /**
@@ -170,11 +170,12 @@ class PHPExcel_DocumentSecurity
      * @param boolean     $pAlreadyHashed If the password has already been hashed, set this to true
      * @return PHPExcel_DocumentSecurity
      */
-    function setRevisionsPassword($pValue = '', $pAlreadyHashed = false) {
+    public function setRevisionsPassword($pValue = '', $pAlreadyHashed = false)
+    {
         if (!$pAlreadyHashed) {
             $pValue = PHPExcel_Shared_PasswordHasher::hashPassword($pValue);
         }
-    	$this->_revisionsPassword = $pValue;
+        $this->revisionsPassword = $pValue;
         return $this;
     }
 
@@ -183,8 +184,9 @@ class PHPExcel_DocumentSecurity
      *
      * @return string
      */
-    function getWorkbookPassword() {
-    	return $this->_workbookPassword;
+    public function getWorkbookPassword()
+    {
+        return $this->workbookPassword;
     }
 
     /**
@@ -194,18 +196,20 @@ class PHPExcel_DocumentSecurity
      * @param boolean     $pAlreadyHashed If the password has already been hashed, set this to true
      * @return PHPExcel_DocumentSecurity
      */
-    function setWorkbookPassword($pValue = '', $pAlreadyHashed = false) {
+    public function setWorkbookPassword($pValue = '', $pAlreadyHashed = false)
+    {
         if (!$pAlreadyHashed) {
             $pValue = PHPExcel_Shared_PasswordHasher::hashPassword($pValue);
         }
-		$this->_workbookPassword = $pValue;
+        $this->workbookPassword = $pValue;
         return $this;
     }
 
     /**
      * Implement PHP __clone to create a deep clone, not just a shallow copy.
      */
-	public function __clone() {
+    public function __clone()
+    {
         $vars = get_object_vars($this);
         foreach ($vars as $key => $value) {
             if (is_object($value)) {

Classes/PHPExcel/Exception.php

@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2013 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,7 +20,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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,9 +31,10 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
-class PHPExcel_Exception extends Exception {
+class PHPExcel_Exception extends Exception
+{
     /**
      * Error handler callback
      *
@@ -43,7 +44,8 @@ class PHPExcel_Exception extends Exception {
      * @param mixed $line
      * @param mixed $context
      */
-    public static function errorHandlerCallback($code, $string, $file, $line, $context) {
+    public static function errorHandlerCallback($code, $string, $file, $line, $context)
+    {
         $e = new self($string, $code);
         $e->line = $line;
         $e->file = $file;

Classes/PHPExcel/HashTable.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * PHPExcel
+ * PHPExcel_HashTable
  *
- * Copyright (c) 2006 - 2013 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,19 +21,10 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-
-/**
- * PHPExcel_HashTable
- *
- * @category   PHPExcel
- * @package	PHPExcel
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
 class PHPExcel_HashTable
 {
     /**
@@ -40,14 +32,14 @@ class PHPExcel_HashTable
      *
      * @var array
      */
-	public $_items = array();
+    protected $items = array();
 
     /**
      * HashTable key map
      *
      * @var array
      */
-	public $_keyMap = array();
+    protected $keyMap = array();
 
     /**
      * Create a new PHPExcel_HashTable
@@ -57,7 +49,7 @@ class PHPExcel_HashTable
      */
     public function __construct($pSource = null)
     {
-		if ($pSource !== NULL) {
+        if ($pSource !== null) {
             // Create HashTable
             $this->addFromSource($pSource);
         }
@@ -69,7 +61,8 @@ class PHPExcel_HashTable
      * @param    PHPExcel_IComparable[] $pSource    Source array to create HashTable from
      * @throws    PHPExcel_Exception
      */
-	public function addFromSource($pSource = null) {
+    public function addFromSource($pSource = null)
+    {
         // Check if an array was passed
         if ($pSource == null) {
             return;
@@ -88,11 +81,12 @@ class PHPExcel_HashTable
      * @param    PHPExcel_IComparable $pSource    Item to add
      * @throws    PHPExcel_Exception
      */
-	public function add(PHPExcel_IComparable $pSource = null) {
+    public function add(PHPExcel_IComparable $pSource = null)
+    {
         $hash = $pSource->getHashCode();
-		if (!isset($this->_items[$hash])) {
-			$this->_items[$hash] = $pSource;
-			$this->_keyMap[count($this->_items) - 1] = $hash;
+        if (!isset($this->items[$hash])) {
+            $this->items[$hash] = $pSource;
+            $this->keyMap[count($this->items) - 1] = $hash;
         }
     }
 
@@ -102,22 +96,23 @@ class PHPExcel_HashTable
      * @param    PHPExcel_IComparable $pSource    Item to remove
      * @throws    PHPExcel_Exception
      */
-	public function remove(PHPExcel_IComparable $pSource = null) {
+    public function remove(PHPExcel_IComparable $pSource = null)
+    {
         $hash = $pSource->getHashCode();
-		if (isset($this->_items[$hash])) {
-			unset($this->_items[$hash]);
+        if (isset($this->items[$hash])) {
+            unset($this->items[$hash]);
 
             $deleteKey = -1;
-			foreach ($this->_keyMap as $key => $value) {
+            foreach ($this->keyMap as $key => $value) {
                 if ($deleteKey >= 0) {
-					$this->_keyMap[$key - 1] = $value;
+                    $this->keyMap[$key - 1] = $value;
                 }
 
                 if ($value == $hash) {
                     $deleteKey = $key;
                 }
             }
-			unset($this->_keyMap[count($this->_keyMap) - 1]);
+            unset($this->keyMap[count($this->keyMap) - 1]);
         }
     }
 
@@ -125,9 +120,10 @@ class PHPExcel_HashTable
      * Clear HashTable
      *
      */
-	public function clear() {
-		$this->_items = array();
-		$this->_keyMap = array();
+    public function clear()
+    {
+        $this->items = array();
+        $this->keyMap = array();
     }
 
     /**
@@ -135,8 +131,9 @@ class PHPExcel_HashTable
      *
      * @return int
      */
-	public function count() {
-		return count($this->_items);
+    public function count()
+    {
+        return count($this->items);
     }
 
     /**
@@ -145,8 +142,9 @@ class PHPExcel_HashTable
      * @param    string    $pHashCode
      * @return    int    Index
      */
-	public function getIndexForHashCode($pHashCode = '') {
-		return array_search($pHashCode, $this->_keyMap);
+    public function getIndexForHashCode($pHashCode = '')
+    {
+        return array_search($pHashCode, $this->keyMap);
     }
 
     /**
@@ -156,9 +154,10 @@ class PHPExcel_HashTable
      * @return    PHPExcel_IComparable
      *
      */
-	public function getByIndex($pIndex = 0) {
-		if (isset($this->_keyMap[$pIndex])) {
-			return $this->getByHashCode( $this->_keyMap[$pIndex] );
+    public function getByIndex($pIndex = 0)
+    {
+        if (isset($this->keyMap[$pIndex])) {
+            return $this->getByHashCode($this->keyMap[$pIndex]);
         }
 
         return null;
@@ -171,9 +170,10 @@ class PHPExcel_HashTable
      * @return    PHPExcel_IComparable
      *
      */
-	public function getByHashCode($pHashCode = '') {
-		if (isset($this->_items[$pHashCode])) {
-			return $this->_items[$pHashCode];
+    public function getByHashCode($pHashCode = '')
+    {
+        if (isset($this->items[$pHashCode])) {
+            return $this->items[$pHashCode];
         }
 
         return null;
@@ -184,14 +184,16 @@ class PHPExcel_HashTable
      *
      * @return PHPExcel_IComparable[]
      */
-	public function toArray() {
-		return $this->_items;
+    public function toArray()
+    {
+        return $this->items;
     }
 
     /**
      * Implement PHP __clone to create a deep clone, not just a shallow copy.
      */
-	public function __clone() {
+    public function __clone()
+    {
         $vars = get_object_vars($this);
         foreach ($vars as $key => $value) {
             if (is_object($value)) {

Classes/PHPExcel/Helper/HTML.php

@@ -0,0 +1,808 @@
+<?php
+
+class PHPExcel_Helper_HTML
+{
+    protected static $colourMap = array(
+        'aliceblue' => 'f0f8ff',
+        'antiquewhite' => 'faebd7',
+        'antiquewhite1' => 'ffefdb',
+        'antiquewhite2' => 'eedfcc',
+        'antiquewhite3' => 'cdc0b0',
+        'antiquewhite4' => '8b8378',
+        'aqua' => '00ffff',
+        'aquamarine1' => '7fffd4',
+        'aquamarine2' => '76eec6',
+        'aquamarine4' => '458b74',
+        'azure1' => 'f0ffff',
+        'azure2' => 'e0eeee',
+        'azure3' => 'c1cdcd',
+        'azure4' => '838b8b',
+        'beige' => 'f5f5dc',
+        'bisque1' => 'ffe4c4',
+        'bisque2' => 'eed5b7',
+        'bisque3' => 'cdb79e',
+        'bisque4' => '8b7d6b',
+        'black' => '000000',
+        'blanchedalmond' => 'ffebcd',
+        'blue' => '0000ff',
+        'blue1' => '0000ff',
+        'blue2' => '0000ee',
+        'blue4' => '00008b',
+        'blueviolet' => '8a2be2',
+        'brown' => 'a52a2a',
+        'brown1' => 'ff4040',
+        'brown2' => 'ee3b3b',
+        'brown3' => 'cd3333',
+        'brown4' => '8b2323',
+        'burlywood' => 'deb887',
+        'burlywood1' => 'ffd39b',
+        'burlywood2' => 'eec591',
+        'burlywood3' => 'cdaa7d',
+        'burlywood4' => '8b7355',
+        'cadetblue' => '5f9ea0',
+        'cadetblue1' => '98f5ff',
+        'cadetblue2' => '8ee5ee',
+        'cadetblue3' => '7ac5cd',
+        'cadetblue4' => '53868b',
+        'chartreuse1' => '7fff00',
+        'chartreuse2' => '76ee00',
+        'chartreuse3' => '66cd00',
+        'chartreuse4' => '458b00',
+        'chocolate' => 'd2691e',
+        'chocolate1' => 'ff7f24',
+        'chocolate2' => 'ee7621',
+        'chocolate3' => 'cd661d',
+        'coral' => 'ff7f50',
+        'coral1' => 'ff7256',
+        'coral2' => 'ee6a50',
+        'coral3' => 'cd5b45',
+        'coral4' => '8b3e2f',
+        'cornflowerblue' => '6495ed',
+        'cornsilk1' => 'fff8dc',
+        'cornsilk2' => 'eee8cd',
+        'cornsilk3' => 'cdc8b1',
+        'cornsilk4' => '8b8878',
+        'cyan1' => '00ffff',
+        'cyan2' => '00eeee',
+        'cyan3' => '00cdcd',
+        'cyan4' => '008b8b',
+        'darkgoldenrod' => 'b8860b',
+        'darkgoldenrod1' => 'ffb90f',
+        'darkgoldenrod2' => 'eead0e',
+        'darkgoldenrod3' => 'cd950c',
+        'darkgoldenrod4' => '8b6508',
+        'darkgreen' => '006400',
+        'darkkhaki' => 'bdb76b',
+        'darkolivegreen' => '556b2f',
+        'darkolivegreen1' => 'caff70',
+        'darkolivegreen2' => 'bcee68',
+        'darkolivegreen3' => 'a2cd5a',
+        'darkolivegreen4' => '6e8b3d',
+        'darkorange' => 'ff8c00',
+        'darkorange1' => 'ff7f00',
+        'darkorange2' => 'ee7600',
+        'darkorange3' => 'cd6600',
+        'darkorange4' => '8b4500',
+        'darkorchid' => '9932cc',
+        'darkorchid1' => 'bf3eff',
+        'darkorchid2' => 'b23aee',
+        'darkorchid3' => '9a32cd',
+        'darkorchid4' => '68228b',
+        'darksalmon' => 'e9967a',
+        'darkseagreen' => '8fbc8f',
+        'darkseagreen1' => 'c1ffc1',
+        'darkseagreen2' => 'b4eeb4',
+        'darkseagreen3' => '9bcd9b',
+        'darkseagreen4' => '698b69',
+        'darkslateblue' => '483d8b',
+        'darkslategray' => '2f4f4f',
+        'darkslategray1' => '97ffff',
+        'darkslategray2' => '8deeee',
+        'darkslategray3' => '79cdcd',
+        'darkslategray4' => '528b8b',
+        'darkturquoise' => '00ced1',
+        'darkviolet' => '9400d3',
+        'deeppink1' => 'ff1493',
+        'deeppink2' => 'ee1289',
+        'deeppink3' => 'cd1076',
+        'deeppink4' => '8b0a50',
+        'deepskyblue1' => '00bfff',
+        'deepskyblue2' => '00b2ee',
+        'deepskyblue3' => '009acd',
+        'deepskyblue4' => '00688b',
+        'dimgray' => '696969',
+        'dodgerblue1' => '1e90ff',
+        'dodgerblue2' => '1c86ee',
+        'dodgerblue3' => '1874cd',
+        'dodgerblue4' => '104e8b',
+        'firebrick' => 'b22222',
+        'firebrick1' => 'ff3030',
+        'firebrick2' => 'ee2c2c',
+        'firebrick3' => 'cd2626',
+        'firebrick4' => '8b1a1a',
+        'floralwhite' => 'fffaf0',
+        'forestgreen' => '228b22',
+        'fuchsia' => 'ff00ff',
+        'gainsboro' => 'dcdcdc',
+        'ghostwhite' => 'f8f8ff',
+        'gold1' => 'ffd700',
+        'gold2' => 'eec900',
+        'gold3' => 'cdad00',
+        'gold4' => '8b7500',
+        'goldenrod' => 'daa520',
+        'goldenrod1' => 'ffc125',
+        'goldenrod2' => 'eeb422',
+        'goldenrod3' => 'cd9b1d',
+        'goldenrod4' => '8b6914',
+        'gray' => 'bebebe',
+        'gray1' => '030303',
+        'gray10' => '1a1a1a',
+        'gray11' => '1c1c1c',
+        'gray12' => '1f1f1f',
+        'gray13' => '212121',
+        'gray14' => '242424',
+        'gray15' => '262626',
+        'gray16' => '292929',
+        'gray17' => '2b2b2b',
+        'gray18' => '2e2e2e',
+        'gray19' => '303030',
+        'gray2' => '050505',
+        'gray20' => '333333',
+        'gray21' => '363636',
+        'gray22' => '383838',
+        'gray23' => '3b3b3b',
+        'gray24' => '3d3d3d',
+        'gray25' => '404040',
+        'gray26' => '424242',
+        'gray27' => '454545',
+        'gray28' => '474747',
+        'gray29' => '4a4a4a',
+        'gray3' => '080808',
+        'gray30' => '4d4d4d',
+        'gray31' => '4f4f4f',
+        'gray32' => '525252',
+        'gray33' => '545454',
+        'gray34' => '575757',
+        'gray35' => '595959',
+        'gray36' => '5c5c5c',
+        'gray37' => '5e5e5e',
+        'gray38' => '616161',
+        'gray39' => '636363',
+        'gray4' => '0a0a0a',
+        'gray40' => '666666',
+        'gray41' => '696969',
+        'gray42' => '6b6b6b',
+        'gray43' => '6e6e6e',
+        'gray44' => '707070',
+        'gray45' => '737373',
+        'gray46' => '757575',
+        'gray47' => '787878',
+        'gray48' => '7a7a7a',
+        'gray49' => '7d7d7d',
+        'gray5' => '0d0d0d',
+        'gray50' => '7f7f7f',
+        'gray51' => '828282',
+        'gray52' => '858585',
+        'gray53' => '878787',
+        'gray54' => '8a8a8a',
+        'gray55' => '8c8c8c',
+        'gray56' => '8f8f8f',
+        'gray57' => '919191',
+        'gray58' => '949494',
+        'gray59' => '969696',
+        'gray6' => '0f0f0f',
+        'gray60' => '999999',
+        'gray61' => '9c9c9c',
+        'gray62' => '9e9e9e',
+        'gray63' => 'a1a1a1',
+        'gray64' => 'a3a3a3',
+        'gray65' => 'a6a6a6',
+        'gray66' => 'a8a8a8',
+        'gray67' => 'ababab',
+        'gray68' => 'adadad',
+        'gray69' => 'b0b0b0',
+        'gray7' => '121212',
+        'gray70' => 'b3b3b3',
+        'gray71' => 'b5b5b5',
+        'gray72' => 'b8b8b8',
+        'gray73' => 'bababa',
+        'gray74' => 'bdbdbd',
+        'gray75' => 'bfbfbf',
+        'gray76' => 'c2c2c2',
+        'gray77' => 'c4c4c4',
+        'gray78' => 'c7c7c7',
+        'gray79' => 'c9c9c9',
+        'gray8' => '141414',
+        'gray80' => 'cccccc',
+        'gray81' => 'cfcfcf',
+        'gray82' => 'd1d1d1',
+        'gray83' => 'd4d4d4',
+        'gray84' => 'd6d6d6',
+        'gray85' => 'd9d9d9',
+        'gray86' => 'dbdbdb',
+        'gray87' => 'dedede',
+        'gray88' => 'e0e0e0',
+        'gray89' => 'e3e3e3',
+        'gray9' => '171717',
+        'gray90' => 'e5e5e5',
+        'gray91' => 'e8e8e8',
+        'gray92' => 'ebebeb',
+        'gray93' => 'ededed',
+        'gray94' => 'f0f0f0',
+        'gray95' => 'f2f2f2',
+        'gray97' => 'f7f7f7',
+        'gray98' => 'fafafa',
+        'gray99' => 'fcfcfc',
+        'green' => '00ff00',
+        'green1' => '00ff00',
+        'green2' => '00ee00',
+        'green3' => '00cd00',
+        'green4' => '008b00',
+        'greenyellow' => 'adff2f',
+        'honeydew1' => 'f0fff0',
+        'honeydew2' => 'e0eee0',
+        'honeydew3' => 'c1cdc1',
+        'honeydew4' => '838b83',
+        'hotpink' => 'ff69b4',
+        'hotpink1' => 'ff6eb4',
+        'hotpink2' => 'ee6aa7',
+        'hotpink3' => 'cd6090',
+        'hotpink4' => '8b3a62',
+        'indianred' => 'cd5c5c',
+        'indianred1' => 'ff6a6a',
+        'indianred2' => 'ee6363',
+        'indianred3' => 'cd5555',
+        'indianred4' => '8b3a3a',
+        'ivory1' => 'fffff0',
+        'ivory2' => 'eeeee0',
+        'ivory3' => 'cdcdc1',
+        'ivory4' => '8b8b83',
+        'khaki' => 'f0e68c',
+        'khaki1' => 'fff68f',
+        'khaki2' => 'eee685',
+        'khaki3' => 'cdc673',
+        'khaki4' => '8b864e',
+        'lavender' => 'e6e6fa',
+        'lavenderblush1' => 'fff0f5',
+        'lavenderblush2' => 'eee0e5',
+        'lavenderblush3' => 'cdc1c5',
+        'lavenderblush4' => '8b8386',
+        'lawngreen' => '7cfc00',
+        'lemonchiffon1' => 'fffacd',
+        'lemonchiffon2' => 'eee9bf',
+        'lemonchiffon3' => 'cdc9a5',
+        'lemonchiffon4' => '8b8970',
+        'light' => 'eedd82',
+        'lightblue' => 'add8e6',
+        'lightblue1' => 'bfefff',
+        'lightblue2' => 'b2dfee',
+        'lightblue3' => '9ac0cd',
+        'lightblue4' => '68838b',
+        'lightcoral' => 'f08080',
+        'lightcyan1' => 'e0ffff',
+        'lightcyan2' => 'd1eeee',
+        'lightcyan3' => 'b4cdcd',
+        'lightcyan4' => '7a8b8b',
+        'lightgoldenrod1' => 'ffec8b',
+        'lightgoldenrod2' => 'eedc82',
+        'lightgoldenrod3' => 'cdbe70',
+        'lightgoldenrod4' => '8b814c',
+        'lightgoldenrodyellow' => 'fafad2',
+        'lightgray' => 'd3d3d3',
+        'lightpink' => 'ffb6c1',
+        'lightpink1' => 'ffaeb9',
+        'lightpink2' => 'eea2ad',
+        'lightpink3' => 'cd8c95',
+        'lightpink4' => '8b5f65',
+        'lightsalmon1' => 'ffa07a',
+        'lightsalmon2' => 'ee9572',
+        'lightsalmon3' => 'cd8162',
+        'lightsalmon4' => '8b5742',
+        'lightseagreen' => '20b2aa',
+        'lightskyblue' => '87cefa',
+        'lightskyblue1' => 'b0e2ff',
+        'lightskyblue2' => 'a4d3ee',
+        'lightskyblue3' => '8db6cd',
+        'lightskyblue4' => '607b8b',
+        'lightslateblue' => '8470ff',
+        'lightslategray' => '778899',
+        'lightsteelblue' => 'b0c4de',
+        'lightsteelblue1' => 'cae1ff',
+        'lightsteelblue2' => 'bcd2ee',
+        'lightsteelblue3' => 'a2b5cd',
+        'lightsteelblue4' => '6e7b8b',
+        'lightyellow1' => 'ffffe0',
+        'lightyellow2' => 'eeeed1',
+        'lightyellow3' => 'cdcdb4',
+        'lightyellow4' => '8b8b7a',
+        'lime' => '00ff00',
+        'limegreen' => '32cd32',
+        'linen' => 'faf0e6',
+        'magenta' => 'ff00ff',
+        'magenta2' => 'ee00ee',
+        'magenta3' => 'cd00cd',
+        'magenta4' => '8b008b',
+        'maroon' => 'b03060',
+        'maroon1' => 'ff34b3',
+        'maroon2' => 'ee30a7',
+        'maroon3' => 'cd2990',
+        'maroon4' => '8b1c62',
+        'medium' => '66cdaa',
+        'mediumaquamarine' => '66cdaa',
+        'mediumblue' => '0000cd',
+        'mediumorchid' => 'ba55d3',
+        'mediumorchid1' => 'e066ff',
+        'mediumorchid2' => 'd15fee',
+        'mediumorchid3' => 'b452cd',
+        'mediumorchid4' => '7a378b',
+        'mediumpurple' => '9370db',
+        'mediumpurple1' => 'ab82ff',
+        'mediumpurple2' => '9f79ee',
+        'mediumpurple3' => '8968cd',
+        'mediumpurple4' => '5d478b',
+        'mediumseagreen' => '3cb371',
+        'mediumslateblue' => '7b68ee',
+        'mediumspringgreen' => '00fa9a',
+        'mediumturquoise' => '48d1cc',
+        'mediumvioletred' => 'c71585',
+        'midnightblue' => '191970',
+        'mintcream' => 'f5fffa',
+        'mistyrose1' => 'ffe4e1',
+        'mistyrose2' => 'eed5d2',
+        'mistyrose3' => 'cdb7b5',
+        'mistyrose4' => '8b7d7b',
+        'moccasin' => 'ffe4b5',
+        'navajowhite1' => 'ffdead',
+        'navajowhite2' => 'eecfa1',
+        'navajowhite3' => 'cdb38b',
+        'navajowhite4' => '8b795e',
+        'navy' => '000080',
+        'navyblue' => '000080',
+        'oldlace' => 'fdf5e6',
+        'olive' => '808000',
+        'olivedrab' => '6b8e23',
+        'olivedrab1' => 'c0ff3e',
+        'olivedrab2' => 'b3ee3a',
+        'olivedrab4' => '698b22',
+        'orange' => 'ffa500',
+        'orange1' => 'ffa500',
+        'orange2' => 'ee9a00',
+        'orange3' => 'cd8500',
+        'orange4' => '8b5a00',
+        'orangered1' => 'ff4500',
+        'orangered2' => 'ee4000',
+        'orangered3' => 'cd3700',
+        'orangered4' => '8b2500',
+        'orchid' => 'da70d6',
+        'orchid1' => 'ff83fa',
+        'orchid2' => 'ee7ae9',
+        'orchid3' => 'cd69c9',
+        'orchid4' => '8b4789',
+        'pale' => 'db7093',
+        'palegoldenrod' => 'eee8aa',
+        'palegreen' => '98fb98',
+        'palegreen1' => '9aff9a',
+        'palegreen2' => '90ee90',
+        'palegreen3' => '7ccd7c',
+        'palegreen4' => '548b54',
+        'paleturquoise' => 'afeeee',
+        'paleturquoise1' => 'bbffff',
+        'paleturquoise2' => 'aeeeee',
+        'paleturquoise3' => '96cdcd',
+        'paleturquoise4' => '668b8b',
+        'palevioletred' => 'db7093',
+        'palevioletred1' => 'ff82ab',
+        'palevioletred2' => 'ee799f',
+        'palevioletred3' => 'cd6889',
+        'palevioletred4' => '8b475d',
+        'papayawhip' => 'ffefd5',
+        'peachpuff1' => 'ffdab9',
+        'peachpuff2' => 'eecbad',
+        'peachpuff3' => 'cdaf95',
+        'peachpuff4' => '8b7765',
+        'pink' => 'ffc0cb',
+        'pink1' => 'ffb5c5',
+        'pink2' => 'eea9b8',
+        'pink3' => 'cd919e',
+        'pink4' => '8b636c',
+        'plum' => 'dda0dd',
+        'plum1' => 'ffbbff',
+        'plum2' => 'eeaeee',
+        'plum3' => 'cd96cd',
+        'plum4' => '8b668b',
+        'powderblue' => 'b0e0e6',
+        'purple' => 'a020f0',
+        'rebeccapurple' => '663399',
+        'purple1' => '9b30ff',
+        'purple2' => '912cee',
+        'purple3' => '7d26cd',
+        'purple4' => '551a8b',
+        'red' => 'ff0000',
+        'red1' => 'ff0000',
+        'red2' => 'ee0000',
+        'red3' => 'cd0000',
+        'red4' => '8b0000',
+        'rosybrown' => 'bc8f8f',
+        'rosybrown1' => 'ffc1c1',
+        'rosybrown2' => 'eeb4b4',
+        'rosybrown3' => 'cd9b9b',
+        'rosybrown4' => '8b6969',
+        'royalblue' => '4169e1',
+        'royalblue1' => '4876ff',
+        'royalblue2' => '436eee',
+        'royalblue3' => '3a5fcd',
+        'royalblue4' => '27408b',
+        'saddlebrown' => '8b4513',
+        'salmon' => 'fa8072',
+        'salmon1' => 'ff8c69',
+        'salmon2' => 'ee8262',
+        'salmon3' => 'cd7054',
+        'salmon4' => '8b4c39',
+        'sandybrown' => 'f4a460',
+        'seagreen1' => '54ff9f',
+        'seagreen2' => '4eee94',
+        'seagreen3' => '43cd80',
+        'seagreen4' => '2e8b57',
+        'seashell1' => 'fff5ee',
+        'seashell2' => 'eee5de',
+        'seashell3' => 'cdc5bf',
+        'seashell4' => '8b8682',
+        'sienna' => 'a0522d',
+        'sienna1' => 'ff8247',
+        'sienna2' => 'ee7942',
+        'sienna3' => 'cd6839',
+        'sienna4' => '8b4726',
+        'silver' => 'c0c0c0',
+        'skyblue' => '87ceeb',
+        'skyblue1' => '87ceff',
+        'skyblue2' => '7ec0ee',
+        'skyblue3' => '6ca6cd',
+        'skyblue4' => '4a708b',
+        'slateblue' => '6a5acd',
+        'slateblue1' => '836fff',
+        'slateblue2' => '7a67ee',
+        'slateblue3' => '6959cd',
+        'slateblue4' => '473c8b',
+        'slategray' => '708090',
+        'slategray1' => 'c6e2ff',
+        'slategray2' => 'b9d3ee',
+        'slategray3' => '9fb6cd',
+        'slategray4' => '6c7b8b',
+        'snow1' => 'fffafa',
+        'snow2' => 'eee9e9',
+        'snow3' => 'cdc9c9',
+        'snow4' => '8b8989',
+        'springgreen1' => '00ff7f',
+        'springgreen2' => '00ee76',
+        'springgreen3' => '00cd66',
+        'springgreen4' => '008b45',
+        'steelblue' => '4682b4',
+        'steelblue1' => '63b8ff',
+        'steelblue2' => '5cacee',
+        'steelblue3' => '4f94cd',
+        'steelblue4' => '36648b',
+        'tan' => 'd2b48c',
+        'tan1' => 'ffa54f',
+        'tan2' => 'ee9a49',
+        'tan3' => 'cd853f',
+        'tan4' => '8b5a2b',
+        'teal' => '008080',
+        'thistle' => 'd8bfd8',
+        'thistle1' => 'ffe1ff',
+        'thistle2' => 'eed2ee',
+        'thistle3' => 'cdb5cd',
+        'thistle4' => '8b7b8b',
+        'tomato1' => 'ff6347',
+        'tomato2' => 'ee5c42',
+        'tomato3' => 'cd4f39',
+        'tomato4' => '8b3626',
+        'turquoise' => '40e0d0',
+        'turquoise1' => '00f5ff',
+        'turquoise2' => '00e5ee',
+        'turquoise3' => '00c5cd',
+        'turquoise4' => '00868b',
+        'violet' => 'ee82ee',
+        'violetred' => 'd02090',
+        'violetred1' => 'ff3e96',
+        'violetred2' => 'ee3a8c',
+        'violetred3' => 'cd3278',
+        'violetred4' => '8b2252',
+        'wheat' => 'f5deb3',
+        'wheat1' => 'ffe7ba',
+        'wheat2' => 'eed8ae',
+        'wheat3' => 'cdba96',
+        'wheat4' => '8b7e66',
+        'white' => 'ffffff',
+        'whitesmoke' => 'f5f5f5',
+        'yellow' => 'ffff00',
+        'yellow1' => 'ffff00',
+        'yellow2' => 'eeee00',
+        'yellow3' => 'cdcd00',
+        'yellow4' => '8b8b00',
+        'yellowgreen' => '9acd32',
+    );
+
+    protected $face;
+    protected $size;
+    protected $color;
+
+    protected $bold = false;
+    protected $italic = false;
+    protected $underline = false;
+    protected $superscript = false;
+    protected $subscript = false;
+    protected $strikethrough = false;
+
+    protected $startTagCallbacks = array(
+        'font' => 'startFontTag',
+        'b' => 'startBoldTag',
+        'strong' => 'startBoldTag',
+        'i' => 'startItalicTag',
+        'em' => 'startItalicTag',
+        'u' => 'startUnderlineTag',
+        'ins' => 'startUnderlineTag',
+        'del' => 'startStrikethruTag',
+        'sup' => 'startSuperscriptTag',
+        'sub' => 'startSubscriptTag',
+    );
+
+    protected $endTagCallbacks = array(
+        'font' => 'endFontTag',
+        'b' => 'endBoldTag',
+        'strong' => 'endBoldTag',
+        'i' => 'endItalicTag',
+        'em' => 'endItalicTag',
+        'u' => 'endUnderlineTag',
+        'ins' => 'endUnderlineTag',
+        'del' => 'endStrikethruTag',
+        'sup' => 'endSuperscriptTag',
+        'sub' => 'endSubscriptTag',
+        'br' => 'breakTag',
+        'p' => 'breakTag',
+        'h1' => 'breakTag',
+        'h2' => 'breakTag',
+        'h3' => 'breakTag',
+        'h4' => 'breakTag',
+        'h5' => 'breakTag',
+        'h6' => 'breakTag',
+    );
+
+    protected $stack = array();
+
+    protected $stringData = '';
+
+    protected $richTextObject;
+
+    protected function initialise()
+    {
+        $this->face = $this->size = $this->color = null;
+        $this->bold = $this->italic = $this->underline = $this->superscript = $this->subscript = $this->strikethrough = false;
+
+        $this->stack = array();
+
+        $this->stringData = '';
+    }
+
+    public function toRichTextObject($html)
+    {
+        $this->initialise();
+
+        //  Create a new DOM object
+        $dom = new \DOMDocument;
+        //  Load the HTML file into the DOM object
+        //  Note the use of error suppression, because typically this will be an html fragment, so not fully valid markup
+        $loaded = @$dom->loadHTML($html);
+
+        //  Discard excess white space
+        $dom->preserveWhiteSpace = false;
+
+        $this->richTextObject = new PHPExcel_RichText();;
+        $this->parseElements($dom);
+
+        // Clean any further spurious whitespace
+        $this->cleanWhitespace();
+
+        return $this->richTextObject;
+    }
+
+    protected function cleanWhitespace()
+    {
+        foreach ($this->richTextObject->getRichTextElements() as $key => $element) {
+            $text = $element->getText();
+            // Trim any leading spaces on the first run
+            if ($key == 0) {
+                $text = ltrim($text);
+            }
+            // Trim any spaces immediately after a line break
+            $text = preg_replace('/\n */mu', "\n", $text);
+            $element->setText($text);
+        }
+    }
+
+    protected function buildTextRun()
+    {
+        $text = $this->stringData;
+        if (trim($text) === '') {
+            return;
+        }
+
+        $richtextRun = $this->richTextObject->createTextRun($this->stringData);
+        if ($this->face) {
+            $richtextRun->getFont()->setName($this->face);
+        }
+        if ($this->size) {
+            $richtextRun->getFont()->setSize($this->size);
+        }
+        if ($this->color) {
+            $richtextRun->getFont()->setColor(new PHPExcel_Style_Color('ff' . $this->color));
+        }
+        if ($this->bold) {
+            $richtextRun->getFont()->setBold(true);
+        }
+        if ($this->italic) {
+            $richtextRun->getFont()->setItalic(true);
+        }
+        if ($this->underline) {
+            $richtextRun->getFont()->setUnderline(PHPExcel_Style_Font::UNDERLINE_SINGLE);
+        }
+        if ($this->superscript) {
+            $richtextRun->getFont()->setSuperScript(true);
+        }
+        if ($this->subscript) {
+            $richtextRun->getFont()->setSubScript(true);
+        }
+        if ($this->strikethrough) {
+            $richtextRun->getFont()->setStrikethrough(true);
+        }
+        $this->stringData = '';
+    }
+
+    protected function rgbToColour($rgb)
+    {
+        preg_match_all('/\d+/', $rgb, $values);
+        foreach ($values[0] as &$value) {
+            $value = str_pad(dechex($value), 2, '0', STR_PAD_LEFT);
+        }
+        return implode($values[0]);
+    }
+
+    protected function colourNameLookup($rgb)
+    {
+        return self::$colourMap[$rgb];
+    }
+
+    protected function startFontTag($tag)
+    {
+        foreach ($tag->attributes as $attribute) {
+            $attributeName = strtolower($attribute->name);
+            $attributeValue = $attribute->value;
+
+            if ($attributeName == 'color') {
+                if (preg_match('/rgb\s*\(/', $attributeValue)) {
+                    $this->$attributeName = $this->rgbToColour($attributeValue);
+                } elseif (strpos(trim($attributeValue), '#') === 0) {
+                    $this->$attributeName = ltrim($attributeValue, '#');
+                } else {
+                    $this->$attributeName = $this->colourNameLookup($attributeValue);
+                }
+            } else {
+                $this->$attributeName = $attributeValue;
+            }
+        }
+    }
+
+    protected function endFontTag()
+    {
+        $this->face = $this->size = $this->color = null;
+    }
+
+    protected function startBoldTag()
+    {
+        $this->bold = true;
+    }
+
+    protected function endBoldTag()
+    {
+        $this->bold = false;
+    }
+
+    protected function startItalicTag()
+    {
+        $this->italic = true;
+    }
+
+    protected function endItalicTag()
+    {
+        $this->italic = false;
+    }
+
+    protected function startUnderlineTag()
+    {
+        $this->underline = true;
+    }
+
+    protected function endUnderlineTag()
+    {
+        $this->underline = false;
+    }
+
+    protected function startSubscriptTag()
+    {
+        $this->subscript = true;
+    }
+
+    protected function endSubscriptTag()
+    {
+        $this->subscript = false;
+    }
+
+    protected function startSuperscriptTag()
+    {
+        $this->superscript = true;
+    }
+
+    protected function endSuperscriptTag()
+    {
+        $this->superscript = false;
+    }
+
+    protected function startStrikethruTag()
+    {
+        $this->strikethrough = true;
+    }
+
+    protected function endStrikethruTag()
+    {
+        $this->strikethrough = false;
+    }
+
+    protected function breakTag()
+    {
+        $this->stringData .= "\n";
+    }
+
+    protected function parseTextNode(DOMText $textNode)
+    {
+        $domText = preg_replace(
+            '/\s+/u',
+            ' ',
+            str_replace(array("\r", "\n"), ' ', $textNode->nodeValue)
+        );
+        $this->stringData .= $domText;
+        $this->buildTextRun();
+    }
+
+    protected function handleCallback($element, $callbackTag, $callbacks)
+    {
+        if (isset($callbacks[$callbackTag])) {
+            $elementHandler = $callbacks[$callbackTag];
+            if (method_exists($this, $elementHandler)) {
+                call_user_func(array($this, $elementHandler), $element);
+            }
+        }
+    }
+
+    protected function parseElementNode(DOMElement $element)
+    {
+        $callbackTag = strtolower($element->nodeName);
+        $this->stack[] = $callbackTag;
+
+        $this->handleCallback($element, $callbackTag, $this->startTagCallbacks);
+
+        $this->parseElements($element);
+        array_pop($this->stack);
+
+        $this->handleCallback($element, $callbackTag, $this->endTagCallbacks);
+    }
+
+    protected function parseElements(DOMNode $element)
+    {
+        foreach ($element->childNodes as $child) {
+            if ($child instanceof DOMText) {
+                $this->parseTextNode($child);
+            } elseif ($child instanceof DOMElement) {
+                $this->parseElementNode($child);
+            }
+        }
+    }
+}

Classes/PHPExcel/IComparable.php

@@ -1,6 +1,7 @@
 <?php
+
 /**
- * PHPExcel
+ * PHPExcel_IComparable
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -18,19 +19,10 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-
-/**
- * PHPExcel_IComparable
- *
- * @category   PHPExcel
- * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
 interface PHPExcel_IComparable
 {
     /**
@@ -39,5 +31,4 @@ interface PHPExcel_IComparable
      * @return string    Hash code
      */
     public function getHashCode();
-
 }

Classes/PHPExcel/IOFactory.php

@@ -1,8 +1,18 @@
 <?php
+
+/**    PHPExcel root directory */
+if (!defined('PHPEXCEL_ROOT')) {
     /**
- * PHPExcel
+     * @ignore
+     */
+    define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../');
+    require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+}
+
+/**
+ * PHPExcel_IOFactory
  *
- * Copyright (c) 2006 - 2013 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,28 +30,10 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-
-/**	PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-	/**
-	 * @ignore
-	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-/**
- * PHPExcel_IOFactory
- *
- * @category   PHPExcel
- * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
 class PHPExcel_IOFactory
 {
     /**
@@ -51,7 +43,7 @@ class PHPExcel_IOFactory
      * @access    private
      * @static
      */
-	private static $_searchLocations = array(
+    private static $searchLocations = array(
         array( 'type' => 'IWriter', 'path' => 'PHPExcel/Writer/{0}.php', 'class' => 'PHPExcel_Writer_{0}' ),
         array( 'type' => 'IReader', 'path' => 'PHPExcel/Reader/{0}.php', 'class' => 'PHPExcel_Reader_{0}' )
     );
@@ -63,7 +55,7 @@ class PHPExcel_IOFactory
      * @access    private
      * @static
      */
-	private static $_autoResolveClasses = array(
+    private static $autoResolveClasses = array(
         'Excel2007',
         'Excel5',
         'Excel2003XML',
@@ -77,7 +69,9 @@ class PHPExcel_IOFactory
     /**
      *    Private constructor for PHPExcel_IOFactory
      */
-    private function __construct() { }
+    private function __construct()
+    {
+    }
 
     /**
      * Get search locations
@@ -86,9 +80,10 @@ class PHPExcel_IOFactory
      * @access    public
      * @return    array
      */
-	public static function getSearchLocations() {
-		return self::$_searchLocations;
-	}	//	function getSearchLocations()
+    public static function getSearchLocations()
+    {
+        return self::$searchLocations;
+    }
 
     /**
      * Set search locations
@@ -98,13 +93,14 @@ class PHPExcel_IOFactory
      * @param    array $value
      * @throws    PHPExcel_Reader_Exception
      */
-	public static function setSearchLocations($value) {
+    public static function setSearchLocations($value)
+    {
         if (is_array($value)) {
-			self::$_searchLocations = $value;
+            self::$searchLocations = $value;
         } else {
             throw new PHPExcel_Reader_Exception('Invalid parameter passed.');
         }
-	}	//	function setSearchLocations()
+    }
 
     /**
      * Add search location
@@ -115,9 +111,10 @@ class PHPExcel_IOFactory
      * @param    string $location    Example: PHPExcel/Writer/{0}.php
      * @param    string $classname     Example: PHPExcel_Writer_{0}
      */
-	public static function addSearchLocation($type = '', $location = '', $classname = '') {
-		self::$_searchLocations[] = array( 'type' => $type, 'path' => $location, 'class' => $classname );
-	}	//	function addSearchLocation()
+    public static function addSearchLocation($type = '', $location = '', $classname = '')
+    {
+        self::$searchLocations[] = array( 'type' => $type, 'path' => $location, 'class' => $classname );
+    }
 
     /**
      * Create PHPExcel_Writer_IWriter
@@ -129,17 +126,18 @@ class PHPExcel_IOFactory
      * @return    PHPExcel_Writer_IWriter
      * @throws    PHPExcel_Reader_Exception
      */
-	public static function createWriter(PHPExcel $phpExcel, $writerType = '') {
+    public static function createWriter(PHPExcel $phpExcel, $writerType = '')
+    {
         // Search type
         $searchType = 'IWriter';
 
         // Include class
-		foreach (self::$_searchLocations as $searchLocation) {
+        foreach (self::$searchLocations as $searchLocation) {
             if ($searchLocation['type'] == $searchType) {
                 $className = str_replace('{0}', $writerType, $searchLocation['class']);
 
                 $instance = new $className($phpExcel);
-				if ($instance !== NULL) {
+                if ($instance !== null) {
                     return $instance;
                 }
             }
@@ -147,7 +145,7 @@ class PHPExcel_IOFactory
 
         // Nothing found...
         throw new PHPExcel_Reader_Exception("No $searchType found for type $writerType");
-	}	//	function createWriter()
+    }
 
     /**
      * Create PHPExcel_Reader_IReader
@@ -158,17 +156,18 @@ class PHPExcel_IOFactory
      * @return    PHPExcel_Reader_IReader
      * @throws    PHPExcel_Reader_Exception
      */
-	public static function createReader($readerType = '') {
+    public static function createReader($readerType = '')
+    {
         // Search type
         $searchType = 'IReader';
 
         // Include class
-		foreach (self::$_searchLocations as $searchLocation) {
+        foreach (self::$searchLocations as $searchLocation) {
             if ($searchLocation['type'] == $searchType) {
                 $className = str_replace('{0}', $readerType, $searchLocation['class']);
 
                 $instance = new $className();
-				if ($instance !== NULL) {
+                if ($instance !== null) {
                     return $instance;
                 }
             }
@@ -176,7 +175,7 @@ class PHPExcel_IOFactory
 
         // Nothing found...
         throw new PHPExcel_Reader_Exception("No $searchType found for type $readerType");
-	}	//	function createReader()
+    }
 
     /**
      * Loads PHPExcel from file using automatic PHPExcel_Reader_IReader resolution
@@ -187,10 +186,11 @@ class PHPExcel_IOFactory
      * @return    PHPExcel
      * @throws    PHPExcel_Reader_Exception
      */
-	public static function load($pFilename) {
+    public static function load($pFilename)
+    {
         $reader = self::createReaderForFile($pFilename);
         return $reader->load($pFilename);
-	}	//	function load()
+    }
 
     /**
      * Identify file type using automatic PHPExcel_Reader_IReader resolution
@@ -201,13 +201,14 @@ class PHPExcel_IOFactory
      * @return    string
      * @throws    PHPExcel_Reader_Exception
      */
-	public static function identify($pFilename) {
+    public static function identify($pFilename)
+    {
         $reader = self::createReaderForFile($pFilename);
         $className = get_class($reader);
         $classType = explode('_', $className);
         unset($reader);
         return array_pop($classType);
-	}	//	function identify()
+    }
 
     /**
      * Create PHPExcel_Reader_IReader for file using automatic PHPExcel_Reader_IReader resolution
@@ -218,12 +219,12 @@ class PHPExcel_IOFactory
      * @return    PHPExcel_Reader_IReader
      * @throws    PHPExcel_Reader_Exception
      */
-	public static function createReaderForFile($pFilename) {
-
+    public static function createReaderForFile($pFilename)
+    {
         // First, lucky guess by inspecting file extension
         $pathinfo = pathinfo($pFilename);
 
-		$extensionType = NULL;
+        $extensionType = null;
         if (isset($pathinfo['extension'])) {
             switch (strtolower($pathinfo['extension'])) {
                 case 'xlsx':            //    Excel (OfficeOpenXML) Spreadsheet
@@ -262,7 +263,7 @@ class PHPExcel_IOFactory
                     break;
             }
 
-			if ($extensionType !== NULL) {
+            if ($extensionType !== null) {
                 $reader = self::createReader($extensionType);
                 // Let's see if we are lucky
                 if (isset($reader) && $reader->canRead($pFilename)) {
@@ -272,8 +273,8 @@ class PHPExcel_IOFactory
         }
 
         // If we reach here then "lucky guess" didn't give any result
-		// Try walking through all the options in self::$_autoResolveClasses
-		foreach (self::$_autoResolveClasses as $autoResolveClass) {
+        // Try walking through all the options in self::$autoResolveClasses
+        foreach (self::$autoResolveClasses as $autoResolveClass) {
             //    Ignore our original guess, we know that won't work
             if ($autoResolveClass !== $extensionType) {
                 $reader = self::createReader($autoResolveClass);
@@ -284,5 +285,5 @@ class PHPExcel_IOFactory
         }
 
         throw new PHPExcel_Reader_Exception('Unable to identify a reader for this file');
-	}	//	function createReaderForFile()
+    }
 }

Classes/PHPExcel/NamedRange.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * PHPExcel
+ * PHPExcel_NamedRange
  *
- * Copyright (c) 2006 - 2013 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,19 +21,10 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-
-/**
- * PHPExcel_NamedRange
- *
- * @category   PHPExcel
- * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
 class PHPExcel_NamedRange
 {
     /**
@@ -40,35 +32,35 @@ class PHPExcel_NamedRange
      *
      * @var string
      */
-	private $_name;
+    private $name;
 
     /**
      * Worksheet on which the named range can be resolved
      *
      * @var PHPExcel_Worksheet
      */
-	private $_worksheet;
+    private $worksheet;
 
     /**
      * Range of the referenced cells
      *
      * @var string
      */
-	private $_range;
+    private $range;
 
     /**
-	 * Is the named range local? (i.e. can only be used on $this->_worksheet)
+     * Is the named range local? (i.e. can only be used on $this->worksheet)
      *
      * @var bool
      */
-	private $_localOnly;
+    private $localOnly;
 
     /**
      * Scope
      *
      * @var PHPExcel_Worksheet
      */
-	private $_scope;
+    private $scope;
 
     /**
      * Create a new NamedRange
@@ -83,17 +75,16 @@ class PHPExcel_NamedRange
     public function __construct($pName = null, PHPExcel_Worksheet $pWorksheet, $pRange = 'A1', $pLocalOnly = false, $pScope = null)
     {
         // Validate data
-    	if (($pName === NULL) || ($pWorksheet === NULL) || ($pRange === NULL)) {
+        if (($pName === null) || ($pWorksheet === null) || ($pRange === null)) {
             throw new PHPExcel_Exception('Parameters can not be null.');
         }
 
         // Set local members
-    	$this->_name 		= $pName;
-    	$this->_worksheet 	= $pWorksheet;
-    	$this->_range 		= $pRange;
-    	$this->_localOnly 	= $pLocalOnly;
-    	$this->_scope 		= ($pLocalOnly == true) ?
-								(($pScope == null) ? $pWorksheet : $pScope) : null;
+        $this->name       = $pName;
+        $this->worksheet  = $pWorksheet;
+        $this->range      = $pRange;
+        $this->localOnly  = $pLocalOnly;
+        $this->scope      = ($pLocalOnly == true) ? (($pScope == null) ? $pWorksheet : $pScope) : null;
     }
 
     /**
@@ -101,8 +92,9 @@ class PHPExcel_NamedRange
      *
      * @return string
      */
-    public function getName() {
-    	return $this->_name;
+    public function getName()
+    {
+        return $this->name;
     }
 
     /**
@@ -111,24 +103,25 @@ class PHPExcel_NamedRange
      * @param string $value
      * @return PHPExcel_NamedRange
      */
-    public function setName($value = null) {
-    	if ($value !== NULL) {
+    public function setName($value = null)
+    {
+        if ($value !== null) {
             // Old title
-    		$oldTitle = $this->_name;
+            $oldTitle = $this->name;
 
             // Re-attach
-    		if ($this->_worksheet !== NULL) {
-    			$this->_worksheet->getParent()->removeNamedRange($this->_name,$this->_worksheet);
+            if ($this->worksheet !== null) {
+                $this->worksheet->getParent()->removeNamedRange($this->name, $this->worksheet);
             }
-    		$this->_name = $value;
+            $this->name = $value;
 
-    		if ($this->_worksheet !== NULL) {
-    			$this->_worksheet->getParent()->addNamedRange($this);
+            if ($this->worksheet !== null) {
+                $this->worksheet->getParent()->addNamedRange($this);
             }
 
             // New title
-	    	$newTitle = $this->_name;
-	    	PHPExcel_ReferenceHelper::getInstance()->updateNamedFormulas($this->_worksheet->getParent(), $oldTitle, $newTitle);
+            $newTitle = $this->name;
+            PHPExcel_ReferenceHelper::getInstance()->updateNamedFormulas($this->worksheet->getParent(), $oldTitle, $newTitle);
         }
         return $this;
     }
@@ -138,8 +131,9 @@ class PHPExcel_NamedRange
      *
      * @return PHPExcel_Worksheet
      */
-    public function getWorksheet() {
-    	return $this->_worksheet;
+    public function getWorksheet()
+    {
+        return $this->worksheet;
     }
 
     /**
@@ -148,9 +142,10 @@ class PHPExcel_NamedRange
      * @param PHPExcel_Worksheet $value
      * @return PHPExcel_NamedRange
      */
-    public function setWorksheet(PHPExcel_Worksheet $value = null) {
-    	if ($value !== NULL) {
-    		$this->_worksheet = $value;
+    public function setWorksheet(PHPExcel_Worksheet $value = null)
+    {
+        if ($value !== null) {
+            $this->worksheet = $value;
         }
         return $this;
     }
@@ -160,8 +155,9 @@ class PHPExcel_NamedRange
      *
      * @return string
      */
-    public function getRange() {
-    	return $this->_range;
+    public function getRange()
+    {
+        return $this->range;
     }
 
     /**
@@ -170,9 +166,10 @@ class PHPExcel_NamedRange
      * @param string $value
      * @return PHPExcel_NamedRange
      */
-    public function setRange($value = null) {
-    	if ($value !== NULL) {
-    		$this->_range = $value;
+    public function setRange($value = null)
+    {
+        if ($value !== null) {
+            $this->range = $value;
         }
         return $this;
     }
@@ -182,8 +179,9 @@ class PHPExcel_NamedRange
      *
      * @return bool
      */
-    public function getLocalOnly() {
-    	return $this->_localOnly;
+    public function getLocalOnly()
+    {
+        return $this->localOnly;
     }
 
     /**
@@ -192,9 +190,10 @@ class PHPExcel_NamedRange
      * @param bool $value
      * @return PHPExcel_NamedRange
      */
-    public function setLocalOnly($value = false) {
-    	$this->_localOnly = $value;
-    	$this->_scope = $value ? $this->_worksheet : null;
+    public function setLocalOnly($value = false)
+    {
+        $this->localOnly = $value;
+        $this->scope = $value ? $this->worksheet : null;
         return $this;
     }
 
@@ -203,8 +202,9 @@ class PHPExcel_NamedRange
      *
      * @return PHPExcel_Worksheet|null
      */
-    public function getScope() {
-    	return $this->_scope;
+    public function getScope()
+    {
+        return $this->scope;
     }
 
     /**
@@ -213,9 +213,10 @@ class PHPExcel_NamedRange
      * @param PHPExcel_Worksheet|null $value
      * @return PHPExcel_NamedRange
      */
-    public function setScope(PHPExcel_Worksheet $value = null) {
-    	$this->_scope = $value;
-    	$this->_localOnly = ($value == null) ? false : true;
+    public function setScope(PHPExcel_Worksheet $value = null)
+    {
+        $this->scope = $value;
+        $this->localOnly = ($value == null) ? false : true;
         return $this;
     }
 
@@ -226,14 +227,16 @@ class PHPExcel_NamedRange
      * @param PHPExcel_Worksheet|null $pSheet Scope. Use null for global scope
      * @return PHPExcel_NamedRange
      */
-    public static function resolveRange($pNamedRange = '', PHPExcel_Worksheet $pSheet) {
+    public static function resolveRange($pNamedRange = '', PHPExcel_Worksheet $pSheet)
+    {
         return $pSheet->getParent()->getNamedRange($pNamedRange, $pSheet);
     }
 
     /**
      * Implement PHP __clone to create a deep clone, not just a shallow copy.
      */
-	public function __clone() {
+    public function __clone()
+    {
         $vars = get_object_vars($this);
         foreach ($vars as $key => $value) {
             if (is_object($value)) {

Classes/PHPExcel/Reader/Abstract.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * PHPExcel
+ * PHPExcel_Reader_Abstract
  *
- * Copyright (c) 2006 - 2013 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,19 +21,10 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-
-/**
- * PHPExcel_Reader_Abstract
- *
- * @category	PHPExcel
- * @package	PHPExcel_Reader
- * @copyright	Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
 abstract class PHPExcel_Reader_Abstract implements PHPExcel_Reader_IReader
 {
     /**
@@ -42,7 +34,16 @@ abstract class PHPExcel_Reader_Abstract implements PHPExcel_Reader_IReader
      *
      * @var    boolean
      */
-	protected $_readDataOnly = FALSE;
+    protected $readDataOnly = false;
+
+    /**
+     * Read empty cells?
+     * Identifies whether the Reader should read data values for cells all cells, or should ignore cells containing
+     *         null value or empty string
+     *
+     * @var    boolean
+     */
+    protected $readEmptyCells = true;
 
     /**
      * Read charts that are defined in the workbook?
@@ -50,7 +51,7 @@ abstract class PHPExcel_Reader_Abstract implements PHPExcel_Reader_IReader
      *
      * @var    boolean
      */
-	protected $_includeCharts = FALSE;
+    protected $includeCharts = false;
 
     /**
      * Restrict which sheets should be loaded?
@@ -58,16 +59,16 @@ abstract class PHPExcel_Reader_Abstract implements PHPExcel_Reader_IReader
      *
      * @var array of string
      */
-	protected $_loadSheetsOnly = NULL;
+    protected $loadSheetsOnly;
 
     /**
      * PHPExcel_Reader_IReadFilter instance
      *
      * @var PHPExcel_Reader_IReadFilter
      */
-	protected $_readFilter = NULL;
+    protected $readFilter;
 
-	protected $_fileHandle = NULL;
+    protected $fileHandle = null;
 
 
     /**
@@ -77,8 +78,9 @@ abstract class PHPExcel_Reader_Abstract implements PHPExcel_Reader_IReader
      *
      * @return    boolean
      */
-	public function getReadDataOnly() {
-		return $this->_readDataOnly;
+    public function getReadDataOnly()
+    {
+        return $this->readDataOnly;
     }
 
     /**
@@ -90,8 +92,36 @@ abstract class PHPExcel_Reader_Abstract implements PHPExcel_Reader_IReader
      *
      * @return    PHPExcel_Reader_IReader
      */
-	public function setReadDataOnly($pValue = FALSE) {
-		$this->_readDataOnly = $pValue;
+    public function setReadDataOnly($pValue = false)
+    {
+        $this->readDataOnly = $pValue;
+        return $this;
+    }
+
+    /**
+     * Read empty cells?
+     *        If this is true (the default), then the Reader will read data values for all cells, irrespective of value.
+     *        If false it will not read data for cells containing a null value or an empty string.
+     *
+     * @return    boolean
+     */
+    public function getReadEmptyCells()
+    {
+        return $this->readEmptyCells;
+    }
+
+    /**
+     * Set read empty cells
+     *        Set to true (the default) to advise the Reader read data values for all cells, irrespective of value.
+     *        Set to false to advise the Reader to ignore cells containing a null value or an empty string.
+     *
+     * @param    boolean    $pValue
+     *
+     * @return    PHPExcel_Reader_IReader
+     */
+    public function setReadEmptyCells($pValue = true)
+    {
+        $this->readEmptyCells = $pValue;
         return $this;
     }
 
@@ -103,8 +133,9 @@ abstract class PHPExcel_Reader_Abstract implements PHPExcel_Reader_IReader
      *
      * @return    boolean
      */
-	public function getIncludeCharts() {
-		return $this->_includeCharts;
+    public function getIncludeCharts()
+    {
+        return $this->includeCharts;
     }
 
     /**
@@ -117,8 +148,9 @@ abstract class PHPExcel_Reader_Abstract implements PHPExcel_Reader_IReader
      *
      * @return    PHPExcel_Reader_IReader
      */
-	public function setIncludeCharts($pValue = FALSE) {
-		$this->_includeCharts = (boolean) $pValue;
+    public function setIncludeCharts($pValue = false)
+    {
+        $this->includeCharts = (boolean) $pValue;
         return $this;
     }
 
@@ -131,7 +163,7 @@ abstract class PHPExcel_Reader_Abstract implements PHPExcel_Reader_IReader
      */
     public function getLoadSheetsOnly()
     {
-		return $this->_loadSheetsOnly;
+        return $this->loadSheetsOnly;
     }
 
     /**
@@ -143,10 +175,13 @@ abstract class PHPExcel_Reader_Abstract implements PHPExcel_Reader_IReader
      *
      * @return PHPExcel_Reader_IReader
      */
-	public function setLoadSheetsOnly($value = NULL)
+    public function setLoadSheetsOnly($value = null)
     {
-		$this->_loadSheetsOnly = is_array($value) ?
-			$value : array($value);
+        if ($value === null) {
+            return $this->setLoadAllSheets();
+        }
+
+        $this->loadSheetsOnly = is_array($value) ? $value : array($value);
         return $this;
     }
 
@@ -158,7 +193,7 @@ abstract class PHPExcel_Reader_Abstract implements PHPExcel_Reader_IReader
      */
     public function setLoadAllSheets()
     {
-		$this->_loadSheetsOnly = NULL;
+        $this->loadSheetsOnly = null;
         return $this;
     }
 
@@ -167,8 +202,9 @@ abstract class PHPExcel_Reader_Abstract implements PHPExcel_Reader_IReader
      *
      * @return PHPExcel_Reader_IReadFilter
      */
-	public function getReadFilter() {
-		return $this->_readFilter;
+    public function getReadFilter()
+    {
+        return $this->readFilter;
     }
 
     /**
@@ -177,8 +213,9 @@ abstract class PHPExcel_Reader_Abstract implements PHPExcel_Reader_IReader
      * @param PHPExcel_Reader_IReadFilter $pValue
      * @return PHPExcel_Reader_IReader
      */
-	public function setReadFilter(PHPExcel_Reader_IReadFilter $pValue) {
-		$this->_readFilter = $pValue;
+    public function setReadFilter(PHPExcel_Reader_IReadFilter $pValue)
+    {
+        $this->readFilter = $pValue;
         return $this;
     }
 
@@ -189,7 +226,7 @@ abstract class PHPExcel_Reader_Abstract implements PHPExcel_Reader_IReader
      * @throws    PHPExcel_Reader_Exception
      * @return resource
      */
-	protected function _openFile($pFilename)
+    protected function openFile($pFilename)
     {
         // Check if file exists
         if (!file_exists($pFilename) || !is_readable($pFilename)) {
@@ -197,8 +234,8 @@ abstract class PHPExcel_Reader_Abstract implements PHPExcel_Reader_IReader
         }
 
         // Open file
-		$this->_fileHandle = fopen($pFilename, 'r');
-		if ($this->_fileHandle === FALSE) {
+        $this->fileHandle = fopen($pFilename, 'r');
+        if ($this->fileHandle === false) {
             throw new PHPExcel_Reader_Exception("Could not open file " . $pFilename . " for reading.");
         }
     }
@@ -214,14 +251,39 @@ abstract class PHPExcel_Reader_Abstract implements PHPExcel_Reader_IReader
     {
         // Check if file exists
         try {
-			$this->_openFile($pFilename);
+            $this->openFile($pFilename);
         } catch (Exception $e) {
-			return FALSE;
+            return false;
         }
 
-		$readable = $this->_isValidFormat();
-		fclose ($this->_fileHandle);
+        $readable = $this->isValidFormat();
+        fclose($this->fileHandle);
         return $readable;
     }
 
+    /**
+     * Scan theXML for use of <!ENTITY to prevent XXE/XEE attacks
+     *
+     * @param     string         $xml
+     * @throws PHPExcel_Reader_Exception
+     */
+    public function securityScan($xml)
+    {
+        $pattern = '/\\0?' . implode('\\0?', str_split('<!DOCTYPE')) . '\\0?/';
+        if (preg_match($pattern, $xml)) {
+            throw new PHPExcel_Reader_Exception('Detected use of ENTITY in XML, spreadsheet file load() aborted to prevent XXE/XEE attacks');
+        }
+        return $xml;
+    }
+
+    /**
+     * Scan theXML for use of <!ENTITY to prevent XXE/XEE attacks
+     *
+     * @param     string         $filestream
+     * @throws PHPExcel_Reader_Exception
+     */
+    public function securityScanFile($filestream)
+    {
+        return $this->securityScan(file_get_contents($filestream));
+    }
 }

Classes/PHPExcel/Reader/CSV.php

@@ -1,8 +1,18 @@
 <?php
+
+/** PHPExcel root directory */
+if (!defined('PHPEXCEL_ROOT')) {
     /**
- * PHPExcel
+     * @ignore
+     */
+    define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
+    require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+}
+
+/**
+ * PHPExcel_Reader_CSV
  *
- * Copyright (c) 2006 - 2013 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,28 +30,10 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-	/**
-	 * @ignore
-	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-/**
- * PHPExcel_Reader_CSV
- *
- * @category   PHPExcel
- * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
 class PHPExcel_Reader_CSV extends PHPExcel_Reader_Abstract implements PHPExcel_Reader_IReader
 {
     /**
@@ -50,7 +42,7 @@ class PHPExcel_Reader_CSV extends PHPExcel_Reader_Abstract implements PHPExcel_R
      * @access    private
      * @var    string
      */
-	private $_inputEncoding	= 'UTF-8';
+    private $inputEncoding = 'UTF-8';
 
     /**
      * Delimiter
@@ -58,7 +50,7 @@ class PHPExcel_Reader_CSV extends PHPExcel_Reader_Abstract implements PHPExcel_R
      * @access    private
      * @var string
      */
-	private $_delimiter		= ',';
+    private $delimiter = ',';
 
     /**
      * Enclosure
@@ -66,15 +58,7 @@ class PHPExcel_Reader_CSV extends PHPExcel_Reader_Abstract implements PHPExcel_R
      * @access    private
      * @var    string
      */
-	private $_enclosure		= '"';
-
-	/**
-	 * Line ending
-	 *
-	 * @access	private
-	 * @var	string
-	 */
-	private $_lineEnding	= PHP_EOL;
+    private $enclosure = '"';
 
     /**
      * Sheet index to read
@@ -82,7 +66,7 @@ class PHPExcel_Reader_CSV extends PHPExcel_Reader_Abstract implements PHPExcel_R
      * @access    private
      * @var    int
      */
-	private $_sheetIndex	= 0;
+    private $sheetIndex = 0;
 
     /**
      * Load rows contiguously
@@ -90,21 +74,22 @@ class PHPExcel_Reader_CSV extends PHPExcel_Reader_Abstract implements PHPExcel_R
      * @access    private
      * @var    int
      */
-	private $_contiguous	= false;
+    private $contiguous = false;
 
     /**
      * Row counter for loading rows contiguously
      *
      * @var    int
      */
-	private $_contiguousRow	= -1;
+    private $contiguousRow = -1;
 
 
     /**
      * Create a new PHPExcel_Reader_CSV
      */
-	public function __construct() {
-		$this->_readFilter		= new PHPExcel_Reader_DefaultReadFilter();
+    public function __construct()
+    {
+        $this->readFilter = new PHPExcel_Reader_DefaultReadFilter();
     }
 
     /**
@@ -112,9 +97,9 @@ class PHPExcel_Reader_CSV extends PHPExcel_Reader_Abstract implements PHPExcel_R
      *
      * @return boolean
      */
-	protected function _isValidFormat()
+    protected function isValidFormat()
     {
-		return TRUE;
+        return true;
     }
 
     /**
@@ -124,7 +109,7 @@ class PHPExcel_Reader_CSV extends PHPExcel_Reader_Abstract implements PHPExcel_R
      */
     public function setInputEncoding($pValue = 'UTF-8')
     {
-		$this->_inputEncoding = $pValue;
+        $this->inputEncoding = $pValue;
         return $this;
     }
 
@@ -135,43 +120,61 @@ class PHPExcel_Reader_CSV extends PHPExcel_Reader_Abstract implements PHPExcel_R
      */
     public function getInputEncoding()
     {
-		return $this->_inputEncoding;
+        return $this->inputEncoding;
     }
 
     /**
      * Move filepointer past any BOM marker
      *
      */
-	protected function _skipBOM()
+    protected function skipBOM()
     {
-		rewind($fileHandle);
+        rewind($this->fileHandle);
 
-		switch ($this->_inputEncoding) {
+        switch ($this->inputEncoding) {
             case 'UTF-8':
-				fgets($this->_fileHandle, 4) == "\xEF\xBB\xBF" ?
-				fseek($this->_fileHandle, 3) : fseek($this->_fileHandle, 0);
+                fgets($this->fileHandle, 4) == "\xEF\xBB\xBF" ?
+                    fseek($this->fileHandle, 3) : fseek($this->fileHandle, 0);
                 break;
             case 'UTF-16LE':
-				fgets($this->_fileHandle, 3) == "\xFF\xFE" ?
-				fseek($this->_fileHandle, 2) : fseek($this->_fileHandle, 0);
+                fgets($this->fileHandle, 3) == "\xFF\xFE" ?
+                    fseek($this->fileHandle, 2) : fseek($this->fileHandle, 0);
                 break;
             case 'UTF-16BE':
-				fgets($this->_fileHandle, 3) == "\xFE\xFF" ?
-				fseek($this->_fileHandle, 2) : fseek($this->_fileHandle, 0);
+                fgets($this->fileHandle, 3) == "\xFE\xFF" ?
+                    fseek($this->fileHandle, 2) : fseek($this->fileHandle, 0);
                 break;
             case 'UTF-32LE':
-				fgets($this->_fileHandle, 5) == "\xFF\xFE\x00\x00" ?
-				fseek($this->_fileHandle, 4) : fseek($this->_fileHandle, 0);
+                fgets($this->fileHandle, 5) == "\xFF\xFE\x00\x00" ?
+                    fseek($this->fileHandle, 4) : fseek($this->fileHandle, 0);
                 break;
             case 'UTF-32BE':
-				fgets($this->_fileHandle, 5) == "\x00\x00\xFE\xFF" ?
-				fseek($this->_fileHandle, 4) : fseek($this->_fileHandle, 0);
+                fgets($this->fileHandle, 5) == "\x00\x00\xFE\xFF" ?
+                    fseek($this->fileHandle, 4) : fseek($this->fileHandle, 0);
                 break;
             default:
                 break;
         }
     }
 
+    /**
+     * Identify any separator that is explicitly set in the file
+     *
+     */
+    protected function checkSeparator()
+    {
+        $line = fgets($this->fileHandle);
+        if ($line === false) {
+            return;
+        }
+
+        if ((strlen(trim($line, "\r\n")) == 5) && (stripos($line, 'sep=') === 0)) {
+            $this->delimiter = substr($line, 4, 1);
+            return;
+        }
+        return $this->skipBOM();
+    }
+
     /**
      * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns)
      *
@@ -181,17 +184,18 @@ class PHPExcel_Reader_CSV extends PHPExcel_Reader_Abstract implements PHPExcel_R
     public function listWorksheetInfo($pFilename)
     {
         // Open file
-		$this->_openFile($pFilename);
-		if (!$this->_isValidFormat()) {
-			fclose ($this->_fileHandle);
+        $this->openFile($pFilename);
+        if (!$this->isValidFormat()) {
+            fclose($this->fileHandle);
             throw new PHPExcel_Reader_Exception($pFilename . " is an Invalid Spreadsheet file.");
         }
-		$fileHandle = $this->_fileHandle;
+        $fileHandle = $this->fileHandle;
 
         // Skip BOM, if any
-		$this->_skipBOM();
+        $this->skipBOM();
+        $this->checkSeparator();
 
-		$escapeEnclosures = array( "\\" . $this->_enclosure, $this->_enclosure . $this->_enclosure );
+        $escapeEnclosures = array( "\\" . $this->enclosure, $this->enclosure . $this->enclosure );
 
         $worksheetInfo = array();
         $worksheetInfo[0]['worksheetName'] = 'Worksheet';
@@ -201,7 +205,7 @@ class PHPExcel_Reader_CSV extends PHPExcel_Reader_Abstract implements PHPExcel_R
         $worksheetInfo[0]['totalColumns'] = 0;
 
         // Loop through each line of the file in turn
-		while (($rowData = fgetcsv($fileHandle, 0, $this->_delimiter, $this->_enclosure)) !== FALSE) {
+        while (($rowData = fgetcsv($fileHandle, 0, $this->delimiter, $this->enclosure)) !== false) {
             $worksheetInfo[0]['totalRows']++;
             $worksheetInfo[0]['lastColumnIndex'] = max($worksheetInfo[0]['lastColumnIndex'], count($rowData) - 1);
         }
@@ -245,43 +249,44 @@ class PHPExcel_Reader_CSV extends PHPExcel_Reader_Abstract implements PHPExcel_R
         ini_set('auto_detect_line_endings', true);
 
         // Open file
-		$this->_openFile($pFilename);
-		if (!$this->_isValidFormat()) {
-			fclose ($this->_fileHandle);
+        $this->openFile($pFilename);
+        if (!$this->isValidFormat()) {
+            fclose($this->fileHandle);
             throw new PHPExcel_Reader_Exception($pFilename . " is an Invalid Spreadsheet file.");
         }
-		$fileHandle = $this->_fileHandle;
+        $fileHandle = $this->fileHandle;
 
         // Skip BOM, if any
-		$this->_skipBOM();
+        $this->skipBOM();
+        $this->checkSeparator();
 
         // Create new PHPExcel object
-		while ($objPHPExcel->getSheetCount() <= $this->_sheetIndex) {
+        while ($objPHPExcel->getSheetCount() <= $this->sheetIndex) {
             $objPHPExcel->createSheet();
         }
-		$sheet = $objPHPExcel->setActiveSheetIndex($this->_sheetIndex);
+        $sheet = $objPHPExcel->setActiveSheetIndex($this->sheetIndex);
 
-		$escapeEnclosures = array( "\\" . $this->_enclosure,
-								   $this->_enclosure . $this->_enclosure
+        $escapeEnclosures = array( "\\" . $this->enclosure,
+                                   $this->enclosure . $this->enclosure
                                  );
 
         // Set our starting row based on whether we're in contiguous mode or not
         $currentRow = 1;
-		if ($this->_contiguous) {
-			$currentRow = ($this->_contiguousRow == -1) ? $sheet->getHighestRow(): $this->_contiguousRow;
+        if ($this->contiguous) {
+            $currentRow = ($this->contiguousRow == -1) ? $sheet->getHighestRow(): $this->contiguousRow;
         }
 
         // Loop through each line of the file in turn
-		while (($rowData = fgetcsv($fileHandle, 0, $this->_delimiter, $this->_enclosure)) !== FALSE) {
+        while (($rowData = fgetcsv($fileHandle, 0, $this->delimiter, $this->enclosure)) !== false) {
             $columnLetter = 'A';
             foreach ($rowData as $rowDatum) {
-				if ($rowDatum != '' && $this->_readFilter->readCell($columnLetter, $currentRow)) {
+                if ($rowDatum != '' && $this->readFilter->readCell($columnLetter, $currentRow)) {
                     // Unescape enclosures
-					$rowDatum = str_replace($escapeEnclosures, $this->_enclosure, $rowDatum);
+                    $rowDatum = str_replace($escapeEnclosures, $this->enclosure, $rowDatum);
 
                     // Convert encoding if necessary
-					if ($this->_inputEncoding !== 'UTF-8') {
-						$rowDatum = PHPExcel_Shared_String::ConvertEncoding($rowDatum, 'UTF-8', $this->_inputEncoding);
+                    if ($this->inputEncoding !== 'UTF-8') {
+                        $rowDatum = PHPExcel_Shared_String::ConvertEncoding($rowDatum, 'UTF-8', $this->inputEncoding);
                     }
 
                     // Set cell value
@@ -295,8 +300,8 @@ class PHPExcel_Reader_CSV extends PHPExcel_Reader_Abstract implements PHPExcel_R
         // Close file
         fclose($fileHandle);
 
-		if ($this->_contiguous) {
-			$this->_contiguousRow = $currentRow;
+        if ($this->contiguous) {
+            $this->contiguousRow = $currentRow;
         }
 
         ini_set('auto_detect_line_endings', $lineEnding);
@@ -310,8 +315,9 @@ class PHPExcel_Reader_CSV extends PHPExcel_Reader_Abstract implements PHPExcel_R
      *
      * @return string
      */
-	public function getDelimiter() {
-		return $this->_delimiter;
+    public function getDelimiter()
+    {
+        return $this->delimiter;
     }
 
     /**
@@ -320,8 +326,9 @@ class PHPExcel_Reader_CSV extends PHPExcel_Reader_Abstract implements PHPExcel_R
      * @param    string    $pValue        Delimiter, defaults to ,
      * @return    PHPExcel_Reader_CSV
      */
-	public function setDelimiter($pValue = ',') {
-		$this->_delimiter = $pValue;
+    public function setDelimiter($pValue = ',')
+    {
+        $this->delimiter = $pValue;
         return $this;
     }
 
@@ -330,8 +337,9 @@ class PHPExcel_Reader_CSV extends PHPExcel_Reader_Abstract implements PHPExcel_R
      *
      * @return string
      */
-	public function getEnclosure() {
-		return $this->_enclosure;
+    public function getEnclosure()
+    {
+        return $this->enclosure;
     }
 
     /**
@@ -340,31 +348,12 @@ class PHPExcel_Reader_CSV extends PHPExcel_Reader_Abstract implements PHPExcel_R
      * @param    string    $pValue        Enclosure, defaults to "
      * @return PHPExcel_Reader_CSV
      */
-	public function setEnclosure($pValue = '"') {
+    public function setEnclosure($pValue = '"')
+    {
         if ($pValue == '') {
             $pValue = '"';
         }
-		$this->_enclosure = $pValue;
-		return $this;
-	}
-
-	/**
-	 * Get line ending
-	 *
-	 * @return string
-	 */
-	public function getLineEnding() {
-		return $this->_lineEnding;
-	}
-
-	/**
-	 * Set line ending
-	 *
-	 * @param	string	$pValue		Line ending, defaults to OS line ending (PHP_EOL)
-	 * @return PHPExcel_Reader_CSV
-	 */
-	public function setLineEnding($pValue = PHP_EOL) {
-		$this->_lineEnding = $pValue;
+        $this->enclosure = $pValue;
         return $this;
     }
 
@@ -373,8 +362,9 @@ class PHPExcel_Reader_CSV extends PHPExcel_Reader_Abstract implements PHPExcel_R
      *
      * @return integer
      */
-	public function getSheetIndex() {
-		return $this->_sheetIndex;
+    public function getSheetIndex()
+    {
+        return $this->sheetIndex;
     }
 
     /**
@@ -383,8 +373,9 @@ class PHPExcel_Reader_CSV extends PHPExcel_Reader_Abstract implements PHPExcel_R
      * @param    integer        $pValue        Sheet index
      * @return PHPExcel_Reader_CSV
      */
-	public function setSheetIndex($pValue = 0) {
-		$this->_sheetIndex = $pValue;
+    public function setSheetIndex($pValue = 0)
+    {
+        $this->sheetIndex = $pValue;
         return $this;
     }
 
@@ -393,11 +384,11 @@ class PHPExcel_Reader_CSV extends PHPExcel_Reader_Abstract implements PHPExcel_R
      *
      * @param boolean $contiguous
      */
-	public function setContiguous($contiguous = FALSE)
+    public function setContiguous($contiguous = false)
     {
-		$this->_contiguous = (bool) $contiguous;
+        $this->contiguous = (bool) $contiguous;
         if (!$contiguous) {
-			$this->_contiguousRow = -1;
+            $this->contiguousRow = -1;
         }
 
         return $this;
@@ -408,8 +399,8 @@ class PHPExcel_Reader_CSV extends PHPExcel_Reader_Abstract implements PHPExcel_R
      *
      * @return boolean
      */
-	public function getContiguous() {
-		return $this->_contiguous;
+    public function getContiguous()
+    {
+        return $this->contiguous;
     }
-
 }

Classes/PHPExcel/Reader/DefaultReadFilter.php

@@ -1,8 +1,18 @@
 <?php
+
+/** PHPExcel root directory */
+if (!defined('PHPEXCEL_ROOT')) {
     /**
- * PHPExcel
+     * @ignore
+     */
+    define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
+    require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+}
+
+/**
+ * PHPExcel_Reader_DefaultReadFilter
  *
- * Copyright (c) 2006 - 2013 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,39 +30,22 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-	/**
-	 * @ignore
-	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-/**
- * PHPExcel_Reader_DefaultReadFilter
- *
- * @category   PHPExcel
- * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
 class PHPExcel_Reader_DefaultReadFilter implements PHPExcel_Reader_IReadFilter
 {
     /**
      * Should this cell be read?
      *
-	 * @param 	$column		String column index
-	 * @param 	$row			Row index
+     * @param    $column           Column address (as a string value like "A", or "IV")
+     * @param    $row              Row number
      * @param    $worksheetName    Optional worksheet name
      * @return   boolean
      */
-	public function readCell($column, $row, $worksheetName = '') {
+    public function readCell($column, $row, $worksheetName = '')
+    {
         return true;
     }
 }

Classes/PHPExcel/Reader/Excel2003XML.php

@@ -1,8 +1,18 @@
 <?php
+
+/** PHPExcel root directory */
+if (!defined('PHPEXCEL_ROOT')) {
     /**
- * PHPExcel
+     * @ignore
+     */
+    define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
+    require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+}
+
+/**
+ * PHPExcel_Reader_Excel2003XML
  *
- * Copyright (c) 2006 - 2013 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,28 +30,10 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-	/**
-	 * @ignore
-	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-/**
- * PHPExcel_Reader_Excel2003XML
- *
- * @category   PHPExcel
- * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
 class PHPExcel_Reader_Excel2003XML extends PHPExcel_Reader_Abstract implements PHPExcel_Reader_IReader
 {
     /**
@@ -49,21 +41,21 @@ class PHPExcel_Reader_Excel2003XML extends PHPExcel_Reader_Abstract implements P
      *
      * @var array
      */
-	private $_styles = array();
+    protected $styles = array();
 
     /**
      * Character set used in the file
      *
      * @var string
      */
-	private $_charSet = 'UTF-8';
-
+    protected $charSet = 'UTF-8';
 
     /**
      * Create a new PHPExcel_Reader_Excel2003XML
      */
-	public function __construct() {
-		$this->_readFilter 	= new PHPExcel_Reader_DefaultReadFilter();
+    public function __construct()
+    {
+        $this->readFilter = new PHPExcel_Reader_DefaultReadFilter();
     }
 
 
@@ -93,8 +85,8 @@ class PHPExcel_Reader_Excel2003XML extends PHPExcel_Reader_Abstract implements P
             );
 
         // Open file
-		$this->_openFile($pFilename);
-		$fileHandle = $this->_fileHandle;
+        $this->openFile($pFilename);
+        $fileHandle = $this->fileHandle;
         
         // Read sample data (first 2 KB will do)
         $data = fread($fileHandle, 2048);
@@ -111,9 +103,9 @@ class PHPExcel_Reader_Excel2003XML extends PHPExcel_Reader_Abstract implements P
 
         //    Retrieve charset encoding
         if (preg_match('/<?xml.*encoding=[\'"](.*?)[\'"].*?>/um', $data, $matches)) {
-			$this->_charSet = strtoupper($matches[1]);
+            $this->charSet = strtoupper($matches[1]);
         }
-//		echo 'Character Set is ',$this->_charSet,'<br />';
+//        echo 'Character Set is ', $this->charSet,'<br />';
 
         return $valid;
     }
@@ -137,13 +129,13 @@ class PHPExcel_Reader_Excel2003XML extends PHPExcel_Reader_Abstract implements P
 
         $worksheetNames = array();
 
-		$xml = simplexml_load_file($pFilename);
+        $xml = simplexml_load_string($this->securityScan(file_get_contents($pFilename)), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions());
         $namespaces = $xml->getNamespaces(true);
 
         $xml_ss = $xml->children($namespaces['ss']);
         foreach ($xml_ss->Worksheet as $worksheet) {
             $worksheet_ss = $worksheet->attributes($namespaces['ss']);
-			$worksheetNames[] = self::_convertStringEncoding((string) $worksheet_ss['Name'],$this->_charSet);
+            $worksheetNames[] = self::convertStringEncoding((string) $worksheet_ss['Name'], $this->charSet);
         }
 
         return $worksheetNames;
@@ -165,7 +157,7 @@ class PHPExcel_Reader_Excel2003XML extends PHPExcel_Reader_Abstract implements P
 
         $worksheetInfo = array();
 
-		$xml = simplexml_load_file($pFilename);
+        $xml = simplexml_load_string($this->securityScan(file_get_contents($pFilename)), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions());
         $namespaces = $xml->getNamespaces(true);
 
         $worksheetID = 1;
@@ -232,13 +224,14 @@ class PHPExcel_Reader_Excel2003XML extends PHPExcel_Reader_Abstract implements P
     {
         // Create new PHPExcel
         $objPHPExcel = new PHPExcel();
+        $objPHPExcel->removeSheetByIndex(0);
 
         // Load into this instance
         return $this->loadIntoExisting($pFilename, $objPHPExcel);
     }
 
-
-	private static function identifyFixedStyleValue($styleList,&$styleAttributeValue) {
+    protected static function identifyFixedStyleValue($styleList, &$styleAttributeValue)
+    {
         $styleAttributeValue = strtolower($styleAttributeValue);
         foreach ($styleList as $style) {
             if ($styleAttributeValue == strtolower($style)) {
@@ -249,13 +242,13 @@ class PHPExcel_Reader_Excel2003XML extends PHPExcel_Reader_Abstract implements P
         return false;
     }
 
-
     /**
      * pixel units to excel width units(units of 1/256th of a character width)
      * @param pxs
      * @return
      */
- 	private static function _pixel2WidthUnits($pxs) {
+    protected static function pixel2WidthUnits($pxs)
+    {
         $UNIT_OFFSET_MAP = array(0, 36, 73, 109, 146, 182, 219);
 
         $widthUnits = 256 * ($pxs / 7);
@@ -263,25 +256,24 @@ class PHPExcel_Reader_Excel2003XML extends PHPExcel_Reader_Abstract implements P
         return $widthUnits;
     }
 
-
     /**
      * excel width units(units of 1/256th of a character width) to pixel units
      * @param widthUnits
      * @return
      */
-	private static function _widthUnits2Pixel($widthUnits) {
+    protected static function widthUnits2Pixel($widthUnits)
+    {
         $pixels = ($widthUnits / 256) * 7;
         $offsetWidthUnits = $widthUnits % 256;
         $pixels += round($offsetWidthUnits / (256 / 7));
         return $pixels;
     }
 
-
-	private static function _hex2str($hex) {
+    protected static function hex2str($hex)
+    {
         return chr(hexdec($hex[1]));
     }
 
-
     /**
      * Loads PHPExcel from file into PHPExcel instance
      *
@@ -320,7 +312,6 @@ class PHPExcel_Reader_Excel2003XML extends PHPExcel_Reader_Abstract implements P
         $timezoneObj = new DateTimeZone('Europe/London');
         $GMT = new DateTimeZone('UTC');
 
-
         // Check if file exists
         if (!file_exists($pFilename)) {
             throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! File does not exist.");
@@ -330,7 +321,7 @@ class PHPExcel_Reader_Excel2003XML extends PHPExcel_Reader_Abstract implements P
             throw new PHPExcel_Reader_Exception($pFilename . " is an Invalid Spreadsheet file.");
         }
 
-		$xml = simplexml_load_file($pFilename);
+        $xml = simplexml_load_string($this->securityScan(file_get_contents($pFilename)), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions());
         $namespaces = $xml->getNamespaces(true);
 
         $docProps = $objPHPExcel->getProperties();
@@ -338,39 +329,39 @@ class PHPExcel_Reader_Excel2003XML extends PHPExcel_Reader_Abstract implements P
             foreach ($xml->DocumentProperties[0] as $propertyName => $propertyValue) {
                 switch ($propertyName) {
                     case 'Title':
-							$docProps->setTitle(self::_convertStringEncoding($propertyValue,$this->_charSet));
+                        $docProps->setTitle(self::convertStringEncoding($propertyValue, $this->charSet));
                         break;
                     case 'Subject':
-							$docProps->setSubject(self::_convertStringEncoding($propertyValue,$this->_charSet));
+                        $docProps->setSubject(self::convertStringEncoding($propertyValue, $this->charSet));
                         break;
                     case 'Author':
-							$docProps->setCreator(self::_convertStringEncoding($propertyValue,$this->_charSet));
+                        $docProps->setCreator(self::convertStringEncoding($propertyValue, $this->charSet));
                         break;
                     case 'Created':
                         $creationDate = strtotime($propertyValue);
                         $docProps->setCreated($creationDate);
                         break;
                     case 'LastAuthor':
-							$docProps->setLastModifiedBy(self::_convertStringEncoding($propertyValue,$this->_charSet));
+                        $docProps->setLastModifiedBy(self::convertStringEncoding($propertyValue, $this->charSet));
                         break;
                     case 'LastSaved':
                         $lastSaveDate = strtotime($propertyValue);
                         $docProps->setModified($lastSaveDate);
                         break;
                     case 'Company':
-							$docProps->setCompany(self::_convertStringEncoding($propertyValue,$this->_charSet));
+                        $docProps->setCompany(self::convertStringEncoding($propertyValue, $this->charSet));
                         break;
                     case 'Category':
-							$docProps->setCategory(self::_convertStringEncoding($propertyValue,$this->_charSet));
+                        $docProps->setCategory(self::convertStringEncoding($propertyValue, $this->charSet));
                         break;
                     case 'Manager':
-							$docProps->setManager(self::_convertStringEncoding($propertyValue,$this->_charSet));
+                        $docProps->setManager(self::convertStringEncoding($propertyValue, $this->charSet));
                         break;
                     case 'Keywords':
-							$docProps->setKeywords(self::_convertStringEncoding($propertyValue,$this->_charSet));
+                        $docProps->setKeywords(self::convertStringEncoding($propertyValue, $this->charSet));
                         break;
                     case 'Description':
-							$docProps->setDescription(self::_convertStringEncoding($propertyValue,$this->_charSet));
+                        $docProps->setDescription(self::convertStringEncoding($propertyValue, $this->charSet));
                         break;
                 }
             }
@@ -378,7 +369,7 @@ class PHPExcel_Reader_Excel2003XML extends PHPExcel_Reader_Abstract implements P
         if (isset($xml->CustomDocumentProperties)) {
             foreach ($xml->CustomDocumentProperties[0] as $propertyName => $propertyValue) {
                 $propertyAttributes = $propertyValue->attributes($namespaces['dt']);
-				$propertyName = preg_replace_callback('/_x([0-9a-z]{4})_/','PHPExcel_Reader_Excel2003XML::_hex2str',$propertyName);
+                $propertyName = preg_replace_callback('/_x([0-9a-z]{4})_/', 'PHPExcel_Reader_Excel2003XML::hex2str', $propertyName);
                 $propertyType = PHPExcel_DocumentProperties::PROPERTY_TYPE_UNKNOWN;
                 switch ((string) $propertyAttributes) {
                     case 'string':
@@ -410,11 +401,7 @@ class PHPExcel_Reader_Excel2003XML extends PHPExcel_Reader_Abstract implements P
             $style_ss = $style->attributes($namespaces['ss']);
             $styleID = (string) $style_ss['ID'];
 //            echo 'Style ID = '.$styleID.'<br />';
-			if ($styleID == 'Default') {
-				$this->_styles['Default'] = array();
-			} else {
-				$this->_styles[$styleID] = $this->_styles['Default'];
-			}
+            $this->styles[$styleID] = (isset($this->styles['Default'])) ? $this->styles['Default'] : array();
             foreach ($style as $styleType => $styleData) {
                 $styleAttributes = $styleData->attributes($namespaces['ss']);
 //                echo $styleType.'<br />';
@@ -426,16 +413,16 @@ class PHPExcel_Reader_Excel2003XML extends PHPExcel_Reader_Abstract implements P
                             switch ($styleAttributeKey) {
                                 case 'Vertical':
                                     if (self::identifyFixedStyleValue($verticalAlignmentStyles, $styleAttributeValue)) {
-												$this->_styles[$styleID]['alignment']['vertical'] = $styleAttributeValue;
+                                        $this->styles[$styleID]['alignment']['vertical'] = $styleAttributeValue;
                                     }
                                     break;
                                 case 'Horizontal':
                                     if (self::identifyFixedStyleValue($horizontalAlignmentStyles, $styleAttributeValue)) {
-												$this->_styles[$styleID]['alignment']['horizontal'] = $styleAttributeValue;
+                                        $this->styles[$styleID]['alignment']['horizontal'] = $styleAttributeValue;
                                     }
                                     break;
                                 case 'WrapText':
-											$this->_styles[$styleID]['alignment']['wrap'] = true;
+                                    $this->styles[$styleID]['alignment']['wrap'] = true;
                                     break;
                             }
                         }
@@ -465,7 +452,7 @@ class PHPExcel_Reader_Excel2003XML extends PHPExcel_Reader_Abstract implements P
                             }
                             if (!empty($thisBorder)) {
                                 if (($borderPosition == 'left') || ($borderPosition == 'right') || ($borderPosition == 'top') || ($borderPosition == 'bottom')) {
-										$this->_styles[$styleID]['borders'][$borderPosition] = $thisBorder;
+                                    $this->styles[$styleID]['borders'][$borderPosition] = $thisBorder;
                                 }
                             }
                         }
@@ -476,23 +463,23 @@ class PHPExcel_Reader_Excel2003XML extends PHPExcel_Reader_Abstract implements P
                             $styleAttributeValue = (string) $styleAttributeValue;
                             switch ($styleAttributeKey) {
                                 case 'FontName':
-											$this->_styles[$styleID]['font']['name'] = $styleAttributeValue;
+                                    $this->styles[$styleID]['font']['name'] = $styleAttributeValue;
                                     break;
                                 case 'Size':
-											$this->_styles[$styleID]['font']['size'] = $styleAttributeValue;
+                                    $this->styles[$styleID]['font']['size'] = $styleAttributeValue;
                                     break;
                                 case 'Color':
-											$this->_styles[$styleID]['font']['color']['rgb'] = substr($styleAttributeValue,1);
+                                    $this->styles[$styleID]['font']['color']['rgb'] = substr($styleAttributeValue, 1);
                                     break;
                                 case 'Bold':
-											$this->_styles[$styleID]['font']['bold'] = true;
+                                    $this->styles[$styleID]['font']['bold'] = true;
                                     break;
                                 case 'Italic':
-											$this->_styles[$styleID]['font']['italic'] = true;
+                                    $this->styles[$styleID]['font']['italic'] = true;
                                     break;
                                 case 'Underline':
                                     if (self::identifyFixedStyleValue($underlineStyles, $styleAttributeValue)) {
-												$this->_styles[$styleID]['font']['underline'] = $styleAttributeValue;
+                                        $this->styles[$styleID]['font']['underline'] = $styleAttributeValue;
                                     }
                                     break;
                             }
@@ -503,7 +490,7 @@ class PHPExcel_Reader_Excel2003XML extends PHPExcel_Reader_Abstract implements P
 //                                echo $styleAttributeKey.' = '.$styleAttributeValue.'<br />';
                             switch ($styleAttributeKey) {
                                 case 'Color':
-											$this->_styles[$styleID]['fill']['color']['rgb'] = substr($styleAttributeValue,1);
+                                    $this->styles[$styleID]['fill']['color']['rgb'] = substr($styleAttributeValue, 1);
                                     break;
                             }
                         }
@@ -518,7 +505,7 @@ class PHPExcel_Reader_Excel2003XML extends PHPExcel_Reader_Abstract implements P
                                     break;
                             }
                             if ($styleAttributeValue > '') {
-									$this->_styles[$styleID]['numberformat']['code'] = $styleAttributeValue;
+                                $this->styles[$styleID]['numberformat']['code'] = $styleAttributeValue;
                             }
                         }
                         break;
@@ -529,7 +516,7 @@ class PHPExcel_Reader_Excel2003XML extends PHPExcel_Reader_Abstract implements P
                         break;
                 }
             }
-//			print_r($this->_styles[$styleID]);
+//            print_r($this->styles[$styleID]);
 //            echo '<hr />';
         }
 //        echo '<hr />';
@@ -540,8 +527,8 @@ class PHPExcel_Reader_Excel2003XML extends PHPExcel_Reader_Abstract implements P
         foreach ($xml_ss->Worksheet as $worksheet) {
             $worksheet_ss = $worksheet->attributes($namespaces['ss']);
 
-			if ((isset($this->_loadSheetsOnly)) && (isset($worksheet_ss['Name'])) &&
-				(!in_array($worksheet_ss['Name'], $this->_loadSheetsOnly))) {
+            if ((isset($this->loadSheetsOnly)) && (isset($worksheet_ss['Name'])) &&
+                (!in_array($worksheet_ss['Name'], $this->loadSheetsOnly))) {
                 continue;
             }
 
@@ -551,7 +538,7 @@ class PHPExcel_Reader_Excel2003XML extends PHPExcel_Reader_Abstract implements P
             $objPHPExcel->createSheet();
             $objPHPExcel->setActiveSheetIndex($worksheetID);
             if (isset($worksheet_ss['Name'])) {
-				$worksheetName = self::_convertStringEncoding((string) $worksheet_ss['Name'],$this->_charSet);
+                $worksheetName = self::convertStringEncoding((string) $worksheet_ss['Name'], $this->charSet);
                 //    Use false for $updateFormulaCellReferences to prevent adjustment of worksheet references in
                 //        formula cells... during the load, all formulae should be correct, and we're simply bringing
                 //        the worksheet name in line with the formula, not the reverse
@@ -576,6 +563,7 @@ class PHPExcel_Reader_Excel2003XML extends PHPExcel_Reader_Abstract implements P
 
             $rowID = 1;
             if (isset($worksheet->Table->Row)) {
+                $additionalMergedCells = 0;
                 foreach ($worksheet->Table->Row as $rowData) {
                     $rowHasData = false;
                     $row_ss = $rowData->attributes($namespaces['ss']);
@@ -586,14 +574,13 @@ class PHPExcel_Reader_Excel2003XML extends PHPExcel_Reader_Abstract implements P
 
                     $columnID = 'A';
                     foreach ($rowData->Cell as $cell) {
-
                         $cell_ss = $cell->attributes($namespaces['ss']);
                         if (isset($cell_ss['Index'])) {
                             $columnID = PHPExcel_Cell::stringFromColumnIndex($cell_ss['Index']-1);
                         }
                         $cellRange = $columnID.$rowID;
 
-						if ($this->getReadFilter() !== NULL) {
+                        if ($this->getReadFilter() !== null) {
                             if (!$this->getReadFilter()->readCell($columnID, $rowID, $worksheetName)) {
                                 continue;
                             }
@@ -602,6 +589,7 @@ class PHPExcel_Reader_Excel2003XML extends PHPExcel_Reader_Abstract implements P
                         if ((isset($cell_ss['MergeAcross'])) || (isset($cell_ss['MergeDown']))) {
                             $columnTo = $columnID;
                             if (isset($cell_ss['MergeAcross'])) {
+                                $additionalMergedCells += (int)$cell_ss['MergeAcross'];
                                 $columnTo = PHPExcel_Cell::stringFromColumnIndex(PHPExcel_Cell::columnIndexFromString($columnID) + $cell_ss['MergeAcross'] -1);
                             }
                             $rowTo = $rowID;
@@ -640,7 +628,7 @@ class PHPExcel_Reader_Excel2003XML extends PHPExcel_Reader_Abstract implements P
                                     const TYPE_ERROR        = 'e';
                                     */
                                     case 'String':
-											$cellValue = self::_convertStringEncoding($cellValue,$this->_charSet);
+                                        $cellValue = self::convertStringEncoding($cellValue, $this->charSet);
                                         $type = PHPExcel_Cell_DataType::TYPE_STRING;
                                         break;
                                     case 'Number':
@@ -697,14 +685,22 @@ class PHPExcel_Reader_Excel2003XML extends PHPExcel_Reader_Abstract implements P
                                             foreach ($cellReferences as $cellReference) {
                                                 $rowReference = $cellReference[2][0];
                                                 //    Empty R reference is the current row
-												if ($rowReference == '') $rowReference = $rowID;
+                                                if ($rowReference == '') {
+                                                    $rowReference = $rowID;
+                                                }
                                                 //    Bracketed R references are relative to the current row
-												if ($rowReference{0} == '[') $rowReference = $rowID + trim($rowReference,'[]');
+                                                if ($rowReference{0} == '[') {
+                                                    $rowReference = $rowID + trim($rowReference, '[]');
+                                                }
                                                 $columnReference = $cellReference[4][0];
                                                 //    Empty C reference is the current column
-												if ($columnReference == '') $columnReference = $columnNumber;
+                                                if ($columnReference == '') {
+                                                    $columnReference = $columnNumber;
+                                                }
                                                 //    Bracketed C references are relative to the current column
-												if ($columnReference{0} == '[') $columnReference = $columnNumber + trim($columnReference,'[]');
+                                                if ($columnReference{0} == '[') {
+                                                    $columnReference = $columnNumber + trim($columnReference, '[]');
+                                                }
                                                 $A1CellReference = PHPExcel_Cell::stringFromColumnIndex($columnReference-1).$rowReference;
                                                 $value = substr_replace($value, $A1CellReference, $cellReference[0][1], strlen($cellReference[0][0]));
                                             }
@@ -740,25 +736,27 @@ class PHPExcel_Reader_Excel2003XML extends PHPExcel_Reader_Abstract implements P
 //                            echo $annotation,'<br />';
                             $annotation = strip_tags($node);
 //                            echo 'Annotation: ', $annotation,'<br />';
-							$objPHPExcel->getActiveSheet()->getComment( $columnID.$rowID )
-															->setAuthor(self::_convertStringEncoding($author ,$this->_charSet))
-															->setText($this->_parseRichText($annotation) );
+                            $objPHPExcel->getActiveSheet()->getComment($columnID.$rowID)->setAuthor(self::convertStringEncoding($author, $this->charSet))->setText($this->parseRichText($annotation));
                         }
 
                         if (($cellIsSet) && (isset($cell_ss['StyleID']))) {
                             $style = (string) $cell_ss['StyleID'];
 //                            echo 'Cell style for '.$columnID.$rowID.' is '.$style.'<br />';
-							if ((isset($this->_styles[$style])) && (!empty($this->_styles[$style]))) {
+                            if ((isset($this->styles[$style])) && (!empty($this->styles[$style]))) {
 //                                echo 'Cell '.$columnID.$rowID.'<br />';
-//								print_r($this->_styles[$style]);
+//                                print_r($this->styles[$style]);
 //                                echo '<br />';
                                 if (!$objPHPExcel->getActiveSheet()->cellExists($columnID.$rowID)) {
-									$objPHPExcel->getActiveSheet()->getCell($columnID.$rowID)->setValue(NULL);
+                                    $objPHPExcel->getActiveSheet()->getCell($columnID.$rowID)->setValue(null);
                                 }
-								$objPHPExcel->getActiveSheet()->getStyle($cellRange)->applyFromArray($this->_styles[$style]);
+                                $objPHPExcel->getActiveSheet()->getStyle($cellRange)->applyFromArray($this->styles[$style]);
                             }
                         }
                         ++$columnID;
+                        while ($additionalMergedCells > 0) {
+                            ++$columnID;
+                            $additionalMergedCells--;
+                        }
                     }
 
                     if ($rowHasData) {
@@ -783,7 +781,8 @@ class PHPExcel_Reader_Excel2003XML extends PHPExcel_Reader_Abstract implements P
     }
 
 
-	private static function _convertStringEncoding($string,$charset) {
+    protected static function convertStringEncoding($string, $charset)
+    {
         if ($charset != 'UTF-8') {
             return PHPExcel_Shared_String::ConvertEncoding($string, 'UTF-8', $charset);
         }
@@ -791,12 +790,12 @@ class PHPExcel_Reader_Excel2003XML extends PHPExcel_Reader_Abstract implements P
     }
 
 
-	private function _parseRichText($is = '') {
+    protected function parseRichText($is = '')
+    {
         $value = new PHPExcel_RichText();
 
-		$value->createText(self::_convertStringEncoding($is,$this->_charSet));
+        $value->createText(self::convertStringEncoding($is, $this->charSet));
 
         return $value;
     }
-
 }

Classes/PHPExcel/Reader/Excel2007/Chart.php

@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2013 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,7 +20,7 @@
  *
  * @category    PHPExcel
  * @package        PHPExcel_Reader_Excel2007
- * @copyright	Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
@@ -30,11 +30,12 @@
  *
  * @category    PHPExcel
  * @package        PHPExcel_Reader_Excel2007
- * @copyright	Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright    Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Reader_Excel2007_Chart
 {
-	private static function _getAttribute($component, $name, $format) {
+    private static function getAttribute($component, $name, $format)
+    {
         $attributes = $component->attributes();
         if (isset($attributes[$name])) {
             if ($format == 'string') {
@@ -48,10 +49,11 @@ class PHPExcel_Reader_Excel2007_Chart
             }
         }
         return null;
-	}	//	function _getAttribute()
+    }
 
 
-	private static function _readColor($color,$background=false) {
+    private static function readColor($color, $background = false)
+    {
         if (isset($color["rgb"])) {
             return (string)$color["rgb"];
         } elseif (isset($color["indexed"])) {
@@ -59,13 +61,13 @@ class PHPExcel_Reader_Excel2007_Chart
         }
     }
 
-
-	public static function readChart($chartElements,$chartName) {
+    public static function readChart($chartElements, $chartName)
+    {
         $namespacesChartMeta = $chartElements->getNamespaces(true);
         $chartElementsC = $chartElements->children($namespacesChartMeta['c']);
 
-		$XaxisLabel = $YaxisLabel = $legend = $title = NULL;
-		$dispBlanksAs = $plotVisOnly = NULL;
+        $XaxisLabel = $YaxisLabel = $legend = $title = null;
+        $dispBlanksAs = $plotVisOnly = null;
 
         foreach ($chartElementsC as $chartElementKey => $chartElement) {
             switch ($chartElementKey) {
@@ -79,99 +81,99 @@ class PHPExcel_Reader_Excel2007_Chart
                                 foreach ($chartDetails as $chartDetailKey => $chartDetail) {
                                     switch ($chartDetailKey) {
                                         case "layout":
-												$plotAreaLayout = self::_chartLayoutDetails($chartDetail,$namespacesChartMeta,'plotArea');
+                                            $plotAreaLayout = self::chartLayoutDetails($chartDetail, $namespacesChartMeta, 'plotArea');
                                             break;
                                         case "catAx":
                                             if (isset($chartDetail->title)) {
-													$XaxisLabel = self::_chartTitle($chartDetail->title->children($namespacesChartMeta['c']),$namespacesChartMeta,'cat');
+                                                $XaxisLabel = self::chartTitle($chartDetail->title->children($namespacesChartMeta['c']), $namespacesChartMeta, 'cat');
                                             }
                                             break;
                                         case "dateAx":
                                             if (isset($chartDetail->title)) {
-													$XaxisLabel = self::_chartTitle($chartDetail->title->children($namespacesChartMeta['c']),$namespacesChartMeta,'cat');
+                                                $XaxisLabel = self::chartTitle($chartDetail->title->children($namespacesChartMeta['c']), $namespacesChartMeta, 'cat');
                                             }
                                             break;
                                         case "valAx":
                                             if (isset($chartDetail->title)) {
-													$YaxisLabel = self::_chartTitle($chartDetail->title->children($namespacesChartMeta['c']),$namespacesChartMeta,'cat');
+                                                $YaxisLabel = self::chartTitle($chartDetail->title->children($namespacesChartMeta['c']), $namespacesChartMeta, 'cat');
                                             }
                                             break;
                                         case "barChart":
                                         case "bar3DChart":
-												$barDirection = self::_getAttribute($chartDetail->barDir, 'val', 'string');
-												$plotSer = self::_chartDataSeries($chartDetail,$namespacesChartMeta,$chartDetailKey);
+                                            $barDirection = self::getAttribute($chartDetail->barDir, 'val', 'string');
+                                            $plotSer = self::chartDataSeries($chartDetail, $namespacesChartMeta, $chartDetailKey);
                                             $plotSer->setPlotDirection($barDirection);
                                             $plotSeries[] = $plotSer;
-												$plotAttributes = self::_readChartAttributes($chartDetail);
+                                            $plotAttributes = self::readChartAttributes($chartDetail);
                                             break;
                                         case "lineChart":
                                         case "line3DChart":
-												$plotSeries[] = self::_chartDataSeries($chartDetail,$namespacesChartMeta,$chartDetailKey);
-												$plotAttributes = self::_readChartAttributes($chartDetail);
+                                            $plotSeries[] = self::chartDataSeries($chartDetail, $namespacesChartMeta, $chartDetailKey);
+                                            $plotAttributes = self::readChartAttributes($chartDetail);
                                             break;
                                         case "areaChart":
                                         case "area3DChart":
-												$plotSeries[] = self::_chartDataSeries($chartDetail,$namespacesChartMeta,$chartDetailKey);
-												$plotAttributes = self::_readChartAttributes($chartDetail);
+                                            $plotSeries[] = self::chartDataSeries($chartDetail, $namespacesChartMeta, $chartDetailKey);
+                                            $plotAttributes = self::readChartAttributes($chartDetail);
                                             break;
                                         case "doughnutChart":
                                         case "pieChart":
                                         case "pie3DChart":
                                             $explosion = isset($chartDetail->ser->explosion);
-												$plotSer = self::_chartDataSeries($chartDetail,$namespacesChartMeta,$chartDetailKey);
+                                            $plotSer = self::chartDataSeries($chartDetail, $namespacesChartMeta, $chartDetailKey);
                                             $plotSer->setPlotStyle($explosion);
                                             $plotSeries[] = $plotSer;
-												$plotAttributes = self::_readChartAttributes($chartDetail);
+                                            $plotAttributes = self::readChartAttributes($chartDetail);
                                             break;
                                         case "scatterChart":
-												$scatterStyle = self::_getAttribute($chartDetail->scatterStyle, 'val', 'string');
-												$plotSer = self::_chartDataSeries($chartDetail,$namespacesChartMeta,$chartDetailKey);
+                                            $scatterStyle = self::getAttribute($chartDetail->scatterStyle, 'val', 'string');
+                                            $plotSer = self::chartDataSeries($chartDetail, $namespacesChartMeta, $chartDetailKey);
                                             $plotSer->setPlotStyle($scatterStyle);
                                             $plotSeries[] = $plotSer;
-												$plotAttributes = self::_readChartAttributes($chartDetail);
+                                            $plotAttributes = self::readChartAttributes($chartDetail);
                                             break;
                                         case "bubbleChart":
-												$bubbleScale = self::_getAttribute($chartDetail->bubbleScale, 'val', 'integer');
-												$plotSer = self::_chartDataSeries($chartDetail,$namespacesChartMeta,$chartDetailKey);
+                                            $bubbleScale = self::getAttribute($chartDetail->bubbleScale, 'val', 'integer');
+                                            $plotSer = self::chartDataSeries($chartDetail, $namespacesChartMeta, $chartDetailKey);
                                             $plotSer->setPlotStyle($bubbleScale);
                                             $plotSeries[] = $plotSer;
-												$plotAttributes = self::_readChartAttributes($chartDetail);
+                                            $plotAttributes = self::readChartAttributes($chartDetail);
                                             break;
                                         case "radarChart":
-												$radarStyle = self::_getAttribute($chartDetail->radarStyle, 'val', 'string');
-												$plotSer = self::_chartDataSeries($chartDetail,$namespacesChartMeta,$chartDetailKey);
+                                            $radarStyle = self::getAttribute($chartDetail->radarStyle, 'val', 'string');
+                                            $plotSer = self::chartDataSeries($chartDetail, $namespacesChartMeta, $chartDetailKey);
                                             $plotSer->setPlotStyle($radarStyle);
                                             $plotSeries[] = $plotSer;
-												$plotAttributes = self::_readChartAttributes($chartDetail);
+                                            $plotAttributes = self::readChartAttributes($chartDetail);
                                             break;
                                         case "surfaceChart":
                                         case "surface3DChart":
-												$wireFrame = self::_getAttribute($chartDetail->wireframe, 'val', 'boolean');
-												$plotSer = self::_chartDataSeries($chartDetail,$namespacesChartMeta,$chartDetailKey);
+                                            $wireFrame = self::getAttribute($chartDetail->wireframe, 'val', 'boolean');
+                                            $plotSer = self::chartDataSeries($chartDetail, $namespacesChartMeta, $chartDetailKey);
                                             $plotSer->setPlotStyle($wireFrame);
                                             $plotSeries[] = $plotSer;
-												$plotAttributes = self::_readChartAttributes($chartDetail);
+                                            $plotAttributes = self::readChartAttributes($chartDetail);
                                             break;
                                         case "stockChart":
-												$plotSeries[] = self::_chartDataSeries($chartDetail,$namespacesChartMeta,$chartDetailKey);
-												$plotAttributes = self::_readChartAttributes($plotAreaLayout);
+                                            $plotSeries[] = self::chartDataSeries($chartDetail, $namespacesChartMeta, $chartDetailKey);
+                                            $plotAttributes = self::readChartAttributes($plotAreaLayout);
                                             break;
                                     }
                                 }
-									if ($plotAreaLayout == NULL) {
+                                if ($plotAreaLayout == null) {
                                     $plotAreaLayout = new PHPExcel_Chart_Layout();
                                 }
                                 $plotArea = new PHPExcel_Chart_PlotArea($plotAreaLayout, $plotSeries);
-									self::_setChartAttributes($plotAreaLayout,$plotAttributes);
+                                self::setChartAttributes($plotAreaLayout, $plotAttributes);
                                 break;
                             case "plotVisOnly":
-									$plotVisOnly = self::_getAttribute($chartDetails, 'val', 'string');
+                                $plotVisOnly = self::getAttribute($chartDetails, 'val', 'string');
                                 break;
                             case "dispBlanksAs":
-									$dispBlanksAs = self::_getAttribute($chartDetails, 'val', 'string');
+                                $dispBlanksAs = self::getAttribute($chartDetails, 'val', 'string');
                                 break;
                             case "title":
-									$title = self::_chartTitle($chartDetails,$namespacesChartMeta,'title');
+                                $title = self::chartTitle($chartDetails, $namespacesChartMeta, 'title');
                                 break;
                             case "legend":
                                 $legendPos = 'r';
@@ -180,13 +182,13 @@ class PHPExcel_Reader_Excel2007_Chart
                                 foreach ($chartDetails as $chartDetailKey => $chartDetail) {
                                     switch ($chartDetailKey) {
                                         case "legendPos":
-												$legendPos = self::_getAttribute($chartDetail, 'val', 'string');
+                                            $legendPos = self::getAttribute($chartDetail, 'val', 'string');
                                             break;
                                         case "overlay":
-												$legendOverlay = self::_getAttribute($chartDetail, 'val', 'boolean');
+                                            $legendOverlay = self::getAttribute($chartDetail, 'val', 'boolean');
                                             break;
                                         case "layout":
-												$legendLayout = self::_chartLayoutDetails($chartDetail,$namespacesChartMeta,'legend');
+                                            $legendLayout = self::chartLayoutDetails($chartDetail, $namespacesChartMeta, 'legend');
                                             break;
                                     }
                                 }
@@ -199,10 +201,10 @@ class PHPExcel_Reader_Excel2007_Chart
         $chart = new PHPExcel_Chart($chartName, $title, $legend, $plotArea, $plotVisOnly, $dispBlanksAs, $XaxisLabel, $YaxisLabel);
 
         return $chart;
-	}	//	function readChart()
+    }
 
-
-	private static function _chartTitle($titleDetails,$namespacesChartMeta,$type) {
+    private static function chartTitle($titleDetails, $namespacesChartMeta, $type)
+    {
         $caption = array();
         $titleLayout = null;
         foreach ($titleDetails as $titleDetailKey => $chartDetail) {
@@ -213,21 +215,21 @@ class PHPExcel_Reader_Excel2007_Chart
                         switch ($titleKey) {
                             case "p":
                                 $titleDetailPart = $titleDetail->children($namespacesChartMeta['a']);
-								$caption[] = self::_parseRichText($titleDetailPart);
+                                $caption[] = self::parseRichText($titleDetailPart);
                         }
                     }
                     break;
                 case "layout":
-					$titleLayout = self::_chartLayoutDetails($chartDetail,$namespacesChartMeta);
+                    $titleLayout = self::chartLayoutDetails($chartDetail, $namespacesChartMeta);
                     break;
             }
         }
 
         return new PHPExcel_Chart_Title($caption, $titleLayout);
-	}	//	function _chartTitle()
+    }
 
-
-	private static function _chartLayoutDetails($chartDetail,$namespacesChartMeta) {
+    private static function chartLayoutDetails($chartDetail, $namespacesChartMeta)
+    {
         if (!isset($chartDetail->manualLayout)) {
             return null;
         }
@@ -237,15 +239,15 @@ class PHPExcel_Reader_Excel2007_Chart
         }
         $layout = array();
         foreach ($details as $detailKey => $detail) {
-//			echo $detailKey,' => ',self::_getAttribute($detail, 'val', 'string'),PHP_EOL;
-			$layout[$detailKey] = self::_getAttribute($detail, 'val', 'string');
+//            echo $detailKey, ' => ',self::getAttribute($detail, 'val', 'string'),PHP_EOL;
+            $layout[$detailKey] = self::getAttribute($detail, 'val', 'string');
         }
         return new PHPExcel_Chart_Layout($layout);
-	}	//	function _chartLayoutDetails()
+    }
 
-
-	private static function _chartDataSeries($chartDetail,$namespacesChartMeta,$plotType) {
-		$multiSeriesType = NULL;
+    private static function chartDataSeries($chartDetail, $namespacesChartMeta, $plotType)
+    {
+        $multiSeriesType = null;
         $smoothLine = false;
         $seriesLabel = $seriesCategory = $seriesValues = $plotOrder = array();
 
@@ -253,77 +255,79 @@ class PHPExcel_Reader_Excel2007_Chart
         foreach ($seriesDetailSet as $seriesDetailKey => $seriesDetails) {
             switch ($seriesDetailKey) {
                 case "grouping":
-					$multiSeriesType = self::_getAttribute($chartDetail->grouping, 'val', 'string');
+                    $multiSeriesType = self::getAttribute($chartDetail->grouping, 'val', 'string');
                     break;
                 case "ser":
-					$marker = NULL;
+                    $marker = null;
                     foreach ($seriesDetails as $seriesKey => $seriesDetail) {
                         switch ($seriesKey) {
                             case "idx":
-								$seriesIndex = self::_getAttribute($seriesDetail, 'val', 'integer');
+                                $seriesIndex = self::getAttribute($seriesDetail, 'val', 'integer');
                                 break;
                             case "order":
-								$seriesOrder = self::_getAttribute($seriesDetail, 'val', 'integer');
+                                $seriesOrder = self::getAttribute($seriesDetail, 'val', 'integer');
                                 $plotOrder[$seriesIndex] = $seriesOrder;
                                 break;
                             case "tx":
-								$seriesLabel[$seriesIndex] = self::_chartDataSeriesValueSet($seriesDetail,$namespacesChartMeta);
+                                $seriesLabel[$seriesIndex] = self::chartDataSeriesValueSet($seriesDetail, $namespacesChartMeta);
                                 break;
                             case "marker":
-								$marker = self::_getAttribute($seriesDetail->symbol, 'val', 'string');
+                                $marker = self::getAttribute($seriesDetail->symbol, 'val', 'string');
                                 break;
                             case "smooth":
-								$smoothLine = self::_getAttribute($seriesDetail, 'val', 'boolean');
+                                $smoothLine = self::getAttribute($seriesDetail, 'val', 'boolean');
                                 break;
                             case "cat":
-								$seriesCategory[$seriesIndex] = self::_chartDataSeriesValueSet($seriesDetail,$namespacesChartMeta);
+                                $seriesCategory[$seriesIndex] = self::chartDataSeriesValueSet($seriesDetail, $namespacesChartMeta);
                                 break;
                             case "val":
-								$seriesValues[$seriesIndex] = self::_chartDataSeriesValueSet($seriesDetail,$namespacesChartMeta,$marker);
+                                $seriesValues[$seriesIndex] = self::chartDataSeriesValueSet($seriesDetail, $namespacesChartMeta, $marker);
                                 break;
                             case "xVal":
-								$seriesCategory[$seriesIndex] = self::_chartDataSeriesValueSet($seriesDetail,$namespacesChartMeta,$marker);
+                                $seriesCategory[$seriesIndex] = self::chartDataSeriesValueSet($seriesDetail, $namespacesChartMeta, $marker);
                                 break;
                             case "yVal":
-								$seriesValues[$seriesIndex] = self::_chartDataSeriesValueSet($seriesDetail,$namespacesChartMeta,$marker);
+                                $seriesValues[$seriesIndex] = self::chartDataSeriesValueSet($seriesDetail, $namespacesChartMeta, $marker);
                                 break;
                         }
                     }
             }
         }
         return new PHPExcel_Chart_DataSeries($plotType, $multiSeriesType, $plotOrder, $seriesLabel, $seriesCategory, $seriesValues, $smoothLine);
-	}	//	function _chartDataSeries()
+    }
 
 
-	private static function _chartDataSeriesValueSet($seriesDetail, $namespacesChartMeta, $marker = null, $smoothLine = false) {
+    private static function chartDataSeriesValueSet($seriesDetail, $namespacesChartMeta, $marker = null, $smoothLine = false)
+    {
         if (isset($seriesDetail->strRef)) {
             $seriesSource = (string) $seriesDetail->strRef->f;
-			$seriesData = self::_chartDataSeriesValues($seriesDetail->strRef->strCache->children($namespacesChartMeta['c']),'s');
+            $seriesData = self::chartDataSeriesValues($seriesDetail->strRef->strCache->children($namespacesChartMeta['c']), 's');
 
             return new PHPExcel_Chart_DataSeriesValues('String', $seriesSource, $seriesData['formatCode'], $seriesData['pointCount'], $seriesData['dataValues'], $marker, $smoothLine);
         } elseif (isset($seriesDetail->numRef)) {
             $seriesSource = (string) $seriesDetail->numRef->f;
-			$seriesData = self::_chartDataSeriesValues($seriesDetail->numRef->numCache->children($namespacesChartMeta['c']));
+            $seriesData = self::chartDataSeriesValues($seriesDetail->numRef->numCache->children($namespacesChartMeta['c']));
 
             return new PHPExcel_Chart_DataSeriesValues('Number', $seriesSource, $seriesData['formatCode'], $seriesData['pointCount'], $seriesData['dataValues'], $marker, $smoothLine);
         } elseif (isset($seriesDetail->multiLvlStrRef)) {
             $seriesSource = (string) $seriesDetail->multiLvlStrRef->f;
-			$seriesData = self::_chartDataSeriesValuesMultiLevel($seriesDetail->multiLvlStrRef->multiLvlStrCache->children($namespacesChartMeta['c']),'s');
+            $seriesData = self::chartDataSeriesValuesMultiLevel($seriesDetail->multiLvlStrRef->multiLvlStrCache->children($namespacesChartMeta['c']), 's');
             $seriesData['pointCount'] = count($seriesData['dataValues']);
 
             return new PHPExcel_Chart_DataSeriesValues('String', $seriesSource, $seriesData['formatCode'], $seriesData['pointCount'], $seriesData['dataValues'], $marker, $smoothLine);
         } elseif (isset($seriesDetail->multiLvlNumRef)) {
             $seriesSource = (string) $seriesDetail->multiLvlNumRef->f;
-			$seriesData = self::_chartDataSeriesValuesMultiLevel($seriesDetail->multiLvlNumRef->multiLvlNumCache->children($namespacesChartMeta['c']),'s');
+            $seriesData = self::chartDataSeriesValuesMultiLevel($seriesDetail->multiLvlNumRef->multiLvlNumCache->children($namespacesChartMeta['c']), 's');
             $seriesData['pointCount'] = count($seriesData['dataValues']);
 
             return new PHPExcel_Chart_DataSeriesValues('String', $seriesSource, $seriesData['formatCode'], $seriesData['pointCount'], $seriesData['dataValues'], $marker, $smoothLine);
         }
         return null;
-	}	//	function _chartDataSeriesValueSet()
+    }
 
 
-	private static function _chartDataSeriesValues($seriesValueSet,$dataType='n') {
+    private static function chartDataSeriesValues($seriesValueSet, $dataType = 'n')
+    {
         $seriesVal = array();
         $formatCode = '';
         $pointCount = 0;
@@ -331,13 +335,13 @@ class PHPExcel_Reader_Excel2007_Chart
         foreach ($seriesValueSet as $seriesValueIdx => $seriesValue) {
             switch ($seriesValueIdx) {
                 case 'ptCount':
-					$pointCount = self::_getAttribute($seriesValue, 'val', 'integer');
+                    $pointCount = self::getAttribute($seriesValue, 'val', 'integer');
                     break;
                 case 'formatCode':
                     $formatCode = (string) $seriesValue;
                     break;
                 case 'pt':
-					$pointVal = self::_getAttribute($seriesValue, 'idx', 'integer');
+                    $pointVal = self::getAttribute($seriesValue, 'idx', 'integer');
                     if ($dataType == 's') {
                         $seriesVal[$pointVal] = (string) $seriesValue->v;
                     } else {
@@ -347,18 +351,15 @@ class PHPExcel_Reader_Excel2007_Chart
             }
         }
 
-		if (empty($seriesVal)) {
-			$seriesVal = NULL;
-		}
-
-		return array( 'formatCode'	=> $formatCode,
+        return array(
+            'formatCode'    => $formatCode,
             'pointCount'    => $pointCount,
             'dataValues'    => $seriesVal
         );
-	}	//	function _chartDataSeriesValues()
+    }
 
-
-	private static function _chartDataSeriesValuesMultiLevel($seriesValueSet,$dataType='n') {
+    private static function chartDataSeriesValuesMultiLevel($seriesValueSet, $dataType = 'n')
+    {
         $seriesVal = array();
         $formatCode = '';
         $pointCount = 0;
@@ -367,13 +368,13 @@ class PHPExcel_Reader_Excel2007_Chart
             foreach ($seriesLevel as $seriesValueIdx => $seriesValue) {
                 switch ($seriesValueIdx) {
                     case 'ptCount':
-						$pointCount = self::_getAttribute($seriesValue, 'val', 'integer');
+                        $pointCount = self::getAttribute($seriesValue, 'val', 'integer');
                         break;
                     case 'formatCode':
                         $formatCode = (string) $seriesValue;
                         break;
                     case 'pt':
-						$pointVal = self::_getAttribute($seriesValue, 'idx', 'integer');
+                        $pointVal = self::getAttribute($seriesValue, 'idx', 'integer');
                         if ($dataType == 's') {
                             $seriesVal[$pointVal][] = (string) $seriesValue->v;
                         } else {
@@ -384,13 +385,15 @@ class PHPExcel_Reader_Excel2007_Chart
             }
         }
 
-		return array( 'formatCode'	=> $formatCode,
+        return array(
+            'formatCode'    => $formatCode,
             'pointCount'    => $pointCount,
             'dataValues'    => $seriesVal
         );
-	}	//	function _chartDataSeriesValuesMultiLevel()
+    }
 
-	private static function _parseRichText($titleDetailPart = null) {
+    private static function parseRichText($titleDetailPart = null)
+    {
         $value = new PHPExcel_RichText();
 
         foreach ($titleDetailPart as $titleDetailElementKey => $titleDetailElement) {
@@ -402,27 +405,27 @@ class PHPExcel_Reader_Excel2007_Chart
                     $objText->getFont()->setName((string) $titleDetailElement->rPr->rFont["val"]);
                 }
 
-				$fontSize = (self::_getAttribute($titleDetailElement->rPr, 'sz', 'integer'));
+                $fontSize = (self::getAttribute($titleDetailElement->rPr, 'sz', 'integer'));
                 if (!is_null($fontSize)) {
                     $objText->getFont()->setSize(floor($fontSize / 100));
                 }
 
-				$fontColor = (self::_getAttribute($titleDetailElement->rPr, 'color', 'string'));
+                $fontColor = (self::getAttribute($titleDetailElement->rPr, 'color', 'string'));
                 if (!is_null($fontColor)) {
-					$objText->getFont()->setColor( new PHPExcel_Style_Color( self::_readColor($fontColor) ) );
+                    $objText->getFont()->setColor(new PHPExcel_Style_Color(self::readColor($fontColor)));
                 }
 
-				$bold = self::_getAttribute($titleDetailElement->rPr, 'b', 'boolean');
+                $bold = self::getAttribute($titleDetailElement->rPr, 'b', 'boolean');
                 if (!is_null($bold)) {
                     $objText->getFont()->setBold($bold);
                 }
 
-				$italic = self::_getAttribute($titleDetailElement->rPr, 'i', 'boolean');
+                $italic = self::getAttribute($titleDetailElement->rPr, 'i', 'boolean');
                 if (!is_null($italic)) {
                     $objText->getFont()->setItalic($italic);
                 }
 
-				$baseline = self::_getAttribute($titleDetailElement->rPr, 'baseline', 'integer');
+                $baseline = self::getAttribute($titleDetailElement->rPr, 'baseline', 'integer');
                 if (!is_null($baseline)) {
                     if ($baseline > 0) {
                         $objText->getFont()->setSuperScript(true);
@@ -431,7 +434,7 @@ class PHPExcel_Reader_Excel2007_Chart
                     }
                 }
 
-				$underscore = (self::_getAttribute($titleDetailElement->rPr, 'u', 'string'));
+                $underscore = (self::getAttribute($titleDetailElement->rPr, 'u', 'string'));
                 if (!is_null($underscore)) {
                     if ($underscore == 'sng') {
                         $objText->getFont()->setUnderline(PHPExcel_Style_Font::UNDERLINE_SINGLE);
@@ -442,7 +445,7 @@ class PHPExcel_Reader_Excel2007_Chart
                     }
                 }
 
-				$strikethrough = (self::_getAttribute($titleDetailElement->rPr, 's', 'string'));
+                $strikethrough = (self::getAttribute($titleDetailElement->rPr, 's', 'string'));
                 if (!is_null($strikethrough)) {
                     if ($strikethrough == 'noStrike') {
                         $objText->getFont()->setStrikethrough(false);
@@ -456,36 +459,37 @@ class PHPExcel_Reader_Excel2007_Chart
         return $value;
     }
 
-	private static function _readChartAttributes($chartDetail) {
+    private static function readChartAttributes($chartDetail)
+    {
         $plotAttributes = array();
         if (isset($chartDetail->dLbls)) {
             if (isset($chartDetail->dLbls->howLegendKey)) {
-				$plotAttributes['showLegendKey'] = self::_getAttribute($chartDetail->dLbls->showLegendKey, 'val', 'string');
+                $plotAttributes['showLegendKey'] = self::getAttribute($chartDetail->dLbls->showLegendKey, 'val', 'string');
             }
             if (isset($chartDetail->dLbls->showVal)) {
-				$plotAttributes['showVal'] = self::_getAttribute($chartDetail->dLbls->showVal, 'val', 'string');
+                $plotAttributes['showVal'] = self::getAttribute($chartDetail->dLbls->showVal, 'val', 'string');
             }
             if (isset($chartDetail->dLbls->showCatName)) {
-				$plotAttributes['showCatName'] = self::_getAttribute($chartDetail->dLbls->showCatName, 'val', 'string');
+                $plotAttributes['showCatName'] = self::getAttribute($chartDetail->dLbls->showCatName, 'val', 'string');
             }
             if (isset($chartDetail->dLbls->showSerName)) {
-				$plotAttributes['showSerName'] = self::_getAttribute($chartDetail->dLbls->showSerName, 'val', 'string');
+                $plotAttributes['showSerName'] = self::getAttribute($chartDetail->dLbls->showSerName, 'val', 'string');
             }
             if (isset($chartDetail->dLbls->showPercent)) {
-				$plotAttributes['showPercent'] = self::_getAttribute($chartDetail->dLbls->showPercent, 'val', 'string');
+                $plotAttributes['showPercent'] = self::getAttribute($chartDetail->dLbls->showPercent, 'val', 'string');
             }
             if (isset($chartDetail->dLbls->showBubbleSize)) {
-				$plotAttributes['showBubbleSize'] = self::_getAttribute($chartDetail->dLbls->showBubbleSize, 'val', 'string');
+                $plotAttributes['showBubbleSize'] = self::getAttribute($chartDetail->dLbls->showBubbleSize, 'val', 'string');
             }
             if (isset($chartDetail->dLbls->showLeaderLines)) {
-				$plotAttributes['showLeaderLines'] = self::_getAttribute($chartDetail->dLbls->showLeaderLines, 'val', 'string');
+                $plotAttributes['showLeaderLines'] = self::getAttribute($chartDetail->dLbls->showLeaderLines, 'val', 'string');
             }
         }
 
         return $plotAttributes;
     }
 
-	private static function _setChartAttributes($plotArea,$plotAttributes)
+    private static function setChartAttributes($plotArea, $plotAttributes)
     {
         foreach ($plotAttributes as $plotAttributeKey => $plotAttributeValue) {
             switch ($plotAttributeKey) {
@@ -513,5 +517,4 @@ class PHPExcel_Reader_Excel2007_Chart
             }
         }
     }
-
 }

Classes/PHPExcel/Reader/Excel2007/Theme.php

@@ -2,7 +2,7 @@
 /**
  * PHPExcel
  *
- * Copyright (c) 2006 - 2013 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,7 +20,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Reader_Excel2007
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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,7 +31,7 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Reader_Excel2007
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @copyright  Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_Reader_Excel2007_Theme
 {
@@ -40,21 +40,21 @@ class PHPExcel_Reader_Excel2007_Theme
      *
      * @var string
      */
-	private $_themeName;
+    private $themeName;
 
     /**
      * Colour Scheme Name
      *
      * @var string
      */
-	private $_colourSchemeName;
+    private $colourSchemeName;
 
     /**
      * Colour Map indexed by position
      *
      * @var array of string
      */
-	private $_colourMapValues;
+    private $colourMapValues;
 
 
     /**
@@ -62,7 +62,7 @@ class PHPExcel_Reader_Excel2007_Theme
      *
      * @var array of string
      */
-	private $_colourMap;
+    private $colourMap;
 
 
     /**
@@ -72,9 +72,9 @@ class PHPExcel_Reader_Excel2007_Theme
     public function __construct($themeName, $colourSchemeName, $colourMap)
     {
         // Initialise values
-    	$this->_themeName			= $themeName;
-		$this->_colourSchemeName	= $colourSchemeName;
-		$this->_colourMap			= $colourMap;
+        $this->themeName        = $themeName;
+        $this->colourSchemeName = $colourSchemeName;
+        $this->colourMap        = $colourMap;
     }
 
     /**
@@ -84,7 +84,7 @@ class PHPExcel_Reader_Excel2007_Theme
      */
     public function getThemeName()
     {
-		return $this->_themeName;
+        return $this->themeName;
     }
 
     /**
@@ -92,8 +92,9 @@ class PHPExcel_Reader_Excel2007_Theme
      *
      * @return string
      */
-    public function getColourSchemeName() {
-		return $this->_colourSchemeName;
+    public function getColourSchemeName()
+    {
+        return $this->colourSchemeName;
     }
 
     /**
@@ -101,9 +102,10 @@ class PHPExcel_Reader_Excel2007_Theme
      *
      * @return string
      */
-    public function getColourByIndex($index=0) {
-    	if (isset($this->_colourMap[$index])) {
-			return $this->_colourMap[$index];
+    public function getColourByIndex($index = 0)
+    {
+        if (isset($this->colourMap[$index])) {
+            return $this->colourMap[$index];
         }
         return null;
     }
@@ -111,7 +113,8 @@ class PHPExcel_Reader_Excel2007_Theme
     /**
      * Implement PHP __clone to create a deep clone, not just a shallow copy.
      */
-	public function __clone() {
+    public function __clone()
+    {
         $vars = get_object_vars($this);
         foreach ($vars as $key => $value) {
             if ((is_object($value)) && ($key != '_parent')) {

Classes/PHPExcel/Reader/Excel5/Color.php

@@ -0,0 +1,32 @@
+<?php
+
+class PHPExcel_Reader_Excel5_Color
+{
+    /**
+     * Read color
+     *
+     * @param int $color Indexed color
+     * @param array $palette Color palette
+     * @return array RGB color value, example: array('rgb' => 'FF0000')
+     */
+    public static function map($color, $palette, $version)
+    {
+        if ($color <= 0x07 || $color >= 0x40) {
+            // special built-in color
+            return PHPExcel_Reader_Excel5_Color_BuiltIn::lookup($color);
+        } elseif (isset($palette) && isset($palette[$color - 8])) {
+            // palette color, color index 0x08 maps to pallete index 0
+            return $palette[$color - 8];
+        } else {
+            // default color table
+            if ($version == PHPExcel_Reader_Excel5::XLS_BIFF8) {
+                return PHPExcel_Reader_Excel5_Color_BIFF8::lookup($color);
+            } else {
+                // BIFF5
+                return PHPExcel_Reader_Excel5_Color_BIFF5::lookup($color);
+            }
+        }
+
+        return $color;
+    }
+}

Classes/PHPExcel/Reader/Excel5/Color/BIFF5.php

@@ -0,0 +1,77 @@
+<?php
+
+class PHPExcel_Reader_Excel5_Color_BIFF5
+{
+    protected static $map = array(
+        0x08 => '000000',
+        0x09 => 'FFFFFF',
+        0x0A => 'FF0000',
+        0x0B => '00FF00',
+        0x0C => '0000FF',
+        0x0D => 'FFFF00',
+        0x0E => 'FF00FF',
+        0x0F => '00FFFF',
+        0x10 => '800000',
+        0x11 => '008000',
+        0x12 => '000080',
+        0x13 => '808000',
+        0x14 => '800080',
+        0x15 => '008080',
+        0x16 => 'C0C0C0',
+        0x17 => '808080',
+        0x18 => '8080FF',
+        0x19 => '802060',
+        0x1A => 'FFFFC0',
+        0x1B => 'A0E0F0',
+        0x1C => '600080',
+        0x1D => 'FF8080',
+        0x1E => '0080C0',
+        0x1F => 'C0C0FF',
+        0x20 => '000080',
+        0x21 => 'FF00FF',
+        0x22 => 'FFFF00',
+        0x23 => '00FFFF',
+        0x24 => '800080',
+        0x25 => '800000',
+        0x26 => '008080',
+        0x27 => '0000FF',
+        0x28 => '00CFFF',
+        0x29 => '69FFFF',
+        0x2A => 'E0FFE0',
+        0x2B => 'FFFF80',
+        0x2C => 'A6CAF0',
+        0x2D => 'DD9CB3',
+        0x2E => 'B38FEE',
+        0x2F => 'E3E3E3',
+        0x30 => '2A6FF9',
+        0x31 => '3FB8CD',
+        0x32 => '488436',
+        0x33 => '958C41',
+        0x34 => '8E5E42',
+        0x35 => 'A0627A',
+        0x36 => '624FAC',
+        0x37 => '969696',
+        0x38 => '1D2FBE',
+        0x39 => '286676',
+        0x3A => '004500',
+        0x3B => '453E01',
+        0x3C => '6A2813',
+        0x3D => '85396A',
+        0x3E => '4A3285',
+        0x3F => '424242',
+    );
+
+    /**
+     * Map color array from BIFF5 built-in color index
+     *
+     * @param int $color
+     * @return array
+     */
+    public static function lookup($color)
+    {
+        if (isset(self::$map[$color])) {
+            return array('rgb' => self::$map[$color]);
+        }
+        return array('rgb' => '000000');
+    }
+}

Classes/PHPExcel/Reader/Excel5/Color/BIFF8.php

@@ -0,0 +1,77 @@
+<?php
+
+class PHPExcel_Reader_Excel5_Color_BIFF8
+{
+    protected static $map = array(
+        0x08 => '000000',
+        0x09 => 'FFFFFF',
+        0x0A => 'FF0000',
+        0x0B => '00FF00',
+        0x0C => '0000FF',
+        0x0D => 'FFFF00',
+        0x0E => 'FF00FF',
+        0x0F => '00FFFF',
+        0x10 => '800000',
+        0x11 => '008000',
+        0x12 => '000080',
+        0x13 => '808000',
+        0x14 => '800080',
+        0x15 => '008080',
+        0x16 => 'C0C0C0',
+        0x17 => '808080',
+        0x18 => '9999FF',
+        0x19 => '993366',
+        0x1A => 'FFFFCC',
+        0x1B => 'CCFFFF',
+        0x1C => '660066',
+        0x1D => 'FF8080',
+        0x1E => '0066CC',
+        0x1F => 'CCCCFF',
+        0x20 => '000080',
+        0x21 => 'FF00FF',
+        0x22 => 'FFFF00',
+        0x23 => '00FFFF',
+        0x24 => '800080',
+        0x25 => '800000',
+        0x26 => '008080',
+        0x27 => '0000FF',
+        0x28 => '00CCFF',
+        0x29 => 'CCFFFF',
+        0x2A => 'CCFFCC',
+        0x2B => 'FFFF99',
+        0x2C => '99CCFF',
+        0x2D => 'FF99CC',
+        0x2E => 'CC99FF',
+        0x2F => 'FFCC99',
+        0x30 => '3366FF',
+        0x31 => '33CCCC',
+        0x32 => '99CC00',
+        0x33 => 'FFCC00',
+        0x34 => 'FF9900',
+        0x35 => 'FF6600',
+        0x36 => '666699',
+        0x37 => '969696',
+        0x38 => '003366',
+        0x39 => '339966',
+        0x3A => '003300',
+        0x3B => '333300',
+        0x3C => '993300',
+        0x3D => '993366',
+        0x3E => '333399',
+        0x3F => '333333',
+    );
+
+   /**
+     * Map color array from BIFF8 built-in color index
+     *
+     * @param int $color
+     * @return array
+     */
+    public static function lookup($color)
+    {
+        if (isset(self::$map[$color])) {
+            return array('rgb' => self::$map[$color]);
+        }
+        return array('rgb' => '000000');
+    }
+}

Classes/PHPExcel/Reader/Excel5/Color/BuiltIn.php

@@ -0,0 +1,31 @@
+<?php
+
+class PHPExcel_Reader_Excel5_Color_BuiltIn
+{
+    protected static $map = array(
+        0x00 => '000000',
+        0x01 => 'FFFFFF',
+        0x02 => 'FF0000',
+        0x03 => '00FF00',
+        0x04 => '0000FF',
+        0x05 => 'FFFF00',
+        0x06 => 'FF00FF',
+        0x07 => '00FFFF',
+        0x40 => '000000', // system window text color
+        0x41 => 'FFFFFF', // system window background color
+    );
+
+    /**
+     * Map built-in color to RGB value
+     *
+     * @param int $color Indexed color
+     * @return array
+     */
+    public static function lookup($color)
+    {
+        if (isset(self::$map[$color])) {
+            return array('rgb' => self::$map[$color]);
+        }
+        return array('rgb' => '000000');
+    }
+}

Classes/PHPExcel/Reader/Excel5/ErrorCode.php

@@ -0,0 +1,28 @@
+<?php
+
+class PHPExcel_Reader_Excel5_ErrorCode
+{
+    protected static $map = array(
+        0x00 => '#NULL!',
+        0x07 => '#DIV/0!',
+        0x0F => '#VALUE!',
+        0x17 => '#REF!',
+        0x1D => '#NAME?',
+        0x24 => '#NUM!',
+        0x2A => '#N/A',
+    );
+
+    /**
+     * Map error code, e.g. '#N/A'
+     *
+     * @param int $code
+     * @return string
+     */
+    public static function lookup($code)
+    {
+        if (isset(self::$map[$code])) {
+            return self::$map[$code];
+        }
+        return false;
+    }
+}

Classes/PHPExcel/Reader/Excel5/Escher.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * PHPExcel
+ * PHPExcel_Reader_Excel5_Escher
  *
- * Copyright (c) 2006 - 2013 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,18 +21,10 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Reader_Excel5
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-/**
- * PHPExcel_Reader_Excel5_Escher
- *
- * @category   PHPExcel
- * @package    PHPExcel_Reader_Excel5
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
 class PHPExcel_Reader_Excel5_Escher
 {
     const DGGCONTAINER      = 0xF000;
@@ -58,28 +51,28 @@ class PHPExcel_Reader_Excel5_Escher
      *
      * @var string
      */
-	private $_data;
+    private $data;
 
     /**
      * Size in bytes of the Escher stream data
      *
      * @var int
      */
-	private $_dataSize;
+    private $dataSize;
 
     /**
      * Current position of stream pointer in Escher stream data
      *
      * @var int
      */
-	private $_pos;
+    private $pos;
 
     /**
      * The object to be returned by the reader. Modified during load.
      *
      * @var mixed
      */
-	private $_object;
+    private $object;
 
     /**
      * Create a new PHPExcel_Reader_Excel5_Escher instance
@@ -88,7 +81,7 @@ class PHPExcel_Reader_Excel5_Escher
      */
     public function __construct($object)
     {
-		$this->_object = $object;
+        $this->object = $object;
     }
 
     /**
@@ -98,80 +91,117 @@ class PHPExcel_Reader_Excel5_Escher
      */
     public function load($data)
     {
-		$this->_data = $data;
+        $this->data = $data;
 
         // total byte size of Excel data (workbook global substream + sheet substreams)
-		$this->_dataSize = strlen($this->_data);
+        $this->dataSize = strlen($this->data);
 
-		$this->_pos = 0;
+        $this->pos = 0;
 
         // Parse Escher stream
-		while ($this->_pos < $this->_dataSize) {
-
+        while ($this->pos < $this->dataSize) {
             // offset: 2; size: 2: Record Type
-			$fbt = PHPExcel_Reader_Excel5::_GetInt2d($this->_data, $this->_pos + 2);
+            $fbt = PHPExcel_Reader_Excel5::getInt2d($this->data, $this->pos + 2);
 
             switch ($fbt) {
-				case self::DGGCONTAINER:	$this->_readDggContainer();		break;
-				case self::DGG:				$this->_readDgg();				break;
-				case self::BSTORECONTAINER:	$this->_readBstoreContainer();	break;
-				case self::BSE:				$this->_readBSE();				break;
-				case self::BLIPJPEG:		$this->_readBlipJPEG();			break;
-				case self::BLIPPNG:			$this->_readBlipPNG();			break;
-				case self::OPT:				$this->_readOPT();				break;
-				case self::TERTIARYOPT:		$this->_readTertiaryOPT();		break;
-				case self::SPLITMENUCOLORS:	$this->_readSplitMenuColors();	break;
-				case self::DGCONTAINER:		$this->_readDgContainer();		break;
-				case self::DG:				$this->_readDg();				break;
-				case self::SPGRCONTAINER:	$this->_readSpgrContainer();	break;
-				case self::SPCONTAINER:		$this->_readSpContainer();		break;
-				case self::SPGR:			$this->_readSpgr();				break;
-				case self::SP:				$this->_readSp();				break;
-				case self::CLIENTTEXTBOX:	$this->_readClientTextbox();	break;
-				case self::CLIENTANCHOR:	$this->_readClientAnchor();		break;
-				case self::CLIENTDATA:		$this->_readClientData();		break;
-				default:					$this->_readDefault();			break;
+                case self::DGGCONTAINER:
+                    $this->readDggContainer();
+                    break;
+                case self::DGG:
+                    $this->readDgg();
+                    break;
+                case self::BSTORECONTAINER:
+                    $this->readBstoreContainer();
+                    break;
+                case self::BSE:
+                    $this->readBSE();
+                    break;
+                case self::BLIPJPEG:
+                    $this->readBlipJPEG();
+                    break;
+                case self::BLIPPNG:
+                    $this->readBlipPNG();
+                    break;
+                case self::OPT:
+                    $this->readOPT();
+                    break;
+                case self::TERTIARYOPT:
+                    $this->readTertiaryOPT();
+                    break;
+                case self::SPLITMENUCOLORS:
+                    $this->readSplitMenuColors();
+                    break;
+                case self::DGCONTAINER:
+                    $this->readDgContainer();
+                    break;
+                case self::DG:
+                    $this->readDg();
+                    break;
+                case self::SPGRCONTAINER:
+                    $this->readSpgrContainer();
+                    break;
+                case self::SPCONTAINER:
+                    $this->readSpContainer();
+                    break;
+                case self::SPGR:
+                    $this->readSpgr();
+                    break;
+                case self::SP:
+                    $this->readSp();
+                    break;
+                case self::CLIENTTEXTBOX:
+                    $this->readClientTextbox();
+                    break;
+                case self::CLIENTANCHOR:
+                    $this->readClientAnchor();
+                    break;
+                case self::CLIENTDATA:
+                    $this->readClientData();
+                    break;
+                default:
+                    $this->readDefault();
+                    break;
             }
         }
 
-		return $this->_object;
+        return $this->object;
     }
 
     /**
      * Read a generic record
      */
-	private function _readDefault()
+    private function readDefault()
     {
         // offset 0; size: 2; recVer and recInstance
-		$verInstance = PHPExcel_Reader_Excel5::_GetInt2d($this->_data, $this->_pos);
+        $verInstance = PHPExcel_Reader_Excel5::getInt2d($this->data, $this->pos);
 
         // offset: 2; size: 2: Record Type
-		$fbt = PHPExcel_Reader_Excel5::_GetInt2d($this->_data, $this->_pos + 2);
+        $fbt = PHPExcel_Reader_Excel5::getInt2d($this->data, $this->pos + 2);
 
         // bit: 0-3; mask: 0x000F; recVer
         $recVer = (0x000F & $verInstance) >> 0;
 
-		$length = PHPExcel_Reader_Excel5::_GetInt4d($this->_data, $this->_pos + 4);
-		$recordData = substr($this->_data, $this->_pos + 8, $length);
+        $length = PHPExcel_Reader_Excel5::getInt4d($this->data, $this->pos + 4);
+        $recordData = substr($this->data, $this->pos + 8, $length);
 
         // move stream pointer to next record
-		$this->_pos += 8 + $length;
+        $this->pos += 8 + $length;
     }
 
     /**
      * Read DggContainer record (Drawing Group Container)
      */
-	private function _readDggContainer()
+    private function readDggContainer()
     {
-		$length = PHPExcel_Reader_Excel5::_GetInt4d($this->_data, $this->_pos + 4);
-		$recordData = substr($this->_data, $this->_pos + 8, $length);
+        $length = PHPExcel_Reader_Excel5::getInt4d($this->data, $this->pos + 4);
+        $recordData = substr($this->data, $this->pos + 8, $length);
 
         // move stream pointer to next record
-		$this->_pos += 8 + $length;
+        $this->pos += 8 + $length;
 
         // record is a container, read contents
         $dggContainer = new PHPExcel_Shared_Escher_DggContainer();
-		$this->_object->setDggContainer($dggContainer);
+        $this->object->setDggContainer($dggContainer);
         $reader = new PHPExcel_Reader_Excel5_Escher($dggContainer);
         $reader->load($recordData);
     }
@@ -179,29 +209,29 @@ class PHPExcel_Reader_Excel5_Escher
     /**
      * Read Dgg record (Drawing Group)
      */
-	private function _readDgg()
+    private function readDgg()
     {
-		$length = PHPExcel_Reader_Excel5::_GetInt4d($this->_data, $this->_pos + 4);
-		$recordData = substr($this->_data, $this->_pos + 8, $length);
+        $length = PHPExcel_Reader_Excel5::getInt4d($this->data, $this->pos + 4);
+        $recordData = substr($this->data, $this->pos + 8, $length);
 
         // move stream pointer to next record
-		$this->_pos += 8 + $length;
+        $this->pos += 8 + $length;
     }
 
     /**
      * Read BstoreContainer record (Blip Store Container)
      */
-	private function _readBstoreContainer()
+    private function readBstoreContainer()
     {
-		$length = PHPExcel_Reader_Excel5::_GetInt4d($this->_data, $this->_pos + 4);
-		$recordData = substr($this->_data, $this->_pos + 8, $length);
+        $length = PHPExcel_Reader_Excel5::getInt4d($this->data, $this->pos + 4);
+        $recordData = substr($this->data, $this->pos + 8, $length);
 
         // move stream pointer to next record
-		$this->_pos += 8 + $length;
+        $this->pos += 8 + $length;
 
         // record is a container, read contents
         $bstoreContainer = new PHPExcel_Shared_Escher_DggContainer_BstoreContainer();
-		$this->_object->setBstoreContainer($bstoreContainer);
+        $this->object->setBstoreContainer($bstoreContainer);
         $reader = new PHPExcel_Reader_Excel5_Escher($bstoreContainer);
         $reader->load($recordData);
     }
@@ -209,22 +239,22 @@ class PHPExcel_Reader_Excel5_Escher
     /**
      * Read BSE record
      */
-	private function _readBSE()
+    private function readBSE()
     {
         // offset: 0; size: 2; recVer and recInstance
 
         // bit: 4-15; mask: 0xFFF0; recInstance
-		$recInstance = (0xFFF0 & PHPExcel_Reader_Excel5::_GetInt2d($this->_data, $this->_pos)) >> 4;
+        $recInstance = (0xFFF0 & PHPExcel_Reader_Excel5::getInt2d($this->data, $this->pos)) >> 4;
 
-		$length = PHPExcel_Reader_Excel5::_GetInt4d($this->_data, $this->_pos + 4);
-		$recordData = substr($this->_data, $this->_pos + 8, $length);
+        $length = PHPExcel_Reader_Excel5::getInt4d($this->data, $this->pos + 4);
+        $recordData = substr($this->data, $this->pos + 8, $length);
 
         // move stream pointer to next record
-		$this->_pos += 8 + $length;
+        $this->pos += 8 + $length;
 
         // add BSE to BstoreContainer
         $BSE = new PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE();
-		$this->_object->addBSE($BSE);
+        $this->object->addBSE($BSE);
 
         $BSE->setBLIPType($recInstance);
 
@@ -238,16 +268,16 @@ class PHPExcel_Reader_Excel5_Escher
         $rgbUid = substr($recordData, 2, 16);
 
         // offset: 18; size: 2; tag
-		$tag = PHPExcel_Reader_Excel5::_GetInt2d($recordData, 18);
+        $tag = PHPExcel_Reader_Excel5::getInt2d($recordData, 18);
 
         // offset: 20; size: 4; size of BLIP in bytes
-		$size = PHPExcel_Reader_Excel5::_GetInt4d($recordData, 20);
+        $size = PHPExcel_Reader_Excel5::getInt4d($recordData, 20);
 
         // offset: 24; size: 4; number of references to this BLIP
-		$cRef = PHPExcel_Reader_Excel5::_GetInt4d($recordData, 24);
+        $cRef = PHPExcel_Reader_Excel5::getInt4d($recordData, 24);
 
         // offset: 28; size: 4; MSOFO file offset
-		$foDelay = PHPExcel_Reader_Excel5::_GetInt4d($recordData, 28);
+        $foDelay = PHPExcel_Reader_Excel5::getInt4d($recordData, 28);
 
         // offset: 32; size: 1; unused1
         $unused1 = ord($recordData{32});
@@ -275,18 +305,18 @@ class PHPExcel_Reader_Excel5_Escher
     /**
      * Read BlipJPEG record. Holds raw JPEG image data
      */
-	private function _readBlipJPEG()
+    private function readBlipJPEG()
     {
         // offset: 0; size: 2; recVer and recInstance
 
         // bit: 4-15; mask: 0xFFF0; recInstance
-		$recInstance = (0xFFF0 & PHPExcel_Reader_Excel5::_GetInt2d($this->_data, $this->_pos)) >> 4;
+        $recInstance = (0xFFF0 & PHPExcel_Reader_Excel5::getInt2d($this->data, $this->pos)) >> 4;
 
-		$length = PHPExcel_Reader_Excel5::_GetInt4d($this->_data, $this->_pos + 4);
-		$recordData = substr($this->_data, $this->_pos + 8, $length);
+        $length = PHPExcel_Reader_Excel5::getInt4d($this->data, $this->pos + 4);
+        $recordData = substr($this->data, $this->pos + 8, $length);
 
         // move stream pointer to next record
-		$this->_pos += 8 + $length;
+        $this->pos += 8 + $length;
 
         $pos = 0;
 
@@ -310,24 +340,24 @@ class PHPExcel_Reader_Excel5_Escher
         $blip = new PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE_Blip();
         $blip->setData($data);
 
-		$this->_object->setBlip($blip);
+        $this->object->setBlip($blip);
     }
 
     /**
      * Read BlipPNG record. Holds raw PNG image data
      */
-	private function _readBlipPNG()
+    private function readBlipPNG()
     {
         // offset: 0; size: 2; recVer and recInstance
 
         // bit: 4-15; mask: 0xFFF0; recInstance
-		$recInstance = (0xFFF0 & PHPExcel_Reader_Excel5::_GetInt2d($this->_data, $this->_pos)) >> 4;
+        $recInstance = (0xFFF0 & PHPExcel_Reader_Excel5::getInt2d($this->data, $this->pos)) >> 4;
 
-		$length = PHPExcel_Reader_Excel5::_GetInt4d($this->_data, $this->_pos + 4);
-		$recordData = substr($this->_data, $this->_pos + 8, $length);
+        $length = PHPExcel_Reader_Excel5::getInt4d($this->data, $this->pos + 4);
+        $recordData = substr($this->data, $this->pos + 8, $length);
 
         // move stream pointer to next record
-		$this->_pos += 8 + $length;
+        $this->pos += 8 + $length;
 
         $pos = 0;
 
@@ -351,71 +381,71 @@ class PHPExcel_Reader_Excel5_Escher
         $blip = new PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE_Blip();
         $blip->setData($data);
 
-		$this->_object->setBlip($blip);
+        $this->object->setBlip($blip);
     }
 
     /**
      * Read OPT record. This record may occur within DggContainer record or SpContainer
      */
-	private function _readOPT()
+    private function readOPT()
     {
         // offset: 0; size: 2; recVer and recInstance
 
         // bit: 4-15; mask: 0xFFF0; recInstance
-		$recInstance = (0xFFF0 & PHPExcel_Reader_Excel5::_GetInt2d($this->_data, $this->_pos)) >> 4;
+        $recInstance = (0xFFF0 & PHPExcel_Reader_Excel5::getInt2d($this->data, $this->pos)) >> 4;
 
-		$length = PHPExcel_Reader_Excel5::_GetInt4d($this->_data, $this->_pos + 4);
-		$recordData = substr($this->_data, $this->_pos + 8, $length);
+        $length = PHPExcel_Reader_Excel5::getInt4d($this->data, $this->pos + 4);
+        $recordData = substr($this->data, $this->pos + 8, $length);
 
         // move stream pointer to next record
-		$this->_pos += 8 + $length;
+        $this->pos += 8 + $length;
 
-		$this->_readOfficeArtRGFOPTE($recordData, $recInstance);
+        $this->readOfficeArtRGFOPTE($recordData, $recInstance);
     }
 
     /**
      * Read TertiaryOPT record
      */
-	private function _readTertiaryOPT()
+    private function readTertiaryOPT()
     {
         // offset: 0; size: 2; recVer and recInstance
 
         // bit: 4-15; mask: 0xFFF0; recInstance
-		$recInstance = (0xFFF0 & PHPExcel_Reader_Excel5::_GetInt2d($this->_data, $this->_pos)) >> 4;
+        $recInstance = (0xFFF0 & PHPExcel_Reader_Excel5::getInt2d($this->data, $this->pos)) >> 4;
 
-		$length = PHPExcel_Reader_Excel5::_GetInt4d($this->_data, $this->_pos + 4);
-		$recordData = substr($this->_data, $this->_pos + 8, $length);
+        $length = PHPExcel_Reader_Excel5::getInt4d($this->data, $this->pos + 4);
+        $recordData = substr($this->data, $this->pos + 8, $length);
 
         // move stream pointer to next record
-		$this->_pos += 8 + $length;
+        $this->pos += 8 + $length;
     }
 
     /**
      * Read SplitMenuColors record
      */
-	private function _readSplitMenuColors()
+    private function readSplitMenuColors()
     {
-		$length = PHPExcel_Reader_Excel5::_GetInt4d($this->_data, $this->_pos + 4);
-		$recordData = substr($this->_data, $this->_pos + 8, $length);
+        $length = PHPExcel_Reader_Excel5::getInt4d($this->data, $this->pos + 4);
+        $recordData = substr($this->data, $this->pos + 8, $length);
 
         // move stream pointer to next record
-		$this->_pos += 8 + $length;
+        $this->pos += 8 + $length;
     }
 
     /**
      * Read DgContainer record (Drawing Container)
      */
-	private function _readDgContainer()
+    private function readDgContainer()
     {
-		$length = PHPExcel_Reader_Excel5::_GetInt4d($this->_data, $this->_pos + 4);
-		$recordData = substr($this->_data, $this->_pos + 8, $length);
+        $length = PHPExcel_Reader_Excel5::getInt4d($this->data, $this->pos + 4);
+        $recordData = substr($this->data, $this->pos + 8, $length);
 
         // move stream pointer to next record
-		$this->_pos += 8 + $length;
+        $this->pos += 8 + $length;
 
         // record is a container, read contents
         $dgContainer = new PHPExcel_Shared_Escher_DgContainer();
-		$this->_object->setDgContainer($dgContainer);
+        $this->object->setDgContainer($dgContainer);
         $reader = new PHPExcel_Reader_Excel5_Escher($dgContainer);
         $escher = $reader->load($recordData);
     }
@@ -423,37 +453,37 @@ class PHPExcel_Reader_Excel5_Escher
     /**
      * Read Dg record (Drawing)
      */
-	private function _readDg()
+    private function readDg()
     {
-		$length = PHPExcel_Reader_Excel5::_GetInt4d($this->_data, $this->_pos + 4);
-		$recordData = substr($this->_data, $this->_pos + 8, $length);
+        $length = PHPExcel_Reader_Excel5::getInt4d($this->data, $this->pos + 4);
+        $recordData = substr($this->data, $this->pos + 8, $length);
 
         // move stream pointer to next record
-		$this->_pos += 8 + $length;
+        $this->pos += 8 + $length;
     }
 
     /**
      * Read SpgrContainer record (Shape Group Container)
      */
-	private function _readSpgrContainer()
+    private function readSpgrContainer()
     {
         // context is either context DgContainer or SpgrContainer
 
-		$length = PHPExcel_Reader_Excel5::_GetInt4d($this->_data, $this->_pos + 4);
-		$recordData = substr($this->_data, $this->_pos + 8, $length);
+        $length = PHPExcel_Reader_Excel5::getInt4d($this->data, $this->pos + 4);
+        $recordData = substr($this->data, $this->pos + 8, $length);
 
         // move stream pointer to next record
-		$this->_pos += 8 + $length;
+        $this->pos += 8 + $length;
 
         // record is a container, read contents
         $spgrContainer = new PHPExcel_Shared_Escher_DgContainer_SpgrContainer();
 
-		if ($this->_object instanceof PHPExcel_Shared_Escher_DgContainer) {
+        if ($this->object instanceof PHPExcel_Shared_Escher_DgContainer) {
             // DgContainer
-			$this->_object->setSpgrContainer($spgrContainer);
+            $this->object->setSpgrContainer($spgrContainer);
         } else {
             // SpgrContainer
-			$this->_object->addChild($spgrContainer);
+            $this->object->addChild($spgrContainer);
         }
 
         $reader = new PHPExcel_Reader_Excel5_Escher($spgrContainer);
@@ -463,17 +493,17 @@ class PHPExcel_Reader_Excel5_Escher
     /**
      * Read SpContainer record (Shape Container)
      */
-	private function _readSpContainer()
+    private function readSpContainer()
     {
-		$length = PHPExcel_Reader_Excel5::_GetInt4d($this->_data, $this->_pos + 4);
-		$recordData = substr($this->_data, $this->_pos + 8, $length);
+        $length = PHPExcel_Reader_Excel5::getInt4d($this->data, $this->pos + 4);
+        $recordData = substr($this->data, $this->pos + 8, $length);
 
         // add spContainer to spgrContainer
         $spContainer = new PHPExcel_Shared_Escher_DgContainer_SpgrContainer_SpContainer();
-		$this->_object->addChild($spContainer);
+        $this->object->addChild($spContainer);
 
         // move stream pointer to next record
-		$this->_pos += 8 + $length;
+        $this->pos += 8 + $length;
 
         // record is a container, read contents
         $reader = new PHPExcel_Reader_Excel5_Escher($spContainer);
@@ -483,113 +513,113 @@ class PHPExcel_Reader_Excel5_Escher
     /**
      * Read Spgr record (Shape Group)
      */
-	private function _readSpgr()
+    private function readSpgr()
     {
-		$length = PHPExcel_Reader_Excel5::_GetInt4d($this->_data, $this->_pos + 4);
-		$recordData = substr($this->_data, $this->_pos + 8, $length);
+        $length = PHPExcel_Reader_Excel5::getInt4d($this->data, $this->pos + 4);
+        $recordData = substr($this->data, $this->pos + 8, $length);
 
         // move stream pointer to next record
-		$this->_pos += 8 + $length;
+        $this->pos += 8 + $length;
     }
 
     /**
      * Read Sp record (Shape)
      */
-	private function _readSp()
+    private function readSp()
     {
         // offset: 0; size: 2; recVer and recInstance
 
         // bit: 4-15; mask: 0xFFF0; recInstance
-		$recInstance = (0xFFF0 & PHPExcel_Reader_Excel5::_GetInt2d($this->_data, $this->_pos)) >> 4;
+        $recInstance = (0xFFF0 & PHPExcel_Reader_Excel5::getInt2d($this->data, $this->pos)) >> 4;
 
-		$length = PHPExcel_Reader_Excel5::_GetInt4d($this->_data, $this->_pos + 4);
-		$recordData = substr($this->_data, $this->_pos + 8, $length);
+        $length = PHPExcel_Reader_Excel5::getInt4d($this->data, $this->pos + 4);
+        $recordData = substr($this->data, $this->pos + 8, $length);
 
         // move stream pointer to next record
-		$this->_pos += 8 + $length;
+        $this->pos += 8 + $length;
     }
 
     /**
      * Read ClientTextbox record
      */
-	private function _readClientTextbox()
+    private function readClientTextbox()
     {
         // offset: 0; size: 2; recVer and recInstance
 
         // bit: 4-15; mask: 0xFFF0; recInstance
-		$recInstance = (0xFFF0 & PHPExcel_Reader_Excel5::_GetInt2d($this->_data, $this->_pos)) >> 4;
+        $recInstance = (0xFFF0 & PHPExcel_Reader_Excel5::getInt2d($this->data, $this->pos)) >> 4;
 
-		$length = PHPExcel_Reader_Excel5::_GetInt4d($this->_data, $this->_pos + 4);
-		$recordData = substr($this->_data, $this->_pos + 8, $length);
+        $length = PHPExcel_Reader_Excel5::getInt4d($this->data, $this->pos + 4);
+        $recordData = substr($this->data, $this->pos + 8, $length);
 
         // move stream pointer to next record
-		$this->_pos += 8 + $length;
+        $this->pos += 8 + $length;
     }
 
     /**
      * Read ClientAnchor record. This record holds information about where the shape is anchored in worksheet
      */
-	private function _readClientAnchor()
+    private function readClientAnchor()
     {
-		$length = PHPExcel_Reader_Excel5::_GetInt4d($this->_data, $this->_pos + 4);
-		$recordData = substr($this->_data, $this->_pos + 8, $length);
+        $length = PHPExcel_Reader_Excel5::getInt4d($this->data, $this->pos + 4);
+        $recordData = substr($this->data, $this->pos + 8, $length);
 
         // move stream pointer to next record
-		$this->_pos += 8 + $length;
+        $this->pos += 8 + $length;
 
         // offset: 2; size: 2; upper-left corner column index (0-based)
-		$c1 = PHPExcel_Reader_Excel5::_GetInt2d($recordData, 2);
+        $c1 = PHPExcel_Reader_Excel5::getInt2d($recordData, 2);
 
         // offset: 4; size: 2; upper-left corner horizontal offset in 1/1024 of column width
-		$startOffsetX = PHPExcel_Reader_Excel5::_GetInt2d($recordData, 4);
+        $startOffsetX = PHPExcel_Reader_Excel5::getInt2d($recordData, 4);
 
         // offset: 6; size: 2; upper-left corner row index (0-based)
-		$r1 = PHPExcel_Reader_Excel5::_GetInt2d($recordData, 6);
+        $r1 = PHPExcel_Reader_Excel5::getInt2d($recordData, 6);
 
         // offset: 8; size: 2; upper-left corner vertical offset in 1/256 of row height
-		$startOffsetY = PHPExcel_Reader_Excel5::_GetInt2d($recordData, 8);
+        $startOffsetY = PHPExcel_Reader_Excel5::getInt2d($recordData, 8);
 
         // offset: 10; size: 2; bottom-right corner column index (0-based)
-		$c2 = PHPExcel_Reader_Excel5::_GetInt2d($recordData, 10);
+        $c2 = PHPExcel_Reader_Excel5::getInt2d($recordData, 10);
 
         // offset: 12; size: 2; bottom-right corner horizontal offset in 1/1024 of column width
-		$endOffsetX = PHPExcel_Reader_Excel5::_GetInt2d($recordData, 12);
+        $endOffsetX = PHPExcel_Reader_Excel5::getInt2d($recordData, 12);
 
         // offset: 14; size: 2; bottom-right corner row index (0-based)
-		$r2 = PHPExcel_Reader_Excel5::_GetInt2d($recordData, 14);
+        $r2 = PHPExcel_Reader_Excel5::getInt2d($recordData, 14);
 
         // offset: 16; size: 2; bottom-right corner vertical offset in 1/256 of row height
-		$endOffsetY = PHPExcel_Reader_Excel5::_GetInt2d($recordData, 16);
+        $endOffsetY = PHPExcel_Reader_Excel5::getInt2d($recordData, 16);
 
         // set the start coordinates
-		$this->_object->setStartCoordinates(PHPExcel_Cell::stringFromColumnIndex($c1) . ($r1 + 1));
+        $this->object->setStartCoordinates(PHPExcel_Cell::stringFromColumnIndex($c1) . ($r1 + 1));
 
         // set the start offsetX
-		$this->_object->setStartOffsetX($startOffsetX);
+        $this->object->setStartOffsetX($startOffsetX);
 
         // set the start offsetY
-		$this->_object->setStartOffsetY($startOffsetY);
+        $this->object->setStartOffsetY($startOffsetY);
 
         // set the end coordinates
-		$this->_object->setEndCoordinates(PHPExcel_Cell::stringFromColumnIndex($c2) . ($r2 + 1));
+        $this->object->setEndCoordinates(PHPExcel_Cell::stringFromColumnIndex($c2) . ($r2 + 1));
 
         // set the end offsetX
-		$this->_object->setEndOffsetX($endOffsetX);
+        $this->object->setEndOffsetX($endOffsetX);
 
         // set the end offsetY
-		$this->_object->setEndOffsetY($endOffsetY);
+        $this->object->setEndOffsetY($endOffsetY);
     }
 
     /**
      * Read ClientData record
      */
-	private function _readClientData()
+    private function readClientData()
     {
-		$length = PHPExcel_Reader_Excel5::_GetInt4d($this->_data, $this->_pos + 4);
-		$recordData = substr($this->_data, $this->_pos + 8, $length);
+        $length = PHPExcel_Reader_Excel5::getInt4d($this->data, $this->pos + 4);
+        $recordData = substr($this->data, $this->pos + 8, $length);
 
         // move stream pointer to next record
-		$this->_pos += 8 + $length;
+        $this->pos += 8 + $length;
     }
 
     /**
@@ -598,8 +628,8 @@ class PHPExcel_Reader_Excel5_Escher
      * @param string $data Binary data
      * @param int $n Number of properties
      */
-	private function _readOfficeArtRGFOPTE($data, $n) {
-
+    private function readOfficeArtRGFOPTE($data, $n)
+    {
         $splicedComplexData = substr($data, 6 * $n);
 
         // loop through property-value pairs
@@ -608,7 +638,7 @@ class PHPExcel_Reader_Excel5_Escher
             $fopte = substr($data, 6 * $i, 6);
 
             // offset: 0; size: 2; opid
-			$opid = PHPExcel_Reader_Excel5::_GetInt2d($fopte, 0);
+            $opid = PHPExcel_Reader_Excel5::getInt2d($fopte, 0);
 
             // bit: 0-13; mask: 0x3FFF; opid.opid
             $opidOpid = (0x3FFF & $opid) >> 0;
@@ -620,7 +650,7 @@ class PHPExcel_Reader_Excel5_Escher
             $opidFComplex = (0x8000 & $opid) >> 15;
 
             // offset: 2; size: 4; the value for this property
-			$op = PHPExcel_Reader_Excel5::_GetInt4d($fopte, 2);
+            $op = PHPExcel_Reader_Excel5::getInt4d($fopte, 2);
 
             if ($opidFComplex) {
                 $complexData = substr($splicedComplexData, 0, $op);
@@ -633,8 +663,7 @@ class PHPExcel_Reader_Excel5_Escher
                 $value = $op;
             }
 
-			$this->_object->setOPT($opidOpid, $value);
+            $this->object->setOPT($opidOpid, $value);
         }
     }
-
 }

Classes/PHPExcel/Reader/Excel5/MD5.php

@@ -0,0 +1,203 @@
+<?php
+
+/**
+ * PHPExcel_Reader_Excel5_MD5
+ *
+ * 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
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Reader_Excel5
+ * @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##
+ */
+class PHPExcel_Reader_Excel5_MD5
+{
+    // Context
+    private $a;
+    private $b;
+    private $c;
+    private $d;
+
+    /**
+     * MD5 stream constructor
+     */
+    public function __construct()
+    {
+        $this->reset();
+    }
+
+    /**
+     * Reset the MD5 stream context
+     */
+    public function reset()
+    {
+        $this->a = 0x67452301;
+        $this->b = 0xEFCDAB89;
+        $this->c = 0x98BADCFE;
+        $this->d = 0x10325476;
+    }
+
+    /**
+     * Get MD5 stream context
+     *
+     * @return string
+     */
+    public function getContext()
+    {
+        $s = '';
+        foreach (array('a', 'b', 'c', 'd') as $i) {
+            $v = $this->{$i};
+            $s .= chr($v & 0xff);
+            $s .= chr(($v >> 8) & 0xff);
+            $s .= chr(($v >> 16) & 0xff);
+            $s .= chr(($v >> 24) & 0xff);
+        }
+
+        return $s;
+    }
+
+    /**
+     * Add data to context
+     *
+     * @param string $data Data to add
+     */
+    public function add($data)
+    {
+        $words = array_values(unpack('V16', $data));
+
+        $A = $this->a;
+        $B = $this->b;
+        $C = $this->c;
+        $D = $this->d;
+
+        $F = array('PHPExcel_Reader_Excel5_MD5','f');
+        $G = array('PHPExcel_Reader_Excel5_MD5','g');
+        $H = array('PHPExcel_Reader_Excel5_MD5','h');
+        $I = array('PHPExcel_Reader_Excel5_MD5','i');
+
+        /* ROUND 1 */
+        self::step($F, $A, $B, $C, $D, $words[0], 7, 0xd76aa478);
+        self::step($F, $D, $A, $B, $C, $words[1], 12, 0xe8c7b756);
+        self::step($F, $C, $D, $A, $B, $words[2], 17, 0x242070db);
+        self::step($F, $B, $C, $D, $A, $words[3], 22, 0xc1bdceee);
+        self::step($F, $A, $B, $C, $D, $words[4], 7, 0xf57c0faf);
+        self::step($F, $D, $A, $B, $C, $words[5], 12, 0x4787c62a);
+        self::step($F, $C, $D, $A, $B, $words[6], 17, 0xa8304613);
+        self::step($F, $B, $C, $D, $A, $words[7], 22, 0xfd469501);
+        self::step($F, $A, $B, $C, $D, $words[8], 7, 0x698098d8);
+        self::step($F, $D, $A, $B, $C, $words[9], 12, 0x8b44f7af);
+        self::step($F, $C, $D, $A, $B, $words[10], 17, 0xffff5bb1);
+        self::step($F, $B, $C, $D, $A, $words[11], 22, 0x895cd7be);
+        self::step($F, $A, $B, $C, $D, $words[12], 7, 0x6b901122);
+        self::step($F, $D, $A, $B, $C, $words[13], 12, 0xfd987193);
+        self::step($F, $C, $D, $A, $B, $words[14], 17, 0xa679438e);
+        self::step($F, $B, $C, $D, $A, $words[15], 22, 0x49b40821);
+
+        /* ROUND 2 */
+        self::step($G, $A, $B, $C, $D, $words[1], 5, 0xf61e2562);
+        self::step($G, $D, $A, $B, $C, $words[6], 9, 0xc040b340);
+        self::step($G, $C, $D, $A, $B, $words[11], 14, 0x265e5a51);
+        self::step($G, $B, $C, $D, $A, $words[0], 20, 0xe9b6c7aa);
+        self::step($G, $A, $B, $C, $D, $words[5], 5, 0xd62f105d);
+        self::step($G, $D, $A, $B, $C, $words[10], 9, 0x02441453);
+        self::step($G, $C, $D, $A, $B, $words[15], 14, 0xd8a1e681);
+        self::step($G, $B, $C, $D, $A, $words[4], 20, 0xe7d3fbc8);
+        self::step($G, $A, $B, $C, $D, $words[9], 5, 0x21e1cde6);
+        self::step($G, $D, $A, $B, $C, $words[14], 9, 0xc33707d6);
+        self::step($G, $C, $D, $A, $B, $words[3], 14, 0xf4d50d87);
+        self::step($G, $B, $C, $D, $A, $words[8], 20, 0x455a14ed);
+        self::step($G, $A, $B, $C, $D, $words[13], 5, 0xa9e3e905);
+        self::step($G, $D, $A, $B, $C, $words[2], 9, 0xfcefa3f8);
+        self::step($G, $C, $D, $A, $B, $words[7], 14, 0x676f02d9);
+        self::step($G, $B, $C, $D, $A, $words[12], 20, 0x8d2a4c8a);
+
+        /* ROUND 3 */
+        self::step($H, $A, $B, $C, $D, $words[5], 4, 0xfffa3942);
+        self::step($H, $D, $A, $B, $C, $words[8], 11, 0x8771f681);
+        self::step($H, $C, $D, $A, $B, $words[11], 16, 0x6d9d6122);
+        self::step($H, $B, $C, $D, $A, $words[14], 23, 0xfde5380c);
+        self::step($H, $A, $B, $C, $D, $words[1], 4, 0xa4beea44);
+        self::step($H, $D, $A, $B, $C, $words[4], 11, 0x4bdecfa9);
+        self::step($H, $C, $D, $A, $B, $words[7], 16, 0xf6bb4b60);
+        self::step($H, $B, $C, $D, $A, $words[10], 23, 0xbebfbc70);
+        self::step($H, $A, $B, $C, $D, $words[13], 4, 0x289b7ec6);
+        self::step($H, $D, $A, $B, $C, $words[0], 11, 0xeaa127fa);
+        self::step($H, $C, $D, $A, $B, $words[3], 16, 0xd4ef3085);
+        self::step($H, $B, $C, $D, $A, $words[6], 23, 0x04881d05);
+        self::step($H, $A, $B, $C, $D, $words[9], 4, 0xd9d4d039);
+        self::step($H, $D, $A, $B, $C, $words[12], 11, 0xe6db99e5);
+        self::step($H, $C, $D, $A, $B, $words[15], 16, 0x1fa27cf8);
+        self::step($H, $B, $C, $D, $A, $words[2], 23, 0xc4ac5665);
+
+        /* ROUND 4 */
+        self::step($I, $A, $B, $C, $D, $words[0], 6, 0xf4292244);
+        self::step($I, $D, $A, $B, $C, $words[7], 10, 0x432aff97);
+        self::step($I, $C, $D, $A, $B, $words[14], 15, 0xab9423a7);
+        self::step($I, $B, $C, $D, $A, $words[5], 21, 0xfc93a039);
+        self::step($I, $A, $B, $C, $D, $words[12], 6, 0x655b59c3);
+        self::step($I, $D, $A, $B, $C, $words[3], 10, 0x8f0ccc92);
+        self::step($I, $C, $D, $A, $B, $words[10], 15, 0xffeff47d);
+        self::step($I, $B, $C, $D, $A, $words[1], 21, 0x85845dd1);
+        self::step($I, $A, $B, $C, $D, $words[8], 6, 0x6fa87e4f);
+        self::step($I, $D, $A, $B, $C, $words[15], 10, 0xfe2ce6e0);
+        self::step($I, $C, $D, $A, $B, $words[6], 15, 0xa3014314);
+        self::step($I, $B, $C, $D, $A, $words[13], 21, 0x4e0811a1);
+        self::step($I, $A, $B, $C, $D, $words[4], 6, 0xf7537e82);
+        self::step($I, $D, $A, $B, $C, $words[11], 10, 0xbd3af235);
+        self::step($I, $C, $D, $A, $B, $words[2], 15, 0x2ad7d2bb);
+        self::step($I, $B, $C, $D, $A, $words[9], 21, 0xeb86d391);
+
+        $this->a = ($this->a + $A) & 0xffffffff;
+        $this->b = ($this->b + $B) & 0xffffffff;
+        $this->c = ($this->c + $C) & 0xffffffff;
+        $this->d = ($this->d + $D) & 0xffffffff;
+    }
+
+    private static function f($X, $Y, $Z)
+    {
+        return (($X & $Y) | ((~ $X) & $Z)); // X AND Y OR NOT X AND Z
+    }
+
+    private static function g($X, $Y, $Z)
+    {
+        return (($X & $Z) | ($Y & (~ $Z))); // X AND Z OR Y AND NOT Z
+    }
+
+    private static function h($X, $Y, $Z)
+    {
+        return ($X ^ $Y ^ $Z); // X XOR Y XOR Z
+    }
+
+    private static function i($X, $Y, $Z)
+    {
+        return ($Y ^ ($X | (~ $Z))) ; // Y XOR (X OR NOT Z)
+    }
+
+    private static function step($func, &$A, $B, $C, $D, $M, $s, $t)
+    {
+        $A = ($A + call_user_func($func, $B, $C, $D) + $M + $t) & 0xffffffff;
+        $A = self::rotate($A, $s);
+        $A = ($B + $A) & 0xffffffff;
+    }
+
+    private static function rotate($decimal, $bits)
+    {
+        $binary = str_pad(decbin($decimal), 32, "0", STR_PAD_LEFT);
+        return bindec(substr($binary, $bits).substr($binary, 0, $bits));
+    }
+}

Classes/PHPExcel/Reader/Excel5/RC4.php

@@ -0,0 +1,81 @@
+<?php
+
+/**
+ * PHPExcel_Reader_Excel5_RC4
+ *
+ * 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
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * @category   PHPExcel
+ * @package    PHPExcel_Reader_Excel5
+ * @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##
+ */
+class PHPExcel_Reader_Excel5_RC4
+{
+    // Context
+    protected $s = array();
+    protected $i = 0;
+    protected $j = 0;
+
+    /**
+     * RC4 stream decryption/encryption constrcutor
+     *
+     * @param string $key Encryption key/passphrase
+     */
+    public function __construct($key)
+    {
+        $len = strlen($key);
+
+        for ($this->i = 0; $this->i < 256; $this->i++) {
+            $this->s[$this->i] = $this->i;
+        }
+
+        $this->j = 0;
+        for ($this->i = 0; $this->i < 256; $this->i++) {
+            $this->j = ($this->j + $this->s[$this->i] + ord($key[$this->i % $len])) % 256;
+            $t = $this->s[$this->i];
+            $this->s[$this->i] = $this->s[$this->j];
+            $this->s[$this->j] = $t;
+        }
+        $this->i = $this->j = 0;
+    }
+
+    /**
+     * Symmetric decryption/encryption function
+     *
+     * @param string $data Data to encrypt/decrypt
+     *
+     * @return string
+     */
+    public function RC4($data)
+    {
+        $len = strlen($data);
+        for ($c = 0; $c < $len; $c++) {
+            $this->i = ($this->i + 1) % 256;
+            $this->j = ($this->j + $this->s[$this->i]) % 256;
+            $t = $this->s[$this->i];
+            $this->s[$this->i] = $this->s[$this->j];
+            $this->s[$this->j] = $t;
+
+            $t = ($this->s[$this->i] + $this->s[$this->j]) % 256;
+
+            $data[$c] = chr(ord($data[$c]) ^ $this->s[$t]);
+        }
+        return $data;
+    }
+}

Classes/PHPExcel/Reader/Excel5/Style/Border.php

@@ -0,0 +1,36 @@
+<?php
+
+class PHPExcel_Reader_Excel5_Style_Border
+{
+    protected static $map = array(
+        0x00 => PHPExcel_Style_Border::BORDER_NONE,
+        0x01 => PHPExcel_Style_Border::BORDER_THIN,
+        0x02 => PHPExcel_Style_Border::BORDER_MEDIUM,
+        0x03 => PHPExcel_Style_Border::BORDER_DASHED,
+        0x04 => PHPExcel_Style_Border::BORDER_DOTTED,
+        0x05 => PHPExcel_Style_Border::BORDER_THICK,
+        0x06 => PHPExcel_Style_Border::BORDER_DOUBLE,
+        0x07 => PHPExcel_Style_Border::BORDER_HAIR,
+        0x08 => PHPExcel_Style_Border::BORDER_MEDIUMDASHED,
+        0x09 => PHPExcel_Style_Border::BORDER_DASHDOT,
+        0x0A => PHPExcel_Style_Border::BORDER_MEDIUMDASHDOT,
+        0x0B => PHPExcel_Style_Border::BORDER_DASHDOTDOT,
+        0x0C => PHPExcel_Style_Border::BORDER_MEDIUMDASHDOTDOT,
+        0x0D => PHPExcel_Style_Border::BORDER_SLANTDASHDOT,
+    );
+
+    /**
+     * Map border style
+     * OpenOffice documentation: 2.5.11
+     *
+     * @param int $index
+     * @return string
+     */
+    public static function lookup($index)
+    {
+        if (isset(self::$map[$index])) {
+            return self::$map[$index];
+        }
+        return PHPExcel_Style_Border::BORDER_NONE;
+    }
+}

Classes/PHPExcel/Reader/Excel5/Style/FillPattern.php

@@ -0,0 +1,41 @@
+<?php
+
+class PHPExcel_Reader_Excel5_Style_FillPattern
+{
+    protected static $map = array(
+        0x00 => PHPExcel_Style_Fill::FILL_NONE,
+        0x01 => PHPExcel_Style_Fill::FILL_SOLID,
+        0x02 => PHPExcel_Style_Fill::FILL_PATTERN_MEDIUMGRAY,
+        0x03 => PHPExcel_Style_Fill::FILL_PATTERN_DARKGRAY,
+        0x04 => PHPExcel_Style_Fill::FILL_PATTERN_LIGHTGRAY,
+        0x05 => PHPExcel_Style_Fill::FILL_PATTERN_DARKHORIZONTAL,
+        0x06 => PHPExcel_Style_Fill::FILL_PATTERN_DARKVERTICAL,
+        0x07 => PHPExcel_Style_Fill::FILL_PATTERN_DARKDOWN,
+        0x08 => PHPExcel_Style_Fill::FILL_PATTERN_DARKUP,
+        0x09 => PHPExcel_Style_Fill::FILL_PATTERN_DARKGRID,
+        0x0A => PHPExcel_Style_Fill::FILL_PATTERN_DARKTRELLIS,
+        0x0B => PHPExcel_Style_Fill::FILL_PATTERN_LIGHTHORIZONTAL,
+        0x0C => PHPExcel_Style_Fill::FILL_PATTERN_LIGHTVERTICAL,
+        0x0D => PHPExcel_Style_Fill::FILL_PATTERN_LIGHTDOWN,
+        0x0E => PHPExcel_Style_Fill::FILL_PATTERN_LIGHTUP,
+        0x0F => PHPExcel_Style_Fill::FILL_PATTERN_LIGHTGRID,
+        0x10 => PHPExcel_Style_Fill::FILL_PATTERN_LIGHTTRELLIS,
+        0x11 => PHPExcel_Style_Fill::FILL_PATTERN_GRAY125,
+        0x12 => PHPExcel_Style_Fill::FILL_PATTERN_GRAY0625,
+    );
+
+    /**
+     * Get fill pattern from index
+     * OpenOffice documentation: 2.5.12
+     *
+     * @param int $index
+     * @return string
+     */
+    public static function lookup($index)
+    {
+        if (isset(self::$map[$index])) {
+            return self::$map[$index];
+        }
+        return PHPExcel_Style_Fill::FILL_NONE;
+    }
+}

Classes/PHPExcel/Reader/Exception.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * PHPExcel
+ * PHPExcel_Reader_Exception
  *
- * Copyright (c) 2006 - 2013 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,20 +21,12 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-
-/**
- * PHPExcel_Reader_Exception
- *
- * @category   PHPExcel
- * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Reader_Exception extends PHPExcel_Exception {
+class PHPExcel_Reader_Exception extends PHPExcel_Exception
+{
     /**
      * Error handler callback
      *
@@ -43,7 +36,8 @@ class PHPExcel_Reader_Exception extends PHPExcel_Exception {
      * @param mixed $line
      * @param mixed $context
      */
-	public static function errorHandlerCallback($code, $string, $file, $line, $context) {
+    public static function errorHandlerCallback($code, $string, $file, $line, $context)
+    {
         $e = new self($string, $code);
         $e->line = $line;
         $e->file = $file;

Classes/PHPExcel/Reader/Gnumeric.php

@@ -1,8 +1,18 @@
 <?php
+
+/** PHPExcel root directory */
+if (!defined('PHPEXCEL_ROOT')) {
     /**
- * PHPExcel
+     * @ignore
+     */
+    define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
+    require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+}
+
+/**
+ * PHPExcel_Reader_Gnumeric
  *
- * Copyright (c) 2006 - 2013 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,28 +30,10 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-	/**
-	 * @ignore
-	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-/**
- * PHPExcel_Reader_Gnumeric
- *
- * @category	PHPExcel
- * @package		PHPExcel_Reader
- * @copyright	Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
 class PHPExcel_Reader_Gnumeric extends PHPExcel_Reader_Abstract implements PHPExcel_Reader_IReader
 {
     /**
@@ -49,27 +41,26 @@ class PHPExcel_Reader_Gnumeric extends PHPExcel_Reader_Abstract implements PHPEx
      *
      * @var array
      */
-	private $_styles = array();
+    private $styles = array();
 
     /**
      * Shared Expressions
      *
      * @var array
      */
-	private $_expressions = array();
-
-	private $_referenceHelper = null;
+    private $expressions = array();
 
+    private $referenceHelper = null;
 
     /**
      * Create a new PHPExcel_Reader_Gnumeric
      */
-	public function __construct() {
-		$this->_readFilter 	= new PHPExcel_Reader_DefaultReadFilter();
-		$this->_referenceHelper = PHPExcel_ReferenceHelper::getInstance();
+    public function __construct()
+    {
+        $this->readFilter     = new PHPExcel_Reader_DefaultReadFilter();
+        $this->referenceHelper = PHPExcel_ReferenceHelper::getInstance();
     }
 
-
     /**
      * Can the current PHPExcel_Reader_IReader read the file?
      *
@@ -101,7 +92,6 @@ class PHPExcel_Reader_Gnumeric extends PHPExcel_Reader_Abstract implements PHPEx
         return true;
     }
 
-
     /**
      * Reads names of the worksheets from a file, without parsing the whole file to a PHPExcel object
      *
@@ -116,9 +106,7 @@ class PHPExcel_Reader_Gnumeric extends PHPExcel_Reader_Abstract implements PHPEx
         }
 
         $xml = new XMLReader();
-		$xml->open(
-			'compress.zlib://'.realpath($pFilename)
-		);
+        $xml->xml($this->securityScanFile('compress.zlib://'.realpath($pFilename)), null, PHPExcel_Settings::getLibXmlLoaderOptions());
         $xml->setParserProperty(2, true);
 
         $worksheetNames = array();
@@ -135,7 +123,6 @@ class PHPExcel_Reader_Gnumeric extends PHPExcel_Reader_Abstract implements PHPEx
         return $worksheetNames;
     }
 
-
     /**
      * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns)
      *
@@ -150,9 +137,7 @@ class PHPExcel_Reader_Gnumeric extends PHPExcel_Reader_Abstract implements PHPEx
         }
 
         $xml = new XMLReader();
-		$xml->open(
-			'compress.zlib://'.realpath($pFilename)
-		);
+        $xml->xml($this->securityScanFile('compress.zlib://'.realpath($pFilename)), null, PHPExcel_Settings::getLibXmlLoaderOptions());
         $xml->setParserProperty(2, true);
 
         $worksheetInfo = array();
@@ -188,8 +173,8 @@ class PHPExcel_Reader_Gnumeric extends PHPExcel_Reader_Abstract implements PHPEx
         return $worksheetInfo;
     }
 
-
-	private function _gzfileGetContents($filename) {
+    private function gzfileGetContents($filename)
+    {
         $file = @gzopen($filename, 'rb');
         if ($file !== false) {
             $data = '';
@@ -201,7 +186,6 @@ class PHPExcel_Reader_Gnumeric extends PHPExcel_Reader_Abstract implements PHPEx
         return $data;
     }
 
-
     /**
      * Loads PHPExcel from file
      *
@@ -218,7 +202,6 @@ class PHPExcel_Reader_Gnumeric extends PHPExcel_Reader_Abstract implements PHPEx
         return $this->loadIntoExisting($pFilename, $objPHPExcel);
     }
 
-
     /**
      * Loads PHPExcel from file into PHPExcel instance
      *
@@ -237,13 +220,13 @@ class PHPExcel_Reader_Gnumeric extends PHPExcel_Reader_Abstract implements PHPEx
         $timezoneObj = new DateTimeZone('Europe/London');
         $GMT = new DateTimeZone('UTC');
 
-		$gFileData = $this->_gzfileGetContents($pFilename);
+        $gFileData = $this->gzfileGetContents($pFilename);
 
 //        echo '<pre>';
 //        echo htmlentities($gFileData,ENT_QUOTES,'UTF-8');
 //        echo '</pre><hr />';
 //
-		$xml = simplexml_load_string($gFileData);
+        $xml = simplexml_load_string($this->securityScan($gFileData), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions());
         $namespacesMeta = $xml->getNamespaces(true);
 
 //        var_dump($namespacesMeta);
@@ -258,7 +241,6 @@ class PHPExcel_Reader_Gnumeric extends PHPExcel_Reader_Abstract implements PHPEx
             $officeDocMetaXML = $officeDocXML->meta;
 
             foreach ($officeDocMetaXML as $officePropertyData) {
-
                 $officePropertyDC = array();
                 if (isset($namespacesMeta['dc'])) {
                     $officePropertyDC = $officePropertyData->children($namespacesMeta['dc']);
@@ -358,7 +340,7 @@ class PHPExcel_Reader_Gnumeric extends PHPExcel_Reader_Abstract implements PHPEx
         foreach ($gnmXML->Sheets->Sheet as $sheet) {
             $worksheetName = (string) $sheet->Name;
 //            echo '<b>Worksheet: ', $worksheetName,'</b><br />';
-			if ((isset($this->_loadSheetsOnly)) && (!in_array($worksheetName, $this->_loadSheetsOnly))) {
+            if ((isset($this->loadSheetsOnly)) && (!in_array($worksheetName, $this->loadSheetsOnly))) {
                 continue;
             }
 
@@ -372,9 +354,9 @@ class PHPExcel_Reader_Gnumeric extends PHPExcel_Reader_Abstract implements PHPEx
             //        name in line with the formula, not the reverse
             $objPHPExcel->getActiveSheet()->setTitle($worksheetName, false);
 
-			if ((!$this->_readDataOnly) && (isset($sheet->PrintInformation))) {
+            if ((!$this->readDataOnly) && (isset($sheet->PrintInformation))) {
                 if (isset($sheet->PrintInformation->Margins)) {
-					foreach($sheet->PrintInformation->Margins->children('gnm',TRUE) as $key => $margin) {
+                    foreach ($sheet->PrintInformation->Margins->children('gnm', true) as $key => $margin) {
                         $marginAttributes = $margin->attributes();
                         $marginSize = 72 / 100;    //    Default
                         switch ($marginAttributes['PrefUnit']) {
@@ -411,13 +393,17 @@ class PHPExcel_Reader_Gnumeric extends PHPExcel_Reader_Abstract implements PHPEx
                 $row = (int) $cellAttributes->Row + 1;
                 $column = (int) $cellAttributes->Col;
 
-				if ($row > $maxRow) $maxRow = $row;
-				if ($column > $maxCol) $maxCol = $column;
+                if ($row > $maxRow) {
+                    $maxRow = $row;
+                }
+                if ($column > $maxCol) {
+                    $maxCol = $column;
+                }
 
                 $column = PHPExcel_Cell::stringFromColumnIndex($column);
 
                 // Read cell?
-				if ($this->getReadFilter() !== NULL) {
+                if ($this->getReadFilter() !== null) {
                     if (!$this->getReadFilter()->readCell($column, $row, $worksheetName)) {
                         continue;
                     }
@@ -431,16 +417,17 @@ class PHPExcel_Reader_Gnumeric extends PHPExcel_Reader_Abstract implements PHPEx
                 $type = PHPExcel_Cell_DataType::TYPE_FORMULA;
                 if ($ExprID > '') {
                     if (((string) $cell) > '') {
-
-						$this->_expressions[$ExprID] = array( 'column'	=> $cellAttributes->Col,
+                        $this->expressions[$ExprID] = array(
+                            'column'    => $cellAttributes->Col,
                             'row'        => $cellAttributes->Row,
                             'formula'    => (string) $cell
                         );
 //                        echo 'NEW EXPRESSION ', $ExprID,'<br />';
                     } else {
-						$expression = $this->_expressions[$ExprID];
+                        $expression = $this->expressions[$ExprID];
 
-						$cell = $this->_referenceHelper->updateFormulaReferences( $expression['formula'],
+                        $cell = $this->referenceHelper->updateFormulaReferences(
+                            $expression['formula'],
                             'A1',
                             $cellAttributes->Col - $expression['column'],
                             $cellAttributes->Row - $expression['row'],
@@ -457,10 +444,11 @@ class PHPExcel_Reader_Gnumeric extends PHPExcel_Reader_Abstract implements PHPEx
                             break;
                         case '20':        //    Boolean
                             $type = PHPExcel_Cell_DataType::TYPE_BOOL;
-							$cell = ($cell == 'TRUE') ? True : False;
+                            $cell = ($cell == 'TRUE') ? true: false;
                             break;
                         case '30':        //    Integer
                             $cell = intval($cell);
+                            // Excel 2007+ doesn't differentiate between integer and float, so set the value and dropthru to the next (numeric) case
                         case '40':        //    Float
                             $type = PHPExcel_Cell_DataType::TYPE_NUMERIC;
                             break;
@@ -477,14 +465,12 @@ class PHPExcel_Reader_Gnumeric extends PHPExcel_Reader_Abstract implements PHPEx
                 $objPHPExcel->getActiveSheet()->getCell($column.$row)->setValueExplicit($cell, $type);
             }
 
-			if ((!$this->_readDataOnly) && (isset($sheet->Objects))) {
-				foreach($sheet->Objects->children('gnm',TRUE) as $key => $comment) {
+            if ((!$this->readDataOnly) && (isset($sheet->Objects))) {
+                foreach ($sheet->Objects->children('gnm', true) as $key => $comment) {
                     $commentAttributes = $comment->attributes();
                     //    Only comment objects are handled at the moment
                     if ($commentAttributes->Text) {
-						$objPHPExcel->getActiveSheet()->getComment( (string)$commentAttributes->ObjectBound )
-															->setAuthor( (string)$commentAttributes->Author )
-															->setText($this->_parseRichText((string)$commentAttributes->Text) );
+                        $objPHPExcel->getActiveSheet()->getComment((string)$commentAttributes->ObjectBound)->setAuthor((string)$commentAttributes->Author)->setText($this->parseRichText((string)$commentAttributes->Text));
                     }
                 }
             }
@@ -494,7 +480,6 @@ class PHPExcel_Reader_Gnumeric extends PHPExcel_Reader_Abstract implements PHPEx
                 $styleAttributes = $styleRegion->attributes();
                 if (($styleAttributes['startRow'] <= $maxRow) &&
                     ($styleAttributes['startCol'] <= $maxCol)) {
-
                     $startColumn = PHPExcel_Cell::stringFromColumnIndex((int) $styleAttributes['startCol']);
                     $startRow = $styleAttributes['startRow'] + 1;
 
@@ -509,13 +494,13 @@ class PHPExcel_Reader_Gnumeric extends PHPExcel_Reader_Abstract implements PHPEx
 //                    var_dump($styleAttributes);
 //                    echo '<br />';
 
-					//	We still set the number format mask for date/time values, even if _readDataOnly is true
-					if ((!$this->_readDataOnly) ||
-						(PHPExcel_Shared_Date::isDateTimeFormatCode($styleArray['numberformat']['code']))) {
+                    //    We still set the number format mask for date/time values, even if readDataOnly is true
+                    if ((!$this->readDataOnly) ||
+                        (PHPExcel_Shared_Date::isDateTimeFormatCode((string) $styleAttributes['Format']))) {
                         $styleArray = array();
                         $styleArray['numberformat']['code'] = (string) $styleAttributes['Format'];
-						//	If _readDataOnly is false, we set all formatting information
-						if (!$this->_readDataOnly) {
+                        //    If readDataOnly is false, we set all formatting information
+                        if (!$this->readDataOnly) {
                             switch ($styleAttributes['HAlign']) {
                                 case '1':
                                     $styleArray['alignment']['horizontal'] = PHPExcel_Style_Alignment::HORIZONTAL_GENERAL;
@@ -553,17 +538,17 @@ class PHPExcel_Reader_Gnumeric extends PHPExcel_Reader_Abstract implements PHPEx
                                     break;
                             }
 
-							$styleArray['alignment']['wrap'] = ($styleAttributes['WrapText'] == '1') ? True : False;
-							$styleArray['alignment']['shrinkToFit'] = ($styleAttributes['ShrinkToFit'] == '1') ? True : False;
+                            $styleArray['alignment']['wrap'] = ($styleAttributes['WrapText'] == '1') ? true : false;
+                            $styleArray['alignment']['shrinkToFit'] = ($styleAttributes['ShrinkToFit'] == '1') ? true : false;
                             $styleArray['alignment']['indent'] = (intval($styleAttributes["Indent"]) > 0) ? $styleAttributes["indent"] : 0;
 
-							$RGB = self::_parseGnumericColour($styleAttributes["Fore"]);
+                            $RGB = self::parseGnumericColour($styleAttributes["Fore"]);
                             $styleArray['font']['color']['rgb'] = $RGB;
-							$RGB = self::_parseGnumericColour($styleAttributes["Back"]);
+                            $RGB = self::parseGnumericColour($styleAttributes["Back"]);
                             $shade = $styleAttributes["Shade"];
                             if (($RGB != '000000') || ($shade != '0')) {
                                 $styleArray['fill']['color']['rgb'] = $styleArray['fill']['startcolor']['rgb'] = $RGB;
-								$RGB2 = self::_parseGnumericColour($styleAttributes["PatternColor"]);
+                                $RGB2 = self::parseGnumericColour($styleAttributes["PatternColor"]);
                                 $styleArray['fill']['endcolor']['rgb'] = $RGB2;
                                 switch ($shade) {
                                     case '1':
@@ -634,9 +619,9 @@ class PHPExcel_Reader_Gnumeric extends PHPExcel_Reader_Abstract implements PHPEx
 //                            echo '<br />';
                             $styleArray['font']['name'] = (string) $styleRegion->Style->Font;
                             $styleArray['font']['size'] = intval($fontAttributes['Unit']);
-							$styleArray['font']['bold'] = ($fontAttributes['Bold'] == '1') ? True : False;
-							$styleArray['font']['italic'] = ($fontAttributes['Italic'] == '1') ? True : False;
-							$styleArray['font']['strike'] = ($fontAttributes['StrikeThrough'] == '1') ? True : False;
+                            $styleArray['font']['bold'] = ($fontAttributes['Bold'] == '1') ? true : false;
+                            $styleArray['font']['italic'] = ($fontAttributes['Italic'] == '1') ? true : false;
+                            $styleArray['font']['strike'] = ($fontAttributes['StrikeThrough'] == '1') ? true : false;
                             switch ($fontAttributes['Underline']) {
                                 case '1':
                                     $styleArray['font']['underline'] = PHPExcel_Style_Font::UNDERLINE_SINGLE;
@@ -656,34 +641,34 @@ class PHPExcel_Reader_Gnumeric extends PHPExcel_Reader_Abstract implements PHPEx
                             }
                             switch ($fontAttributes['Script']) {
                                 case '1':
-									$styleArray['font']['superScript'] = True;
+                                    $styleArray['font']['superScript'] = true;
                                     break;
                                 case '-1':
-									$styleArray['font']['subScript'] = True;
+                                    $styleArray['font']['subScript'] = true;
                                     break;
                             }
 
                             if (isset($styleRegion->Style->StyleBorder)) {
                                 if (isset($styleRegion->Style->StyleBorder->Top)) {
-									$styleArray['borders']['top'] = self::_parseBorderAttributes($styleRegion->Style->StyleBorder->Top->attributes());
+                                    $styleArray['borders']['top'] = self::parseBorderAttributes($styleRegion->Style->StyleBorder->Top->attributes());
                                 }
                                 if (isset($styleRegion->Style->StyleBorder->Bottom)) {
-									$styleArray['borders']['bottom'] = self::_parseBorderAttributes($styleRegion->Style->StyleBorder->Bottom->attributes());
+                                    $styleArray['borders']['bottom'] = self::parseBorderAttributes($styleRegion->Style->StyleBorder->Bottom->attributes());
                                 }
                                 if (isset($styleRegion->Style->StyleBorder->Left)) {
-									$styleArray['borders']['left'] = self::_parseBorderAttributes($styleRegion->Style->StyleBorder->Left->attributes());
+                                    $styleArray['borders']['left'] = self::parseBorderAttributes($styleRegion->Style->StyleBorder->Left->attributes());
                                 }
                                 if (isset($styleRegion->Style->StyleBorder->Right)) {
-									$styleArray['borders']['right'] = self::_parseBorderAttributes($styleRegion->Style->StyleBorder->Right->attributes());
+                                    $styleArray['borders']['right'] = self::parseBorderAttributes($styleRegion->Style->StyleBorder->Right->attributes());
                                 }
                                 if ((isset($styleRegion->Style->StyleBorder->Diagonal)) && (isset($styleRegion->Style->StyleBorder->{'Rev-Diagonal'}))) {
-									$styleArray['borders']['diagonal'] = self::_parseBorderAttributes($styleRegion->Style->StyleBorder->Diagonal->attributes());
+                                    $styleArray['borders']['diagonal'] = self::parseBorderAttributes($styleRegion->Style->StyleBorder->Diagonal->attributes());
                                     $styleArray['borders']['diagonaldirection'] = PHPExcel_Style_Borders::DIAGONAL_BOTH;
                                 } elseif (isset($styleRegion->Style->StyleBorder->Diagonal)) {
-									$styleArray['borders']['diagonal'] = self::_parseBorderAttributes($styleRegion->Style->StyleBorder->Diagonal->attributes());
+                                    $styleArray['borders']['diagonal'] = self::parseBorderAttributes($styleRegion->Style->StyleBorder->Diagonal->attributes());
                                     $styleArray['borders']['diagonaldirection'] = PHPExcel_Style_Borders::DIAGONAL_UP;
                                 } elseif (isset($styleRegion->Style->StyleBorder->{'Rev-Diagonal'})) {
-									$styleArray['borders']['diagonal'] = self::_parseBorderAttributes($styleRegion->Style->StyleBorder->{'Rev-Diagonal'}->attributes());
+                                    $styleArray['borders']['diagonal'] = self::parseBorderAttributes($styleRegion->Style->StyleBorder->{'Rev-Diagonal'}->attributes());
                                     $styleArray['borders']['diagonaldirection'] = PHPExcel_Style_Borders::DIAGONAL_DOWN;
                                 }
                             }
@@ -699,7 +684,7 @@ class PHPExcel_Reader_Gnumeric extends PHPExcel_Reader_Abstract implements PHPEx
                 }
             }
 
-			if ((!$this->_readDataOnly) && (isset($sheet->Cols))) {
+            if ((!$this->readDataOnly) && (isset($sheet->Cols))) {
                 //    Column Widths
                 $columnAttributes = $sheet->Cols->attributes();
                 $defaultWidth = $columnAttributes['DefaultSizePts']  / 5.4;
@@ -728,7 +713,7 @@ class PHPExcel_Reader_Gnumeric extends PHPExcel_Reader_Abstract implements PHPEx
                 }
             }
 
-			if ((!$this->_readDataOnly) && (isset($sheet->Rows))) {
+            if ((!$this->readDataOnly) && (isset($sheet->Rows))) {
                 //    Row Heights
                 $rowAttributes = $sheet->Rows->attributes();
                 $defaultHeight = $rowAttributes['DefaultSizePts'];
@@ -761,7 +746,7 @@ class PHPExcel_Reader_Gnumeric extends PHPExcel_Reader_Abstract implements PHPEx
             //    Handle Merged Cells in this worksheet
             if (isset($sheet->MergedRegions)) {
                 foreach ($sheet->MergedRegions->Merge as $mergeCells) {
-					if (strpos($mergeCells,':') !== FALSE) {
+                    if (strpos($mergeCells, ':') !== false) {
                         $objPHPExcel->getActiveSheet()->mergeCells($mergeCells);
                     }
                 }
@@ -780,7 +765,7 @@ class PHPExcel_Reader_Gnumeric extends PHPExcel_Reader_Abstract implements PHPEx
                 }
 
                 $range = explode('!', $range);
-				$range[0] = trim($range[0],"'");;
+                $range[0] = trim($range[0], "'");
                 if ($worksheet = $objPHPExcel->getSheetByName($range[0])) {
                     $extractedRange = str_replace('$', '', $range[1]);
                     $objPHPExcel->addNamedRange(new PHPExcel_NamedRange($name, $worksheet, $extractedRange));
@@ -788,19 +773,15 @@ class PHPExcel_Reader_Gnumeric extends PHPExcel_Reader_Abstract implements PHPEx
             }
         }
 
-
         // Return
         return $objPHPExcel;
     }
 
-
-	private static function _parseBorderAttributes($borderAttributes)
+    private static function parseBorderAttributes($borderAttributes)
     {
         $styleArray = array();
-
         if (isset($borderAttributes["Color"])) {
-			$RGB = self::_parseGnumericColour($borderAttributes["Color"]);
-			$styleArray['color']['rgb'] = $RGB;
+            $styleArray['color']['rgb'] = self::parseGnumericColour($borderAttributes["Color"]);
         }
 
         switch ($borderAttributes["Style"]) {
@@ -813,6 +794,9 @@ class PHPExcel_Reader_Gnumeric extends PHPExcel_Reader_Abstract implements PHPEx
             case '2':
                 $styleArray['style'] = PHPExcel_Style_Border::BORDER_MEDIUM;
                 break;
+            case '3':
+                $styleArray['style'] = PHPExcel_Style_Border::BORDER_SLANTDASHDOT;
+                break;
             case '4':
                 $styleArray['style'] = PHPExcel_Style_Border::BORDER_DASHED;
                 break;
@@ -825,6 +809,9 @@ class PHPExcel_Reader_Gnumeric extends PHPExcel_Reader_Abstract implements PHPEx
             case '7':
                 $styleArray['style'] = PHPExcel_Style_Border::BORDER_DOTTED;
                 break;
+            case '8':
+                $styleArray['style'] = PHPExcel_Style_Border::BORDER_MEDIUMDASHED;
+                break;
             case '9':
                 $styleArray['style'] = PHPExcel_Style_Border::BORDER_DASHDOT;
                 break;
@@ -840,34 +827,24 @@ class PHPExcel_Reader_Gnumeric extends PHPExcel_Reader_Abstract implements PHPEx
             case '13':
                 $styleArray['style'] = PHPExcel_Style_Border::BORDER_MEDIUMDASHDOTDOT;
                 break;
-			case '3' :
-				$styleArray['style'] = PHPExcel_Style_Border::BORDER_SLANTDASHDOT;
-				break;
-			case '8' :
-				$styleArray['style'] = PHPExcel_Style_Border::BORDER_MEDIUMDASHED;
-				break;
         }
         return $styleArray;
     }
 
-
-	private function _parseRichText($is = '') {
+    private function parseRichText($is = '')
+    {
         $value = new PHPExcel_RichText();
-
         $value->createText($is);
 
         return $value;
     }
 
-
-	private static function _parseGnumericColour($gnmColour) {
+    private static function parseGnumericColour($gnmColour)
+    {
         list($gnmR, $gnmG, $gnmB) = explode(':', $gnmColour);
         $gnmR = substr(str_pad($gnmR, 4, '0', STR_PAD_RIGHT), 0, 2);
         $gnmG = substr(str_pad($gnmG, 4, '0', STR_PAD_RIGHT), 0, 2);
         $gnmB = substr(str_pad($gnmB, 4, '0', STR_PAD_RIGHT), 0, 2);
-		$RGB = $gnmR.$gnmG.$gnmB;
-//		echo 'Excel Colour: ',$RGB,'<br />';
-		return $RGB;
+        return $gnmR . $gnmG . $gnmB;
     }
-
 }

Classes/PHPExcel/Reader/HTML.php

@@ -1,8 +1,17 @@
 <?php
+
+if (!defined('PHPEXCEL_ROOT')) {
     /**
- * PHPExcel
+     * @ignore
+     */
+    define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
+    require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+}
+
+/**
+ * PHPExcel_Reader_HTML
  *
- * Copyright (c) 2006 - 2013 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,92 +29,98 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-
 /** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-	/**
-	 * @ignore
-	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-/**
- * PHPExcel_Reader_HTML
- *
- * @category   PHPExcel
- * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
 class PHPExcel_Reader_HTML extends PHPExcel_Reader_Abstract implements PHPExcel_Reader_IReader
 {
+
     /**
      * Input encoding
      *
      * @var string
      */
-	private $_inputEncoding	= 'ANSI';
+    protected $inputEncoding = 'ANSI';
 
     /**
      * Sheet index to read
      *
      * @var int
      */
-	private $_sheetIndex 	= 0;
+    protected $sheetIndex = 0;
 
     /**
      * Formats
      *
      * @var array
      */
-	private $_formats = array( 'h1' => array( 'font' => array( 'bold' => true,
+    protected $formats = array(
+        'h1' => array(
+            'font' => array(
+                'bold' => true,
                 'size' => 24,
             ),
         ), //    Bold, 24pt
-							   'h2' => array( 'font' => array( 'bold' => true,
+        'h2' => array(
+            'font' => array(
+                'bold' => true,
                 'size' => 18,
             ),
         ), //    Bold, 18pt
-							   'h3' => array( 'font' => array( 'bold' => true,
+        'h3' => array(
+            'font' => array(
+                'bold' => true,
                 'size' => 13.5,
             ),
         ), //    Bold, 13.5pt
-							   'h4' => array( 'font' => array( 'bold' => true,
+        'h4' => array(
+            'font' => array(
+                'bold' => true,
                 'size' => 12,
             ),
         ), //    Bold, 12pt
-							   'h5' => array( 'font' => array( 'bold' => true,
+        'h5' => array(
+            'font' => array(
+                'bold' => true,
                 'size' => 10,
             ),
         ), //    Bold, 10pt
-							   'h6' => array( 'font' => array( 'bold' => true,
+        'h6' => array(
+            'font' => array(
+                'bold' => true,
                 'size' => 7.5,
             ),
         ), //    Bold, 7.5pt
-							   'a'  => array( 'font' => array( 'underline' => true,
-															   'color' => array( 'argb' => PHPExcel_Style_Color::COLOR_BLUE,
+        'a' => array(
+            'font' => array(
+                'underline' => true,
+                'color' => array(
+                    'argb' => PHPExcel_Style_Color::COLOR_BLUE,
                 ),
             ),
         ), //    Blue underlined
-							   'hr' => array( 'borders' => array( 'bottom' => array( 'style' => PHPExcel_Style_Border::BORDER_THIN,
-																					 'color' => array( PHPExcel_Style_Color::COLOR_BLACK,
+        'hr' => array(
+            'borders' => array(
+                'bottom' => array(
+                    'style' => PHPExcel_Style_Border::BORDER_THIN,
+                    'color' => array(
+                        PHPExcel_Style_Color::COLOR_BLACK,
                     ),
                 ),
             ),
         ), //    Bottom border
     );
 
+    protected $rowspan = array();
 
     /**
      * Create a new PHPExcel_Reader_HTML
      */
-	public function __construct() {
-		$this->_readFilter 	= new PHPExcel_Reader_DefaultReadFilter();
+    public function __construct()
+    {
+        $this->readFilter = new PHPExcel_Reader_DefaultReadFilter();
     }
 
     /**
@@ -113,16 +128,16 @@ class PHPExcel_Reader_HTML extends PHPExcel_Reader_Abstract implements PHPExcel_
      *
      * @return boolean
      */
-	protected function _isValidFormat()
+    protected function isValidFormat()
     {
         //    Reading 2048 bytes should be enough to validate that the format is HTML
-		$data = fread($this->_fileHandle, 2048);
-		if ((strpos('<',$data) !== FALSE) &&
+        $data = fread($this->fileHandle, 2048);
+        if ((strpos($data, '<') !== false) &&
                 (strlen($data) !== strlen(strip_tags($data)))) {
-			return TRUE;
+            return true;
         }
 
-		return FALSE;
+        return false;
     }
 
     /**
@@ -148,7 +163,8 @@ class PHPExcel_Reader_HTML extends PHPExcel_Reader_Abstract implements PHPExcel_
      */
     public function setInputEncoding($pValue = 'ANSI')
     {
-		$this->_inputEncoding = $pValue;
+        $this->inputEncoding = $pValue;
+
         return $this;
     }
 
@@ -159,34 +175,39 @@ class PHPExcel_Reader_HTML extends PHPExcel_Reader_Abstract implements PHPExcel_
      */
     public function getInputEncoding()
     {
-		return $this->_inputEncoding;
+        return $this->inputEncoding;
     }
 
     //    Data Array used for testing only, should write to PHPExcel object on completion of tests
-	private $_dataArray = array();
+    protected $dataArray = array();
+    protected $tableLevel = 0;
+    protected $nestedColumn = array('A');
 
-	private $_tableLevel = 0;
-	private $_nestedColumn = array('A');
-
-	private function _setTableStartColumn($column) {
-		if ($this->_tableLevel == 0)
+    protected function setTableStartColumn($column)
+    {
+        if ($this->tableLevel == 0) {
             $column = 'A';
-		++$this->_tableLevel;
-		$this->_nestedColumn[$this->_tableLevel] = $column;
+        }
+        ++$this->tableLevel;
+        $this->nestedColumn[$this->tableLevel] = $column;
 
-		return $this->_nestedColumn[$this->_tableLevel];
+        return $this->nestedColumn[$this->tableLevel];
     }
 
-	private function _getTableStartColumn() {
-		return $this->_nestedColumn[$this->_tableLevel];
+    protected function getTableStartColumn()
+    {
+        return $this->nestedColumn[$this->tableLevel];
     }
 
-	private function _releaseTableStartColumn() {
-		--$this->_tableLevel;
-		return array_pop($this->_nestedColumn);
+    protected function releaseTableStartColumn()
+    {
+        --$this->tableLevel;
+
+        return array_pop($this->nestedColumn);
     }
 
-	private function _flushCell($sheet,$column,$row,&$cellContent) {
+    protected function flushCell($sheet, $column, $row, &$cellContent)
+    {
         if (is_string($cellContent)) {
             //    Simple String content
             if (trim($cellContent) > '') {
@@ -194,21 +215,22 @@ class PHPExcel_Reader_HTML extends PHPExcel_Reader_Abstract implements PHPExcel_
 //                echo 'FLUSH CELL: ' , $column , $row , ' => ' , $cellContent , '<br />';
                 //    Write to worksheet to be done here...
                 //    ... we return the cell so we can mess about with styles more easily
-				$cell = $sheet->setCellValue($column.$row,$cellContent,true);
-				$this->_dataArray[$row][$column] = $cellContent;
+                $sheet->setCellValue($column . $row, $cellContent, true);
+                $this->dataArray[$row][$column] = $cellContent;
             }
         } else {
             //    We have a Rich Text run
             //    TODO
-			$this->_dataArray[$row][$column] = 'RICH TEXT: ' . $cellContent;
+            $this->dataArray[$row][$column] = 'RICH TEXT: ' . $cellContent;
         }
         $cellContent = (string) '';
     }
 
-	private function _processDomElement(DOMNode $element, $sheet, &$row, &$column, &$cellContent){
+    protected function processDomElement(DOMNode $element, $sheet, &$row, &$column, &$cellContent, $format = null)
+    {
         foreach ($element->childNodes as $child) {
             if ($child instanceof DOMText) {
-				$domText = preg_replace('/\s+/',' ',trim($child->nodeValue));
+                $domText = preg_replace('/\s+/u', ' ', trim($child->nodeValue));
                 if (is_string($cellContent)) {
                     //    simply append the text if the cell content is a plain text string
                     $cellContent .= $domText;
@@ -235,10 +257,10 @@ class PHPExcel_Reader_HTML extends PHPExcel_Reader_Abstract implements PHPExcel_
                                     break;
                             }
                         }
-						$this->_processDomElement($child,$sheet,$row,$column,$cellContent);
+                        $this->processDomElement($child, $sheet, $row, $column, $cellContent);
                         break;
                     case 'title':
-						$this->_processDomElement($child,$sheet,$row,$column,$cellContent);
+                        $this->processDomElement($child, $sheet, $row, $column, $cellContent);
                         $sheet->setTitle($cellContent);
                         $cellContent = '';
                         break;
@@ -250,30 +272,33 @@ class PHPExcel_Reader_HTML extends PHPExcel_Reader_Abstract implements PHPExcel_
                     case 'strong':
                     case 'b':
 //                        echo 'STYLING, SPAN OR DIV<br />';
-						if ($cellContent > '')
+                        if ($cellContent > '') {
                             $cellContent .= ' ';
-						$this->_processDomElement($child,$sheet,$row,$column,$cellContent);
-						if ($cellContent > '')
+                        }
+                        $this->processDomElement($child, $sheet, $row, $column, $cellContent);
+                        if ($cellContent > '') {
                             $cellContent .= ' ';
+                        }
 //                        echo 'END OF STYLING, SPAN OR DIV<br />';
                         break;
                     case 'hr':
-						$this->_flushCell($sheet,$column,$row,$cellContent);
+                        $this->flushCell($sheet, $column, $row, $cellContent);
                         ++$row;
-						if (isset($this->_formats[$child->nodeName])) {
-							$sheet->getStyle($column.$row)->applyFromArray($this->_formats[$child->nodeName]);
+                        if (isset($this->formats[$child->nodeName])) {
+                            $sheet->getStyle($column . $row)->applyFromArray($this->formats[$child->nodeName]);
                         } else {
                             $cellContent = '----------';
-							$this->_flushCell($sheet,$column,$row,$cellContent);
+                            $this->flushCell($sheet, $column, $row, $cellContent);
                         }
                         ++$row;
+                        // Add a break after a horizontal rule, simply by allowing the code to dropthru
                     case 'br':
-						if ($this->_tableLevel > 0) {
+                        if ($this->tableLevel > 0) {
                             //    If we're inside a table, replace with a \n
                             $cellContent .= "\n";
                         } else {
                             //    Otherwise flush our existing content and move the row cursor on
-							$this->_flushCell($sheet,$column,$row,$cellContent);
+                            $this->flushCell($sheet, $column, $row, $cellContent);
                             ++$row;
                         }
 //                        echo 'HARD LINE BREAK: ' , '<br />';
@@ -285,14 +310,14 @@ class PHPExcel_Reader_HTML extends PHPExcel_Reader_Abstract implements PHPExcel_
                                 case 'href':
 //                                    echo 'Link to ' , $attributeValue , '<br />';
                                     $sheet->getCell($column . $row)->getHyperlink()->setUrl($attributeValue);
-									if (isset($this->_formats[$child->nodeName])) {
-										$sheet->getStyle($column.$row)->applyFromArray($this->_formats[$child->nodeName]);
+                                    if (isset($this->formats[$child->nodeName])) {
+                                        $sheet->getStyle($column . $row)->applyFromArray($this->formats[$child->nodeName]);
                                     }
                                     break;
                             }
                         }
                         $cellContent .= ' ';
-						$this->_processDomElement($child,$sheet,$row,$column,$cellContent);
+                        $this->processDomElement($child, $sheet, $row, $column, $cellContent);
 //                        echo 'END OF HYPERLINK:' , '<br />';
                         break;
                     case 'h1':
@@ -304,59 +329,60 @@ class PHPExcel_Reader_HTML extends PHPExcel_Reader_Abstract implements PHPExcel_
                     case 'ol':
                     case 'ul':
                     case 'p':
-						if ($this->_tableLevel > 0) {
+                        if ($this->tableLevel > 0) {
                             //    If we're inside a table, replace with a \n
                             $cellContent .= "\n";
 //                            echo 'LIST ENTRY: ' , '<br />';
-							$this->_processDomElement($child,$sheet,$row,$column,$cellContent);
+                            $this->processDomElement($child, $sheet, $row, $column, $cellContent);
 //                            echo 'END OF LIST ENTRY:' , '<br />';
                         } else {
                             if ($cellContent > '') {
-								$this->_flushCell($sheet,$column,$row,$cellContent);
-								$row += 2;
+                                $this->flushCell($sheet, $column, $row, $cellContent);
+                                $row++;
                             }
 //                            echo 'START OF PARAGRAPH: ' , '<br />';
-							$this->_processDomElement($child,$sheet,$row,$column,$cellContent);
+                            $this->processDomElement($child, $sheet, $row, $column, $cellContent);
 //                            echo 'END OF PARAGRAPH:' , '<br />';
-							$this->_flushCell($sheet,$column,$row,$cellContent);
+                            $this->flushCell($sheet, $column, $row, $cellContent);
 
-							if (isset($this->_formats[$child->nodeName])) {
-								$sheet->getStyle($column.$row)->applyFromArray($this->_formats[$child->nodeName]);
+                            if (isset($this->formats[$child->nodeName])) {
+                                $sheet->getStyle($column . $row)->applyFromArray($this->formats[$child->nodeName]);
                             }
 
-							$row += 2;
+                            $row++;
                             $column = 'A';
                         }
                         break;
                     case 'li':
-						if ($this->_tableLevel > 0) {
+                        if ($this->tableLevel > 0) {
                             //    If we're inside a table, replace with a \n
                             $cellContent .= "\n";
 //                            echo 'LIST ENTRY: ' , '<br />';
-							$this->_processDomElement($child,$sheet,$row,$column,$cellContent);
+                            $this->processDomElement($child, $sheet, $row, $column, $cellContent);
 //                            echo 'END OF LIST ENTRY:' , '<br />';
                         } else {
                             if ($cellContent > '') {
-								$this->_flushCell($sheet,$column,$row,$cellContent);
+                                $this->flushCell($sheet, $column, $row, $cellContent);
                             }
                             ++$row;
 //                            echo 'LIST ENTRY: ' , '<br />';
-							$this->_processDomElement($child,$sheet,$row,$column,$cellContent);
+                            $this->processDomElement($child, $sheet, $row, $column, $cellContent);
 //                            echo 'END OF LIST ENTRY:' , '<br />';
-							$this->_flushCell($sheet,$column,$row,$cellContent);
+                            $this->flushCell($sheet, $column, $row, $cellContent);
                             $column = 'A';
                         }
                         break;
                     case 'table':
-						$this->_flushCell($sheet,$column,$row,$cellContent);
-						$column = $this->_setTableStartColumn($column);
-//						echo 'START OF TABLE LEVEL ' , $this->_tableLevel , '<br />';
-						if ($this->_tableLevel > 1)
+                        $this->flushCell($sheet, $column, $row, $cellContent);
+                        $column = $this->setTableStartColumn($column);
+//                        echo 'START OF TABLE LEVEL ' , $this->tableLevel , '<br />';
+                        if ($this->tableLevel > 1) {
                             --$row;
-						$this->_processDomElement($child,$sheet,$row,$column,$cellContent);
-//						echo 'END OF TABLE LEVEL ' , $this->_tableLevel , '<br />';
-						$column = $this->_releaseTableStartColumn();
-						if ($this->_tableLevel > 1) {
+                        }
+                        $this->processDomElement($child, $sheet, $row, $column, $cellContent);
+//                        echo 'END OF TABLE LEVEL ' , $this->tableLevel , '<br />';
+                        $column = $this->releaseTableStartColumn();
+                        if ($this->tableLevel > 1) {
                             ++$column;
                         } else {
                             ++$row;
@@ -364,33 +390,75 @@ class PHPExcel_Reader_HTML extends PHPExcel_Reader_Abstract implements PHPExcel_
                         break;
                     case 'thead':
                     case 'tbody':
-						$this->_processDomElement($child,$sheet,$row,$column,$cellContent);
+                        $this->processDomElement($child, $sheet, $row, $column, $cellContent);
                         break;
                     case 'tr':
-						++$row;
-						$column = $this->_getTableStartColumn();
+                        $column = $this->getTableStartColumn();
                         $cellContent = '';
-//						echo 'START OF TABLE ' , $this->_tableLevel , ' ROW<br />';
-						$this->_processDomElement($child,$sheet,$row,$column,$cellContent);
-//						echo 'END OF TABLE ' , $this->_tableLevel , ' ROW<br />';
+//                        echo 'START OF TABLE ' , $this->tableLevel , ' ROW<br />';
+                        $this->processDomElement($child, $sheet, $row, $column, $cellContent);
+                        ++$row;
+//                        echo 'END OF TABLE ' , $this->tableLevel , ' ROW<br />';
                         break;
                     case 'th':
                     case 'td':
-//						echo 'START OF TABLE ' , $this->_tableLevel , ' CELL<br />';
-						$this->_processDomElement($child,$sheet,$row,$column,$cellContent);
-//						echo 'END OF TABLE ' , $this->_tableLevel , ' CELL<br />';
-						$this->_flushCell($sheet,$column,$row,$cellContent);
+//                        echo 'START OF TABLE ' , $this->tableLevel , ' CELL<br />';
+                        $this->processDomElement($child, $sheet, $row, $column, $cellContent);
+//                        echo 'END OF TABLE ' , $this->tableLevel , ' CELL<br />';
+
+                        while (isset($this->rowspan[$column . $row])) {
+                            ++$column;
+                        }
+
+                        $this->flushCell($sheet, $column, $row, $cellContent);
+
+//                        if (isset($attributeArray['style']) && !empty($attributeArray['style'])) {
+//                            $styleAry = $this->getPhpExcelStyleArray($attributeArray['style']);
+//
+//                            if (!empty($styleAry)) {
+//                                $sheet->getStyle($column . $row)->applyFromArray($styleAry);
+//                            }
+//                        }
+
+                        if (isset($attributeArray['rowspan']) && isset($attributeArray['colspan'])) {
+                            //create merging rowspan and colspan
+                            $columnTo = $column;
+                            for ($i = 0; $i < $attributeArray['colspan'] - 1; $i++) {
+                                ++$columnTo;
+                            }
+                            $range = $column . $row . ':' . $columnTo . ($row + $attributeArray['rowspan'] - 1);
+                            foreach (\PHPExcel_Cell::extractAllCellReferencesInRange($range) as $value) {
+                                $this->rowspan[$value] = true;
+                            }
+                            $sheet->mergeCells($range);
+                            $column = $columnTo;
+                        } elseif (isset($attributeArray['rowspan'])) {
+                            //create merging rowspan
+                            $range = $column . $row . ':' . $column . ($row + $attributeArray['rowspan'] - 1);
+                            foreach (\PHPExcel_Cell::extractAllCellReferencesInRange($range) as $value) {
+                                $this->rowspan[$value] = true;
+                            }
+                            $sheet->mergeCells($range);
+                        } elseif (isset($attributeArray['colspan'])) {
+                            //create merging colspan
+                            $columnTo = $column;
+                            for ($i = 0; $i < $attributeArray['colspan'] - 1; $i++) {
+                                ++$columnTo;
+                            }
+                            $sheet->mergeCells($column . $row . ':' . $columnTo . $row);
+                            $column = $columnTo;
+                        }
                         ++$column;
                         break;
                     case 'body':
                         $row = 1;
                         $column = 'A';
                         $content = '';
-						$this->_tableLevel = 0;
-						$this->_processDomElement($child,$sheet,$row,$column,$cellContent);
+                        $this->tableLevel = 0;
+                        $this->processDomElement($child, $sheet, $row, $column, $cellContent);
                         break;
                     default:
-						$this->_processDomElement($child,$sheet,$row,$column,$cellContent);
+                        $this->processDomElement($child, $sheet, $row, $column, $cellContent);
                 }
             }
         }
@@ -407,39 +475,35 @@ class PHPExcel_Reader_HTML extends PHPExcel_Reader_Abstract implements PHPExcel_
     public function loadIntoExisting($pFilename, PHPExcel $objPHPExcel)
     {
         // Open file to validate
-		$this->_openFile($pFilename);
-		if (!$this->_isValidFormat()) {
-			fclose ($this->_fileHandle);
+        $this->openFile($pFilename);
+        if (!$this->isValidFormat()) {
+            fclose($this->fileHandle);
             throw new PHPExcel_Reader_Exception($pFilename . " is an Invalid HTML file.");
         }
         //    Close after validating
-		fclose ($this->_fileHandle);
+        fclose($this->fileHandle);
 
         // Create new PHPExcel
-		while ($objPHPExcel->getSheetCount() <= $this->_sheetIndex) {
+        while ($objPHPExcel->getSheetCount() <= $this->sheetIndex) {
             $objPHPExcel->createSheet();
         }
-		$objPHPExcel->setActiveSheetIndex( $this->_sheetIndex );
+        $objPHPExcel->setActiveSheetIndex($this->sheetIndex);
 
         //    Create a new DOM object
         $dom = new domDocument;
         //    Reload the HTML file into the DOM object
-		$loaded = $dom->loadHTMLFile($pFilename);
-		if ($loaded === FALSE) {
-			throw new PHPExcel_Reader_Exception('Failed to load ',$pFilename,' as a DOM Document');
+        $loaded = $dom->loadHTML(mb_convert_encoding($this->securityScanFile($pFilename), 'HTML-ENTITIES', 'UTF-8'));
+        if ($loaded === false) {
+            throw new PHPExcel_Reader_Exception('Failed to load ' . $pFilename . ' as a DOM Document');
         }
 
         //    Discard white space
         $dom->preserveWhiteSpace = false;
 
-
         $row = 0;
         $column = 'A';
         $content = '';
-		$this->_processDomElement($dom,$objPHPExcel->getActiveSheet(),$row,$column,$content);
-
-//		echo '<hr />';
-//		var_dump($this->_dataArray);
+        $this->processDomElement($dom, $objPHPExcel->getActiveSheet(), $row, $column, $content);
 
         // Return
         return $objPHPExcel;
@@ -450,8 +514,9 @@ class PHPExcel_Reader_HTML extends PHPExcel_Reader_Abstract implements PHPExcel_
      *
      * @return int
      */
-	public function getSheetIndex() {
-		return $this->_sheetIndex;
+    public function getSheetIndex()
+    {
+        return $this->sheetIndex;
     }
 
     /**
@@ -460,9 +525,25 @@ class PHPExcel_Reader_HTML extends PHPExcel_Reader_Abstract implements PHPExcel_
      * @param  int                  $pValue Sheet index
      * @return PHPExcel_Reader_HTML
      */
-	public function setSheetIndex($pValue = 0) {
-		$this->_sheetIndex = $pValue;
+    public function setSheetIndex($pValue = 0)
+    {
+        $this->sheetIndex = $pValue;
+
         return $this;
     }
 
+    /**
+     * Scan theXML for use of <!ENTITY to prevent XXE/XEE attacks
+     *
+     * @param     string         $xml
+     * @throws PHPExcel_Reader_Exception
+     */
+    public function securityScan($xml)
+    {
+        $pattern = '/\\0?' . implode('\\0?', str_split('<!ENTITY')) . '\\0?/';
+        if (preg_match($pattern, $xml)) {
+            throw new PHPExcel_Reader_Exception('Detected use of ENTITY in XML, spreadsheet file load() aborted to prevent XXE/XEE attacks');
+        }
+        return $xml;
+    }
 }

Classes/PHPExcel/Reader/IReadFilter.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * PHPExcel
+ * PHPExcel_Reader_IReadFilter
  *
- * Copyright (c) 2006 - 2013 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,26 +21,17 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-
-/**
- * PHPExcel_Reader_IReadFilter
- *
- * @category   PHPExcel
- * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
 interface PHPExcel_Reader_IReadFilter
 {
     /**
      * Should this cell be read?
      *
-	 * @param 	$column		String column index
-	 * @param 	$row			Row index
+     * @param    $column           Column address (as a string value like "A", or "IV")
+     * @param    $row              Row number
      * @param    $worksheetName    Optional worksheet name
      * @return   boolean
      */

Classes/PHPExcel/Reader/IReader.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * PHPExcel
+ * PHPExcel_Reader_IReader
  *
- * Copyright (c) 2006 - 2013 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,19 +21,10 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-
-/**
- * PHPExcel_Reader_IReader
- *
- * @category   PHPExcel
- * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
 interface PHPExcel_Reader_IReader
 {
     /**
@@ -47,6 +39,7 @@ interface PHPExcel_Reader_IReader
      * Loads PHPExcel from file
      *
      * @param     string         $pFilename
+     * @return  PHPExcel
      * @throws     PHPExcel_Reader_Exception
      */
     public function load($pFilename);

Classes/PHPExcel/Reader/OOCalc.php

@@ -1,8 +1,18 @@
 <?php
+
+/** PHPExcel root directory */
+if (!defined('PHPEXCEL_ROOT')) {
     /**
- * PHPExcel
+     * @ignore
+     */
+    define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
+    require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+}
+
+/**
+ * PHPExcel_Reader_OOCalc
  *
- * Copyright (c) 2006 - 2013 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,28 +30,10 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-	/**
-	 * @ignore
-	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-/**
- * PHPExcel_Reader_OOCalc
- *
- * @category	PHPExcel
- * @package		PHPExcel_Reader
- * @copyright	Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
 class PHPExcel_Reader_OOCalc extends PHPExcel_Reader_Abstract implements PHPExcel_Reader_IReader
 {
     /**
@@ -49,17 +41,16 @@ class PHPExcel_Reader_OOCalc extends PHPExcel_Reader_Abstract implements PHPExce
      *
      * @var array
      */
-	private $_styles = array();
-
+    private $styles = array();
 
     /**
      * Create a new PHPExcel_Reader_OOCalc
      */
-	public function __construct() {
-		$this->_readFilter 	= new PHPExcel_Reader_DefaultReadFilter();
+    public function __construct()
+    {
+        $this->readFilter     = new PHPExcel_Reader_DefaultReadFilter();
     }
 
-
     /**
      * Can the current PHPExcel_Reader_IReader read the file?
      *
@@ -74,21 +65,23 @@ class PHPExcel_Reader_OOCalc extends PHPExcel_Reader_Abstract implements PHPExce
             throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! File does not exist.");
         }
 
+        $zipClass = PHPExcel_Settings::getZipClass();
+
         // Check if zip class exists
-		if (!class_exists('ZipArchive',FALSE)) {
-			throw new PHPExcel_Reader_Exception("ZipArchive library is not enabled");
-		}
+//        if (!class_exists($zipClass, false)) {
+//            throw new PHPExcel_Reader_Exception($zipClass . " library is not enabled");
+//        }
 
         $mimeType = 'UNKNOWN';
         // Load file
-		$zip = new ZipArchive;
+        $zip = new $zipClass;
         if ($zip->open($pFilename) === true) {
             // check if it is an OOXML archive
             $stat = $zip->statName('mimetype');
             if ($stat && ($stat['size'] <= 255)) {
                 $mimeType = $zip->getFromName($stat['name']);
             } elseif ($stat = $zip->statName('META-INF/manifest.xml')) {
-		        $xml = simplexml_load_string($zip->getFromName('META-INF/manifest.xml'));
+                $xml = simplexml_load_string($this->securityScan($zip->getFromName('META-INF/manifest.xml')), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions());
                 $namespacesContent = $xml->getNamespaces(true);
                 if (isset($namespacesContent['manifest'])) {
                     $manifest = $xml->children($namespacesContent['manifest']);
@@ -107,7 +100,7 @@ class PHPExcel_Reader_OOCalc extends PHPExcel_Reader_Abstract implements PHPExce
             return ($mimeType === 'application/vnd.oasis.opendocument.spreadsheet');
         }
 
-		return FALSE;
+        return false;
     }
 
 
@@ -124,7 +117,9 @@ class PHPExcel_Reader_OOCalc extends PHPExcel_Reader_Abstract implements PHPExce
             throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! File does not exist.");
         }
 
-		$zip = new ZipArchive;
+        $zipClass = PHPExcel_Settings::getZipClass();
+
+        $zip = new $zipClass;
         if (!$zip->open($pFilename)) {
             throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! Error opening file.");
         }
@@ -132,7 +127,7 @@ class PHPExcel_Reader_OOCalc extends PHPExcel_Reader_Abstract implements PHPExce
         $worksheetNames = array();
 
         $xml = new XMLReader();
-		$res = $xml->open('zip://'.realpath($pFilename).'#content.xml');
+        $res = $xml->xml($this->securityScanFile('zip://'.realpath($pFilename).'#content.xml'), null, PHPExcel_Settings::getLibXmlLoaderOptions());
         $xml->setParserProperty(2, true);
 
         //    Step into the first level of content of the XML
@@ -140,11 +135,12 @@ class PHPExcel_Reader_OOCalc extends PHPExcel_Reader_Abstract implements PHPExce
         while ($xml->read()) {
             //    Quickly jump through to the office:body node
             while ($xml->name !== 'office:body') {
-				if ($xml->isEmptyElement)
+                if ($xml->isEmptyElement) {
                     $xml->read();
-				else
+                } else {
                     $xml->next();
                 }
+            }
             //    Now read each node until we find our first table:table node
             while ($xml->read()) {
                 if ($xml->name == 'table:table' && $xml->nodeType == XMLReader::ELEMENT) {
@@ -160,7 +156,6 @@ class PHPExcel_Reader_OOCalc extends PHPExcel_Reader_Abstract implements PHPExce
         return $worksheetNames;
     }
 
-
     /**
      * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns)
      *
@@ -176,13 +171,15 @@ class PHPExcel_Reader_OOCalc extends PHPExcel_Reader_Abstract implements PHPExce
 
         $worksheetInfo = array();
 
-		$zip = new ZipArchive;
+        $zipClass = PHPExcel_Settings::getZipClass();
+
+        $zip = new $zipClass;
         if (!$zip->open($pFilename)) {
             throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! Error opening file.");
         }
 
         $xml = new XMLReader();
-		$res = $xml->open('zip://'.realpath($pFilename).'#content.xml');
+        $res = $xml->xml($this->securityScanFile('zip://'.realpath($pFilename).'#content.xml'), null, PHPExcel_Settings::getLibXmlLoaderOptions());
         $xml->setParserProperty(2, true);
 
         //    Step into the first level of content of the XML
@@ -190,11 +187,12 @@ class PHPExcel_Reader_OOCalc extends PHPExcel_Reader_Abstract implements PHPExce
         while ($xml->read()) {
             //    Quickly jump through to the office:body node
             while ($xml->name !== 'office:body') {
-				if ($xml->isEmptyElement)
+                if ($xml->isEmptyElement) {
                     $xml->read();
-				else
+                } else {
                     $xml->next();
                 }
+            }
                 //    Now read each node until we find our first table:table node
             while ($xml->read()) {
                 if ($xml->name == 'table:table' && $xml->nodeType == XMLReader::ELEMENT) {
@@ -283,7 +281,6 @@ class PHPExcel_Reader_OOCalc extends PHPExcel_Reader_Abstract implements PHPExce
         return $worksheetInfo;
     }
 
-
     /**
      * Loads PHPExcel from file
      *
@@ -300,8 +297,8 @@ class PHPExcel_Reader_OOCalc extends PHPExcel_Reader_Abstract implements PHPExce
         return $this->loadIntoExisting($pFilename, $objPHPExcel);
     }
 
-
-	private static function identifyFixedStyleValue($styleList,&$styleAttributeValue) {
+    private static function identifyFixedStyleValue($styleList, &$styleAttributeValue)
+    {
         $styleAttributeValue = strtolower($styleAttributeValue);
         foreach ($styleList as $style) {
             if ($styleAttributeValue == strtolower($style)) {
@@ -312,7 +309,6 @@ class PHPExcel_Reader_OOCalc extends PHPExcel_Reader_Abstract implements PHPExce
         return false;
     }
 
-
     /**
      * Loads PHPExcel from file into PHPExcel instance
      *
@@ -331,13 +327,15 @@ class PHPExcel_Reader_OOCalc extends PHPExcel_Reader_Abstract implements PHPExce
         $timezoneObj = new DateTimeZone('Europe/London');
         $GMT = new DateTimeZone('UTC');
 
-		$zip = new ZipArchive;
+        $zipClass = PHPExcel_Settings::getZipClass();
+
+        $zip = new $zipClass;
         if (!$zip->open($pFilename)) {
             throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! Error opening file.");
         }
 
 //        echo '<h1>Meta Information</h1>';
-		$xml = simplexml_load_string($zip->getFromName("meta.xml"));
+        $xml = simplexml_load_string($this->securityScan($zip->getFromName("meta.xml")), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions());
         $namespacesMeta = $xml->getNamespaces(true);
 //        echo '<pre>';
 //        print_r($namespacesMeta);
@@ -351,6 +349,7 @@ class PHPExcel_Reader_OOCalc extends PHPExcel_Reader_Abstract implements PHPExce
                 $officePropertyDC = $officePropertyData->children($namespacesMeta['dc']);
             }
             foreach ($officePropertyDC as $propertyName => $propertyValue) {
+                $propertyValue = (string) $propertyValue;
                 switch ($propertyName) {
                     case 'title':
                         $docProps->setTitle($propertyValue);
@@ -378,6 +377,7 @@ class PHPExcel_Reader_OOCalc extends PHPExcel_Reader_Abstract implements PHPExce
             }
             foreach ($officePropertyMeta as $propertyName => $propertyValue) {
                 $propertyValueAttributes = $propertyValue->attributes($namespacesMeta['meta']);
+                $propertyValue = (string) $propertyValue;
                 switch ($propertyName) {
                     case 'initial-creator':
                         $docProps->setCreator($propertyValue);
@@ -421,7 +421,7 @@ class PHPExcel_Reader_OOCalc extends PHPExcel_Reader_Abstract implements PHPExce
 
 
 //        echo '<h1>Workbook Content</h1>';
-		$xml = simplexml_load_string($zip->getFromName("content.xml"));
+        $xml = simplexml_load_string($this->securityScan($zip->getFromName("content.xml")), 'SimpleXMLElement', PHPExcel_Settings::getLibXmlLoaderOptions());
         $namespacesContent = $xml->getNamespaces(true);
 //        echo '<pre>';
 //        print_r($namespacesContent);
@@ -438,8 +438,8 @@ class PHPExcel_Reader_OOCalc extends PHPExcel_Reader_Abstract implements PHPExce
                 $worksheetDataAttributes = $worksheetDataSet->attributes($namespacesContent['table']);
 //                print_r($worksheetDataAttributes);
 //                echo '<br />';
-				if ((isset($this->_loadSheetsOnly)) && (isset($worksheetDataAttributes['name'])) &&
-					(!in_array($worksheetDataAttributes['name'], $this->_loadSheetsOnly))) {
+                if ((isset($this->loadSheetsOnly)) && (isset($worksheetDataAttributes['name'])) &&
+                    (!in_array($worksheetDataAttributes['name'], $this->loadSheetsOnly))) {
                     continue;
                 }
 
@@ -466,20 +466,17 @@ class PHPExcel_Reader_OOCalc extends PHPExcel_Reader_Abstract implements PHPExce
                             }
                         case 'table-row':
                             $rowDataTableAttributes = $rowData->attributes($namespacesContent['table']);
-							$rowRepeats = (isset($rowDataTableAttributes['number-rows-repeated'])) ?
-									$rowDataTableAttributes['number-rows-repeated'] : 1;
+                            $rowRepeats = (isset($rowDataTableAttributes['number-rows-repeated'])) ? $rowDataTableAttributes['number-rows-repeated'] : 1;
                             $columnID = 'A';
                             foreach ($rowData as $key => $cellData) {
-								if ($this->getReadFilter() !== NULL) {
+                                if ($this->getReadFilter() !== null) {
                                     if (!$this->getReadFilter()->readCell($columnID, $rowID, $worksheetName)) {
                                         continue;
                                     }
                                 }
 
 //                                echo '<b>'.$columnID.$rowID.'</b><br />';
-								$cellDataText = (isset($namespacesContent['text'])) ?
-									$cellData->children($namespacesContent['text']) :
-									'';
+                                $cellDataText = (isset($namespacesContent['text'])) ? $cellData->children($namespacesContent['text']) : '';
                                 $cellDataOffice = $cellData->children($namespacesContent['office']);
                                 $cellDataOfficeAttributes = $cellData->attributes($namespacesContent['office']);
                                 $cellDataTableAttributes = $cellData->attributes($namespacesContent['table']);
@@ -505,15 +502,18 @@ class PHPExcel_Reader_OOCalc extends PHPExcel_Reader_Abstract implements PHPExce
                                     $annotationText = $cellDataOffice->annotation->children($namespacesContent['text']);
                                     $textArray = array();
                                     foreach ($annotationText as $t) {
+                                        if (isset($t->span)) {
                                             foreach ($t->span as $text) {
                                                 $textArray[] = (string)$text;
                                             }
+                                        } else {
+                                            $textArray[] = (string) $t;
+                                        }
                                     }
                                     $text = implode("\n", $textArray);
 //                                    echo $text, '<br />';
-									$objPHPExcel->getActiveSheet()->getComment( $columnID.$rowID )
+                                    $objPHPExcel->getActiveSheet()->getComment($columnID.$rowID)->setText($this->parseRichText($text));
 //                                                                    ->setAuthor( $author )
-																	->setText($this->_parseRichText($text) );
                                 }
 
                                 if (isset($cellDataText->p)) {
@@ -550,7 +550,7 @@ class PHPExcel_Reader_OOCalc extends PHPExcel_Reader_Abstract implements PHPExce
                                             break;
                                         case 'boolean':
                                             $type = PHPExcel_Cell_DataType::TYPE_BOOL;
-												$dataValue = ($allCellDataText == 'TRUE') ? True : False;
+                                            $dataValue = ($allCellDataText == 'TRUE') ? true : false;
                                             break;
                                         case 'percentage':
                                             $type = PHPExcel_Cell_DataType::TYPE_NUMERIC;
@@ -572,11 +572,12 @@ class PHPExcel_Reader_OOCalc extends PHPExcel_Reader_Abstract implements PHPExce
                                             $type = PHPExcel_Cell_DataType::TYPE_NUMERIC;
                                             $dataValue = (float) $cellDataOfficeAttributes['value'];
                                             if (floor($dataValue) == $dataValue) {
-													if ($dataValue = (integer) $dataValue)
+                                                if ($dataValue == (integer) $dataValue) {
                                                     $dataValue = (integer) $dataValue;
-													else
+                                                } else {
                                                     $dataValue = (float) $dataValue;
                                                 }
+                                            }
                                             break;
                                         case 'date':
                                             $type = PHPExcel_Cell_DataType::TYPE_NUMERIC;
@@ -597,37 +598,38 @@ class PHPExcel_Reader_OOCalc extends PHPExcel_Reader_Abstract implements PHPExce
                                             break;
                                     }
 //                                    echo 'Data value is '.$dataValue.'<br />';
-//									if ($hyperlink !== NULL) {
+//                                    if ($hyperlink !== null) {
 //                                        echo 'Hyperlink is '.$hyperlink.'<br />';
 //                                    }
                                 } else {
                                     $type = PHPExcel_Cell_DataType::TYPE_NULL;
-									$dataValue = NULL;
+                                    $dataValue = null;
                                 }
 
                                 if ($hasCalculatedValue) {
                                     $type = PHPExcel_Cell_DataType::TYPE_FORMULA;
-//									echo 'Formula: '.$cellDataFormula.'<br />';
+//                                    echo 'Formula: ', $cellDataFormula, PHP_EOL;
                                     $cellDataFormula = substr($cellDataFormula, strpos($cellDataFormula, ':=')+1);
                                     $temp = explode('"', $cellDataFormula);
                                     $tKey = false;
                                     foreach ($temp as &$value) {
                                         //    Only replace in alternate array entries (i.e. non-quoted blocks)
                                         if ($tKey = !$tKey) {
-											$value = preg_replace('/\[\.(.*):\.(.*)\]/Ui','$1:$2',$value);
-											$value = preg_replace('/\[\.(.*)\]/Ui','$1',$value);
-											$value = PHPExcel_Calculation::_translateSeparator(';',',',$value,$inBraces);
+                                            $value = preg_replace('/\[([^\.]+)\.([^\.]+):\.([^\.]+)\]/Ui', '$1!$2:$3', $value);    //  Cell range reference in another sheet
+                                            $value = preg_replace('/\[([^\.]+)\.([^\.]+)\]/Ui', '$1!$2', $value);       //  Cell reference in another sheet
+                                            $value = preg_replace('/\[\.([^\.]+):\.([^\.]+)\]/Ui', '$1:$2', $value);    //  Cell range reference
+                                            $value = preg_replace('/\[\.([^\.]+)\]/Ui', '$1', $value);                  //  Simple cell reference
+                                            $value = PHPExcel_Calculation::translateSeparator(';', ',', $value, $inBraces);
                                         }
                                     }
                                     unset($value);
                                     //    Then rebuild the formula string
                                     $cellDataFormula = implode('"', $temp);
-//									echo 'Adjusted Formula: '.$cellDataFormula.'<br />';
+//                                    echo 'Adjusted Formula: ', $cellDataFormula, PHP_EOL;
                                 }
 
-								$colRepeats = (isset($cellDataTableAttributes['number-columns-repeated'])) ?
-									$cellDataTableAttributes['number-columns-repeated'] : 1;
-								if ($type !== NULL) {
+                                $colRepeats = (isset($cellDataTableAttributes['number-columns-repeated'])) ? $cellDataTableAttributes['number-columns-repeated'] : 1;
+                                if ($type !== null) {
                                     for ($i = 0; $i < $colRepeats; ++$i) {
                                         if ($i > 0) {
                                             ++$columnID;
@@ -640,12 +642,12 @@ class PHPExcel_Reader_OOCalc extends PHPExcel_Reader_Abstract implements PHPExce
 //                                                    echo 'Forumla result is '.$dataValue.'<br />';
                                                     $objPHPExcel->getActiveSheet()->getCell($columnID.$rID)->setCalculatedValue($dataValue);
                                                 }
-												if ($formatting !== NULL) {
+                                                if ($formatting !== null) {
                                                     $objPHPExcel->getActiveSheet()->getStyle($columnID.$rID)->getNumberFormat()->setFormatCode($formatting);
                                                 } else {
                                                     $objPHPExcel->getActiveSheet()->getStyle($columnID.$rID)->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_GENERAL);
                                                 }
-												if ($hyperlink !== NULL) {
+                                                if ($hyperlink !== null) {
                                                     $objPHPExcel->getActiveSheet()->getCell($columnID.$rID)->getHyperlink()->setUrl($hyperlink);
                                                 }
                                             }
@@ -655,7 +657,7 @@ class PHPExcel_Reader_OOCalc extends PHPExcel_Reader_Abstract implements PHPExce
 
                                 //    Merged cells
                                 if ((isset($cellDataTableAttributes['number-columns-spanned'])) || (isset($cellDataTableAttributes['number-rows-spanned']))) {
-									if (($type !== PHPExcel_Cell_DataType::TYPE_NULL) || (!$this->_readDataOnly)) {
+                                    if (($type !== PHPExcel_Cell_DataType::TYPE_NULL) || (!$this->readDataOnly)) {
                                         $columnTo = $columnID;
                                         if (isset($cellDataTableAttributes['number-columns-spanned'])) {
                                             $columnTo = PHPExcel_Cell::stringFromColumnIndex(PHPExcel_Cell::columnIndexFromString($columnID) + $cellDataTableAttributes['number-columns-spanned'] -2);
@@ -683,13 +685,12 @@ class PHPExcel_Reader_OOCalc extends PHPExcel_Reader_Abstract implements PHPExce
         return $objPHPExcel;
     }
 
-
-	private function _parseRichText($is = '') {
+    private function parseRichText($is = '')
+    {
         $value = new PHPExcel_RichText();
 
         $value->createText($is);
 
         return $value;
     }
-
 }

Classes/PHPExcel/Reader/SYLK.php

@@ -1,8 +1,18 @@
 <?php
+
+/** PHPExcel root directory */
+if (!defined('PHPEXCEL_ROOT')) {
     /**
- * PHPExcel
+     * @ignore
+     */
+    define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
+    require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+}
+
+/**
+ * PHPExcel_Reader_SYLK
  *
- * Copyright (c) 2006 - 2013 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,28 +30,10 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-	/**
-	 * @ignore
-	 */
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-/**
- * PHPExcel_Reader_SYLK
- *
- * @category   PHPExcel
- * @package    PHPExcel_Reader
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
 class PHPExcel_Reader_SYLK extends PHPExcel_Reader_Abstract implements PHPExcel_Reader_IReader
 {
     /**
@@ -49,34 +41,35 @@ class PHPExcel_Reader_SYLK extends PHPExcel_Reader_Abstract implements PHPExcel_
      *
      * @var string
      */
-	private $_inputEncoding	= 'ANSI';
+    private $inputEncoding = 'ANSI';
 
     /**
      * Sheet index to read
      *
      * @var int
      */
-	private $_sheetIndex 	= 0;
+    private $sheetIndex = 0;
 
     /**
      * Formats
      *
      * @var array
      */
-	private $_formats = array();
+    private $formats = array();
 
     /**
      * Format Count
      *
      * @var int
      */
-	private $_format = 0;
+    private $format = 0;
 
     /**
      * Create a new PHPExcel_Reader_SYLK
      */
-	public function __construct() {
-		$this->_readFilter 	= new PHPExcel_Reader_DefaultReadFilter();
+    public function __construct()
+    {
+        $this->readFilter = new PHPExcel_Reader_DefaultReadFilter();
     }
 
     /**
@@ -84,24 +77,24 @@ class PHPExcel_Reader_SYLK extends PHPExcel_Reader_Abstract implements PHPExcel_
      *
      * @return boolean
      */
-	protected function _isValidFormat()
+    protected function isValidFormat()
     {
         // Read sample data (first 2 KB will do)
-		$data = fread($this->_fileHandle, 2048);
+        $data = fread($this->fileHandle, 2048);
 
         // Count delimiters in file
         $delimiterCount = substr_count($data, ';');
         if ($delimiterCount < 1) {
-			return FALSE;
+            return false;
         }
 
         // Analyze first line looking for ID; signature
         $lines = explode("\n", $data);
         if (substr($lines[0], 0, 4) != 'ID;P') {
-			return FALSE;
+            return false;
         }
 
-		return TRUE;
+        return true;
     }
 
     /**
@@ -111,7 +104,7 @@ class PHPExcel_Reader_SYLK extends PHPExcel_Reader_Abstract implements PHPExcel_
      */
     public function setInputEncoding($pValue = 'ANSI')
     {
-		$this->_inputEncoding = $pValue;
+        $this->inputEncoding = $pValue;
         return $this;
     }
 
@@ -122,7 +115,7 @@ class PHPExcel_Reader_SYLK extends PHPExcel_Reader_Abstract implements PHPExcel_
      */
     public function getInputEncoding()
     {
-		return $this->_inputEncoding;
+        return $this->inputEncoding;
     }
 
     /**
@@ -134,12 +127,12 @@ class PHPExcel_Reader_SYLK extends PHPExcel_Reader_Abstract implements PHPExcel_
     public function listWorksheetInfo($pFilename)
     {
         // Open file
-		$this->_openFile($pFilename);
-		if (!$this->_isValidFormat()) {
-			fclose ($this->_fileHandle);
+        $this->openFile($pFilename);
+        if (!$this->isValidFormat()) {
+            fclose($this->fileHandle);
             throw new PHPExcel_Reader_Exception($pFilename . " is an Invalid Spreadsheet file.");
         }
-		$fileHandle = $this->_fileHandle;
+        $fileHandle = $this->fileHandle;
         rewind($fileHandle);
 
         $worksheetInfo = array();
@@ -154,7 +147,7 @@ class PHPExcel_Reader_SYLK extends PHPExcel_Reader_Abstract implements PHPExcel_
 
         // loop through one row (line) at a time in the file
         $rowIndex = 0;
-		while (($rowData = fgets($fileHandle)) !== FALSE) {
+        while (($rowData = fgets($fileHandle)) !== false) {
             $columnIndex = 0;
 
             // convert SYLK encoded $rowData to UTF-8
@@ -221,19 +214,19 @@ class PHPExcel_Reader_SYLK extends PHPExcel_Reader_Abstract implements PHPExcel_
     public function loadIntoExisting($pFilename, PHPExcel $objPHPExcel)
     {
         // Open file
-		$this->_openFile($pFilename);
-		if (!$this->_isValidFormat()) {
-			fclose ($this->_fileHandle);
+        $this->openFile($pFilename);
+        if (!$this->isValidFormat()) {
+            fclose($this->fileHandle);
             throw new PHPExcel_Reader_Exception($pFilename . " is an Invalid Spreadsheet file.");
         }
-		$fileHandle = $this->_fileHandle;
+        $fileHandle = $this->fileHandle;
         rewind($fileHandle);
 
         // Create new PHPExcel
-		while ($objPHPExcel->getSheetCount() <= $this->_sheetIndex) {
+        while ($objPHPExcel->getSheetCount() <= $this->sheetIndex) {
             $objPHPExcel->createSheet();
         }
-		$objPHPExcel->setActiveSheetIndex( $this->_sheetIndex );
+        $objPHPExcel->setActiveSheetIndex($this->sheetIndex);
 
         $fromFormats    = array('\-',    '\ ');
         $toFormats        = array('-',    ' ');
@@ -243,8 +236,7 @@ class PHPExcel_Reader_SYLK extends PHPExcel_Reader_Abstract implements PHPExcel_
         $column = $row = '';
 
         // loop through one row (line) at a time in the file
-		while (($rowData = fgets($fileHandle)) !== FALSE) {
-
+        while (($rowData = fgets($fileHandle)) !== false) {
             // convert SYLK encoded $rowData to UTF-8
             $rowData = PHPExcel_Shared_String::SYLKtoUTF8($rowData);
 
@@ -258,34 +250,44 @@ class PHPExcel_Reader_SYLK extends PHPExcel_Reader_Abstract implements PHPExcel_
                 $formatArray = array();
                 foreach ($rowData as $rowDatum) {
                     switch ($rowDatum{0}) {
-						case 'P' :	$formatArray['numberformat']['code'] = str_replace($fromFormats,$toFormats,substr($rowDatum,1));
+                        case 'P':
+                            $formatArray['numberformat']['code'] = str_replace($fromFormats, $toFormats, substr($rowDatum, 1));
                             break;
                         case 'E':
-						case 'F' :	$formatArray['font']['name'] = substr($rowDatum,1);
+                        case 'F':
+                            $formatArray['font']['name'] = substr($rowDatum, 1);
                             break;
-						case 'L' :	$formatArray['font']['size'] = substr($rowDatum,1);
+                        case 'L':
+                            $formatArray['font']['size'] = substr($rowDatum, 1);
                             break;
-						case 'S' :	$styleSettings = substr($rowDatum,1);
+                        case 'S':
+                            $styleSettings = substr($rowDatum, 1);
                             for ($i=0; $i<strlen($styleSettings); ++$i) {
                                 switch ($styleSettings{$i}) {
-											case 'I' :	$formatArray['font']['italic'] = true;
+                                    case 'I':
+                                        $formatArray['font']['italic'] = true;
                                         break;
-											case 'D' :	$formatArray['font']['bold'] = true;
+                                    case 'D':
+                                        $formatArray['font']['bold'] = true;
                                         break;
-											case 'T' :	$formatArray['borders']['top']['style'] = PHPExcel_Style_Border::BORDER_THIN;
+                                    case 'T':
+                                        $formatArray['borders']['top']['style'] = PHPExcel_Style_Border::BORDER_THIN;
                                         break;
-											case 'B' :	$formatArray['borders']['bottom']['style'] = PHPExcel_Style_Border::BORDER_THIN;
+                                    case 'B':
+                                        $formatArray['borders']['bottom']['style'] = PHPExcel_Style_Border::BORDER_THIN;
                                         break;
-											case 'L' :	$formatArray['borders']['left']['style'] = PHPExcel_Style_Border::BORDER_THIN;
+                                    case 'L':
+                                        $formatArray['borders']['left']['style'] = PHPExcel_Style_Border::BORDER_THIN;
                                         break;
-											case 'R' :	$formatArray['borders']['right']['style'] = PHPExcel_Style_Border::BORDER_THIN;
+                                    case 'R':
+                                        $formatArray['borders']['right']['style'] = PHPExcel_Style_Border::BORDER_THIN;
                                         break;
                                 }
                             }
                             break;
                     }
                 }
-				$this->_formats['P'.$this->_format++] = $formatArray;
+                $this->formats['P'.$this->format++] = $formatArray;
             //    Read cell value data
             } elseif ($dataType == 'C') {
                 $hasCalculatedValue = false;
@@ -293,14 +295,18 @@ class PHPExcel_Reader_SYLK extends PHPExcel_Reader_Abstract implements PHPExcel_
                 foreach ($rowData as $rowDatum) {
                     switch ($rowDatum{0}) {
                         case 'C':
-						case 'X' :	$column = substr($rowDatum,1);
+                        case 'X':
+                            $column = substr($rowDatum, 1);
                             break;
                         case 'R':
-						case 'Y' :	$row = substr($rowDatum,1);
+                        case 'Y':
+                            $row = substr($rowDatum, 1);
                             break;
-						case 'K' :	$cellData = substr($rowDatum,1);
+                        case 'K':
+                            $cellData = substr($rowDatum, 1);
                             break;
-						case 'E' :	$cellDataFormula = '='.substr($rowDatum,1);
+                        case 'E':
+                            $cellDataFormula = '='.substr($rowDatum, 1);
                             //    Convert R1C1 style references to A1 style references (but only when not quoted)
                             $temp = explode('"', $cellDataFormula);
                             $key = false;
@@ -317,14 +323,22 @@ class PHPExcel_Reader_SYLK extends PHPExcel_Reader_Abstract implements PHPExcel_
                                     foreach ($cellReferences as $cellReference) {
                                         $rowReference = $cellReference[2][0];
                                         //    Empty R reference is the current row
-												if ($rowReference == '') $rowReference = $row;
+                                        if ($rowReference == '') {
+                                            $rowReference = $row;
+                                        }
                                         //    Bracketed R references are relative to the current row
-												if ($rowReference{0} == '[') $rowReference = $row + trim($rowReference,'[]');
+                                        if ($rowReference{0} == '[') {
+                                            $rowReference = $row + trim($rowReference, '[]');
+                                        }
                                         $columnReference = $cellReference[4][0];
                                         //    Empty C reference is the current column
-												if ($columnReference == '') $columnReference = $column;
+                                        if ($columnReference == '') {
+                                            $columnReference = $column;
+                                        }
                                         //    Bracketed C references are relative to the current column
-												if ($columnReference{0} == '[') $columnReference = $column + trim($columnReference,'[]');
+                                        if ($columnReference{0} == '[') {
+                                            $columnReference = $column + trim($columnReference, '[]');
+                                        }
                                         $A1CellReference = PHPExcel_Cell::stringFromColumnIndex($columnReference-1).$rowReference;
 
                                         $value = substr_replace($value, $A1CellReference, $cellReference[0][1], strlen($cellReference[0][0]));
@@ -339,12 +353,12 @@ class PHPExcel_Reader_SYLK extends PHPExcel_Reader_Abstract implements PHPExcel_
                     }
                 }
                 $columnLetter = PHPExcel_Cell::stringFromColumnIndex($column-1);
-				$cellData = PHPExcel_Calculation::_unwrapResult($cellData);
+                $cellData = PHPExcel_Calculation::unwrapResult($cellData);
 
                 // Set cell value
                 $objPHPExcel->getActiveSheet()->getCell($columnLetter.$row)->setValue(($hasCalculatedValue) ? $cellDataFormula : $cellData);
                 if ($hasCalculatedValue) {
-					$cellData = PHPExcel_Calculation::_unwrapResult($cellData);
+                    $cellData = PHPExcel_Calculation::unwrapResult($cellData);
                     $objPHPExcel->getActiveSheet()->getCell($columnLetter.$row)->setCalculatedValue($cellData);
                 }
             //    Read cell formatting
@@ -354,29 +368,40 @@ class PHPExcel_Reader_SYLK extends PHPExcel_Reader_Abstract implements PHPExcel_
                 foreach ($rowData as $rowDatum) {
                     switch ($rowDatum{0}) {
                         case 'C':
-						case 'X' :	$column = substr($rowDatum,1);
+                        case 'X':
+                            $column = substr($rowDatum, 1);
                             break;
                         case 'R':
-						case 'Y' :	$row = substr($rowDatum,1);
+                        case 'Y':
+                            $row = substr($rowDatum, 1);
                             break;
-						case 'P' :	$formatStyle = $rowDatum;
+                        case 'P':
+                            $formatStyle = $rowDatum;
                             break;
-						case 'W' :	list($startCol,$endCol,$columnWidth) = explode(' ',substr($rowDatum,1));
+                        case 'W':
+                            list($startCol, $endCol, $columnWidth) = explode(' ', substr($rowDatum, 1));
                             break;
-						case 'S' :	$styleSettings = substr($rowDatum,1);
+                        case 'S':
+                            $styleSettings = substr($rowDatum, 1);
                             for ($i=0; $i<strlen($styleSettings); ++$i) {
                                 switch ($styleSettings{$i}) {
-											case 'I' :	$styleData['font']['italic'] = true;
+                                    case 'I':
+                                        $styleData['font']['italic'] = true;
                                         break;
-											case 'D' :	$styleData['font']['bold'] = true;
+                                    case 'D':
+                                        $styleData['font']['bold'] = true;
                                         break;
-											case 'T' :	$styleData['borders']['top']['style'] = PHPExcel_Style_Border::BORDER_THIN;
+                                    case 'T':
+                                        $styleData['borders']['top']['style'] = PHPExcel_Style_Border::BORDER_THIN;
                                         break;
-											case 'B' :	$styleData['borders']['bottom']['style'] = PHPExcel_Style_Border::BORDER_THIN;
+                                    case 'B':
+                                        $styleData['borders']['bottom']['style'] = PHPExcel_Style_Border::BORDER_THIN;
                                         break;
-											case 'L' :	$styleData['borders']['left']['style'] = PHPExcel_Style_Border::BORDER_THIN;
+                                    case 'L':
+                                        $styleData['borders']['left']['style'] = PHPExcel_Style_Border::BORDER_THIN;
                                         break;
-											case 'R' :	$styleData['borders']['right']['style'] = PHPExcel_Style_Border::BORDER_THIN;
+                                    case 'R':
+                                        $styleData['borders']['right']['style'] = PHPExcel_Style_Border::BORDER_THIN;
                                         break;
                                 }
                             }
@@ -385,8 +410,8 @@ class PHPExcel_Reader_SYLK extends PHPExcel_Reader_Abstract implements PHPExcel_
                 }
                 if (($formatStyle > '') && ($column > '') && ($row > '')) {
                     $columnLetter = PHPExcel_Cell::stringFromColumnIndex($column-1);
-					if (isset($this->_formats[$formatStyle])) {
-						$objPHPExcel->getActiveSheet()->getStyle($columnLetter.$row)->applyFromArray($this->_formats[$formatStyle]);
+                    if (isset($this->formats[$formatStyle])) {
+                        $objPHPExcel->getActiveSheet()->getStyle($columnLetter.$row)->applyFromArray($this->formats[$formatStyle]);
                     }
                 }
                 if ((!empty($styleData)) && ($column > '') && ($row > '')) {
@@ -410,10 +435,12 @@ class PHPExcel_Reader_SYLK extends PHPExcel_Reader_Abstract implements PHPExcel_
                 foreach ($rowData as $rowDatum) {
                     switch ($rowDatum{0}) {
                         case 'C':
-						case 'X' :	$column = substr($rowDatum,1);
+                        case 'X':
+                            $column = substr($rowDatum, 1);
                             break;
                         case 'R':
-						case 'Y' :	$row = substr($rowDatum,1);
+                        case 'Y':
+                            $row = substr($rowDatum, 1);
                             break;
                     }
                 }
@@ -432,8 +459,9 @@ class PHPExcel_Reader_SYLK extends PHPExcel_Reader_Abstract implements PHPExcel_
      *
      * @return int
      */
-	public function getSheetIndex() {
-		return $this->_sheetIndex;
+    public function getSheetIndex()
+    {
+        return $this->sheetIndex;
     }
 
     /**
@@ -442,9 +470,9 @@ class PHPExcel_Reader_SYLK extends PHPExcel_Reader_Abstract implements PHPExcel_
      * @param    int        $pValue        Sheet index
      * @return PHPExcel_Reader_SYLK
      */
-	public function setSheetIndex($pValue = 0) {
-		$this->_sheetIndex = $pValue;
+    public function setSheetIndex($pValue = 0)
+    {
+        $this->sheetIndex = $pValue;
         return $this;
     }
-
 }

Classes/PHPExcel/ReferenceHelper.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * PHPExcel
+ * PHPExcel_ReferenceHelper (Singleton)
  *
- * Copyright (c) 2006 - 2013 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,19 +21,10 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-
-/**
- * PHPExcel_ReferenceHelper (Singleton)
- *
- * @category   PHPExcel
- * @package	PHPExcel
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
 class PHPExcel_ReferenceHelper
 {
     /**    Constants                */
@@ -47,25 +39,27 @@ class PHPExcel_ReferenceHelper
      *
      * @var PHPExcel_ReferenceHelper
      */
-	private static $_instance;
+    private static $instance;
 
     /**
      * Get an instance of this class
      *
      * @return PHPExcel_ReferenceHelper
      */
-	public static function getInstance() {
-		if (!isset(self::$_instance) || (self::$_instance === NULL)) {
-			self::$_instance = new PHPExcel_ReferenceHelper();
+    public static function getInstance()
+    {
+        if (!isset(self::$instance) || (self::$instance === null)) {
+            self::$instance = new PHPExcel_ReferenceHelper();
         }
 
-		return self::$_instance;
+        return self::$instance;
     }
 
     /**
      * Create a new PHPExcel_ReferenceHelper
      */
-	protected function __construct() {
+    protected function __construct()
+    {
     }
 
     /**
@@ -76,7 +70,8 @@ class PHPExcel_ReferenceHelper
      * @param   string   $b  Second column to test (e.g. 'Z')
      * @return  integer
      */
-	public static function columnSort($a, $b) {
+    public static function columnSort($a, $b)
+    {
         return strcasecmp(strlen($a) . $a, strlen($b) . $b);
     }
 
@@ -88,7 +83,8 @@ class PHPExcel_ReferenceHelper
      * @param   string   $b  Second column to test (e.g. 'Z')
      * @return  integer
      */
-	public static function columnReverseSort($a, $b) {
+    public static function columnReverseSort($a, $b)
+    {
         return 1 - strcasecmp(strlen($a) . $a, strlen($b) . $b);
     }
 
@@ -100,7 +96,8 @@ class PHPExcel_ReferenceHelper
      * @param   string   $b  Second cell to test (e.g. 'Z1')
      * @return  integer
      */
-	public static function cellSort($a, $b) {
+    public static function cellSort($a, $b)
+    {
         sscanf($a, '%[A-Z]%d', $ac, $ar);
         sscanf($b, '%[A-Z]%d', $bc, $br);
 
@@ -118,7 +115,8 @@ class PHPExcel_ReferenceHelper
      * @param   string   $b  Second cell to test (e.g. 'Z1')
      * @return  integer
      */
-	public static function cellReverseSort($a, $b) {
+    public static function cellReverseSort($a, $b)
+    {
         sscanf($a, '%[A-Z]%d', $ac, $ar);
         sscanf($b, '%[A-Z]%d', $bc, $br);
 
@@ -138,20 +136,21 @@ class PHPExcel_ReferenceHelper
      * @param   integer    $pNumCols           Number of columns to insert/delete (negative values indicate deletion)
      * @return  boolean
      */
-	private static function cellAddressInDeleteRange($cellAddress, $beforeRow, $pNumRows, $beforeColumnIndex, $pNumCols) {
+    private static function cellAddressInDeleteRange($cellAddress, $beforeRow, $pNumRows, $beforeColumnIndex, $pNumCols)
+    {
         list($cellColumn, $cellRow) = PHPExcel_Cell::coordinateFromString($cellAddress);
         $cellColumnIndex = PHPExcel_Cell::columnIndexFromString($cellColumn);
         //    Is cell within the range of rows/columns if we're deleting
         if ($pNumRows < 0 &&
             ($cellRow >= ($beforeRow + $pNumRows)) &&
             ($cellRow < $beforeRow)) {
-			return TRUE;
+            return true;
         } elseif ($pNumCols < 0 &&
             ($cellColumnIndex >= ($beforeColumnIndex + $pNumCols)) &&
             ($cellColumnIndex < $beforeColumnIndex)) {
-			return TRUE;
+            return true;
         }
-		return FALSE;
+        return false;
     }
 
     /**
@@ -164,7 +163,7 @@ class PHPExcel_ReferenceHelper
      * @param   integer             $beforeRow          Number of the row we're inserting/deleting before
      * @param   integer             $pNumRows           Number of rows to insert/delete (negative values indicate deletion)
      */
-	protected function _adjustPageBreaks(PHPExcel_Worksheet $pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows)
+    protected function adjustPageBreaks(PHPExcel_Worksheet $pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows)
     {
         $aBreaks = $pSheet->getBreaks();
         ($pNumCols > 0 || $pNumRows > 0) ?
@@ -198,7 +197,7 @@ class PHPExcel_ReferenceHelper
      * @param   integer             $beforeRow          Number of the row we're inserting/deleting before
      * @param   integer             $pNumRows           Number of rows to insert/delete (negative values indicate deletion)
      */
-	protected function _adjustComments($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows)
+    protected function adjustComments($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows)
     {
         $aComments = $pSheet->getComments();
         $aNewComments = array(); // the new array of all comments
@@ -225,12 +224,10 @@ class PHPExcel_ReferenceHelper
      * @param   integer             $beforeRow          Number of the row we're inserting/deleting before
      * @param   integer             $pNumRows           Number of rows to insert/delete (negative values indicate deletion)
      */
-	protected function _adjustHyperlinks($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows)
+    protected function adjustHyperlinks($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows)
     {
         $aHyperlinkCollection = $pSheet->getHyperlinkCollection();
-		($pNumCols > 0 || $pNumRows > 0) ?
-			uksort($aHyperlinkCollection, array('PHPExcel_ReferenceHelper','cellReverseSort')) :
-			uksort($aHyperlinkCollection, array('PHPExcel_ReferenceHelper','cellSort'));
+        ($pNumCols > 0 || $pNumRows > 0) ? uksort($aHyperlinkCollection, array('PHPExcel_ReferenceHelper','cellReverseSort')) : uksort($aHyperlinkCollection, array('PHPExcel_ReferenceHelper','cellSort'));
 
         foreach ($aHyperlinkCollection as $key => $value) {
             $newReference = $this->updateCellReference($key, $pBefore, $pNumCols, $pNumRows);
@@ -251,12 +248,11 @@ class PHPExcel_ReferenceHelper
      * @param   integer             $beforeRow          Number of the row we're inserting/deleting before
      * @param   integer             $pNumRows           Number of rows to insert/delete (negative values indicate deletion)
      */
-	protected function _adjustDataValidations($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows)
+    protected function adjustDataValidations($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows)
     {
         $aDataValidationCollection = $pSheet->getDataValidationCollection();
-		($pNumCols > 0 || $pNumRows > 0) ?
-			uksort($aDataValidationCollection, array('PHPExcel_ReferenceHelper','cellReverseSort')) :
-			uksort($aDataValidationCollection, array('PHPExcel_ReferenceHelper','cellSort'));
+        ($pNumCols > 0 || $pNumRows > 0) ? uksort($aDataValidationCollection, array('PHPExcel_ReferenceHelper','cellReverseSort')) : uksort($aDataValidationCollection, array('PHPExcel_ReferenceHelper','cellSort'));
+        
         foreach ($aDataValidationCollection as $key => $value) {
             $newReference = $this->updateCellReference($key, $pBefore, $pNumCols, $pNumRows);
             if ($key != $newReference) {
@@ -276,7 +272,7 @@ class PHPExcel_ReferenceHelper
      * @param   integer             $beforeRow          Number of the row we're inserting/deleting before
      * @param   integer             $pNumRows           Number of rows to insert/delete (negative values indicate deletion)
      */
-	protected function _adjustMergeCells($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows)
+    protected function adjustMergeCells($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows)
     {
         $aMergeCells = $pSheet->getMergeCells();
         $aNewMergeCells = array(); // the new array of all merge cells
@@ -297,7 +293,7 @@ class PHPExcel_ReferenceHelper
      * @param   integer             $beforeRow          Number of the row we're inserting/deleting before
      * @param   integer             $pNumRows           Number of rows to insert/delete (negative values indicate deletion)
      */
-	protected function _adjustProtectedCells($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows)
+    protected function adjustProtectedCells($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows)
     {
         $aProtectedCells = $pSheet->getProtectedCells();
         ($pNumCols > 0 || $pNumRows > 0) ?
@@ -322,7 +318,7 @@ class PHPExcel_ReferenceHelper
      * @param   integer             $beforeRow          Number of the row we're inserting/deleting before
      * @param   integer             $pNumRows           Number of rows to insert/delete (negative values indicate deletion)
      */
-	protected function _adjustColumnDimensions($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows)
+    protected function adjustColumnDimensions($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows)
     {
         $aColumnDimensions = array_reverse($pSheet->getColumnDimensions(), true);
         if (!empty($aColumnDimensions)) {
@@ -347,7 +343,7 @@ class PHPExcel_ReferenceHelper
      * @param   integer             $beforeRow          Number of the row we're inserting/deleting before
      * @param   integer             $pNumRows           Number of rows to insert/delete (negative values indicate deletion)
      */
-	protected function _adjustRowDimensions($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows)
+    protected function adjustRowDimensions($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows)
     {
         $aRowDimensions = array_reverse($pSheet->getRowDimensions(), true);
         if (!empty($aRowDimensions)) {
@@ -380,7 +376,7 @@ class PHPExcel_ReferenceHelper
      * @param   PHPExcel_Worksheet  $pSheet     The worksheet that we're editing
      * @throws  PHPExcel_Exception
      */
-	public function insertNewBefore($pBefore = 'A1', $pNumCols = 0, $pNumRows = 0, PHPExcel_Worksheet $pSheet = NULL)
+    public function insertNewBefore($pBefore = 'A1', $pNumCols = 0, $pNumRows = 0, PHPExcel_Worksheet $pSheet = null)
     {
         $remove = ($pNumCols < 0 || $pNumRows < 0);
         $aCellCollection = $pSheet->getCellCollection();
@@ -424,9 +420,14 @@ class PHPExcel_ReferenceHelper
         }
 
         // Loop through cells, bottom-up, and change cell coordinates
-		while (($cellID = $remove ? array_shift($aCellCollection) : array_pop($aCellCollection))) {
+        if ($remove) {
+            // It's faster to reverse and pop than to use unshift, especially with large cell collections
+            $aCellCollection = array_reverse($aCellCollection);
+        }
+        while ($cellID = array_pop($aCellCollection)) {
             $cell = $pSheet->getCell($cellID);
             $cellIndex = PHPExcel_Cell::columnIndexFromString($cell->getColumn());
+
             if ($cellIndex-1 + $pNumCols < 0) {
                 continue;
             }
@@ -435,9 +436,7 @@ class PHPExcel_ReferenceHelper
             $newCoordinates = PHPExcel_Cell::stringFromColumnIndex($cellIndex-1 + $pNumCols) . ($cell->getRow() + $pNumRows);
 
             // Should the cell be updated? Move value and cellXf index from one cell to another.
-			if (($cellIndex >= $beforeColumnIndex) &&
-				($cell->getRow() >= $beforeRow)) {
-
+            if (($cellIndex >= $beforeColumnIndex) && ($cell->getRow() >= $beforeRow)) {
                 // Update cell styles
                 $pSheet->getCell($newCoordinates)->setXfIndex($cell->getXfIndex());
 
@@ -445,8 +444,7 @@ class PHPExcel_ReferenceHelper
                 if ($cell->getDataType() == PHPExcel_Cell_DataType::TYPE_FORMULA) {
                     // Formula should be adjusted
                     $pSheet->getCell($newCoordinates)
-						   ->setValue($this->updateFormulaReferences($cell->getValue(),
-						   					$pBefore, $pNumCols, $pNumRows, $pSheet->getTitle()));
+                           ->setValue($this->updateFormulaReferences($cell->getValue(), $pBefore, $pNumCols, $pNumRows, $pSheet->getTitle()));
                 } else {
                     // Formula should not be adjusted
                     $pSheet->getCell($newCoordinates)->setValue($cell->getValue());
@@ -454,14 +452,12 @@ class PHPExcel_ReferenceHelper
 
                 // Clear the original cell
                 $pSheet->getCellCacheController()->deleteCacheData($cellID);
-
             } else {
                 /*    We don't need to update styles for rows/columns before our insertion position,
                         but we do still need to adjust any formulae    in those cells                    */
                 if ($cell->getDataType() == PHPExcel_Cell_DataType::TYPE_FORMULA) {
                     // Formula should be adjusted
-					$cell->setValue($this->updateFormulaReferences($cell->getValue(),
-										$pBefore, $pNumCols, $pNumRows, $pSheet->getTitle()));
+                    $cell->setValue($this->updateFormulaReferences($cell->getValue(), $pBefore, $pNumCols, $pNumRows, $pSheet->getTitle()));
                 }
 
             }
@@ -473,7 +469,6 @@ class PHPExcel_ReferenceHelper
 
         if ($pNumCols > 0 && $beforeColumnIndex - 2 > 0) {
             for ($i = $beforeRow; $i <= $highestRow - 1; ++$i) {
-
                 // Style
                 $coordinate = PHPExcel_Cell::stringFromColumnIndex($beforeColumnIndex - 2) . $i;
                 if ($pSheet->cellExists($coordinate)) {
@@ -497,7 +492,6 @@ class PHPExcel_ReferenceHelper
 
         if ($pNumRows > 0 && $beforeRow - 1 > 0) {
             for ($i = $beforeColumnIndex - 1; $i <= PHPExcel_Cell::columnIndexFromString($highestColumn) - 1; ++$i) {
-
                 // Style
                 $coordinate = PHPExcel_Cell::stringFromColumnIndex($i) . ($beforeRow - 1);
                 if ($pSheet->cellExists($coordinate)) {
@@ -519,28 +513,28 @@ class PHPExcel_ReferenceHelper
         }
 
         // Update worksheet: column dimensions
-		$this->_adjustColumnDimensions($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows);
+        $this->adjustColumnDimensions($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows);
 
         // Update worksheet: row dimensions
-		$this->_adjustRowDimensions($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows);
+        $this->adjustRowDimensions($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows);
 
         //    Update worksheet: page breaks
-		$this->_adjustPageBreaks($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows);
+        $this->adjustPageBreaks($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows);
 
         //    Update worksheet: comments
-		$this->_adjustComments($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows);
+        $this->adjustComments($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows);
 
         // Update worksheet: hyperlinks
-		$this->_adjustHyperlinks($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows);
+        $this->adjustHyperlinks($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows);
 
         // Update worksheet: data validations
-		$this->_adjustDataValidations($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows);
+        $this->adjustDataValidations($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows);
 
         // Update worksheet: merge cells
-		$this->_adjustMergeCells($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows);
+        $this->adjustMergeCells($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows);
 
         // Update worksheet: protected cells
-		$this->_adjustProtectedCells($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows);
+        $this->adjustProtectedCells($pSheet, $pBefore, $beforeColumnIndex, $pNumCols, $beforeRow, $pNumRows);
 
         // Update worksheet: autofilter
         $autoFilter = $pSheet->getAutoFilter();
@@ -623,9 +617,7 @@ class PHPExcel_ReferenceHelper
         if (count($pSheet->getParent()->getNamedRanges()) > 0) {
             foreach ($pSheet->getParent()->getNamedRanges() as $namedRange) {
                 if ($namedRange->getWorksheet()->getHashCode() == $pSheet->getHashCode()) {
-					$namedRange->setRange(
-						$this->updateCellReference($namedRange->getRange(), $pBefore, $pNumCols, $pNumRows)
-					);
+                    $namedRange->setRange($this->updateCellReference($namedRange->getRange(), $pBefore, $pNumCols, $pNumRows));
                 }
             }
         }
@@ -645,7 +637,8 @@ class PHPExcel_ReferenceHelper
      * @return    string    Updated formula
      * @throws    PHPExcel_Exception
      */
-	public function updateFormulaReferences($pFormula = '', $pBefore = 'A1', $pNumCols = 0, $pNumRows = 0, $sheetName = '') {
+    public function updateFormulaReferences($pFormula = '', $pBefore = 'A1', $pNumCols = 0, $pNumRows = 0, $sheetName = '')
+    {
         //    Update cell references in the formula
         $formulaBlocks = explode('"', $pFormula);
         $i = false;
@@ -673,7 +666,7 @@ class PHPExcel_ReferenceHelper
                                 $cellIndex = $column.$row;
 
                                 $newCellTokens[$cellIndex] = preg_quote($toString);
-								$cellTokens[$cellIndex] = '/(?<!\d)'.preg_quote($fromString).'(?!\d)/i';
+                                $cellTokens[$cellIndex] = '/(?<!\d\$\!)'.preg_quote($fromString).'(?!\d)/i';
                                 ++$adjustCount;
                             }
                         }
@@ -698,7 +691,7 @@ class PHPExcel_ReferenceHelper
                                 $cellIndex = $column.$row;
 
                                 $newCellTokens[$cellIndex] = preg_quote($toString);
-								$cellTokens[$cellIndex] = '/(?<![A-Z])'.preg_quote($fromString).'(?![A-Z])/i';
+                                $cellTokens[$cellIndex] = '/(?<![A-Z\$\!])'.preg_quote($fromString).'(?![A-Z])/i';
                                 ++$adjustCount;
                             }
                         }
@@ -724,7 +717,7 @@ class PHPExcel_ReferenceHelper
                                 $cellIndex = $column.$row;
 
                                 $newCellTokens[$cellIndex] = preg_quote($toString);
-								$cellTokens[$cellIndex] = '/(?<![A-Z])'.preg_quote($fromString).'(?!\d)/i';
+                                $cellTokens[$cellIndex] = '/(?<![A-Z]\$\!)'.preg_quote($fromString).'(?!\d)/i';
                                 ++$adjustCount;
                             }
                         }
@@ -732,12 +725,13 @@ class PHPExcel_ReferenceHelper
                 }
                 //    Search for cell references (e.g. 'Sheet1'!A3 or C5) with or without $ absolutes (e.g. $A1 or C$5)
                 $matchCount = preg_match_all('/'.self::REFHELPER_REGEXP_CELLREF.'/i', ' '.$formulaBlock.' ', $matches, PREG_SET_ORDER);
+
                 if ($matchCount > 0) {
                     foreach ($matches as $match) {
                         $fromString = ($match[2] > '') ? $match[2].'!' : '';
                         $fromString .= $match[3];
-						$modified3 = $this->updateCellReference($match[3],$pBefore,$pNumCols,$pNumRows);
 
+                        $modified3 = $this->updateCellReference($match[3], $pBefore, $pNumCols, $pNumRows);
                         if ($match[3] !== $modified3) {
                             if (($match[2] == '') || (trim($match[2], "'") == $sheetName)) {
                                 $toString = ($match[2] > '') ? $match[2].'!' : '';
@@ -746,24 +740,23 @@ class PHPExcel_ReferenceHelper
                                 //    Max worksheet size is 1,048,576 rows by 16,384 columns in Excel 2007, so our adjustments need to be at least one digit more
                                 $column = PHPExcel_Cell::columnIndexFromString(trim($column, '$')) + 100000;
                                 $row = trim($row, '$') + 10000000;
-								$cellIndex = $column.$row;
+                                $cellIndex = $row . $column;
 
                                 $newCellTokens[$cellIndex] = preg_quote($toString);
-								$cellTokens[$cellIndex] = '/(?<![A-Z])'.preg_quote($fromString).'(?!\d)/i';
+                                $cellTokens[$cellIndex] = '/(?<![A-Z\$\!])'.preg_quote($fromString).'(?!\d)/i';
                                 ++$adjustCount;
                             }
                         }
                     }
                 }
                 if ($adjustCount > 0) {
-					if ($pNumCols > 0) {
+                    if ($pNumCols > 0 || $pNumRows > 0) {
                         krsort($cellTokens);
                         krsort($newCellTokens);
                     } else {
                         ksort($cellTokens);
                         ksort($newCellTokens);
-					}
-					//	Update cell references in the formula
+                    }   //  Update cell references in the formula
                     $formulaBlock = str_replace('\\', '', preg_replace($cellTokens, $newCellTokens, $formulaBlock));
                 }
             }
@@ -784,17 +777,18 @@ class PHPExcel_ReferenceHelper
      * @return    string    Updated cell range
      * @throws    PHPExcel_Exception
      */
-	public function updateCellReference($pCellRange = 'A1', $pBefore = 'A1', $pNumCols = 0, $pNumRows = 0) {
+    public function updateCellReference($pCellRange = 'A1', $pBefore = 'A1', $pNumCols = 0, $pNumRows = 0)
+    {
         // Is it in another worksheet? Will not have to update anything.
         if (strpos($pCellRange, "!") !== false) {
             return $pCellRange;
         // Is it a range or a single cell?
         } elseif (strpos($pCellRange, ':') === false && strpos($pCellRange, ',') === false) {
             // Single cell
-			return $this->_updateSingleCellReference($pCellRange, $pBefore, $pNumCols, $pNumRows);
+            return $this->updateSingleCellReference($pCellRange, $pBefore, $pNumCols, $pNumRows);
         } elseif (strpos($pCellRange, ':') !== false || strpos($pCellRange, ',') !== false) {
             // Range
-			return $this->_updateCellRange($pCellRange, $pBefore, $pNumCols, $pNumRows);
+            return $this->updateCellRange($pCellRange, $pBefore, $pNumCols, $pNumRows);
         } else {
             // Return original
             return $pCellRange;
@@ -808,7 +802,8 @@ class PHPExcel_ReferenceHelper
      * @param string $oldName        Old name (name to replace)
      * @param string $newName        New name
      */
-	public function updateNamedFormulas(PHPExcel $pPhpExcel, $oldName = '', $newName = '') {
+    public function updateNamedFormulas(PHPExcel $pPhpExcel, $oldName = '', $newName = '')
+    {
         if ($oldName == '') {
             return;
         }
@@ -816,7 +811,7 @@ class PHPExcel_ReferenceHelper
         foreach ($pPhpExcel->getWorksheetIterator() as $sheet) {
             foreach ($sheet->getCellCollection(false) as $cellID) {
                 $cell = $sheet->getCell($cellID);
-				if (($cell !== NULL) && ($cell->getDataType() == PHPExcel_Cell_DataType::TYPE_FORMULA)) {
+                if (($cell !== null) && ($cell->getDataType() == PHPExcel_Cell_DataType::TYPE_FORMULA)) {
                     $formula = $cell->getValue();
                     if (strpos($formula, $oldName) !== false) {
                         $formula = str_replace("'" . $oldName . "'!", "'" . $newName . "'!", $formula);
@@ -838,7 +833,8 @@ class PHPExcel_ReferenceHelper
      * @return    string    Updated cell range
      * @throws    PHPExcel_Exception
      */
-	private function _updateCellRange($pCellRange = 'A1:A1', $pBefore = 'A1', $pNumCols = 0, $pNumRows = 0) {
+    private function updateCellRange($pCellRange = 'A1:A1', $pBefore = 'A1', $pNumCols = 0, $pNumRows = 0)
+    {
         if (strpos($pCellRange, ':') !== false || strpos($pCellRange, ',') !== false) {
             // Update range
             $range = PHPExcel_Cell::splitRange($pCellRange);
@@ -847,13 +843,13 @@ class PHPExcel_ReferenceHelper
                 $jc = count($range[$i]);
                 for ($j = 0; $j < $jc; ++$j) {
                     if (ctype_alpha($range[$i][$j])) {
-						$r = PHPExcel_Cell::coordinateFromString($this->_updateSingleCellReference($range[$i][$j].'1', $pBefore, $pNumCols, $pNumRows));
+                        $r = PHPExcel_Cell::coordinateFromString($this->updateSingleCellReference($range[$i][$j].'1', $pBefore, $pNumCols, $pNumRows));
                         $range[$i][$j] = $r[0];
                     } elseif (ctype_digit($range[$i][$j])) {
-						$r = PHPExcel_Cell::coordinateFromString($this->_updateSingleCellReference('A'.$range[$i][$j], $pBefore, $pNumCols, $pNumRows));
+                        $r = PHPExcel_Cell::coordinateFromString($this->updateSingleCellReference('A'.$range[$i][$j], $pBefore, $pNumCols, $pNumRows));
                         $range[$i][$j] = $r[1];
                     } else {
-						$range[$i][$j] = $this->_updateSingleCellReference($range[$i][$j], $pBefore, $pNumCols, $pNumRows);
+                        $range[$i][$j] = $this->updateSingleCellReference($range[$i][$j], $pBefore, $pNumCols, $pNumRows);
                     }
                 }
             }
@@ -875,7 +871,8 @@ class PHPExcel_ReferenceHelper
      * @return    string    Updated cell reference
      * @throws    PHPExcel_Exception
      */
-	private function _updateSingleCellReference($pCellReference = 'A1', $pBefore = 'A1', $pNumCols = 0, $pNumRows = 0) {
+    private function updateSingleCellReference($pCellReference = 'A1', $pBefore = 'A1', $pNumCols = 0, $pNumRows = 0)
+    {
         if (strpos($pCellReference, ':') === false && strpos($pCellReference, ',') === false) {
             // Get coordinates of $pBefore
             list($beforeColumn, $beforeRow) = PHPExcel_Cell::coordinateFromString($pBefore);
@@ -884,11 +881,8 @@ class PHPExcel_ReferenceHelper
             list($newColumn, $newRow) = PHPExcel_Cell::coordinateFromString($pCellReference);
 
             // Verify which parts should be updated
-			$updateColumn = (($newColumn{0} != '$') && ($beforeColumn{0} != '$') &&
-							 PHPExcel_Cell::columnIndexFromString($newColumn) >= PHPExcel_Cell::columnIndexFromString($beforeColumn));
-
-			$updateRow = (($newRow{0} != '$') && ($beforeRow{0} != '$') &&
-						  $newRow >= $beforeRow);
+            $updateColumn = (($newColumn{0} != '$') && ($beforeColumn{0} != '$') && (PHPExcel_Cell::columnIndexFromString($newColumn) >= PHPExcel_Cell::columnIndexFromString($beforeColumn)));
+            $updateRow = (($newRow{0} != '$') && ($beforeRow{0} != '$') && $newRow >= $beforeRow);
 
             // Create new column reference
             if ($updateColumn) {
@@ -912,7 +906,8 @@ class PHPExcel_ReferenceHelper
      *
      * @throws    PHPExcel_Exception
      */
-	public final function __clone() {
+    final public function __clone()
+    {
         throw new PHPExcel_Exception("Cloning a Singleton is not allowed!");
     }
 }

Classes/PHPExcel/RichText.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * PHPExcel
+ * PHPExcel_RichText
  *
- * Copyright (c) 2006 - 2013 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,19 +21,10 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_RichText
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-
-/**
- * PHPExcel_RichText
- *
- * @category   PHPExcel
- * @package    PHPExcel_RichText
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
 class PHPExcel_RichText implements PHPExcel_IComparable
 {
     /**
@@ -40,7 +32,7 @@ class PHPExcel_RichText implements PHPExcel_IComparable
      *
      * @var PHPExcel_RichText_ITextElement[]
      */
-    private $_richTextElements;
+    private $richTextElements;
 
     /**
      * Create a new PHPExcel_RichText instance
@@ -51,10 +43,10 @@ class PHPExcel_RichText implements PHPExcel_IComparable
     public function __construct(PHPExcel_Cell $pCell = null)
     {
         // Initialise variables
-        $this->_richTextElements = array();
+        $this->richTextElements = array();
 
         // Rich-Text string attached to cell?
-        if ($pCell !== NULL) {
+        if ($pCell !== null) {
             // Add cell text and style
             if ($pCell->getValue() != "") {
                 $objRun = new PHPExcel_RichText_Run($pCell->getValue());
@@ -76,7 +68,7 @@ class PHPExcel_RichText implements PHPExcel_IComparable
      */
     public function addText(PHPExcel_RichText_ITextElement $pText = null)
     {
-        $this->_richTextElements[] = $pText;
+        $this->richTextElements[] = $pText;
         return $this;
     }
 
@@ -119,7 +111,7 @@ class PHPExcel_RichText implements PHPExcel_IComparable
         $returnValue = '';
 
         // Loop through all PHPExcel_RichText_ITextElement
-        foreach ($this->_richTextElements as $text) {
+        foreach ($this->richTextElements as $text) {
             $returnValue .= $text->getText();
         }
 
@@ -144,7 +136,7 @@ class PHPExcel_RichText implements PHPExcel_IComparable
      */
     public function getRichTextElements()
     {
-        return $this->_richTextElements;
+        return $this->richTextElements;
     }
 
     /**
@@ -157,7 +149,7 @@ class PHPExcel_RichText implements PHPExcel_IComparable
     public function setRichTextElements($pElements = null)
     {
         if (is_array($pElements)) {
-            $this->_richTextElements = $pElements;
+            $this->richTextElements = $pElements;
         } else {
             throw new PHPExcel_Exception("Invalid PHPExcel_RichText_ITextElement[] array passed.");
         }
@@ -172,13 +164,13 @@ class PHPExcel_RichText implements PHPExcel_IComparable
     public function getHashCode()
     {
         $hashElements = '';
-        foreach ($this->_richTextElements as $element) {
+        foreach ($this->richTextElements as $element) {
             $hashElements .= $element->getHashCode();
         }
 
         return md5(
-              $hashElements
-            . __CLASS__
+            $hashElements .
+            __CLASS__
         );
     }
 

Classes/PHPExcel/RichText/ITextElement.php

@@ -1,6 +1,7 @@
 <?php
+
 /**
- * PHPExcel
+ * PHPExcel_RichText_ITextElement
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -18,19 +19,10 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_RichText
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-
-/**
- * PHPExcel_RichText_ITextElement
- *
- * @category   PHPExcel
- * @package    PHPExcel_RichText
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
 interface PHPExcel_RichText_ITextElement
 {
     /**

Classes/PHPExcel/RichText/Run.php

@@ -1,6 +1,7 @@
 <?php
+
 /**
- * PHPExcel
+ * PHPExcel_RichText_Run
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -18,19 +19,10 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_RichText
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-
-/**
- * PHPExcel_RichText_Run
- *
- * @category   PHPExcel
- * @package    PHPExcel_RichText
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
 class PHPExcel_RichText_Run extends PHPExcel_RichText_TextElement implements PHPExcel_RichText_ITextElement
 {
     /**
@@ -38,7 +30,7 @@ class PHPExcel_RichText_Run extends PHPExcel_RichText_TextElement implements PHP
      *
      * @var PHPExcel_Style_Font
      */
-	private $_font;
+    private $font;
 
     /**
      * Create a new PHPExcel_RichText_Run instance
@@ -49,7 +41,7 @@ class PHPExcel_RichText_Run extends PHPExcel_RichText_TextElement implements PHP
     {
         // Initialise variables
         $this->setText($pText);
-    	$this->_font = new PHPExcel_Style_Font();
+        $this->font = new PHPExcel_Style_Font();
     }
 
     /**
@@ -57,8 +49,9 @@ class PHPExcel_RichText_Run extends PHPExcel_RichText_TextElement implements PHP
      *
      * @return PHPExcel_Style_Font
      */
-	public function getFont() {
-		return $this->_font;
+    public function getFont()
+    {
+        return $this->font;
     }
 
     /**
@@ -68,8 +61,9 @@ class PHPExcel_RichText_Run extends PHPExcel_RichText_TextElement implements PHP
      * @throws     PHPExcel_Exception
      * @return PHPExcel_RichText_ITextElement
      */
-	public function setFont(PHPExcel_Style_Font $pFont = null) {
-		$this->_font = $pFont;
+    public function setFont(PHPExcel_Style_Font $pFont = null)
+    {
+        $this->font = $pFont;
         return $this;
     }
 
@@ -78,18 +72,20 @@ class PHPExcel_RichText_Run extends PHPExcel_RichText_TextElement implements PHP
      *
      * @return string    Hash code
      */
-	public function getHashCode() {
+    public function getHashCode()
+    {
         return md5(
-    		  $this->getText()
-    		. $this->_font->getHashCode()
-    		. __CLASS__
+            $this->getText() .
+            $this->font->getHashCode() .
+            __CLASS__
         );
     }
 
     /**
      * Implement PHP __clone to create a deep clone, not just a shallow copy.
      */
-	public function __clone() {
+    public function __clone()
+    {
         $vars = get_object_vars($this);
         foreach ($vars as $key => $value) {
             if (is_object($value)) {

Classes/PHPExcel/RichText/TextElement.php

@@ -1,6 +1,7 @@
 <?php
+
 /**
- * PHPExcel
+ * PHPExcel_RichText_TextElement
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -18,19 +19,10 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_RichText
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-
-/**
- * PHPExcel_RichText_TextElement
- *
- * @category   PHPExcel
- * @package    PHPExcel_RichText
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
 class PHPExcel_RichText_TextElement implements PHPExcel_RichText_ITextElement
 {
     /**
@@ -38,7 +30,7 @@ class PHPExcel_RichText_TextElement implements PHPExcel_RichText_ITextElement
      *
      * @var string
      */
-	private $_text;
+    private $text;
 
     /**
      * Create a new PHPExcel_RichText_TextElement instance
@@ -48,7 +40,7 @@ class PHPExcel_RichText_TextElement implements PHPExcel_RichText_ITextElement
     public function __construct($pText = '')
     {
         // Initialise variables
-    	$this->_text = $pText;
+        $this->text = $pText;
     }
 
     /**
@@ -56,8 +48,9 @@ class PHPExcel_RichText_TextElement implements PHPExcel_RichText_ITextElement
      *
      * @return string    Text
      */
-	public function getText() {
-		return $this->_text;
+    public function getText()
+    {
+        return $this->text;
     }
 
     /**
@@ -66,8 +59,9 @@ class PHPExcel_RichText_TextElement implements PHPExcel_RichText_ITextElement
      * @param     $pText string    Text
      * @return PHPExcel_RichText_ITextElement
      */
-	public function setText($pText = '') {
-		$this->_text = $pText;
+    public function setText($pText = '')
+    {
+        $this->text = $pText;
         return $this;
     }
 
@@ -76,7 +70,8 @@ class PHPExcel_RichText_TextElement implements PHPExcel_RichText_ITextElement
      *
      * @return PHPExcel_Style_Font
      */
-	public function getFont() {
+    public function getFont()
+    {
         return null;
     }
 
@@ -85,17 +80,19 @@ class PHPExcel_RichText_TextElement implements PHPExcel_RichText_ITextElement
      *
      * @return string    Hash code
      */
-	public function getHashCode() {
+    public function getHashCode()
+    {
         return md5(
-    		  $this->_text
-    		. __CLASS__
+            $this->text .
+            __CLASS__
         );
     }
 
     /**
      * Implement PHP __clone to create a deep clone, not just a shallow copy.
      */
-	public function __clone() {
+    public function __clone()
+    {
         $vars = get_object_vars($this);
         foreach ($vars as $key => $value) {
             if (is_object($value)) {

Classes/PHPExcel/Settings.php

@@ -1,8 +1,18 @@
 <?php
+
+/** PHPExcel root directory */
+if (!defined('PHPEXCEL_ROOT')) {
     /**
- * PHPExcel
+     * @ignore
+     */
+    define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../');
+    require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+}
+
+/**
+ * PHPExcel_Settings
  *
- * Copyright (c) 2006 - 2013 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,21 +30,10 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Settings
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-/** PHPExcel root directory */
-if (!defined('PHPEXCEL_ROOT')) {
-    /**
-     * @ignore
-     */
-    define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../');
-    require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
-}
-
-
 class PHPExcel_Settings
 {
     /**    constants */
@@ -51,11 +50,11 @@ class PHPExcel_Settings
     const PDF_RENDERER_MPDF   = 'mPDF';
 
 
-    private static $_chartRenderers = array(
+    private static $chartRenderers = array(
         self::CHART_RENDERER_JPGRAPH,
     );
 
-    private static $_pdfRenderers = array(
+    private static $pdfRenderers = array(
         self::PDF_RENDERER_TCPDF,
         self::PDF_RENDERER_DOMPDF,
         self::PDF_RENDERER_MPDF,
@@ -69,7 +68,7 @@ class PHPExcel_Settings
      *
      * @var string
      */
-    private static $_zipClass    = self::ZIPARCHIVE;
+    private static $zipClass = self::ZIPARCHIVE;
 
 
     /**
@@ -79,14 +78,14 @@ class PHPExcel_Settings
      *
      * @var string
      */
-    private static $_chartRendererName = NULL;
+    private static $chartRendererName;
 
     /**
      * Directory Path to the external Library used for rendering charts
      *
      * @var string
      */
-    private static $_chartRendererPath = NULL;
+    private static $chartRendererPath;
 
 
     /**
@@ -96,15 +95,21 @@ class PHPExcel_Settings
      *
      * @var string
      */
-    private static $_pdfRendererName = NULL;
+    private static $pdfRendererName;
 
     /**
      * Directory Path to the external Library used for rendering PDF files
      *
      * @var string
      */
-    private static $_pdfRendererPath = NULL;
+    private static $pdfRendererPath;
 
+    /**
+     * Default options for libxml loader
+     *
+     * @var int
+     */
+    private static $libXmlLoaderOptions = null;
 
     /**
      * Set the Zip handler Class that PHPExcel should use for Zip file management (PCLZip or ZipArchive)
@@ -117,11 +122,11 @@ class PHPExcel_Settings
     {
         if (($zipClass === self::PCLZIP) ||
             ($zipClass === self::ZIPARCHIVE)) {
-            self::$_zipClass = $zipClass;
-            return TRUE;
+            self::$zipClass = $zipClass;
+            return true;
+        }
+        return false;
     }
-        return FALSE;
-    } // function setZipClass()
 
 
     /**
@@ -134,8 +139,8 @@ class PHPExcel_Settings
      */
     public static function getZipClass()
     {
-        return self::$_zipClass;
-    } // function getZipClass()
+        return self::$zipClass;
+    }
 
 
     /**
@@ -146,7 +151,7 @@ class PHPExcel_Settings
     public static function getCacheStorageMethod()
     {
         return PHPExcel_CachedObjectStorageFactory::getCacheStorageMethod();
-    } // function getCacheStorageMethod()
+    }
 
 
     /**
@@ -157,7 +162,7 @@ class PHPExcel_Settings
     public static function getCacheStorageClass()
     {
         return PHPExcel_CachedObjectStorageFactory::getCacheStorageClass();
-    } // function getCacheStorageClass()
+    }
 
 
     /**
@@ -167,13 +172,10 @@ class PHPExcel_Settings
      * @param array $arguments Optional configuration arguments for the cacheing method
      * @return boolean Success or failure
      */
-    public static function setCacheStorageMethod(
-    	$method = PHPExcel_CachedObjectStorageFactory::cache_in_memory,
-      $arguments = array()
-    )
+    public static function setCacheStorageMethod($method = PHPExcel_CachedObjectStorageFactory::cache_in_memory, $arguments = array())
     {
         return PHPExcel_CachedObjectStorageFactory::initialize($method, $arguments);
-    } // function setCacheStorageMethod()
+    }
 
 
     /**
@@ -185,7 +187,7 @@ class PHPExcel_Settings
     public static function setLocale($locale = 'en_us')
     {
         return PHPExcel_Calculation::getInstance()->setLocale($locale);
-    } // function setLocale()
+    }
 
 
     /**
@@ -199,10 +201,11 @@ class PHPExcel_Settings
      */
     public static function setChartRenderer($libraryName, $libraryBaseDir)
     {
-        if (!self::setChartRendererName($libraryName))
-            return FALSE;
+        if (!self::setChartRendererName($libraryName)) {
+            return false;
+        }
         return self::setChartRendererPath($libraryBaseDir);
-    } // function setChartRenderer()
+    }
 
 
     /**
@@ -215,14 +218,13 @@ class PHPExcel_Settings
      */
     public static function setChartRendererName($libraryName)
     {
-        if (!in_array($libraryName,self::$_chartRenderers)) {
-            return FALSE;
+        if (!in_array($libraryName, self::$chartRenderers)) {
+            return false;
         }
+        self::$chartRendererName = $libraryName;
 
-        self::$_chartRendererName = $libraryName;
-
-        return TRUE;
-    } // function setChartRendererName()
+        return true;
+    }
 
 
     /**
@@ -234,12 +236,12 @@ class PHPExcel_Settings
     public static function setChartRendererPath($libraryBaseDir)
     {
         if ((file_exists($libraryBaseDir) === false) || (is_readable($libraryBaseDir) === false)) {
-            return FALSE;
+            return false;
         }
-        self::$_chartRendererPath = $libraryBaseDir;
+        self::$chartRendererPath = $libraryBaseDir;
 
-        return TRUE;
-    } // function setChartRendererPath()
+        return true;
+    }
 
 
     /**
@@ -251,8 +253,8 @@ class PHPExcel_Settings
      */
     public static function getChartRendererName()
     {
-        return self::$_chartRendererName;
-    } // function getChartRendererName()
+        return self::$chartRendererName;
+    }
 
 
     /**
@@ -263,8 +265,8 @@ class PHPExcel_Settings
      */
     public static function getChartRendererPath()
     {
-        return self::$_chartRendererPath;
-    } // function getChartRendererPath()
+        return self::$chartRendererPath;
+    }
 
 
     /**
@@ -280,10 +282,11 @@ class PHPExcel_Settings
      */
     public static function setPdfRenderer($libraryName, $libraryBaseDir)
     {
-        if (!self::setPdfRendererName($libraryName))
-            return FALSE;
+        if (!self::setPdfRendererName($libraryName)) {
+            return false;
+        }
         return self::setPdfRendererPath($libraryBaseDir);
-    } // function setPdfRenderer()
+    }
 
 
     /**
@@ -298,14 +301,13 @@ class PHPExcel_Settings
      */
     public static function setPdfRendererName($libraryName)
     {
-        if (!in_array($libraryName,self::$_pdfRenderers)) {
-            return FALSE;
+        if (!in_array($libraryName, self::$pdfRenderers)) {
+            return false;
         }
+        self::$pdfRendererName = $libraryName;
 
-        self::$_pdfRendererName = $libraryName;
-
-        return TRUE;
-    } // function setPdfRendererName()
+        return true;
+    }
 
 
     /**
@@ -317,12 +319,12 @@ class PHPExcel_Settings
     public static function setPdfRendererPath($libraryBaseDir)
     {
         if ((file_exists($libraryBaseDir) === false) || (is_readable($libraryBaseDir) === false)) {
-            return FALSE;
+            return false;
         }
-        self::$_pdfRendererPath = $libraryBaseDir;
+        self::$pdfRendererPath = $libraryBaseDir;
 
-        return TRUE;
-    } // function setPdfRendererPath()
+        return true;
+    }
 
 
     /**
@@ -336,9 +338,8 @@ class PHPExcel_Settings
      */
     public static function getPdfRendererName()
     {
-        return self::$_pdfRendererName;
-    } // function getPdfRendererName()
-
+        return self::$pdfRendererName;
+    }
 
     /**
      * Return the directory path to the PDF Rendering Library that PHPExcel is currently configured to use
@@ -348,7 +349,41 @@ class PHPExcel_Settings
      */
     public static function getPdfRendererPath()
     {
-        return self::$_pdfRendererPath;
-    } // function getPdfRendererPath()
-
+        return self::$pdfRendererPath;
+    }
+
+    /**
+     * Set options for libxml loader
+     *
+     * @param   int   $options   Options for libxml loader
+     */
+    public static function setLibXmlLoaderOptions($options = null)
+    {
+        if (is_null($options) && defined('LIBXML_DTDLOAD')) {
+            $options = LIBXML_DTDLOAD | LIBXML_DTDATTR;
+        }
+        if (version_compare(PHP_VERSION, '5.2.11') >= 0) {
+            @libxml_disable_entity_loader((bool) $options);
+        }
+        self::$libXmlLoaderOptions = $options;
+    }
+
+    /**
+     * Get defined options for libxml loader.
+     * Defaults to LIBXML_DTDLOAD | LIBXML_DTDATTR when not set explicitly.
+     *
+     * @return int Default options for libxml loader
+     */
+    public static function getLibXmlLoaderOptions()
+    {
+        if (is_null(self::$libXmlLoaderOptions) && defined('LIBXML_DTDLOAD')) {
+            self::setLibXmlLoaderOptions(LIBXML_DTDLOAD | LIBXML_DTDATTR);
+        } elseif (is_null(self::$libXmlLoaderOptions)) {
+            self::$libXmlLoaderOptions = true;
+        }
+        if (version_compare(PHP_VERSION, '5.2.11') >= 0) {
+            @libxml_disable_entity_loader((bool) self::$libXmlLoaderOptions);
+        }
+        return self::$libXmlLoaderOptions;
+    }
 }

Classes/PHPExcel/Shared/CodePage.php

@@ -1,8 +1,9 @@
 <?php
+
 /**
- * PHPExcel
+ * PHPExcel_Shared_CodePage
  *
- * Copyright (c) 2006 - 2013 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,19 +21,10 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-
-/**
- * PHPExcel_Shared_CodePage
- *
- * @category   PHPExcel
- * @package    PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
 class PHPExcel_Shared_CodePage
 {
     /**
@@ -46,56 +38,119 @@ class PHPExcel_Shared_CodePage
     public static function NumberToName($codePage = 1252)
     {
         switch ($codePage) {
-			case 367:	return 'ASCII';				break;	//	ASCII
-			case 437:	return 'CP437';				break;	//	OEM US
-			case 720:	throw new PHPExcel_Exception('Code page 720 not supported.');
-													break;	//	OEM Arabic
-			case 737:	return 'CP737';				break;	//	OEM Greek
-			case 775:	return 'CP775';				break;	//	OEM Baltic
-			case 850:	return 'CP850';				break;	//	OEM Latin I
-			case 852:	return 'CP852';				break;	//	OEM Latin II (Central European)
-			case 855:	return 'CP855';				break;	//	OEM Cyrillic
-			case 857:	return 'CP857';				break;	//	OEM Turkish
-			case 858:	return 'CP858';				break;	//	OEM Multilingual Latin I with Euro
-			case 860:	return 'CP860';				break;	//	OEM Portugese
-			case 861:	return 'CP861';				break;	//	OEM Icelandic
-			case 862:	return 'CP862';				break;	//	OEM Hebrew
-			case 863:	return 'CP863';				break;	//	OEM Canadian (French)
-			case 864:	return 'CP864';				break;	//	OEM Arabic
-			case 865:	return 'CP865';				break;	//	OEM Nordic
-			case 866:	return 'CP866';				break;	//	OEM Cyrillic (Russian)
-			case 869:	return 'CP869';				break;	//	OEM Greek (Modern)
-			case 874:	return 'CP874';				break;	//	ANSI Thai
-			case 932:	return 'CP932';				break;	//	ANSI Japanese Shift-JIS
-			case 936:	return 'CP936';				break;	//	ANSI Chinese Simplified GBK
-			case 949:	return 'CP949';				break;	//	ANSI Korean (Wansung)
-			case 950:	return 'CP950';				break;	//	ANSI Chinese Traditional BIG5
-			case 1200:	return 'UTF-16LE';			break;	//	UTF-16 (BIFF8)
-			case 1250:	return 'CP1250';			break;	//	ANSI Latin II (Central European)
-			case 1251:	return 'CP1251';			break;	//	ANSI Cyrillic
-			case 0:		//	CodePage is not always correctly set when the xls file was saved by Apple's Numbers program
-			case 1252:	return 'CP1252';			break;	//	ANSI Latin I (BIFF4-BIFF7)
-			case 1253:	return 'CP1253';			break;	//	ANSI Greek
-			case 1254:	return 'CP1254';			break;	//	ANSI Turkish
-			case 1255:	return 'CP1255';			break;	//	ANSI Hebrew
-			case 1256:	return 'CP1256';			break;	//	ANSI Arabic
-			case 1257:	return 'CP1257';			break;	//	ANSI Baltic
-			case 1258:	return 'CP1258';			break;	//	ANSI Vietnamese
-			case 1361:	return 'CP1361';			break;	//	ANSI Korean (Johab)
-			case 10000:	return 'MAC';				break;	//	Apple Roman
-			case 10006:	return 'MACGREEK';			break;	//	Macintosh Greek
-			case 10007:	return 'MACCYRILLIC';		break;	//	Macintosh Cyrillic
-			case 10029:	return 'MACCENTRALEUROPE';	break;	//	Macintosh Central Europe
-			case 10079: return 'MACICELAND';		break;	//	Macintosh Icelandic
-			case 10081: return 'MACTURKISH';		break;	//	Macintosh Turkish
-			case 32768:	return 'MAC';				break;	//	Apple Roman
-			case 32769:	throw new PHPExcel_Exception('Code page 32769 not supported.');
-													break;	//	ANSI Latin I (BIFF2-BIFF3)
-			case 65000:	return 'UTF-7';				break;	//	Unicode (UTF-7)
-			case 65001:	return 'UTF-8';				break;	//	Unicode (UTF-8)
+            case 367:
+                return 'ASCII';    //    ASCII
+            case 437:
+                return 'CP437';    //    OEM US
+            case 720:
+                throw new PHPExcel_Exception('Code page 720 not supported.');    //    OEM Arabic
+            case 737:
+                return 'CP737';    //    OEM Greek
+            case 775:
+                return 'CP775';    //    OEM Baltic
+            case 850:
+                return 'CP850';    //    OEM Latin I
+            case 852:
+                return 'CP852';    //    OEM Latin II (Central European)
+            case 855:
+                return 'CP855';    //    OEM Cyrillic
+            case 857:
+                return 'CP857';    //    OEM Turkish
+            case 858:
+                return 'CP858';    //    OEM Multilingual Latin I with Euro
+            case 860:
+                return 'CP860';    //    OEM Portugese
+            case 861:
+                return 'CP861';    //    OEM Icelandic
+            case 862:
+                return 'CP862';    //    OEM Hebrew
+            case 863:
+                return 'CP863';    //    OEM Canadian (French)
+            case 864:
+                return 'CP864';    //    OEM Arabic
+            case 865:
+                return 'CP865';    //    OEM Nordic
+            case 866:
+                return 'CP866';    //    OEM Cyrillic (Russian)
+            case 869:
+                return 'CP869';    //    OEM Greek (Modern)
+            case 874:
+                return 'CP874';    //    ANSI Thai
+            case 932:
+                return 'CP932';    //    ANSI Japanese Shift-JIS
+            case 936:
+                return 'CP936';    //    ANSI Chinese Simplified GBK
+            case 949:
+                return 'CP949';    //    ANSI Korean (Wansung)
+            case 950:
+                return 'CP950';    //    ANSI Chinese Traditional BIG5
+            case 1200:
+                return 'UTF-16LE'; //    UTF-16 (BIFF8)
+            case 1250:
+                return 'CP1250';   //    ANSI Latin II (Central European)
+            case 1251:
+                return 'CP1251';   //    ANSI Cyrillic
+            case 0:
+                //    CodePage is not always correctly set when the xls file was saved by Apple's Numbers program
+            case 1252:
+                return 'CP1252';   //    ANSI Latin I (BIFF4-BIFF7)
+            case 1253:
+                return 'CP1253';   //    ANSI Greek
+            case 1254:
+                return 'CP1254';   //    ANSI Turkish
+            case 1255:
+                return 'CP1255';   //    ANSI Hebrew
+            case 1256:
+                return 'CP1256';   //    ANSI Arabic
+            case 1257:
+                return 'CP1257';   //    ANSI Baltic
+            case 1258:
+                return 'CP1258';   //    ANSI Vietnamese
+            case 1361:
+                return 'CP1361';   //    ANSI Korean (Johab)
+            case 10000:
+                return 'MAC';      //    Apple Roman
+            case 10001:
+                return 'CP932';    //    Macintosh Japanese
+            case 10002:
+                return 'CP950';    //    Macintosh Chinese Traditional
+            case 10003:
+                return 'CP1361';   //    Macintosh Korean
+            case 10004:	
+                return 'MACARABIC';  //	Apple Arabic
+            case 10005:
+                return 'MACHEBREW';		//	Apple Hebrew
+            case 10006:
+                return 'MACGREEK';  //    Macintosh Greek
+            case 10007:
+                return 'MACCYRILLIC';  //    Macintosh Cyrillic
+            case 10008:
+                return 'CP936';  //    Macintosh - Simplified Chinese (GB 2312)
+            case 10010:
+                return 'MACROMANIA';	//	Macintosh Romania
+            case 10017:
+                return 'MACUKRAINE';	//	Macintosh Ukraine
+            case 10021:
+                return 'MACTHAI';	//	Macintosh Thai
+            case 10029:
+                return 'MACCENTRALEUROPE';  //    Macintosh Central Europe
+            case 10079:
+                return 'MACICELAND';  //    Macintosh Icelandic
+            case 10081:
+                return 'MACTURKISH';  //    Macintosh Turkish
+            case 10082:
+                return 'MACCROATIAN';	//	Macintosh Croatian
+            case 21010:
+                return 'UTF-16LE';  //    UTF-16 (BIFF8) This isn't correct, but some Excel writer libraries erroneously use Codepage 21010 for UTF-16LE
+            case 32768:
+                return 'MAC';      //    Apple Roman
+            case 32769:
+                throw new PHPExcel_Exception('Code page 32769 not supported.');  //    ANSI Latin I (BIFF2-BIFF3)
+            case 65000:
+                return 'UTF-7';    //    Unicode (UTF-7)
+            case 65001:
+                return 'UTF-8';    //    Unicode (UTF-8)
         }
-
         throw new PHPExcel_Exception('Unknown codepage: ' . $codePage);
     }
-
 }

Classes/PHPExcel/Shared/Date.php

@@ -1,9 +1,9 @@
 <?php
 
 /**
- * PHPExcel
+ * PHPExcel_Shared_Date
  *
- * Copyright (c) 2006 - 2013 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
@@ -21,19 +21,10 @@
  *
  * @category   PHPExcel
  * @package    PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+ * @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##
  */
-
-
-/**
- * PHPExcel_Shared_Date
- *
- * @category   PHPExcel
- * @package	PHPExcel_Shared
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
 class PHPExcel_Shared_Date
 {
     /** constants */
@@ -47,7 +38,8 @@ class PHPExcel_Shared_Date
      * @public
      * @var    string[]
      */
-	public static $_monthNames = array(	'Jan' => 'January',
+    public static $monthNames = array(
+        'Jan' => 'January',
         'Feb' => 'February',
         'Mar' => 'March',
         'Apr' => 'April',
@@ -68,7 +60,8 @@ class PHPExcel_Shared_Date
      * @public
      * @var    string[]
      */
-	public static $_numberSuffixes = array(	'st',
+    public static $numberSuffixes = array(
+        'st',
         'nd',
         'rd',
         'th',
@@ -80,7 +73,7 @@ class PHPExcel_Shared_Date
      * @private
      * @var    int
      */
-	protected static $_excelBaseDate	= self::CALENDAR_WINDOWS_1900;
+    protected static $excelBaseDate = self::CALENDAR_WINDOWS_1900;
 
     /**
      * Set the Excel calendar (Windows 1900 or Mac 1904)
@@ -88,14 +81,15 @@ class PHPExcel_Shared_Date
      * @param     integer    $baseDate           Excel base date (1900 or 1904)
      * @return    boolean                        Success or failure
      */
-	public static function setExcelCalendar($baseDate) {
+    public static function setExcelCalendar($baseDate)
+    {
         if (($baseDate == self::CALENDAR_WINDOWS_1900) ||
             ($baseDate == self::CALENDAR_MAC_1904)) {
-			self::$_excelBaseDate = $baseDate;
-			return TRUE;
+            self::$excelBaseDate = $baseDate;
+            return true;
+        }
+        return false;
     }
-		return FALSE;
-	}	//	function setExcelCalendar()
 
 
     /**
@@ -103,34 +97,36 @@ class PHPExcel_Shared_Date
      *
      * @return     integer    Excel base date (1900 or 1904)
      */
-	public static function getExcelCalendar() {
-		return self::$_excelBaseDate;
-	}	//	function getExcelCalendar()
+    public static function getExcelCalendar()
+    {
+        return self::$excelBaseDate;
+    }
 
 
     /**
      *    Convert a date from Excel to PHP
      *
-	 *	@param		long		$dateValue			Excel date/time value
+     *    @param        integer        $dateValue            Excel date/time value
      *    @param        boolean        $adjustToTimezone    Flag indicating whether $dateValue should be treated as
      *                                                    a UST timestamp, or adjusted to UST
      *    @param        string         $timezone            The timezone for finding the adjustment from UST
-	 *	@return		long		PHP serialized date/time
+     *    @return       integer        PHP serialized date/time
      */
-	public static function ExcelToPHP($dateValue = 0, $adjustToTimezone = FALSE, $timezone = NULL) {
-		if (self::$_excelBaseDate == self::CALENDAR_WINDOWS_1900) {
-			$my_excelBaseDate = 25569;
+    public static function ExcelToPHP($dateValue = 0, $adjustToTimezone = false, $timezone = null)
+    {
+        if (self::$excelBaseDate == self::CALENDAR_WINDOWS_1900) {
+            $myexcelBaseDate = 25569;
             //    Adjust for the spurious 29-Feb-1900 (Day 60)
             if ($dateValue < 60) {
-				--$my_excelBaseDate;
+                --$myexcelBaseDate;
             }
         } else {
-			$my_excelBaseDate = 24107;
+            $myexcelBaseDate = 24107;
         }
 
         // Perform conversion
         if ($dateValue >= 1) {
-			$utcDays = $dateValue - $my_excelBaseDate;
+            $utcDays = $dateValue - $myexcelBaseDate;
             $returnValue = round($utcDays * 86400);
             if (($returnValue <= PHP_INT_MAX) && ($returnValue >= -PHP_INT_MAX)) {
                 $returnValue = (integer) $returnValue;
@@ -146,18 +142,18 @@ class PHPExcel_Shared_Date
             PHPExcel_Shared_TimeZone::getTimezoneAdjustment($timezone, $returnValue) :
             0;
 
-		// Return
         return $returnValue + $timezoneAdjustment;
-	}	//	function ExcelToPHP()
+    }
 
 
     /**
      * Convert a date from Excel to a PHP Date/Time object
      *
      * @param    integer        $dateValue        Excel date/time value
-	 * @return	integer						PHP date/time object
+     * @return    DateTime                    PHP date/time object
      */
-	public static function ExcelToPHPObject($dateValue = 0) {
+    public static function ExcelToPHPObject($dateValue = 0)
+    {
         $dateTime = self::ExcelToPHP($dateValue);
         $days = floor($dateTime / 86400);
         $time = round((($dateTime / 86400) - $days) * 86400);
@@ -169,7 +165,7 @@ class PHPExcel_Shared_Date
         $dateObj->setTime($hours, $minutes, $seconds);
 
         return $dateObj;
-	}	//	function ExcelToPHPObject()
+    }
 
 
     /**
@@ -182,48 +178,57 @@ class PHPExcel_Shared_Date
      *    @return    mixed        Excel date/time value
      *                            or boolean FALSE on failure
      */
-	public static function PHPToExcel($dateValue = 0, $adjustToTimezone = FALSE, $timezone = NULL) {
+    public static function PHPToExcel($dateValue = 0, $adjustToTimezone = false, $timezone = null)
+    {
         $saveTimeZone = date_default_timezone_get();
         date_default_timezone_set('UTC');
-		$retValue = FALSE;
+
+        $timezoneAdjustment = ($adjustToTimezone) ?
+            PHPExcel_Shared_TimeZone::getTimezoneAdjustment($timezone ? $timezone : $saveTimeZone, $dateValue) :
+            0;
+
+        $retValue = false;
         if ((is_object($dateValue)) && ($dateValue instanceof DateTime)) {
-			$retValue = self::FormattedPHPToExcel( $dateValue->format('Y'), $dateValue->format('m'), $dateValue->format('d'),
-												   $dateValue->format('H'), $dateValue->format('i'), $dateValue->format('s')
-												 );
+            $dateValue->add(new DateInterval('PT' . $timezoneAdjustment . 'S'));
+            $retValue = self::FormattedPHPToExcel($dateValue->format('Y'), $dateValue->format('m'), $dateValue->format('d'), $dateValue->format('H'), $dateValue->format('i'), $dateValue->format('s'));
         } elseif (is_numeric($dateValue)) {
-			$retValue = self::FormattedPHPToExcel( date('Y',$dateValue), date('m',$dateValue), date('d',$dateValue),
-												   date('H',$dateValue), date('i',$dateValue), date('s',$dateValue)
-												 );
+            $dateValue += $timezoneAdjustment;
+            $retValue = self::FormattedPHPToExcel(date('Y', $dateValue), date('m', $dateValue), date('d', $dateValue), date('H', $dateValue), date('i', $dateValue), date('s', $dateValue));
+        } elseif (is_string($dateValue)) {
+            $retValue = self::stringToExcel($dateValue);
         }
         date_default_timezone_set($saveTimeZone);
 
         return $retValue;
-	}	//	function PHPToExcel()
+    }
 
 
     /**
      * FormattedPHPToExcel
      *
-	 * @param	long	$year
-	 * @param	long	$month
-	 * @param	long	$day
-	 * @param	long	$hours
-	 * @param	long	$minutes
-	 * @param	long	$seconds
-	 * @return  long				Excel date/time value
+     * @param    integer    $year
+     * @param    integer    $month
+     * @param    integer    $day
+     * @param    integer    $hours
+     * @param    integer    $minutes
+     * @param    integer    $seconds
+     * @return   integer    Excel date/time value
      */
-	public static function FormattedPHPToExcel($year, $month, $day, $hours=0, $minutes=0, $seconds=0) {
-		if (self::$_excelBaseDate == self::CALENDAR_WINDOWS_1900) {
+    public static function FormattedPHPToExcel($year, $month, $day, $hours = 0, $minutes = 0, $seconds = 0)
+    {
+        if (self::$excelBaseDate == self::CALENDAR_WINDOWS_1900) {
             //
             //    Fudge factor for the erroneous fact that the year 1900 is treated as a Leap Year in MS Excel
             //    This affects every date following 28th February 1900
             //
-			$excel1900isLeapYear = TRUE;
-			if (($year == 1900) && ($month <= 2)) { $excel1900isLeapYear = FALSE; }
-			$my_excelBaseDate = 2415020;
+            $excel1900isLeapYear = true;
+            if (($year == 1900) && ($month <= 2)) {
+                $excel1900isLeapYear = false;
+            }
+            $myexcelBaseDate = 2415020;
         } else {
-			$my_excelBaseDate = 2416481;
-			$excel1900isLeapYear = FALSE;
+            $myexcelBaseDate = 2416481;
+            $excel1900isLeapYear = false;
         }
 
         //    Julian base date Adjustment
@@ -237,12 +242,12 @@ class PHPExcel_Shared_Date
         //    Calculate the Julian Date, then subtract the Excel base date (JD 2415020 = 31-Dec-1899 Giving Excel Date of 0)
         $century = substr($year, 0, 2);
         $decade = substr($year, 2, 2);
-		$excelDate = floor((146097 * $century) / 4) + floor((1461 * $decade) / 4) + floor((153 * $month + 2) / 5) + $day + 1721119 - $my_excelBaseDate + $excel1900isLeapYear;
+        $excelDate = floor((146097 * $century) / 4) + floor((1461 * $decade) / 4) + floor((153 * $month + 2) / 5) + $day + 1721119 - $myexcelBaseDate + $excel1900isLeapYear;
 
         $excelTime = (($hours * 3600) + ($minutes * 60) + $seconds) / 86400;
 
         return (float) $excelDate + $excelTime;
-	}	//	function FormattedPHPToExcel()
+    }
 
 
     /**
@@ -251,13 +256,14 @@ class PHPExcel_Shared_Date
      * @param     PHPExcel_Cell    $pCell
      * @return     boolean
      */
-	public static function isDateTime(PHPExcel_Cell $pCell) {
+    public static function isDateTime(PHPExcel_Cell $pCell)
+    {
         return self::isDateTimeFormat(
             $pCell->getWorksheet()->getStyle(
                 $pCell->getCoordinate()
             )->getNumberFormat()
         );
-	}	//	function isDateTime()
+    }
 
 
     /**
@@ -266,9 +272,10 @@ class PHPExcel_Shared_Date
      * @param     PHPExcel_Style_NumberFormat    $pFormat
      * @return     boolean
      */
-	public static function isDateTimeFormat(PHPExcel_Style_NumberFormat $pFormat) {
+    public static function isDateTimeFormat(PHPExcel_Style_NumberFormat $pFormat)
+    {
         return self::isDateTimeFormatCode($pFormat->getFormatCode());
-	}	//	function isDateTimeFormat()
+    }
 
 
     private static $possibleDateFormatCharacters = 'eymdHs';
@@ -279,12 +286,19 @@ class PHPExcel_Shared_Date
      * @param     string    $pFormatCode
      * @return     boolean
      */
-	public static function isDateTimeFormatCode($pFormatCode = '') {
+    public static function isDateTimeFormatCode($pFormatCode = '')
+    {
+        if (strtolower($pFormatCode) === strtolower(PHPExcel_Style_NumberFormat::FORMAT_GENERAL)) {
+            //    "General" contains an epoch letter 'e', so we trap for it explicitly here (case-insensitive check)
+            return false;
+        }
+        if (preg_match('/[0#]E[+-]0/i', $pFormatCode)) {
+            //    Scientific format
+            return false;
+        }
+
         // Switch on formatcode
         switch ($pFormatCode) {
-			//	General contains an epoch letter 'e', so we trap for it explicitly here
-			case PHPExcel_Style_NumberFormat::FORMAT_GENERAL:
-				return FALSE;
             //    Explicitly defined date formats
             case PHPExcel_Style_NumberFormat::FORMAT_DATE_YYYYMMDD:
             case PHPExcel_Style_NumberFormat::FORMAT_DATE_YYYYMMDD2:
@@ -308,34 +322,34 @@ class PHPExcel_Shared_Date
             case PHPExcel_Style_NumberFormat::FORMAT_DATE_XLSX16:
             case PHPExcel_Style_NumberFormat::FORMAT_DATE_XLSX17:
             case PHPExcel_Style_NumberFormat::FORMAT_DATE_XLSX22:
-				return TRUE;
+                return true;
         }
 
         //    Typically number, currency or accounting (or occasionally fraction) formats
         if ((substr($pFormatCode, 0, 1) == '_') || (substr($pFormatCode, 0, 2) == '0 ')) {
-			return FALSE;
+            return false;
         }
         // Try checking for any of the date formatting characters that don't appear within square braces
         if (preg_match('/(^|\])[^\[]*['.self::$possibleDateFormatCharacters.']/i', $pFormatCode)) {
             //    We might also have a format mask containing quoted strings...
             //        we don't want to test for any of our characters within the quoted blocks
-			if (strpos($pFormatCode,'"') !== FALSE) {
-				$segMatcher = FALSE;
+            if (strpos($pFormatCode, '"') !== false) {
+                $segMatcher = false;
                 foreach (explode('"', $pFormatCode) as $subVal) {
                     //    Only test in alternate array entries (the non-quoted blocks)
                     if (($segMatcher = !$segMatcher) &&
                         (preg_match('/(^|\])[^\[]*['.self::$possibleDateFormatCharacters.']/i', $subVal))) {
-						return TRUE;
+                        return true;
                     }
                 }
-				return FALSE;
+                return false;
             }
-			return TRUE;
+            return true;
         }
 
         // No date...
-		return FALSE;
-	}	//	function isDateTimeFormatCode()
+        return false;
+    }
 
 
     /**
@@ -344,33 +358,41 @@ class PHPExcel_Shared_Date
      * @param    string    $dateValue        Examples: '2009-12-31', '2009-12-31 15:59', '2009-12-31 15:59:10'
      * @return    float|FALSE        Excel date/time serial value
      */
-	public static function stringToExcel($dateValue = '') {
-		if (strlen($dateValue) < 2)
-			return FALSE;
-		if (!preg_match('/^(\d{1,4}[ \.\/\-][A-Z]{3,9}([ \.\/\-]\d{1,4})?|[A-Z]{3,9}[ \.\/\-]\d{1,4}([ \.\/\-]\d{1,4})?|\d{1,4}[ \.\/\-]\d{1,4}([ \.\/\-]\d{1,4})?)( \d{1,2}:\d{1,2}(:\d{1,2})?)?$/iu', $dateValue))
-			return FALSE;
+    public static function stringToExcel($dateValue = '')
+    {
+        if (strlen($dateValue) < 2) {
+            return false;
+        }
+        if (!preg_match('/^(\d{1,4}[ \.\/\-][A-Z]{3,9}([ \.\/\-]\d{1,4})?|[A-Z]{3,9}[ \.\/\-]\d{1,4}([ \.\/\-]\d{1,4})?|\d{1,4}[ \.\/\-]\d{1,4}([ \.\/\-]\d{1,4})?)( \d{1,2}:\d{1,2}(:\d{1,2})?)?$/iu', $dateValue)) {
+            return false;
+        }
 
         $dateValueNew = PHPExcel_Calculation_DateTime::DATEVALUE($dateValue);
 
         if ($dateValueNew === PHPExcel_Calculation_Functions::VALUE()) {
-			return FALSE;
-		} else {
-			if (strpos($dateValue, ':') !== FALSE) {
+            return false;
+        }
+
+        if (strpos($dateValue, ':') !== false) {
             $timeValue = PHPExcel_Calculation_DateTime::TIMEVALUE($dateValue);
             if ($timeValue === PHPExcel_Calculation_Functions::VALUE()) {
-					return FALSE;
+                return false;
             }
             $dateValueNew += $timeValue;
         }
         return $dateValueNew;
     }
 
-
-	}
-
-    public static function monthStringToNumber($month) {
+    /**
+     * Converts a month name (either a long or a short name) to a month number
+     *
+     * @param     string    $month    Month name or abbreviation
+     * @return    integer|string     Month number (1 - 12), or the original string argument if it isn't a valid month name
+     */
+    public static function monthStringToNumber($month)
+    {
         $monthIndex = 1;
-        foreach(self::$_monthNames as $shortMonthName => $longMonthName) {
+        foreach (self::$monthNames as $shortMonthName => $longMonthName) {
             if (($month === $longMonthName) || ($month === $shortMonthName)) {
                 return $monthIndex;
             }
@@ -379,12 +401,18 @@ class PHPExcel_Shared_Date
         return $month;
     }
 
-    public static function dayStringToNumber($day) {
-		$strippedDayValue = (str_replace(self::$_numberSuffixes,'',$day));
+    /**
+     * Strips an ordinal froma numeric value
+     *
+     * @param     string    $day      Day number with an ordinal
+     * @return    integer|string      The integer value with any ordinal stripped, or the original string argument if it isn't a valid numeric
+     */
+    public static function dayStringToNumber($day)
+    {
+        $strippedDayValue = (str_replace(self::$numberSuffixes, '', $day));
         if (is_numeric($strippedDayValue)) {
-		    return $strippedDayValue;
+            return (integer) $strippedDayValue;
         }
         return $day;
     }
-
 }