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
+/unitTests export-ignore
-/Tests export-ignore
 README.md export-ignore

.travis.yml

@@ -1,13 +1,29 @@
 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:
- - phpunit -c ./unitTests/
+  ## PHP_CodeSniffer
+  - ./vendor/bin/phpcs --report-width=200 --report-summary  --report-full Classes/ unitTests/ --standard=PSR2 -n
+  ## PHPUnit
+  - phpunit -c ./unitTests/
 
 notifications:
   email: false

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
+            // Register any existing autoloader function with SPL, so we don't get any clashes
             spl_autoload_register('__autoload');
         }
-        //    Register ourselves with SPL
+        // Register ourselves with SPL
-        return spl_autoload_register(array('PHPExcel_Autoloader', 'Load'));
+        if (version_compare(PHP_VERSION, '5.3.0') >= 0) {
-    }   //    function Register()
+            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){
+    public static function load($pClassName)
-        if ((class_exists($pClassName,FALSE)) || (strpos($pClassName, 'PHPExcel') !== 0)) {
+    {
-            //    Either already loaded, or not a PHPExcel class request
+        if ((class_exists($pClassName, false)) || (strpos($pClassName, 'PHPExcel') !== 0)) {
-            return FALSE;
+            // Either already loaded, or not a PHPExcel class request
+            return false;
         }
 
         $pClassFilePath = PHPEXCEL_ROOT .
-                          str_replace('_',DIRECTORY_SEPARATOR,$pClassName) .
+            str_replace('_', DIRECTORY_SEPARATOR, $pClassName) .
-                          '.php';
+            '.php';
 
-        if ((file_exists($pClassFilePath) === FALSE) || (is_readable($pClassFilePath) === FALSE)) {
+        if ((file_exists($pClassFilePath) === false) || (is_readable($pClassFilePath) === false)) {
-            //    Can't load
+            // 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##
  */
-
+class PHPExcel_CachedObjectStorage_APC extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache
-
+{
-/**
- * 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 {
-
     /**
      * 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() {
+    protected function storeData()
-        if ($this->_currentCellIsDirty) {
+    {
-            $this->_currentObject->detach();
+        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) {
+    public function addCacheData($pCoord, PHPExcel_Cell $cell)
-        if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
+    {
-            $this->_storeData();
+        if (($pCoord !== $this->currentObjectID) && ($this->currentObjectID !== null)) {
+            $this->storeData();
         }
-        $this->_cellCache[$pCoord] = true;
+        $this->cellCache[$pCoord] = true;
 
-        $this->_currentObjectID = $pCoord;
+        $this->currentObjectID = $pCoord;
-        $this->_currentObject = $cell;
+        $this->currentObject = $cell;
-        $this->_currentCellIsDirty = true;
+        $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');
+            $success = apc_fetch($this->cachePrefix.$pCoord.'.cache');
-            if ($success === FALSE) {
+            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) {
+    public function getCacheData($pCoord)
-        if ($pCoord === $this->_currentObjectID) {
+    {
-            return $this->_currentObject;
+        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');
+            $obj = apc_fetch($this->cachePrefix . $pCoord . '.cache');
-            if ($obj === FALSE) {
+            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,29 +148,28 @@ class PHPExcel_CachedObjectStorage_APC extends PHPExcel_CachedObjectStorage_Cach
         }
 
         //    Set current entry to the requested entry
-        $this->_currentObjectID = $pCoord;
+        $this->currentObjectID = $pCoord;
-        $this->_currentObject = unserialize($obj);
+        $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;
+        return $this->currentObject;
-    }    //    function getCacheData()
+    }
 
+    /**
+     * Get a list of all cell addresses currently held in cache
+     *
+     * @return  string[]
+     */
+    public function getCellList()
+    {
+        if ($this->currentObjectID !== null) {
+            $this->storeData();
+        }
 
-	/**
+        return parent::getCellList();
-	 * Get a list of all cell addresses currently held in cache
+    }
-	 *
-	 * @return  array of string
-	 */
-	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).'.';
+        $newCachePrefix = substr(md5($baseUnique), 0, 8) . '.';
         $cacheList = $this->getCellList();
-        foreach($cacheList as $cellID) {
+        foreach ($cacheList as $cellID) {
-            if ($cellID != $this->_currentObjectID) {
+            if ($cellID != $this->currentObjectID) {
-                $obj = apc_fetch($this->_cachePrefix.$cellID.'.cache');
+                $obj = apc_fetch($this->cachePrefix . $cellID . '.cache');
-                if ($obj === FALSE) {
+                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');
+                    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');
+                    throw new PHPExcel_Exception('Failed to store cell ' . $cellID . ' in APC');
                 }
             }
         }
-        $this->_cachePrefix = $newCachePrefix;
+        $this->cachePrefix = $newCachePrefix;
-    }    //    function copyCellCollection()
+    }
-
 
     /**
      * Clear the cell collection and disconnect from our parent
      *
      * @return  void
      */
-    public function unsetWorksheetCells() {
+    public function unsetWorksheetCells()
-        if ($this->_currentObject !== NULL) {
+    {
-            $this->_currentObject->detach();
+        if ($this->currentObject !== null) {
-            $this->_currentObject = $this->_currentObjectID = 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;
+        $this->parent = null;
-    }    //    function unsetWorksheetCells()
+    }
-
 
     /**
      * 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) {
+        if ($this->cachePrefix === null) {
-            $baseUnique = $this->_getUniqueID();
+            $baseUnique = $this->getUniqueID();
-            $this->_cachePrefix = substr(md5($baseUnique),0,8).'.';
+            $this->cachePrefix = substr(md5($baseUnique), 0, 8) . '.';
-            $this->_cacheTime = $cacheTime;
+            $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) {
+        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) {
+        if (apc_sma_info() === false) {
-            return 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,299 +21,348 @@
  *
  * @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
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
  * @version    ##VERSION##, ##DATE##
  */
+abstract class PHPExcel_CachedObjectStorage_CacheBase
+{
+    /**
+     * Parent worksheet
+     *
+     * @var PHPExcel_Worksheet
+     */
+    protected $parent;
 
+    /**
+     * The currently active Cell
+     *
+     * @var PHPExcel_Cell
+     */
+    protected $currentObject = null;
 
-/**
+    /**
- * PHPExcel_CachedObjectStorage_CacheBase
+     * Coordinate address of the currently active Cell
- *
+     *
- * @category   PHPExcel
+     * @var string
- * @package    PHPExcel_CachedObjectStorage
+     */
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+    protected $currentObjectID = null;
- */
-abstract class PHPExcel_CachedObjectStorage_CacheBase {
 
-	/**
+    /**
-	 * Parent worksheet
+     * Flag indicating whether the currently active Cell requires saving
-	 *
+     *
-	 * @var PHPExcel_Worksheet
+     * @var boolean
-	 */
+     */
-	protected $_parent;
+    protected $currentCellIsDirty = true;
 
-	/**
+    /**
-	 * The currently active Cell
+     * An array of cells or cell pointers for the worksheet cells held in this cache,
-	 *
+     *        and indexed by their coordinate address within the worksheet
-	 * @var PHPExcel_Cell
+     *
-	 */
+     * @var array of mixed
-	protected $_currentObject = null;
+     */
+    protected $cellCache = array();
 
-	/**
+    /**
-	 * Coordinate address of the currently active Cell
+     * Initialise this new cell collection
-	 *
+     *
-	 * @var string
+     * @param    PHPExcel_Worksheet    $parent        The worksheet for this cell collection
-	 */
+     */
-	protected $_currentObjectID = null;
+    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;
+    }
 
+    /**
+     * Return the parent worksheet for this cell collection
+     *
+     * @return    PHPExcel_Worksheet
+     */
+    public function getParent()
+    {
+        return $this->parent;
+    }
 
-	/**
+    /**
-	 * Flag indicating whether the currently active Cell requires saving
+     * Is a value set in the current PHPExcel_CachedObjectStorage_ICache for an indexed cell?
-	 *
+     *
-	 * @var boolean
+     * @param    string        $pCoord        Coordinate address of the cell to check
-	 */
+     * @return    boolean
-	protected $_currentCellIsDirty = true;
+     */
+    public function isDataSet($pCoord)
+    {
+        if ($pCoord === $this->currentObjectID) {
+            return true;
+        }
+        //    Check if the requested entry exists in the cache
+        return isset($this->cellCache[$pCoord]);
+    }
 
-	/**
+    /**
-	 * An array of cells or cell pointers for the worksheet cells held in this cache,
+     * Move a cell object from one address to another
-	 *		and indexed by their coordinate address within the worksheet
+     *
-	 *
+     * @param    string        $fromAddress    Current address of the cell to move
-	 * @var array of mixed
+     * @param    string        $toAddress        Destination address of the cell to move
-	 */
+     * @return    boolean
-	protected $_cellCache = array();
+     */
-
+    public function moveCell($fromAddress, $toAddress)
-
+    {
-	/**
+        if ($fromAddress === $this->currentObjectID) {
-	 * Initialise this new cell collection
+            $this->currentObjectID = $toAddress;
-	 *
+        }
-	 * @param	PHPExcel_Worksheet	$parent		The worksheet for this cell collection
+        $this->currentCellIsDirty = true;
-	 */
+        if (isset($this->cellCache[$fromAddress])) {
-	public function __construct(PHPExcel_Worksheet $parent) {
+            $this->cellCache[$toAddress] = &$this->cellCache[$fromAddress];
-		//	Set our parent worksheet.
+            unset($this->cellCache[$fromAddress]);
-		//	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()
-
-
-	/**
-	 * Return the parent worksheet for this cell collection
-	 *
-	 * @return	PHPExcel_Worksheet
-	 */
-	public function getParent()
-	{
-		return $this->_parent;
-	}
-
-	/**
-	 * 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	boolean
-	 */
-	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()
-
-
-	/**
-	 * Move a cell object from one address to another
-	 *
-	 * @param	string		$fromAddress	Current address of the cell to move
-	 * @param	string		$toAddress		Destination address of the cell to move
-	 * @return	boolean
-	 */
-	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]);
-		}
-
-		return TRUE;
-	}	//	function moveCell()
 
+        return true;
+    }
 
     /**
      * Add or Update a cell in cache
      *
-     * @param	PHPExcel_Cell	$cell		Cell to update
+     * @param    PHPExcel_Cell    $cell        Cell to update
-	 * @return	void
+     * @return    PHPExcel_Cell
-     * @throws	PHPExcel_Exception
+     * @throws    PHPExcel_Exception
      */
-	public function updateCacheData(PHPExcel_Cell $cell) {
+    public function updateCacheData(PHPExcel_Cell $cell)
-		return $this->addCacheData($cell->getCoordinate(),$cell);
+    {
-	}	//	function updateCacheData()
+        return $this->addCacheData($cell->getCoordinate(), $cell);
-
+    }
 
     /**
      * Delete a cell in cache identified by coordinate address
      *
-     * @param	string			$pCoord		Coordinate address of the cell to delete
+     * @param    string            $pCoord        Coordinate address of the cell to delete
-     * @throws	PHPExcel_Exception
+     * @throws    PHPExcel_Exception
      */
-	public function deleteCacheData($pCoord) {
+    public function deleteCacheData($pCoord)
-		if ($pCoord === $this->_currentObjectID) {
+    {
-			$this->_currentObject->detach();
+        if ($pCoord === $this->currentObjectID && !is_null($this->currentObject)) {
-			$this->_currentObjectID = $this->_currentObject = null;
+            $this->currentObject->detach();
-		}
+            $this->currentObjectID = $this->currentObject = null;
+        }
 
-		if (is_object($this->_cellCache[$pCoord])) {
+        if (is_object($this->cellCache[$pCoord])) {
-			$this->_cellCache[$pCoord]->detach();
+            $this->cellCache[$pCoord]->detach();
-			unset($this->_cellCache[$pCoord]);
+            unset($this->cellCache[$pCoord]);
-		}
+        }
-		$this->_currentCellIsDirty = false;
+        $this->currentCellIsDirty = false;
-	}	//	function deleteCacheData()
+    }
 
+    /**
+     * Get a list of all cell addresses currently held in cache
+     *
+     * @return    string[]
+     */
+    public function getCellList()
+    {
+        return array_keys($this->cellCache);
+    }
 
-	/**
+    /**
-	 * Get a list of all cell addresses currently held in cache
+     * Sort the list of all cell addresses currently held in cache by row and column
-	 *
+     *
-	 * @return	array of string
+     * @return    string[]
-	 */
+     */
-	public function getCellList() {
+    public function getSortedCellList()
-		return array_keys($this->_cellCache);
+    {
-	}	//	function getCellList()
+        $sortKeys = array();
+        foreach ($this->getCellList() as $coord) {
+            sscanf($coord, '%[A-Z]%d', $column, $row);
+            $sortKeys[sprintf('%09d%3s', $row, $column)] = $coord;
+        }
+        ksort($sortKeys);
 
+        return array_values($sortKeys);
+    }
 
-	/**
+    /**
-	 * Sort the list of all cell addresses currently held in cache by row and column
+     * Get highest worksheet column and highest row that have cell records
-	 *
+     *
-	 * @return	void
+     * @return array Highest column name and highest row number
-	 */
+     */
-	public function getSortedCellList() {
+    public function getHighestRowAndColumn()
-		$sortKeys = array();
+    {
-		foreach ($this->getCellList() as $coord) {
+        // Lookup highest column and highest row
-			sscanf($coord,'%[A-Z]%d', $column, $row);
+        $col = array('A' => '1A');
-			$sortKeys[sprintf('%09d%3s',$row,$column)] = $coord;
+        $row = array(1);
-		}
+        foreach ($this->getCellList() as $coord) {
-		ksort($sortKeys);
+            sscanf($coord, '%[A-Z]%d', $c, $r);
+            $row[$r] = $r;
+            $col[$c] = strlen($c).$c;
+        }
+        if (!empty($row)) {
+            // Determine highest column and row
+            $highestRow = max($row);
+            $highestColumn = substr(max($col), 1);
+        }
 
-		return array_values($sortKeys);
+        return array(
-	}	//	function sortCellList()
+            'row'    => $highestRow,
+            'column' => $highestColumn
+        );
+    }
 
+    /**
+     * Return the cell address of the currently active cell object
+     *
+     * @return    string
+     */
+    public function getCurrentAddress()
+    {
+        return $this->currentObjectID;
+    }
 
+    /**
+     * Return the column address of the currently active cell object
+     *
+     * @return    string
+     */
+    public function getCurrentColumn()
+    {
+        sscanf($this->currentObjectID, '%[A-Z]%d', $column, $row);
+        return $column;
+    }
 
-	/**
+    /**
-	 * Get highest worksheet column and highest row that have cell records
+     * Return the row address of the currently active cell object
-	 *
+     *
-	 * @return array Highest column name and highest row number
+     * @return    integer
-	 */
+     */
-	public function getHighestRowAndColumn()
+    public function getCurrentRow()
-	{
+    {
-		// Lookup highest column and highest row
+        sscanf($this->currentObjectID, '%[A-Z]%d', $column, $row);
-		$col = array('A' => '1A');
+        return (integer) $row;
-		$row = array(1);
+    }
-		foreach ($this->getCellList() as $coord) {
-			sscanf($coord,'%[A-Z]%d', $c, $r);
-			$row[$r] = $r;
-			$col[$c] = strlen($c).$c;
-		}
-		if (!empty($row)) {
-			// Determine highest column and row
-			$highestRow = max($row);
-			$highestColumn = substr(max($col),1);
-		}
 
-		return array( 'row'	   => $highestRow,
+    /**
-					  'column' => $highestColumn
+     * 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($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);
+    }
 
-	/**
+    /**
-	 * Return the cell address of the currently active cell object
+     * Get highest worksheet row
-	 *
+     *
-	 * @return	string
+     * @param   string     $column     Return the highest row for the specified column,
-	 */
+     *                                     or the highest row of any column if no column letter is passed
-	public function getCurrentAddress()
+     * @return  int        Highest row number
-	{
+     */
-		return $this->_currentObjectID;
+    public function getHighestRow($column = null)
-	}
+    {
+        if ($column == null) {
+            $colRow = $this->getHighestRowAndColumn();
+            return $colRow['row'];
+        }
 
-	/**
+        $rowList = array(0);
-	 * Return the column address of the currently active cell object
+        foreach ($this->getCellList() as $coord) {
-	 *
+            sscanf($coord, '%[A-Z]%d', $c, $r);
-	 * @return	string
+            if ($c != $column) {
-	 */
+                continue;
-	public function getCurrentColumn()
+            }
-	{
+            $rowList[] = $r;
-		sscanf($this->_currentObjectID, '%[A-Z]%d', $column, $row);
+        }
-		return $column;
-	}
 
-	/**
+        return max($rowList);
-	 * Return the row address of the currently active cell object
+    }
-	 *
-	 * @return	string
-	 */
-	public function getCurrentRow()
-	{
-		sscanf($this->_currentObjectID, '%[A-Z]%d', $column, $row);
-		return $row;
-	}
 
-	/**
+    /**
-	 * Get highest worksheet column
+     * Generate a unique ID for cache referencing
-	 *
+     *
-	 * @return string Highest column name
+     * @return string Unique Reference
-	 */
+     */
-	public function getHighestColumn()
+    protected function getUniqueID()
-	{
+    {
-		$colRow = $this->getHighestRowAndColumn();
+        if (function_exists('posix_getpid')) {
-		return $colRow['column'];
+            $baseUnique = posix_getpid();
-	}
+        } else {
+            $baseUnique = mt_rand();
+        }
+        return uniqid($baseUnique, true);
+    }
 
-	/**
+    /**
-	 * Get highest worksheet row
+     * Clone the cell collection
-	 *
+     *
-	 * @return int Highest row number
+     * @param    PHPExcel_Worksheet    $parent        The new worksheet
-	 */
+     * @return    void
-	public function getHighestRow()
+     */
-	{
+    public function copyCellCollection(PHPExcel_Worksheet $parent)
-		$colRow = $this->getHighestRowAndColumn();
+    {
-		return $colRow['row'];
+        $this->currentCellIsDirty;
-	}
+        $this->storeData();
 
+        $this->parent = $parent;
+        if (($this->currentObject !== null) && (is_object($this->currentObject))) {
+            $this->currentObject->attach($this);
+        }
+    }    //    function copyCellCollection()
 
-	/**
+    /**
-	 * Generate a unique ID for cache referencing
+     * Remove a row, deleting all cells in that row
-	 *
+     *
-	 * @return string Unique Reference
+     * @param string    $row    Row number to remove
-	 */
+     * @return void
-	protected function _getUniqueID() {
+     */
-		if (function_exists('posix_getpid')) {
+    public function removeRow($row)
-			$baseUnique = posix_getpid();
+    {
-		} else {
+        foreach ($this->getCellList() as $coord) {
-			$baseUnique = mt_rand();
+            sscanf($coord, '%[A-Z]%d', $c, $r);
-		}
+            if ($r == $row) {
-		return uniqid($baseUnique,true);
+                $this->deleteCacheData($coord);
-	}
+            }
+        }
+    }
 
-	/**
+    /**
-	 * Clone the cell collection
+     * Remove a column, deleting all cells in that column
-	 *
+     *
-	 * @param	PHPExcel_Worksheet	$parent		The new worksheet
+     * @param string    $column    Column ID to remove
-	 * @return	void
+     * @return void
-	 */
+     */
-	public function copyCellCollection(PHPExcel_Worksheet $parent) {
+    public function removeColumn($column)
-		$this->_currentCellIsDirty;
+    {
-        $this->_storeData();
+        foreach ($this->getCellList() as $coord) {
-
+            sscanf($coord, '%[A-Z]%d', $c, $r);
-		$this->_parent = $parent;
+            if ($c == $column) {
-		if (($this->_currentObject !== NULL) && (is_object($this->_currentObject))) {
+                $this->deleteCacheData($coord);
-			$this->_currentObject->attach($this);
+            }
-		}
+        }
-	}	//	function copyCellCollection()
+    }
-
-
-	/**
-	 * Identify whether the caching method is currently available
-	 * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
-	 *
-	 * @return	boolean
-	 */
-	public static function cacheMethodIsAvailable() {
-		return true;
-	}
 
+    /**
+     * Identify whether the caching method is currently available
+     * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
+     *
+     * @return    boolean
+     */
+    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,200 +21,188 @@
  *
  * @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
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
  * @version    ##VERSION##, ##DATE##
  */
+class PHPExcel_CachedObjectStorage_DiscISAM extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache
+{
+    /**
+     * Name of the file for this cache
+     *
+     * @var string
+     */
+    private $fileName = null;
 
+    /**
+     * File handle for this cache file
+     *
+     * @var resource
+     */
+    private $fileHandle = null;
 
-/**
+    /**
- * PHPExcel_CachedObjectStorage_DiscISAM
+     * Directory/Folder where the cache file is located
- *
+     *
- * @category   PHPExcel
+     * @var string
- * @package    PHPExcel_CachedObjectStorage
+     */
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+    private $cacheDirectory = null;
- */
-class PHPExcel_CachedObjectStorage_DiscISAM extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache {
-
-	/**
-	 * Name of the file for this cache
-	 *
-	 * @var string
-	 */
-	private $_fileName = NULL;
-
-	/**
-	 * File handle for this cache file
-	 *
-	 * @var resource
-	 */
-	private $_fileHandle = NULL;
-
-	/**
-	 * Directory/Folder where the cache file is located
-	 *
-	 * @var string
-	 */
-	private $_cacheDirectory = NULL;
-
 
     /**
      * Store cell data in cache for the current cell object if it's "dirty",
      *     and the 'nullify' the current cell object
      *
-	 * @return	void
+     * @return    void
-     * @throws	PHPExcel_Exception
+     * @throws    PHPExcel_Exception
      */
-	protected function _storeData() {
+    protected function storeData()
-		if ($this->_currentCellIsDirty) {
+    {
-			$this->_currentObject->detach();
+        if ($this->currentCellIsDirty && !empty($this->currentObjectID)) {
+            $this->currentObject->detach();
 
-			fseek($this->_fileHandle,0,SEEK_END);
+            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
-															   );
-			$this->_currentCellIsDirty = false;
-		}
-		$this->_currentObjectID = $this->_currentObject = null;
-	}	//	function _storeData()
 
+            $this->cellCache[$this->currentObjectID] = array(
+                'ptr' => ftell($this->fileHandle),
+                'sz'  => fwrite($this->fileHandle, serialize($this->currentObject))
+            );
+            $this->currentCellIsDirty = false;
+        }
+        $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    string            $pCoord        Coordinate address of the cell to update
-     * @param	PHPExcel_Cell	$cell		Cell to update
+     * @param    PHPExcel_Cell    $cell        Cell to update
-	 * @return	void
+     * @return    PHPExcel_Cell
-     * @throws	PHPExcel_Exception
+     * @throws    PHPExcel_Exception
      */
-	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
+    public function addCacheData($pCoord, PHPExcel_Cell $cell)
-		if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
+    {
-			$this->_storeData();
+        if (($pCoord !== $this->currentObjectID) && ($this->currentObjectID !== null)) {
-		}
+            $this->storeData();
+        }
 
-		$this->_currentObjectID = $pCoord;
+        $this->currentObjectID = $pCoord;
-		$this->_currentObject = $cell;
+        $this->currentObject = $cell;
-		$this->_currentCellIsDirty = true;
+        $this->currentCellIsDirty = true;
-
-		return $cell;
-	}	//	function addCacheData()
 
+        return $cell;
+    }
 
     /**
      * Get cell at a specific coordinate
      *
-     * @param 	string 			$pCoord		Coordinate of the cell
+     * @param     string             $pCoord        Coordinate of the cell
-     * @throws 	PHPExcel_Exception
+     * @throws     PHPExcel_Exception
-     * @return 	PHPExcel_Cell 	Cell that was found, or null if not found
+     * @return     PHPExcel_Cell     Cell that was found, or null if not found
      */
-	public function getCacheData($pCoord) {
+    public function getCacheData($pCoord)
-		if ($pCoord === $this->_currentObjectID) {
+    {
-			return $this->_currentObject;
+        if ($pCoord === $this->currentObjectID) {
-		}
+            return $this->currentObject;
-		$this->_storeData();
+        }
+        $this->storeData();
 
-		//	Check if the entry that has been requested actually exists
+        //    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 if requested entry doesn't exist in cache
-			return null;
+            return null;
-		}
+        }
 
-		//	Set current entry to the requested entry
+        //    Set current entry to the requested entry
-		$this->_currentObjectID = $pCoord;
+        $this->currentObjectID = $pCoord;
-		fseek($this->_fileHandle,$this->_cellCache[$pCoord]['ptr']);
+        fseek($this->fileHandle, $this->cellCache[$pCoord]['ptr']);
-		$this->_currentObject = unserialize(fread($this->_fileHandle,$this->_cellCache[$pCoord]['sz']));
+        $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 requested entry
-		return $this->_currentObject;
+        return $this->currentObject;
-	}	//	function getCacheData()
+    }
 
+    /**
+     * Get a list of all cell addresses currently held in cache
+     *
+     * @return  string[]
+     */
+    public function getCellList()
+    {
+        if ($this->currentObjectID !== null) {
+            $this->storeData();
+        }
 
-	/**
+        return parent::getCellList();
-	 * Get a list of all cell addresses currently held in cache
+    }
-	 *
-	 * @return  array of string
-	 */
-	public function getCellList() {
-		if ($this->_currentObjectID !== null) {
-			$this->_storeData();
-		}
 
-		return parent::getCellList();
+    /**
-	}
+     * Clone the cell collection
+     *
+     * @param    PHPExcel_Worksheet    $parent        The new worksheet
+     */
+    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';
+        //    Copy the existing cell cache file
+        copy($this->fileName, $newFileName);
+        $this->fileName = $newFileName;
+        //    Open the copied cell cache file
+        $this->fileHandle = fopen($this->fileName, 'a+');
+    }
 
+    /**
+     * Clear the cell collection and disconnect from our parent
+     *
+     */
+    public function unsetWorksheetCells()
+    {
+        if (!is_null($this->currentObject)) {
+            $this->currentObject->detach();
+            $this->currentObject = $this->currentObjectID = null;
+        }
+        $this->cellCache = array();
 
-	/**
+        //    detach ourself from the worksheet, so that it can then delete this object successfully
-	 * Clone the cell collection
+        $this->parent = null;
-	 *
-	 * @param	PHPExcel_Worksheet	$parent		The new worksheet
-	 * @return	void
-	 */
-	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';
-		//	Copy the existing cell cache file
-		copy ($this->_fileName,$newFileName);
-		$this->_fileName = $newFileName;
-		//	Open the copied cell cache file
-		$this->_fileHandle = fopen($this->_fileName,'a+');
-	}	//	function copyCellCollection()
 
+        //    Close down the temporary cache file
+        $this->__destruct();
+    }
 
-	/**
+    /**
-	 * Clear the cell collection and disconnect from our parent
+     * Initialise this new cell collection
-	 *
+     *
-	 * @return	void
+     * @param    PHPExcel_Worksheet    $parent        The worksheet for this cell collection
-	 */
+     * @param    array of mixed        $arguments    Additional initialisation arguments
-	public function unsetWorksheetCells() {
+     */
-		if(!is_null($this->_currentObject)) {
+    public function __construct(PHPExcel_Worksheet $parent, $arguments)
-			$this->_currentObject->detach();
+    {
-			$this->_currentObject = $this->_currentObjectID = null;
+        $this->cacheDirectory    = ((isset($arguments['dir'])) && ($arguments['dir'] !== null))
-		}
+                                    ? $arguments['dir']
-		$this->_cellCache = array();
+                                    : PHPExcel_Shared_File::sys_get_temp_dir();
 
-		//	detach ourself from the worksheet, so that it can then delete this object successfully
+        parent::__construct($parent);
-		$this->_parent = null;
+        if (is_null($this->fileHandle)) {
-
+            $baseUnique = $this->getUniqueID();
-		//	Close down the temporary cache file
+            $this->fileName = $this->cacheDirectory.'/PHPExcel.'.$baseUnique.'.cache';
-		$this->__destruct();
+            $this->fileHandle = fopen($this->fileName, 'a+');
-	}	//	function unsetWorksheetCells()
+        }
-
+    }
-
-	/**
-	 * Initialise this new cell collection
-	 *
-	 * @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))
-									? $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+');
-		}
-	}	//	function __construct()
-
-
-	/**
-	 * Destroy this cell collection
-	 */
-	public function __destruct() {
-		if (!is_null($this->_fileHandle)) {
-			fclose($this->_fileHandle);
-			unlink($this->_fileName);
-		}
-		$this->_fileHandle = null;
-	}	//	function __destruct()
 
+    /**
+     * Destroy this cell collection
+     */
+    public function __destruct()
+    {
+        if (!is_null($this->fileHandle)) {
+            fclose($this->fileHandle);
+            unlink($this->fileName);
+        }
+        $this->fileHandle = null;
+    }
 }

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,93 +21,83 @@
  *
  * @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
+ * @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
 {
     /**
      * Add or Update a cell in cache identified by coordinate address
      *
-     * @param	string			$pCoord		Coordinate address of the cell to update
+     * @param    string            $pCoord        Coordinate address of the cell to update
-     * @param	PHPExcel_Cell	$cell		Cell to update
+     * @param    PHPExcel_Cell    $cell        Cell to update
-	 * @return	void
+     * @return    PHPExcel_Cell
-     * @throws	PHPExcel_Exception
+     * @throws    PHPExcel_Exception
      */
-	public function addCacheData($pCoord, PHPExcel_Cell $cell);
+    public function addCacheData($pCoord, PHPExcel_Cell $cell);
 
     /**
      * Add or Update a cell in cache
      *
-     * @param	PHPExcel_Cell	$cell		Cell to update
+     * @param    PHPExcel_Cell    $cell        Cell to update
-	 * @return	void
+     * @return    PHPExcel_Cell
-     * @throws	PHPExcel_Exception
+     * @throws    PHPExcel_Exception
      */
-	public function updateCacheData(PHPExcel_Cell $cell);
+    public function updateCacheData(PHPExcel_Cell $cell);
 
     /**
      * Fetch a cell from cache identified by coordinate address
      *
-     * @param	string			$pCoord		Coordinate address of the cell to retrieve
+     * @param    string            $pCoord        Coordinate address of the cell to retrieve
-     * @return PHPExcel_Cell 	Cell that was found, or null if not found
+     * @return PHPExcel_Cell     Cell that was found, or null if not found
-     * @throws	PHPExcel_Exception
+     * @throws    PHPExcel_Exception
      */
-	public function getCacheData($pCoord);
+    public function getCacheData($pCoord);
 
     /**
      * Delete a cell in cache identified by coordinate address
      *
-     * @param	string			$pCoord		Coordinate address of the cell to delete
+     * @param    string            $pCoord        Coordinate address of the cell to delete
-     * @throws	PHPExcel_Exception
+     * @throws    PHPExcel_Exception
      */
-	public function deleteCacheData($pCoord);
+    public function deleteCacheData($pCoord);
 
-	/**
+    /**
-	 * Is a value set in the current PHPExcel_CachedObjectStorage_ICache for an indexed cell?
+     * Is a value set in the current PHPExcel_CachedObjectStorage_ICache for an indexed cell?
-	 *
+     *
-	 * @param	string		$pCoord		Coordinate address of the cell to check
+     * @param    string        $pCoord        Coordinate address of the cell to check
-	 * @return	boolean
+     * @return    boolean
-	 */
+     */
-	public function isDataSet($pCoord);
+    public function isDataSet($pCoord);
 
-	/**
+    /**
-	 * Get a list of all cell addresses currently held in cache
+     * Get a list of all cell addresses currently held in cache
-	 *
+     *
-	 * @return	array of string
+     * @return    string[]
-	 */
+     */
-	public function getCellList();
+    public function getCellList();
 
-	/**
+    /**
-	 * Get the list of all cell addresses currently held in cache sorted by column and row
+     * Get the list of all cell addresses currently held in cache sorted by column and row
-	 *
+     *
-	 * @return	void
+     * @return    string[]
-	 */
+     */
-	public function getSortedCellList();
+    public function getSortedCellList();
 
-	/**
+    /**
-	 * Clone the cell collection
+     * Clone the cell collection
-	 *
+     *
-	 * @param	PHPExcel_Worksheet	$parent		The new worksheet
+     * @param    PHPExcel_Worksheet    $parent        The new worksheet
-	 * @return	void
+     * @return    void
-	 */
+     */
-	public function copyCellCollection(PHPExcel_Worksheet $parent);
+    public function copyCellCollection(PHPExcel_Worksheet $parent);
-
-	/**
-	 * Identify whether the caching method is currently available
-	 * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
-	 *
-	 * @return	boolean
-	 */
-	public static function cacheMethodIsAvailable();
 
+    /**
+     * Identify whether the caching method is currently available
+     * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
+     *
+     * @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,133 +21,129 @@
  *
  * @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
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
  * @version    ##VERSION##, ##DATE##
  */
-
+class PHPExcel_CachedObjectStorage_Igbinary extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache
-
+{
-/**
- * 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 {
-
     /**
      * Store cell data in cache for the current cell object if it's "dirty",
      *     and the 'nullify' the current cell object
      *
-	 * @return	void
+     * @return    void
-     * @throws	PHPExcel_Exception
+     * @throws    PHPExcel_Exception
      */
-	protected function _storeData() {
+    protected function storeData()
-		if ($this->_currentCellIsDirty) {
+    {
-			$this->_currentObject->detach();
+        if ($this->currentCellIsDirty && !empty($this->currentObjectID)) {
+            $this->currentObject->detach();
 
-			$this->_cellCache[$this->_currentObjectID] = igbinary_serialize($this->_currentObject);
+            $this->cellCache[$this->currentObjectID] = igbinary_serialize($this->currentObject);
-			$this->_currentCellIsDirty = false;
+            $this->currentCellIsDirty = false;
-		}
+        }
-		$this->_currentObjectID = $this->_currentObject = null;
+        $this->currentObjectID = $this->currentObject = null;
-	}	//	function _storeData()
+    }    //    function _storeData()
 
 
     /**
      * Add or Update a cell in cache identified by coordinate address
      *
-     * @param	string			$pCoord		Coordinate address of the cell to update
+     * @param    string            $pCoord        Coordinate address of the cell to update
-     * @param	PHPExcel_Cell	$cell		Cell to update
+     * @param    PHPExcel_Cell    $cell        Cell to update
-	 * @return	void
+     * @return    PHPExcel_Cell
-     * @throws	PHPExcel_Exception
+     * @throws    PHPExcel_Exception
      */
-	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
+    public function addCacheData($pCoord, PHPExcel_Cell $cell)
-		if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
+    {
-			$this->_storeData();
+        if (($pCoord !== $this->currentObjectID) && ($this->currentObjectID !== null)) {
-		}
+            $this->storeData();
+        }
 
-		$this->_currentObjectID = $pCoord;
+        $this->currentObjectID = $pCoord;
-		$this->_currentObject = $cell;
+        $this->currentObject = $cell;
-		$this->_currentCellIsDirty = true;
+        $this->currentCellIsDirty = true;
 
-		return $cell;
+        return $cell;
-	}	//	function addCacheData()
+    }    //    function addCacheData()
 
 
     /**
      * Get cell at a specific coordinate
      *
-     * @param 	string 			$pCoord		Coordinate of the cell
+     * @param     string             $pCoord        Coordinate of the cell
-     * @throws 	PHPExcel_Exception
+     * @throws     PHPExcel_Exception
-     * @return 	PHPExcel_Cell 	Cell that was found, or null if not found
+     * @return     PHPExcel_Cell     Cell that was found, or null if not found
      */
-	public function getCacheData($pCoord) {
+    public function getCacheData($pCoord)
-		if ($pCoord === $this->_currentObjectID) {
+    {
-			return $this->_currentObject;
+        if ($pCoord === $this->currentObjectID) {
-		}
+            return $this->currentObject;
-		$this->_storeData();
+        }
+        $this->storeData();
 
-		//	Check if the entry that has been requested actually exists
+        //    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 if requested entry doesn't exist in cache
-			return null;
+            return null;
-		}
+        }
 
-		//	Set current entry to the requested entry
+        //    Set current entry to the requested entry
-		$this->_currentObjectID = $pCoord;
+        $this->currentObjectID = $pCoord;
-		$this->_currentObject = igbinary_unserialize($this->_cellCache[$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 requested entry
-		return $this->_currentObject;
+        return $this->currentObject;
-	}	//	function getCacheData()
+    }    //    function getCacheData()
 
 
-	/**
+    /**
-	 * Get a list of all cell addresses currently held in cache
+     * Get a list of all cell addresses currently held in cache
-	 *
+     *
-	 * @return  array of string
+     * @return  string[]
-	 */
+     */
-	public function getCellList() {
+    public function getCellList()
-		if ($this->_currentObjectID !== null) {
+    {
-			$this->_storeData();
+        if ($this->currentObjectID !== null) {
-		}
+            $this->storeData();
+        }
 
-		return parent::getCellList();
+        return parent::getCellList();
-	}
+    }
 
 
-	/**
+    /**
-	 * Clear the cell collection and disconnect from our parent
+     * Clear the cell collection and disconnect from our parent
-	 *
+     *
-	 * @return	void
+     * @return    void
-	 */
+     */
-	public function unsetWorksheetCells() {
+    public function unsetWorksheetCells()
-		if(!is_null($this->_currentObject)) {
+    {
-			$this->_currentObject->detach();
+        if (!is_null($this->currentObject)) {
-			$this->_currentObject = $this->_currentObjectID = null;
+            $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
+        //    detach ourself from the worksheet, so that it can then delete this object successfully
-		$this->_parent = null;
+        $this->parent = null;
-	}	//	function unsetWorksheetCells()
+    }    //    function unsetWorksheetCells()
 
 
-	/**
+    /**
-	 * Identify whether the caching method is currently available
+     * Identify whether the caching method is currently available
-	 * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
+     * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
-	 *
+     *
-	 * @return	boolean
+     * @return    boolean
-	 */
+     */
-	public static function cacheMethodIsAvailable() {
+    public static function cacheMethodIsAvailable()
-		if (!function_exists('igbinary_serialize')) {
+    {
-			return false;
+        if (!function_exists('igbinary_serialize')) {
-		}
+            return false;
-
+        }
-		return true;
-	}
 
+        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,293 +21,288 @@
  *
  * @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
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
  * @version    ##VERSION##, ##DATE##
  */
+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;
 
+    /**
+     * Cache timeout
+     *
+     * @var integer
+     */
+    private $cacheTime = 600;
 
-/**
+    /**
- * PHPExcel_CachedObjectStorage_Memcache
+     * Memcache interface
- *
+     *
- * @category   PHPExcel
+     * @var resource
- * @package    PHPExcel_CachedObjectStorage
+     */
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+    private $memcache = null;
- */
-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;
-
-	/**
-	 * Cache timeout
-	 *
-	 * @var integer
-	 */
-	private $_cacheTime = 600;
-
-	/**
-	 * Memcache interface
-	 *
-	 * @var resource
-	 */
-	private $_memcache = null;
 
 
     /**
      * Store cell data in cache for the current cell object if it's "dirty",
      *     and the 'nullify' the current cell object
      *
-	 * @return	void
+     * @return    void
-     * @throws	PHPExcel_Exception
+     * @throws    PHPExcel_Exception
      */
-	protected function _storeData() {
+    protected function storeData()
-		if ($this->_currentCellIsDirty) {
+    {
-			$this->_currentObject->detach();
+        if ($this->currentCellIsDirty && !empty($this->currentObjectID)) {
+            $this->currentObject->detach();
 
-			$obj = serialize($this->_currentObject);
+            $obj = serialize($this->currentObject);
-			if (!$this->_memcache->replace($this->_cachePrefix.$this->_currentObjectID.'.cache',$obj,NULL,$this->_cacheTime)) {
+            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)) {
+                if (!$this->memcache->add($this->cachePrefix . $this->currentObjectID . '.cache', $obj, null, $this->cacheTime)) {
-					$this->__destruct();
+                    $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()
+    }    //    function _storeData()
 
 
     /**
      * Add or Update a cell in cache identified by coordinate address
      *
-     * @param	string			$pCoord		Coordinate address of the cell to update
+     * @param    string            $pCoord        Coordinate address of the cell to update
-     * @param	PHPExcel_Cell	$cell		Cell to update
+     * @param    PHPExcel_Cell    $cell        Cell to update
-	 * @return	void
+     * @return    PHPExcel_Cell
-     * @throws	PHPExcel_Exception
+     * @throws    PHPExcel_Exception
      */
-	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
+    public function addCacheData($pCoord, PHPExcel_Cell $cell)
-		if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
+    {
-			$this->_storeData();
+        if (($pCoord !== $this->currentObjectID) && ($this->currentObjectID !== null)) {
-		}
+            $this->storeData();
-		$this->_cellCache[$pCoord] = true;
+        }
+        $this->cellCache[$pCoord] = true;
 
-		$this->_currentObjectID = $pCoord;
+        $this->currentObjectID = $pCoord;
-		$this->_currentObject = $cell;
+        $this->currentObject = $cell;
-		$this->_currentCellIsDirty = true;
+        $this->currentCellIsDirty = true;
 
-		return $cell;
+        return $cell;
-	}	//	function addCacheData()
+    }    //    function addCacheData()
 
 
-	/**
+    /**
-	 * Is a value set in the current PHPExcel_CachedObjectStorage_ICache for an indexed cell?
+     * Is a value set in the current PHPExcel_CachedObjectStorage_ICache for an indexed cell?
-	 *
+     *
-	 * @param	string		$pCoord		Coordinate address of the cell to check
+     * @param    string        $pCoord        Coordinate address of the cell to check
-	 * @return	void
+     * @return    boolean
-	 * @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)) {
+        //    Check if the requested entry is the current object, or exists in the cache
-			if ($this->_currentObjectID == $pCoord) {
+        if (parent::isDataSet($pCoord)) {
-				return true;
+            if ($this->currentObjectID == $pCoord) {
-			}
+                return true;
-			//	Check if the requested entry still exists in Memcache
+            }
-			$success = $this->_memcache->get($this->_cachePrefix.$pCoord.'.cache');
+            //    Check if the requested entry still exists in Memcache
-			if ($success === false) {
+            $success = $this->memcache->get($this->cachePrefix.$pCoord.'.cache');
-				//	Entry no longer exists in Memcache, so clear it from the cache array
+            if ($success === false) {
-				parent::deleteCacheData($pCoord);
+                //    Entry no longer exists in Memcache, so clear it from the cache array
-				throw new PHPExcel_Exception('Cell entry '.$pCoord.' no longer exists in MemCache');
+                parent::deleteCacheData($pCoord);
-			}
+                throw new PHPExcel_Exception('Cell entry '.$pCoord.' no longer exists in MemCache');
-			return true;
+            }
-		}
+            return true;
-		return false;
+        }
-	}	//	function isDataSet()
+        return false;
+    }
 
 
-	/**
+    /**
      * Get cell at a specific coordinate
      *
-     * @param 	string 			$pCoord		Coordinate of the cell
+     * @param     string             $pCoord        Coordinate of the cell
-     * @throws 	PHPExcel_Exception
+     * @throws     PHPExcel_Exception
-     * @return 	PHPExcel_Cell 	Cell that was found, or null if not found
+     * @return     PHPExcel_Cell     Cell that was found, or null if not found
      */
-	public function getCacheData($pCoord) {
+    public function getCacheData($pCoord)
-		if ($pCoord === $this->_currentObjectID) {
+    {
-			return $this->_currentObject;
+        if ($pCoord === $this->currentObjectID) {
-		}
+            return $this->currentObject;
-		$this->_storeData();
+        }
+        $this->storeData();
 
-		//	Check if the entry that has been requested actually exists
+        //    Check if the entry that has been requested actually exists
-		if (parent::isDataSet($pCoord)) {
+        if (parent::isDataSet($pCoord)) {
-			$obj = $this->_memcache->get($this->_cachePrefix.$pCoord.'.cache');
+            $obj = $this->memcache->get($this->cachePrefix . $pCoord . '.cache');
-			if ($obj === false) {
+            if ($obj === false) {
-				//	Entry no longer exists in Memcache, so clear it from the cache array
+                //    Entry no longer exists in Memcache, so clear it from the cache array
-				parent::deleteCacheData($pCoord);
+                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 {
+        } else {
-			//	Return null if requested entry doesn't exist in cache
+            //    Return null if requested entry doesn't exist in cache
-			return null;
+            return null;
-		}
+        }
 
-		//	Set current entry to the requested entry
+        //    Set current entry to the requested entry
-		$this->_currentObjectID = $pCoord;
+        $this->currentObjectID = $pCoord;
-		$this->_currentObject = unserialize($obj);
+        $this->currentObject = unserialize($obj);
         //    Re-attach this as the cell's parent
-        $this->_currentObject->attach($this);
+        $this->currentObject->attach($this);
 
-		//	Return requested entry
+        //    Return requested entry
-		return $this->_currentObject;
+        return $this->currentObject;
-	}	//	function getCacheData()
+    }
 
+    /**
+     * Get a list of all cell addresses currently held in cache
+     *
+     * @return  string[]
+     */
+    public function getCellList()
+    {
+        if ($this->currentObjectID !== null) {
+            $this->storeData();
+        }
 
-	/**
+        return parent::getCellList();
-	 * Get a list of all cell addresses currently held in cache
+    }
-	 *
-	 * @return  array of string
-	 */
-	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
+     * @param    string            $pCoord        Coordinate address of the cell to delete
-     * @throws	PHPExcel_Exception
+     * @throws    PHPExcel_Exception
      */
-	public function deleteCacheData($pCoord) {
+    public function deleteCacheData($pCoord)
-		//	Delete the entry from Memcache
+    {
-		$this->_memcache->delete($this->_cachePrefix.$pCoord.'.cache');
+        //    Delete the entry from Memcache
+        $this->memcache->delete($this->cachePrefix . $pCoord . '.cache');
 
-		//	Delete the entry from our cell address array
+        //    Delete the entry from our cell address array
-		parent::deleteCacheData($pCoord);
+        parent::deleteCacheData($pCoord);
-	}	//	function deleteCacheData()
+    }
 
+    /**
+     * Clone the cell collection
+     *
+     * @param    PHPExcel_Worksheet    $parent        The new worksheet
+     * @return    void
+     */
+    public function copyCellCollection(PHPExcel_Worksheet $parent)
+    {
+        parent::copyCellCollection($parent);
+        //    Get a new id for the new file name
+        $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 ($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");
+                }
+                if (!$this->memcache->add($newCachePrefix . $cellID . '.cache', $obj, null, $this->cacheTime)) {
+                    $this->__destruct();
+                    throw new PHPExcel_Exception("Failed to store cell {$cellID} in MemCache");
+                }
+            }
+        }
+        $this->cachePrefix = $newCachePrefix;
+    }
 
-	/**
+    /**
-	 * Clone the cell collection
+     * Clear the cell collection and disconnect from our parent
-	 *
+     *
-	 * @param	PHPExcel_Worksheet	$parent		The new worksheet
+     * @return    void
-	 * @return	void
+     */
-	 */
+    public function unsetWorksheetCells()
-	public function copyCellCollection(PHPExcel_Worksheet $parent) {
+    {
-		parent::copyCellCollection($parent);
+        if (!is_null($this->currentObject)) {
-		//	Get a new id for the new file name
+            $this->currentObject->detach();
-		$baseUnique = $this->_getUniqueID();
+            $this->currentObject = $this->currentObjectID = null;
-		$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 ($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');
-				}
-				if (!$this->_memcache->add($newCachePrefix.$cellID.'.cache',$obj,NULL,$this->_cacheTime)) {
-					$this->__destruct();
-					throw new PHPExcel_Exception('Failed to store cell '.$cellID.' in MemCache');
-				}
-			}
-		}
-		$this->_cachePrefix = $newCachePrefix;
-	}	//	function copyCellCollection()
 
+        //    Flush the Memcache cache
+        $this->__destruct();
 
-	/**
+        $this->cellCache = array();
-	 * 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;
-		}
 
-		//	Flush the Memcache cache
+        //    detach ourself from the worksheet, so that it can then delete this object successfully
-		$this->__destruct();
+        $this->parent = null;
+    }
 
-		$this->_cellCache = array();
+    /**
+     * Initialise this new cell collection
+     *
+     * @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)
+    {
+        $memcacheServer = (isset($arguments['memcacheServer'])) ? $arguments['memcacheServer'] : 'localhost';
+        $memcachePort = (isset($arguments['memcachePort'])) ? $arguments['memcachePort'] : 11211;
+        $cacheTime = (isset($arguments['cacheTime'])) ? $arguments['cacheTime'] : 600;
 
-		//	detach ourself from the worksheet, so that it can then delete this object successfully
+        if (is_null($this->cachePrefix)) {
-		$this->_parent = null;
+            $baseUnique = $this->getUniqueID();
-	}	//	function unsetWorksheetCells()
+            $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->cacheTime = $cacheTime;
 
-	/**
+            parent::__construct($parent);
-	 * Initialise this new cell collection
+        }
-	 *
+    }
-	 * @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) {
-		$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();
+     * Memcache error handler
-			$this->_cachePrefix = substr(md5($baseUnique),0,8).'.';
+     *
+     * @param    string    $host        Memcache server
+     * @param    integer    $port        Memcache port
+     * @throws    PHPExcel_Exception
+     */
+    public function failureCallback($host, $port)
+    {
+        throw new PHPExcel_Exception("memcache {$host}:{$port} failed");
+    }
 
-			//	Set a new Memcache object and connect to the Memcache server
+    /**
-			$this->_memcache = new Memcache();
+     * Destroy this cell collection
-			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);
+    public function __destruct()
-			}
+    {
-			$this->_cacheTime = $cacheTime;
+        $cacheList = $this->getCellList();
+        foreach ($cacheList as $cellID) {
+            $this->memcache->delete($this->cachePrefix.$cellID . '.cache');
+        }
+    }
 
-			parent::__construct($parent);
+    /**
-		}
+     * Identify whether the caching method is currently available
-	}	//	function __construct()
+     * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
-
+     *
-
+     * @return    boolean
-	/**
+     */
-	 * Memcache error handler
+    public static function cacheMethodIsAvailable()
-	 *
+    {
-	 * @param	string	$host		Memcache server
+        if (!function_exists('memcache_add')) {
-	 * @param	integer	$port		Memcache port
+            return false;
-     * @throws	PHPExcel_Exception
+        }
-	 */
-	public function failureCallback($host, $port) {
-		throw new PHPExcel_Exception('memcache '.$host.':'.$port.' failed');
-	}
-
-
-	/**
-	 * Destroy this cell collection
-	 */
-	public function __destruct() {
-		$cacheList = $this->getCellList();
-		foreach($cacheList as $cellID) {
-			$this->_memcache->delete($this->_cachePrefix.$cellID.'.cache');
-		}
-	}	//	function __destruct()
-
-	/**
-	 * Identify whether the caching method is currently available
-	 * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
-	 *
-	 * @return	boolean
-	 */
-	public static function cacheMethodIsAvailable() {
-		if (!function_exists('memcache_add')) {
-			return false;
-		}
-
-		return true;
-	}
 
+        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,106 +21,98 @@
  *
  * @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
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
  * @version    ##VERSION##, ##DATE##
  */
-
+class PHPExcel_CachedObjectStorage_Memory extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache
-
+{
-/**
- * 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 {
-
     /**
      * Dummy method callable from CacheBase, but unused by Memory cache
      *
-	 * @return	void
+     * @return    void
      */
-	protected function _storeData() {
+    protected function storeData()
-	}	//	function _storeData()
+    {
+    }
 
     /**
      * Add or Update a cell in cache identified by coordinate address
      *
-     * @param	string			$pCoord		Coordinate address of the cell to update
+     * @param    string            $pCoord        Coordinate address of the cell to update
-     * @param	PHPExcel_Cell	$cell		Cell to update
+     * @param    PHPExcel_Cell    $cell        Cell to update
-	 * @return	PHPExcel_Cell
+     * @return    PHPExcel_Cell
-     * @throws	PHPExcel_Exception
+     * @throws    PHPExcel_Exception
      */
-	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
+    public function addCacheData($pCoord, PHPExcel_Cell $cell)
-		$this->_cellCache[$pCoord] = $cell;
+    {
+        $this->cellCache[$pCoord] = $cell;
 
-		//	Set current entry to the new/updated entry
+        //    Set current entry to the new/updated entry
-		$this->_currentObjectID = $pCoord;
+        $this->currentObjectID = $pCoord;
 
-		return $cell;
+        return $cell;
-	}	//	function addCacheData()
+    }
 
 
     /**
      * Get cell at a specific coordinate
      *
-     * @param 	string 			$pCoord		Coordinate of the cell
+     * @param     string             $pCoord        Coordinate of the cell
-     * @throws 	PHPExcel_Exception
+     * @throws     PHPExcel_Exception
-     * @return 	PHPExcel_Cell 	Cell that was found, or null if not found
+     * @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])) {
+        //    Check if the entry that has been requested actually exists
-			$this->_currentObjectID = NULL;
+        if (!isset($this->cellCache[$pCoord])) {
-			//	Return null if requested entry doesn't exist in cache
+            $this->currentObjectID = null;
-			return null;
+            //    Return null if requested entry doesn't exist in cache
-		}
+            return null;
+        }
 
-		//	Set current entry to the requested entry
+        //    Set current entry to the requested entry
-		$this->_currentObjectID = $pCoord;
+        $this->currentObjectID = $pCoord;
 
-		//	Return requested entry
+        //    Return requested entry
-		return $this->_cellCache[$pCoord];
+        return $this->cellCache[$pCoord];
-	}	//	function getCacheData()
+    }
 
 
-	/**
+    /**
-	 * Clone the cell collection
+     * Clone the cell collection
-	 *
+     *
-	 * @param	PHPExcel_Worksheet	$parent		The new worksheet
+     * @param    PHPExcel_Worksheet    $parent        The new worksheet
-	 * @return	void
+     */
-	 */
+    public function copyCellCollection(PHPExcel_Worksheet $parent)
-	public function copyCellCollection(PHPExcel_Worksheet $parent) {
+    {
-		parent::copyCellCollection($parent);
+        parent::copyCellCollection($parent);
 
-		$newCollection = array();
+        $newCollection = array();
-		foreach($this->_cellCache as $k => &$cell) {
+        foreach ($this->cellCache as $k => &$cell) {
-			$newCollection[$k] = clone $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
+     *
+     */
+    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) {
+            $cell->detach();
+            $this->cellCache[$k] = null;
+        }
+        unset($cell);
 
-	/**
+        $this->cellCache = array();
-	 * Clear the cell collection and disconnect from our parent
-	 *
-	 * @return	void
-	 */
-	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) {
-			$cell->detach();
-			$this->_cellCache[$k] = null;
-		}
-		unset($cell);
-
-		$this->_cellCache = array();
-
-		//	detach ourself from the worksheet, so that it can then delete this object successfully
-		$this->_parent = null;
-	}	//	function unsetWorksheetCells()
 
+        //    detach ourself from the worksheet, so that it can then delete this object successfully
+        $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,118 +21,113 @@
  *
  * @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
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
  * @version    ##VERSION##, ##DATE##
  */
-
+class PHPExcel_CachedObjectStorage_MemoryGZip extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache
-
+{
-/**
- * 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 {
-
     /**
      * Store cell data in cache for the current cell object if it's "dirty",
      *     and the 'nullify' the current cell object
      *
-	 * @return	void
+     * @return    void
-     * @throws	PHPExcel_Exception
+     * @throws    PHPExcel_Exception
      */
-	protected function _storeData() {
+    protected function storeData()
-		if ($this->_currentCellIsDirty) {
+    {
-			$this->_currentObject->detach();
+        if ($this->currentCellIsDirty && !empty($this->currentObjectID)) {
+            $this->currentObject->detach();
 
-			$this->_cellCache[$this->_currentObjectID] = gzdeflate(serialize($this->_currentObject));
+            $this->cellCache[$this->currentObjectID] = gzdeflate(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    string            $pCoord        Coordinate address of the cell to update
-     * @param	PHPExcel_Cell	$cell		Cell to update
+     * @param    PHPExcel_Cell    $cell        Cell to update
-	 * @return	void
+     * @return    PHPExcel_Cell
-     * @throws	PHPExcel_Exception
+     * @throws    PHPExcel_Exception
      */
-	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
+    public function addCacheData($pCoord, PHPExcel_Cell $cell)
-		if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
+    {
-			$this->_storeData();
+        if (($pCoord !== $this->currentObjectID) && ($this->currentObjectID !== null)) {
-		}
+            $this->storeData();
+        }
 
-		$this->_currentObjectID = $pCoord;
+        $this->currentObjectID = $pCoord;
-		$this->_currentObject = $cell;
+        $this->currentObject = $cell;
-		$this->_currentCellIsDirty = true;
+        $this->currentCellIsDirty = true;
 
-		return $cell;
+        return $cell;
-	}	//	function addCacheData()
+    }
 
 
     /**
      * Get cell at a specific coordinate
      *
-     * @param 	string 			$pCoord		Coordinate of the cell
+     * @param     string             $pCoord        Coordinate of the cell
-     * @throws 	PHPExcel_Exception
+     * @throws     PHPExcel_Exception
-     * @return 	PHPExcel_Cell 	Cell that was found, or null if not found
+     * @return     PHPExcel_Cell     Cell that was found, or null if not found
      */
-	public function getCacheData($pCoord) {
+    public function getCacheData($pCoord)
-		if ($pCoord === $this->_currentObjectID) {
+    {
-			return $this->_currentObject;
+        if ($pCoord === $this->currentObjectID) {
-		}
+            return $this->currentObject;
-		$this->_storeData();
+        }
+        $this->storeData();
 
-		//	Check if the entry that has been requested actually exists
+        //    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 if requested entry doesn't exist in cache
-			return null;
+            return null;
-		}
+        }
 
-		//	Set current entry to the requested entry
+        //    Set current entry to the requested entry
-		$this->_currentObjectID = $pCoord;
+        $this->currentObjectID = $pCoord;
-		$this->_currentObject = unserialize(gzinflate($this->_cellCache[$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 requested entry
-		return $this->_currentObject;
+        return $this->currentObject;
-	}	//	function getCacheData()
+    }
 
 
-	/**
+    /**
-	 * Get a list of all cell addresses currently held in cache
+     * Get a list of all cell addresses currently held in cache
-	 *
+     *
-	 * @return  array of string
+     * @return  string[]
-	 */
+     */
-	public function getCellList() {
+    public function getCellList()
-		if ($this->_currentObjectID !== null) {
+    {
-			$this->_storeData();
+        if ($this->currentObjectID !== null) {
-		}
+            $this->storeData();
+        }
 
-		return parent::getCellList();
+        return parent::getCellList();
-	}
+    }
 
 
-	/**
+    /**
-	 * Clear the cell collection and disconnect from our parent
+     * Clear the cell collection and disconnect from our parent
-	 *
+     *
-	 * @return	void
+     * @return    void
-	 */
+     */
-	public function unsetWorksheetCells() {
+    public function unsetWorksheetCells()
-		if(!is_null($this->_currentObject)) {
+    {
-			$this->_currentObject->detach();
+        if (!is_null($this->currentObject)) {
-			$this->_currentObject = $this->_currentObjectID = null;
+            $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()
 
+        //    detach ourself from the worksheet, so that it can then delete this object successfully
+        $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,118 +21,109 @@
  *
  * @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
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
  * @version    ##VERSION##, ##DATE##
  */
-
+class PHPExcel_CachedObjectStorage_MemorySerialized extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache
-
+{
-/**
- * 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 {
-
     /**
      * Store cell data in cache for the current cell object if it's "dirty",
      *     and the 'nullify' the current cell object
      *
-	 * @return	void
+     * @return    void
-     * @throws	PHPExcel_Exception
+     * @throws    PHPExcel_Exception
      */
-	protected function _storeData() {
+    protected function storeData()
-		if ($this->_currentCellIsDirty) {
+    {
-			$this->_currentObject->detach();
+        if ($this->currentCellIsDirty && !empty($this->currentObjectID)) {
-
+            $this->currentObject->detach();
-			$this->_cellCache[$this->_currentObjectID] = serialize($this->_currentObject);
-			$this->_currentCellIsDirty = false;
-		}
-		$this->_currentObjectID = $this->_currentObject = null;
-	}	//	function _storeData()
 
+            $this->cellCache[$this->currentObjectID] = serialize($this->currentObject);
+            $this->currentCellIsDirty = false;
+        }
+        $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    string            $pCoord        Coordinate address of the cell to update
-     * @param	PHPExcel_Cell	$cell		Cell to update
+     * @param    PHPExcel_Cell    $cell        Cell to update
-	 * @return	void
+     * @return    PHPExcel_Cell
-     * @throws	PHPExcel_Exception
+     * @throws    PHPExcel_Exception
      */
-	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
+    public function addCacheData($pCoord, PHPExcel_Cell $cell)
-		if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
+    {
-			$this->_storeData();
+        if (($pCoord !== $this->currentObjectID) && ($this->currentObjectID !== null)) {
-		}
+            $this->storeData();
+        }
 
-		$this->_currentObjectID = $pCoord;
+        $this->currentObjectID = $pCoord;
-		$this->_currentObject = $cell;
+        $this->currentObject = $cell;
-		$this->_currentCellIsDirty = true;
+        $this->currentCellIsDirty = true;
-
-		return $cell;
-	}	//	function addCacheData()
 
+        return $cell;
+    }
 
     /**
      * Get cell at a specific coordinate
      *
-     * @param 	string 			$pCoord		Coordinate of the cell
+     * @param     string             $pCoord        Coordinate of the cell
-     * @throws 	PHPExcel_Exception
+     * @throws     PHPExcel_Exception
-     * @return 	PHPExcel_Cell 	Cell that was found, or null if not found
+     * @return     PHPExcel_Cell     Cell that was found, or null if not found
      */
-	public function getCacheData($pCoord) {
+    public function getCacheData($pCoord)
-		if ($pCoord === $this->_currentObjectID) {
+    {
-			return $this->_currentObject;
+        if ($pCoord === $this->currentObjectID) {
-		}
+            return $this->currentObject;
-		$this->_storeData();
+        }
+        $this->storeData();
 
-		//	Check if the entry that has been requested actually exists
+        //    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 if requested entry doesn't exist in cache
-			return null;
+            return null;
-		}
+        }
 
-		//	Set current entry to the requested entry
+        //    Set current entry to the requested entry
-		$this->_currentObjectID = $pCoord;
+        $this->currentObjectID = $pCoord;
-		$this->_currentObject = unserialize($this->_cellCache[$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 requested entry
-		return $this->_currentObject;
+        return $this->currentObject;
-	}	//	function getCacheData()
+    }
 
+    /**
+     * Get a list of all cell addresses currently held in cache
+     *
+     * @return  string[]
+     */
+    public function getCellList()
+    {
+        if ($this->currentObjectID !== null) {
+            $this->storeData();
+        }
 
-	/**
+        return parent::getCellList();
-	 * Get a list of all cell addresses currently held in cache
+    }
-	 *
-	 * @return  array of string
-	 */
-	public function getCellList() {
-		if ($this->_currentObjectID !== null) {
-			$this->_storeData();
-		}
 
-		return parent::getCellList();
+    /**
-	}
+     * Clear the cell collection and disconnect from our parent
-
+     *
-
+     * @return    void
-	/**
+     */
-	 * Clear the cell collection and disconnect from our parent
+    public function unsetWorksheetCells()
-	 *
+    {
-	 * @return	void
+        if (!is_null($this->currentObject)) {
-	 */
+            $this->currentObject->detach();
-	public function unsetWorksheetCells() {
+            $this->currentObject = $this->currentObjectID = null;
-		if(!is_null($this->_currentObject)) {
+        }
-			$this->_currentObject->detach();
+        $this->cellCache = array();
-			$this->_currentObject = $this->_currentObjectID = null;
-		}
-		$this->_cellCache = array();
-
-		//	detach ourself from the worksheet, so that it can then delete this object successfully
-		$this->_parent = null;
-	}	//	function unsetWorksheetCells()
 
+        //    detach ourself from the worksheet, so that it can then delete this object successfully
+        $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,187 +21,180 @@
  *
  * @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
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
  * @version    ##VERSION##, ##DATE##
  */
+class PHPExcel_CachedObjectStorage_PHPTemp extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache
+{
+    /**
+     * Name of the file for this cache
+     *
+     * @var string
+     */
+    private $fileHandle = null;
 
-
+    /**
-/**
+     * Memory limit to use before reverting to file cache
- * PHPExcel_CachedObjectStorage_PHPTemp
+     *
- *
+     * @var integer
- * @category   PHPExcel
+     */
- * @package    PHPExcel_CachedObjectStorage
+    private $memoryCacheSize = null;
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_CachedObjectStorage_PHPTemp extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache {
-
-	/**
-	 * Name of the file for this cache
-	 *
-	 * @var string
-	 */
-	private $_fileHandle = null;
-
-	/**
-	 * Memory limit to use before reverting to file cache
-	 *
-	 * @var integer
-	 */
-	private $_memoryCacheSize = null;
 
     /**
      * Store cell data in cache for the current cell object if it's "dirty",
      *     and the 'nullify' the current cell object
      *
-	 * @return	void
+     * @return    void
-     * @throws	PHPExcel_Exception
+     * @throws    PHPExcel_Exception
      */
-	protected function _storeData() {
+    protected function storeData()
-		if ($this->_currentCellIsDirty) {
+    {
-			$this->_currentObject->detach();
+        if ($this->currentCellIsDirty && !empty($this->currentObjectID)) {
+            $this->currentObject->detach();
 
-			fseek($this->_fileHandle,0,SEEK_END);
+            fseek($this->fileHandle, 0, SEEK_END);
-			$offset = ftell($this->_fileHandle);
+
-			fwrite($this->_fileHandle, serialize($this->_currentObject));
+            $this->cellCache[$this->currentObjectID] = array(
-			$this->_cellCache[$this->_currentObjectID]	= array('ptr' => $offset,
+                'ptr' => ftell($this->fileHandle),
-																'sz'  => ftell($this->_fileHandle) - $offset
+                '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    string            $pCoord        Coordinate address of the cell to update
-     * @param	PHPExcel_Cell	$cell		Cell to update
+     * @param    PHPExcel_Cell    $cell        Cell to update
-	 * @return	void
+     * @return    PHPExcel_Cell
-     * @throws	PHPExcel_Exception
+     * @throws    PHPExcel_Exception
      */
-	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
+    public function addCacheData($pCoord, PHPExcel_Cell $cell)
-		if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
+    {
-			$this->_storeData();
+        if (($pCoord !== $this->currentObjectID) && ($this->currentObjectID !== null)) {
-		}
+            $this->storeData();
+        }
 
-		$this->_currentObjectID = $pCoord;
+        $this->currentObjectID = $pCoord;
-		$this->_currentObject = $cell;
+        $this->currentObject = $cell;
-		$this->_currentCellIsDirty = true;
+        $this->currentCellIsDirty = true;
 
-		return $cell;
+        return $cell;
-	}	//	function addCacheData()
+    }
 
 
     /**
      * Get cell at a specific coordinate
      *
-     * @param 	string 			$pCoord		Coordinate of the cell
+     * @param     string             $pCoord        Coordinate of the cell
-     * @throws 	PHPExcel_Exception
+     * @throws     PHPExcel_Exception
-     * @return 	PHPExcel_Cell 	Cell that was found, or null if not found
+     * @return     PHPExcel_Cell     Cell that was found, or null if not found
      */
-	public function getCacheData($pCoord) {
+    public function getCacheData($pCoord)
-		if ($pCoord === $this->_currentObjectID) {
+    {
-			return $this->_currentObject;
+        if ($pCoord === $this->currentObjectID) {
-		}
+            return $this->currentObject;
-		$this->_storeData();
+        }
+        $this->storeData();
 
-		//	Check if the entry that has been requested actually exists
+        //    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 if requested entry doesn't exist in cache
-			return null;
+            return null;
-		}
+        }
 
-		//	Set current entry to the requested entry
+        //    Set current entry to the requested entry
-		$this->_currentObjectID = $pCoord;
+        $this->currentObjectID = $pCoord;
-		fseek($this->_fileHandle,$this->_cellCache[$pCoord]['ptr']);
+        fseek($this->fileHandle, $this->cellCache[$pCoord]['ptr']);
-		$this->_currentObject = unserialize(fread($this->_fileHandle,$this->_cellCache[$pCoord]['sz']));
+        $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 requested entry
-		return $this->_currentObject;
+        return $this->currentObject;
-	}	//	function getCacheData()
+    }
 
+    /**
+     * Get a list of all cell addresses currently held in cache
+     *
+     * @return  string[]
+     */
+    public function getCellList()
+    {
+        if ($this->currentObjectID !== null) {
+            $this->storeData();
+        }
 
-	/**
+        return parent::getCellList();
-	 * Get a list of all cell addresses currently held in cache
+    }
-	 *
-	 * @return  array of string
-	 */
-	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)
+    {
+        parent::copyCellCollection($parent);
+        //    Open a new stream for the cell cache data
+        $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));
+        }
+        $this->fileHandle = $newFileHandle;
+    }
 
+    /**
+     * 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;
+        }
+        $this->cellCache = array();
 
-	/**
+        //    detach ourself from the worksheet, so that it can then delete this object successfully
-	 * Clone the cell collection
+        $this->parent = null;
-	 *
-	 * @param	PHPExcel_Worksheet	$parent		The new worksheet
-	 * @return	void
-	 */
-	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+');
-		//	Copy the existing cell cache data to the new stream
-		fseek($this->_fileHandle,0);
-		while (!feof($this->_fileHandle)) {
-			fwrite($newFileHandle,fread($this->_fileHandle, 1024));
-		}
-		$this->_fileHandle = $newFileHandle;
-	}	//	function copyCellCollection()
 
+        //    Close down the php://temp file
+        $this->__destruct();
+    }
 
-	/**
+    /**
-	 * Clear the cell collection and disconnect from our parent
+     * Initialise this new cell collection
-	 *
+     *
-	 * @return	void
+     * @param    PHPExcel_Worksheet    $parent        The worksheet for this cell collection
-	 */
+     * @param    array of mixed        $arguments    Additional initialisation arguments
-	public function unsetWorksheetCells() {
+     */
-		if(!is_null($this->_currentObject)) {
+    public function __construct(PHPExcel_Worksheet $parent, $arguments)
-			$this->_currentObject->detach();
+    {
-			$this->_currentObject = $this->_currentObjectID = null;
+        $this->memoryCacheSize = (isset($arguments['memoryCacheSize'])) ? $arguments['memoryCacheSize'] : '1MB';
-		}
-		$this->_cellCache = array();
 
-		//	detach ourself from the worksheet, so that it can then delete this object successfully
+        parent::__construct($parent);
-		$this->_parent = null;
+        if (is_null($this->fileHandle)) {
-
+            $this->fileHandle = fopen('php://temp/maxmemory:' . $this->memoryCacheSize, 'a+');
-		//	Close down the php://temp file
+        }
-		$this->__destruct();
+    }
-	}	//	function unsetWorksheetCells()
-
-
-	/**
-	 * Initialise this new cell collection
-	 *
-	 * @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';
-
-		parent::__construct($parent);
-		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);
-		}
-		$this->_fileHandle = null;
-	}	//	function __destruct()
 
+    /**
+     * Destroy this cell collection
+     */
+    public function __destruct()
+    {
+        if (!is_null($this->fileHandle)) {
+            fclose($this->fileHandle);
+        }
+        $this->fileHandle = null;
+    }
 }

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,287 +21,287 @@
  *
  * @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
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
  * @version    ##VERSION##, ##DATE##
  */
+class PHPExcel_CachedObjectStorage_SQLite extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache
+{
+    /**
+     * Database table name
+     *
+     * @var string
+     */
+    private $TableName = null;
 
-
+    /**
-/**
+     * Database handle
- * PHPExcel_CachedObjectStorage_SQLite
+     *
- *
+     * @var resource
- * @category   PHPExcel
+     */
- * @package    PHPExcel_CachedObjectStorage
+    private $DBHandle = null;
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_CachedObjectStorage_SQLite extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache {
-
-	/**
-	 * Database table name
-	 *
-	 * @var string
-	 */
-	private $_TableName = null;
-
-	/**
-	 * Database handle
-	 *
-	 * @var resource
-	 */
-	private $_DBHandle = null;
 
     /**
      * Store cell data in cache for the current cell object if it's "dirty",
      *     and the 'nullify' the current cell object
      *
-	 * @return	void
+     * @return    void
-     * @throws	PHPExcel_Exception
+     * @throws    PHPExcel_Exception
      */
-	protected function _storeData() {
+    protected function storeData()
-		if ($this->_currentCellIsDirty) {
+    {
-			$this->_currentObject->detach();
+        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;
-		}
-		$this->_currentObjectID = $this->_currentObject = null;
-	}	//	function _storeData()
 
+            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;
+    }
 
     /**
      * Add or Update a cell in cache identified by coordinate address
      *
-     * @param	string			$pCoord		Coordinate address of the cell to update
+     * @param    string            $pCoord        Coordinate address of the cell to update
-     * @param	PHPExcel_Cell	$cell		Cell to update
+     * @param    PHPExcel_Cell    $cell        Cell to update
-	 * @return	void
+     * @return    PHPExcel_Cell
-     * @throws	PHPExcel_Exception
+     * @throws    PHPExcel_Exception
      */
-	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
+    public function addCacheData($pCoord, PHPExcel_Cell $cell)
-		if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
+    {
-			$this->_storeData();
+        if (($pCoord !== $this->currentObjectID) && ($this->currentObjectID !== null)) {
-		}
+            $this->storeData();
+        }
 
-		$this->_currentObjectID = $pCoord;
+        $this->currentObjectID = $pCoord;
-		$this->_currentObject = $cell;
+        $this->currentObject = $cell;
-		$this->_currentCellIsDirty = true;
+        $this->currentCellIsDirty = true;
-
-		return $cell;
-	}	//	function addCacheData()
 
+        return $cell;
+    }
 
     /**
      * Get cell at a specific coordinate
      *
-     * @param 	string 			$pCoord		Coordinate of the cell
+     * @param     string             $pCoord        Coordinate of the cell
-     * @throws 	PHPExcel_Exception
+     * @throws     PHPExcel_Exception
-     * @return 	PHPExcel_Cell 	Cell that was found, or null if not found
+     * @return     PHPExcel_Cell     Cell that was found, or null if not found
      */
-	public function getCacheData($pCoord) {
+    public function getCacheData($pCoord)
-		if ($pCoord === $this->_currentObjectID) {
+    {
-			return $this->_currentObject;
+        if ($pCoord === $this->currentObjectID) {
-		}
+            return $this->currentObject;
-		$this->_storeData();
+        }
+        $this->storeData();
 
-		$query = "SELECT value FROM kvp_".$this->_TableName." WHERE id='".$pCoord."'";
+        $query = "SELECT value FROM kvp_".$this->TableName." WHERE id='".$pCoord."'";
-		$cellResultSet = $this->_DBHandle->query($query,SQLITE_ASSOC);
+        $cellResultSet = $this->DBHandle->query($query, SQLITE_ASSOC);
-		if ($cellResultSet === false) {
+        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) {
+        } elseif ($cellResultSet->numRows() == 0) {
-			//	Return null if requested entry doesn't exist in cache
+            //    Return null if requested entry doesn't exist in cache
-			return null;
+            return null;
-		}
+        }
 
-		//	Set current entry to the requested entry
+        //    Set current entry to the requested entry
-		$this->_currentObjectID = $pCoord;
+        $this->currentObjectID = $pCoord;
 
-		$cellResult = $cellResultSet->fetchSingle();
+        $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 requested entry
-		return $this->_currentObject;
+        return $this->currentObject;
-	}	//	function getCacheData()
+    }
 
+    /**
+     * Is a value set for an indexed cell?
+     *
+     * @param    string        $pCoord        Coordinate address of the cell to check
+     * @return    boolean
+     */
+    public function isDataSet($pCoord)
+    {
+        if ($pCoord === $this->currentObjectID) {
+            return true;
+        }
 
-	/**
+        //    Check if the requested entry exists in the cache
-	 * Is a value set for an indexed cell?
+        $query = "SELECT id FROM kvp_".$this->TableName." WHERE id='".$pCoord."'";
-	 *
+        $cellResultSet = $this->DBHandle->query($query, SQLITE_ASSOC);
-	 * @param	string		$pCoord		Coordinate address of the cell to check
+        if ($cellResultSet === false) {
-	 * @return	boolean
+            throw new PHPExcel_Exception(sqlite_error_string($this->DBHandle->lastError()));
-	 */
+        } elseif ($cellResultSet->numRows() == 0) {
-	public function isDataSet($pCoord) {
+            //    Return null if requested entry doesn't exist in cache
-		if ($pCoord === $this->_currentObjectID) {
+            return false;
-			return true;
+        }
-		}
+        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);
-		if ($cellResultSet === false) {
-			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
      *
-     * @param	string			$pCoord		Coordinate address of the cell to delete
+     * @param    string            $pCoord        Coordinate address of the cell to delete
-     * @throws	PHPExcel_Exception
+     * @throws    PHPExcel_Exception
      */
-	public function deleteCacheData($pCoord) {
+    public function deleteCacheData($pCoord)
-		if ($pCoord === $this->_currentObjectID) {
+    {
-			$this->_currentObject->detach();
+        if ($pCoord === $this->currentObjectID) {
-			$this->_currentObjectID = $this->_currentObject = null;
+            $this->currentObject->detach();
-		}
+            $this->currentObjectID = $this->currentObject = null;
+        }
 
-		//	Check if the requested entry exists in the cache
+        //    Check if the requested entry exists in the cache
-		$query = "DELETE FROM kvp_".$this->_TableName." WHERE id='".$pCoord."'";
+        $query = "DELETE FROM kvp_".$this->TableName." WHERE id='".$pCoord."'";
-		if (!$this->_DBHandle->queryExec($query))
+        if (!$this->DBHandle->queryExec($query)) {
-			throw new PHPExcel_Exception(sqlite_error_string($this->_DBHandle->lastError()));
+            throw new PHPExcel_Exception(sqlite_error_string($this->DBHandle->lastError()));
+        }
 
-		$this->_currentCellIsDirty = false;
+        $this->currentCellIsDirty = false;
-	}	//	function deleteCacheData()
+    }
 
+    /**
+     * Move a cell object from one address to another
+     *
+     * @param    string        $fromAddress    Current address of the cell to move
+     * @param    string        $toAddress        Destination address of the cell to move
+     * @return    boolean
+     */
+    public function moveCell($fromAddress, $toAddress)
+    {
+        if ($fromAddress === $this->currentObjectID) {
+            $this->currentObjectID = $toAddress;
+        }
 
-	/**
+        $query = "DELETE FROM kvp_".$this->TableName." WHERE id='".$toAddress."'";
-	 * Move a cell object from one address to another
+        $result = $this->DBHandle->exec($query);
-	 *
+        if ($result === false) {
-	 * @param	string		$fromAddress	Current address of the cell to move
+            throw new PHPExcel_Exception($this->DBHandle->lastErrorMsg());
-	 * @param	string		$toAddress		Destination address of the cell to move
+        }
-	 * @return	boolean
-	 */
-	public function moveCell($fromAddress, $toAddress) {
-		if ($fromAddress === $this->_currentObjectID) {
-			$this->_currentObjectID = $toAddress;
-		}
 
-		$query = "DELETE FROM kvp_".$this->_TableName." WHERE id='".$toAddress."'";
+        $query = "UPDATE kvp_".$this->TableName." SET id='".$toAddress."' WHERE id='".$fromAddress."'";
-		$result = $this->_DBHandle->exec($query);
+        $result = $this->DBHandle->exec($query);
-		if ($result === false)
+        if ($result === false) {
-			throw new PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
+            throw new PHPExcel_Exception($this->DBHandle->lastErrorMsg());
+        }
 
-		$query = "UPDATE kvp_".$this->_TableName." SET id='".$toAddress."' WHERE id='".$fromAddress."'";
+        return true;
-		$result = $this->_DBHandle->exec($query);
+    }
-		if ($result === false)
-			throw new PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
 
-		return TRUE;
+    /**
-	}	//	function moveCell()
+     * Get a list of all cell addresses currently held in cache
+     *
+     * @return    string[]
+     */
+    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()));
+        }
 
-	/**
+        $cellKeys = array();
-	 * Get a list of all cell addresses currently held in cache
+        foreach ($cellIdsResult as $row) {
-	 *
+            $cellKeys[] = $row['id'];
-	 * @return	array of string
+        }
-	 */
-	public function getCellList() {
-		if ($this->_currentObjectID !== null) {
-			$this->_storeData();
-		}
 
-		$query = "SELECT id FROM kvp_".$this->_TableName;
+        return $cellKeys;
-		$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) {
+     * Clone the cell collection
-			$cellKeys[] = $row['id'];
+     *
-		}
+     * @param    PHPExcel_Worksheet    $parent        The new worksheet
+     * @return    void
+     */
+    public function copyCellCollection(PHPExcel_Worksheet $parent)
+    {
+        $this->currentCellIsDirty;
+        $this->storeData();
 
-		return $cellKeys;
+        //    Get a new id for the new table name
-	}	//	function getCellList()
+        $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;
+    }
 
-	/**
+    /**
-	 * Clone the cell collection
+     * Clear the cell collection and disconnect from our parent
-	 *
+     *
-	 * @param	PHPExcel_Worksheet	$parent		The new worksheet
+     * @return    void
-	 * @return	void
+     */
-	 */
+    public function unsetWorksheetCells()
-	public function copyCellCollection(PHPExcel_Worksheet $parent) {
+    {
-		$this->_currentCellIsDirty;
+        if (!is_null($this->currentObject)) {
-        $this->_storeData();
+            $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;
 
-		//	Get a new id for the new table name
+        //    Close down the temporary cache file
-		$tableName = str_replace('.','_',$this->_getUniqueID());
+        $this->__destruct();
-		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;
+     * Initialise this new cell collection
-	}	//	function copyCellCollection()
+     *
+     * @param    PHPExcel_Worksheet    $parent        The worksheet for this cell collection
+     */
+    public function __construct(PHPExcel_Worksheet $parent)
+    {
+        parent::__construct($parent);
+        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()));
+            }
+        }
+    }
 
-	/**
+    /**
-	 * Clear the cell collection and disconnect from our parent
+     * Destroy this cell collection
-	 *
+     */
-	 * @return	void
+    public function __destruct()
-	 */
+    {
-	public function unsetWorksheetCells() {
+        if (!is_null($this->DBHandle)) {
-		if(!is_null($this->_currentObject)) {
+            $this->DBHandle->queryExec('DROP TABLE kvp_'.$this->TableName);
-			$this->_currentObject->detach();
+        }
-			$this->_currentObject = $this->_currentObjectID = null;
+        $this->DBHandle = null;
-		}
+    }
-		//	detach ourself from the worksheet, so that it can then delete this object successfully
-		$this->_parent = null;
 
-		//	Close down the temporary cache file
+    /**
-		$this->__destruct();
+     * Identify whether the caching method is currently available
-	}	//	function unsetWorksheetCells()
+     * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
-
+     *
-
+     * @return    boolean
-	/**
+     */
-	 * Initialise this new cell collection
+    public static function cacheMethodIsAvailable()
-	 *
+    {
-	 * @param	PHPExcel_Worksheet	$parent		The worksheet for this cell collection
+        if (!function_exists('sqlite_open')) {
-	 */
+            return false;
-	public function __construct(PHPExcel_Worksheet $parent) {
+        }
-		parent::__construct($parent);
-		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()));
-		}
-	}	//	function __construct()
-
-
-	/**
-	 * Destroy this cell collection
-	 */
-	public function __destruct() {
-		if (!is_null($this->_DBHandle)) {
-			$this->_DBHandle->queryExec('DROP TABLE kvp_'.$this->_TableName);
-		}
-		$this->_DBHandle = null;
-	}	//	function __destruct()
-
-
-	/**
-	 * Identify whether the caching method is currently available
-	 * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
-	 *
-	 * @return	boolean
-	 */
-	public static function cacheMethodIsAvailable() {
-		if (!function_exists('sqlite_open')) {
-			return false;
-		}
-
-		return true;
-	}
 
+        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,326 +21,326 @@
  *
  * @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
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
  * @version    ##VERSION##, ##DATE##
  */
+class PHPExcel_CachedObjectStorage_SQLite3 extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache
+{
+    /**
+     * Database table name
+     *
+     * @var string
+     */
+    private $TableName = null;
 
+    /**
+     * Database handle
+     *
+     * @var resource
+     */
+    private $DBHandle = null;
 
-/**
+    /**
- * PHPExcel_CachedObjectStorage_SQLite3
+     * Prepared statement for a SQLite3 select query
- *
+     *
- * @category   PHPExcel
+     * @var SQLite3Stmt
- * @package    PHPExcel_CachedObjectStorage
+     */
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+    private $selectQuery;
- */
-class PHPExcel_CachedObjectStorage_SQLite3 extends PHPExcel_CachedObjectStorage_CacheBase implements PHPExcel_CachedObjectStorage_ICache {
 
-	/**
+    /**
-	 * Database table name
+     * Prepared statement for a SQLite3 insert query
-	 *
+     *
-	 * @var string
+     * @var SQLite3Stmt
-	 */
+     */
-	private $_TableName = null;
+    private $insertQuery;
 
-	/**
+    /**
-	 * Database handle
+     * Prepared statement for a SQLite3 update query
-	 *
+     *
-	 * @var resource
+     * @var SQLite3Stmt
-	 */
+     */
-	private $_DBHandle = null;
+    private $updateQuery;
 
-	/**
+    /**
-	 * Prepared statement for a SQLite3 select query
+     * Prepared statement for a SQLite3 delete query
-	 *
+     *
-	 * @var SQLite3Stmt
+     * @var SQLite3Stmt
-	 */
+     */
-	private $_selectQuery;
+    private $deleteQuery;
-
-	/**
-	 * Prepared statement for a SQLite3 insert query
-	 *
-	 * @var SQLite3Stmt
-	 */
-	private $_insertQuery;
-
-	/**
-	 * Prepared statement for a SQLite3 update query
-	 *
-	 * @var SQLite3Stmt
-	 */
-	private $_updateQuery;
-
-	/**
-	 * Prepared statement for a SQLite3 delete query
-	 *
-	 * @var SQLite3Stmt
-	 */
-	private $_deleteQuery;
 
     /**
      * Store cell data in cache for the current cell object if it's "dirty",
      *     and the 'nullify' the current cell object
      *
-	 * @return	void
+     * @return    void
-     * @throws	PHPExcel_Exception
+     * @throws    PHPExcel_Exception
      */
-	protected function _storeData() {
+    protected function storeData()
-		if ($this->_currentCellIsDirty) {
+    {
-			$this->_currentObject->detach();
+        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->_currentObjectID = $this->_currentObject = null;
-	}	//	function _storeData()
 
+            $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;
+    }
 
     /**
      * Add or Update a cell in cache identified by coordinate address
      *
-     * @param	string			$pCoord		Coordinate address of the cell to update
+     * @param    string            $pCoord        Coordinate address of the cell to update
-     * @param	PHPExcel_Cell	$cell		Cell to update
+     * @param    PHPExcel_Cell    $cell        Cell to update
-	 * @return	void
+     * @return    PHPExcel_Cell
-     * @throws	PHPExcel_Exception
+     * @throws    PHPExcel_Exception
      */
-	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
+    public function addCacheData($pCoord, PHPExcel_Cell $cell)
-		if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
+    {
-			$this->_storeData();
+        if (($pCoord !== $this->currentObjectID) && ($this->currentObjectID !== null)) {
-		}
+            $this->storeData();
+        }
 
-		$this->_currentObjectID = $pCoord;
+        $this->currentObjectID = $pCoord;
-		$this->_currentObject = $cell;
+        $this->currentObject = $cell;
-		$this->_currentCellIsDirty = true;
+        $this->currentCellIsDirty = true;
-
-		return $cell;
-	}	//	function addCacheData()
 
+        return $cell;
+    }
 
     /**
      * Get cell at a specific coordinate
      *
-     * @param 	string 			$pCoord		Coordinate of the cell
+     * @param     string             $pCoord        Coordinate of the cell
-     * @throws 	PHPExcel_Exception
+     * @throws     PHPExcel_Exception
-     * @return 	PHPExcel_Cell 	Cell that was found, or null if not found
+     * @return     PHPExcel_Cell     Cell that was found, or null if not found
      */
-	public function getCacheData($pCoord) {
+    public function getCacheData($pCoord)
-		if ($pCoord === $this->_currentObjectID) {
+    {
-			return $this->_currentObject;
+        if ($pCoord === $this->currentObjectID) {
-		}
+            return $this->currentObject;
-		$this->_storeData();
+        }
+        $this->storeData();
 
-		$this->_selectQuery->bindValue('id',$pCoord,SQLITE3_TEXT);
+        $this->selectQuery->bindValue('id', $pCoord, SQLITE3_TEXT);
-		$cellResult = $this->_selectQuery->execute();
+        $cellResult = $this->selectQuery->execute();
-		if ($cellResult === FALSE) {
+        if ($cellResult === false) {
-			throw new PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
+            throw new PHPExcel_Exception($this->DBHandle->lastErrorMsg());
-		}
+        }
-		$cellData = $cellResult->fetchArray(SQLITE3_ASSOC);
+        $cellData = $cellResult->fetchArray(SQLITE3_ASSOC);
-		if ($cellData === FALSE) {
+        if ($cellData === false) {
-			//	Return null if requested entry doesn't exist in cache
+            //    Return null if requested entry doesn't exist in cache
-			return NULL;
+            return null;
-		}
+        }
 
-		//	Set current entry to the requested entry
+        //    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()
-
-
-	/**
-	 *	Is a value set for an indexed cell?
-	 *
-	 * @param	string		$pCoord		Coordinate address of the cell to check
-	 * @return	boolean
-	 */
-	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());
-		}
-		$cellData = $cellResult->fetchArray(SQLITE3_ASSOC);
-
-		return ($cellData === FALSE) ? FALSE : TRUE;
-	}	//	function isDataSet()
 
+        //    Return requested entry
+        return $this->currentObject;
+    }
 
     /**
-     *	Delete a cell in cache identified by coordinate address
+     *    Is a value set for an indexed cell?
      *
-     * @param	string			$pCoord		Coordinate address of the cell to delete
+     * @param    string        $pCoord        Coordinate address of the cell to check
-     * @throws	PHPExcel_Exception
+     * @return    boolean
      */
-	public function deleteCacheData($pCoord) {
+    public function isDataSet($pCoord)
-		if ($pCoord === $this->_currentObjectID) {
+    {
-			$this->_currentObject->detach();
+        if ($pCoord === $this->currentObjectID) {
-			$this->_currentObjectID = $this->_currentObject = NULL;
+            return true;
-		}
+        }
 
-		//	Check if the requested entry exists in the cache
+        //    Check if the requested entry exists in the cache
-		$this->_deleteQuery->bindValue('id',$pCoord,SQLITE3_TEXT);
+        $this->selectQuery->bindValue('id', $pCoord, SQLITE3_TEXT);
-		$result = $this->_deleteQuery->execute();
+        $cellResult = $this->selectQuery->execute();
-		if ($result === FALSE)
+        if ($cellResult === false) {
-			throw new PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
+            throw new PHPExcel_Exception($this->DBHandle->lastErrorMsg());
+        }
+        $cellData = $cellResult->fetchArray(SQLITE3_ASSOC);
 
-		$this->_currentCellIsDirty = FALSE;
+        return ($cellData === false) ? false : true;
-	}	//	function deleteCacheData()
+    }
 
+    /**
+     *    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)
+    {
+        if ($pCoord === $this->currentObjectID) {
+            $this->currentObject->detach();
+            $this->currentObjectID = $this->currentObject = null;
+        }
 
-	/**
+        //    Check if the requested entry exists in the cache
-	 * Move a cell object from one address to another
+        $this->deleteQuery->bindValue('id', $pCoord, SQLITE3_TEXT);
-	 *
+        $result = $this->deleteQuery->execute();
-	 * @param	string		$fromAddress	Current address of the cell to move
+        if ($result === false) {
-	 * @param	string		$toAddress		Destination address of the cell to move
+            throw new PHPExcel_Exception($this->DBHandle->lastErrorMsg());
-	 * @return	boolean
+        }
-	 */
-	public function moveCell($fromAddress, $toAddress) {
-		if ($fromAddress === $this->_currentObjectID) {
-			$this->_currentObjectID = $toAddress;
-		}
 
-		$this->_deleteQuery->bindValue('id',$toAddress,SQLITE3_TEXT);
+        $this->currentCellIsDirty = false;
-		$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);
+     * Move a cell object from one address to another
-		$result = $this->_updateQuery->execute();
+     *
-		if ($result === false)
+     * @param    string        $fromAddress    Current address of the cell to move
-			throw new PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
+     * @param    string        $toAddress        Destination address of the cell to move
+     * @return    boolean
+     */
+    public function moveCell($fromAddress, $toAddress)
+    {
+        if ($fromAddress === $this->currentObjectID) {
+            $this->currentObjectID = $toAddress;
+        }
 
-		return TRUE;
+        $this->deleteQuery->bindValue('id', $toAddress, SQLITE3_TEXT);
-	}	//	function moveCell()
+        $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;
-	 * Get a list of all cell addresses currently held in cache
+    }
-	 *
-	 * @return	array of string
-	 */
-	public function getCellList() {
-		if ($this->_currentObjectID !== null) {
-			$this->_storeData();
-		}
 
-		$query = "SELECT id FROM kvp_".$this->_TableName;
+    /**
-		$cellIdsResult = $this->_DBHandle->query($query);
+     * Get a list of all cell addresses currently held in cache
-		if ($cellIdsResult === false)
+     *
-			throw new PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
+     * @return    string[]
+     */
+    public function getCellList()
+    {
+        if ($this->currentObjectID !== null) {
+            $this->storeData();
+        }
 
-		$cellKeys = array();
+        $query = "SELECT id FROM kvp_".$this->TableName;
-		while ($row = $cellIdsResult->fetchArray(SQLITE3_ASSOC)) {
+        $cellIdsResult = $this->DBHandle->query($query);
-			$cellKeys[] = $row['id'];
+        if ($cellIdsResult === false) {
-		}
+            throw new PHPExcel_Exception($this->DBHandle->lastErrorMsg());
+        }
 
-		return $cellKeys;
+        $cellKeys = array();
-	}	//	function getCellList()
+        while ($row = $cellIdsResult->fetchArray(SQLITE3_ASSOC)) {
+            $cellKeys[] = $row['id'];
+        }
 
+        return $cellKeys;
+    }
 
-	/**
+    /**
-	 * Clone the cell collection
+     * Clone the cell collection
-	 *
+     *
-	 * @param	PHPExcel_Worksheet	$parent		The new worksheet
+     * @param    PHPExcel_Worksheet    $parent        The new worksheet
-	 * @return	void
+     * @return    void
-	 */
+     */
-	public function copyCellCollection(PHPExcel_Worksheet $parent) {
+    public function copyCellCollection(PHPExcel_Worksheet $parent)
-		$this->_currentCellIsDirty;
+    {
-        $this->_storeData();
+        $this->currentCellIsDirty;
+        $this->storeData();
 
-		//	Get a new id for the new table name
+        //    Get a new id for the new table name
-		$tableName = str_replace('.','_',$this->_getUniqueID());
+        $tableName = str_replace('.', '_', $this->getUniqueID());
-		if (!$this->_DBHandle->exec('CREATE TABLE kvp_'.$tableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)
+        if (!$this->DBHandle->exec('CREATE TABLE kvp_'.$tableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)
-		                                       AS SELECT * FROM kvp_'.$this->_TableName))
+            AS SELECT * FROM kvp_'.$this->TableName)
-			throw new PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
+        ) {
+            throw new PHPExcel_Exception($this->DBHandle->lastErrorMsg());
+        }
 
-		//	Copy the existing cell cache file
+        //    Copy the existing cell cache file
-		$this->_TableName = $tableName;
+        $this->TableName = $tableName;
-	}	//	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;
+        }
+        //    detach ourself from the worksheet, so that it can then delete this object successfully
+        $this->parent = null;
 
-	/**
+        //    Close down the temporary cache file
-	 * Clear the cell collection and disconnect from our parent
+        $this->__destruct();
-	 *
+    }
-	 * @return	void
-	 */
-	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;
 
-		//	Close down the temporary cache file
+    /**
-		$this->__destruct();
+     * Initialise this new cell collection
-	}	//	function unsetWorksheetCells()
+     *
+     * @param    PHPExcel_Worksheet    $parent        The worksheet for this cell collection
+     */
+    public function __construct(PHPExcel_Worksheet $parent)
+    {
+        parent::__construct($parent);
+        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->selectQuery = $this->DBHandle->prepare("SELECT value FROM kvp_".$this->TableName." WHERE id = :id");
-	 * Initialise this new cell collection
+        $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");
-	 * @param	PHPExcel_Worksheet	$parent		The worksheet for this cell collection
+        $this->deleteQuery = $this->DBHandle->prepare("DELETE FROM kvp_".$this->TableName." WHERE id = :id");
-	 */
+    }
-	public function __construct(PHPExcel_Worksheet $parent) {
-		parent::__construct($parent);
-		if (is_null($this->_DBHandle)) {
-			$this->_TableName = str_replace('.','_',$this->_getUniqueID());
-			$_DBName = ':memory:';
 
-			$this->_DBHandle = new SQLite3($_DBName);
+    /**
-			if ($this->_DBHandle === false)
+     * Destroy this cell collection
-				throw new PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
+     */
-			if (!$this->_DBHandle->exec('CREATE TABLE kvp_'.$this->_TableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)'))
+    public function __destruct()
-				throw new PHPExcel_Exception($this->_DBHandle->lastErrorMsg());
+    {
-		}
+        if (!is_null($this->DBHandle)) {
+            $this->DBHandle->exec('DROP TABLE kvp_'.$this->TableName);
+            $this->DBHandle->close();
+        }
+        $this->DBHandle = null;
+    }
 
-		$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)");
+     * Identify whether the caching method is currently available
-		$this->_updateQuery = $this->_DBHandle->prepare("UPDATE kvp_".$this->_TableName." SET id=:toId WHERE id=:fromId");
+     * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
-		$this->_deleteQuery = $this->_DBHandle->prepare("DELETE FROM kvp_".$this->_TableName." WHERE id = :id");
+     *
-	}	//	function __construct()
+     * @return    boolean
-
+     */
-
+    public static function cacheMethodIsAvailable()
-	/**
+    {
-	 * Destroy this cell collection
+        if (!class_exists('SQLite3', false)) {
-	 */
+            return false;
-	public function __destruct() {
+        }
-		if (!is_null($this->_DBHandle)) {
-			$this->_DBHandle->exec('DROP TABLE kvp_'.$this->_TableName);
-			$this->_DBHandle->close();
-		}
-		$this->_DBHandle = null;
-	}	//	function __destruct()
-
-
-	/**
-	 * Identify whether the caching method is currently available
-	 * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
-	 *
-	 * @return	boolean
-	 */
-	public static function cacheMethodIsAvailable() {
-		if (!class_exists('SQLite3',FALSE)) {
-			return false;
-		}
-
-		return true;
-	}
 
+        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
@@ -19,276 +20,270 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  * @category   PHPExcel
- * @package	PHPExcel_CachedObjectStorage
+ * @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
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
- * @version	##VERSION##, ##DATE##
+ * @version    ##VERSION##, ##DATE##
  */
+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;
 
-
+    /**
-/**
+     * Cache timeout
- * PHPExcel_CachedObjectStorage_Wincache
+     *
- *
+     * @var integer
- * @category   PHPExcel
+     */
- * @package	PHPExcel_CachedObjectStorage
+    private $cacheTime = 600;
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-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;
-
-	/**
-	 * Cache timeout
-	 *
-	 * @var integer
-	 */
-	private $_cacheTime = 600;
 
 
     /**
      * Store cell data in cache for the current cell object if it's "dirty",
      *     and the 'nullify' the current cell object
      *
-	 * @return	void
+     * @return    void
-     * @throws	PHPExcel_Exception
+     * @throws    PHPExcel_Exception
      */
-	protected function _storeData() {
+    protected function storeData()
-		if ($this->_currentCellIsDirty) {
+    {
-			$this->_currentObject->detach();
+        if ($this->currentCellIsDirty && !empty($this->currentObjectID)) {
+            $this->currentObject->detach();
 
-			$obj = serialize($this->_currentObject);
+            $obj = serialize($this->currentObject);
-			if (wincache_ucache_exists($this->_cachePrefix.$this->_currentObjectID.'.cache')) {
+            if (wincache_ucache_exists($this->cachePrefix.$this->currentObjectID.'.cache')) {
-				if (!wincache_ucache_set($this->_cachePrefix.$this->_currentObjectID.'.cache', $obj, $this->_cacheTime)) {
+                if (!wincache_ucache_set($this->cachePrefix.$this->currentObjectID.'.cache', $obj, $this->cacheTime)) {
-					$this->__destruct();
+                    $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 {
+            } 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();
+                    $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;
+        $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    PHPExcel_Cell
+     * @throws    PHPExcel_Exception
+     */
+    public function addCacheData($pCoord, PHPExcel_Cell $cell)
+    {
+        if (($pCoord !== $this->currentObjectID) && ($this->currentObjectID !== null)) {
+            $this->storeData();
+        }
+        $this->cellCache[$pCoord] = true;
+
+        $this->currentObjectID = $pCoord;
+        $this->currentObject = $cell;
+        $this->currentCellIsDirty = true;
+
+        return $cell;
+    }
+
+    /**
+     * 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    boolean
+     */
+    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) {
+                return true;
+            }
+            //    Check if the requested entry still exists in 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);
+                throw new PHPExcel_Exception('Cell entry '.$pCoord.' no longer exists in WinCache');
+            }
+            return true;
+        }
+        return false;
+    }
 
 
-	/**
+    /**
-	 * Add or Update a cell in cache identified by coordinate address
+     * Get cell at a specific coordinate
-	 *
+     *
-	 * @param	string			$pCoord		Coordinate address of the cell to update
+     * @param    string            $pCoord        Coordinate of the cell
-	 * @param	PHPExcel_Cell	$cell		Cell to update
+     * @throws    PHPExcel_Exception
-	 * @return	void
+     * @return    PHPExcel_Cell    Cell that was found, or null if not found
-	 * @throws	PHPExcel_Exception
+     */
-	 */
+    public function getCacheData($pCoord)
-	public function addCacheData($pCoord, PHPExcel_Cell $cell) {
+    {
-		if (($pCoord !== $this->_currentObjectID) && ($this->_currentObjectID !== null)) {
+        if ($pCoord === $this->currentObjectID) {
-			$this->_storeData();
+            return $this->currentObject;
-		}
+        }
-		$this->_cellCache[$pCoord] = true;
+        $this->storeData();
 
-		$this->_currentObjectID = $pCoord;
+        //    Check if the entry that has been requested actually exists
-		$this->_currentObject = $cell;
+        $obj = null;
-		$this->_currentCellIsDirty = true;
+        if (parent::isDataSet($pCoord)) {
+            $success = false;
+            $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);
+                throw new PHPExcel_Exception('Cell entry '.$pCoord.' no longer exists in WinCache');
+            }
+        } else {
+            //    Return null if requested entry doesn't exist in cache
+            return null;
+        }
 
-		return $cell;
+        //    Set current entry to the requested entry
-	}	//	function addCacheData()
+        $this->currentObjectID = $pCoord;
-
+        $this->currentObject = unserialize($obj);
-
-	/**
-	 * 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	boolean
-	 */
-	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) {
-				return true;
-			}
-			//	Check if the requested entry still exists in 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);
-				throw new PHPExcel_Exception('Cell entry '.$pCoord.' no longer exists in WinCache');
-			}
-			return true;
-		}
-		return false;
-	}	//	function isDataSet()
-
-
-	/**
-	 * Get cell at a specific coordinate
-	 *
-	 * @param	string			$pCoord		Coordinate of the cell
-	 * @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;
-		}
-		$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);
-			if ($success === false) {
-				//	Entry no longer exists in WinCache, so clear it from the cache array
-				parent::deleteCacheData($pCoord);
-				throw new PHPExcel_Exception('Cell entry '.$pCoord.' no longer exists in WinCache');
-			}
-		} else {
-			//	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($obj);
         //    Re-attach this as the cell's parent
-        $this->_currentObject->attach($this);
+        $this->currentObject->attach($this);
 
-		//	Return requested entry
+        //    Return requested entry
-		return $this->_currentObject;
+        return $this->currentObject;
-	}	//	function getCacheData()
+    }
 
 
-	/**
+    /**
-	 * Get a list of all cell addresses currently held in cache
+     * Get a list of all cell addresses currently held in cache
-	 *
+     *
-	 * @return  array of string
+     * @return  string[]
-	 */
+     */
-	public function getCellList() {
+    public function getCellList()
-		if ($this->_currentObjectID !== null) {
+    {
-			$this->_storeData();
+        if ($this->currentObjectID !== null) {
-		}
+            $this->storeData();
+        }
 
-		return parent::getCellList();
+        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)
+    {
+        //    Delete the entry from Wincache
+        wincache_ucache_delete($this->cachePrefix.$pCoord.'.cache');
+
+        //    Delete the entry from our cell address array
+        parent::deleteCacheData($pCoord);
+    }
+
+    /**
+     * Clone the cell collection
+     *
+     * @param    PHPExcel_Worksheet    $parent        The new worksheet
+     * @return    void
+     */
+    public function copyCellCollection(PHPExcel_Worksheet $parent)
+    {
+        parent::copyCellCollection($parent);
+        //    Get a new id for the new file name
+        $baseUnique = $this->getUniqueID();
+        $newCachePrefix = substr(md5($baseUnique), 0, 8) . '.';
+        $cacheList = $this->getCellList();
+        foreach ($cacheList as $cellID) {
+            if ($cellID != $this->currentObjectID) {
+                $success = false;
+                $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)) {
+                    $this->__destruct();
+                    throw new PHPExcel_Exception('Failed to store cell '.$cellID.' in Wincache');
+                }
+            }
+        }
+        $this->cachePrefix = $newCachePrefix;
+    }
 
 
-	/**
+    /**
-	 * Delete a cell in cache identified by coordinate address
+     * Clear the cell collection and disconnect from our parent
-	 *
+     *
-	 * @param	string			$pCoord		Coordinate address of the cell to delete
+     * @return    void
-	 * @throws	PHPExcel_Exception
+     */
-	 */
+    public function unsetWorksheetCells()
-	public function deleteCacheData($pCoord) {
+    {
-		//	Delete the entry from Wincache
+        if (!is_null($this->currentObject)) {
-		wincache_ucache_delete($this->_cachePrefix.$pCoord.'.cache');
+            $this->currentObject->detach();
+            $this->currentObject = $this->currentObjectID = null;
+        }
 
-		//	Delete the entry from our cell address array
+        //    Flush the WinCache cache
-		parent::deleteCacheData($pCoord);
+        $this->__destruct();
-	}	//	function deleteCacheData()
 
+        $this->cellCache = array();
 
-	/**
+        //    detach ourself from the worksheet, so that it can then delete this object successfully
-	 * Clone the cell collection
+        $this->parent = null;
-	 *
+    }
-	 * @param	PHPExcel_Worksheet	$parent		The new worksheet
-	 * @return	void
-	 */
-	public function copyCellCollection(PHPExcel_Worksheet $parent) {
-		parent::copyCellCollection($parent);
-		//	Get a new id for the new file name
-		$baseUnique = $this->_getUniqueID();
-		$newCachePrefix = substr(md5($baseUnique),0,8).'.';
-		$cacheList = $this->getCellList();
-		foreach($cacheList as $cellID) {
-			if ($cellID != $this->_currentObjectID) {
-				$success = false;
-				$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)) {
-					$this->__destruct();
-					throw new PHPExcel_Exception('Failed to store cell '.$cellID.' in Wincache');
-				}
-			}
-		}
-		$this->_cachePrefix = $newCachePrefix;
-	}	//	function copyCellCollection()
 
+    /**
+     * Initialise this new cell collection
+     *
+     * @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)
+    {
+        $cacheTime    = (isset($arguments['cacheTime']))    ? $arguments['cacheTime']    : 600;
 
-	/**
+        if (is_null($this->cachePrefix)) {
-	 * Clear the cell collection and disconnect from our parent
+            $baseUnique = $this->getUniqueID();
-	 *
+            $this->cachePrefix = substr(md5($baseUnique), 0, 8).'.';
-	 * @return	void
+            $this->cacheTime = $cacheTime;
-	 */
-	public function unsetWorksheetCells() {
-		if(!is_null($this->_currentObject)) {
-			$this->_currentObject->detach();
-			$this->_currentObject = $this->_currentObjectID = null;
-		}
 
-		//	Flush the WinCache cache
+            parent::__construct($parent);
-		$this->__destruct();
+        }
+    }
 
-		$this->_cellCache = array();
+    /**
+     * Destroy this cell collection
+     */
+    public function __destruct()
+    {
+        $cacheList = $this->getCellList();
+        foreach ($cacheList as $cellID) {
+            wincache_ucache_delete($this->cachePrefix.$cellID.'.cache');
+        }
+    }
 
-		//	detach ourself from the worksheet, so that it can then delete this object successfully
+    /**
-		$this->_parent = null;
+     * Identify whether the caching method is currently available
-	}	//	function unsetWorksheetCells()
+     * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
-
+     *
-
+     * @return    boolean
-	/**
+     */
-	 * Initialise this new cell collection
+    public static function cacheMethodIsAvailable()
-	 *
+    {
-	 * @param	PHPExcel_Worksheet	$parent		The worksheet for this cell collection
+        if (!function_exists('wincache_ucache_add')) {
-	 * @param	array of mixed		$arguments	Additional initialisation arguments
+            return false;
-	 */
+        }
-	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;
-
-			parent::__construct($parent);
-		}
-	}	//	function __construct()
-
-
-	/**
-	 * Destroy this cell collection
-	 */
-	public function __destruct() {
-		$cacheList = $this->getCellList();
-		foreach($cacheList as $cellID) {
-			wincache_ucache_delete($this->_cachePrefix.$cellID.'.cache');
-		}
-	}	//	function __destruct()
-
-
-	/**
-	 * Identify whether the caching method is currently available
-	 * Some methods are dependent on the availability of certain extensions being enabled in the PHP build
-	 *
-	 * @return	boolean
-	 */
-	public static function cacheMethodIsAvailable() {
-		if (!function_exists('wincache_ucache_add')) {
-			return false;
-		}
-
-		return true;
-	}
 
+        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;
+        return self::$cacheStorageMethod;
-    }   //    function getCacheStorageMethod()
+    }
-
 
     /**
      * Return the current cache storage class
      *
-     * @return PHPExcel_CachedObjectStorage_ICache|NULL
+     * @return PHPExcel_CachedObjectStorage_ICache|null
      **/
     public static function getCacheStorageClass()
     {
-        return self::$_cacheStorageClass;
+        return self::$cacheStorageClass;
-    }   //    function getCacheStorageClass()
+    }
-
 
     /**
      * Return the list of all possible cache storage methods
@@ -154,9 +138,8 @@ class PHPExcel_CachedObjectStorageFactory
      **/
     public static function getAllCacheStorageMethods()
     {
-        return self::$_storageMethods;
+        return self::$storageMethods;
-    }   //    function getCacheStorageMethods()
+    }
-
 
     /**
      * 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)) {
+        if (!in_array($method, self::$storageMethods)) {
-            return FALSE;
+            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) {
+        foreach ($arguments as $k => $v) {
-            if (array_key_exists($k, self::$_storageMethodParameters[$method])) {
+            if (array_key_exists($k, self::$storageMethodParameters[$method])) {
-                self::$_storageMethodParameters[$method][$k] = $v;
+                self::$storageMethodParameters[$method][$k] = $v;
             }
         }
 
-        if (self::$_cacheStorageMethod === NULL) {
+        if (self::$cacheStorageMethod === null) {
-            self::$_cacheStorageClass = 'PHPExcel_CachedObjectStorage_' . $method;
+            self::$cacheStorageClass = 'PHPExcel_CachedObjectStorage_' . $method;
-            self::$_cacheStorageMethod = $method;
+            self::$cacheStorageMethod = $method;
         }
-        return TRUE;
+        return true;
-    }   //    function initialize()
+    }
-
 
     /**
      * Initialise the cache storage
@@ -219,33 +200,32 @@ class PHPExcel_CachedObjectStorageFactory
      **/
     public static function getInstance(PHPExcel_Worksheet $parent)
     {
-        $cacheMethodIsAvailable = TRUE;
+        $cacheMethodIsAvailable = true;
-        if (self::$_cacheStorageMethod === NULL) {
+        if (self::$cacheStorageMethod === null) {
             $cacheMethodIsAvailable = self::initialize();
         }
 
         if ($cacheMethodIsAvailable) {
-            $instance = new self::$_cacheStorageClass( $parent,
+            $instance = new self::$cacheStorageClass(
-                                                       self::$_storageMethodParameters[self::$_cacheStorageMethod]
+                $parent,
-                                                     );
+                self::$storageMethodParameters[self::$cacheStorageMethod]
-            if ($instance !== NULL) {
+            );
+            if ($instance !== null) {
                 return $instance;
             }
         }
 
-        return FALSE;
+        return false;
-    }   //    function getInstance()
+    }
-
 
     /**
      * Clear the cache storage
      *
      **/
-	public static function finalize()
+    public static function finalize()
-	{
+    {
-		self::$_cacheStorageMethod = NULL;
+        self::$cacheStorageMethod = null;
-		self::$_cacheStorageClass = NULL;
+        self::$cacheStorageClass = null;
-		self::$_storageMethodParameters = array();
+        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,79 +21,74 @@
  *
  * @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
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
- * @version	##VERSION##, ##DATE##
+ * @version    ##VERSION##, ##DATE##
  */
+class PHPExcel_CalcEngine_CyclicReferenceStack
+{
+    /**
+     *  The call stack for calculated cells
+     *
+     *  @var mixed[]
+     */
+    private $stack = array();
 
+    /**
+     * Return the number of entries on the stack
+     *
+     * @return  integer
+     */
+    public function count()
+    {
+        return count($this->stack);
+    }
 
-/**
+    /**
- * PHPExcel_CalcEngine_CyclicReferenceStack
+     * Push a new entry onto the stack
- *
+     *
- * @category	PHPExcel_CalcEngine_CyclicReferenceStack
+     * @param  mixed  $value
- * @package		PHPExcel_Calculation
+     */
- * @copyright	Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+    public function push($value)
- */
+    {
-class PHPExcel_CalcEngine_CyclicReferenceStack {
+        $this->stack[$value] = $value;
+    }
 
-	/**
+    /**
-	 *  The call stack for calculated cells
+     * Pop the last entry from the stack
-	 *
+     *
-	 *  @var mixed[]
+     * @return  mixed
-	 */
+     */
-	private $_stack = array();
+    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 isset($this->stack[$value]);
+    }
 
-	/**
+    /**
-	 * Return the number of entries on the stack
+     * Clear the stack
-	 *
+     */
-	 * @return  integer
+    public function clear()
-	 */
+    {
-	public function count() {
+        $this->stack = array();
-		return count($this->_stack);
+    }
-	}
 
-	/**
+    /**
-	 * Push a new entry onto the stack
+     * Return an array of all entries on the stack
-	 *
+     *
-	 * @param  mixed  $value
+     * @return  mixed[]
-	 */
+     */
-	public function push($value) {
+    public function showStack()
-		$this->_stack[] = $value;
+    {
-	}	//	function push()
+        return $this->stack;
-
+    }
-	/**
+}
-	 * Pop the last entry from the stack
-	 *
-	 * @return  mixed
-	 */
-	public function pop() {
-		return array_pop($this->_stack);
-	}	//	function pop()
-
-	/**
-	 * 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);
-	}
-
-	/**
-	 * Clear the stack
-	 */
-	public function clear() {
-		$this->_stack = array();
-	}	//	function push()
-
-	/**
-	 * Return an array of all entries on the stack
-	 *
-	 * @return  mixed[]
-	 */
-	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,134 +21,131 @@
  *
  * @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
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
- * @version	##VERSION##, ##DATE##
+ * @version    ##VERSION##, ##DATE##
  */
+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
+     *        If false, then a debug log will not be generated
+     *
+     * @var boolean
+     */
+    private $writeDebugLog = false;
 
-/**
+    /**
- * PHPExcel_CalcEngine_Logger
+     * Flag to determine whether a debug log should be echoed by the calculation engine
- *
+     *        If true, then a debug log will be echoed
- * @category	PHPExcel
+     *        If false, then a debug log will not be echoed
- * @package		PHPExcel_Calculation
+     * A debug log can only be echoed if it is generated
- * @copyright	Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+     *
- */
+     * @var boolean
-class PHPExcel_CalcEngine_Logger {
+     */
+    private $echoDebugLog = false;
 
-	/**
+    /**
-	 * Flag to determine whether a debug log should be generated by the calculation engine
+     * The debug log generated by the calculation engine
-	 *		If true, then a debug log will be generated
+     *
-	 *		If false, then a debug log will not be generated
+     * @var string[]
-	 *
+     */
-	 * @var boolean
+    private $debugLog = array();
-	 */
-	private $_writeDebugLog = FALSE;
 
-	/**
+    /**
-	 * Flag to determine whether a debug log should be echoed by the calculation engine
+     * The calculation engine cell reference stack
-	 *		If true, then a debug log will be echoed
+     *
-	 *		If false, then a debug log will not be echoed
+     * @var PHPExcel_CalcEngine_CyclicReferenceStack
-	 * A debug log can only be echoed if it is generated
+     */
-	 *
+    private $cellStack;
-	 * @var boolean
-	 */
-	private $_echoDebugLog = FALSE;
 
-	/**
+    /**
-	 * The debug log generated by the calculation engine
+     * Instantiate a Calculation engine logger
-	 *
+     *
-	 * @var string[]
+     * @param  PHPExcel_CalcEngine_CyclicReferenceStack $stack
-	 */
+     */
-	private $_debugLog = array();
+    public function __construct(PHPExcel_CalcEngine_CyclicReferenceStack $stack)
+    {
+        $this->cellStack = $stack;
+    }
 
-	/**
+    /**
-	 * The calculation engine cell reference stack
+     * Enable/Disable Calculation engine logging
-	 *
+     *
-	 * @var PHPExcel_CalcEngine_CyclicReferenceStack
+     * @param  boolean $pValue
-	 */
+     */
-	private $_cellStack;
+    public function setWriteDebugLog($pValue = false)
+    {
+        $this->writeDebugLog = $pValue;
+    }
 
+    /**
+     * Return whether calculation engine logging is enabled or disabled
+     *
+     * @return  boolean
+     */
+    public function getWriteDebugLog()
+    {
+        return $this->writeDebugLog;
+    }
 
-	/**
+    /**
-	 * Instantiate a Calculation engine logger
+     * Enable/Disable echoing of debug log information
-	 *
+     *
-	 * @param  PHPExcel_CalcEngine_CyclicReferenceStack $stack
+     * @param  boolean $pValue
-	 */
+     */
-	public function __construct(PHPExcel_CalcEngine_CyclicReferenceStack $stack) {
+    public function setEchoDebugLog($pValue = false)
-		$this->_cellStack = $stack;
+    {
-	}
+        $this->echoDebugLog = $pValue;
+    }
 
-	/**
+    /**
-	 * Enable/Disable Calculation engine logging
+     * Return whether echoing of debug log information is enabled or disabled
-	 *
+     *
-	 * @param  boolean $pValue
+     * @return  boolean
-	 */
+     */
-	public function setWriteDebugLog($pValue = FALSE) {
+    public function getEchoDebugLog()
-		$this->_writeDebugLog = $pValue;
+    {
-	}
+        return $this->echoDebugLog;
+    }
 
-	/**
+    /**
-	 * Return whether calculation engine logging is enabled or disabled
+     * Write an entry to the calculation engine debug log
-	 *
+     */
-	 * @return  boolean
+    public function writeDebugLog()
-	 */
+    {
-	public function getWriteDebugLog() {
+        //    Only write the debug log if logging is enabled
-		return $this->_writeDebugLog;
+        if ($this->writeDebugLog) {
-	}
+            $message = implode(func_get_args());
+            $cellReference = implode(' -> ', $this->cellStack->showStack());
+            if ($this->echoDebugLog) {
+                echo $cellReference,
+                    ($this->cellStack->count() > 0 ? ' => ' : ''),
+                    $message,
+                    PHP_EOL;
+            }
+            $this->debugLog[] = $cellReference .
+                ($this->cellStack->count() > 0 ? ' => ' : '') .
+                $message;
+        }
+    }
 
-	/**
+    /**
-	 * Enable/Disable echoing of debug log information
+     * Clear the calculation engine debug log
-	 *
+     */
-	 * @param  boolean $pValue
+    public function clearLog()
-	 */
+    {
-	public function setEchoDebugLog($pValue = FALSE) {
+        $this->debugLog = array();
-		$this->_echoDebugLog = $pValue;
+    }
-	}
-
-	/**
-	 * Return whether echoing of debug log information is enabled or disabled
-	 *
-	 * @return  boolean
-	 */
-	public function getEchoDebugLog() {
-		return $this->_echoDebugLog;
-	}
-
-	/**
-	 * Write an entry to the calculation engine debug log
-	 */
-	public function writeDebugLog() {
-		//	Only write the debug log if logging is enabled
-		if ($this->_writeDebugLog) {
-			$message = implode(func_get_args());
-			$cellReference = implode(' -> ', $this->_cellStack->showStack());
-			if ($this->_echoDebugLog) {
-				echo $cellReference, 
-					($this->_cellStack->count() > 0 ? ' => ' : ''), 
-					$message, 
-					PHP_EOL;
-			}
-			$this->_debugLog[] = $cellReference . 
-				($this->_cellStack->count() > 0 ? ' => ' : '') . 
-				$message;
-		}
-	}	//	function _writeDebug()
-
-	/**
-	 * Clear the calculation engine debug log
-	 */
-	public function clearLog() {
-		$this->_debugLog = array();
-	}	//	function flushLogger()
-
-	/**
-	 * Return the calculation engine debug log
-	 *
-	 * @return  string[]
-	 */
-	public function getLog() {
-		return $this->_debugLog;
-	}	//	function flushLogger()
-
-}	//	class PHPExcel_CalcEngine_Logger
 
+    /**
+     * Return the calculation engine debug log
+     *
+     * @return  string[]
+     */
+    public function getLog()
+    {
+        return $this->debugLog;
+    }
+}

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,33 +21,26 @@
  *
  * @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
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
- * @version	##VERSION##, ##DATE##
+ * @version    ##VERSION##, ##DATE##
  */
-
+class PHPExcel_Calculation_Exception extends PHPExcel_Exception
-
+{
-/**
+    /**
- * PHPExcel_Calculation_Exception
+     * Error handler callback
- *
+     *
- * @category   PHPExcel
+     * @param mixed $code
- * @package    PHPExcel_Calculation
+     * @param mixed $string
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+     * @param mixed $file
- */
+     * @param mixed $line
-class PHPExcel_Calculation_Exception extends PHPExcel_Exception {
+     * @param mixed $context
-	/**
+     */
-	 * Error handler callback
+    public static function errorHandlerCallback($code, $string, $file, $line, $context)
-	 *
+    {
-	 * @param mixed $code
+        $e = new self($string, $code);
-	 * @param mixed $string
+        $e->line = $line;
-	 * @param mixed $file
+        $e->file = $file;
-	 * @param mixed $line
+        throw $e;
-	 * @param mixed $context
+    }
-	 */
-	public static function errorHandlerCallback($code, $string, $file, $line, $context) {
-		$e = new self($string, $code);
-		$e->line = $line;
-		$e->file = $file;
-		throw $e;
-	}
 }

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
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
- * @version	##VERSION##, ##DATE##
+ * @version    ##VERSION##, ##DATE##
  */
+class PHPExcel_Calculation_ExceptionHandler
+{
+    /**
+     * Register errorhandler
+     */
+    public function __construct()
+    {
+        set_error_handler(array('PHPExcel_Calculation_Exception', 'errorHandlerCallback'), E_ALL);
+    }
 
-/**
+    /**
- * PHPExcel_Calculation_ExceptionHandler
+     * Unregister errorhandler
- *
+     */
- * @category   PHPExcel
+    public function __destruct()
- * @package    PHPExcel_Calculation
+    {
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+        restore_error_handler();
- */
+    }
-class PHPExcel_Calculation_ExceptionHandler {
-	/**
-	 * Register errorhandler
-	 */
-	public function __construct() {
-		set_error_handler(array('PHPExcel_Calculation_Exception', 'errorHandlerCallback'), E_ALL);
-	}
-
-	/**
-	 * Unregister errorhandler
-	 */
-	public function __destruct() {
-		restore_error_handler();
-	}
 }

Classes/PHPExcel/Calculation/FormulaToken.php

@@ -1,8 +1,32 @@
 <?php
+
+/*
+PARTLY BASED ON:
+    Copyright (c) 2007 E. W. Bachtal, Inc.
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+    and associated documentation files (the "Software"), to deal in the Software without restriction,
+    including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
+    subject to the following conditions:
+
+      The above copyright notice and this permission notice shall be included in all copies or substantial
+      portions of the Software.
+
+    The software is provided "as is", without warranty of any kind, express or implied, including but not
+    limited to the warranties of merchantability, fitness for a particular purpose and noninfringement. In
+    no event shall the authors or copyright holders be liable for any claim, damages or other liability,
+    whether in an action of contract, tort or otherwise, arising from, out of or in connection with the
+    software or the use or other dealings in the software.
+
+    http://ewbi.blogs.com/develops/2007/03/excel_formula_p.html
+    http://ewbi.blogs.com/develops/2004/12/excel_formula_p.html
+*/
+
 /**
- * PHPExcel
+ * PHPExcel_Calculation_FormulaToken
  *
- * 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,104 +44,74 @@
  *
  * @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
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
  * @version    ##VERSION##, ##DATE##
  */
 
 
-/*
+class PHPExcel_Calculation_FormulaToken
-PARTLY BASED ON:
+{
-	Copyright (c) 2007 E. W. Bachtal, Inc.
+    /* Token types */
+    const TOKEN_TYPE_NOOP            = 'Noop';
+    const TOKEN_TYPE_OPERAND         = 'Operand';
+    const TOKEN_TYPE_FUNCTION        = 'Function';
+    const TOKEN_TYPE_SUBEXPRESSION   = 'Subexpression';
+    const TOKEN_TYPE_ARGUMENT        = 'Argument';
+    const TOKEN_TYPE_OPERATORPREFIX  = 'OperatorPrefix';
+    const TOKEN_TYPE_OPERATORINFIX   = 'OperatorInfix';
+    const TOKEN_TYPE_OPERATORPOSTFIX = 'OperatorPostfix';
+    const TOKEN_TYPE_WHITESPACE      = 'Whitespace';
+    const TOKEN_TYPE_UNKNOWN         = 'Unknown';
 
-	Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+    /* Token subtypes */
-	and associated documentation files (the "Software"), to deal in the Software without restriction,
+    const TOKEN_SUBTYPE_NOTHING       = 'Nothing';
-	including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    const TOKEN_SUBTYPE_START         = 'Start';
-	and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
+    const TOKEN_SUBTYPE_STOP          = 'Stop';
-	subject to the following conditions:
+    const TOKEN_SUBTYPE_TEXT          = 'Text';
+    const TOKEN_SUBTYPE_NUMBER        = 'Number';
+    const TOKEN_SUBTYPE_LOGICAL       = 'Logical';
+    const TOKEN_SUBTYPE_ERROR         = 'Error';
+    const TOKEN_SUBTYPE_RANGE         = 'Range';
+    const TOKEN_SUBTYPE_MATH          = 'Math';
+    const TOKEN_SUBTYPE_CONCATENATION = 'Concatenation';
+    const TOKEN_SUBTYPE_INTERSECTION  = 'Intersection';
+    const TOKEN_SUBTYPE_UNION         = 'Union';
 
-	  The above copyright notice and this permission notice shall be included in all copies or substantial
+    /**
-	  portions of the Software.
+     * Value
+     *
+     * @var string
+     */
+    private $value;
 
-	The software is provided "as is", without warranty of any kind, express or implied, including but not
+    /**
-	limited to the warranties of merchantability, fitness for a particular purpose and noninfringement. In
+     * Token Type (represented by TOKEN_TYPE_*)
-	no event shall the authors or copyright holders be liable for any claim, damages or other liability,
+     *
-	whether in an action of contract, tort or otherwise, arising from, out of or in connection with the
+     * @var string
-	software or the use or other dealings in the software.
+     */
+    private $tokenType;
 
-	http://ewbi.blogs.com/develops/2007/03/excel_formula_p.html
+    /**
-	http://ewbi.blogs.com/develops/2004/12/excel_formula_p.html
+     * Token SubType (represented by TOKEN_SUBTYPE_*)
-*/
+     *
-
+     * @var string
-
+     */
-/**
+    private $tokenSubType;
- * PHPExcel_Calculation_FormulaToken
- *
- * @category   PHPExcel
- * @package    PHPExcel_Calculation
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Calculation_FormulaToken {
-	/* Token types */
-	const TOKEN_TYPE_NOOP					= 'Noop';
-	const TOKEN_TYPE_OPERAND				= 'Operand';
-	const TOKEN_TYPE_FUNCTION				= 'Function';
-	const TOKEN_TYPE_SUBEXPRESSION			= 'Subexpression';
-	const TOKEN_TYPE_ARGUMENT				= 'Argument';
-	const TOKEN_TYPE_OPERATORPREFIX			= 'OperatorPrefix';
-	const TOKEN_TYPE_OPERATORINFIX			= 'OperatorInfix';
-	const TOKEN_TYPE_OPERATORPOSTFIX		= 'OperatorPostfix';
-	const TOKEN_TYPE_WHITESPACE				= 'Whitespace';
-	const TOKEN_TYPE_UNKNOWN				= 'Unknown';
-
-	/* Token subtypes */
-	const TOKEN_SUBTYPE_NOTHING				= 'Nothing';
-	const TOKEN_SUBTYPE_START				= 'Start';
-	const TOKEN_SUBTYPE_STOP				= 'Stop';
-	const TOKEN_SUBTYPE_TEXT				= 'Text';
-	const TOKEN_SUBTYPE_NUMBER				= 'Number';
-	const TOKEN_SUBTYPE_LOGICAL				= 'Logical';
-	const TOKEN_SUBTYPE_ERROR				= 'Error';
-	const TOKEN_SUBTYPE_RANGE				= 'Range';
-	const TOKEN_SUBTYPE_MATH				= 'Math';
-	const TOKEN_SUBTYPE_CONCATENATION		= 'Concatenation';
-	const TOKEN_SUBTYPE_INTERSECTION		= 'Intersection';
-	const TOKEN_SUBTYPE_UNION				= 'Union';
-
-	/**
-	 * Value
-	 *
-	 * @var string
-	 */
-	private $_value;
-
-	/**
-	 * Token Type (represented by TOKEN_TYPE_*)
-	 *
-	 * @var string
-	 */
-	private $_tokenType;
-
-	/**
-	 * Token SubType (represented by TOKEN_SUBTYPE_*)
-	 *
-	 * @var string
-	 */
-	private $_tokenSubType;
 
     /**
      * Create a new PHPExcel_Calculation_FormulaToken
      *
-     * @param string	$pValue
+     * @param string    $pValue
-     * @param string	$pTokenType 	Token type (represented by TOKEN_TYPE_*)
+     * @param string    $pTokenType     Token type (represented by TOKEN_TYPE_*)
-     * @param string	$pTokenSubType 	Token Subtype (represented by TOKEN_SUBTYPE_*)
+     * @param string    $pTokenSubType     Token Subtype (represented by TOKEN_SUBTYPE_*)
      */
     public function __construct($pValue, $pTokenType = PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_UNKNOWN, $pTokenSubType = PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_NOTHING)
     {
-    	// Initialise values
+        // Initialise values
-    	$this->_value				= $pValue;
+        $this->value       = $pValue;
-    	$this->_tokenType			= $pTokenType;
+        $this->tokenType    = $pTokenType;
-    	$this->_tokenSubType 		= $pTokenSubType;
+        $this->tokenSubType = $pTokenSubType;
     }
 
     /**
@@ -125,17 +119,19 @@ class PHPExcel_Calculation_FormulaToken {
      *
      * @return string
      */
-    public function getValue() {
+    public function getValue()
-    	return $this->_value;
+    {
+        return $this->value;
     }
 
     /**
      * Set Value
      *
-     * @param string	$value
+     * @param string    $value
      */
-    public function setValue($value) {
+    public function setValue($value)
-    	$this->_value = $value;
+    {
+        $this->value = $value;
     }
 
     /**
@@ -143,17 +139,19 @@ class PHPExcel_Calculation_FormulaToken {
      *
      * @return string
      */
-    public function getTokenType() {
+    public function getTokenType()
-    	return $this->_tokenType;
+    {
+        return $this->tokenType;
     }
 
     /**
      * Set Token Type
      *
-     * @param string	$value
+     * @param string    $value
      */
-    public function setTokenType($value = PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_UNKNOWN) {
+    public function setTokenType($value = PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_UNKNOWN)
-    	$this->_tokenType = $value;
+    {
+        $this->tokenType = $value;
     }
 
     /**
@@ -161,16 +159,18 @@ class PHPExcel_Calculation_FormulaToken {
      *
      * @return string
      */
-    public function getTokenSubType() {
+    public function getTokenSubType()
-    	return $this->_tokenSubType;
+    {
+        return $this->tokenSubType;
     }
 
     /**
      * Set Token SubType
      *
-     * @param string	$value
+     * @param string    $value
      */
-    public function setTokenSubType($value = PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_NOTHING) {
+    public function setTokenSubType($value = PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_NOTHING)
-    	$this->_tokenSubType = $value;
+    {
+        $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,72 +21,64 @@
  *
  * @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
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
  * @version    ##VERSION##, ##DATE##
  */
+class PHPExcel_Calculation_Function
+{
+    /* Function categories */
+    const CATEGORY_CUBE                 = 'Cube';
+    const CATEGORY_DATABASE             = 'Database';
+    const CATEGORY_DATE_AND_TIME        = 'Date and Time';
+    const CATEGORY_ENGINEERING          = 'Engineering';
+    const CATEGORY_FINANCIAL            = 'Financial';
+    const CATEGORY_INFORMATION          = 'Information';
+    const CATEGORY_LOGICAL              = 'Logical';
+    const CATEGORY_LOOKUP_AND_REFERENCE = 'Lookup and Reference';
+    const CATEGORY_MATH_AND_TRIG        = 'Math and Trig';
+    const CATEGORY_STATISTICAL          = 'Statistical';
+    const CATEGORY_TEXT_AND_DATA        = 'Text and Data';
 
+    /**
+     * Category (represented by CATEGORY_*)
+     *
+     * @var string
+     */
+    private $category;
 
-/**
+    /**
- * PHPExcel_Calculation_Function
+     * Excel name
- *
+     *
- * @category   PHPExcel
+     * @var string
- * @package    PHPExcel_Calculation
+     */
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+    private $excelName;
- */
-class PHPExcel_Calculation_Function {
-	/* Function categories */
-	const CATEGORY_CUBE						= 'Cube';
-	const CATEGORY_DATABASE					= 'Database';
-	const CATEGORY_DATE_AND_TIME			= 'Date and Time';
-	const CATEGORY_ENGINEERING				= 'Engineering';
-	const CATEGORY_FINANCIAL				= 'Financial';
-	const CATEGORY_INFORMATION				= 'Information';
-	const CATEGORY_LOGICAL					= 'Logical';
-	const CATEGORY_LOOKUP_AND_REFERENCE		= 'Lookup and Reference';
-	const CATEGORY_MATH_AND_TRIG			= 'Math and Trig';
-	const CATEGORY_STATISTICAL				= 'Statistical';
-	const CATEGORY_TEXT_AND_DATA			= 'Text and Data';
 
-	/**
+    /**
-	 * Category (represented by CATEGORY_*)
+     * PHPExcel name
-	 *
+     *
-	 * @var string
+     * @var string
-	 */
+     */
-	private $_category;
+    private $phpExcelName;
-
-	/**
-	 * Excel name
-	 *
-	 * @var string
-	 */
-	private $_excelName;
-
-	/**
-	 * PHPExcel name
-	 *
-	 * @var string
-	 */
-	private $_phpExcelName;
 
     /**
      * Create a new PHPExcel_Calculation_Function
      *
-     * @param 	string		$pCategory 		Category (represented by CATEGORY_*)
+     * @param     string        $pCategory         Category (represented by CATEGORY_*)
-     * @param 	string		$pExcelName		Excel function name
+     * @param     string        $pExcelName        Excel function name
-     * @param 	string		$pPHPExcelName	PHPExcel function mapping
+     * @param     string        $pPHPExcelName    PHPExcel function mapping
-     * @throws 	PHPExcel_Calculation_Exception
+     * @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
+            // Initialise values
-    		$this->_category 		= $pCategory;
+            $this->category     = $pCategory;
-    		$this->_excelName 		= $pExcelName;
+            $this->excelName    = $pExcelName;
-    		$this->_phpExcelName 	= $pPHPExcelName;
+            $this->phpExcelName = $pPHPExcelName;
-    	} else {
+        } else {
-    		throw new PHPExcel_Calculation_Exception("Invalid parameters passed.");
+            throw new PHPExcel_Calculation_Exception("Invalid parameters passed.");
-    	}
+        }
     }
 
     /**
@@ -93,22 +86,24 @@ class PHPExcel_Calculation_Function {
      *
      * @return string
      */
-    public function getCategory() {
+    public function getCategory()
-    	return $this->_category;
+    {
+        return $this->category;
     }
 
     /**
      * Set Category (represented by CATEGORY_*)
      *
-     * @param 	string		$value
+     * @param     string        $value
-     * @throws 	PHPExcel_Calculation_Exception
+     * @throws     PHPExcel_Calculation_Exception
      */
-    public function setCategory($value = null) {
+    public function setCategory($value = null)
-    	if (!is_null($value)) {
+    {
-    		$this->_category = $value;
+        if (!is_null($value)) {
-    	} else {
+            $this->category = $value;
-    		throw new PHPExcel_Calculation_Exception("Invalid parameter passed.");
+        } else {
-    	}
+            throw new PHPExcel_Calculation_Exception("Invalid parameter passed.");
+        }
     }
 
     /**
@@ -116,17 +111,19 @@ class PHPExcel_Calculation_Function {
      *
      * @return string
      */
-    public function getExcelName() {
+    public function getExcelName()
-    	return $this->_excelName;
+    {
+        return $this->excelName;
     }
 
     /**
      * Set Excel name
      *
-     * @param string	$value
+     * @param string    $value
      */
-    public function setExcelName($value) {
+    public function setExcelName($value)
-    	$this->_excelName = $value;
+    {
+        $this->excelName = $value;
     }
 
     /**
@@ -134,16 +131,18 @@ class PHPExcel_Calculation_Function {
      *
      * @return string
      */
-    public function getPHPExcelName() {
+    public function getPHPExcelName()
-    	return $this->_phpExcelName;
+    {
+        return $this->phpExcelName;
     }
 
     /**
      * Set PHPExcel name
      *
-     * @param string	$value
+     * @param string    $value
      */
-    public function setPHPExcelName($value) {
+    public function setPHPExcelName($value)
-    	$this->_phpExcelName = $value;
+    {
+        $this->phpExcelName = $value;
     }
 }

Classes/PHPExcel/Calculation/Logical.php

@@ -1,8 +1,18 @@
 <?php
+
+/** PHPExcel root directory */
+if (!defined('PHPEXCEL_ROOT')) {
+    /**
+     * @ignore
+     */
+    define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
+    require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+}
+
 /**
- * PHPExcel
+ * 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
@@ -18,271 +28,258 @@
  * 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
+ * @category    PHPExcel
- * @package		PHPExcel_Calculation
+ * @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
+ * @license        http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
- * @version		##VERSION##, ##DATE##
+ * @version        ##VERSION##, ##DATE##
  */
+class PHPExcel_Calculation_Logical
+{
+    /**
+     * TRUE
+     *
+     * Returns the boolean TRUE.
+     *
+     * Excel Function:
+     *        =TRUE()
+     *
+     * @access    public
+     * @category Logical Functions
+     * @return    boolean        True
+     */
+    public static function TRUE()
+    {
+        return true;
+    }
 
 
-/** PHPExcel root directory */
+    /**
-if (!defined('PHPEXCEL_ROOT')) {
+     * FALSE
-	/**
+     *
-	 * @ignore
+     * Returns the boolean FALSE.
-	 */
+     *
-	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
+     * Excel Function:
-	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+     *        =FALSE()
+     *
+     * @access    public
+     * @category Logical Functions
+     * @return    boolean        False
+     */
+    public static function FALSE()
+    {
+        return false;
+    }
+
+
+    /**
+     * LOGICAL_AND
+     *
+     * Returns boolean TRUE if all its arguments are TRUE; returns FALSE if one or more argument is FALSE.
+     *
+     * Excel Function:
+     *        =AND(logical1[,logical2[, ...]])
+     *
+     *        The arguments must evaluate to logical values such as TRUE or FALSE, or the arguments must be arrays
+     *            or references that contain logical values.
+     *
+     *        Boolean arguments are treated as True or False as appropriate
+     *        Integer or floating point arguments are treated as True, except for 0 or 0.0 which are False
+     *        If any argument value is a string, or a Null, the function returns a #VALUE! error, unless the string holds
+     *            the value TRUE or FALSE, in which case it is evaluated as the corresponding boolean value
+     *
+     * @access    public
+     * @category Logical Functions
+     * @param    mixed        $arg,...        Data values
+     * @return    boolean        The logical AND of the arguments.
+     */
+    public static function LOGICAL_AND()
+    {
+        // Return value
+        $returnValue = true;
+
+        // Loop through the arguments
+        $aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
+        $argCount = -1;
+        foreach ($aArgs as $argCount => $arg) {
+            // Is it a boolean value?
+            if (is_bool($arg)) {
+                $returnValue = $returnValue && $arg;
+            } elseif ((is_numeric($arg)) && (!is_string($arg))) {
+                $returnValue = $returnValue && ($arg != 0);
+            } elseif (is_string($arg)) {
+                $arg = strtoupper($arg);
+                if (($arg == 'TRUE') || ($arg == PHPExcel_Calculation::getTRUE())) {
+                    $arg = true;
+                } elseif (($arg == 'FALSE') || ($arg == PHPExcel_Calculation::getFALSE())) {
+                    $arg = false;
+                } else {
+                    return PHPExcel_Calculation_Functions::VALUE();
+                }
+                $returnValue = $returnValue && ($arg != 0);
+            }
+        }
+
+        // Return
+        if ($argCount < 0) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+        return $returnValue;
+    }
+
+
+    /**
+     * LOGICAL_OR
+     *
+     * Returns boolean TRUE if any argument is TRUE; returns FALSE if all arguments are FALSE.
+     *
+     * Excel Function:
+     *        =OR(logical1[,logical2[, ...]])
+     *
+     *        The arguments must evaluate to logical values such as TRUE or FALSE, or the arguments must be arrays
+     *            or references that contain logical values.
+     *
+     *        Boolean arguments are treated as True or False as appropriate
+     *        Integer or floating point arguments are treated as True, except for 0 or 0.0 which are False
+     *        If any argument value is a string, or a Null, the function returns a #VALUE! error, unless the string holds
+     *            the value TRUE or FALSE, in which case it is evaluated as the corresponding boolean value
+     *
+     * @access    public
+     * @category Logical Functions
+     * @param    mixed        $arg,...        Data values
+     * @return    boolean        The logical OR of the arguments.
+     */
+    public static function LOGICAL_OR()
+    {
+        // Return value
+        $returnValue = false;
+
+        // Loop through the arguments
+        $aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
+        $argCount = -1;
+        foreach ($aArgs as $argCount => $arg) {
+            // Is it a boolean value?
+            if (is_bool($arg)) {
+                $returnValue = $returnValue || $arg;
+            } elseif ((is_numeric($arg)) && (!is_string($arg))) {
+                $returnValue = $returnValue || ($arg != 0);
+            } elseif (is_string($arg)) {
+                $arg = strtoupper($arg);
+                if (($arg == 'TRUE') || ($arg == PHPExcel_Calculation::getTRUE())) {
+                    $arg = true;
+                } elseif (($arg == 'FALSE') || ($arg == PHPExcel_Calculation::getFALSE())) {
+                    $arg = false;
+                } else {
+                    return PHPExcel_Calculation_Functions::VALUE();
+                }
+                $returnValue = $returnValue || ($arg != 0);
+            }
+        }
+
+        // Return
+        if ($argCount < 0) {
+            return PHPExcel_Calculation_Functions::VALUE();
+        }
+        return $returnValue;
+    }
+
+
+    /**
+     * NOT
+     *
+     * Returns the boolean inverse of the argument.
+     *
+     * Excel Function:
+     *        =NOT(logical)
+     *
+     *        The argument must evaluate to a logical value such as TRUE or FALSE
+     *
+     *        Boolean arguments are treated as True or False as appropriate
+     *        Integer or floating point arguments are treated as True, except for 0 or 0.0 which are False
+     *        If any argument value is a string, or a Null, the function returns a #VALUE! error, unless the string holds
+     *            the value TRUE or FALSE, in which case it is evaluated as the corresponding boolean value
+     *
+     * @access    public
+     * @category Logical Functions
+     * @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)
+    {
+        $logical = PHPExcel_Calculation_Functions::flattenSingleValue($logical);
+        if (is_string($logical)) {
+            $logical = strtoupper($logical);
+            if (($logical == 'TRUE') || ($logical == PHPExcel_Calculation::getTRUE())) {
+                return false;
+            } elseif (($logical == 'FALSE') || ($logical == PHPExcel_Calculation::getFALSE())) {
+                return true;
+            } else {
+                return PHPExcel_Calculation_Functions::VALUE();
+            }
+        }
+
+        return !$logical;
+    }
+
+    /**
+     * STATEMENT_IF
+     *
+     * Returns one value if a condition you specify evaluates to TRUE and another value if it evaluates to FALSE.
+     *
+     * Excel Function:
+     *        =IF(condition[,returnIfTrue[,returnIfFalse]])
+     *
+     *        Condition is any value or expression that can be evaluated to TRUE or FALSE.
+     *            For example, A10=100 is a logical expression; if the value in cell A10 is equal to 100,
+     *            the expression evaluates to TRUE. Otherwise, the expression evaluates to FALSE.
+     *            This argument can use any comparison calculation operator.
+     *        ReturnIfTrue is the value that is returned if condition evaluates to TRUE.
+     *            For example, if this argument is the text string "Within budget" and the condition argument evaluates to TRUE,
+     *            then the IF function returns the text "Within budget"
+     *            If condition is TRUE and ReturnIfTrue is blank, this argument returns 0 (zero). To display the word TRUE, use
+     *            the logical value TRUE for this argument.
+     *            ReturnIfTrue can be another formula.
+     *        ReturnIfFalse is the value that is returned if condition evaluates to FALSE.
+     *            For example, if this argument is the text string "Over budget" and the condition argument evaluates to FALSE,
+     *            then the IF function returns the text "Over budget".
+     *            If condition is FALSE and ReturnIfFalse is omitted, then the logical value FALSE is returned.
+     *            If condition is FALSE and ReturnIfFalse is blank, then the value 0 (zero) is returned.
+     *            ReturnIfFalse can be another formula.
+     *
+     * @access    public
+     * @category Logical Functions
+     * @param    mixed    $condition        Condition to evaluate
+     * @param    mixed    $returnIfTrue    Value to return when condition is true
+     * @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);
+        $returnIfTrue  = (is_null($returnIfTrue))  ? 0 :     PHPExcel_Calculation_Functions::flattenSingleValue($returnIfTrue);
+        $returnIfFalse = (is_null($returnIfFalse)) ? false : PHPExcel_Calculation_Functions::flattenSingleValue($returnIfFalse);
+
+        return ($condition) ? $returnIfTrue : $returnIfFalse;
+    }
+
+
+    /**
+     * IFERROR
+     *
+     * Excel Function:
+     *        =IFERROR(testValue,errorpart)
+     *
+     * @access    public
+     * @category Logical Functions
+     * @param    mixed    $testValue    Value to check, is also the value returned when no error
+     * @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 = '')
+    {
+        $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);
+    }
 }
-
-
-/**
- * PHPExcel_Calculation_Logical
- *
- * @category	PHPExcel
- * @package		PHPExcel_Calculation
- * @copyright	Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
- */
-class PHPExcel_Calculation_Logical {
-
-	/**
-	 * TRUE
-	 *
-	 * Returns the boolean TRUE.
-	 *
-	 * Excel Function:
-	 *		=TRUE()
-	 *
-	 * @access	public
-	 * @category Logical Functions
-	 * @return	boolean		True
-	 */
-	public static function TRUE() {
-		return TRUE;
-	}	//	function TRUE()
-
-
-	/**
-	 * FALSE
-	 *
-	 * Returns the boolean FALSE.
-	 *
-	 * Excel Function:
-	 *		=FALSE()
-	 *
-	 * @access	public
-	 * @category Logical Functions
-	 * @return	boolean		False
-	 */
-	public static function FALSE() {
-		return FALSE;
-	}	//	function FALSE()
-
-
-	/**
-	 * LOGICAL_AND
-	 *
-	 * Returns boolean TRUE if all its arguments are TRUE; returns FALSE if one or more argument is FALSE.
-	 *
-	 * Excel Function:
-	 *		=AND(logical1[,logical2[, ...]])
-	 *
-	 *		The arguments must evaluate to logical values such as TRUE or FALSE, or the arguments must be arrays
-	 *			or references that contain logical values.
-	 *
-	 *		Boolean arguments are treated as True or False as appropriate
-	 *		Integer or floating point arguments are treated as True, except for 0 or 0.0 which are False
-	 *		If any argument value is a string, or a Null, the function returns a #VALUE! error, unless the string holds
-	 *			the value TRUE or FALSE, in which case it is evaluated as the corresponding boolean value
-	 *
-	 * @access	public
-	 * @category Logical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	boolean		The logical AND of the arguments.
-	 */
-	public static function LOGICAL_AND() {
-		// Return value
-		$returnValue = TRUE;
-
-		// Loop through the arguments
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
-		$argCount = -1;
-		foreach ($aArgs as $argCount => $arg) {
-			// Is it a boolean value?
-			if (is_bool($arg)) {
-				$returnValue = $returnValue && $arg;
-			} elseif ((is_numeric($arg)) && (!is_string($arg))) {
-				$returnValue = $returnValue && ($arg != 0);
-			} elseif (is_string($arg)) {
-				$arg = strtoupper($arg);
-				if (($arg == 'TRUE') || ($arg == PHPExcel_Calculation::getTRUE())) {
-					$arg = TRUE;
-				} elseif (($arg == 'FALSE') || ($arg == PHPExcel_Calculation::getFALSE())) {
-					$arg = FALSE;
-				} else {
-					return PHPExcel_Calculation_Functions::VALUE();
-				}
-				$returnValue = $returnValue && ($arg != 0);
-			}
-		}
-
-		// Return
-		if ($argCount < 0) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		return $returnValue;
-	}	//	function LOGICAL_AND()
-
-
-	/**
-	 * LOGICAL_OR
-	 *
-	 * Returns boolean TRUE if any argument is TRUE; returns FALSE if all arguments are FALSE.
-	 *
-	 * Excel Function:
-	 *		=OR(logical1[,logical2[, ...]])
-	 *
-	 *		The arguments must evaluate to logical values such as TRUE or FALSE, or the arguments must be arrays
-	 *			or references that contain logical values.
-	 *
-	 *		Boolean arguments are treated as True or False as appropriate
-	 *		Integer or floating point arguments are treated as True, except for 0 or 0.0 which are False
-	 *		If any argument value is a string, or a Null, the function returns a #VALUE! error, unless the string holds
-	 *			the value TRUE or FALSE, in which case it is evaluated as the corresponding boolean value
-	 *
-	 * @access	public
-	 * @category Logical Functions
-	 * @param	mixed		$arg,...		Data values
-	 * @return	boolean		The logical OR of the arguments.
-	 */
-	public static function LOGICAL_OR() {
-		// Return value
-		$returnValue = FALSE;
-
-		// Loop through the arguments
-		$aArgs = PHPExcel_Calculation_Functions::flattenArray(func_get_args());
-		$argCount = -1;
-		foreach ($aArgs as $argCount => $arg) {
-			// Is it a boolean value?
-			if (is_bool($arg)) {
-				$returnValue = $returnValue || $arg;
-			} elseif ((is_numeric($arg)) && (!is_string($arg))) {
-				$returnValue = $returnValue || ($arg != 0);
-			} elseif (is_string($arg)) {
-				$arg = strtoupper($arg);
-				if (($arg == 'TRUE') || ($arg == PHPExcel_Calculation::getTRUE())) {
-					$arg = TRUE;
-				} elseif (($arg == 'FALSE') || ($arg == PHPExcel_Calculation::getFALSE())) {
-					$arg = FALSE;
-				} else {
-					return PHPExcel_Calculation_Functions::VALUE();
-				}
-				$returnValue = $returnValue || ($arg != 0);
-			}
-		}
-
-		// Return
-		if ($argCount < 0) {
-			return PHPExcel_Calculation_Functions::VALUE();
-		}
-		return $returnValue;
-	}	//	function LOGICAL_OR()
-
-
-	/**
-	 * NOT
-	 *
-	 * Returns the boolean inverse of the argument.
-	 *
-	 * Excel Function:
-	 *		=NOT(logical)
-	 *
-	 *		The argument must evaluate to a logical value such as TRUE or FALSE
-	 *
-	 *		Boolean arguments are treated as True or False as appropriate
-	 *		Integer or floating point arguments are treated as True, except for 0 or 0.0 which are False
-	 *		If any argument value is a string, or a Null, the function returns a #VALUE! error, unless the string holds
-	 *			the value TRUE or FALSE, in which case it is evaluated as the corresponding boolean value
-	 *
-	 * @access	public
-	 * @category Logical Functions
-	 * @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) {
-		$logical = PHPExcel_Calculation_Functions::flattenSingleValue($logical);
-		if (is_string($logical)) {
-			$logical = strtoupper($logical);
-			if (($logical == 'TRUE') || ($logical == PHPExcel_Calculation::getTRUE())) {
-				return FALSE;
-			} elseif (($logical == 'FALSE') || ($logical == PHPExcel_Calculation::getFALSE())) {
-				return TRUE;
-			} else {
-				return PHPExcel_Calculation_Functions::VALUE();
-			}
-		}
-
-		return !$logical;
-	}	//	function NOT()
-
-	/**
-	 * STATEMENT_IF
-	 *
-	 * Returns one value if a condition you specify evaluates to TRUE and another value if it evaluates to FALSE.
-	 *
-	 * Excel Function:
-	 *		=IF(condition[,returnIfTrue[,returnIfFalse]])
-	 *
-	 *		Condition is any value or expression that can be evaluated to TRUE or FALSE.
-	 *			For example, A10=100 is a logical expression; if the value in cell A10 is equal to 100,
-	 *			the expression evaluates to TRUE. Otherwise, the expression evaluates to FALSE.
-	 *			This argument can use any comparison calculation operator.
-	 *		ReturnIfTrue is the value that is returned if condition evaluates to TRUE.
-	 *			For example, if this argument is the text string "Within budget" and the condition argument evaluates to TRUE,
-	 *			then the IF function returns the text "Within budget"
-	 *			If condition is TRUE and ReturnIfTrue is blank, this argument returns 0 (zero). To display the word TRUE, use
-	 *			the logical value TRUE for this argument.
-	 *			ReturnIfTrue can be another formula.
-	 *		ReturnIfFalse is the value that is returned if condition evaluates to FALSE.
-	 *			For example, if this argument is the text string "Over budget" and the condition argument evaluates to FALSE,
-	 *			then the IF function returns the text "Over budget".
-	 *			If condition is FALSE and ReturnIfFalse is omitted, then the logical value FALSE is returned.
-	 *			If condition is FALSE and ReturnIfFalse is blank, then the value 0 (zero) is returned.
-	 *			ReturnIfFalse can be another formula.
-	 *
-	 * @access	public
-	 * @category Logical Functions
-	 * @param	mixed	$condition		Condition to evaluate
-	 * @param	mixed	$returnIfTrue	Value to return when condition is true
-	 * @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);
-		$returnIfTrue	= (is_null($returnIfTrue))	? 0 :		PHPExcel_Calculation_Functions::flattenSingleValue($returnIfTrue);
-		$returnIfFalse	= (is_null($returnIfFalse))	? FALSE :	PHPExcel_Calculation_Functions::flattenSingleValue($returnIfFalse);
-
-		return ($condition) ? $returnIfTrue : $returnIfFalse;
-	}	//	function STATEMENT_IF()
-
-
-	/**
-	 * IFERROR
-	 *
-	 * Excel Function:
-	 *		=IFERROR(testValue,errorpart)
-	 *
-	 * @access	public
-	 * @category Logical Functions
-	 * @param	mixed	$testValue	Value to check, is also the value returned when no error
-	 * @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 = '') {
-		$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/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,96 +21,91 @@
  *
  * @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
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
- * @version	##VERSION##, ##DATE##
+ * @version    ##VERSION##, ##DATE##
  */
+class PHPExcel_Calculation_Token_Stack
+{
+    /**
+     *  The parser stack for formulae
+     *
+     *  @var mixed[]
+     */
+    private $stack = array();
 
+    /**
+     *  Count of entries in the parser stack
+     *
+     *  @var integer
+     */
+    private $count = 0;
 
-/**
+    /**
- * PHPExcel_Calculation_Token_Stack
+     * Return the number of entries on the stack
- *
+     *
- * @category	PHPExcel_Calculation_Token_Stack
+     * @return  integer
- * @package		PHPExcel_Calculation
+     */
- * @copyright	Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+    public function count()
- */
+    {
-class PHPExcel_Calculation_Token_Stack {
+        return $this->count;
+    }
 
-	/**
+    /**
-	 *  The parser stack for formulae
+     * Push a new entry onto the stack
-	 *
+     *
-	 *  @var mixed[]
+     * @param  mixed  $type
-	 */
+     * @param  mixed  $value
-	private $_stack = array();
+     * @param  mixed  $reference
+     */
+    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);
+            if ($localeFunction != $value) {
+                $this->stack[($this->count - 1)]['localeValue'] = $localeFunction;
+            }
+        }
+    }
 
-	/**
+    /**
-	 *  Count of entries in the parser stack
+     * Pop the last entry from the stack
-	 *
+     *
-	 *  @var integer
+     * @return  mixed
-	 */
+     */
-	private $_count = 0;
+    public function pop()
+    {
+        if ($this->count > 0) {
+            return $this->stack[--$this->count];
+        }
+        return null;
+    }
 
+    /**
+     * Return an entry from the stack without removing it
+     *
+     * @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;
+        }
+        return $this->stack[$this->count - $n];
+    }
 
-	/**
+    /**
-	 * Return the number of entries on the stack
+     * Clear the stack
-	 *
+     */
-	 * @return  integer
+    public function clear()
-	 */
+    {
-	public function count() {
+        $this->stack = array();
-		return $this->_count;
+        $this->count = 0;
-	}	//	function count()
+    }
-
+}
-	/**
-	 * Push a new entry onto the stack
-	 *
-	 * @param  mixed  $type
-	 * @param  mixed  $value
-	 * @param  mixed  $reference
-	 */
-	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);
-			if ($localeFunction != $value) {
-				$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];
-		}
-		return NULL;
-	}	//	function pop()
-
-	/**
-	 * Return an entry from the stack without removing it
-	 *
-	 * @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;
-		}
-		return $this->_stack[$this->_count - $n];
-	}	//	function last()
-
-	/**
-	 * Clear the stack
-	 */
-	function clear() {
-		$this->_stack = array();
-		$this->_count = 0;
-	}
-
-}	//	class PHPExcel_Calculation_Token_Stack

Classes/PHPExcel/Cell/AdvancedValueBinder.php

@@ -1,8 +1,18 @@
 <?php
+
+/** PHPExcel root directory */
+if (!defined('PHPEXCEL_ROOT')) {
+    /**
+     * @ignore
+     */
+    define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
+    require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+}
+
 /**
- * PHPExcel
+ * 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,37 +57,41 @@ 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()) {
+            } elseif ($value == PHPExcel_Calculation::getFALSE()) {
-                $cell->setValueExplicit( FALSE, PHPExcel_Cell_DataType::TYPE_BOOL);
+                $cell->setValueExplicit(false, PHPExcel_Cell_DataType::TYPE_BOOL);
                 return true;
             }
 
             // Check for number in scientific format
             if (preg_match('/^'.PHPExcel_Calculation::CALCULATION_REGEXP_NUMBER.'$/', $value)) {
-                $cell->setValueExplicit( (float) $value, PHPExcel_Cell_DataType::TYPE_NUMERIC);
+                $cell->setValueExplicit((float) $value, PHPExcel_Cell_DataType::TYPE_NUMERIC);
                 return true;
             }
 
             // 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] == '-') {
-                $cell->setValueExplicit( (float) $value, PHPExcel_Cell_DataType::TYPE_NUMERIC);
+                    $value = 0 - $value;
+                }
+                $cell->setValueExplicit((float) $value, PHPExcel_Cell_DataType::TYPE_NUMERIC);
                 // Set style
-                $cell->getWorksheet()->getStyle( $cell->getCoordinate() )
+                $cell->getWorksheet()->getStyle($cell->getCoordinate())
-                    ->getNumberFormat()->setFormatCode( '??/??' );
+                    ->getNumberFormat()->setFormatCode('??/??');
                 return true;
             } 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] == '-') {
-                $cell->setValueExplicit( (float) $value, PHPExcel_Cell_DataType::TYPE_NUMERIC);
+                    $value = 0 - $value;
+                }
+                $cell->setValueExplicit((float) $value, PHPExcel_Cell_DataType::TYPE_NUMERIC);
                 // Set style
-                $cell->getWorksheet()->getStyle( $cell->getCoordinate() )
+                $cell->getWorksheet()->getStyle($cell->getCoordinate())
-                    ->getNumberFormat()->setFormatCode( '# ??/??' );
+                    ->getNumberFormat()->setFormatCode('# ??/??');
                 return true;
             }
 
@@ -104,10 +99,10 @@ class PHPExcel_Cell_AdvancedValueBinder extends PHPExcel_Cell_DefaultValueBinder
             if (preg_match('/^\-?[0-9]*\.?[0-9]*\s?\%$/', $value)) {
                 // Convert value to number
                 $value = (float) str_replace('%', '', $value) / 100;
-                $cell->setValueExplicit( $value, PHPExcel_Cell_DataType::TYPE_NUMERIC);
+                $cell->setValueExplicit($value, PHPExcel_Cell_DataType::TYPE_NUMERIC);
                 // Set style
-                $cell->getWorksheet()->getStyle( $cell->getCoordinate() )
+                $cell->getWorksheet()->getStyle($cell->getCoordinate())
-                    ->getNumberFormat()->setFormatCode( PHPExcel_Style_NumberFormat::FORMAT_PERCENTAGE_00 );
+                    ->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_PERCENTAGE_00);
                 return true;
             }
 
@@ -118,20 +113,20 @@ class PHPExcel_Cell_AdvancedValueBinder extends PHPExcel_Cell_DefaultValueBinder
             if (preg_match('/^'.preg_quote($currencyCode).' *(\d{1,3}('.preg_quote($thousandsSeparator).'\d{3})*|(\d+))('.preg_quote($decimalSeparator).'\d{2})?$/', $value)) {
                 // Convert value to number
                 $value = (float) trim(str_replace(array($currencyCode, $thousandsSeparator, $decimalSeparator), array('', '', '.'), $value));
-                $cell->setValueExplicit( $value, PHPExcel_Cell_DataType::TYPE_NUMERIC);
+                $cell->setValueExplicit($value, PHPExcel_Cell_DataType::TYPE_NUMERIC);
                 // Set style
-                $cell->getWorksheet()->getStyle( $cell->getCoordinate() )
+                $cell->getWorksheet()->getStyle($cell->getCoordinate())
                     ->getNumberFormat()->setFormatCode(
-                        str_replace('$', $currencyCode, PHPExcel_Style_NumberFormat::FORMAT_CURRENCY_USD_SIMPLE )
+                        str_replace('$', $currencyCode, PHPExcel_Style_NumberFormat::FORMAT_CURRENCY_USD_SIMPLE)
                     );
                 return true;
             } elseif (preg_match('/^\$ *(\d{1,3}(\,\d{3})*|(\d+))(\.\d{2})?$/', $value)) {
                 // Convert value to number
                 $value = (float) trim(str_replace(array('$',','), '', $value));
-                $cell->setValueExplicit( $value, PHPExcel_Cell_DataType::TYPE_NUMERIC);
+                $cell->setValueExplicit($value, PHPExcel_Cell_DataType::TYPE_NUMERIC);
                 // Set style
-                $cell->getWorksheet()->getStyle( $cell->getCoordinate() )
+                $cell->getWorksheet()->getStyle($cell->getCoordinate())
-                    ->getNumberFormat()->setFormatCode( PHPExcel_Style_NumberFormat::FORMAT_CURRENCY_USD_SIMPLE );
+                    ->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_CURRENCY_USD_SIMPLE);
                 return true;
             }
 
@@ -142,8 +137,8 @@ class PHPExcel_Cell_AdvancedValueBinder extends PHPExcel_Cell_DefaultValueBinder
                 $days = $h / 24 + $m / 1440;
                 $cell->setValueExplicit($days, PHPExcel_Cell_DataType::TYPE_NUMERIC);
                 // Set style
-                $cell->getWorksheet()->getStyle( $cell->getCoordinate() )
+                $cell->getWorksheet()->getStyle($cell->getCoordinate())
-                    ->getNumberFormat()->setFormatCode( PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME3 );
+                    ->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME3);
                 return true;
             }
 
@@ -155,8 +150,8 @@ class PHPExcel_Cell_AdvancedValueBinder extends PHPExcel_Cell_DefaultValueBinder
                 // Convert value to number
                 $cell->setValueExplicit($days, PHPExcel_Cell_DataType::TYPE_NUMERIC);
                 // Set style
-                $cell->getWorksheet()->getStyle( $cell->getCoordinate() )
+                $cell->getWorksheet()->getStyle($cell->getCoordinate())
-                    ->getNumberFormat()->setFormatCode( PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME4 );
+                    ->getNumberFormat()->setFormatCode(PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME4);
                 return true;
             }
 
@@ -170,18 +165,18 @@ class PHPExcel_Cell_AdvancedValueBinder extends PHPExcel_Cell_DefaultValueBinder
                 } else {
                     $formatCode = 'yyyy-mm-dd';
                 }
-                $cell->getWorksheet()->getStyle( $cell->getCoordinate() )
+                $cell->getWorksheet()->getStyle($cell->getCoordinate())
                     ->getNumberFormat()->setFormatCode($formatCode);
                 return true;
             }
 
             // 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() )
+                $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() {
+    public static function getErrorCodes()
-        return self::$_errorCodes;
+    {
+        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->formula1          = '';
-        $this->_formula2          = '';
+        $this->formula2          = '';
-        $this->_type              = PHPExcel_Cell_DataValidation::TYPE_NONE;
+        $this->type              = PHPExcel_Cell_DataValidation::TYPE_NONE;
-        $this->_errorStyle        = PHPExcel_Cell_DataValidation::STYLE_STOP;
+        $this->errorStyle        = PHPExcel_Cell_DataValidation::STYLE_STOP;
-        $this->_operator          = '';
+        $this->operator          = '';
-        $this->_allowBlank        = FALSE;
+        $this->allowBlank        = false;
-        $this->_showDropDown      = FALSE;
+        $this->showDropDown      = false;
-        $this->_showInputMessage  = FALSE;
+        $this->showInputMessage  = false;
-        $this->_showErrorMessage  = FALSE;
+        $this->showErrorMessage  = false;
-        $this->_errorTitle        = '';
+        $this->errorTitle        = '';
-        $this->_error             = '';
+        $this->error             = '';
-        $this->_promptTitle       = '';
+        $this->promptTitle       = '';
-        $this->_prompt            = '';
+        $this->prompt            = '';
     }
 
     /**
@@ -177,8 +169,9 @@ class PHPExcel_Cell_DataValidation
      *
      * @return string
      */
-    public function getFormula1() {
+    public function getFormula1()
-        return $this->_formula1;
+    {
+        return $this->formula1;
     }
 
     /**
@@ -187,8 +180,9 @@ class PHPExcel_Cell_DataValidation
      * @param  string    $value
      * @return PHPExcel_Cell_DataValidation
      */
-    public function setFormula1($value = '') {
+    public function setFormula1($value = '')
-        $this->_formula1 = $value;
+    {
+        $this->formula1 = $value;
         return $this;
     }
 
@@ -197,8 +191,9 @@ class PHPExcel_Cell_DataValidation
      *
      * @return string
      */
-    public function getFormula2() {
+    public function getFormula2()
-        return $this->_formula2;
+    {
+        return $this->formula2;
     }
 
     /**
@@ -207,8 +202,9 @@ class PHPExcel_Cell_DataValidation
      * @param  string    $value
      * @return PHPExcel_Cell_DataValidation
      */
-    public function setFormula2($value = '') {
+    public function setFormula2($value = '')
-        $this->_formula2 = $value;
+    {
+        $this->formula2 = $value;
         return $this;
     }
 
@@ -217,8 +213,9 @@ class PHPExcel_Cell_DataValidation
      *
      * @return string
      */
-    public function getType() {
+    public function getType()
-        return $this->_type;
+    {
+        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) {
+    public function setType($value = PHPExcel_Cell_DataValidation::TYPE_NONE)
-        $this->_type = $value;
+    {
+        $this->type = $value;
         return $this;
     }
 
@@ -237,8 +235,9 @@ class PHPExcel_Cell_DataValidation
      *
      * @return string
      */
-    public function getErrorStyle() {
+    public function getErrorStyle()
-        return $this->_errorStyle;
+    {
+        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) {
+    public function setErrorStyle($value = PHPExcel_Cell_DataValidation::STYLE_STOP)
-        $this->_errorStyle = $value;
+    {
+        $this->errorStyle = $value;
         return $this;
     }
 
@@ -257,8 +257,9 @@ class PHPExcel_Cell_DataValidation
      *
      * @return string
      */
-    public function getOperator() {
+    public function getOperator()
-        return $this->_operator;
+    {
+        return $this->operator;
     }
 
     /**
@@ -267,8 +268,9 @@ class PHPExcel_Cell_DataValidation
      * @param  string    $value
      * @return PHPExcel_Cell_DataValidation
      */
-    public function setOperator($value = '') {
+    public function setOperator($value = '')
-        $this->_operator = $value;
+    {
+        $this->operator = $value;
         return $this;
     }
 
@@ -277,8 +279,9 @@ class PHPExcel_Cell_DataValidation
      *
      * @return boolean
      */
-    public function getAllowBlank() {
+    public function getAllowBlank()
-        return $this->_allowBlank;
+    {
+        return $this->allowBlank;
     }
 
     /**
@@ -287,8 +290,9 @@ class PHPExcel_Cell_DataValidation
      * @param  boolean    $value
      * @return PHPExcel_Cell_DataValidation
      */
-    public function setAllowBlank($value = false) {
+    public function setAllowBlank($value = false)
-        $this->_allowBlank = $value;
+    {
+        $this->allowBlank = $value;
         return $this;
     }
 
@@ -297,8 +301,9 @@ class PHPExcel_Cell_DataValidation
      *
      * @return boolean
      */
-    public function getShowDropDown() {
+    public function getShowDropDown()
-        return $this->_showDropDown;
+    {
+        return $this->showDropDown;
     }
 
     /**
@@ -307,8 +312,9 @@ class PHPExcel_Cell_DataValidation
      * @param  boolean    $value
      * @return PHPExcel_Cell_DataValidation
      */
-    public function setShowDropDown($value = false) {
+    public function setShowDropDown($value = false)
-        $this->_showDropDown = $value;
+    {
+        $this->showDropDown = $value;
         return $this;
     }
 
@@ -317,8 +323,9 @@ class PHPExcel_Cell_DataValidation
      *
      * @return boolean
      */
-    public function getShowInputMessage() {
+    public function getShowInputMessage()
-        return $this->_showInputMessage;
+    {
+        return $this->showInputMessage;
     }
 
     /**
@@ -327,8 +334,9 @@ class PHPExcel_Cell_DataValidation
      * @param  boolean    $value
      * @return PHPExcel_Cell_DataValidation
      */
-    public function setShowInputMessage($value = false) {
+    public function setShowInputMessage($value = false)
-        $this->_showInputMessage = $value;
+    {
+        $this->showInputMessage = $value;
         return $this;
     }
 
@@ -337,8 +345,9 @@ class PHPExcel_Cell_DataValidation
      *
      * @return boolean
      */
-    public function getShowErrorMessage() {
+    public function getShowErrorMessage()
-        return $this->_showErrorMessage;
+    {
+        return $this->showErrorMessage;
     }
 
     /**
@@ -347,8 +356,9 @@ class PHPExcel_Cell_DataValidation
      * @param  boolean    $value
      * @return PHPExcel_Cell_DataValidation
      */
-    public function setShowErrorMessage($value = false) {
+    public function setShowErrorMessage($value = false)
-        $this->_showErrorMessage = $value;
+    {
+        $this->showErrorMessage = $value;
         return $this;
     }
 
@@ -357,8 +367,9 @@ class PHPExcel_Cell_DataValidation
      *
      * @return string
      */
-    public function getErrorTitle() {
+    public function getErrorTitle()
-        return $this->_errorTitle;
+    {
+        return $this->errorTitle;
     }
 
     /**
@@ -367,8 +378,9 @@ class PHPExcel_Cell_DataValidation
      * @param  string    $value
      * @return PHPExcel_Cell_DataValidation
      */
-    public function setErrorTitle($value = '') {
+    public function setErrorTitle($value = '')
-        $this->_errorTitle = $value;
+    {
+        $this->errorTitle = $value;
         return $this;
     }
 
@@ -377,8 +389,9 @@ class PHPExcel_Cell_DataValidation
      *
      * @return string
      */
-    public function getError() {
+    public function getError()
-        return $this->_error;
+    {
+        return $this->error;
     }
 
     /**
@@ -387,8 +400,9 @@ class PHPExcel_Cell_DataValidation
      * @param  string    $value
      * @return PHPExcel_Cell_DataValidation
      */
-    public function setError($value = '') {
+    public function setError($value = '')
-        $this->_error = $value;
+    {
+        $this->error = $value;
         return $this;
     }
 
@@ -397,8 +411,9 @@ class PHPExcel_Cell_DataValidation
      *
      * @return string
      */
-    public function getPromptTitle() {
+    public function getPromptTitle()
-        return $this->_promptTitle;
+    {
+        return $this->promptTitle;
     }
 
     /**
@@ -407,8 +422,9 @@ class PHPExcel_Cell_DataValidation
      * @param  string    $value
      * @return PHPExcel_Cell_DataValidation
      */
-    public function setPromptTitle($value = '') {
+    public function setPromptTitle($value = '')
-        $this->_promptTitle = $value;
+    {
+        $this->promptTitle = $value;
         return $this;
     }
 
@@ -417,8 +433,9 @@ class PHPExcel_Cell_DataValidation
      *
      * @return string
      */
-    public function getPrompt() {
+    public function getPrompt()
-        return $this->_prompt;
+    {
+        return $this->prompt;
     }
 
     /**
@@ -427,8 +444,9 @@ class PHPExcel_Cell_DataValidation
      * @param  string    $value
      * @return PHPExcel_Cell_DataValidation
      */
-    public function setPrompt($value = '') {
+    public function setPrompt($value = '')
-        $this->_prompt = $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->formula1 .
-            . $this->_formula2
+            $this->formula2 .
-            . $this->_type = PHPExcel_Cell_DataValidation::TYPE_NONE
+            $this->type = PHPExcel_Cell_DataValidation::TYPE_NONE .
-            . $this->_errorStyle = PHPExcel_Cell_DataValidation::STYLE_STOP
+            $this->errorStyle = PHPExcel_Cell_DataValidation::STYLE_STOP .
-            . $this->_operator
+            $this->operator .
-            . ($this->_allowBlank ? 't' : 'f')
+            ($this->allowBlank ? 't' : 'f') .
-            . ($this->_showDropDown ? 't' : 'f')
+            ($this->showDropDown ? 't' : 'f') .
-            . ($this->_showInputMessage ? 't' : 'f')
+            ($this->showInputMessage ? 't' : 'f') .
-            . ($this->_showErrorMessage ? 't' : 'f')
+            ($this->showErrorMessage ? 't' : 'f') .
-            . $this->_errorTitle
+            $this->errorTitle .
-            . $this->_error
+            $this->error .
-            . $this->_promptTitle
+            $this->promptTitle .
-            . $this->_prompt
+            $this->prompt .
-            . __CLASS__
+            __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')) {
+    /**
+     * @ignore
+     */
+    define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
+    require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+}
+
 /**
- * PHPExcel
+ * 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) );
+        $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]+)([Ee][\-\+]?[0-2]?\d{1,3})?$/', $pValue)) {
-        } elseif (preg_match('/^\-?([0-9]+\\.?[0-9]*|[0-9]*\\.?[0-9]+)$/', $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;
-
         }
+
+        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->url     = $pUrl;
-        $this->_tooltip     = $pTooltip;
+        $this->tooltip = $pTooltip;
     }
 
     /**
@@ -67,8 +59,9 @@ class PHPExcel_Cell_Hyperlink
      *
      * @return string
      */
-    public function getUrl() {
+    public function getUrl()
-        return $this->_url;
+    {
+        return $this->url;
     }
 
     /**
@@ -77,8 +70,9 @@ class PHPExcel_Cell_Hyperlink
      * @param  string    $value
      * @return PHPExcel_Cell_Hyperlink
      */
-    public function setUrl($value = '') {
+    public function setUrl($value = '')
-        $this->_url = $value;
+    {
+        $this->url = $value;
         return $this;
     }
 
@@ -87,8 +81,9 @@ class PHPExcel_Cell_Hyperlink
      *
      * @return string
      */
-    public function getTooltip() {
+    public function getTooltip()
-        return $this->_tooltip;
+    {
+        return $this->tooltip;
     }
 
     /**
@@ -97,8 +92,9 @@ class PHPExcel_Cell_Hyperlink
      * @param  string    $value
      * @return PHPExcel_Cell_Hyperlink
      */
-    public function setTooltip($value = '') {
+    public function setTooltip($value = '')
-        $this->_tooltip = $value;
+    {
+        $this->tooltip = $value;
         return $this;
     }
 
@@ -107,8 +103,9 @@ class PHPExcel_Cell_Hyperlink
      *
      * @return boolean
      */
-    public function isInternal() {
+    public function isInternal()
-        return strpos($this->_url, 'sheet://') !== false;
+    {
+        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->url .
-            . $this->_tooltip
+            $this->tooltip .
-            . __CLASS__
+            __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/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
@@ -18,337 +18,373 @@
  * 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
+ * @category    PHPExcel
- * @package		PHPExcel_Chart
+ * @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
+ * @license        http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
- * @version	##VERSION##, ##DATE##
+ * @version    ##VERSION##, ##DATE##
  */
 
 
 /**
  * PHPExcel_Chart_DataSeries
  *
- * @category	PHPExcel
+ * @category    PHPExcel
- * @package		PHPExcel_Chart
+ * @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';
+    const TYPE_LINECHART_3D    = 'line3DChart';
+    const TYPE_AREACHART       = 'areaChart';
+    const TYPE_AREACHART_3D    = 'area3DChart';
+    const TYPE_PIECHART        = 'pieChart';
+    const TYPE_PIECHART_3D     = 'pie3DChart';
+    const TYPE_DOUGHTNUTCHART  = 'doughnutChart';
+    const TYPE_DONUTCHART      = self::TYPE_DOUGHTNUTCHART;    //    Synonym
+    const TYPE_SCATTERCHART    = 'scatterChart';
+    const TYPE_SURFACECHART    = 'surfaceChart';
+    const TYPE_SURFACECHART_3D = 'surface3DChart';
+    const TYPE_RADARCHART      = 'radarChart';
+    const TYPE_BUBBLECHART     = 'bubbleChart';
+    const TYPE_STOCKCHART      = 'stockChart';
+    const TYPE_CANDLECHART     = self::TYPE_STOCKCHART;       //    Synonym
 
-	const TYPE_BARCHART			= 'barChart';
+    const GROUPING_CLUSTERED       = 'clustered';
-	const TYPE_BARCHART_3D		= 'bar3DChart';
+    const GROUPING_STACKED         = 'stacked';
-	const TYPE_LINECHART		= 'lineChart';
+    const GROUPING_PERCENT_STACKED = 'percentStacked';
-	const TYPE_LINECHART_3D		= 'line3DChart';
+    const GROUPING_STANDARD        = 'standard';
-	const TYPE_AREACHART		= 'areaChart';
-	const TYPE_AREACHART_3D		= 'area3DChart';
-	const TYPE_PIECHART			= 'pieChart';
-	const TYPE_PIECHART_3D		= 'pie3DChart';
-	const TYPE_DOUGHTNUTCHART	= 'doughnutChart';
-	const TYPE_DONUTCHART		= self::TYPE_DOUGHTNUTCHART;	//	Synonym
-	const TYPE_SCATTERCHART		= 'scatterChart';
-	const TYPE_SURFACECHART		= 'surfaceChart';
-	const TYPE_SURFACECHART_3D	= 'surface3DChart';
-	const TYPE_RADARCHART		= 'radarChart';
-	const TYPE_BUBBLECHART		= 'bubbleChart';
-	const TYPE_STOCKCHART		= 'stockChart';
 
-	const GROUPING_CLUSTERED			= 'clustered';
+    const DIRECTION_BAR        = 'bar';
-	const GROUPING_STACKED				= 'stacked';
+    const DIRECTION_HORIZONTAL = self::DIRECTION_BAR;
-	const GROUPING_PERCENT_STACKED		= 'percentStacked';
+    const DIRECTION_COL        = 'col';
-	const GROUPING_STANDARD				= 'standard';
+    const DIRECTION_COLUMN     = self::DIRECTION_COL;
+    const DIRECTION_VERTICAL   = self::DIRECTION_COL;
 
-	const DIRECTION_BAR			= 'bar';
+    const STYLE_LINEMARKER   = 'lineMarker';
-	const DIRECTION_HORIZONTAL	= self::DIRECTION_BAR;
+    const STYLE_SMOOTHMARKER = 'smoothMarker';
-	const DIRECTION_COL			= 'col';
+    const STYLE_MARKER       = 'marker';
-	const DIRECTION_COLUMN		= self::DIRECTION_COL;
+    const STYLE_FILLED       = 'filled';
-	const DIRECTION_VERTICAL	= self::DIRECTION_COL;
-
-	const STYLE_LINEMARKER		= 'lineMarker';
-	const STYLE_SMOOTHMARKER	= 'smoothMarker';
-	const STYLE_MARKER			= 'marker';
-	const STYLE_FILLED			= 'filled';
 
 
-	/**
+    /**
-	 * Series Plot Type
+     * Series Plot Type
-	 *
+     *
-	 * @var string
+     * @var string
-	 */
+     */
-	private $_plotType = null;
+    private $plotType;
 
-	/**
+    /**
-	 * Plot Grouping Type
+     * Plot Grouping Type
-	 *
+     *
-	 * @var boolean
+     * @var boolean
-	 */
+     */
-	private $_plotGrouping = null;
+    private $plotGrouping;
 
-	/**
+    /**
-	 * Plot Direction
+     * Plot Direction
-	 *
+     *
-	 * @var boolean
+     * @var boolean
-	 */
+     */
-	private $_plotDirection = null;
+    private $plotDirection;
 
-	/**
+    /**
-	 * Plot Style
+     * Plot Style
-	 *
+     *
-	 * @var string
+     * @var string
-	 */
+     */
-	private $_plotStyle = null;
+    private $plotStyle;
 
-	/**
+    /**
-	 * Order of plots in Series
+     * Order of plots in Series
-	 *
+     *
-	 * @var array of integer
+     * @var array of integer
-	 */
+     */
-	private $_plotOrder = array();
+    private $plotOrder = array();
 
-	/**
+    /**
-	 * Plot Label
+     * Plot Label
-	 *
+     *
-	 * @var array of PHPExcel_Chart_DataSeriesValues
+     * @var array of PHPExcel_Chart_DataSeriesValues
-	 */
+     */
-	private $_plotLabel = array();
+    private $plotLabel = array();
 
-	/**
+    /**
-	 * Plot Category
+     * Plot Category
-	 *
+     *
-	 * @var array of PHPExcel_Chart_DataSeriesValues
+     * @var array of PHPExcel_Chart_DataSeriesValues
-	 */
+     */
-	private $_plotCategory = array();
+    private $plotCategory = array();
 
-	/**
+    /**
-	 * Smooth Line
+     * Smooth Line
-	 *
+     *
-	 * @var string
+     * @var string
-	 */
+     */
-	private $_smoothLine = null;
+    private $smoothLine;
 
-	/**
+    /**
-	 * Plot Values
+     * Plot Values
-	 *
+     *
-	 * @var array of PHPExcel_Chart_DataSeriesValues
+     * @var array of PHPExcel_Chart_DataSeriesValues
-	 */
+     */
-	private $_plotValues = array();
+    private $plotValues = array();
 
-	/**
+    /**
-	 * Create a new PHPExcel_Chart_DataSeries
+     * 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->plotType = $plotType;
-		$this->_plotGrouping = $plotGrouping;
+        $this->plotGrouping = $plotGrouping;
-		$this->_plotOrder = $plotOrder;
+        $this->plotOrder = $plotOrder;
-		$keys = array_keys($plotValues);
+        $keys = array_keys($plotValues);
-		$this->_plotValues = $plotValues;
+        $this->plotValues = $plotValues;
-		if ((count($plotLabel) == 0) || (is_null($plotLabel[$keys[0]]))) {
+        if ((count($plotLabel) == 0) || (is_null($plotLabel[$keys[0]]))) {
-			$plotLabel[$keys[0]] = new PHPExcel_Chart_DataSeriesValues();
+            $plotLabel[$keys[0]] = new PHPExcel_Chart_DataSeriesValues();
-		}
+        }
 
-		$this->_plotLabel = $plotLabel;
+        $this->plotLabel = $plotLabel;
-		if ((count($plotCategory) == 0) || (is_null($plotCategory[$keys[0]]))) {
+        if ((count($plotCategory) == 0) || (is_null($plotCategory[$keys[0]]))) {
-			$plotCategory[$keys[0]] = new PHPExcel_Chart_DataSeriesValues();
+            $plotCategory[$keys[0]] = new PHPExcel_Chart_DataSeriesValues();
-		}
+        }
-		$this->_plotCategory = $plotCategory;
+        $this->plotCategory = $plotCategory;
-		$this->_smoothLine = $smoothLine;
+        $this->smoothLine = $smoothLine;
-		$this->_plotStyle = $plotStyle;
+        $this->plotStyle = $plotStyle;
-	}
         
-	/**
+        if (is_null($plotDirection)) {
-	 * Get Plot Type
+            $plotDirection = self::DIRECTION_COL;
-	 *
+        }
-	 * @return string
+        $this->plotDirection = $plotDirection;
-	 */
+    }
-	public function getPlotType() {
-		return $this->_plotType;
-	}
 
-	/**
+    /**
-	 * Set Plot Type
+     * Get Plot Type
-	 *
+     *
-	 * @param string $plotType
+     * @return string
-	 */
+     */
-	public function setPlotType($plotType = '') {
+    public function getPlotType()
-		$this->_plotType = $plotType;
+    {
-	}
+        return $this->plotType;
+    }
 
-	/**
+    /**
-	 * Get Plot Grouping Type
+     * Set Plot Type
-	 *
+     *
-	 * @return string
+     * @param string $plotType
-	 */
+     * @return PHPExcel_Chart_DataSeries
-	public function getPlotGrouping() {
+     */
-		return $this->_plotGrouping;
+    public function setPlotType($plotType = '')
-	}
+    {
+        $this->plotType = $plotType;
+        return $this;
+    }
 
-	/**
+    /**
-	 * Set Plot Grouping Type
+     * Get Plot Grouping Type
-	 *
+     *
-	 * @param string $groupingType
+     * @return string
-	 */
+     */
-	public function setPlotGrouping($groupingType = null) {
+    public function getPlotGrouping()
-		$this->_plotGrouping = $groupingType;
+    {
-	}
+        return $this->plotGrouping;
+    }
 
-	/**
+    /**
-	 * Get Plot Direction
+     * Set Plot Grouping Type
-	 *
+     *
-	 * @return string
+     * @param string $groupingType
-	 */
+     * @return PHPExcel_Chart_DataSeries
-	public function getPlotDirection() {
+     */
-		return $this->_plotDirection;
+    public function setPlotGrouping($groupingType = null)
-	}
+    {
+        $this->plotGrouping = $groupingType;
+        return $this;
+    }
 
-	/**
+    /**
-	 * Set Plot Direction
+     * Get Plot Direction
-	 *
+     *
-	 * @param string $plotDirection
+     * @return string
-	 */
+     */
-	public function setPlotDirection($plotDirection = null) {
+    public function getPlotDirection()
-		$this->_plotDirection = $plotDirection;
+    {
-	}
+        return $this->plotDirection;
+    }
 
-	/**
+    /**
-	 * Get Plot Order
+     * Set Plot Direction
-	 *
+     *
-	 * @return string
+     * @param string $plotDirection
-	 */
+     * @return PHPExcel_Chart_DataSeries
-	public function getPlotOrder() {
+     */
-		return $this->_plotOrder;
+    public function setPlotDirection($plotDirection = null)
-	}
+    {
+        $this->plotDirection = $plotDirection;
+        return $this;
+    }
 
-	/**
+    /**
-	 * Get Plot Labels
+     * Get Plot Order
-	 *
+     *
-	 * @return array of PHPExcel_Chart_DataSeriesValues
+     * @return string
-	 */
+     */
-	public function getPlotLabels() {
+    public function getPlotOrder()
-		return $this->_plotLabel;
+    {
-	}
+        return $this->plotOrder;
+    }
 
-	/**
+    /**
-	 * Get Plot Label by Index
+     * Get Plot Labels
-	 *
+     *
-	 * @return PHPExcel_Chart_DataSeriesValues
+     * @return array of PHPExcel_Chart_DataSeriesValues
-	 */
+     */
-	public function getPlotLabelByIndex($index) {
+    public function getPlotLabels()
-		$keys = array_keys($this->_plotLabel);
+    {
-		if (in_array($index,$keys)) {
+        return $this->plotLabel;
-			return $this->_plotLabel[$index];
+    }
-		} elseif(isset($keys[$index])) {
-			return $this->_plotLabel[$keys[$index]];
-		}
-		return false;
-	}
 
-	/**
+    /**
-	 * Get Plot Categories
+     * Get Plot Label by Index
-	 *
+     *
-	 * @return array of PHPExcel_Chart_DataSeriesValues
+     * @return PHPExcel_Chart_DataSeriesValues
-	 */
+     */
-	public function getPlotCategories() {
+    public function getPlotLabelByIndex($index)
-		return $this->_plotCategory;
+    {
-	}
+        $keys = array_keys($this->plotLabel);
+        if (in_array($index, $keys)) {
+            return $this->plotLabel[$index];
+        } elseif (isset($keys[$index])) {
+            return $this->plotLabel[$keys[$index]];
+        }
+        return false;
+    }
 
-	/**
+    /**
-	 * Get Plot Category by Index
+     * Get Plot Categories
-	 *
+     *
-	 * @return PHPExcel_Chart_DataSeriesValues
+     * @return array of PHPExcel_Chart_DataSeriesValues
-	 */
+     */
-	public function getPlotCategoryByIndex($index) {
+    public function getPlotCategories()
-		$keys = array_keys($this->_plotCategory);
+    {
-		if (in_array($index,$keys)) {
+        return $this->plotCategory;
-			return $this->_plotCategory[$index];
+    }
-		} elseif(isset($keys[$index])) {
-			return $this->_plotCategory[$keys[$index]];
-		}
-		return false;
-	}
 
-	/**
+    /**
-	 * Get Plot Style
+     * Get Plot Category by Index
-	 *
+     *
-	 * @return string
+     * @return PHPExcel_Chart_DataSeriesValues
-	 */
+     */
-	public function getPlotStyle() {
+    public function getPlotCategoryByIndex($index)
-		return $this->_plotStyle;
+    {
-	}
+        $keys = array_keys($this->plotCategory);
+        if (in_array($index, $keys)) {
+            return $this->plotCategory[$index];
+        } elseif (isset($keys[$index])) {
+            return $this->plotCategory[$keys[$index]];
+        }
+        return false;
+    }
 
-	/**
+    /**
-	 * Set Plot Style
+     * Get Plot Style
-	 *
+     *
-	 * @param string $plotStyle
+     * @return string
-	 */
+     */
-	public function setPlotStyle($plotStyle = null) {
+    public function getPlotStyle()
-		$this->_plotStyle = $plotStyle;
+    {
-	}
+        return $this->plotStyle;
+    }
 
-	/**
+    /**
-	 * Get Plot Values
+     * Set Plot Style
-	 *
+     *
-	 * @return array of PHPExcel_Chart_DataSeriesValues
+     * @param string $plotStyle
-	 */
+     * @return PHPExcel_Chart_DataSeries
-	public function getPlotValues() {
+     */
-		return $this->_plotValues;
+    public function setPlotStyle($plotStyle = null)
-	}
+    {
+        $this->plotStyle = $plotStyle;
+        return $this;
+    }
 
-	/**
+    /**
-	 * Get Plot Values by Index
+     * Get Plot Values
-	 *
+     *
-	 * @return PHPExcel_Chart_DataSeriesValues
+     * @return array of PHPExcel_Chart_DataSeriesValues
-	 */
+     */
-	public function getPlotValuesByIndex($index) {
+    public function getPlotValues()
-		$keys = array_keys($this->_plotValues);
+    {
-		if (in_array($index,$keys)) {
+        return $this->plotValues;
-			return $this->_plotValues[$index];
+    }
-		} elseif(isset($keys[$index])) {
-			return $this->_plotValues[$keys[$index]];
-		}
-		return false;
-	}
 
-	/**
+    /**
-	 * Get Number of Plot Series
+     * Get Plot Values by Index
-	 *
+     *
-	 * @return integer
+     * @return PHPExcel_Chart_DataSeriesValues
-	 */
+     */
-	public function getPlotSeriesCount() {
+    public function getPlotValuesByIndex($index)
-		return count($this->_plotValues);
+    {
-	}
+        $keys = array_keys($this->plotValues);
+        if (in_array($index, $keys)) {
+            return $this->plotValues[$index];
+        } elseif (isset($keys[$index])) {
+            return $this->plotValues[$keys[$index]];
+        }
+        return false;
+    }
 
-	/**
+    /**
-	 * Get Smooth Line
+     * Get Number of Plot Series
-	 *
+     *
-	 * @return boolean
+     * @return integer
-	 */
+     */
-	public function getSmoothLine() {
+    public function getPlotSeriesCount()
-		return $this->_smoothLine;
+    {
-	}
+        return count($this->plotValues);
+    }
 
-	/**
+    /**
-	 * Set Smooth Line
+     * Get Smooth Line
-	 *
+     *
-	 * @param boolean $smoothLine
+     * @return boolean
-	 */
+     */
-	public function setSmoothLine($smoothLine = TRUE) {
+    public function getSmoothLine()
-		$this->_smoothLine = $smoothLine;
+    {
-	}
+        return $this->smoothLine;
+    }
 
-	public function refresh(PHPExcel_Worksheet $worksheet) {
+    /**
-	    foreach($this->_plotValues as $plotValues) {
+     * Set Smooth Line
-			if ($plotValues !== NULL)
+     *
-				$plotValues->refresh($worksheet, TRUE);
+     * @param boolean $smoothLine
-		}
+     * @return PHPExcel_Chart_DataSeries
-		foreach($this->_plotLabel as $plotValues) {
+     */
-			if ($plotValues !== NULL)
+    public function setSmoothLine($smoothLine = true)
-				$plotValues->refresh($worksheet, TRUE);
+    {
-		}
+        $this->smoothLine = $smoothLine;
-		foreach($this->_plotCategory as $plotValues) {
+        return $this;
-			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
@@ -18,310 +19,315 @@
  * 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
+ * @category    PHPExcel
- * @package		PHPExcel_Chart
+ * @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
+ * @license        http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
- * @version		##VERSION##, ##DATE##
+ * @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_STRING    = 'String';
-	const DATASERIES_TYPE_NUMBER	= 'Number';
+    const DATASERIES_TYPE_NUMBER    = 'Number';
 
-	private static $_dataTypeValues = array(
+    private static $dataTypeValues = array(
-		self::DATASERIES_TYPE_STRING,
+        self::DATASERIES_TYPE_STRING,
-		self::DATASERIES_TYPE_NUMBER,
+        self::DATASERIES_TYPE_NUMBER,
-	);
+    );
 
-	/**
+    /**
-	 * Series Data Type
+     * Series Data Type
-	 *
+     *
-	 * @var	string
+     * @var    string
-	 */
+     */
-	private $_dataType = null;
+    private $dataType;
 
-	/**
+    /**
-	 * Series Data Source
+     * Series Data Source
-	 *
+     *
-	 * @var	string
+     * @var    string
-	 */
+     */
-	private $_dataSource = null;
+    private $dataSource;
 
-	/**
+    /**
-	 * Format Code
+     * Format Code
-	 *
+     *
-	 * @var	string
+     * @var    string
-	 */
+     */
-	private $_formatCode = null;
+    private $formatCode;
 
-	/**
+    /**
-	 * Series Point Marker
+     * Series Point Marker
-	 *
+     *
-	 * @var	string
+     * @var    string
-	 */
+     */
-	private $_marker = null;
+    private $pointMarker;
 
-	/**
+    /**
-	 * Point Count (The number of datapoints in the dataseries)
+     * Point Count (The number of datapoints in the dataseries)
-	 *
+     *
-	 * @var	integer
+     * @var    integer
-	 */
+     */
-	private $_pointCount = 0;
+    private $pointCount = 0;
 
-	/**
+    /**
-	 * Data Values
+     * Data Values
-	 *
+     *
-	 * @var	array of mixed
+     * @var    array of mixed
-	 */
+     */
-	private $_dataValues = array();
+    private $dataValues = array();
 
-	/**
+    /**
-	 * Create a new PHPExcel_Chart_DataSeriesValues object
+     * Create a new PHPExcel_Chart_DataSeriesValues object
-	 */
+     */
-	public function __construct($dataType = self::DATASERIES_TYPE_NUMBER, $dataSource = null, $formatCode = null, $pointCount = 0, $dataValues = array(), $marker = null)
+    public function __construct($dataType = self::DATASERIES_TYPE_NUMBER, $dataSource = null, $formatCode = null, $pointCount = 0, $dataValues = array(), $marker = null)
-	{
+    {
-		$this->setDataType($dataType);
+        $this->setDataType($dataType);
-		$this->_dataSource = $dataSource;
+        $this->dataSource = $dataSource;
-		$this->_formatCode = $formatCode;
+        $this->formatCode = $formatCode;
-		$this->_pointCount = $pointCount;
+        $this->pointCount = $pointCount;
-		$this->_dataValues = $dataValues;
+        $this->dataValues = $dataValues;
-		$this->_marker = $marker;
+        $this->pointMarker = $marker;
-	}
+    }
 
-	/**
+    /**
-	 * Get Series Data Type
+     * Get Series Data Type
-	 *
+     *
-	 * @return	string
+     * @return    string
-	 */
+     */
-	public function getDataType() {
+    public function getDataType()
-		return $this->_dataType;
+    {
-	}
+        return $this->dataType;
+    }
 
-	/**
+    /**
-	 * Set Series Data Type
+     * Set Series Data Type
-	 *
+     *
-	 * @param	string	$dataType	Datatype of this data series
+     * @param    string    $dataType    Datatype of this data series
-	 *								Typical values are:
+     *                                Typical values are:
-	 *									PHPExcel_Chart_DataSeriesValues::DATASERIES_TYPE_STRING
+     *                                    PHPExcel_Chart_DataSeriesValues::DATASERIES_TYPE_STRING
-	 *										Normally used for axis point values
+     *                                        Normally used for axis point values
-	 *									PHPExcel_Chart_DataSeriesValues::DATASERIES_TYPE_NUMBER
+     *                                    PHPExcel_Chart_DataSeriesValues::DATASERIES_TYPE_NUMBER
-	 *										Normally used for chart data values
+     *                                        Normally used for chart data values
-	 * @return	PHPExcel_Chart_DataSeriesValues
+     * @return    PHPExcel_Chart_DataSeriesValues
-	 */
+     */
-	public function setDataType($dataType = self::DATASERIES_TYPE_NUMBER) {
+    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');
+        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;
+        return $this;
-	}
+    }
 
-	/**
+    /**
-	 * Get Series Data Source (formula)
+     * Get Series Data Source (formula)
-	 *
+     *
-	 * @return	string
+     * @return    string
-	 */
+     */
-	public function getDataSource() {
+    public function getDataSource()
-		return $this->_dataSource;
+    {
-	}
+        return $this->dataSource;
+    }
 
-	/**
+    /**
-	 * Set Series Data Source (formula)
+     * Set Series Data Source (formula)
-	 *
+     *
-	 * @param	string	$dataSource
+     * @param    string    $dataSource
-	 * @return	PHPExcel_Chart_DataSeriesValues
+     * @return    PHPExcel_Chart_DataSeriesValues
-	 */
+     */
-	public function setDataSource($dataSource = null, $refreshDataValues = true) {
+    public function setDataSource($dataSource = null, $refreshDataValues = true)
-		$this->_dataSource = $dataSource;
+    {
+        $this->dataSource = $dataSource;
 
-		if ($refreshDataValues) {
+        if ($refreshDataValues) {
-			//	TO DO
+            //    TO DO
-		}
+        }
 
-		return $this;
+        return $this;
-	}
+    }
 
-	/**
+    /**
-	 * Get Point Marker
+     * Get Point Marker
-	 *
+     *
-	 * @return string
+     * @return string
-	 */
+     */
-	public function getPointMarker() {
+    public function getPointMarker()
-		return $this->_marker;
+    {
-	}
+        return $this->pointMarker;
+    }
 
-	/**
+    /**
-	 * Set Point Marker
+     * Set Point Marker
-	 *
+     *
-	 * @param	string	$marker
+     * @param    string    $marker
-	 * @return	PHPExcel_Chart_DataSeriesValues
+     * @return    PHPExcel_Chart_DataSeriesValues
-	 */
+     */
-	public function setPointMarker($marker = null) {
+    public function setPointMarker($marker = null)
-		$this->_marker = $marker;
+    {
+        $this->pointMarker = $marker;
 
-		return $this;
+        return $this;
-	}
+    }
 
-	/**
+    /**
-	 * Get Series Format Code
+     * Get Series Format Code
-	 *
+     *
-	 * @return	string
+     * @return    string
-	 */
+     */
-	public function getFormatCode() {
+    public function getFormatCode()
-		return $this->_formatCode;
+    {
-	}
+        return $this->formatCode;
+    }
 
-	/**
+    /**
-	 * Set Series Format Code
+     * Set Series Format Code
-	 *
+     *
-	 * @param	string	$formatCode
+     * @param    string    $formatCode
-	 * @return	PHPExcel_Chart_DataSeriesValues
+     * @return    PHPExcel_Chart_DataSeriesValues
-	 */
+     */
-	public function setFormatCode($formatCode = null) {
+    public function setFormatCode($formatCode = null)
-		$this->_formatCode = $formatCode;
+    {
+        $this->formatCode = $formatCode;
 
-		return $this;
+        return $this;
-	}
+    }
 
-	/**
+    /**
-	 * Get Series Point Count
+     * Get Series Point Count
-	 *
+     *
-	 * @return	integer
+     * @return    integer
-	 */
+     */
-	public function getPointCount() {
+    public function getPointCount()
-		return $this->_pointCount;
+    {
-	}
+        return $this->pointCount;
+    }
 
-	/**
+    /**
-	 * Identify if the Data Series is a multi-level or a simple series
+     * Identify if the Data Series is a multi-level or a simple series
-	 *
+     *
-	 * @return	boolean
+     * @return    boolean
-	 */
+     */
-	public function isMultiLevelSeries() {
+    public function isMultiLevelSeries()
-		if (count($this->_dataValues) > 0) {
+    {
-			return is_array($this->_dataValues[0]);
+        if (count($this->dataValues) > 0) {
-		}
+            return is_array($this->dataValues[0]);
-		return null;
+        }
-	}
+        return null;
+    }
 
-	/**
+    /**
-	 * Return the level count of a multi-level Data Series
+     * Return the level count of a multi-level Data Series
-	 *
+     *
-	 * @return	boolean
+     * @return    boolean
-	 */
+     */
-	public function multiLevelCount() {
+    public function multiLevelCount()
-		$levelCount = 0;
+    {
-		foreach($this->_dataValues as $dataValueSet) {
+        $levelCount = 0;
-			$levelCount = max($levelCount,count($dataValueSet));
+        foreach ($this->dataValues as $dataValueSet) {
-		}
+            $levelCount = max($levelCount, count($dataValueSet));
-		return $levelCount;
+        }
-	}
+        return $levelCount;
+    }
 
-	/**
+    /**
-	 * Get Series Data Values
+     * Get Series Data Values
-	 *
+     *
-	 * @return	array of mixed
+     * @return    array of mixed
-	 */
+     */
-	public function getDataValues() {
+    public function getDataValues()
-		return $this->_dataValues;
+    {
-	}
+        return $this->dataValues;
+    }
 
-	/**
+    /**
-	 * Get the first Series Data value
+     * Get the first Series Data value
-	 *
+     *
-	 * @return	mixed
+     * @return    mixed
-	 */
+     */
-	public function getDataValue() {
+    public function getDataValue()
-		$count = count($this->_dataValues);
+    {
-		if ($count == 0) {
+        $count = count($this->dataValues);
-			return null;
+        if ($count == 0) {
-		} elseif ($count == 1) {
+            return null;
-			return $this->_dataValues[0];
+        } elseif ($count == 1) {
-		}
+            return $this->dataValues[0];
-		return $this->_dataValues;
+        }
-	}
+        return $this->dataValues;
+    }
 
-	/**
+    /**
-	 * Set Series Data Values
+     * Set Series Data Values
-	 *
+     *
-	 * @param	array	$dataValues
+     * @param    array    $dataValues
-	 * @param	boolean	$refreshDataSource
+     * @param    boolean    $refreshDataSource
-	 *					TRUE - refresh the value of _dataSource based on the values of $dataValues
+     *                    TRUE - refresh the value of dataSource based on the values of $dataValues
-	 *					FALSE - don't change the value of _dataSource
+     *                    FALSE - don't change the value of dataSource
-	 * @return	PHPExcel_Chart_DataSeriesValues
+     * @return    PHPExcel_Chart_DataSeriesValues
-	 */
+     */
-	public function setDataValues($dataValues = array(), $refreshDataSource = TRUE) {
+    public function setDataValues($dataValues = array(), $refreshDataSource = true)
-		$this->_dataValues = PHPExcel_Calculation_Functions::flattenArray($dataValues);
+    {
-		$this->_pointCount = count($dataValues);
+        $this->dataValues = PHPExcel_Calculation_Functions::flattenArray($dataValues);
+        $this->pointCount = count($dataValues);
 
-		if ($refreshDataSource) {
+        if ($refreshDataSource) {
-			//	TO DO
+            //    TO DO
-		}
+        }
 
-		return $this;
+        return $this;
-	}
+    }
 
-	private function _stripNulls($var) {
+    private function stripNulls($var)
-		return $var !== NULL;
+    {
-	}
+        return $var !== null;
+    }
 
-	public function refresh(PHPExcel_Worksheet $worksheet, $flatten = TRUE) {
+    public function refresh(PHPExcel_Worksheet $worksheet, $flatten = true)
-        if ($this->_dataSource !== NULL) {
+    {
-        	$calcEngine = PHPExcel_Calculation::getInstance($worksheet->getParent());
+        if ($this->dataSource !== null) {
-			$newDataValues = PHPExcel_Calculation::_unwrapResult(
+            $calcEngine = PHPExcel_Calculation::getInstance($worksheet->getParent());
-			    $calcEngine->_calculateFormulaValue(
+            $newDataValues = PHPExcel_Calculation::unwrapResult(
-			        '='.$this->_dataSource,
+                $calcEngine->_calculateFormulaValue(
-			        NULL,
+                    '='.$this->dataSource,
-			        $worksheet->getCell('A1')
+                    null,
-			    )
+                    $worksheet->getCell('A1')
-			);
+                )
-			if ($flatten) {
+            );
-				$this->_dataValues = PHPExcel_Calculation_Functions::flattenArray($newDataValues);
+            if ($flatten) {
-				foreach($this->_dataValues as &$dataValue) {
+                $this->dataValues = PHPExcel_Calculation_Functions::flattenArray($newDataValues);
-					if ((!empty($dataValue)) && ($dataValue[0] == '#')) {
+                foreach ($this->dataValues as &$dataValue) {
-						$dataValue = 0.0;
+                    if ((!empty($dataValue)) && ($dataValue[0] == '#')) {
-					}
+                        $dataValue = 0.0;
-				}
+                    }
-				unset($dataValue);
+                }
-			} else {
+                unset($dataValue);
-				$cellRange = explode('!',$this->_dataSource);
+            } else {
-				if (count($cellRange) > 1) {
+                $cellRange = explode('!', $this->dataSource);
-					list(,$cellRange) = $cellRange;
+                if (count($cellRange) > 1) {
-				}
+                    list(, $cellRange) = $cellRange;
+                }
 
-				$dimensions = PHPExcel_Cell::rangeDimension(str_replace('$','',$cellRange));
+                $dimensions = PHPExcel_Cell::rangeDimension(str_replace('$', '', $cellRange));
-				if (($dimensions[0] == 1) || ($dimensions[1] == 1)) {
+                if (($dimensions[0] == 1) || ($dimensions[1] == 1)) {
-					$this->_dataValues = PHPExcel_Calculation_Functions::flattenArray($newDataValues);
+                    $this->dataValues = PHPExcel_Calculation_Functions::flattenArray($newDataValues);
-				} else {
+                } else {
-					$newArray = array_values(array_shift($newDataValues));
+                    $newArray = array_values(array_shift($newDataValues));
-					foreach($newArray as $i => $newDataSet) {
+                    foreach ($newArray as $i => $newDataSet) {
-						$newArray[$i] = array($newDataSet);
+                        $newArray[$i] = array($newDataSet);
-					}
+                    }
-
-					foreach($newDataValues as $newDataSet) {
-						$i = 0;
-						foreach($newDataSet as $newDataVal) {
-							array_unshift($newArray[$i++],$newDataVal);
-						}
-					}
-					$this->_dataValues = $newArray;
-				}
-			}
-			$this->_pointCount = count($this->_dataValues);
-		}
-
-	}
 
+                    foreach ($newDataValues as $newDataSet) {
+                        $i = 0;
+                        foreach ($newDataSet as $newDataVal) {
+                            array_unshift($newArray[$i++], $newDataVal);
+                        }
+                    }
+                    $this->dataValues = $newArray;
+                }
+            }
+            $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,33 +21,26 @@
  *
  * @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
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
- * @version	##VERSION##, ##DATE##
+ * @version    ##VERSION##, ##DATE##
  */
-
+class PHPExcel_Chart_Exception extends PHPExcel_Exception
-
+{
-/**
+    /**
- * PHPExcel_Chart_Exception
+     * Error handler callback
- *
+     *
- * @category   PHPExcel
+     * @param mixed $code
- * @package    PHPExcel_Chart
+     * @param mixed $string
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+     * @param mixed $file
- */
+     * @param mixed $line
-class PHPExcel_Chart_Exception extends PHPExcel_Exception {
+     * @param mixed $context
-	/**
+     */
-	 * Error handler callback
+    public static function errorHandlerCallback($code, $string, $file, $line, $context)
-	 *
+    {
-	 * @param mixed $code
+        $e = new self($string, $code);
-	 * @param mixed $string
+        $e->line = $line;
-	 * @param mixed $file
+        $e->file = $file;
-	 * @param mixed $line
+        throw $e;
-	 * @param mixed $context
+    }
-	 */
-	public static function errorHandlerCallback($code, $string, $file, $line, $context) {
-		$e = new self($string, $code);
-		$e->line = $line;
-		$e->file = $file;
-		throw $e;
-	}
 }

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
@@ -18,400 +18,469 @@
  * 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
+ * @category    PHPExcel
- * @package		PHPExcel_Chart
+ * @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
+ * @license        http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
- * @version		##VERSION##, ##DATE##
+ * @version        ##VERSION##, ##DATE##
  */
 
 
 /**
  * PHPExcel_Chart_Layout
  *
- * @category	PHPExcel
+ * @category    PHPExcel
- * @package		PHPExcel_Chart
+ * @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
 {
-	/**
+    /**
-	 * layoutTarget
+     * layoutTarget
-	 *
+     *
-	 * @var string
+     * @var string
-	 */
+     */
-	private $_layoutTarget = NULL;
+    private $layoutTarget;
 
-	/**
+    /**
-	 * X Mode
+     * X Mode
-	 *
+     *
-	 * @var string
+     * @var string
-	 */
+     */
-	private $_xMode		= NULL;
+    private $xMode;
 
-	/**
+    /**
-	 * Y Mode
+     * Y Mode
-	 *
+     *
-	 * @var string
+     * @var string
-	 */
+     */
-	private $_yMode		= NULL;
+    private $yMode;
 
-	/**
+    /**
-	 * X-Position
+     * X-Position
-	 *
+     *
-	 * @var float
+     * @var float
-	 */
+     */
-	private $_xPos		= NULL;
+    private $xPos;
 
-	/**
+    /**
-	 * Y-Position
+     * Y-Position
-	 *
+     *
-	 * @var float
+     * @var float
-	 */
+     */
-	private $_yPos		= NULL;
+    private $yPos;
 
-	/**
+    /**
-	 * width
+     * width
-	 *
+     *
-	 * @var float
+     * @var float
-	 */
+     */
-	private $_width		= NULL;
+    private $width;
 
-	/**
+    /**
-	 * height
+     * height
-	 *
+     *
-	 * @var float
+     * @var float
-	 */
+     */
-	private $_height	= NULL;
+    private $height;
 
-	/**
+    /**
-	 * show legend key
+     * show legend key
-	 * Specifies that legend keys should be shown in data labels
+     * Specifies that legend keys should be shown in data labels
-	 *
+     *
-	 * @var boolean
+     * @var boolean
-	 */
+     */
-	private $_showLegendKey	= NULL;
+    private $showLegendKey;
 
-	/**
+    /**
-	 * show value
+     * show value
-	 * Specifies that the value should be shown in a data label.
+     * Specifies that the value should be shown in a data label.
-	 *
+     *
-	 * @var boolean
+     * @var boolean
-	 */
+     */
-	private $_showVal	= NULL;
+    private $showVal;
 
-	/**
+    /**
-	 * show category name
+     * show category name
-	 * Specifies that the category name should be shown in the data label.
+     * Specifies that the category name should be shown in the data label.
-	 *
+     *
-	 * @var boolean
+     * @var boolean
-	 */
+     */
-	private $_showCatName	= NULL;
+    private $showCatName;
 
-	/**
+    /**
-	 * show data series name
+     * show data series name
-	 * Specifies that the series name should be shown in the data label.
+     * Specifies that the series name should be shown in the data label.
-	 *
+     *
-	 * @var boolean
+     * @var boolean
-	 */
+     */
-	private $_showSerName	= NULL;
+    private $showSerName;
 
-	/**
+    /**
-	 * show percentage
+     * show percentage
-	 * Specifies that the percentage should be shown in the data label.
+     * Specifies that the percentage should be shown in the data label.
-	 *
+     *
-	 * @var boolean
+     * @var boolean
-	 */
+     */
-	private $_showPercent	= NULL;
+    private $showPercent;
 
-	/**
+    /**
-	 * show bubble size
+     * show bubble size
-	 *
+     *
-	 * @var boolean
+     * @var boolean
-	 */
+     */
-	private $_showBubbleSize	= NULL;
+    private $showBubbleSize;
 
-	/**
+    /**
-	 * show leader lines
+     * show leader lines
-	 * Specifies that leader lines should be shown for the data label.
+     * Specifies that leader lines should be shown for the data label.
-	 *
+     *
-	 * @var boolean
+     * @var boolean
-	 */
+     */
-	private $_showLeaderLines	= NULL;
+    private $showLeaderLines;
 
 
-	/**
+    /**
-	 * Create a new PHPExcel_Chart_Layout
+     * Create a new PHPExcel_Chart_Layout
-	 */
+     */
-	public function __construct($layout=array())
+    public function __construct($layout = array())
-	{
+    {
-		if (isset($layout['layoutTarget']))	{ $this->_layoutTarget	= $layout['layoutTarget'];	}
+        if (isset($layout['layoutTarget'])) {
-		if (isset($layout['xMode']))		{ $this->_xMode			= $layout['xMode'];			}
+            $this->layoutTarget = $layout['layoutTarget'];
-		if (isset($layout['yMode']))		{ $this->_yMode			= $layout['yMode'];			}
+        }
-		if (isset($layout['x']))			{ $this->_xPos			= (float) $layout['x'];		}
+        if (isset($layout['xMode'])) {
-		if (isset($layout['y']))			{ $this->_yPos			= (float) $layout['y'];		}
+            $this->xMode = $layout['xMode'];
-		if (isset($layout['w']))			{ $this->_width			= (float) $layout['w'];		}
+        }
-		if (isset($layout['h']))			{ $this->_height		= (float) $layout['h'];		}
+        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'];
+        }
+    }
 
-	/**
+    /**
-	 * Get Layout Target
+     * Get Layout Target
-	 *
+     *
-	 * @return string
+     * @return string
-	 */
+     */
-	public function getLayoutTarget() {
+    public function getLayoutTarget()
-		return $this->_layoutTarget;
+    {
-	}
+        return $this->layoutTarget;
+    }
 
-	/**
+    /**
-	 * Set Layout Target
+     * Set Layout Target
-	 *
+     *
-	 * @param Layout Target $value
+     * @param Layout Target $value
-	 */
+     * @return PHPExcel_Chart_Layout
-	public function setLayoutTarget($value) {
+     */
-		$this->_layoutTarget = $value;
+    public function setLayoutTarget($value)
-	}
+    {
+        $this->layoutTarget = $value;
+        return $this;
+    }
 
-	/**
+    /**
-	 * Get X-Mode
+     * Get X-Mode
-	 *
+     *
-	 * @return string
+     * @return string
-	 */
+     */
-	public function getXMode() {
+    public function getXMode()
-		return $this->_xMode;
+    {
-	}
+        return $this->xMode;
+    }
 
-	/**
+    /**
-	 * Set X-Mode
+     * Set X-Mode
-	 *
+     *
-	 * @param X-Mode $value
+     * @param X-Mode $value
-	 */
+     * @return PHPExcel_Chart_Layout
-	public function setXMode($value) {
+     */
-		$this->_xMode = $value;
+    public function setXMode($value)
-	}
+    {
+        $this->xMode = $value;
+        return $this;
+    }
 
-	/**
+    /**
-	 * Get Y-Mode
+     * Get Y-Mode
-	 *
+     *
-	 * @return string
+     * @return string
-	 */
+     */
-	public function getYMode() {
+    public function getYMode()
-		return $this->_xMode;
+    {
-	}
+        return $this->yMode;
+    }
 
-	/**
+    /**
-	 * Set Y-Mode
+     * Set Y-Mode
-	 *
+     *
-	 * @param Y-Mode $value
+     * @param Y-Mode $value
-	 */
+     * @return PHPExcel_Chart_Layout
-	public function setYMode($value) {
+     */
-		$this->_xMode = $value;
+    public function setYMode($value)
-	}
+    {
+        $this->yMode = $value;
+        return $this;
+    }
 
-	/**
+    /**
-	 * Get X-Position
+     * Get X-Position
-	 *
+     *
-	 * @return number
+     * @return number
-	 */
+     */
-	public function getXPosition() {
+    public function getXPosition()
-		return $this->_xPos;
+    {
-	}
+        return $this->xPos;
+    }
 
-	/**
+    /**
-	 * Set X-Position
+     * Set X-Position
-	 *
+     *
-	 * @param X-Position $value
+     * @param X-Position $value
-	 */
+     * @return PHPExcel_Chart_Layout
-	public function setXPosition($value) {
+     */
-		$this->_xPos = $value;
+    public function setXPosition($value)
-	}
+    {
+        $this->xPos = $value;
+        return $this;
+    }
 
-	/**
+    /**
-	 * Get Y-Position
+     * Get Y-Position
-	 *
+     *
-	 * @return number
+     * @return number
-	 */
+     */
-	public function getYPosition() {
+    public function getYPosition()
-		return $this->_yPos;
+    {
-	}
+        return $this->yPos;
+    }
 
-	/**
+    /**
-	 * Set Y-Position
+     * Set Y-Position
-	 *
+     *
-	 * @param Y-Position $value
+     * @param Y-Position $value
-	 */
+     * @return PHPExcel_Chart_Layout
-	public function setYPosition($value) {
+     */
-		$this->_yPos = $value;
+    public function setYPosition($value)
-	}
+    {
+        $this->yPos = $value;
+        return $this;
+    }
 
-	/**
+    /**
-	 * Get Width
+     * Get Width
-	 *
+     *
-	 * @return number
+     * @return number
-	 */
+     */
-	public function getWidth() {
+    public function getWidth()
-		return $this->_width;
+    {
-	}
+        return $this->width;
+    }
 
-	/**
+    /**
-	 * Set Width
+     * Set Width
-	 *
+     *
-	 * @param Width $value
+     * @param Width $value
-	 */
+     * @return PHPExcel_Chart_Layout
-	public function setWidth($value) {
+     */
-		$this->_width = $value;
+    public function setWidth($value)
-	}
+    {
+        $this->width = $value;
+        return $this;
+    }
 
-	/**
+    /**
-	 * Get Height
+     * Get Height
-	 *
+     *
-	 * @return number
+     * @return number
-	 */
+     */
-	public function getHeight() {
+    public function getHeight()
-		return $this->_height;
+    {
-	}
+        return $this->height;
+    }
 
-	/**
+    /**
-	 * Set Height
+     * Set Height
-	 *
+     *
-	 * @param Height $value
+     * @param Height $value
-	 */
+     * @return PHPExcel_Chart_Layout
-	public function setHeight($value) {
+     */
-		$this->_height = $value;
+    public function setHeight($value)
-	}
+    {
+        $this->height = $value;
+        return $this;
+    }
 
 
-	/**
+    /**
-	 * Get show legend key
+     * Get show legend key
-	 *
+     *
-	 * @return boolean
+     * @return boolean
-	 */
+     */
-	public function getShowLegendKey() {
+    public function getShowLegendKey()
-		return $this->_showLegendKey;
+    {
-	}
+        return $this->showLegendKey;
+    }
 
-	/**
+    /**
-	 * Set show legend key
+     * Set show legend key
-	 * Specifies that legend keys should be shown in data labels.
+     * Specifies that legend keys should be shown in data labels.
-	 *
+     *
-	 * @param boolean $value		Show legend key
+     * @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;
+    }
 
-	/**
+    /**
-	 * Get show value
+     * Get show value
-	 *
+     *
-	 * @return boolean
+     * @return boolean
-	 */
+     */
-	public function getShowVal() {
+    public function getShowVal()
-		return $this->_showVal;
+    {
-	}
+        return $this->showVal;
+    }
 
-	/**
+    /**
-	 * Set show val
+     * Set show val
-	 * Specifies that the value should be shown in data labels.
+     * Specifies that the value should be shown in data labels.
-	 *
+     *
-	 * @param boolean $value		Show val
+     * @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;
+    }
 
-	/**
+    /**
-	 * Get show category name
+     * Get show category name
-	 *
+     *
-	 * @return boolean
+     * @return boolean
-	 */
+     */
-	public function getShowCatName() {
+    public function getShowCatName()
-		return $this->_showCatName;
+    {
-	}
+        return $this->showCatName;
+    }
 
-	/**
+    /**
-	 * Set show cat name
+     * Set show cat name
-	 * Specifies that the category name should be shown in data labels.
+     * Specifies that the category name should be shown in data labels.
-	 *
+     *
-	 * @param boolean $value		Show cat name
+     * @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;
+    }
 
-	/**
+    /**
-	 * Get show data series name
+     * Get show data series name
-	 *
+     *
-	 * @return boolean
+     * @return boolean
-	 */
+     */
-	public function getShowSerName() {
+    public function getShowSerName()
-		return $this->_showSerName;
+    {
-	}
+        return $this->showSerName;
+    }
 
-	/**
+    /**
-	 * Set show ser name
+     * Set show ser name
-	 * Specifies that the series name should be shown in data labels.
+     * 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;
+    }
 
-	/**
+    /**
-	 * Get show percentage
+     * Get show percentage
-	 *
+     *
-	 * @return boolean
+     * @return boolean
-	 */
+     */
-	public function getShowPercent() {
+    public function getShowPercent()
-		return $this->_showPercent;
+    {
-	}
+        return $this->showPercent;
+    }
 
-	/**
+    /**
-	 * Set show percentage
+     * Set show percentage
-	 * Specifies that the percentage should be shown in data labels.
+     * Specifies that the percentage should be shown in data labels.
-	 *
+     *
-	 * @param boolean $value		Show percentage
+     * @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;
+    }
 
-	/**
+    /**
-	 * Get show bubble size
+     * Get show bubble size
-	 *
+     *
-	 * @return boolean
+     * @return boolean
-	 */
+     */
-	public function getShowBubbleSize() {
+    public function getShowBubbleSize()
-		return $this->_showBubbleSize;
+    {
-	}
+        return $this->showBubbleSize;
+    }
 
-	/**
+    /**
-	 * Set show bubble size
+     * Set show bubble size
-	 * Specifies that the bubble size should be shown in data labels.
+     * Specifies that the bubble size should be shown in data labels.
-	 *
+     *
-	 * @param boolean $value		Show bubble size
+     * @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;
+    }
 
-	/**
+    /**
-	 * Get show leader lines
+     * Get show leader lines
-	 *
+     *
-	 * @return boolean
+     * @return boolean
-	 */
+     */
-	public function getShowLeaderLines() {
+    public function getShowLeaderLines()
-		return $this->_showLeaderLines;
+    {
-	}
+        return $this->showLeaderLines;
-
+    }
-	/**
-	 * Set show leader lines
-	 * Specifies that leader lines should be shown in data labels.
-	 *
-	 * @param boolean $value		Show leader lines
-	 */
-	public function setShowLeaderLines($value) {
-		$this->_showLeaderLines = $value;
-	}
 
+    /**
+     * Set show leader lines
+     * 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;
+        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
@@ -18,154 +19,152 @@
  * 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
+ * @category    PHPExcel
- * @package		PHPExcel_Chart
+ * @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
+ * @license        http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
- * @version		##VERSION##, ##DATE##
+ * @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 */
+    /** Legend positions */
-	const xlLegendPositionBottom	= -4107;	//	Below the chart.
+    const xlLegendPositionBottom = -4107;    //    Below the chart.
-	const xlLegendPositionCorner	= 2;		//	In the upper right-hand corner of the chart border.
+    const xlLegendPositionCorner = 2;        //    In the upper right-hand corner of the chart border.
-	const xlLegendPositionCustom	= -4161;	//	A custom position.
+    const xlLegendPositionCustom = -4161;    //    A custom position.
-	const xlLegendPositionLeft		= -4131;	//	Left of the chart.
+    const xlLegendPositionLeft   = -4131;    //    Left of the chart.
-	const xlLegendPositionRight		= -4152;	//	Right of the chart.
+    const xlLegendPositionRight  = -4152;    //    Right of the chart.
-	const xlLegendPositionTop		= -4160;	//	Above the chart.
+    const xlLegendPositionTop    = -4160;    //    Above the chart.
 
-	const POSITION_RIGHT	= 'r';
+    const POSITION_RIGHT    = 'r';
-	const POSITION_LEFT		= 'l';
+    const POSITION_LEFT     = 'l';
-	const POSITION_BOTTOM	= 'b';
+    const POSITION_BOTTOM   = 'b';
-	const POSITION_TOP		= 't';
+    const POSITION_TOP      = 't';
-	const POSITION_TOPRIGHT	= 'tr';
+    const POSITION_TOPRIGHT = 'tr';
 
-	private static $_positionXLref = array( self::xlLegendPositionBottom	=> self::POSITION_BOTTOM,
+    private static $positionXLref = array(
-											self::xlLegendPositionCorner	=> self::POSITION_TOPRIGHT,
+        self::xlLegendPositionBottom => self::POSITION_BOTTOM,
-											self::xlLegendPositionCustom	=> '??',
+        self::xlLegendPositionCorner => self::POSITION_TOPRIGHT,
-											self::xlLegendPositionLeft		=> self::POSITION_LEFT,
+        self::xlLegendPositionCustom => '??',
-											self::xlLegendPositionRight		=> self::POSITION_RIGHT,
+        self::xlLegendPositionLeft   => self::POSITION_LEFT,
-											self::xlLegendPositionTop		=> self::POSITION_TOP
+        self::xlLegendPositionRight  => self::POSITION_RIGHT,
-										  );
+        self::xlLegendPositionTop    => self::POSITION_TOP
+    );
 
-	/**
+    /**
-	 * Legend position
+     * Legend position
-	 *
+     *
-	 * @var	string
+     * @var    string
-	 */
+     */
-	private $_position = self::POSITION_RIGHT;
+    private $position = self::POSITION_RIGHT;
 
-	/**
+    /**
-	 * Allow overlay of other elements?
+     * Allow overlay of other elements?
-	 *
+     *
-	 * @var	boolean
+     * @var    boolean
-	 */
+     */
-	private $_overlay = TRUE;
+    private $overlay = true;
 
-	/**
+    /**
-	 * Legend Layout
+     * Legend Layout
-	 *
+     *
-	 * @var	PHPExcel_Chart_Layout
+     * @var    PHPExcel_Chart_Layout
-	 */
+     */
-	private $_layout = NULL;
+    private $layout = null;
 
 
-	/**
+    /**
-	 *	Create a new PHPExcel_Chart_Legend
+     *    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->setPosition($position);
-		$this->_layout = $layout;
+        $this->layout = $layout;
-		$this->setOverlay($overlay);
+        $this->setOverlay($overlay);
-	}
+    }
 
-	/**
+    /**
-	 * Get legend position as an excel string value
+     * Get legend position as an excel string value
-	 *
+     *
-	 * @return	string
+     * @return    string
-	 */
+     */
-	public function getPosition() {
+    public function getPosition()
-		return $this->_position;
+    {
-	}
+        return $this->position;
+    }
 
-	/**
+    /**
-	 * Get legend position using an excel string value
+     * Get legend position using an excel string value
-	 *
+     *
-	 * @param	string	$position
+     * @param    string    $position
-	 */
+     */
-	public function setPosition($position = self::POSITION_RIGHT) {
+    public function setPosition($position = self::POSITION_RIGHT)
-		if (!in_array($position,self::$_positionXLref)) {
+    {
-			return false;
+        if (!in_array($position, self::$positionXLref)) {
-		}
+            return false;
+        }
 
-		$this->_position = $position;
+        $this->position = $position;
-		return true;
+        return true;
-	}
+    }
 
-	/**
+    /**
-	 * Get legend position as an Excel internal numeric value
+     * Get legend position as an Excel internal numeric value
-	 *
+     *
-	 * @return	number
+     * @return    number
-	 */
+     */
-	public function getPositionXL() {
+    public function getPositionXL()
-		return array_search($this->_position,self::$_positionXLref);
+    {
-	}
+        return array_search($this->position, self::$positionXLref);
+    }
 
-	/**
+    /**
-	 * Set legend position using an Excel internal numeric value
+     * Set legend position using an Excel internal numeric value
-	 *
+     *
-	 * @param	number	$positionXL
+     * @param    number    $positionXL
-	 */
+     */
-	public function setPositionXL($positionXL = self::xlLegendPositionRight) {
+    public function setPositionXL($positionXL = self::xlLegendPositionRight)
-		if (!array_key_exists($positionXL,self::$_positionXLref)) {
+    {
-			return false;
+        if (!array_key_exists($positionXL, self::$positionXLref)) {
-		}
+            return false;
+        }
 
-		$this->_position = self::$_positionXLref[$positionXL];
+        $this->position = self::$positionXLref[$positionXL];
-		return true;
+        return true;
-	}
+    }
 
-	/**
+    /**
-	 * Get allow overlay of other elements?
+     * Get allow overlay of other elements?
-	 *
+     *
-	 * @return	boolean
+     * @return    boolean
-	 */
+     */
-	public function getOverlay() {
+    public function getOverlay()
-		return $this->_overlay;
+    {
-	}
+        return $this->overlay;
+    }
 
-	/**
+    /**
-	 * Set allow overlay of other elements?
+     * Set allow overlay of other elements?
-	 *
+     *
-	 * @param	boolean	$overlay
+     * @param    boolean    $overlay
-	 * @return	boolean
+     * @return    boolean
-	 */
+     */
-	public function setOverlay($overlay = FALSE) {
+    public function setOverlay($overlay = false)
-		if (!is_bool($overlay)) {
+    {
-			return false;
+        if (!is_bool($overlay)) {
-		}
+            return false;
+        }
 
-		$this->_overlay = $overlay;
+        $this->overlay = $overlay;
-		return true;
+        return true;
-	}
+    }
-
-	/**
-	 * Get Layout
-	 *
-	 * @return PHPExcel_Chart_Layout
-	 */
-	public function getLayout() {
-		return $this->_layout;
-	}
 
+    /**
+     * Get Layout
+     *
+     * @return PHPExcel_Chart_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
@@ -18,108 +19,108 @@
  * 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
+ * @category    PHPExcel
- * @package		PHPExcel_Chart
+ * @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
+ * @license        http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
- * @version		##VERSION##, ##DATE##
+ * @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
 {
-	/**
+    /**
-	 * PlotArea Layout
+     * PlotArea Layout
-	 *
+     *
-	 * @var PHPExcel_Chart_Layout
+     * @var PHPExcel_Chart_Layout
-	 */
+     */
-	private $_layout = null;
+    private $layout = null;
 
-	/**
+    /**
-	 * Plot Series
+     * Plot Series
-	 *
+     *
-	 * @var array of PHPExcel_Chart_DataSeries
+     * @var array of PHPExcel_Chart_DataSeries
-	 */
+     */
-	private $_plotSeries = array();
+    private $plotSeries = array();
 
-	/**
+    /**
-	 * Create a new PHPExcel_Chart_PlotArea
+     * Create a new PHPExcel_Chart_PlotArea
-	 */
+     */
-	public function __construct(PHPExcel_Chart_Layout $layout = null, $plotSeries = array())
+    public function __construct(PHPExcel_Chart_Layout $layout = null, $plotSeries = array())
-	{
+    {
-		$this->_layout = $layout;
+        $this->layout = $layout;
-		$this->_plotSeries = $plotSeries;
+        $this->plotSeries = $plotSeries;
-	}
+    }
 
-	/**
+    /**
-	 * Get Layout
+     * Get Layout
-	 *
+     *
-	 * @return PHPExcel_Chart_Layout
+     * @return PHPExcel_Chart_Layout
-	 */
+     */
-	public function getLayout() {
+    public function getLayout()
-		return $this->_layout;
+    {
-	}
+        return $this->layout;
+    }
 
-	/**
+    /**
-	 * Get Number of Plot Groups
+     * Get Number of Plot Groups
-	 *
+     *
-	 * @return array of PHPExcel_Chart_DataSeries
+     * @return array of PHPExcel_Chart_DataSeries
-	 */
+     */
-	public function getPlotGroupCount() {
+    public function getPlotGroupCount()
-		return count($this->_plotSeries);
+    {
-	}
+        return count($this->plotSeries);
+    }
 
-	/**
+    /**
-	 * Get Number of Plot Series
+     * Get Number of Plot Series
-	 *
+     *
-	 * @return integer
+     * @return integer
-	 */
+     */
-	public function getPlotSeriesCount() {
+    public function getPlotSeriesCount()
-		$seriesCount = 0;
+    {
-		foreach($this->_plotSeries as $plot) {
+        $seriesCount = 0;
-			$seriesCount += $plot->getPlotSeriesCount();
+        foreach ($this->plotSeries as $plot) {
-		}
+            $seriesCount += $plot->getPlotSeriesCount();
-		return $seriesCount;
+        }
-	}
+        return $seriesCount;
+    }
 
-	/**
+    /**
-	 * Get Plot Series
+     * Get Plot Series
-	 *
+     *
-	 * @return array of PHPExcel_Chart_DataSeries
+     * @return array of PHPExcel_Chart_DataSeries
-	 */
+     */
-	public function getPlotGroup() {
+    public function getPlotGroup()
-		return $this->_plotSeries;
+    {
-	}
+        return $this->plotSeries;
+    }
 
-	/**
+    /**
-	 * Get Plot Series by Index
+     * Get Plot Series by Index
-	 *
+     *
-	 * @return PHPExcel_Chart_DataSeries
+     * @return PHPExcel_Chart_DataSeries
-	 */
+     */
-	public function getPlotGroupByIndex($index) {
+    public function getPlotGroupByIndex($index)
-		return $this->_plotSeries[$index];
+    {
-	}
+        return $this->plotSeries[$index];
+    }
 
-	/**
+    /**
-	 * Set Plot Series
+     * Set Plot Series
-	 *
+     *
-	 * @param [PHPExcel_Chart_DataSeries]
+     * @param [PHPExcel_Chart_DataSeries]
-	 */
+     * @return PHPExcel_Chart_PlotArea
-	public function setPlotSeries($plotSeries = array()) {
+     */
-		$this->_plotSeries = $plotSeries;
+    public function setPlotSeries($plotSeries = array())
-	}
+    {
+        $this->plotSeries = $plotSeries;
         
-	public function refresh(PHPExcel_Worksheet $worksheet) {
+        return $this;
-	    foreach($this->_plotSeries as $plotSeries) {
+    }
-			$plotSeries->refresh($worksheet);
-		}
-	}
 
+    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
@@ -18,72 +19,68 @@
  * 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
+ * @category    PHPExcel
- * @package		PHPExcel_Chart
+ * @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
+ * @license        http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
- * @version		##VERSION##, ##DATE##
+ * @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
 {
 
-	/**
+    /**
-	 * Title Caption
+     * Title Caption
-	 *
+     *
-	 * @var string
+     * @var string
-	 */
+     */
-	private $_caption = null;
+    private $caption = null;
 
-	/**
+    /**
-	 * Title Layout
+     * Title Layout
-	 *
+     *
-	 * @var PHPExcel_Chart_Layout
+     * @var PHPExcel_Chart_Layout
-	 */
+     */
-	private $_layout = null;
+    private $layout = null;
 
-	/**
+    /**
-	 * Create a new PHPExcel_Chart_Title
+     * Create a new PHPExcel_Chart_Title
-	 */
+     */
-	public function __construct($caption = null, PHPExcel_Chart_Layout $layout = null)
+    public function __construct($caption = null, PHPExcel_Chart_Layout $layout = null)
-	{
+    {
-		$this->_caption = $caption;
+        $this->caption = $caption;
-		$this->_layout = $layout;
+        $this->layout = $layout;
-	}
+    }
 
-	/**
+    /**
-	 * Get caption
+     * Get caption
-	 *
+     *
-	 * @return string
+     * @return string
-	 */
+     */
-	public function getCaption() {
+    public function getCaption()
-		return $this->_caption;
+    {
-	}
+        return $this->caption;
+    }
 
-	/**
+    /**
-	 * Set caption
+     * Set caption
-	 *
+     *
-	 * @param string $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;
-	 * Get Layout
+    }
-	 *
-	 * @return PHPExcel_Chart_Layout
-	 */
-	public function getLayout() {
-		return $this->_layout;
-	}
 
+    /**
+     * Get Layout
+     *
+     * @return PHPExcel_Chart_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->author    = 'Author';
-        $this->_text		= new PHPExcel_RichText();
+        $this->text      = new PHPExcel_RichText();
-        $this->_fillColor	= new PHPExcel_Style_Color('FFFFFFE1');
+        $this->fillColor = new PHPExcel_Style_Color('FFFFFFE1');
-        $this->_alignment	= PHPExcel_Style_Alignment::HORIZONTAL_GENERAL;
+        $this->alignment = PHPExcel_Style_Alignment::HORIZONTAL_GENERAL;
     }
 
     /**
@@ -117,8 +109,9 @@ class PHPExcel_Comment implements PHPExcel_IComparable
      *
      * @return string
      */
-    public function getAuthor() {
+    public function getAuthor()
-        return $this->_author;
+    {
+        return $this->author;
     }
 
     /**
@@ -127,8 +120,9 @@ class PHPExcel_Comment implements PHPExcel_IComparable
      * @param string $pValue
      * @return PHPExcel_Comment
      */
-    public function setAuthor($pValue = '') {
+    public function setAuthor($pValue = '')
-        $this->_author = $pValue;
+    {
+        $this->author = $pValue;
         return $this;
     }
 
@@ -137,8 +131,9 @@ class PHPExcel_Comment implements PHPExcel_IComparable
      *
      * @return PHPExcel_RichText
      */
-    public function getText() {
+    public function getText()
-        return $this->_text;
+    {
+        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) {
+    public function setText(PHPExcel_RichText $pValue)
-        $this->_text = $pValue;
+    {
+        $this->text = $pValue;
         return $this;
     }
 
@@ -157,8 +153,9 @@ class PHPExcel_Comment implements PHPExcel_IComparable
      *
      * @return string
      */
-    public function getWidth() {
+    public function getWidth()
-        return $this->_width;
+    {
+        return $this->width;
     }
 
     /**
@@ -167,8 +164,9 @@ class PHPExcel_Comment implements PHPExcel_IComparable
      * @param string $value
      * @return PHPExcel_Comment
      */
-    public function setWidth($value = '96pt') {
+    public function setWidth($value = '96pt')
-        $this->_width = $value;
+    {
+        $this->width = $value;
         return $this;
     }
 
@@ -177,8 +175,9 @@ class PHPExcel_Comment implements PHPExcel_IComparable
      *
      * @return string
      */
-    public function getHeight() {
+    public function getHeight()
-        return $this->_height;
+    {
+        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') {
+    public function setHeight($value = '55.5pt')
-        $this->_height = $value;
+    {
+        $this->height = $value;
         return $this;
     }
 
@@ -197,8 +197,9 @@ class PHPExcel_Comment implements PHPExcel_IComparable
      *
      * @return string
      */
-    public function getMarginLeft() {
+    public function getMarginLeft()
-        return $this->_marginLeft;
+    {
+        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') {
+    public function setMarginLeft($value = '59.25pt')
-        $this->_marginLeft = $value;
+    {
+        $this->marginLeft = $value;
         return $this;
     }
 
@@ -217,8 +219,9 @@ class PHPExcel_Comment implements PHPExcel_IComparable
      *
      * @return string
      */
-    public function getMarginTop() {
+    public function getMarginTop()
-        return $this->_marginTop;
+    {
+        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') {
+    public function setMarginTop($value = '1.5pt')
-        $this->_marginTop = $value;
+    {
+        $this->marginTop = $value;
         return $this;
     }
 
@@ -237,8 +241,9 @@ class PHPExcel_Comment implements PHPExcel_IComparable
      *
      * @return boolean
      */
-    public function getVisible() {
+    public function getVisible()
-        return $this->_visible;
+    {
+        return $this->visible;
     }
 
     /**
@@ -247,8 +252,9 @@ class PHPExcel_Comment implements PHPExcel_IComparable
      * @param boolean $value
      * @return PHPExcel_Comment
      */
-    public function setVisible($value = false) {
+    public function setVisible($value = false)
-        $this->_visible = $value;
+    {
+        $this->visible = $value;
         return $this;
     }
 
@@ -257,8 +263,9 @@ class PHPExcel_Comment implements PHPExcel_IComparable
      *
      * @return PHPExcel_Style_Color
      */
-    public function getFillColor() {
+    public function getFillColor()
-        return $this->_fillColor;
+    {
+        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) {
+    public function setAlignment($pValue = PHPExcel_Style_Alignment::HORIZONTAL_GENERAL)
-        $this->_alignment = $pValue;
+    {
+        $this->alignment = $pValue;
         return $this;
     }
 
@@ -277,8 +285,9 @@ class PHPExcel_Comment implements PHPExcel_IComparable
      *
      * @return string
      */
-    public function getAlignment() {
+    public function getAlignment()
-        return $this->_alignment;
+    {
+        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->author .
-            . $this->_text->getHashCode()
+            $this->text->getHashCode() .
-            . $this->_width
+            $this->width .
-            . $this->_height
+            $this->height .
-            . $this->_marginLeft
+            $this->marginLeft .
-            . $this->_marginTop
+            $this->marginTop .
-            . ($this->_visible ? 1 : 0)
+            ($this->visible ? 1 : 0) .
-            . $this->_fillColor->getHashCode()
+            $this->fillColor->getHashCode() .
-            . $this->_alignment
+            $this->alignment .
-            . __CLASS__
+            __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() {
+    public function __toString()
-        return $this->_text->getPlainText();
+    {
+        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,23 +21,14 @@
  *
  * @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 */
-    const PROPERTY_TYPE_BOOLEAN	= 'b';
+    const PROPERTY_TYPE_BOOLEAN = 'b';
     const PROPERTY_TYPE_INTEGER = 'i';
     const PROPERTY_TYPE_FLOAT   = 'f';
     const PROPERTY_TYPE_DATE    = 'd';
@@ -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->lastModifiedBy = $this->creator;
-        $this->_created        = time();
+        $this->created  = time();
-        $this->_modified    = time();
+        $this->modified = time();
     }
 
     /**
@@ -144,8 +136,9 @@ class PHPExcel_DocumentProperties
      *
      * @return string
      */
-    public function getCreator() {
+    public function getCreator()
-        return $this->_creator;
+    {
+        return $this->creator;
     }
 
     /**
@@ -154,8 +147,9 @@ class PHPExcel_DocumentProperties
      * @param string $pValue
      * @return PHPExcel_DocumentProperties
      */
-    public function setCreator($pValue = '') {
+    public function setCreator($pValue = '')
-        $this->_creator = $pValue;
+    {
+        $this->creator = $pValue;
         return $this;
     }
 
@@ -164,8 +158,9 @@ class PHPExcel_DocumentProperties
      *
      * @return string
      */
-    public function getLastModifiedBy() {
+    public function getLastModifiedBy()
-        return $this->_lastModifiedBy;
+    {
+        return $this->lastModifiedBy;
     }
 
     /**
@@ -174,8 +169,9 @@ class PHPExcel_DocumentProperties
      * @param string $pValue
      * @return PHPExcel_DocumentProperties
      */
-    public function setLastModifiedBy($pValue = '') {
+    public function setLastModifiedBy($pValue = '')
-        $this->_lastModifiedBy = $pValue;
+    {
+        $this->lastModifiedBy = $pValue;
         return $this;
     }
 
@@ -184,8 +180,9 @@ class PHPExcel_DocumentProperties
      *
      * @return datetime
      */
-    public function getCreated() {
+    public function getCreated()
-        return $this->_created;
+    {
+        return $this->created;
     }
 
     /**
@@ -194,8 +191,9 @@ class PHPExcel_DocumentProperties
      * @param datetime $pValue
      * @return PHPExcel_DocumentProperties
      */
-    public function setCreated($pValue = null) {
+    public function setCreated($pValue = null)
-        if ($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() {
+    public function getModified()
-        return $this->_modified;
+    {
+        return $this->modified;
     }
 
     /**
@@ -224,8 +223,9 @@ class PHPExcel_DocumentProperties
      * @param datetime $pValue
      * @return PHPExcel_DocumentProperties
      */
-    public function setModified($pValue = null) {
+    public function setModified($pValue = null)
-        if ($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() {
+    public function getTitle()
-        return $this->_title;
+    {
+        return $this->title;
     }
 
     /**
@@ -254,8 +255,9 @@ class PHPExcel_DocumentProperties
      * @param string $pValue
      * @return PHPExcel_DocumentProperties
      */
-    public function setTitle($pValue = '') {
+    public function setTitle($pValue = '')
-        $this->_title = $pValue;
+    {
+        $this->title = $pValue;
         return $this;
     }
 
@@ -264,8 +266,9 @@ class PHPExcel_DocumentProperties
      *
      * @return string
      */
-    public function getDescription() {
+    public function getDescription()
-        return $this->_description;
+    {
+        return $this->description;
     }
 
     /**
@@ -274,8 +277,9 @@ class PHPExcel_DocumentProperties
      * @param string $pValue
      * @return PHPExcel_DocumentProperties
      */
-    public function setDescription($pValue = '') {
+    public function setDescription($pValue = '')
-        $this->_description = $pValue;
+    {
+        $this->description = $pValue;
         return $this;
     }
 
@@ -284,8 +288,9 @@ class PHPExcel_DocumentProperties
      *
      * @return string
      */
-    public function getSubject() {
+    public function getSubject()
-        return $this->_subject;
+    {
+        return $this->subject;
     }
 
     /**
@@ -294,8 +299,9 @@ class PHPExcel_DocumentProperties
      * @param string $pValue
      * @return PHPExcel_DocumentProperties
      */
-    public function setSubject($pValue = '') {
+    public function setSubject($pValue = '')
-        $this->_subject = $pValue;
+    {
+        $this->subject = $pValue;
         return $this;
     }
 
@@ -304,8 +310,9 @@ class PHPExcel_DocumentProperties
      *
      * @return string
      */
-    public function getKeywords() {
+    public function getKeywords()
-        return $this->_keywords;
+    {
+        return $this->keywords;
     }
 
     /**
@@ -314,8 +321,9 @@ class PHPExcel_DocumentProperties
      * @param string $pValue
      * @return PHPExcel_DocumentProperties
      */
-    public function setKeywords($pValue = '') {
+    public function setKeywords($pValue = '')
-        $this->_keywords = $pValue;
+    {
+        $this->keywords = $pValue;
         return $this;
     }
 
@@ -324,8 +332,9 @@ class PHPExcel_DocumentProperties
      *
      * @return string
      */
-    public function getCategory() {
+    public function getCategory()
-        return $this->_category;
+    {
+        return $this->category;
     }
 
     /**
@@ -334,8 +343,9 @@ class PHPExcel_DocumentProperties
      * @param string $pValue
      * @return PHPExcel_DocumentProperties
      */
-    public function setCategory($pValue = '') {
+    public function setCategory($pValue = '')
-        $this->_category = $pValue;
+    {
+        $this->category = $pValue;
         return $this;
     }
 
@@ -344,8 +354,9 @@ class PHPExcel_DocumentProperties
      *
      * @return string
      */
-    public function getCompany() {
+    public function getCompany()
-        return $this->_company;
+    {
+        return $this->company;
     }
 
     /**
@@ -354,8 +365,9 @@ class PHPExcel_DocumentProperties
      * @param string $pValue
      * @return PHPExcel_DocumentProperties
      */
-    public function setCompany($pValue = '') {
+    public function setCompany($pValue = '')
-        $this->_company = $pValue;
+    {
+        $this->company = $pValue;
         return $this;
     }
 
@@ -364,8 +376,9 @@ class PHPExcel_DocumentProperties
      *
      * @return string
      */
-    public function getManager() {
+    public function getManager()
-        return $this->_manager;
+    {
+        return $this->manager;
     }
 
     /**
@@ -374,8 +387,9 @@ class PHPExcel_DocumentProperties
      * @param string $pValue
      * @return PHPExcel_DocumentProperties
      */
-    public function setManager($pValue = '') {
+    public function setManager($pValue = '')
-        $this->_manager = $pValue;
+    {
+        $this->manager = $pValue;
         return $this;
     }
 
@@ -384,8 +398,9 @@ class PHPExcel_DocumentProperties
      *
      * @return array of string
      */
-    public function getCustomProperties() {
+    public function getCustomProperties()
-        return array_keys($this->_customProperties);
+    {
+        return array_keys($this->customProperties);
     }
 
     /**
@@ -394,8 +409,9 @@ class PHPExcel_DocumentProperties
      * @param string $propertyName
      * @return boolean
      */
-    public function isCustomPropertySet($propertyName) {
+    public function isCustomPropertySet($propertyName)
-        return isset($this->_customProperties[$propertyName]);
+    {
+        return isset($this->customProperties[$propertyName]);
     }
 
     /**
@@ -404,9 +420,10 @@ class PHPExcel_DocumentProperties
      * @param string $propertyName
      * @return string
      */
-    public function getCustomPropertyValue($propertyName) {
+    public function getCustomPropertyValue($propertyName)
-        if (isset($this->_customProperties[$propertyName])) {
+    {
-            return $this->_customProperties[$propertyName]['value'];
+        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) {
+    public function getCustomPropertyType($propertyName)
-        if (isset($this->_customProperties[$propertyName])) {
+    {
-            return $this->_customProperties[$propertyName]['type'];
+        if (isset($this->customProperties[$propertyName])) {
+            return $this->customProperties[$propertyName]['type'];
         }
 
     }
@@ -430,24 +448,25 @@ class PHPExcel_DocumentProperties
      * @param string $propertyName
      * @param mixed $propertyValue
      * @param string $propertyType
-     * 	 'i'    : Integer
+     *      'i'    : Integer
      *   'f' : Floating Point
      *   's' : String
      *   'd' : Date/Time
      *   'b' : Boolean
      * @return PHPExcel_DocumentProperties
      */
-    public function setCustomProperty($propertyName,$propertyValue='',$propertyType=NULL) {
+    public function setCustomProperty($propertyName, $propertyValue = '', $propertyType = null)
-        if (($propertyType === NULL) || (!in_array($propertyType,array(self::PROPERTY_TYPE_INTEGER,
+    {
-                                                                       self::PROPERTY_TYPE_FLOAT,
+        if (($propertyType === null) || (!in_array($propertyType, array(self::PROPERTY_TYPE_INTEGER,
-                                                                       self::PROPERTY_TYPE_STRING,
+                                                                        self::PROPERTY_TYPE_FLOAT,
-                                                                       self::PROPERTY_TYPE_DATE,
+                                                                        self::PROPERTY_TYPE_STRING,
-                                                                       self::PROPERTY_TYPE_BOOLEAN)))) {
+                                                                        self::PROPERTY_TYPE_DATE,
-            if ($propertyValue === NULL) {
+                                                                        self::PROPERTY_TYPE_BOOLEAN)))) {
+            if ($propertyValue === null) {
                 $propertyType = self::PROPERTY_TYPE_STRING;
             } elseif (is_float($propertyValue)) {
                 $propertyType = self::PROPERTY_TYPE_FLOAT;
-            } elseif(is_int($propertyValue)) {
+            } elseif (is_int($propertyValue)) {
                 $propertyType = self::PROPERTY_TYPE_INTEGER;
             } elseif (is_bool($propertyValue)) {
                 $propertyType = self::PROPERTY_TYPE_BOOLEAN;
@@ -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,114 +497,115 @@ class PHPExcel_DocumentProperties
         }
     }
 
-    public static function convertProperty($propertyValue,$propertyType) {
+    public static function convertProperty($propertyValue, $propertyType)
+    {
         switch ($propertyType) {
-            case 'empty'    :    //    Empty
+            case 'empty':     //    Empty
                 return '';
                 break;
-            case 'null'        :    //    Null
+            case 'null':      //    Null
-                return NULL;
+                return null;
                 break;
-            case 'i1'        :    //    1-Byte Signed Integer
+            case 'i1':        //    1-Byte Signed Integer
-            case 'i2'        :    //    2-Byte Signed Integer
+            case 'i2':        //    2-Byte Signed Integer
-            case 'i4'        :    //    4-Byte Signed Integer
+            case 'i4':        //    4-Byte Signed Integer
-            case 'i8'        :    //    8-Byte Signed Integer
+            case 'i8':        //    8-Byte Signed Integer
-            case 'int'        :    //    Integer
+            case 'int':       //    Integer
                 return (int) $propertyValue;
                 break;
-            case 'ui1'        :    //    1-Byte Unsigned Integer
+            case 'ui1':       //    1-Byte Unsigned Integer
-            case 'ui2'        :    //    2-Byte Unsigned Integer
+            case 'ui2':       //    2-Byte Unsigned Integer
-            case 'ui4'        :    //    4-Byte Unsigned Integer
+            case 'ui4':       //    4-Byte Unsigned Integer
-            case 'ui8'        :    //    8-Byte Unsigned Integer
+            case 'ui8':       //    8-Byte Unsigned Integer
-            case 'uint'        :    //    Unsigned Integer
+            case 'uint':      //    Unsigned Integer
                 return abs((int) $propertyValue);
                 break;
-            case 'r4'        :    //    4-Byte Real Number
+            case 'r4':        //    4-Byte Real Number
-            case 'r8'        :    //    8-Byte Real Number
+            case 'r8':        //    8-Byte Real Number
-            case 'decimal'    :    //    Decimal
+            case 'decimal':   //    Decimal
                 return (float) $propertyValue;
                 break;
-            case 'lpstr'    :    //    LPSTR
+            case 'lpstr':     //    LPSTR
-            case 'lpwstr'    :    //    LPWSTR
+            case 'lpwstr':    //    LPWSTR
-            case 'bstr'        :    //    Basic String
+            case 'bstr':      //    Basic String
                 return $propertyValue;
                 break;
-            case 'date'        :    //    Date and Time
+            case 'date':      //    Date and Time
-            case 'filetime'    :    //    File Time
+            case 'filetime':  //    File Time
                 return strtotime($propertyValue);
                 break;
-            case 'bool'        :    //    Boolean
+            case 'bool':     //    Boolean
-                return ($propertyValue == 'true') ? True : False;
+                return ($propertyValue == 'true') ? true : false;
                 break;
-            case 'cy'        :    //    Currency
+            case 'cy':       //    Currency
-            case 'error'    :    //    Error Status Code
+            case 'error':    //    Error Status Code
-            case 'vector'    :    //    Vector
+            case 'vector':   //    Vector
-            case 'array'    :    //    Array
+            case 'array':    //    Array
-            case 'blob'        :    //    Binary Blob
+            case 'blob':     //    Binary Blob
-            case 'oblob'    :    //    Binary Blob Object
+            case 'oblob':    //    Binary Blob Object
-            case 'stream'    :    //    Binary Stream
+            case 'stream':   //    Binary Stream
-            case 'ostream'    :    //    Binary Stream Object
+            case 'ostream':  //    Binary Stream Object
-            case 'storage'    :    //    Binary Storage
+            case 'storage':  //    Binary Storage
-            case 'ostorage'    :    //    Binary Storage Object
+            case 'ostorage': //    Binary Storage Object
-            case 'vstream'    :    //    Binary Versioned Stream
+            case 'vstream':  //    Binary Versioned Stream
-            case 'clsid'    :    //    Class ID
+            case 'clsid':    //    Class ID
-            case 'cf'        :    //    Clipboard Data
+            case 'cf':       //    Clipboard Data
                 return $propertyValue;
                 break;
         }
         return $propertyValue;
     }
 
-    public static function convertPropertyType($propertyType) {
+    public static function convertPropertyType($propertyType)
+    {
         switch ($propertyType) {
-            case 'i1'        :    //    1-Byte Signed Integer
+            case 'i1':       //    1-Byte Signed Integer
-            case 'i2'        :    //    2-Byte Signed Integer
+            case 'i2':       //    2-Byte Signed Integer
-            case 'i4'        :    //    4-Byte Signed Integer
+            case 'i4':       //    4-Byte Signed Integer
-            case 'i8'        :    //    8-Byte Signed Integer
+            case 'i8':       //    8-Byte Signed Integer
-            case 'int'        :    //    Integer
+            case 'int':      //    Integer
-            case 'ui1'        :    //    1-Byte Unsigned Integer
+            case 'ui1':      //    1-Byte Unsigned Integer
-            case 'ui2'        :    //    2-Byte Unsigned Integer
+            case 'ui2':      //    2-Byte Unsigned Integer
-            case 'ui4'        :    //    4-Byte Unsigned Integer
+            case 'ui4':      //    4-Byte Unsigned Integer
-            case 'ui8'        :    //    8-Byte Unsigned Integer
+            case 'ui8':      //    8-Byte Unsigned Integer
-            case 'uint'        :    //    Unsigned Integer
+            case 'uint':     //    Unsigned Integer
                 return self::PROPERTY_TYPE_INTEGER;
                 break;
-            case 'r4'        :    //    4-Byte Real Number
+            case 'r4':       //    4-Byte Real Number
-            case 'r8'        :    //    8-Byte Real Number
+            case 'r8':       //    8-Byte Real Number
-            case 'decimal'    :    //    Decimal
+            case 'decimal':  //    Decimal
                 return self::PROPERTY_TYPE_FLOAT;
                 break;
-            case 'empty'    :    //    Empty
+            case 'empty':    //    Empty
-            case 'null'        :    //    Null
+            case 'null':     //    Null
-            case 'lpstr'    :    //    LPSTR
+            case 'lpstr':    //    LPSTR
-            case 'lpwstr'    :    //    LPWSTR
+            case 'lpwstr':   //    LPWSTR
-            case 'bstr'        :    //    Basic String
+            case 'bstr':     //    Basic String
                 return self::PROPERTY_TYPE_STRING;
                 break;
-            case 'date'        :    //    Date and Time
+            case 'date':     //    Date and Time
-            case 'filetime'    :    //    File Time
+            case 'filetime': //    File Time
                 return self::PROPERTY_TYPE_DATE;
                 break;
-            case 'bool'        :    //    Boolean
+            case 'bool':     //    Boolean
                 return self::PROPERTY_TYPE_BOOLEAN;
                 break;
-            case 'cy'        :    //    Currency
+            case 'cy':       //    Currency
-            case 'error'    :    //    Error Status Code
+            case 'error':    //    Error Status Code
-            case 'vector'    :    //    Vector
+            case 'vector':   //    Vector
-            case 'array'    :    //    Array
+            case 'array':    //    Array
-            case 'blob'        :    //    Binary Blob
+            case 'blob':     //    Binary Blob
-            case 'oblob'    :    //    Binary Blob Object
+            case 'oblob':    //    Binary Blob Object
-            case 'stream'    :    //    Binary Stream
+            case 'stream':   //    Binary Stream
-            case 'ostream'    :    //    Binary Stream Object
+            case 'ostream':  //    Binary Stream Object
-            case 'storage'    :    //    Binary Storage
+            case 'storage':  //    Binary Storage
-            case 'ostorage'    :    //    Binary Storage Object
+            case 'ostorage': //    Binary Storage Object
-            case 'vstream'    :    //    Binary Versioned Stream
+            case 'vstream':  //    Binary Versioned Stream
-            case 'clsid'    :    //    Class ID
+            case 'clsid':    //    Class ID
-            case 'cf'        :    //    Clipboard Data
+            case 'cf':       //    Clipboard Data
                 return self::PROPERTY_TYPE_UNKNOWN;
                 break;
         }
         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,78 +21,70 @@
  *
  * @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
+ * @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
 {
-	/**
+    /**
-	 * LockRevision
+     * LockRevision
-	 *
+     *
-	 * @var boolean
+     * @var boolean
-	 */
+     */
-	private $_lockRevision;
+    private $lockRevision;
 
-	/**
+    /**
-	 * LockStructure
+     * LockStructure
-	 *
+     *
-	 * @var boolean
+     * @var boolean
-	 */
+     */
-	private $_lockStructure;
+    private $lockStructure;
 
-	/**
+    /**
-	 * LockWindows
+     * LockWindows
-	 *
+     *
-	 * @var boolean
+     * @var boolean
-	 */
+     */
-	private $_lockWindows;
+    private $lockWindows;
 
-	/**
+    /**
-	 * RevisionsPassword
+     * RevisionsPassword
-	 *
+     *
-	 * @var string
+     * @var string
-	 */
+     */
-	private $_revisionsPassword;
+    private $revisionsPassword;
 
-	/**
+    /**
-	 * WorkbookPassword
+     * WorkbookPassword
-	 *
+     *
-	 * @var string
+     * @var string
-	 */
+     */
-	private $_workbookPassword;
+    private $workbookPassword;
 
     /**
      * Create a new PHPExcel_DocumentSecurity
      */
     public function __construct()
     {
-    	// Initialise values
+        // Initialise values
-    	$this->_lockRevision		= false;
+        $this->lockRevision      = false;
-    	$this->_lockStructure		= false;
+        $this->lockStructure     = false;
-    	$this->_lockWindows			= false;
+        $this->lockWindows       = false;
-    	$this->_revisionsPassword	= '';
+        $this->revisionsPassword = '';
-    	$this->_workbookPassword	= '';
+        $this->workbookPassword  = '';
     }
 
     /**
-     * Is some sort of dcument security enabled?
+     * Is some sort of document security enabled?
      *
      * @return boolean
      */
-    function isSecurityEnabled() {
+    public function isSecurityEnabled()
-    	return 	$this->_lockRevision ||
+    {
-		    	$this->_lockStructure ||
+        return  $this->lockRevision ||
-		    	$this->_lockWindows;
+                $this->lockStructure ||
+                $this->lockWindows;
     }
 
     /**
@@ -99,8 +92,9 @@ class PHPExcel_DocumentSecurity
      *
      * @return boolean
      */
-    function getLockRevision() {
+    public function getLockRevision()
-    	return $this->_lockRevision;
+    {
+        return $this->lockRevision;
     }
 
     /**
@@ -109,9 +103,10 @@ class PHPExcel_DocumentSecurity
      * @param boolean $pValue
      * @return PHPExcel_DocumentSecurity
      */
-    function setLockRevision($pValue = false) {
+    public function setLockRevision($pValue = false)
-    	$this->_lockRevision = $pValue;
+    {
-    	return $this;
+        $this->lockRevision = $pValue;
+        return $this;
     }
 
     /**
@@ -119,8 +114,9 @@ class PHPExcel_DocumentSecurity
      *
      * @return boolean
      */
-    function getLockStructure() {
+    public function getLockStructure()
-    	return $this->_lockStructure;
+    {
+        return $this->lockStructure;
     }
 
     /**
@@ -129,9 +125,10 @@ class PHPExcel_DocumentSecurity
      * @param boolean $pValue
      * @return PHPExcel_DocumentSecurity
      */
-    function setLockStructure($pValue = false) {
+    public function setLockStructure($pValue = false)
-		$this->_lockStructure = $pValue;
+    {
-		return $this;
+        $this->lockStructure = $pValue;
+        return $this;
     }
 
     /**
@@ -139,8 +136,9 @@ class PHPExcel_DocumentSecurity
      *
      * @return boolean
      */
-    function getLockWindows() {
+    public function getLockWindows()
-    	return $this->_lockWindows;
+    {
+        return $this->lockWindows;
     }
 
     /**
@@ -149,9 +147,10 @@ class PHPExcel_DocumentSecurity
      * @param boolean $pValue
      * @return PHPExcel_DocumentSecurity
      */
-    function setLockWindows($pValue = false) {
+    public function setLockWindows($pValue = false)
-    	$this->_lockWindows = $pValue;
+    {
-    	return $this;
+        $this->lockWindows = $pValue;
+        return $this;
     }
 
     /**
@@ -159,23 +158,25 @@ class PHPExcel_DocumentSecurity
      *
      * @return string
      */
-    function getRevisionsPassword() {
+    public function getRevisionsPassword()
-    	return $this->_revisionsPassword;
+    {
+        return $this->revisionsPassword;
     }
 
     /**
      * Set RevisionsPassword
      *
-     * @param string 	$pValue
+     * @param string     $pValue
-     * @param boolean 	$pAlreadyHashed If the password has already been hashed, set this to true
+     * @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);
+        if (!$pAlreadyHashed) {
-    	}
+            $pValue = PHPExcel_Shared_PasswordHasher::hashPassword($pValue);
-    	$this->_revisionsPassword = $pValue;
+        }
-    	return $this;
+        $this->revisionsPassword = $pValue;
+        return $this;
     }
 
     /**
@@ -183,36 +184,39 @@ class PHPExcel_DocumentSecurity
      *
      * @return string
      */
-    function getWorkbookPassword() {
+    public function getWorkbookPassword()
-    	return $this->_workbookPassword;
+    {
+        return $this->workbookPassword;
     }
 
     /**
      * Set WorkbookPassword
      *
-     * @param string 	$pValue
+     * @param string     $pValue
-     * @param boolean 	$pAlreadyHashed If the password has already been hashed, set this to true
+     * @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);
+        if (!$pAlreadyHashed) {
-    	}
+            $pValue = PHPExcel_Shared_PasswordHasher::hashPassword($pValue);
-		$this->_workbookPassword = $pValue;
+        }
-		return $this;
+        $this->workbookPassword = $pValue;
+        return $this;
     }
 
-	/**
+    /**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     * 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) {
+        $vars = get_object_vars($this);
-			if (is_object($value)) {
+        foreach ($vars as $key => $value) {
-				$this->$key = clone $value;
+            if (is_object($value)) {
-			} else {
+                $this->$key = clone $value;
-				$this->$key = $value;
+            } else {
-			}
+                $this->$key = $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
@@ -19,184 +20,185 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  * @category   PHPExcel
- * @package	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
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
- * @version	##VERSION##, ##DATE##
+ * @version    ##VERSION##, ##DATE##
- */
-
-
-/**
- * PHPExcel_HashTable
- *
- * @category   PHPExcel
- * @package	PHPExcel
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
  */
 class PHPExcel_HashTable
 {
-	/**
+    /**
-	 * HashTable elements
+     * HashTable elements
-	 *
+     *
-	 * @var array
+     * @var array
-	 */
+     */
-	public $_items = array();
+    protected $items = array();
 
-	/**
+    /**
-	 * HashTable key map
+     * HashTable key map
-	 *
+     *
-	 * @var array
+     * @var array
-	 */
+     */
-	public $_keyMap = array();
+    protected $keyMap = array();
 
-	/**
+    /**
-	 * Create a new PHPExcel_HashTable
+     * Create a new PHPExcel_HashTable
-	 *
+     *
-	 * @param	PHPExcel_IComparable[] $pSource	Optional source array to create HashTable from
+     * @param    PHPExcel_IComparable[] $pSource    Optional source array to create HashTable from
-	 * @throws	PHPExcel_Exception
+     * @throws    PHPExcel_Exception
-	 */
+     */
-	public function __construct($pSource = null)
+    public function __construct($pSource = null)
-	{
+    {
-		if ($pSource !== NULL) {
+        if ($pSource !== null) {
-			// Create HashTable
+            // Create HashTable
-			$this->addFromSource($pSource);
+            $this->addFromSource($pSource);
-		}
+        }
-	}
+    }
 
-	/**
+    /**
-	 * Add HashTable items from source
+     * Add HashTable items from source
-	 *
+     *
-	 * @param	PHPExcel_IComparable[] $pSource	Source array to create HashTable from
+     * @param    PHPExcel_IComparable[] $pSource    Source array to create HashTable from
-	 * @throws	PHPExcel_Exception
+     * @throws    PHPExcel_Exception
-	 */
+     */
-	public function addFromSource($pSource = null) {
+    public function addFromSource($pSource = null)
-		// Check if an array was passed
+    {
-		if ($pSource == null) {
+        // Check if an array was passed
-			return;
+        if ($pSource == null) {
-		} else if (!is_array($pSource)) {
+            return;
-			throw new PHPExcel_Exception('Invalid array parameter passed.');
+        } elseif (!is_array($pSource)) {
-		}
+            throw new PHPExcel_Exception('Invalid array parameter passed.');
+        }
 
-		foreach ($pSource as $item) {
+        foreach ($pSource as $item) {
-			$this->add($item);
+            $this->add($item);
-		}
+        }
-	}
+    }
 
-	/**
+    /**
-	 * Add HashTable item
+     * Add HashTable item
-	 *
+     *
-	 * @param	PHPExcel_IComparable $pSource	Item to add
+     * @param    PHPExcel_IComparable $pSource    Item to add
-	 * @throws	PHPExcel_Exception
+     * @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])) {
+        $hash = $pSource->getHashCode();
-			$this->_items[$hash] = $pSource;
+        if (!isset($this->items[$hash])) {
-			$this->_keyMap[count($this->_items) - 1] = $hash;
+            $this->items[$hash] = $pSource;
-		}
+            $this->keyMap[count($this->items) - 1] = $hash;
-	}
+        }
+    }
 
-	/**
+    /**
-	 * Remove HashTable item
+     * Remove HashTable item
-	 *
+     *
-	 * @param	PHPExcel_IComparable $pSource	Item to remove
+     * @param    PHPExcel_IComparable $pSource    Item to remove
-	 * @throws	PHPExcel_Exception
+     * @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])) {
+        $hash = $pSource->getHashCode();
-			unset($this->_items[$hash]);
+        if (isset($this->items[$hash])) {
+            unset($this->items[$hash]);
 
-			$deleteKey = -1;
+            $deleteKey = -1;
-			foreach ($this->_keyMap as $key => $value) {
+            foreach ($this->keyMap as $key => $value) {
-				if ($deleteKey >= 0) {
+                if ($deleteKey >= 0) {
-					$this->_keyMap[$key - 1] = $value;
+                    $this->keyMap[$key - 1] = $value;
-				}
+                }
 
-				if ($value == $hash) {
+                if ($value == $hash) {
-					$deleteKey = $key;
+                    $deleteKey = $key;
-				}
+                }
-			}
+            }
-			unset($this->_keyMap[count($this->_keyMap) - 1]);
+            unset($this->keyMap[count($this->keyMap) - 1]);
-		}
+        }
-	}
+    }
 
-	/**
+    /**
-	 * Clear HashTable
+     * Clear HashTable
-	 *
+     *
-	 */
+     */
-	public function clear() {
+    public function clear()
-		$this->_items = array();
+    {
-		$this->_keyMap = array();
+        $this->items = array();
-	}
+        $this->keyMap = array();
+    }
 
-	/**
+    /**
-	 * Count
+     * Count
-	 *
+     *
-	 * @return int
+     * @return int
-	 */
+     */
-	public function count() {
+    public function count()
-		return count($this->_items);
+    {
-	}
+        return count($this->items);
+    }
 
-	/**
+    /**
-	 * Get index for hash code
+     * Get index for hash code
-	 *
+     *
-	 * @param	string	$pHashCode
+     * @param    string    $pHashCode
-	 * @return	int	Index
+     * @return    int    Index
-	 */
+     */
-	public function getIndexForHashCode($pHashCode = '') {
+    public function getIndexForHashCode($pHashCode = '')
-		return array_search($pHashCode, $this->_keyMap);
+    {
-	}
+        return array_search($pHashCode, $this->keyMap);
+    }
 
-	/**
+    /**
-	 * Get by index
+     * Get by index
-	 *
+     *
-	 * @param	int	$pIndex
+     * @param    int    $pIndex
-	 * @return	PHPExcel_IComparable
+     * @return    PHPExcel_IComparable
-	 *
+     *
-	 */
+     */
-	public function getByIndex($pIndex = 0) {
+    public function getByIndex($pIndex = 0)
-		if (isset($this->_keyMap[$pIndex])) {
+    {
-			return $this->getByHashCode( $this->_keyMap[$pIndex] );
+        if (isset($this->keyMap[$pIndex])) {
-		}
+            return $this->getByHashCode($this->keyMap[$pIndex]);
+        }
 
-		return null;
+        return null;
-	}
+    }
 
-	/**
+    /**
-	 * Get by hashcode
+     * Get by hashcode
-	 *
+     *
-	 * @param	string	$pHashCode
+     * @param    string    $pHashCode
-	 * @return	PHPExcel_IComparable
+     * @return    PHPExcel_IComparable
-	 *
+     *
-	 */
+     */
-	public function getByHashCode($pHashCode = '') {
+    public function getByHashCode($pHashCode = '')
-		if (isset($this->_items[$pHashCode])) {
+    {
-			return $this->_items[$pHashCode];
+        if (isset($this->items[$pHashCode])) {
-		}
+            return $this->items[$pHashCode];
+        }
 
-		return null;
+        return null;
-	}
+    }
 
-	/**
+    /**
-	 * HashTable to array
+     * HashTable to array
-	 *
+     *
-	 * @return PHPExcel_IComparable[]
+     * @return PHPExcel_IComparable[]
-	 */
+     */
-	public function toArray() {
+    public function toArray()
-		return $this->_items;
+    {
-	}
+        return $this->items;
+    }
 
-	/**
+    /**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     * 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) {
+        $vars = get_object_vars($this);
-			if (is_object($value)) {
+        foreach ($vars as $key => $value) {
-				$this->$key = clone $value;
+            if (is_object($value)) {
-			}
+                $this->$key = clone $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,26 +19,16 @@
  *
  * @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
+ * @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
 {
-	/**
+    /**
-	 * Get hash code
+     * Get hash code
-	 *
+     *
-	 * @return string	Hash code
+     * @return string    Hash code
-	 */
+     */
-	public function getHashCode();
+    public function getHashCode();
-
 }

Classes/PHPExcel/IOFactory.php

@@ -1,8 +1,18 @@
 <?php
+
+/**    PHPExcel root directory */
+if (!defined('PHPEXCEL_ROOT')) {
+    /**
+     * @ignore
+     */
+    define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../');
+    require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+}
+
 /**
- * PHPExcel
+ * 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,269 +30,260 @@
  *
  * @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
+ * @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
 {
-	/**
+    /**
-	 * Search locations
+     * Search locations
-	 *
+     *
-	 * @var	array
+     * @var    array
-	 * @access	private
+     * @access    private
-	 * @static
+     * @static
-	 */
+     */
-	private static $_searchLocations = array(
+    private static $searchLocations = array(
-		array( 'type' => 'IWriter', 'path' => 'PHPExcel/Writer/{0}.php', 'class' => 'PHPExcel_Writer_{0}' ),
+        array( 'type' => 'IWriter', 'path' => 'PHPExcel/Writer/{0}.php', 'class' => 'PHPExcel_Writer_{0}' ),
-		array( 'type' => 'IReader', 'path' => 'PHPExcel/Reader/{0}.php', 'class' => 'PHPExcel_Reader_{0}' )
+        array( 'type' => 'IReader', 'path' => 'PHPExcel/Reader/{0}.php', 'class' => 'PHPExcel_Reader_{0}' )
-	);
+    );
-
-	/**
-	 * Autoresolve classes
-	 *
-	 * @var	array
-	 * @access	private
-	 * @static
-	 */
-	private static $_autoResolveClasses = array(
-		'Excel2007',
-		'Excel5',
-		'Excel2003XML',
-		'OOCalc',
-		'SYLK',
-		'Gnumeric',
-		'HTML',
-		'CSV',
-	);
 
     /**
-     *	Private constructor for PHPExcel_IOFactory
+     * Autoresolve classes
+     *
+     * @var    array
+     * @access    private
+     * @static
      */
-    private function __construct() { }
+    private static $autoResolveClasses = array(
+        'Excel2007',
+        'Excel5',
+        'Excel2003XML',
+        'OOCalc',
+        'SYLK',
+        'Gnumeric',
+        'HTML',
+        'CSV',
+    );
+
+    /**
+     *    Private constructor for PHPExcel_IOFactory
+     */
+    private function __construct()
+    {
+    }
 
     /**
      * Get search locations
      *
-	 * @static
+     * @static
-	 * @access	public
+     * @access    public
-     * @return	array
+     * @return    array
      */
-	public static function getSearchLocations() {
+    public static function getSearchLocations()
-		return self::$_searchLocations;
+    {
-	}	//	function getSearchLocations()
+        return self::$searchLocations;
+    }
 
-	/**
+    /**
-	 * Set search locations
+     * Set search locations
-	 *
+     *
-	 * @static
+     * @static
-	 * @access	public
+     * @access    public
-	 * @param	array $value
+     * @param    array $value
-	 * @throws	PHPExcel_Reader_Exception
+     * @throws    PHPExcel_Reader_Exception
-	 */
+     */
-	public static function setSearchLocations($value) {
+    public static function setSearchLocations($value)
-		if (is_array($value)) {
+    {
-			self::$_searchLocations = $value;
+        if (is_array($value)) {
-		} else {
+            self::$searchLocations = $value;
-			throw new PHPExcel_Reader_Exception('Invalid parameter passed.');
+        } else {
-		}
+            throw new PHPExcel_Reader_Exception('Invalid parameter passed.');
-	}	//	function setSearchLocations()
+        }
+    }
 
-	/**
+    /**
-	 * Add search location
+     * Add search location
-	 *
+     *
-	 * @static
+     * @static
-	 * @access	public
+     * @access    public
-	 * @param	string $type		Example: IWriter
+     * @param    string $type        Example: IWriter
-	 * @param	string $location	Example: PHPExcel/Writer/{0}.php
+     * @param    string $location    Example: PHPExcel/Writer/{0}.php
-	 * @param	string $classname 	Example: PHPExcel_Writer_{0}
+     * @param    string $classname     Example: PHPExcel_Writer_{0}
-	 */
+     */
-	public static function addSearchLocation($type = '', $location = '', $classname = '') {
+    public static function addSearchLocation($type = '', $location = '', $classname = '')
-		self::$_searchLocations[] = array( 'type' => $type, 'path' => $location, 'class' => $classname );
+    {
-	}	//	function addSearchLocation()
+        self::$searchLocations[] = array( 'type' => $type, 'path' => $location, 'class' => $classname );
+    }
 
-	/**
+    /**
-	 * Create PHPExcel_Writer_IWriter
+     * Create PHPExcel_Writer_IWriter
-	 *
+     *
-	 * @static
+     * @static
-	 * @access	public
+     * @access    public
-	 * @param	PHPExcel $phpExcel
+     * @param    PHPExcel $phpExcel
-	 * @param	string  $writerType	Example: Excel2007
+     * @param    string  $writerType    Example: Excel2007
-	 * @return	PHPExcel_Writer_IWriter
+     * @return    PHPExcel_Writer_IWriter
-	 * @throws	PHPExcel_Reader_Exception
+     * @throws    PHPExcel_Reader_Exception
-	 */
+     */
-	public static function createWriter(PHPExcel $phpExcel, $writerType = '') {
+    public static function createWriter(PHPExcel $phpExcel, $writerType = '')
-		// Search type
+    {
-		$searchType = 'IWriter';
+        // Search type
+        $searchType = 'IWriter';
 
-		// Include class
+        // Include class
-		foreach (self::$_searchLocations as $searchLocation) {
+        foreach (self::$searchLocations as $searchLocation) {
-			if ($searchLocation['type'] == $searchType) {
+            if ($searchLocation['type'] == $searchType) {
-				$className = str_replace('{0}', $writerType, $searchLocation['class']);
+                $className = str_replace('{0}', $writerType, $searchLocation['class']);
 
-				$instance = new $className($phpExcel);
+                $instance = new $className($phpExcel);
-				if ($instance !== NULL) {
+                if ($instance !== null) {
-					return $instance;
+                    return $instance;
-				}
+                }
-			}
+            }
-		}
+        }
 
-		// Nothing found...
+        // Nothing found...
-		throw new PHPExcel_Reader_Exception("No $searchType found for type $writerType");
+        throw new PHPExcel_Reader_Exception("No $searchType found for type $writerType");
-	}	//	function createWriter()
+    }
 
-	/**
+    /**
-	 * Create PHPExcel_Reader_IReader
+     * Create PHPExcel_Reader_IReader
-	 *
+     *
-	 * @static
+     * @static
-	 * @access	public
+     * @access    public
-	 * @param	string $readerType	Example: Excel2007
+     * @param    string $readerType    Example: Excel2007
-	 * @return	PHPExcel_Reader_IReader
+     * @return    PHPExcel_Reader_IReader
-	 * @throws	PHPExcel_Reader_Exception
+     * @throws    PHPExcel_Reader_Exception
-	 */
+     */
-	public static function createReader($readerType = '') {
+    public static function createReader($readerType = '')
-		// Search type
+    {
-		$searchType = 'IReader';
+        // Search type
+        $searchType = 'IReader';
 
-		// Include class
+        // Include class
-		foreach (self::$_searchLocations as $searchLocation) {
+        foreach (self::$searchLocations as $searchLocation) {
-			if ($searchLocation['type'] == $searchType) {
+            if ($searchLocation['type'] == $searchType) {
-				$className = str_replace('{0}', $readerType, $searchLocation['class']);
+                $className = str_replace('{0}', $readerType, $searchLocation['class']);
 
-				$instance = new $className();
+                $instance = new $className();
-				if ($instance !== NULL) {
+                if ($instance !== null) {
-					return $instance;
+                    return $instance;
-				}
+                }
-			}
+            }
-		}
+        }
 
-		// Nothing found...
+        // Nothing found...
-		throw new PHPExcel_Reader_Exception("No $searchType found for type $readerType");
+        throw new PHPExcel_Reader_Exception("No $searchType found for type $readerType");
-	}	//	function createReader()
+    }
 
-	/**
+    /**
-	 * Loads PHPExcel from file using automatic PHPExcel_Reader_IReader resolution
+     * Loads PHPExcel from file using automatic PHPExcel_Reader_IReader resolution
-	 *
+     *
-	 * @static
+     * @static
-	 * @access public
+     * @access public
-	 * @param 	string 		$pFilename		The name of the spreadsheet file
+     * @param     string         $pFilename        The name of the spreadsheet file
-	 * @return	PHPExcel
+     * @return    PHPExcel
-	 * @throws	PHPExcel_Reader_Exception
+     * @throws    PHPExcel_Reader_Exception
-	 */
+     */
-	public static function load($pFilename) {
+    public static function load($pFilename)
-		$reader = self::createReaderForFile($pFilename);
+    {
-		return $reader->load($pFilename);
+        $reader = self::createReaderForFile($pFilename);
-	}	//	function load()
+        return $reader->load($pFilename);
+    }
 
-	/**
+    /**
-	 * Identify file type using automatic PHPExcel_Reader_IReader resolution
+     * Identify file type using automatic PHPExcel_Reader_IReader resolution
-	 *
+     *
-	 * @static
+     * @static
-	 * @access public
+     * @access public
-	 * @param 	string 		$pFilename		The name of the spreadsheet file to identify
+     * @param     string         $pFilename        The name of the spreadsheet file to identify
-	 * @return	string
+     * @return    string
-	 * @throws	PHPExcel_Reader_Exception
+     * @throws    PHPExcel_Reader_Exception
-	 */
+     */
-	public static function identify($pFilename) {
+    public static function identify($pFilename)
-		$reader = self::createReaderForFile($pFilename);
+    {
-		$className = get_class($reader);
+        $reader = self::createReaderForFile($pFilename);
-		$classType = explode('_',$className);
+        $className = get_class($reader);
-		unset($reader);
+        $classType = explode('_', $className);
-		return array_pop($classType);
+        unset($reader);
-	}	//	function identify()
+        return array_pop($classType);
+    }
 
-	/**
+    /**
-	 * Create PHPExcel_Reader_IReader for file using automatic PHPExcel_Reader_IReader resolution
+     * Create PHPExcel_Reader_IReader for file using automatic PHPExcel_Reader_IReader resolution
-	 *
+     *
-	 * @static
+     * @static
-	 * @access	public
+     * @access    public
-	 * @param 	string 		$pFilename		The name of the spreadsheet file
+     * @param     string         $pFilename        The name of the spreadsheet file
-	 * @return	PHPExcel_Reader_IReader
+     * @return    PHPExcel_Reader_IReader
-	 * @throws	PHPExcel_Reader_Exception
+     * @throws    PHPExcel_Reader_Exception
-	 */
+     */
-	public static function createReaderForFile($pFilename) {
+    public static function createReaderForFile($pFilename)
+    {
+        // First, lucky guess by inspecting file extension
+        $pathinfo = pathinfo($pFilename);
 
-		// First, lucky guess by inspecting file extension
+        $extensionType = null;
-		$pathinfo = pathinfo($pFilename);
+        if (isset($pathinfo['extension'])) {
+            switch (strtolower($pathinfo['extension'])) {
+                case 'xlsx':            //    Excel (OfficeOpenXML) Spreadsheet
+                case 'xlsm':            //    Excel (OfficeOpenXML) Macro Spreadsheet (macros will be discarded)
+                case 'xltx':            //    Excel (OfficeOpenXML) Template
+                case 'xltm':            //    Excel (OfficeOpenXML) Macro Template (macros will be discarded)
+                    $extensionType = 'Excel2007';
+                    break;
+                case 'xls':                //    Excel (BIFF) Spreadsheet
+                case 'xlt':                //    Excel (BIFF) Template
+                    $extensionType = 'Excel5';
+                    break;
+                case 'ods':                //    Open/Libre Offic Calc
+                case 'ots':                //    Open/Libre Offic Calc Template
+                    $extensionType = 'OOCalc';
+                    break;
+                case 'slk':
+                    $extensionType = 'SYLK';
+                    break;
+                case 'xml':                //    Excel 2003 SpreadSheetML
+                    $extensionType = 'Excel2003XML';
+                    break;
+                case 'gnumeric':
+                    $extensionType = 'Gnumeric';
+                    break;
+                case 'htm':
+                case 'html':
+                    $extensionType = 'HTML';
+                    break;
+                case 'csv':
+                    // Do nothing
+                    // We must not try to use CSV reader since it loads
+                    // all files including Excel files etc.
+                    break;
+                default:
+                    break;
+            }
 
-		$extensionType = NULL;
+            if ($extensionType !== null) {
-		if (isset($pathinfo['extension'])) {
+                $reader = self::createReader($extensionType);
-			switch (strtolower($pathinfo['extension'])) {
+                // Let's see if we are lucky
-				case 'xlsx':			//	Excel (OfficeOpenXML) Spreadsheet
+                if (isset($reader) && $reader->canRead($pFilename)) {
-				case 'xlsm':			//	Excel (OfficeOpenXML) Macro Spreadsheet (macros will be discarded)
+                    return $reader;
-				case 'xltx':			//	Excel (OfficeOpenXML) Template
+                }
-				case 'xltm':			//	Excel (OfficeOpenXML) Macro Template (macros will be discarded)
+            }
-					$extensionType = 'Excel2007';
+        }
-					break;
-				case 'xls':				//	Excel (BIFF) Spreadsheet
-				case 'xlt':				//	Excel (BIFF) Template
-					$extensionType = 'Excel5';
-					break;
-				case 'ods':				//	Open/Libre Offic Calc
-				case 'ots':				//	Open/Libre Offic Calc Template
-					$extensionType = 'OOCalc';
-					break;
-				case 'slk':
-					$extensionType = 'SYLK';
-					break;
-				case 'xml':				//	Excel 2003 SpreadSheetML
-					$extensionType = 'Excel2003XML';
-					break;
-				case 'gnumeric':
-					$extensionType = 'Gnumeric';
-					break;
-				case 'htm':
-				case 'html':
-					$extensionType = 'HTML';
-					break;
-				case 'csv':
-					// Do nothing
-					// We must not try to use CSV reader since it loads
-					// all files including Excel files etc.
-					break;
-				default:
-					break;
-			}
 
-			if ($extensionType !== NULL) {
+        // If we reach here then "lucky guess" didn't give any result
-				$reader = self::createReader($extensionType);
+        // Try walking through all the options in self::$autoResolveClasses
-				// Let's see if we are lucky
+        foreach (self::$autoResolveClasses as $autoResolveClass) {
-				if (isset($reader) && $reader->canRead($pFilename)) {
+            //    Ignore our original guess, we know that won't work
-					return $reader;
+            if ($autoResolveClass !== $extensionType) {
-				}
+                $reader = self::createReader($autoResolveClass);
-			}
+                if ($reader->canRead($pFilename)) {
-		}
+                    return $reader;
+                }
+            }
+        }
 
-		// If we reach here then "lucky guess" didn't give any result
+        throw new PHPExcel_Reader_Exception('Unable to identify a reader for this file');
-		// 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);
-				if ($reader->canRead($pFilename)) {
-					return $reader;
-				}
-			}
-		}
-
-		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,55 +21,46 @@
  *
  * @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
+ * @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
 {
-	/**
+    /**
-	 * Range name
+     * Range name
-	 *
+     *
-	 * @var string
+     * @var string
-	 */
+     */
-	private $_name;
+    private $name;
 
-	/**
+    /**
-	 * Worksheet on which the named range can be resolved
+     * Worksheet on which the named range can be resolved
-	 *
+     *
-	 * @var PHPExcel_Worksheet
+     * @var PHPExcel_Worksheet
-	 */
+     */
-	private $_worksheet;
+    private $worksheet;
 
-	/**
+    /**
-	 * Range of the referenced cells
+     * Range of the referenced cells
-	 *
+     *
-	 * @var string
+     * @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
+     * @var bool
-	 */
+     */
-	private $_localOnly;
+    private $localOnly;
 
-	/**
+    /**
-	 * Scope
+     * Scope
-	 *
+     *
-	 * @var PHPExcel_Worksheet
+     * @var PHPExcel_Worksheet
-	 */
+     */
-	private $_scope;
+    private $scope;
 
     /**
      * Create a new NamedRange
@@ -77,23 +69,22 @@ class PHPExcel_NamedRange
      * @param PHPExcel_Worksheet $pWorksheet
      * @param string $pRange
      * @param bool $pLocalOnly
-     * @param PHPExcel_Worksheet|null $pScope	Scope. Only applies when $pLocalOnly = true. Null for global scope.
+     * @param PHPExcel_Worksheet|null $pScope    Scope. Only applies when $pLocalOnly = true. Null for global scope.
      * @throws PHPExcel_Exception
      */
     public function __construct($pName = null, PHPExcel_Worksheet $pWorksheet, $pRange = 'A1', $pLocalOnly = false, $pScope = null)
     {
-    	// Validate data
+        // 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.');
+            throw new PHPExcel_Exception('Parameters can not be null.');
-    	}
+        }
 
-    	// Set local members
+        // Set local members
-    	$this->_name 		= $pName;
+        $this->name       = $pName;
-    	$this->_worksheet 	= $pWorksheet;
+        $this->worksheet  = $pWorksheet;
-    	$this->_range 		= $pRange;
+        $this->range      = $pRange;
-    	$this->_localOnly 	= $pLocalOnly;
+        $this->localOnly  = $pLocalOnly;
-    	$this->_scope 		= ($pLocalOnly == true) ?
+        $this->scope      = ($pLocalOnly == true) ? (($pScope == null) ? $pWorksheet : $pScope) : null;
-								(($pScope == null) ? $pWorksheet : $pScope) : null;
     }
 
     /**
@@ -101,8 +92,9 @@ class PHPExcel_NamedRange
      *
      * @return string
      */
-    public function getName() {
+    public function getName()
-    	return $this->_name;
+    {
+        return $this->name;
     }
 
     /**
@@ -111,26 +103,27 @@ class PHPExcel_NamedRange
      * @param string $value
      * @return PHPExcel_NamedRange
      */
-    public function setName($value = null) {
+    public function setName($value = null)
-    	if ($value !== NULL) {
+    {
-    		// Old title
+        if ($value !== null) {
-    		$oldTitle = $this->_name;
+            // Old title
+            $oldTitle = $this->name;
 
-    		// Re-attach
+            // Re-attach
-    		if ($this->_worksheet !== NULL) {
+            if ($this->worksheet !== null) {
-    			$this->_worksheet->getParent()->removeNamedRange($this->_name,$this->_worksheet);
+                $this->worksheet->getParent()->removeNamedRange($this->name, $this->worksheet);
-    		}
+            }
-    		$this->_name = $value;
+            $this->name = $value;
 
-    		if ($this->_worksheet !== NULL) {
+            if ($this->worksheet !== null) {
-    			$this->_worksheet->getParent()->addNamedRange($this);
+                $this->worksheet->getParent()->addNamedRange($this);
-    		}
+            }
 
-	    	// New title
+            // New title
-	    	$newTitle = $this->_name;
+            $newTitle = $this->name;
-	    	PHPExcel_ReferenceHelper::getInstance()->updateNamedFormulas($this->_worksheet->getParent(), $oldTitle, $newTitle);
+            PHPExcel_ReferenceHelper::getInstance()->updateNamedFormulas($this->worksheet->getParent(), $oldTitle, $newTitle);
-    	}
+        }
-    	return $this;
+        return $this;
     }
 
     /**
@@ -138,8 +131,9 @@ class PHPExcel_NamedRange
      *
      * @return PHPExcel_Worksheet
      */
-    public function getWorksheet() {
+    public function getWorksheet()
-    	return $this->_worksheet;
+    {
+        return $this->worksheet;
     }
 
     /**
@@ -148,11 +142,12 @@ class PHPExcel_NamedRange
      * @param PHPExcel_Worksheet $value
      * @return PHPExcel_NamedRange
      */
-    public function setWorksheet(PHPExcel_Worksheet $value = null) {
+    public function setWorksheet(PHPExcel_Worksheet $value = null)
-    	if ($value !== NULL) {
+    {
-    		$this->_worksheet = $value;
+        if ($value !== null) {
-    	}
+            $this->worksheet = $value;
-    	return $this;
+        }
+        return $this;
     }
 
     /**
@@ -160,8 +155,9 @@ class PHPExcel_NamedRange
      *
      * @return string
      */
-    public function getRange() {
+    public function getRange()
-    	return $this->_range;
+    {
+        return $this->range;
     }
 
     /**
@@ -170,11 +166,12 @@ class PHPExcel_NamedRange
      * @param string $value
      * @return PHPExcel_NamedRange
      */
-    public function setRange($value = null) {
+    public function setRange($value = null)
-    	if ($value !== NULL) {
+    {
-    		$this->_range = $value;
+        if ($value !== null) {
-    	}
+            $this->range = $value;
-    	return $this;
+        }
+        return $this;
     }
 
     /**
@@ -182,8 +179,9 @@ class PHPExcel_NamedRange
      *
      * @return bool
      */
-    public function getLocalOnly() {
+    public function getLocalOnly()
-    	return $this->_localOnly;
+    {
+        return $this->localOnly;
     }
 
     /**
@@ -192,10 +190,11 @@ class PHPExcel_NamedRange
      * @param bool $value
      * @return PHPExcel_NamedRange
      */
-    public function setLocalOnly($value = false) {
+    public function setLocalOnly($value = false)
-    	$this->_localOnly = $value;
+    {
-    	$this->_scope = $value ? $this->_worksheet : null;
+        $this->localOnly = $value;
-    	return $this;
+        $this->scope = $value ? $this->worksheet : null;
+        return $this;
     }
 
     /**
@@ -203,8 +202,9 @@ class PHPExcel_NamedRange
      *
      * @return PHPExcel_Worksheet|null
      */
-    public function getScope() {
+    public function getScope()
-    	return $this->_scope;
+    {
+        return $this->scope;
     }
 
     /**
@@ -213,10 +213,11 @@ class PHPExcel_NamedRange
      * @param PHPExcel_Worksheet|null $value
      * @return PHPExcel_NamedRange
      */
-    public function setScope(PHPExcel_Worksheet $value = null) {
+    public function setScope(PHPExcel_Worksheet $value = null)
-    	$this->_scope = $value;
+    {
-    	$this->_localOnly = ($value == null) ? false : true;
+        $this->scope = $value;
-    	return $this;
+        $this->localOnly = ($value == null) ? false : true;
+        return $this;
     }
 
     /**
@@ -226,21 +227,23 @@ 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);
+    {
+        return $pSheet->getParent()->getNamedRange($pNamedRange, $pSheet);
     }
 
-	/**
+    /**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     * 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) {
+        $vars = get_object_vars($this);
-			if (is_object($value)) {
+        foreach ($vars as $key => $value) {
-				$this->$key = clone $value;
+            if (is_object($value)) {
-			} else {
+                $this->$key = clone $value;
-				$this->$key = $value;
+            } else {
-			}
+                $this->$key = $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,208 +21,269 @@
  *
  * @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
+ * @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
 {
-	/**
+    /**
-	 * Read data only?
+     * Read data only?
-	 * Identifies whether the Reader should only read data values for cells, and ignore any formatting information;
+     * Identifies whether the Reader should only read data values for cells, and ignore any formatting information;
-	 *		or whether it should read both data and formatting
+     *        or whether it should read both data and formatting
-	 *
+     *
-	 * @var	boolean
+     * @var    boolean
-	 */
+     */
-	protected $_readDataOnly = FALSE;
+    protected $readDataOnly = false;
 
-	/**
+    /**
-	 * Read charts that are defined in the workbook?
+     * Read empty cells?
-	 * Identifies whether the Reader should read the definitions for any charts that exist in the workbook;
+     * Identifies whether the Reader should read data values for cells all cells, or should ignore cells containing
-	 *
+     *         null value or empty string
-	 * @var	boolean
+     *
-	 */
+     * @var    boolean
-	protected $_includeCharts = FALSE;
+     */
+    protected $readEmptyCells = true;
 
-	/**
+    /**
-	 * Restrict which sheets should be loaded?
+     * Read charts that are defined in the workbook?
-	 * This property holds an array of worksheet names to be loaded. If null, then all worksheets will be loaded.
+     * Identifies whether the Reader should read the definitions for any charts that exist in the workbook;
-	 *
+     *
-	 * @var array of string
+     * @var    boolean
-	 */
+     */
-	protected $_loadSheetsOnly = NULL;
+    protected $includeCharts = false;
 
-	/**
+    /**
-	 * PHPExcel_Reader_IReadFilter instance
+     * Restrict which sheets should be loaded?
-	 *
+     * This property holds an array of worksheet names to be loaded. If null, then all worksheets will be loaded.
-	 * @var PHPExcel_Reader_IReadFilter
+     *
-	 */
+     * @var array of string
-	protected $_readFilter = NULL;
+     */
+    protected $loadSheetsOnly;
 
-	protected $_fileHandle = NULL;
+    /**
+     * PHPExcel_Reader_IReadFilter instance
+     *
+     * @var PHPExcel_Reader_IReadFilter
+     */
+    protected $readFilter;
+
+    protected $fileHandle = null;
 
 
-	/**
+    /**
-	 * Read data only?
+     * Read data only?
-	 *		If this is true, then the Reader will only read data values for cells, it will not read any formatting information.
+     *        If this is true, then the Reader will only read data values for cells, it will not read any formatting information.
-	 *		If false (the default) it will read data and formatting.
+     *        If false (the default) it will read data and formatting.
-	 *
+     *
-	 * @return	boolean
+     * @return    boolean
-	 */
+     */
-	public function getReadDataOnly() {
+    public function getReadDataOnly()
-		return $this->_readDataOnly;
+    {
-	}
+        return $this->readDataOnly;
+    }
 
-	/**
+    /**
-	 * Set read data only
+     * Set read data only
-	 *		Set to true, to advise the Reader only to read data values for cells, and to ignore any formatting information.
+     *        Set to true, to advise the Reader only to read data values for cells, and to ignore any formatting information.
-	 *		Set to false (the default) to advise the Reader to read both data and formatting for cells.
+     *        Set to false (the default) to advise the Reader to read both data and formatting for cells.
-	 *
+     *
-	 * @param	boolean	$pValue
+     * @param    boolean    $pValue
-	 *
+     *
-	 * @return	PHPExcel_Reader_IReader
+     * @return    PHPExcel_Reader_IReader
-	 */
+     */
-	public function setReadDataOnly($pValue = FALSE) {
+    public function setReadDataOnly($pValue = false)
-		$this->_readDataOnly = $pValue;
+    {
-		return $this;
+        $this->readDataOnly = $pValue;
-	}
+        return $this;
+    }
 
-	/**
+    /**
-	 * Read charts in workbook?
+     * Read empty cells?
-	 *		If this is true, then the Reader will include any charts that exist in the workbook.
+     *        If this is true (the default), then the Reader will read data values for all cells, irrespective of value.
-	 *      Note that a ReadDataOnly value of false overrides, and charts won't be read regardless of the IncludeCharts value.
+     *        If false it will not read data for cells containing a null value or an empty string.
-	 *		If false (the default) it will ignore any charts defined in the workbook file.
+     *
-	 *
+     * @return    boolean
-	 * @return	boolean
+     */
-	 */
+    public function getReadEmptyCells()
-	public function getIncludeCharts() {
+    {
-		return $this->_includeCharts;
+        return $this->readEmptyCells;
-	}
+    }
 
-	/**
+    /**
-	 * Set read charts in workbook
+     * Set read empty cells
-	 *		Set to true, to advise the Reader to include any charts that exist in the workbook.
+     *        Set to true (the default) to advise the Reader read data values for all cells, irrespective of value.
-	 *      Note that a ReadDataOnly value of false overrides, and charts won't be read regardless of the IncludeCharts value.
+     *        Set to false to advise the Reader to ignore cells containing a null value or an empty string.
-	 *		Set to false (the default) to discard charts.
+     *
-	 *
+     * @param    boolean    $pValue
-	 * @param	boolean	$pValue
+     *
-	 *
+     * @return    PHPExcel_Reader_IReader
-	 * @return	PHPExcel_Reader_IReader
+     */
-	 */
+    public function setReadEmptyCells($pValue = true)
-	public function setIncludeCharts($pValue = FALSE) {
+    {
-		$this->_includeCharts = (boolean) $pValue;
+        $this->readEmptyCells = $pValue;
-		return $this;
+        return $this;
-	}
+    }
 
-	/**
+    /**
-	 * Get which sheets to load
+     * Read charts in workbook?
-	 * Returns either an array of worksheet names (the list of worksheets that should be loaded), or a null
+     *        If this is true, then the Reader will include any charts that exist in the workbook.
-	 *		indicating that all worksheets in the workbook should be loaded.
+     *      Note that a ReadDataOnly value of false overrides, and charts won't be read regardless of the IncludeCharts value.
-	 *
+     *        If false (the default) it will ignore any charts defined in the workbook file.
-	 * @return mixed
+     *
-	 */
+     * @return    boolean
-	public function getLoadSheetsOnly()
+     */
-	{
+    public function getIncludeCharts()
-		return $this->_loadSheetsOnly;
+    {
-	}
+        return $this->includeCharts;
+    }
 
-	/**
+    /**
-	 * Set which sheets to load
+     * Set read charts in workbook
-	 *
+     *        Set to true, to advise the Reader to include any charts that exist in the workbook.
-	 * @param mixed $value
+     *      Note that a ReadDataOnly value of false overrides, and charts won't be read regardless of the IncludeCharts value.
-	 *		This should be either an array of worksheet names to be loaded, or a string containing a single worksheet name.
+     *        Set to false (the default) to discard charts.
-	 *		If NULL, then it tells the Reader to read all worksheets in the workbook
+     *
-	 *
+     * @param    boolean    $pValue
-	 * @return PHPExcel_Reader_IReader
+     *
-	 */
+     * @return    PHPExcel_Reader_IReader
-	public function setLoadSheetsOnly($value = NULL)
+     */
-	{
+    public function setIncludeCharts($pValue = false)
-		$this->_loadSheetsOnly = is_array($value) ?
+    {
-			$value : array($value);
+        $this->includeCharts = (boolean) $pValue;
-		return $this;
+        return $this;
-	}
+    }
 
-	/**
+    /**
-	 * Set all sheets to load
+     * Get which sheets to load
-	 *		Tells the Reader to load all worksheets from the workbook.
+     * Returns either an array of worksheet names (the list of worksheets that should be loaded), or a null
-	 *
+     *        indicating that all worksheets in the workbook should be loaded.
-	 * @return PHPExcel_Reader_IReader
+     *
-	 */
+     * @return mixed
-	public function setLoadAllSheets()
+     */
-	{
+    public function getLoadSheetsOnly()
-		$this->_loadSheetsOnly = NULL;
+    {
-		return $this;
+        return $this->loadSheetsOnly;
-	}
+    }
 
-	/**
+    /**
-	 * Read filter
+     * Set which sheets to load
-	 *
+     *
-	 * @return PHPExcel_Reader_IReadFilter
+     * @param mixed $value
-	 */
+     *        This should be either an array of worksheet names to be loaded, or a string containing a single worksheet name.
-	public function getReadFilter() {
+     *        If NULL, then it tells the Reader to read all worksheets in the workbook
-		return $this->_readFilter;
+     *
-	}
+     * @return PHPExcel_Reader_IReader
+     */
+    public function setLoadSheetsOnly($value = null)
+    {
+        if ($value === null) {
+            return $this->setLoadAllSheets();
+        }
 
-	/**
+        $this->loadSheetsOnly = is_array($value) ? $value : array($value);
-	 * Set read filter
+        return $this;
-	 *
+    }
-	 * @param PHPExcel_Reader_IReadFilter $pValue
-	 * @return PHPExcel_Reader_IReader
-	 */
-	public function setReadFilter(PHPExcel_Reader_IReadFilter $pValue) {
-		$this->_readFilter = $pValue;
-		return $this;
-	}
 
-	/**
+    /**
-	 * Open file for reading
+     * Set all sheets to load
-	 *
+     *        Tells the Reader to load all worksheets from the workbook.
-	 * @param string $pFilename
+     *
-	 * @throws	PHPExcel_Reader_Exception
+     * @return PHPExcel_Reader_IReader
-	 * @return resource
+     */
-	 */
+    public function setLoadAllSheets()
-	protected function _openFile($pFilename)
+    {
-	{
+        $this->loadSheetsOnly = null;
-		// Check if file exists
+        return $this;
-		if (!file_exists($pFilename) || !is_readable($pFilename)) {
+    }
-			throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! File does not exist.");
-		}
 
-		// Open file
+    /**
-		$this->_fileHandle = fopen($pFilename, 'r');
+     * Read filter
-		if ($this->_fileHandle === FALSE) {
+     *
-			throw new PHPExcel_Reader_Exception("Could not open file " . $pFilename . " for reading.");
+     * @return PHPExcel_Reader_IReadFilter
-		}
+     */
-	}
+    public function getReadFilter()
+    {
+        return $this->readFilter;
+    }
 
-	/**
+    /**
-	 * Can the current PHPExcel_Reader_IReader read the file?
+     * Set read filter
-	 *
+     *
-	 * @param 	string 		$pFilename
+     * @param PHPExcel_Reader_IReadFilter $pValue
-	 * @return boolean
+     * @return PHPExcel_Reader_IReader
-	 * @throws PHPExcel_Reader_Exception
+     */
-	 */
+    public function setReadFilter(PHPExcel_Reader_IReadFilter $pValue)
-	public function canRead($pFilename)
+    {
-	{
+        $this->readFilter = $pValue;
-		// Check if file exists
+        return $this;
-		try {
+    }
-			$this->_openFile($pFilename);
-		} catch (Exception $e) {
-			return FALSE;
-		}
 
-		$readable = $this->_isValidFormat();
+    /**
-		fclose ($this->_fileHandle);
+     * Open file for reading
-		return $readable;
+     *
-	}
+     * @param string $pFilename
+     * @throws    PHPExcel_Reader_Exception
+     * @return resource
+     */
+    protected function openFile($pFilename)
+    {
+        // Check if file exists
+        if (!file_exists($pFilename) || !is_readable($pFilename)) {
+            throw new PHPExcel_Reader_Exception("Could not open " . $pFilename . " for reading! File does not exist.");
+        }
 
+        // Open file
+        $this->fileHandle = fopen($pFilename, 'r');
+        if ($this->fileHandle === false) {
+            throw new PHPExcel_Reader_Exception("Could not open file " . $pFilename . " for reading.");
+        }
+    }
+
+    /**
+     * Can the current PHPExcel_Reader_IReader read the file?
+     *
+     * @param     string         $pFilename
+     * @return boolean
+     * @throws PHPExcel_Reader_Exception
+     */
+    public function canRead($pFilename)
+    {
+        // Check if file exists
+        try {
+            $this->openFile($pFilename);
+        } catch (Exception $e) {
+            return false;
+        }
+
+        $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')) {
+    /**
+     * @ignore
+     */
+    define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
+    require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+}
+
 /**
- * PHPExcel
+ * 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,396 +30,377 @@
  *
  * @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
+ * @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
 {
-	/**
+    /**
-	 * Input encoding
+     * Input encoding
-	 *
+     *
-	 * @access	private
+     * @access    private
-	 * @var	string
+     * @var    string
-	 */
+     */
-	private $_inputEncoding	= 'UTF-8';
+    private $inputEncoding = 'UTF-8';
 
-	/**
+    /**
-	 * Delimiter
+     * Delimiter
-	 *
+     *
-	 * @access	private
+     * @access    private
-	 * @var string
+     * @var string
-	 */
+     */
-	private $_delimiter		= ',';
+    private $delimiter = ',';
 
-	/**
+    /**
-	 * Enclosure
+     * Enclosure
-	 *
+     *
-	 * @access	private
+     * @access    private
-	 * @var	string
+     * @var    string
-	 */
+     */
-	private $_enclosure		= '"';
+    private $enclosure = '"';
 
-	/**
+    /**
-	 * Line ending
+     * Sheet index to read
-	 *
+     *
-	 * @access	private
+     * @access    private
-	 * @var	string
+     * @var    int
-	 */
+     */
-	private $_lineEnding	= PHP_EOL;
+    private $sheetIndex = 0;
 
-	/**
+    /**
-	 * Sheet index to read
+     * Load rows contiguously
-	 *
+     *
-	 * @access	private
+     * @access    private
-	 * @var	int
+     * @var    int
-	 */
+     */
-	private $_sheetIndex	= 0;
+    private $contiguous = false;
 
-	/**
+    /**
-	 * Load rows contiguously
+     * Row counter for loading rows contiguously
-	 *
+     *
-	 * @access	private
+     * @var    int
-	 * @var	int
+     */
-	 */
+    private $contiguousRow = -1;
-	private $_contiguous	= false;
-
-	/**
-	 * Row counter for loading rows contiguously
-	 *
-	 * @var	int
-	 */
-	private $_contiguousRow	= -1;
 
 
-	/**
+    /**
-	 * Create a new PHPExcel_Reader_CSV
+     * Create a new PHPExcel_Reader_CSV
-	 */
+     */
-	public function __construct() {
+    public function __construct()
-		$this->_readFilter		= new PHPExcel_Reader_DefaultReadFilter();
+    {
-	}
+        $this->readFilter = new PHPExcel_Reader_DefaultReadFilter();
+    }
 
-	/**
+    /**
-	 * Validate that the current file is a CSV file
+     * Validate that the current file is a CSV file
-	 *
+     *
-	 * @return boolean
+     * @return boolean
-	 */
+     */
-	protected function _isValidFormat()
+    protected function isValidFormat()
-	{
+    {
-		return TRUE;
+        return true;
-	}
+    }
 
-	/**
+    /**
-	 * Set input encoding
+     * Set input encoding
-	 *
+     *
-	 * @param string $pValue Input encoding
+     * @param string $pValue Input encoding
-	 */
+     */
-	public function setInputEncoding($pValue = 'UTF-8')
+    public function setInputEncoding($pValue = 'UTF-8')
-	{
+    {
-		$this->_inputEncoding = $pValue;
+        $this->inputEncoding = $pValue;
-		return $this;
+        return $this;
-	}
+    }
 
-	/**
+    /**
-	 * Get input encoding
+     * Get input encoding
-	 *
+     *
-	 * @return string
+     * @return string
-	 */
+     */
-	public function getInputEncoding()
+    public function getInputEncoding()
-	{
+    {
-		return $this->_inputEncoding;
+        return $this->inputEncoding;
-	}
+    }
 
-	/**
+    /**
-	 * Move filepointer past any BOM marker
+     * 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':
+            case 'UTF-8':
-				fgets($this->_fileHandle, 4) == "\xEF\xBB\xBF" ?
+                fgets($this->fileHandle, 4) == "\xEF\xBB\xBF" ?
-				fseek($this->_fileHandle, 3) : fseek($this->_fileHandle, 0);
+                    fseek($this->fileHandle, 3) : fseek($this->fileHandle, 0);
-				break;
+                break;
-			case 'UTF-16LE':
+            case 'UTF-16LE':
-				fgets($this->_fileHandle, 3) == "\xFF\xFE" ?
+                fgets($this->fileHandle, 3) == "\xFF\xFE" ?
-				fseek($this->_fileHandle, 2) : fseek($this->_fileHandle, 0);
+                    fseek($this->fileHandle, 2) : fseek($this->fileHandle, 0);
-				break;
+                break;
-			case 'UTF-16BE':
+            case 'UTF-16BE':
-				fgets($this->_fileHandle, 3) == "\xFE\xFF" ?
+                fgets($this->fileHandle, 3) == "\xFE\xFF" ?
-				fseek($this->_fileHandle, 2) : fseek($this->_fileHandle, 0);
+                    fseek($this->fileHandle, 2) : fseek($this->fileHandle, 0);
-				break;
+                break;
-			case 'UTF-32LE':
+            case 'UTF-32LE':
-				fgets($this->_fileHandle, 5) == "\xFF\xFE\x00\x00" ?
+                fgets($this->fileHandle, 5) == "\xFF\xFE\x00\x00" ?
-				fseek($this->_fileHandle, 4) : fseek($this->_fileHandle, 0);
+                    fseek($this->fileHandle, 4) : fseek($this->fileHandle, 0);
-				break;
+                break;
-			case 'UTF-32BE':
+            case 'UTF-32BE':
-				fgets($this->_fileHandle, 5) == "\x00\x00\xFE\xFF" ?
+                fgets($this->fileHandle, 5) == "\x00\x00\xFE\xFF" ?
-				fseek($this->_fileHandle, 4) : fseek($this->_fileHandle, 0);
+                    fseek($this->fileHandle, 4) : fseek($this->fileHandle, 0);
-				break;
+                break;
-			default:
+            default:
-				break;
+                break;
-		}
+        }
-	}
+    }
 
-	/**
+    /**
-	 * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns)
+     * Identify any separator that is explicitly set in the file
-	 *
+     *
-	 * @param 	string 		$pFilename
+     */
-	 * @throws	PHPExcel_Reader_Exception
+    protected function checkSeparator()
-	 */
+    {
-	public function listWorksheetInfo($pFilename)
+        $line = fgets($this->fileHandle);
-	{
+        if ($line === false) {
-		// Open file
+            return;
-		$this->_openFile($pFilename);
+        }
-		if (!$this->_isValidFormat()) {
-			fclose ($this->_fileHandle);
-			throw new PHPExcel_Reader_Exception($pFilename . " is an Invalid Spreadsheet file.");
-		}
-		$fileHandle = $this->_fileHandle;
 
-		// Skip BOM, if any
+        if ((strlen(trim($line, "\r\n")) == 5) && (stripos($line, 'sep=') === 0)) {
-		$this->_skipBOM();
+            $this->delimiter = substr($line, 4, 1);
+            return;
+        }
+        return $this->skipBOM();
+    }
 
-		$escapeEnclosures = array( "\\" . $this->_enclosure, $this->_enclosure . $this->_enclosure );
+    /**
+     * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns)
+     *
+     * @param     string         $pFilename
+     * @throws    PHPExcel_Reader_Exception
+     */
+    public function listWorksheetInfo($pFilename)
+    {
+        // Open file
+        $this->openFile($pFilename);
+        if (!$this->isValidFormat()) {
+            fclose($this->fileHandle);
+            throw new PHPExcel_Reader_Exception($pFilename . " is an Invalid Spreadsheet file.");
+        }
+        $fileHandle = $this->fileHandle;
 
-		$worksheetInfo = array();
+        // Skip BOM, if any
-		$worksheetInfo[0]['worksheetName'] = 'Worksheet';
+        $this->skipBOM();
-		$worksheetInfo[0]['lastColumnLetter'] = 'A';
+        $this->checkSeparator();
-		$worksheetInfo[0]['lastColumnIndex'] = 0;
-		$worksheetInfo[0]['totalRows'] = 0;
-		$worksheetInfo[0]['totalColumns'] = 0;
 
-		// Loop through each line of the file in turn
+        $escapeEnclosures = array( "\\" . $this->enclosure, $this->enclosure . $this->enclosure );
-		while (($rowData = fgetcsv($fileHandle, 0, $this->_delimiter, $this->_enclosure)) !== FALSE) {
-			$worksheetInfo[0]['totalRows']++;
-			$worksheetInfo[0]['lastColumnIndex'] = max($worksheetInfo[0]['lastColumnIndex'], count($rowData) - 1);
-		}
 
-		$worksheetInfo[0]['lastColumnLetter'] = PHPExcel_Cell::stringFromColumnIndex($worksheetInfo[0]['lastColumnIndex']);
+        $worksheetInfo = array();
-		$worksheetInfo[0]['totalColumns'] = $worksheetInfo[0]['lastColumnIndex'] + 1;
+        $worksheetInfo[0]['worksheetName'] = 'Worksheet';
+        $worksheetInfo[0]['lastColumnLetter'] = 'A';
+        $worksheetInfo[0]['lastColumnIndex'] = 0;
+        $worksheetInfo[0]['totalRows'] = 0;
+        $worksheetInfo[0]['totalColumns'] = 0;
 
-		// Close file
+        // Loop through each line of the file in turn
-		fclose($fileHandle);
+        while (($rowData = fgetcsv($fileHandle, 0, $this->delimiter, $this->enclosure)) !== false) {
+            $worksheetInfo[0]['totalRows']++;
+            $worksheetInfo[0]['lastColumnIndex'] = max($worksheetInfo[0]['lastColumnIndex'], count($rowData) - 1);
+        }
 
-		return $worksheetInfo;
+        $worksheetInfo[0]['lastColumnLetter'] = PHPExcel_Cell::stringFromColumnIndex($worksheetInfo[0]['lastColumnIndex']);
-	}
+        $worksheetInfo[0]['totalColumns'] = $worksheetInfo[0]['lastColumnIndex'] + 1;
 
-	/**
+        // Close file
-	 * Loads PHPExcel from file
+        fclose($fileHandle);
-	 *
-	 * @param 	string 		$pFilename
-	 * @return PHPExcel
-	 * @throws PHPExcel_Reader_Exception
-	 */
-	public function load($pFilename)
-	{
-		// Create new PHPExcel
-		$objPHPExcel = new PHPExcel();
 
-		// Load into this instance
+        return $worksheetInfo;
-		return $this->loadIntoExisting($pFilename, $objPHPExcel);
+    }
-	}
 
-	/**
+    /**
-	 * Loads PHPExcel from file into PHPExcel instance
+     * Loads PHPExcel from file
-	 *
+     *
-	 * @param 	string 		$pFilename
+     * @param     string         $pFilename
-	 * @param	PHPExcel	$objPHPExcel
+     * @return PHPExcel
-	 * @return 	PHPExcel
+     * @throws PHPExcel_Reader_Exception
-	 * @throws 	PHPExcel_Reader_Exception
+     */
-	 */
+    public function load($pFilename)
-	public function loadIntoExisting($pFilename, PHPExcel $objPHPExcel)
+    {
-	{
+        // Create new PHPExcel
-		$lineEnding = ini_get('auto_detect_line_endings');
+        $objPHPExcel = new PHPExcel();
-		ini_set('auto_detect_line_endings', true);
 
-		// Open file
+        // Load into this instance
-		$this->_openFile($pFilename);
+        return $this->loadIntoExisting($pFilename, $objPHPExcel);
-		if (!$this->_isValidFormat()) {
+    }
-			fclose ($this->_fileHandle);
-			throw new PHPExcel_Reader_Exception($pFilename . " is an Invalid Spreadsheet file.");
-		}
-		$fileHandle = $this->_fileHandle;
 
-		// Skip BOM, if any
+    /**
-		$this->_skipBOM();
+     * Loads PHPExcel from file into PHPExcel instance
+     *
+     * @param     string         $pFilename
+     * @param    PHPExcel    $objPHPExcel
+     * @return     PHPExcel
+     * @throws     PHPExcel_Reader_Exception
+     */
+    public function loadIntoExisting($pFilename, PHPExcel $objPHPExcel)
+    {
+        $lineEnding = ini_get('auto_detect_line_endings');
+        ini_set('auto_detect_line_endings', true);
 
-		// Create new PHPExcel object
+        // Open file
-		while ($objPHPExcel->getSheetCount() <= $this->_sheetIndex) {
+        $this->openFile($pFilename);
-			$objPHPExcel->createSheet();
+        if (!$this->isValidFormat()) {
-		}
+            fclose($this->fileHandle);
-		$sheet = $objPHPExcel->setActiveSheetIndex($this->_sheetIndex);
+            throw new PHPExcel_Reader_Exception($pFilename . " is an Invalid Spreadsheet file.");
+        }
+        $fileHandle = $this->fileHandle;
 
-		$escapeEnclosures = array( "\\" . $this->_enclosure,
+        // Skip BOM, if any
-								   $this->_enclosure . $this->_enclosure
+        $this->skipBOM();
-								 );
+        $this->checkSeparator();
 
-		// Set our starting row based on whether we're in contiguous mode or not
+        // Create new PHPExcel object
-		$currentRow = 1;
+        while ($objPHPExcel->getSheetCount() <= $this->sheetIndex) {
-		if ($this->_contiguous) {
+            $objPHPExcel->createSheet();
-			$currentRow = ($this->_contiguousRow == -1) ? $sheet->getHighestRow(): $this->_contiguousRow;
+        }
-		}
+        $sheet = $objPHPExcel->setActiveSheetIndex($this->sheetIndex);
 
-		// Loop through each line of the file in turn
+        $escapeEnclosures = array( "\\" . $this->enclosure,
-		while (($rowData = fgetcsv($fileHandle, 0, $this->_delimiter, $this->_enclosure)) !== FALSE) {
+                                   $this->enclosure . $this->enclosure
-			$columnLetter = 'A';
+                                 );
-			foreach($rowData as $rowDatum) {
-				if ($rowDatum != '' && $this->_readFilter->readCell($columnLetter, $currentRow)) {
-					// Unescape enclosures
-					$rowDatum = str_replace($escapeEnclosures, $this->_enclosure, $rowDatum);
 
-					// Convert encoding if necessary
+        // Set our starting row based on whether we're in contiguous mode or not
-					if ($this->_inputEncoding !== 'UTF-8') {
+        $currentRow = 1;
-						$rowDatum = PHPExcel_Shared_String::ConvertEncoding($rowDatum, 'UTF-8', $this->_inputEncoding);
+        if ($this->contiguous) {
-					}
+            $currentRow = ($this->contiguousRow == -1) ? $sheet->getHighestRow(): $this->contiguousRow;
+        }
 
-					// Set cell value
+        // Loop through each line of the file in turn
-					$sheet->getCell($columnLetter . $currentRow)->setValue($rowDatum);
+        while (($rowData = fgetcsv($fileHandle, 0, $this->delimiter, $this->enclosure)) !== false) {
-				}
+            $columnLetter = 'A';
-				++$columnLetter;
+            foreach ($rowData as $rowDatum) {
-			}
+                if ($rowDatum != '' && $this->readFilter->readCell($columnLetter, $currentRow)) {
-			++$currentRow;
+                    // Unescape enclosures
-		}
+                    $rowDatum = str_replace($escapeEnclosures, $this->enclosure, $rowDatum);
 
-		// Close file
+                    // Convert encoding if necessary
-		fclose($fileHandle);
+                    if ($this->inputEncoding !== 'UTF-8') {
+                        $rowDatum = PHPExcel_Shared_String::ConvertEncoding($rowDatum, 'UTF-8', $this->inputEncoding);
+                    }
 
-		if ($this->_contiguous) {
+                    // Set cell value
-			$this->_contiguousRow = $currentRow;
+                    $sheet->getCell($columnLetter . $currentRow)->setValue($rowDatum);
-		}
+                }
+                ++$columnLetter;
+            }
+            ++$currentRow;
+        }
 
-		ini_set('auto_detect_line_endings', $lineEnding);
+        // Close file
+        fclose($fileHandle);
 
-		// Return
+        if ($this->contiguous) {
-		return $objPHPExcel;
+            $this->contiguousRow = $currentRow;
-	}
+        }
 
-	/**
+        ini_set('auto_detect_line_endings', $lineEnding);
-	 * Get delimiter
-	 *
-	 * @return string
-	 */
-	public function getDelimiter() {
-		return $this->_delimiter;
-	}
 
-	/**
+        // Return
-	 * Set delimiter
+        return $objPHPExcel;
-	 *
+    }
-	 * @param	string	$pValue		Delimiter, defaults to ,
-	 * @return	PHPExcel_Reader_CSV
-	 */
-	public function setDelimiter($pValue = ',') {
-		$this->_delimiter = $pValue;
-		return $this;
-	}
 
-	/**
+    /**
-	 * Get enclosure
+     * Get delimiter
-	 *
+     *
-	 * @return string
+     * @return string
-	 */
+     */
-	public function getEnclosure() {
+    public function getDelimiter()
-		return $this->_enclosure;
+    {
-	}
+        return $this->delimiter;
+    }
 
-	/**
+    /**
-	 * Set enclosure
+     * Set delimiter
-	 *
+     *
-	 * @param	string	$pValue		Enclosure, defaults to "
+     * @param    string    $pValue        Delimiter, defaults to ,
-	 * @return PHPExcel_Reader_CSV
+     * @return    PHPExcel_Reader_CSV
-	 */
+     */
-	public function setEnclosure($pValue = '"') {
+    public function setDelimiter($pValue = ',')
-		if ($pValue == '') {
+    {
-			$pValue = '"';
+        $this->delimiter = $pValue;
-		}
+        return $this;
-		$this->_enclosure = $pValue;
+    }
-		return $this;
-	}
 
-	/**
+    /**
-	 * Get line ending
+     * Get enclosure
-	 *
+     *
-	 * @return string
+     * @return string
-	 */
+     */
-	public function getLineEnding() {
+    public function getEnclosure()
-		return $this->_lineEnding;
+    {
-	}
+        return $this->enclosure;
+    }
 
-	/**
+    /**
-	 * Set line ending
+     * Set enclosure
-	 *
+     *
-	 * @param	string	$pValue		Line ending, defaults to OS line ending (PHP_EOL)
+     * @param    string    $pValue        Enclosure, defaults to "
-	 * @return PHPExcel_Reader_CSV
+     * @return PHPExcel_Reader_CSV
-	 */
+     */
-	public function setLineEnding($pValue = PHP_EOL) {
+    public function setEnclosure($pValue = '"')
-		$this->_lineEnding = $pValue;
+    {
-		return $this;
+        if ($pValue == '') {
-	}
+            $pValue = '"';
+        }
+        $this->enclosure = $pValue;
+        return $this;
+    }
 
-	/**
+    /**
-	 * Get sheet index
+     * Get sheet index
-	 *
+     *
-	 * @return integer
+     * @return integer
-	 */
+     */
-	public function getSheetIndex() {
+    public function getSheetIndex()
-		return $this->_sheetIndex;
+    {
-	}
+        return $this->sheetIndex;
+    }
 
-	/**
+    /**
-	 * Set sheet index
+     * Set sheet index
-	 *
+     *
-	 * @param	integer		$pValue		Sheet index
+     * @param    integer        $pValue        Sheet index
-	 * @return PHPExcel_Reader_CSV
+     * @return PHPExcel_Reader_CSV
-	 */
+     */
-	public function setSheetIndex($pValue = 0) {
+    public function setSheetIndex($pValue = 0)
-		$this->_sheetIndex = $pValue;
+    {
-		return $this;
+        $this->sheetIndex = $pValue;
-	}
+        return $this;
+    }
 
-	/**
+    /**
-	 * Set Contiguous
+     * Set Contiguous
-	 *
+     *
-	 * @param boolean $contiguous
+     * @param boolean $contiguous
-	 */
+     */
-	public function setContiguous($contiguous = FALSE)
+    public function setContiguous($contiguous = false)
-	{
+    {
-		$this->_contiguous = (bool) $contiguous;
+        $this->contiguous = (bool) $contiguous;
-		if (!$contiguous) {
+        if (!$contiguous) {
-			$this->_contiguousRow = -1;
+            $this->contiguousRow = -1;
-		}
+        }
 
-		return $this;
+        return $this;
-	}
+    }
-
-	/**
-	 * Get Contiguous
-	 *
-	 * @return boolean
-	 */
-	public function getContiguous() {
-		return $this->_contiguous;
-	}
 
+    /**
+     * Get Contiguous
+     *
+     * @return boolean
+     */
+    public function getContiguous()
+    {
+        return $this->contiguous;
+    }
 }

Classes/PHPExcel/Reader/DefaultReadFilter.php

@@ -1,8 +1,18 @@
 <?php
+
+/** PHPExcel root directory */
+if (!defined('PHPEXCEL_ROOT')) {
+    /**
+     * @ignore
+     */
+    define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
+    require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+}
+
 /**
- * PHPExcel
+ * 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
+ * @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?
+     * Should this cell be read?
-	 *
+     *
-	 * @param 	$column		String column index
+     * @param    $column           Column address (as a string value like "A", or "IV")
-	 * @param 	$row			Row index
+     * @param    $row              Row number
-	 * @param	$worksheetName	Optional worksheet name
+     * @param    $worksheetName    Optional worksheet name
-	 * @return	boolean
+     * @return   boolean
-	 */
+     */
-	public function readCell($column, $row, $worksheetName = '') {
+    public function readCell($column, $row, $worksheetName = '')
-		return true;
+    {
-	}
+        return true;
+    }
 }

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
@@ -18,500 +18,503 @@
  * 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
+ * @category    PHPExcel
- * @package		PHPExcel_Reader_Excel2007
+ * @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
+ * @license        http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
- * @version		##VERSION##, ##DATE##
+ * @version        ##VERSION##, ##DATE##
  */
 
 /**
  * PHPExcel_Reader_Excel2007_Chart
  *
- * @category	PHPExcel
+ * @category    PHPExcel
- * @package		PHPExcel_Reader_Excel2007
+ * @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])) {
+        $attributes = $component->attributes();
-			if ($format == 'string') {
+        if (isset($attributes[$name])) {
-				return (string) $attributes[$name];
+            if ($format == 'string') {
-			} elseif ($format == 'integer') {
+                return (string) $attributes[$name];
-				return (integer) $attributes[$name];
+            } elseif ($format == 'integer') {
-			} elseif ($format == 'boolean') {
+                return (integer) $attributes[$name];
-				return (boolean) ($attributes[$name] === '0' || $attributes[$name] !== 'true') ? false : true;
+            } elseif ($format == 'boolean') {
-			} else {
+                return (boolean) ($attributes[$name] === '0' || $attributes[$name] !== 'true') ? false : true;
-				return (float) $attributes[$name];
+            } else {
-			}
+                return (float) $attributes[$name];
-		}
+            }
-		return null;
+        }
-	}	//	function _getAttribute()
+        return null;
+    }
 
 
-	private static function _readColor($color,$background=false) {
+    private static function readColor($color, $background = false)
-		if (isset($color["rgb"])) {
+    {
-			return (string)$color["rgb"];
+        if (isset($color["rgb"])) {
-		} else if (isset($color["indexed"])) {
+            return (string)$color["rgb"];
-			return PHPExcel_Style_Color::indexedColor($color["indexed"]-7,$background)->getARGB();
+        } elseif (isset($color["indexed"])) {
-		}
+            return PHPExcel_Style_Color::indexedColor($color["indexed"]-7, $background)->getARGB();
-	}
+        }
+    }
+
+    public static function readChart($chartElements, $chartName)
+    {
+        $namespacesChartMeta = $chartElements->getNamespaces(true);
+        $chartElementsC = $chartElements->children($namespacesChartMeta['c']);
+
+        $XaxisLabel = $YaxisLabel = $legend = $title = null;
+        $dispBlanksAs = $plotVisOnly = null;
+
+        foreach ($chartElementsC as $chartElementKey => $chartElement) {
+            switch ($chartElementKey) {
+                case "chart":
+                    foreach ($chartElement as $chartDetailsKey => $chartDetails) {
+                        $chartDetailsC = $chartDetails->children($namespacesChartMeta['c']);
+                        switch ($chartDetailsKey) {
+                            case "plotArea":
+                                $plotAreaLayout = $XaxisLable = $YaxisLable = null;
+                                $plotSeries = $plotAttributes = array();
+                                foreach ($chartDetails as $chartDetailKey => $chartDetail) {
+                                    switch ($chartDetailKey) {
+                                        case "layout":
+                                            $plotAreaLayout = self::chartLayoutDetails($chartDetail, $namespacesChartMeta, 'plotArea');
+                                            break;
+                                        case "catAx":
+                                            if (isset($chartDetail->title)) {
+                                                $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');
+                                            }
+                                            break;
+                                        case "valAx":
+                                            if (isset($chartDetail->title)) {
+                                                $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);
+                                            $plotSer->setPlotDirection($barDirection);
+                                            $plotSeries[] = $plotSer;
+                                            $plotAttributes = self::readChartAttributes($chartDetail);
+                                            break;
+                                        case "lineChart":
+                                        case "line3DChart":
+                                            $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);
+                                            break;
+                                        case "doughnutChart":
+                                        case "pieChart":
+                                        case "pie3DChart":
+                                            $explosion = isset($chartDetail->ser->explosion);
+                                            $plotSer = self::chartDataSeries($chartDetail, $namespacesChartMeta, $chartDetailKey);
+                                            $plotSer->setPlotStyle($explosion);
+                                            $plotSeries[] = $plotSer;
+                                            $plotAttributes = self::readChartAttributes($chartDetail);
+                                            break;
+                                        case "scatterChart":
+                                            $scatterStyle = self::getAttribute($chartDetail->scatterStyle, 'val', 'string');
+                                            $plotSer = self::chartDataSeries($chartDetail, $namespacesChartMeta, $chartDetailKey);
+                                            $plotSer->setPlotStyle($scatterStyle);
+                                            $plotSeries[] = $plotSer;
+                                            $plotAttributes = self::readChartAttributes($chartDetail);
+                                            break;
+                                        case "bubbleChart":
+                                            $bubbleScale = self::getAttribute($chartDetail->bubbleScale, 'val', 'integer');
+                                            $plotSer = self::chartDataSeries($chartDetail, $namespacesChartMeta, $chartDetailKey);
+                                            $plotSer->setPlotStyle($bubbleScale);
+                                            $plotSeries[] = $plotSer;
+                                            $plotAttributes = self::readChartAttributes($chartDetail);
+                                            break;
+                                        case "radarChart":
+                                            $radarStyle = self::getAttribute($chartDetail->radarStyle, 'val', 'string');
+                                            $plotSer = self::chartDataSeries($chartDetail, $namespacesChartMeta, $chartDetailKey);
+                                            $plotSer->setPlotStyle($radarStyle);
+                                            $plotSeries[] = $plotSer;
+                                            $plotAttributes = self::readChartAttributes($chartDetail);
+                                            break;
+                                        case "surfaceChart":
+                                        case "surface3DChart":
+                                            $wireFrame = self::getAttribute($chartDetail->wireframe, 'val', 'boolean');
+                                            $plotSer = self::chartDataSeries($chartDetail, $namespacesChartMeta, $chartDetailKey);
+                                            $plotSer->setPlotStyle($wireFrame);
+                                            $plotSeries[] = $plotSer;
+                                            $plotAttributes = self::readChartAttributes($chartDetail);
+                                            break;
+                                        case "stockChart":
+                                            $plotSeries[] = self::chartDataSeries($chartDetail, $namespacesChartMeta, $chartDetailKey);
+                                            $plotAttributes = self::readChartAttributes($plotAreaLayout);
+                                            break;
+                                    }
+                                }
+                                if ($plotAreaLayout == null) {
+                                    $plotAreaLayout = new PHPExcel_Chart_Layout();
+                                }
+                                $plotArea = new PHPExcel_Chart_PlotArea($plotAreaLayout, $plotSeries);
+                                self::setChartAttributes($plotAreaLayout, $plotAttributes);
+                                break;
+                            case "plotVisOnly":
+                                $plotVisOnly = self::getAttribute($chartDetails, 'val', 'string');
+                                break;
+                            case "dispBlanksAs":
+                                $dispBlanksAs = self::getAttribute($chartDetails, 'val', 'string');
+                                break;
+                            case "title":
+                                $title = self::chartTitle($chartDetails, $namespacesChartMeta, 'title');
+                                break;
+                            case "legend":
+                                $legendPos = 'r';
+                                $legendLayout = null;
+                                $legendOverlay = false;
+                                foreach ($chartDetails as $chartDetailKey => $chartDetail) {
+                                    switch ($chartDetailKey) {
+                                        case "legendPos":
+                                            $legendPos = self::getAttribute($chartDetail, 'val', 'string');
+                                            break;
+                                        case "overlay":
+                                            $legendOverlay = self::getAttribute($chartDetail, 'val', 'boolean');
+                                            break;
+                                        case "layout":
+                                            $legendLayout = self::chartLayoutDetails($chartDetail, $namespacesChartMeta, 'legend');
+                                            break;
+                                    }
+                                }
+                                $legend = new PHPExcel_Chart_Legend($legendPos, $legendLayout, $legendOverlay);
+                                break;
+                        }
+                    }
+            }
+        }
+        $chart = new PHPExcel_Chart($chartName, $title, $legend, $plotArea, $plotVisOnly, $dispBlanksAs, $XaxisLabel, $YaxisLabel);
+
+        return $chart;
+    }
+
+    private static function chartTitle($titleDetails, $namespacesChartMeta, $type)
+    {
+        $caption = array();
+        $titleLayout = null;
+        foreach ($titleDetails as $titleDetailKey => $chartDetail) {
+            switch ($titleDetailKey) {
+                case "tx":
+                    $titleDetails = $chartDetail->rich->children($namespacesChartMeta['a']);
+                    foreach ($titleDetails as $titleKey => $titleDetail) {
+                        switch ($titleKey) {
+                            case "p":
+                                $titleDetailPart = $titleDetail->children($namespacesChartMeta['a']);
+                                $caption[] = self::parseRichText($titleDetailPart);
+                        }
+                    }
+                    break;
+                case "layout":
+                    $titleLayout = self::chartLayoutDetails($chartDetail, $namespacesChartMeta);
+                    break;
+            }
+        }
+
+        return new PHPExcel_Chart_Title($caption, $titleLayout);
+    }
+
+    private static function chartLayoutDetails($chartDetail, $namespacesChartMeta)
+    {
+        if (!isset($chartDetail->manualLayout)) {
+            return null;
+        }
+        $details = $chartDetail->manualLayout->children($namespacesChartMeta['c']);
+        if (is_null($details)) {
+            return null;
+        }
+        $layout = array();
+        foreach ($details as $detailKey => $detail) {
+//            echo $detailKey, ' => ',self::getAttribute($detail, 'val', 'string'),PHP_EOL;
+            $layout[$detailKey] = self::getAttribute($detail, 'val', 'string');
+        }
+        return new PHPExcel_Chart_Layout($layout);
+    }
+
+    private static function chartDataSeries($chartDetail, $namespacesChartMeta, $plotType)
+    {
+        $multiSeriesType = null;
+        $smoothLine = false;
+        $seriesLabel = $seriesCategory = $seriesValues = $plotOrder = array();
+
+        $seriesDetailSet = $chartDetail->children($namespacesChartMeta['c']);
+        foreach ($seriesDetailSet as $seriesDetailKey => $seriesDetails) {
+            switch ($seriesDetailKey) {
+                case "grouping":
+                    $multiSeriesType = self::getAttribute($chartDetail->grouping, 'val', 'string');
+                    break;
+                case "ser":
+                    $marker = null;
+                    foreach ($seriesDetails as $seriesKey => $seriesDetail) {
+                        switch ($seriesKey) {
+                            case "idx":
+                                $seriesIndex = self::getAttribute($seriesDetail, 'val', 'integer');
+                                break;
+                            case "order":
+                                $seriesOrder = self::getAttribute($seriesDetail, 'val', 'integer');
+                                $plotOrder[$seriesIndex] = $seriesOrder;
+                                break;
+                            case "tx":
+                                $seriesLabel[$seriesIndex] = self::chartDataSeriesValueSet($seriesDetail, $namespacesChartMeta);
+                                break;
+                            case "marker":
+                                $marker = self::getAttribute($seriesDetail->symbol, 'val', 'string');
+                                break;
+                            case "smooth":
+                                $smoothLine = self::getAttribute($seriesDetail, 'val', 'boolean');
+                                break;
+                            case "cat":
+                                $seriesCategory[$seriesIndex] = self::chartDataSeriesValueSet($seriesDetail, $namespacesChartMeta);
+                                break;
+                            case "val":
+                                $seriesValues[$seriesIndex] = self::chartDataSeriesValueSet($seriesDetail, $namespacesChartMeta, $marker);
+                                break;
+                            case "xVal":
+                                $seriesCategory[$seriesIndex] = self::chartDataSeriesValueSet($seriesDetail, $namespacesChartMeta, $marker);
+                                break;
+                            case "yVal":
+                                $seriesValues[$seriesIndex] = self::chartDataSeriesValueSet($seriesDetail, $namespacesChartMeta, $marker);
+                                break;
+                        }
+                    }
+            }
+        }
+        return new PHPExcel_Chart_DataSeries($plotType, $multiSeriesType, $plotOrder, $seriesLabel, $seriesCategory, $seriesValues, $smoothLine);
+    }
 
 
-	public static function readChart($chartElements,$chartName) {
+    private static function chartDataSeriesValueSet($seriesDetail, $namespacesChartMeta, $marker = null, $smoothLine = false)
-		$namespacesChartMeta = $chartElements->getNamespaces(true);
+    {
-		$chartElementsC = $chartElements->children($namespacesChartMeta['c']);
+        if (isset($seriesDetail->strRef)) {
+            $seriesSource = (string) $seriesDetail->strRef->f;
+            $seriesData = self::chartDataSeriesValues($seriesDetail->strRef->strCache->children($namespacesChartMeta['c']), 's');
 
-		$XaxisLabel = $YaxisLabel = $legend = $title = NULL;
+            return new PHPExcel_Chart_DataSeriesValues('String', $seriesSource, $seriesData['formatCode'], $seriesData['pointCount'], $seriesData['dataValues'], $marker, $smoothLine);
-		$dispBlanksAs = $plotVisOnly = NULL;
+        } elseif (isset($seriesDetail->numRef)) {
+            $seriesSource = (string) $seriesDetail->numRef->f;
+            $seriesData = self::chartDataSeriesValues($seriesDetail->numRef->numCache->children($namespacesChartMeta['c']));
 
-		foreach($chartElementsC as $chartElementKey => $chartElement) {
+            return new PHPExcel_Chart_DataSeriesValues('Number', $seriesSource, $seriesData['formatCode'], $seriesData['pointCount'], $seriesData['dataValues'], $marker, $smoothLine);
-			switch ($chartElementKey) {
+        } elseif (isset($seriesDetail->multiLvlStrRef)) {
-				case "chart":
+            $seriesSource = (string) $seriesDetail->multiLvlStrRef->f;
-					foreach($chartElement as $chartDetailsKey => $chartDetails) {
+            $seriesData = self::chartDataSeriesValuesMultiLevel($seriesDetail->multiLvlStrRef->multiLvlStrCache->children($namespacesChartMeta['c']), 's');
-						$chartDetailsC = $chartDetails->children($namespacesChartMeta['c']);
+            $seriesData['pointCount'] = count($seriesData['dataValues']);
-						switch ($chartDetailsKey) {
-							case "plotArea":
-									$plotAreaLayout = $XaxisLable = $YaxisLable = null;
-									$plotSeries = $plotAttributes = array();
-									foreach($chartDetails as $chartDetailKey => $chartDetail) {
-										switch ($chartDetailKey) {
-											case "layout":
-												$plotAreaLayout = self::_chartLayoutDetails($chartDetail,$namespacesChartMeta,'plotArea');
-												break;
-											case "catAx":
-												if (isset($chartDetail->title)) {
-													$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');
-												}
-												break;
-											case "valAx":
-												if (isset($chartDetail->title)) {
-													$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);
-												$plotSer->setPlotDirection($barDirection);
-												$plotSeries[] = $plotSer;
-												$plotAttributes = self::_readChartAttributes($chartDetail);
-												break;
-											case "lineChart":
-											case "line3DChart":
-												$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);
-												break;
-											case "doughnutChart":
-											case "pieChart":
-											case "pie3DChart":
-												$explosion = isset($chartDetail->ser->explosion);
-												$plotSer = self::_chartDataSeries($chartDetail,$namespacesChartMeta,$chartDetailKey);
-												$plotSer->setPlotStyle($explosion);
-												$plotSeries[] = $plotSer;
-												$plotAttributes = self::_readChartAttributes($chartDetail);
-												break;
-											case "scatterChart":
-												$scatterStyle = self::_getAttribute($chartDetail->scatterStyle, 'val', 'string');
-												$plotSer = self::_chartDataSeries($chartDetail,$namespacesChartMeta,$chartDetailKey);
-												$plotSer->setPlotStyle($scatterStyle);
-												$plotSeries[] = $plotSer;
-												$plotAttributes = self::_readChartAttributes($chartDetail);
-												break;
-											case "bubbleChart":
-												$bubbleScale = self::_getAttribute($chartDetail->bubbleScale, 'val', 'integer');
-												$plotSer = self::_chartDataSeries($chartDetail,$namespacesChartMeta,$chartDetailKey);
-												$plotSer->setPlotStyle($bubbleScale);
-												$plotSeries[] = $plotSer;
-												$plotAttributes = self::_readChartAttributes($chartDetail);
-												break;
-											case "radarChart":
-												$radarStyle = self::_getAttribute($chartDetail->radarStyle, 'val', 'string');
-												$plotSer = self::_chartDataSeries($chartDetail,$namespacesChartMeta,$chartDetailKey);
-												$plotSer->setPlotStyle($radarStyle);
-												$plotSeries[] = $plotSer;
-												$plotAttributes = self::_readChartAttributes($chartDetail);
-												break;
-											case "surfaceChart":
-											case "surface3DChart":
-												$wireFrame = self::_getAttribute($chartDetail->wireframe, 'val', 'boolean');
-												$plotSer = self::_chartDataSeries($chartDetail,$namespacesChartMeta,$chartDetailKey);
-												$plotSer->setPlotStyle($wireFrame);
-												$plotSeries[] = $plotSer;
-												$plotAttributes = self::_readChartAttributes($chartDetail);
-												break;
-											case "stockChart":
-												$plotSeries[] = self::_chartDataSeries($chartDetail,$namespacesChartMeta,$chartDetailKey);
-												$plotAttributes = self::_readChartAttributes($plotAreaLayout);
-												break;
-										}
-									}
-									if ($plotAreaLayout == NULL) {
-										$plotAreaLayout = new PHPExcel_Chart_Layout();
-									}
-									$plotArea = new PHPExcel_Chart_PlotArea($plotAreaLayout,$plotSeries);
-									self::_setChartAttributes($plotAreaLayout,$plotAttributes);
-									break;
-							case "plotVisOnly":
-									$plotVisOnly = self::_getAttribute($chartDetails, 'val', 'string');
-									break;
-							case "dispBlanksAs":
-									$dispBlanksAs = self::_getAttribute($chartDetails, 'val', 'string');
-									break;
-							case "title":
-									$title = self::_chartTitle($chartDetails,$namespacesChartMeta,'title');
-									break;
-							case "legend":
-									$legendPos = 'r';
-									$legendLayout = null;
-									$legendOverlay = false;
-									foreach($chartDetails as $chartDetailKey => $chartDetail) {
-										switch ($chartDetailKey) {
-											case "legendPos":
-												$legendPos = self::_getAttribute($chartDetail, 'val', 'string');
-												break;
-											case "overlay":
-												$legendOverlay = self::_getAttribute($chartDetail, 'val', 'boolean');
-												break;
-											case "layout":
-												$legendLayout = self::_chartLayoutDetails($chartDetail,$namespacesChartMeta,'legend');
-												break;
-										}
-									}
-									$legend = new PHPExcel_Chart_Legend($legendPos, $legendLayout, $legendOverlay);
-									break;
-						}
-					}
-			}
-		}
-		$chart = new PHPExcel_Chart($chartName,$title,$legend,$plotArea,$plotVisOnly,$dispBlanksAs,$XaxisLabel,$YaxisLabel);
 
-		return $chart;
+            return new PHPExcel_Chart_DataSeriesValues('String', $seriesSource, $seriesData['formatCode'], $seriesData['pointCount'], $seriesData['dataValues'], $marker, $smoothLine);
-	}	//	function readChart()
+        } elseif (isset($seriesDetail->multiLvlNumRef)) {
+            $seriesSource = (string) $seriesDetail->multiLvlNumRef->f;
+            $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;
+    }
 
 
-	private static function _chartTitle($titleDetails,$namespacesChartMeta,$type) {
+    private static function chartDataSeriesValues($seriesValueSet, $dataType = 'n')
-		$caption = array();
+    {
-		$titleLayout = null;
+        $seriesVal = array();
-		foreach($titleDetails as $titleDetailKey => $chartDetail) {
+        $formatCode = '';
-			switch ($titleDetailKey) {
+        $pointCount = 0;
-				case "tx":
-					$titleDetails = $chartDetail->rich->children($namespacesChartMeta['a']);
-					foreach($titleDetails as $titleKey => $titleDetail) {
-						switch ($titleKey) {
-							case "p":
-								$titleDetailPart = $titleDetail->children($namespacesChartMeta['a']);
-								$caption[] = self::_parseRichText($titleDetailPart);
-						}
-					}
-					break;
-				case "layout":
-					$titleLayout = self::_chartLayoutDetails($chartDetail,$namespacesChartMeta);
-					break;
-			}
-		}
 
-		return new PHPExcel_Chart_Title($caption, $titleLayout);
+        foreach ($seriesValueSet as $seriesValueIdx => $seriesValue) {
-	}	//	function _chartTitle()
+            switch ($seriesValueIdx) {
+                case 'ptCount':
+                    $pointCount = self::getAttribute($seriesValue, 'val', 'integer');
+                    break;
+                case 'formatCode':
+                    $formatCode = (string) $seriesValue;
+                    break;
+                case 'pt':
+                    $pointVal = self::getAttribute($seriesValue, 'idx', 'integer');
+                    if ($dataType == 's') {
+                        $seriesVal[$pointVal] = (string) $seriesValue->v;
+                    } else {
+                        $seriesVal[$pointVal] = (float) $seriesValue->v;
+                    }
+                    break;
+            }
+        }
 
+        return array(
+            'formatCode'    => $formatCode,
+            'pointCount'    => $pointCount,
+            'dataValues'    => $seriesVal
+        );
+    }
 
-	private static function _chartLayoutDetails($chartDetail,$namespacesChartMeta) {
+    private static function chartDataSeriesValuesMultiLevel($seriesValueSet, $dataType = 'n')
-		if (!isset($chartDetail->manualLayout)) {
+    {
-			return null;
+        $seriesVal = array();
-		}
+        $formatCode = '';
-		$details = $chartDetail->manualLayout->children($namespacesChartMeta['c']);
+        $pointCount = 0;
-		if (is_null($details)) {
-			return null;
-		}
-		$layout = array();
-		foreach($details as $detailKey => $detail) {
-//			echo $detailKey,' => ',self::_getAttribute($detail, 'val', 'string'),PHP_EOL;
-			$layout[$detailKey] = self::_getAttribute($detail, 'val', 'string');
-		}
-		return new PHPExcel_Chart_Layout($layout);
-	}	//	function _chartLayoutDetails()
 
+        foreach ($seriesValueSet->lvl as $seriesLevelIdx => $seriesLevel) {
+            foreach ($seriesLevel as $seriesValueIdx => $seriesValue) {
+                switch ($seriesValueIdx) {
+                    case 'ptCount':
+                        $pointCount = self::getAttribute($seriesValue, 'val', 'integer');
+                        break;
+                    case 'formatCode':
+                        $formatCode = (string) $seriesValue;
+                        break;
+                    case 'pt':
+                        $pointVal = self::getAttribute($seriesValue, 'idx', 'integer');
+                        if ($dataType == 's') {
+                            $seriesVal[$pointVal][] = (string) $seriesValue->v;
+                        } else {
+                            $seriesVal[$pointVal][] = (float) $seriesValue->v;
+                        }
+                        break;
+                }
+            }
+        }
 
-	private static function _chartDataSeries($chartDetail,$namespacesChartMeta,$plotType) {
+        return array(
-		$multiSeriesType = NULL;
+            'formatCode'    => $formatCode,
-		$smoothLine = false;
+            'pointCount'    => $pointCount,
-		$seriesLabel = $seriesCategory = $seriesValues = $plotOrder = array();
+            'dataValues'    => $seriesVal
+        );
+    }
 
-		$seriesDetailSet = $chartDetail->children($namespacesChartMeta['c']);
+    private static function parseRichText($titleDetailPart = null)
-		foreach($seriesDetailSet as $seriesDetailKey => $seriesDetails) {
+    {
-			switch ($seriesDetailKey) {
+        $value = new PHPExcel_RichText();
-				case "grouping":
-					$multiSeriesType = self::_getAttribute($chartDetail->grouping, 'val', 'string');
-					break;
-				case "ser":
-					$marker = NULL;
-					foreach($seriesDetails as $seriesKey => $seriesDetail) {
-						switch ($seriesKey) {
-							case "idx":
-								$seriesIndex = self::_getAttribute($seriesDetail, 'val', 'integer');
-								break;
-							case "order":
-								$seriesOrder = self::_getAttribute($seriesDetail, 'val', 'integer');
-								$plotOrder[$seriesIndex] = $seriesOrder;
-								break;
-							case "tx":
-								$seriesLabel[$seriesIndex] = self::_chartDataSeriesValueSet($seriesDetail,$namespacesChartMeta);
-								break;
-							case "marker":
-								$marker = self::_getAttribute($seriesDetail->symbol, 'val', 'string');
-								break;
-							case "smooth":
-								$smoothLine = self::_getAttribute($seriesDetail, 'val', 'boolean');
-								break;
-							case "cat":
-								$seriesCategory[$seriesIndex] = self::_chartDataSeriesValueSet($seriesDetail,$namespacesChartMeta);
-								break;
-							case "val":
-								$seriesValues[$seriesIndex] = self::_chartDataSeriesValueSet($seriesDetail,$namespacesChartMeta,$marker);
-								break;
-							case "xVal":
-								$seriesCategory[$seriesIndex] = self::_chartDataSeriesValueSet($seriesDetail,$namespacesChartMeta,$marker);
-								break;
-							case "yVal":
-								$seriesValues[$seriesIndex] = self::_chartDataSeriesValueSet($seriesDetail,$namespacesChartMeta,$marker);
-								break;
-						}
-					}
-			}
-		}
-		return new PHPExcel_Chart_DataSeries($plotType,$multiSeriesType,$plotOrder,$seriesLabel,$seriesCategory,$seriesValues,$smoothLine);
-	}	//	function _chartDataSeries()
 
+        foreach ($titleDetailPart as $titleDetailElementKey => $titleDetailElement) {
+            if (isset($titleDetailElement->t)) {
+                $objText = $value->createTextRun((string) $titleDetailElement->t);
+            }
+            if (isset($titleDetailElement->rPr)) {
+                if (isset($titleDetailElement->rPr->rFont["val"])) {
+                    $objText->getFont()->setName((string) $titleDetailElement->rPr->rFont["val"]);
+                }
 
-	private static function _chartDataSeriesValueSet($seriesDetail, $namespacesChartMeta, $marker = null, $smoothLine = false) {
+                $fontSize = (self::getAttribute($titleDetailElement->rPr, 'sz', 'integer'));
-		if (isset($seriesDetail->strRef)) {
+                if (!is_null($fontSize)) {
-			$seriesSource = (string) $seriesDetail->strRef->f;
+                    $objText->getFont()->setSize(floor($fontSize / 100));
-			$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);
+                $fontColor = (self::getAttribute($titleDetailElement->rPr, 'color', 'string'));
-		} elseif (isset($seriesDetail->numRef)) {
+                if (!is_null($fontColor)) {
-			$seriesSource = (string) $seriesDetail->numRef->f;
+                    $objText->getFont()->setColor(new PHPExcel_Style_Color(self::readColor($fontColor)));
-			$seriesData = self::_chartDataSeriesValues($seriesDetail->numRef->numCache->children($namespacesChartMeta['c']));
+                }
 
-			return new PHPExcel_Chart_DataSeriesValues('Number',$seriesSource,$seriesData['formatCode'],$seriesData['pointCount'],$seriesData['dataValues'],$marker,$smoothLine);
+                $bold = self::getAttribute($titleDetailElement->rPr, 'b', 'boolean');
-		} elseif (isset($seriesDetail->multiLvlStrRef)) {
+                if (!is_null($bold)) {
-			$seriesSource = (string) $seriesDetail->multiLvlStrRef->f;
+                    $objText->getFont()->setBold($bold);
-			$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);
+                $italic = self::getAttribute($titleDetailElement->rPr, 'i', 'boolean');
-		} elseif (isset($seriesDetail->multiLvlNumRef)) {
+                if (!is_null($italic)) {
-			$seriesSource = (string) $seriesDetail->multiLvlNumRef->f;
+                    $objText->getFont()->setItalic($italic);
-			$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);
+                $baseline = self::getAttribute($titleDetailElement->rPr, 'baseline', 'integer');
-		}
+                if (!is_null($baseline)) {
-		return null;
+                    if ($baseline > 0) {
-	}	//	function _chartDataSeriesValueSet()
+                        $objText->getFont()->setSuperScript(true);
+                    } elseif ($baseline < 0) {
+                        $objText->getFont()->setSubScript(true);
+                    }
+                }
 
+                $underscore = (self::getAttribute($titleDetailElement->rPr, 'u', 'string'));
+                if (!is_null($underscore)) {
+                    if ($underscore == 'sng') {
+                        $objText->getFont()->setUnderline(PHPExcel_Style_Font::UNDERLINE_SINGLE);
+                    } elseif ($underscore == 'dbl') {
+                        $objText->getFont()->setUnderline(PHPExcel_Style_Font::UNDERLINE_DOUBLE);
+                    } else {
+                        $objText->getFont()->setUnderline(PHPExcel_Style_Font::UNDERLINE_NONE);
+                    }
+                }
 
-	private static function _chartDataSeriesValues($seriesValueSet,$dataType='n') {
+                $strikethrough = (self::getAttribute($titleDetailElement->rPr, 's', 'string'));
-		$seriesVal = array();
+                if (!is_null($strikethrough)) {
-		$formatCode = '';
+                    if ($strikethrough == 'noStrike') {
-		$pointCount = 0;
+                        $objText->getFont()->setStrikethrough(false);
+                    } else {
+                        $objText->getFont()->setStrikethrough(true);
+                    }
+                }
+            }
+        }
 
-		foreach($seriesValueSet as $seriesValueIdx => $seriesValue) {
+        return $value;
-			switch ($seriesValueIdx) {
+    }
-				case 'ptCount':
-					$pointCount = self::_getAttribute($seriesValue, 'val', 'integer');
-					break;
-				case 'formatCode':
-					$formatCode = (string) $seriesValue;
-					break;
-				case 'pt':
-					$pointVal = self::_getAttribute($seriesValue, 'idx', 'integer');
-					if ($dataType == 's') {
-						$seriesVal[$pointVal] = (string) $seriesValue->v;
-					} else {
-						$seriesVal[$pointVal] = (float) $seriesValue->v;
-					}
-					break;
-			}
-		}
 
-		if (empty($seriesVal)) {
+    private static function readChartAttributes($chartDetail)
-			$seriesVal = NULL;
+    {
-		}
+        $plotAttributes = array();
+        if (isset($chartDetail->dLbls)) {
+            if (isset($chartDetail->dLbls->howLegendKey)) {
+                $plotAttributes['showLegendKey'] = self::getAttribute($chartDetail->dLbls->showLegendKey, 'val', 'string');
+            }
+            if (isset($chartDetail->dLbls->showVal)) {
+                $plotAttributes['showVal'] = self::getAttribute($chartDetail->dLbls->showVal, 'val', 'string');
+            }
+            if (isset($chartDetail->dLbls->showCatName)) {
+                $plotAttributes['showCatName'] = self::getAttribute($chartDetail->dLbls->showCatName, 'val', 'string');
+            }
+            if (isset($chartDetail->dLbls->showSerName)) {
+                $plotAttributes['showSerName'] = self::getAttribute($chartDetail->dLbls->showSerName, 'val', 'string');
+            }
+            if (isset($chartDetail->dLbls->showPercent)) {
+                $plotAttributes['showPercent'] = self::getAttribute($chartDetail->dLbls->showPercent, 'val', 'string');
+            }
+            if (isset($chartDetail->dLbls->showBubbleSize)) {
+                $plotAttributes['showBubbleSize'] = self::getAttribute($chartDetail->dLbls->showBubbleSize, 'val', 'string');
+            }
+            if (isset($chartDetail->dLbls->showLeaderLines)) {
+                $plotAttributes['showLeaderLines'] = self::getAttribute($chartDetail->dLbls->showLeaderLines, 'val', 'string');
+            }
+        }
 
-		return array( 'formatCode'	=> $formatCode,
+        return $plotAttributes;
-					  'pointCount'	=> $pointCount,
+    }
-					  'dataValues'	=> $seriesVal
-					);
-	}	//	function _chartDataSeriesValues()
-
-
-	private static function _chartDataSeriesValuesMultiLevel($seriesValueSet,$dataType='n') {
-		$seriesVal = array();
-		$formatCode = '';
-		$pointCount = 0;
-
-		foreach($seriesValueSet->lvl as $seriesLevelIdx => $seriesLevel) {
-			foreach($seriesLevel as $seriesValueIdx => $seriesValue) {
-				switch ($seriesValueIdx) {
-					case 'ptCount':
-						$pointCount = self::_getAttribute($seriesValue, 'val', 'integer');
-						break;
-					case 'formatCode':
-						$formatCode = (string) $seriesValue;
-						break;
-					case 'pt':
-						$pointVal = self::_getAttribute($seriesValue, 'idx', 'integer');
-						if ($dataType == 's') {
-							$seriesVal[$pointVal][] = (string) $seriesValue->v;
-						} else {
-							$seriesVal[$pointVal][] = (float) $seriesValue->v;
-						}
-						break;
-				}
-			}
-		}
-
-		return array( 'formatCode'	=> $formatCode,
-					  'pointCount'	=> $pointCount,
-					  'dataValues'	=> $seriesVal
-					);
-	}	//	function _chartDataSeriesValuesMultiLevel()
-
-	private static function _parseRichText($titleDetailPart = null) {
-		$value = new PHPExcel_RichText();
-
-		foreach($titleDetailPart as $titleDetailElementKey => $titleDetailElement) {
-			if (isset($titleDetailElement->t)) {
-				$objText = $value->createTextRun( (string) $titleDetailElement->t );
-			}
-			if (isset($titleDetailElement->rPr)) {
-				if (isset($titleDetailElement->rPr->rFont["val"])) {
-					$objText->getFont()->setName((string) $titleDetailElement->rPr->rFont["val"]);
-				}
-
-				$fontSize = (self::_getAttribute($titleDetailElement->rPr, 'sz', 'integer'));
-				if (!is_null($fontSize)) {
-					$objText->getFont()->setSize(floor($fontSize / 100));
-				}
-
-				$fontColor = (self::_getAttribute($titleDetailElement->rPr, 'color', 'string'));
-				if (!is_null($fontColor)) {
-					$objText->getFont()->setColor( new PHPExcel_Style_Color( self::_readColor($fontColor) ) );
-				}
-
-				$bold = self::_getAttribute($titleDetailElement->rPr, 'b', 'boolean');
-				if (!is_null($bold)) {
-					$objText->getFont()->setBold($bold);
-				}
-
-				$italic = self::_getAttribute($titleDetailElement->rPr, 'i', 'boolean');
-				if (!is_null($italic)) {
-					$objText->getFont()->setItalic($italic);
-				}
-
-				$baseline = self::_getAttribute($titleDetailElement->rPr, 'baseline', 'integer');
-				if (!is_null($baseline)) {
-					if ($baseline > 0) {
-						$objText->getFont()->setSuperScript(true);
-					} elseif($baseline < 0) {
-						$objText->getFont()->setSubScript(true);
-					}
-				}
-
-				$underscore = (self::_getAttribute($titleDetailElement->rPr, 'u', 'string'));
-				if (!is_null($underscore)) {
-					if ($underscore == 'sng') {
-						$objText->getFont()->setUnderline(PHPExcel_Style_Font::UNDERLINE_SINGLE);
-					} elseif($underscore == 'dbl') {
-						$objText->getFont()->setUnderline(PHPExcel_Style_Font::UNDERLINE_DOUBLE);
-					} else {
-						$objText->getFont()->setUnderline(PHPExcel_Style_Font::UNDERLINE_NONE);
-					}
-				}
-
-				$strikethrough = (self::_getAttribute($titleDetailElement->rPr, 's', 'string'));
-				if (!is_null($strikethrough)) {
-					if ($strikethrough == 'noStrike') {
-						$objText->getFont()->setStrikethrough(false);
-					} else {
-						$objText->getFont()->setStrikethrough(true);
-					}
-				}
-			}
-		}
-
-		return $value;
-	}
-
-	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');
-			}
-			if (isset($chartDetail->dLbls->showVal)) {
-				$plotAttributes['showVal'] = self::_getAttribute($chartDetail->dLbls->showVal, 'val', 'string');
-			}
-			if (isset($chartDetail->dLbls->showCatName)) {
-				$plotAttributes['showCatName'] = self::_getAttribute($chartDetail->dLbls->showCatName, 'val', 'string');
-			}
-			if (isset($chartDetail->dLbls->showSerName)) {
-				$plotAttributes['showSerName'] = self::_getAttribute($chartDetail->dLbls->showSerName, 'val', 'string');
-			}
-			if (isset($chartDetail->dLbls->showPercent)) {
-				$plotAttributes['showPercent'] = self::_getAttribute($chartDetail->dLbls->showPercent, 'val', 'string');
-			}
-			if (isset($chartDetail->dLbls->showBubbleSize)) {
-				$plotAttributes['showBubbleSize'] = self::_getAttribute($chartDetail->dLbls->showBubbleSize, 'val', 'string');
-			}
-			if (isset($chartDetail->dLbls->showLeaderLines)) {
-				$plotAttributes['showLeaderLines'] = self::_getAttribute($chartDetail->dLbls->showLeaderLines, 'val', 'string');
-			}
-		}
-
-		return $plotAttributes;
-	}
-
-	private static function _setChartAttributes($plotArea,$plotAttributes)
-	{
-		foreach($plotAttributes as $plotAttributeKey => $plotAttributeValue) {
-			switch($plotAttributeKey) {
-				case 'showLegendKey' :
-					$plotArea->setShowLegendKey($plotAttributeValue);
-					break;
-				case 'showVal' :
-					$plotArea->setShowVal($plotAttributeValue);
-					break;
-				case 'showCatName' :
-					$plotArea->setShowCatName($plotAttributeValue);
-					break;
-				case 'showSerName' :
-					$plotArea->setShowSerName($plotAttributeValue);
-					break;
-				case 'showPercent' :
-					$plotArea->setShowPercent($plotAttributeValue);
-					break;
-				case 'showBubbleSize' :
-					$plotArea->setShowBubbleSize($plotAttributeValue);
-					break;
-				case 'showLeaderLines' :
-					$plotArea->setShowLeaderLines($plotAttributeValue);
-					break;
-			}
-		}
-	}
 
+    private static function setChartAttributes($plotArea, $plotAttributes)
+    {
+        foreach ($plotAttributes as $plotAttributeKey => $plotAttributeValue) {
+            switch ($plotAttributeKey) {
+                case 'showLegendKey':
+                    $plotArea->setShowLegendKey($plotAttributeValue);
+                    break;
+                case 'showVal':
+                    $plotArea->setShowVal($plotAttributeValue);
+                    break;
+                case 'showCatName':
+                    $plotArea->setShowCatName($plotAttributeValue);
+                    break;
+                case 'showSerName':
+                    $plotArea->setShowSerName($plotAttributeValue);
+                    break;
+                case 'showPercent':
+                    $plotArea->setShowPercent($plotAttributeValue);
+                    break;
+                case 'showBubbleSize':
+                    $plotArea->setShowBubbleSize($plotAttributeValue);
+                    break;
+                case 'showLeaderLines':
+                    $plotArea->setShowLeaderLines($plotAttributeValue);
+                    break;
+            }
+        }
+    }
 }

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,8 +20,8 @@
  *
  * @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
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
  * @version    ##VERSION##, ##DATE##
  */
 
@@ -31,69 +31,70 @@
  *
  * @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
 {
-	/**
+    /**
-	 * Theme Name
+     * Theme Name
-	 *
+     *
-	 * @var string
+     * @var string
-	 */
+     */
-	private $_themeName;
+    private $themeName;
 
-	/**
+    /**
-	 * Colour Scheme Name
+     * Colour Scheme Name
-	 *
+     *
-	 * @var string
+     * @var string
-	 */
+     */
-	private $_colourSchemeName;
+    private $colourSchemeName;
 
-	/**
+    /**
-	 * Colour Map indexed by position
+     * Colour Map indexed by position
-	 *
+     *
-	 * @var array of string
+     * @var array of string
-	 */
+     */
-	private $_colourMapValues;
+    private $colourMapValues;
 
 
-	/**
+    /**
-	 * Colour Map
+     * Colour Map
-	 *
+     *
-	 * @var array of string
+     * @var array of string
-	 */
+     */
-	private $_colourMap;
+    private $colourMap;
 
 
     /**
      * Create a new PHPExcel_Theme
-	 *
+     *
      */
-    public function __construct($themeName,$colourSchemeName,$colourMap)
+    public function __construct($themeName, $colourSchemeName, $colourMap)
     {
-		// Initialise values
+        // Initialise values
-    	$this->_themeName			= $themeName;
+        $this->themeName        = $themeName;
-		$this->_colourSchemeName	= $colourSchemeName;
+        $this->colourSchemeName = $colourSchemeName;
-		$this->_colourMap			= $colourMap;
+        $this->colourMap        = $colourMap;
     }
 
-	/**
+    /**
-	 * Get Theme Name
+     * Get Theme Name
-	 *
+     *
-	 * @return string
+     * @return string
-	 */
+     */
-	public function getThemeName()
+    public function getThemeName()
-	{
+    {
-		return $this->_themeName;
+        return $this->themeName;
-	}
+    }
 
     /**
      * Get colour Scheme Name
      *
      * @return string
      */
-    public function getColourSchemeName() {
+    public function getColourSchemeName()
-		return $this->_colourSchemeName;
+    {
+        return $this->colourSchemeName;
     }
 
     /**
@@ -101,24 +102,26 @@ class PHPExcel_Reader_Excel2007_Theme
      *
      * @return string
      */
-    public function getColourByIndex($index=0) {
+    public function getColourByIndex($index = 0)
-    	if (isset($this->_colourMap[$index])) {
+    {
-			return $this->_colourMap[$index];
+        if (isset($this->colourMap[$index])) {
-		}
+            return $this->colourMap[$index];
-		return null;
+        }
+        return null;
     }
 
-	/**
+    /**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     * 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) {
+        $vars = get_object_vars($this);
-			if ((is_object($value)) && ($key != '_parent')) {
+        foreach ($vars as $key => $value) {
-				$this->$key = clone $value;
+            if ((is_object($value)) && ($key != '_parent')) {
-			} else {
+                $this->$key = clone $value;
-				$this->$key = $value;
+            } else {
-			}
+                $this->$key = $value;
-		}
+            }
-	}
+        }
+    }
 }

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/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,33 +21,26 @@
  *
  * @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
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
- * @version	##VERSION##, ##DATE##
+ * @version    ##VERSION##, ##DATE##
  */
-
+class PHPExcel_Reader_Exception extends PHPExcel_Exception
-
+{
-/**
+    /**
- * PHPExcel_Reader_Exception
+     * Error handler callback
- *
+     *
- * @category   PHPExcel
+     * @param mixed $code
- * @package    PHPExcel_Reader
+     * @param mixed $string
- * @copyright  Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
+     * @param mixed $file
- */
+     * @param mixed $line
-class PHPExcel_Reader_Exception extends PHPExcel_Exception {
+     * @param mixed $context
-	/**
+     */
-	 * Error handler callback
+    public static function errorHandlerCallback($code, $string, $file, $line, $context)
-	 *
+    {
-	 * @param mixed $code
+        $e = new self($string, $code);
-	 * @param mixed $string
+        $e->line = $line;
-	 * @param mixed $file
+        $e->file = $file;
-	 * @param mixed $line
+        throw $e;
-	 * @param mixed $context
+    }
-	 */
-	public static function errorHandlerCallback($code, $string, $file, $line, $context) {
-		$e = new self($string, $code);
-		$e->line = $line;
-		$e->file = $file;
-		throw $e;
-	}
 }

Classes/PHPExcel/Reader/HTML.php

@@ -1,8 +1,17 @@
 <?php
+
+if (!defined('PHPEXCEL_ROOT')) {
+    /**
+     * @ignore
+     */
+    define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
+    require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+}
+
 /**
- * PHPExcel
+ * 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,449 +29,521 @@
  *
  * @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
+ * @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';
 
-	/**
+    /**
-	 * Sheet index to read
+     * Input encoding
-	 *
+     *
-	 * @var int
+     * @var string
-	 */
+     */
-	private $_sheetIndex 	= 0;
+    protected $inputEncoding = 'ANSI';
 
-	/**
+    /**
-	 * Formats
+     * Sheet index to read
-	 *
+     *
-	 * @var array
+     * @var int
-	 */
+     */
-	private $_formats = array( 'h1' => array( 'font' => array( 'bold' => true,
+    protected $sheetIndex = 0;
-															   'size' => 24,
-															 ),
-											),	//	Bold, 24pt
-							   'h2' => array( 'font' => array( 'bold' => true,
-															   'size' => 18,
-															 ),
-											),	//	Bold, 18pt
-							   'h3' => array( 'font' => array( 'bold' => true,
-															   'size' => 13.5,
-															 ),
-											),	//	Bold, 13.5pt
-							   'h4' => array( 'font' => array( 'bold' => true,
-															   'size' => 12,
-															 ),
-											),	//	Bold, 12pt
-							   'h5' => array( 'font' => array( 'bold' => true,
-															   'size' => 10,
-															 ),
-											),	//	Bold, 10pt
-							   '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,
-															                   ),
-															 ),
-											),	//	Blue underlined
-							   'hr' => array( 'borders' => array( 'bottom' => array( 'style' => PHPExcel_Style_Border::BORDER_THIN,
-																					 'color' => array( PHPExcel_Style_Color::COLOR_BLACK,
-																					                 ),
-																				   ),
-																),
-											),	//	Bottom border
-							 );
 
+    /**
+     * Formats
+     *
+     * @var array
+     */
+    protected $formats = array(
+        'h1' => array(
+            'font' => array(
+                'bold' => true,
+                'size' => 24,
+            ),
+        ), //    Bold, 24pt
+        'h2' => array(
+            'font' => array(
+                'bold' => true,
+                'size' => 18,
+            ),
+        ), //    Bold, 18pt
+        'h3' => array(
+            'font' => array(
+                'bold' => true,
+                'size' => 13.5,
+            ),
+        ), //    Bold, 13.5pt
+        'h4' => array(
+            'font' => array(
+                'bold' => true,
+                'size' => 12,
+            ),
+        ), //    Bold, 12pt
+        'h5' => array(
+            'font' => array(
+                'bold' => true,
+                'size' => 10,
+            ),
+        ), //    Bold, 10pt
+        '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,
+                ),
+            ),
+        ), //    Blue underlined
+        '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();
-	}
 
-	/**
+    /**
-	 * Validate that the current file is an HTML file
+     * Create a new PHPExcel_Reader_HTML
-	 *
+     */
-	 * @return boolean
+    public function __construct()
-	 */
+    {
-	protected function _isValidFormat()
+        $this->readFilter = new PHPExcel_Reader_DefaultReadFilter();
-	{
+    }
-		//	Reading 2048 bytes should be enough to validate that the format is HTML
-		$data = fread($this->_fileHandle, 2048);
-		if ((strpos('<',$data) !== FALSE) &&
-			(strlen($data) !== strlen(strip_tags($data)))) {
-			return TRUE;
-		}
 
-		return FALSE;
+    /**
-	}
+     * Validate that the current file is an HTML file
+     *
+     * @return boolean
+     */
+    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) &&
+                (strlen($data) !== strlen(strip_tags($data)))) {
+            return true;
+        }
 
-	/**
+        return false;
-	 * Loads PHPExcel from file
+    }
-	 *
-	 * @param 	string 		$pFilename
-	 * @return 	PHPExcel
-	 * @throws 	PHPExcel_Reader_Exception
-	 */
-	public function load($pFilename)
-	{
-		// Create new PHPExcel
-		$objPHPExcel = new PHPExcel();
 
-		// Load into this instance
+    /**
-		return $this->loadIntoExisting($pFilename, $objPHPExcel);
+     * Loads PHPExcel from file
-	}
+     *
+     * @param  string                    $pFilename
+     * @return PHPExcel
+     * @throws PHPExcel_Reader_Exception
+     */
+    public function load($pFilename)
+    {
+        // Create new PHPExcel
+        $objPHPExcel = new PHPExcel();
 
-	/**
+        // Load into this instance
-	 * Set input encoding
+        return $this->loadIntoExisting($pFilename, $objPHPExcel);
-	 *
+    }
-	 * @param string $pValue Input encoding
-	 */
-	public function setInputEncoding($pValue = 'ANSI')
-	{
-		$this->_inputEncoding = $pValue;
-		return $this;
-	}
 
-	/**
+    /**
-	 * Get input encoding
+     * Set input encoding
-	 *
+     *
-	 * @return string
+     * @param string $pValue Input encoding
-	 */
+     */
-	public function getInputEncoding()
+    public function setInputEncoding($pValue = 'ANSI')
-	{
+    {
-		return $this->_inputEncoding;
+        $this->inputEncoding = $pValue;
-	}
 
-	//	Data Array used for testing only, should write to PHPExcel object on completion of tests
+        return $this;
-	private $_dataArray = array();
+    }
 
-	private $_tableLevel = 0;
+    /**
-	private $_nestedColumn = array('A');
+     * Get input encoding
+     *
+     * @return string
+     */
+    public function getInputEncoding()
+    {
+        return $this->inputEncoding;
+    }
 
-	private function _setTableStartColumn($column) {
+    //    Data Array used for testing only, should write to PHPExcel object on completion of tests
-		if ($this->_tableLevel == 0)
+    protected $dataArray = array();
-			$column = 'A';
+    protected $tableLevel = 0;
-		++$this->_tableLevel;
+    protected $nestedColumn = array('A');
-		$this->_nestedColumn[$this->_tableLevel] = $column;
 
-		return $this->_nestedColumn[$this->_tableLevel];
+    protected function setTableStartColumn($column)
-	}
+    {
+        if ($this->tableLevel == 0) {
+            $column = 'A';
+        }
+        ++$this->tableLevel;
+        $this->nestedColumn[$this->tableLevel] = $column;
 
-	private function _getTableStartColumn() {
+        return $this->nestedColumn[$this->tableLevel];
-		return $this->_nestedColumn[$this->_tableLevel];
+    }
-	}
 
-	private function _releaseTableStartColumn() {
+    protected function getTableStartColumn()
-		--$this->_tableLevel;
+    {
-		return array_pop($this->_nestedColumn);
+        return $this->nestedColumn[$this->tableLevel];
-	}
+    }
 
-	private function _flushCell($sheet,$column,$row,&$cellContent) {
+    protected function releaseTableStartColumn()
-		if (is_string($cellContent)) {
+    {
-			//	Simple String content
+        --$this->tableLevel;
-			if (trim($cellContent) > '') {
-				//	Only actually write it if there's content in the string
-//				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;
-			}
-		} else {
-			//	We have a Rich Text run
-			//	TODO
-			$this->_dataArray[$row][$column] = 'RICH TEXT: ' . $cellContent;
-		}
-		$cellContent = (string) '';
-	}
 
-	private function _processDomElement(DOMNode $element, $sheet, &$row, &$column, &$cellContent){
+        return array_pop($this->nestedColumn);
-		foreach($element->childNodes as $child){
+    }
-			if ($child instanceof DOMText) {
-				$domText = preg_replace('/\s+/',' ',trim($child->nodeValue));
-				if (is_string($cellContent)) {
-					//	simply append the text if the cell content is a plain text string
-					$cellContent .= $domText;
-				} else {
-					//	but if we have a rich text run instead, we need to append it correctly
-					//	TODO
-				}
-			} elseif($child instanceof DOMElement) {
-//				echo '<b>DOM ELEMENT: </b>' , strtoupper($child->nodeName) , '<br />';
 
-				$attributeArray = array();
+    protected function flushCell($sheet, $column, $row, &$cellContent)
-				foreach($child->attributes as $attribute) {
+    {
-//					echo '<b>ATTRIBUTE: </b>' , $attribute->name , ' => ' , $attribute->value , '<br />';
+        if (is_string($cellContent)) {
-					$attributeArray[$attribute->name] = $attribute->value;
+            //    Simple String content
-				}
+            if (trim($cellContent) > '') {
+                //    Only actually write it if there's content in the string
+//                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
+                $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;
+        }
+        $cellContent = (string) '';
+    }
 
-				switch($child->nodeName) {
+    protected function processDomElement(DOMNode $element, $sheet, &$row, &$column, &$cellContent, $format = null)
-					case 'meta' :
+    {
-						foreach($attributeArray as $attributeName => $attributeValue) {
+        foreach ($element->childNodes as $child) {
-							switch($attributeName) {
+            if ($child instanceof DOMText) {
-								case 'content':
+                $domText = preg_replace('/\s+/u', ' ', trim($child->nodeValue));
-									//	TODO
+                if (is_string($cellContent)) {
-									//	Extract character set, so we can convert to UTF-8 if required
+                    //    simply append the text if the cell content is a plain text string
-									break;
+                    $cellContent .= $domText;
-							}
+                } else {
-						}
+                    //    but if we have a rich text run instead, we need to append it correctly
-						$this->_processDomElement($child,$sheet,$row,$column,$cellContent);
+                    //    TODO
-						break;
+                }
-					case 'title' :
+            } elseif ($child instanceof DOMElement) {
-						$this->_processDomElement($child,$sheet,$row,$column,$cellContent);
+//                echo '<b>DOM ELEMENT: </b>' , strtoupper($child->nodeName) , '<br />';
-						$sheet->setTitle($cellContent);
-						$cellContent = '';
-						break;
-					case 'span'  :
-					case 'div'   :
-					case 'font'  :
-					case 'i'     :
-					case 'em'    :
-					case 'strong':
-					case 'b'     :
-//						echo 'STYLING, SPAN OR DIV<br />';
-						if ($cellContent > '')
-							$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);
-						++$row;
-						if (isset($this->_formats[$child->nodeName])) {
-							$sheet->getStyle($column.$row)->applyFromArray($this->_formats[$child->nodeName]);
-						} else {
-							$cellContent = '----------';
-							$this->_flushCell($sheet,$column,$row,$cellContent);
-						}
-						++$row;
-					case 'br' :
-						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);
-							++$row;
-						}
-//						echo 'HARD LINE BREAK: ' , '<br />';
-						break;
-					case 'a'  :
-//						echo 'START OF HYPERLINK: ' , '<br />';
-						foreach($attributeArray as $attributeName => $attributeValue) {
-							switch($attributeName) {
-								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]);
-									}
-									break;
-							}
-						}
-						$cellContent .= ' ';
-						$this->_processDomElement($child,$sheet,$row,$column,$cellContent);
-//						echo 'END OF HYPERLINK:' , '<br />';
-						break;
-					case 'h1' :
-					case 'h2' :
-					case 'h3' :
-					case 'h4' :
-					case 'h5' :
-					case 'h6' :
-					case 'ol' :
-					case 'ul' :
-					case 'p'  :
-						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);
-//							echo 'END OF LIST ENTRY:' , '<br />';
-						} else {
-							if ($cellContent > '') {
-								$this->_flushCell($sheet,$column,$row,$cellContent);
-								$row += 2;
-							}
-//							echo 'START OF PARAGRAPH: ' , '<br />';
-							$this->_processDomElement($child,$sheet,$row,$column,$cellContent);
-//							echo 'END OF PARAGRAPH:' , '<br />';
-							$this->_flushCell($sheet,$column,$row,$cellContent);
 
-							if (isset($this->_formats[$child->nodeName])) {
+                $attributeArray = array();
-								$sheet->getStyle($column.$row)->applyFromArray($this->_formats[$child->nodeName]);
+                foreach ($child->attributes as $attribute) {
-							}
+//                    echo '<b>ATTRIBUTE: </b>' , $attribute->name , ' => ' , $attribute->value , '<br />';
+                    $attributeArray[$attribute->name] = $attribute->value;
+                }
 
-							$row += 2;
+                switch ($child->nodeName) {
-							$column = 'A';
+                    case 'meta':
-						}
+                        foreach ($attributeArray as $attributeName => $attributeValue) {
-						break;
+                            switch ($attributeName) {
-					case 'li'  :
+                                case 'content':
-						if ($this->_tableLevel > 0) {
+                                    //    TODO
-							//	If we're inside a table, replace with a \n
+                                    //    Extract character set, so we can convert to UTF-8 if required
-							$cellContent .= "\n";
+                                    break;
-//							echo 'LIST ENTRY: ' , '<br />';
+                            }
-							$this->_processDomElement($child,$sheet,$row,$column,$cellContent);
+                        }
-//							echo 'END OF LIST ENTRY:' , '<br />';
+                        $this->processDomElement($child, $sheet, $row, $column, $cellContent);
-						} else {
+                        break;
-							if ($cellContent > '') {
+                    case 'title':
-								$this->_flushCell($sheet,$column,$row,$cellContent);
+                        $this->processDomElement($child, $sheet, $row, $column, $cellContent);
-							}
+                        $sheet->setTitle($cellContent);
-							++$row;
+                        $cellContent = '';
-//							echo 'LIST ENTRY: ' , '<br />';
+                        break;
-							$this->_processDomElement($child,$sheet,$row,$column,$cellContent);
+                    case 'span':
-//							echo 'END OF LIST ENTRY:' , '<br />';
+                    case 'div':
-							$this->_flushCell($sheet,$column,$row,$cellContent);
+                    case 'font':
-							$column = 'A';
+                    case 'i':
-						}
+                    case 'em':
-						break;
+                    case 'strong':
-					case 'table' :
+                    case 'b':
-						$this->_flushCell($sheet,$column,$row,$cellContent);
+//                        echo 'STYLING, SPAN OR DIV<br />';
-						$column = $this->_setTableStartColumn($column);
+                        if ($cellContent > '') {
-//						echo 'START OF TABLE LEVEL ' , $this->_tableLevel , '<br />';
+                            $cellContent .= ' ';
-						if ($this->_tableLevel > 1)
+                        }
-							--$row;
+                        $this->processDomElement($child, $sheet, $row, $column, $cellContent);
-						$this->_processDomElement($child,$sheet,$row,$column,$cellContent);
+                        if ($cellContent > '') {
-//						echo 'END OF TABLE LEVEL ' , $this->_tableLevel , '<br />';
+                            $cellContent .= ' ';
-						$column = $this->_releaseTableStartColumn();
+                        }
-						if ($this->_tableLevel > 1) {
+//                        echo 'END OF STYLING, SPAN OR DIV<br />';
-							++$column;
+                        break;
-						} else {
+                    case 'hr':
-							++$row;
+                        $this->flushCell($sheet, $column, $row, $cellContent);
-						}
+                        ++$row;
-						break;
+                        if (isset($this->formats[$child->nodeName])) {
-					case 'thead' :
+                            $sheet->getStyle($column . $row)->applyFromArray($this->formats[$child->nodeName]);
-					case 'tbody' :
+                        } else {
-						$this->_processDomElement($child,$sheet,$row,$column,$cellContent);
+                            $cellContent = '----------';
-						break;
+                            $this->flushCell($sheet, $column, $row, $cellContent);
-					case 'tr' :
+                        }
-						++$row;
+                        ++$row;
-						$column = $this->_getTableStartColumn();
+                        // Add a break after a horizontal rule, simply by allowing the code to dropthru
-						$cellContent = '';
+                    case 'br':
-//						echo 'START OF TABLE ' , $this->_tableLevel , ' ROW<br />';
+                        if ($this->tableLevel > 0) {
-						$this->_processDomElement($child,$sheet,$row,$column,$cellContent);
+                            //    If we're inside a table, replace with a \n
-//						echo 'END OF TABLE ' , $this->_tableLevel , ' ROW<br />';
+                            $cellContent .= "\n";
-						break;
+                        } else {
-					case 'th' :
+                            //    Otherwise flush our existing content and move the row cursor on
-					case 'td' :
+                            $this->flushCell($sheet, $column, $row, $cellContent);
-//						echo 'START OF TABLE ' , $this->_tableLevel , ' CELL<br />';
+                            ++$row;
-						$this->_processDomElement($child,$sheet,$row,$column,$cellContent);
+                        }
-//						echo 'END OF TABLE ' , $this->_tableLevel , ' CELL<br />';
+//                        echo 'HARD LINE BREAK: ' , '<br />';
-						$this->_flushCell($sheet,$column,$row,$cellContent);
+                        break;
-						++$column;
+                    case 'a':
-						break;
+//                        echo 'START OF HYPERLINK: ' , '<br />';
-					case 'body' :
+                        foreach ($attributeArray as $attributeName => $attributeValue) {
-						$row = 1;
+                            switch ($attributeName) {
-						$column = 'A';
+                                case 'href':
-						$content = '';
+//                                    echo 'Link to ' , $attributeValue , '<br />';
-						$this->_tableLevel = 0;
+                                    $sheet->getCell($column . $row)->getHyperlink()->setUrl($attributeValue);
-						$this->_processDomElement($child,$sheet,$row,$column,$cellContent);
+                                    if (isset($this->formats[$child->nodeName])) {
-						break;
+                                        $sheet->getStyle($column . $row)->applyFromArray($this->formats[$child->nodeName]);
-					default:
+                                    }
-						$this->_processDomElement($child,$sheet,$row,$column,$cellContent);
+                                    break;
-				}
+                            }
-			}
+                        }
-		}
+                        $cellContent .= ' ';
-	}
+                        $this->processDomElement($child, $sheet, $row, $column, $cellContent);
+//                        echo 'END OF HYPERLINK:' , '<br />';
+                        break;
+                    case 'h1':
+                    case 'h2':
+                    case 'h3':
+                    case 'h4':
+                    case 'h5':
+                    case 'h6':
+                    case 'ol':
+                    case 'ul':
+                    case 'p':
+                        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);
+//                            echo 'END OF LIST ENTRY:' , '<br />';
+                        } else {
+                            if ($cellContent > '') {
+                                $this->flushCell($sheet, $column, $row, $cellContent);
+                                $row++;
+                            }
+//                            echo 'START OF PARAGRAPH: ' , '<br />';
+                            $this->processDomElement($child, $sheet, $row, $column, $cellContent);
+//                            echo 'END OF PARAGRAPH:' , '<br />';
+                            $this->flushCell($sheet, $column, $row, $cellContent);
 
-	/**
+                            if (isset($this->formats[$child->nodeName])) {
-	 * Loads PHPExcel from file into PHPExcel instance
+                                $sheet->getStyle($column . $row)->applyFromArray($this->formats[$child->nodeName]);
-	 *
+                            }
-	 * @param 	string 		$pFilename
-	 * @param	PHPExcel	$objPHPExcel
-	 * @return 	PHPExcel
-	 * @throws 	PHPExcel_Reader_Exception
-	 */
-	public function loadIntoExisting($pFilename, PHPExcel $objPHPExcel)
-	{
-		// Open file to validate
-		$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);
 
-		// Create new PHPExcel
+                            $row++;
-		while ($objPHPExcel->getSheetCount() <= $this->_sheetIndex) {
+                            $column = 'A';
-			$objPHPExcel->createSheet();
+                        }
-		}
+                        break;
-		$objPHPExcel->setActiveSheetIndex( $this->_sheetIndex );
+                    case 'li':
+                        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);
+//                            echo 'END OF LIST ENTRY:' , '<br />';
+                        } else {
+                            if ($cellContent > '') {
+                                $this->flushCell($sheet, $column, $row, $cellContent);
+                            }
+                            ++$row;
+//                            echo 'LIST ENTRY: ' , '<br />';
+                            $this->processDomElement($child, $sheet, $row, $column, $cellContent);
+//                            echo 'END OF LIST ENTRY:' , '<br />';
+                            $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) {
+                            --$row;
+                        }
+                        $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;
+                        }
+                        break;
+                    case 'thead':
+                    case 'tbody':
+                        $this->processDomElement($child, $sheet, $row, $column, $cellContent);
+                        break;
+                    case 'tr':
+                        $column = $this->getTableStartColumn();
+                        $cellContent = '';
+//                        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 />';
 
-		//	Create a new DOM object
+                        while (isset($this->rowspan[$column . $row])) {
-		$dom = new domDocument;
+                            ++$column;
-		//	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');
-		}
 
-		//	Discard white space
+                        $this->flushCell($sheet, $column, $row, $cellContent);
-		$dom->preserveWhiteSpace = false;
 
+//                        if (isset($attributeArray['style']) && !empty($attributeArray['style'])) {
+//                            $styleAry = $this->getPhpExcelStyleArray($attributeArray['style']);
+//
+//                            if (!empty($styleAry)) {
+//                                $sheet->getStyle($column . $row)->applyFromArray($styleAry);
+//                            }
+//                        }
 
-		$row = 0;
+                        if (isset($attributeArray['rowspan']) && isset($attributeArray['colspan'])) {
-		$column = 'A';
+                            //create merging rowspan and colspan
-		$content = '';
+                            $columnTo = $column;
-		$this->_processDomElement($dom,$objPHPExcel->getActiveSheet(),$row,$column,$content);
+                            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);
+                        break;
+                    default:
+                        $this->processDomElement($child, $sheet, $row, $column, $cellContent);
+                }
+            }
+        }
+    }
 
-//		echo '<hr />';
+    /**
-//		var_dump($this->_dataArray);
+     * Loads PHPExcel from file into PHPExcel instance
+     *
+     * @param  string                    $pFilename
+     * @param  PHPExcel                  $objPHPExcel
+     * @return PHPExcel
+     * @throws PHPExcel_Reader_Exception
+     */
+    public function loadIntoExisting($pFilename, PHPExcel $objPHPExcel)
+    {
+        // Open file to validate
+        $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);
 
-		// Return
+        // Create new PHPExcel
-		return $objPHPExcel;
+        while ($objPHPExcel->getSheetCount() <= $this->sheetIndex) {
-	}
+            $objPHPExcel->createSheet();
+        }
+        $objPHPExcel->setActiveSheetIndex($this->sheetIndex);
 
-	/**
+        //    Create a new DOM object
-	 * Get sheet index
+        $dom = new domDocument;
-	 *
+        //    Reload the HTML file into the DOM object
-	 * @return int
+        $loaded = $dom->loadHTML(mb_convert_encoding($this->securityScanFile($pFilename), 'HTML-ENTITIES', 'UTF-8'));
-	 */
+        if ($loaded === false) {
-	public function getSheetIndex() {
+            throw new PHPExcel_Reader_Exception('Failed to load ' . $pFilename . ' as a DOM Document');
-		return $this->_sheetIndex;
+        }
-	}
 
-	/**
+        //    Discard white space
-	 * Set sheet index
+        $dom->preserveWhiteSpace = false;
-	 *
-	 * @param	int		$pValue		Sheet index
-	 * @return PHPExcel_Reader_HTML
-	 */
-	public function setSheetIndex($pValue = 0) {
-		$this->_sheetIndex = $pValue;
-		return $this;
-	}
 
+        $row = 0;
+        $column = 'A';
+        $content = '';
+        $this->processDomElement($dom, $objPHPExcel->getActiveSheet(), $row, $column, $content);
+
+        // Return
+        return $objPHPExcel;
+    }
+
+    /**
+     * Get sheet index
+     *
+     * @return int
+     */
+    public function getSheetIndex()
+    {
+        return $this->sheetIndex;
+    }
+
+    /**
+     * Set sheet index
+     *
+     * @param  int                  $pValue Sheet index
+     * @return PHPExcel_Reader_HTML
+     */
+    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,28 +21,19 @@
  *
  * @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
+ * @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?
+     * Should this cell be read?
-	 *
+     *
-	 * @param 	$column		String column index
+     * @param    $column           Column address (as a string value like "A", or "IV")
-	 * @param 	$row			Row index
+     * @param    $row              Row number
-	 * @param	$worksheetName	Optional worksheet name
+     * @param    $worksheetName    Optional worksheet name
-	 * @return	boolean
+     * @return   boolean
-	 */
+     */
-	public function readCell($column, $row, $worksheetName = '');
+    public function readCell($column, $row, $worksheetName = '');
 }

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,34 +21,26 @@
  *
  * @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
+ * @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
 {
-	/**
+    /**
-	 * Can the current PHPExcel_Reader_IReader read the file?
+     * Can the current PHPExcel_Reader_IReader read the file?
-	 *
+     *
-	 * @param 	string 		$pFilename
+     * @param     string         $pFilename
-	 * @return 	boolean
+     * @return     boolean
-	 */
+     */
-	public function canRead($pFilename);
+    public function canRead($pFilename);
 
-	/**
+    /**
-	 * Loads PHPExcel from file
+     * Loads PHPExcel from file
-	 *
+     *
-	 * @param 	string 		$pFilename
+     * @param     string         $pFilename
-	 * @throws 	PHPExcel_Reader_Exception
+     * @return  PHPExcel
-	 */
+     * @throws     PHPExcel_Reader_Exception
-	public function load($pFilename);
+     */
+    public function load($pFilename);
 }

Classes/PHPExcel/Reader/SYLK.php

@@ -1,8 +1,18 @@
 <?php
+
+/** PHPExcel root directory */
+if (!defined('PHPEXCEL_ROOT')) {
+    /**
+     * @ignore
+     */
+    define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
+    require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+}
+
 /**
- * PHPExcel
+ * 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,431 +30,449 @@
  *
  * @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
+ * @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
 {
-	/**
+    /**
-	 * Input encoding
+     * Input encoding
-	 *
+     *
-	 * @var string
+     * @var string
-	 */
+     */
-	private $_inputEncoding	= 'ANSI';
+    private $inputEncoding = 'ANSI';
 
-	/**
+    /**
-	 * Sheet index to read
+     * Sheet index to read
-	 *
+     *
-	 * @var int
+     * @var int
-	 */
+     */
-	private $_sheetIndex 	= 0;
+    private $sheetIndex = 0;
 
-	/**
+    /**
-	 * Formats
+     * Formats
-	 *
+     *
-	 * @var array
+     * @var array
-	 */
+     */
-	private $_formats = array();
+    private $formats = array();
 
-	/**
+    /**
-	 * Format Count
+     * Format Count
-	 *
+     *
-	 * @var int
+     * @var int
-	 */
+     */
-	private $_format = 0;
+    private $format = 0;
 
-	/**
+    /**
-	 * Create a new PHPExcel_Reader_SYLK
+     * Create a new PHPExcel_Reader_SYLK
-	 */
+     */
-	public function __construct() {
+    public function __construct()
-		$this->_readFilter 	= new PHPExcel_Reader_DefaultReadFilter();
+    {
-	}
+        $this->readFilter = new PHPExcel_Reader_DefaultReadFilter();
+    }
 
-	/**
+    /**
-	 * Validate that the current file is a SYLK file
+     * Validate that the current file is a SYLK file
-	 *
+     *
-	 * @return boolean
+     * @return boolean
-	 */
+     */
-	protected function _isValidFormat()
+    protected function isValidFormat()
-	{
+    {
-		// Read sample data (first 2 KB will do)
+        // Read sample data (first 2 KB will do)
-		$data = fread($this->_fileHandle, 2048);
+        $data = fread($this->fileHandle, 2048);
 
-		// Count delimiters in file
+        // Count delimiters in file
-		$delimiterCount = substr_count($data, ';');
+        $delimiterCount = substr_count($data, ';');
-		if ($delimiterCount < 1) {
+        if ($delimiterCount < 1) {
-			return FALSE;
+            return false;
-		}
+        }
 
-		// Analyze first line looking for ID; signature
+        // Analyze first line looking for ID; signature
-		$lines = explode("\n", $data);
+        $lines = explode("\n", $data);
-		if (substr($lines[0],0,4) != 'ID;P') {
+        if (substr($lines[0], 0, 4) != 'ID;P') {
-			return FALSE;
+            return false;
-		}
+        }
 
-		return TRUE;
+        return true;
-	}
+    }
 
-	/**
+    /**
-	 * Set input encoding
+     * Set input encoding
-	 *
+     *
-	 * @param string $pValue Input encoding
+     * @param string $pValue Input encoding
-	 */
+     */
-	public function setInputEncoding($pValue = 'ANSI')
+    public function setInputEncoding($pValue = 'ANSI')
-	{
+    {
-		$this->_inputEncoding = $pValue;
+        $this->inputEncoding = $pValue;
-		return $this;
+        return $this;
-	}
+    }
 
-	/**
+    /**
-	 * Get input encoding
+     * Get input encoding
-	 *
+     *
-	 * @return string
+     * @return string
-	 */
+     */
-	public function getInputEncoding()
+    public function getInputEncoding()
-	{
+    {
-		return $this->_inputEncoding;
+        return $this->inputEncoding;
-	}
+    }
 
-	/**
+    /**
-	 * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns)
+     * Return worksheet info (Name, Last Column Letter, Last Column Index, Total Rows, Total Columns)
-	 *
+     *
-	 * @param   string     $pFilename
+     * @param   string     $pFilename
-	 * @throws   PHPExcel_Reader_Exception
+     * @throws   PHPExcel_Reader_Exception
-	 */
+     */
-	public function listWorksheetInfo($pFilename)
+    public function listWorksheetInfo($pFilename)
-	{
+    {
-		// Open file
+        // Open file
-		$this->_openFile($pFilename);
+        $this->openFile($pFilename);
-		if (!$this->_isValidFormat()) {
+        if (!$this->isValidFormat()) {
-			fclose ($this->_fileHandle);
+            fclose($this->fileHandle);
-			throw new PHPExcel_Reader_Exception($pFilename . " is an Invalid Spreadsheet file.");
+            throw new PHPExcel_Reader_Exception($pFilename . " is an Invalid Spreadsheet file.");
-		}
+        }
-		$fileHandle = $this->_fileHandle;
+        $fileHandle = $this->fileHandle;
-		rewind($fileHandle);
+        rewind($fileHandle);
 
-		$worksheetInfo = array();
+        $worksheetInfo = array();
-		$worksheetInfo[0]['worksheetName'] = 'Worksheet';
+        $worksheetInfo[0]['worksheetName'] = 'Worksheet';
-		$worksheetInfo[0]['lastColumnLetter'] = 'A';
+        $worksheetInfo[0]['lastColumnLetter'] = 'A';
-		$worksheetInfo[0]['lastColumnIndex'] = 0;
+        $worksheetInfo[0]['lastColumnIndex'] = 0;
-		$worksheetInfo[0]['totalRows'] = 0;
+        $worksheetInfo[0]['totalRows'] = 0;
-		$worksheetInfo[0]['totalColumns'] = 0;
+        $worksheetInfo[0]['totalColumns'] = 0;
 
-		// Loop through file
+        // Loop through file
-		$rowData = array();
+        $rowData = array();
 
-		// loop through one row (line) at a time in the file
+        // loop through one row (line) at a time in the file
-		$rowIndex = 0;
+        $rowIndex = 0;
-		while (($rowData = fgets($fileHandle)) !== FALSE) {
+        while (($rowData = fgets($fileHandle)) !== false) {
-			$columnIndex = 0;
+            $columnIndex = 0;
 
-			// convert SYLK encoded $rowData to UTF-8
+            // convert SYLK encoded $rowData to UTF-8
-			$rowData = PHPExcel_Shared_String::SYLKtoUTF8($rowData);
+            $rowData = PHPExcel_Shared_String::SYLKtoUTF8($rowData);
 
-			// explode each row at semicolons while taking into account that literal semicolon (;)
+            // explode each row at semicolons while taking into account that literal semicolon (;)
-			// is escaped like this (;;)
+            // is escaped like this (;;)
-			$rowData = explode("\t",str_replace('¤',';',str_replace(';',"\t",str_replace(';;','¤',rtrim($rowData)))));
+            $rowData = explode("\t", str_replace('¤', ';', str_replace(';', "\t", str_replace(';;', '¤', rtrim($rowData)))));
 
-			$dataType = array_shift($rowData);
+            $dataType = array_shift($rowData);
-			if ($dataType == 'C') {
+            if ($dataType == 'C') {
-				//  Read cell value data
+                //  Read cell value data
-				foreach($rowData as $rowDatum) {
+                foreach ($rowData as $rowDatum) {
-					switch($rowDatum{0}) {
+                    switch ($rowDatum{0}) {
-						case 'C' :
+                        case 'C':
-						case 'X' :
+                        case 'X':
-							$columnIndex = substr($rowDatum,1) - 1;
+                            $columnIndex = substr($rowDatum, 1) - 1;
-							break;
+                            break;
-						case 'R' :
+                        case 'R':
-						case 'Y' :
+                        case 'Y':
-							$rowIndex = substr($rowDatum,1);
+                            $rowIndex = substr($rowDatum, 1);
-							break;
+                            break;
-					}
+                    }
 
-					$worksheetInfo[0]['totalRows'] = max($worksheetInfo[0]['totalRows'], $rowIndex);
+                    $worksheetInfo[0]['totalRows'] = max($worksheetInfo[0]['totalRows'], $rowIndex);
-					$worksheetInfo[0]['lastColumnIndex'] = max($worksheetInfo[0]['lastColumnIndex'], $columnIndex);
+                    $worksheetInfo[0]['lastColumnIndex'] = max($worksheetInfo[0]['lastColumnIndex'], $columnIndex);
-				}
+                }
-			}
+            }
-		}
+        }
 
-		$worksheetInfo[0]['lastColumnLetter'] = PHPExcel_Cell::stringFromColumnIndex($worksheetInfo[0]['lastColumnIndex']);
+        $worksheetInfo[0]['lastColumnLetter'] = PHPExcel_Cell::stringFromColumnIndex($worksheetInfo[0]['lastColumnIndex']);
-		$worksheetInfo[0]['totalColumns'] = $worksheetInfo[0]['lastColumnIndex'] + 1;
+        $worksheetInfo[0]['totalColumns'] = $worksheetInfo[0]['lastColumnIndex'] + 1;
 
-		// Close file
+        // Close file
-		fclose($fileHandle);
+        fclose($fileHandle);
 
-		return $worksheetInfo;
+        return $worksheetInfo;
-	}
+    }
 
-	/**
+    /**
-	 * Loads PHPExcel from file
+     * Loads PHPExcel from file
-	 *
+     *
-	 * @param 	string 		$pFilename
+     * @param     string         $pFilename
-	 * @return 	PHPExcel
+     * @return     PHPExcel
-	 * @throws 	PHPExcel_Reader_Exception
+     * @throws     PHPExcel_Reader_Exception
-	 */
+     */
-	public function load($pFilename)
+    public function load($pFilename)
-	{
+    {
-		// Create new PHPExcel
+        // Create new PHPExcel
-		$objPHPExcel = new PHPExcel();
+        $objPHPExcel = new PHPExcel();
 
-		// Load into this instance
+        // Load into this instance
-		return $this->loadIntoExisting($pFilename, $objPHPExcel);
+        return $this->loadIntoExisting($pFilename, $objPHPExcel);
-	}
+    }
 
-	/**
+    /**
-	 * Loads PHPExcel from file into PHPExcel instance
+     * Loads PHPExcel from file into PHPExcel instance
-	 *
+     *
-	 * @param 	string 		$pFilename
+     * @param     string         $pFilename
-	 * @param	PHPExcel	$objPHPExcel
+     * @param    PHPExcel    $objPHPExcel
-	 * @return 	PHPExcel
+     * @return     PHPExcel
-	 * @throws 	PHPExcel_Reader_Exception
+     * @throws     PHPExcel_Reader_Exception
-	 */
+     */
-	public function loadIntoExisting($pFilename, PHPExcel $objPHPExcel)
+    public function loadIntoExisting($pFilename, PHPExcel $objPHPExcel)
-	{
+    {
-		// Open file
+        // Open file
-		$this->_openFile($pFilename);
+        $this->openFile($pFilename);
-		if (!$this->_isValidFormat()) {
+        if (!$this->isValidFormat()) {
-			fclose ($this->_fileHandle);
+            fclose($this->fileHandle);
-			throw new PHPExcel_Reader_Exception($pFilename . " is an Invalid Spreadsheet file.");
+            throw new PHPExcel_Reader_Exception($pFilename . " is an Invalid Spreadsheet file.");
-		}
+        }
-		$fileHandle = $this->_fileHandle;
+        $fileHandle = $this->fileHandle;
-		rewind($fileHandle);
+        rewind($fileHandle);
 
-		// Create new PHPExcel
+        // Create new PHPExcel
-		while ($objPHPExcel->getSheetCount() <= $this->_sheetIndex) {
+        while ($objPHPExcel->getSheetCount() <= $this->sheetIndex) {
-			$objPHPExcel->createSheet();
+            $objPHPExcel->createSheet();
-		}
+        }
-		$objPHPExcel->setActiveSheetIndex( $this->_sheetIndex );
+        $objPHPExcel->setActiveSheetIndex($this->sheetIndex);
 
-		$fromFormats	= array('\-',	'\ ');
+        $fromFormats    = array('\-',    '\ ');
-		$toFormats		= array('-',	' ');
+        $toFormats        = array('-',    ' ');
 
-		// Loop through file
+        // Loop through file
-		$rowData = array();
+        $rowData = array();
-		$column = $row = '';
+        $column = $row = '';
 
-		// loop through one row (line) at a time in the file
+        // 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);
 
-			// convert SYLK encoded $rowData to UTF-8
+            // explode each row at semicolons while taking into account that literal semicolon (;)
-			$rowData = PHPExcel_Shared_String::SYLKtoUTF8($rowData);
+            // is escaped like this (;;)
+            $rowData = explode("\t", str_replace('¤', ';', str_replace(';', "\t", str_replace(';;', '¤', rtrim($rowData)))));
 
-			// explode each row at semicolons while taking into account that literal semicolon (;)
+            $dataType = array_shift($rowData);
-			// is escaped like this (;;)
+            //    Read shared styles
-			$rowData = explode("\t",str_replace('¤',';',str_replace(';',"\t",str_replace(';;','¤',rtrim($rowData)))));
+            if ($dataType == 'P') {
+                $formatArray = array();
+                foreach ($rowData as $rowDatum) {
+                    switch ($rowDatum{0}) {
+                        case 'P':
+                            $formatArray['numberformat']['code'] = str_replace($fromFormats, $toFormats, substr($rowDatum, 1));
+                            break;
+                        case 'E':
+                        case 'F':
+                            $formatArray['font']['name'] = substr($rowDatum, 1);
+                            break;
+                        case 'L':
+                            $formatArray['font']['size'] = substr($rowDatum, 1);
+                            break;
+                        case 'S':
+                            $styleSettings = substr($rowDatum, 1);
+                            for ($i=0; $i<strlen($styleSettings); ++$i) {
+                                switch ($styleSettings{$i}) {
+                                    case 'I':
+                                        $formatArray['font']['italic'] = true;
+                                        break;
+                                    case 'D':
+                                        $formatArray['font']['bold'] = true;
+                                        break;
+                                    case 'T':
+                                        $formatArray['borders']['top']['style'] = PHPExcel_Style_Border::BORDER_THIN;
+                                        break;
+                                    case 'B':
+                                        $formatArray['borders']['bottom']['style'] = PHPExcel_Style_Border::BORDER_THIN;
+                                        break;
+                                    case 'L':
+                                        $formatArray['borders']['left']['style'] = PHPExcel_Style_Border::BORDER_THIN;
+                                        break;
+                                    case 'R':
+                                        $formatArray['borders']['right']['style'] = PHPExcel_Style_Border::BORDER_THIN;
+                                        break;
+                                }
+                            }
+                            break;
+                    }
+                }
+                $this->formats['P'.$this->format++] = $formatArray;
+            //    Read cell value data
+            } elseif ($dataType == 'C') {
+                $hasCalculatedValue = false;
+                $cellData = $cellDataFormula = '';
+                foreach ($rowData as $rowDatum) {
+                    switch ($rowDatum{0}) {
+                        case 'C':
+                        case 'X':
+                            $column = substr($rowDatum, 1);
+                            break;
+                        case 'R':
+                        case 'Y':
+                            $row = substr($rowDatum, 1);
+                            break;
+                        case 'K':
+                            $cellData = substr($rowDatum, 1);
+                            break;
+                        case 'E':
+                            $cellDataFormula = '='.substr($rowDatum, 1);
+                            //    Convert R1C1 style references to A1 style references (but only when not quoted)
+                            $temp = explode('"', $cellDataFormula);
+                            $key = false;
+                            foreach ($temp as &$value) {
+                                //    Only count/replace in alternate array entries
+                                if ($key = !$key) {
+                                    preg_match_all('/(R(\[?-?\d*\]?))(C(\[?-?\d*\]?))/', $value, $cellReferences, PREG_SET_ORDER+PREG_OFFSET_CAPTURE);
+                                    //    Reverse the matches array, otherwise all our offsets will become incorrect if we modify our way
+                                    //        through the formula from left to right. Reversing means that we work right to left.through
+                                    //        the formula
+                                    $cellReferences = array_reverse($cellReferences);
+                                    //    Loop through each R1C1 style reference in turn, converting it to its A1 style equivalent,
+                                    //        then modify the formula to use that new reference
+                                    foreach ($cellReferences as $cellReference) {
+                                        $rowReference = $cellReference[2][0];
+                                        //    Empty R reference is the current row
+                                        if ($rowReference == '') {
+                                            $rowReference = $row;
+                                        }
+                                        //    Bracketed R references are relative to the current row
+                                        if ($rowReference{0} == '[') {
+                                            $rowReference = $row + trim($rowReference, '[]');
+                                        }
+                                        $columnReference = $cellReference[4][0];
+                                        //    Empty C reference is the current column
+                                        if ($columnReference == '') {
+                                            $columnReference = $column;
+                                        }
+                                        //    Bracketed C references are relative to the current column
+                                        if ($columnReference{0} == '[') {
+                                            $columnReference = $column + trim($columnReference, '[]');
+                                        }
+                                        $A1CellReference = PHPExcel_Cell::stringFromColumnIndex($columnReference-1).$rowReference;
 
-			$dataType = array_shift($rowData);
+                                        $value = substr_replace($value, $A1CellReference, $cellReference[0][1], strlen($cellReference[0][0]));
-			//	Read shared styles
+                                    }
-			if ($dataType == 'P') {
+                                }
-				$formatArray = array();
+                            }
-				foreach($rowData as $rowDatum) {
+                            unset($value);
-					switch($rowDatum{0}) {
+                            //    Then rebuild the formula string
-						case 'P' :	$formatArray['numberformat']['code'] = str_replace($fromFormats,$toFormats,substr($rowDatum,1));
+                            $cellDataFormula = implode('"', $temp);
-									break;
+                            $hasCalculatedValue = true;
-						case 'E' :
+                            break;
-						case 'F' :	$formatArray['font']['name'] = substr($rowDatum,1);
+                    }
-									break;
+                }
-						case 'L' :	$formatArray['font']['size'] = substr($rowDatum,1);
+                $columnLetter = PHPExcel_Cell::stringFromColumnIndex($column-1);
-									break;
+                $cellData = PHPExcel_Calculation::unwrapResult($cellData);
-						case 'S' :	$styleSettings = substr($rowDatum,1);
-									for ($i=0;$i<strlen($styleSettings);++$i) {
-										switch ($styleSettings{$i}) {
-											case 'I' :	$formatArray['font']['italic'] = true;
-														break;
-											case 'D' :	$formatArray['font']['bold'] = true;
-														break;
-											case 'T' :	$formatArray['borders']['top']['style'] = PHPExcel_Style_Border::BORDER_THIN;
-														break;
-											case 'B' :	$formatArray['borders']['bottom']['style'] = PHPExcel_Style_Border::BORDER_THIN;
-														break;
-											case 'L' :	$formatArray['borders']['left']['style'] = PHPExcel_Style_Border::BORDER_THIN;
-														break;
-											case 'R' :	$formatArray['borders']['right']['style'] = PHPExcel_Style_Border::BORDER_THIN;
-														break;
-										}
-									}
-									break;
-					}
-				}
-				$this->_formats['P'.$this->_format++] = $formatArray;
-			//	Read cell value data
-			} elseif ($dataType == 'C') {
-				$hasCalculatedValue = false;
-				$cellData = $cellDataFormula = '';
-				foreach($rowData as $rowDatum) {
-					switch($rowDatum{0}) {
-						case 'C' :
-						case 'X' :	$column = substr($rowDatum,1);
-									break;
-						case 'R' :
-						case 'Y' :	$row = substr($rowDatum,1);
-									break;
-						case 'K' :	$cellData = substr($rowDatum,1);
-									break;
-						case 'E' :	$cellDataFormula = '='.substr($rowDatum,1);
-									//	Convert R1C1 style references to A1 style references (but only when not quoted)
-									$temp = explode('"',$cellDataFormula);
-									$key = false;
-									foreach($temp as &$value) {
-										//	Only count/replace in alternate array entries
-										if ($key = !$key) {
-											preg_match_all('/(R(\[?-?\d*\]?))(C(\[?-?\d*\]?))/',$value, $cellReferences,PREG_SET_ORDER+PREG_OFFSET_CAPTURE);
-											//	Reverse the matches array, otherwise all our offsets will become incorrect if we modify our way
-											//		through the formula from left to right. Reversing means that we work right to left.through
-											//		the formula
-											$cellReferences = array_reverse($cellReferences);
-											//	Loop through each R1C1 style reference in turn, converting it to its A1 style equivalent,
-											//		then modify the formula to use that new reference
-											foreach($cellReferences as $cellReference) {
-												$rowReference = $cellReference[2][0];
-												//	Empty R reference is the current row
-												if ($rowReference == '') $rowReference = $row;
-												//	Bracketed R references are relative to the current row
-												if ($rowReference{0} == '[') $rowReference = $row + trim($rowReference,'[]');
-												$columnReference = $cellReference[4][0];
-												//	Empty C reference is the current column
-												if ($columnReference == '') $columnReference = $column;
-												//	Bracketed C references are relative to the current column
-												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]));
+                // Set cell value
-											}
+                $objPHPExcel->getActiveSheet()->getCell($columnLetter.$row)->setValue(($hasCalculatedValue) ? $cellDataFormula : $cellData);
-										}
+                if ($hasCalculatedValue) {
-									}
+                    $cellData = PHPExcel_Calculation::unwrapResult($cellData);
-									unset($value);
+                    $objPHPExcel->getActiveSheet()->getCell($columnLetter.$row)->setCalculatedValue($cellData);
-									//	Then rebuild the formula string
+                }
-									$cellDataFormula = implode('"',$temp);
+            //    Read cell formatting
-									$hasCalculatedValue = true;
+            } elseif ($dataType == 'F') {
-									break;
+                $formatStyle = $columnWidth = $styleSettings = '';
-					}
+                $styleData = array();
-				}
+                foreach ($rowData as $rowDatum) {
-				$columnLetter = PHPExcel_Cell::stringFromColumnIndex($column-1);
+                    switch ($rowDatum{0}) {
-				$cellData = PHPExcel_Calculation::_unwrapResult($cellData);
+                        case 'C':
+                        case 'X':
+                            $column = substr($rowDatum, 1);
+                            break;
+                        case 'R':
+                        case 'Y':
+                            $row = substr($rowDatum, 1);
+                            break;
+                        case 'P':
+                            $formatStyle = $rowDatum;
+                            break;
+                        case 'W':
+                            list($startCol, $endCol, $columnWidth) = explode(' ', substr($rowDatum, 1));
+                            break;
+                        case 'S':
+                            $styleSettings = substr($rowDatum, 1);
+                            for ($i=0; $i<strlen($styleSettings); ++$i) {
+                                switch ($styleSettings{$i}) {
+                                    case 'I':
+                                        $styleData['font']['italic'] = true;
+                                        break;
+                                    case 'D':
+                                        $styleData['font']['bold'] = true;
+                                        break;
+                                    case 'T':
+                                        $styleData['borders']['top']['style'] = PHPExcel_Style_Border::BORDER_THIN;
+                                        break;
+                                    case 'B':
+                                        $styleData['borders']['bottom']['style'] = PHPExcel_Style_Border::BORDER_THIN;
+                                        break;
+                                    case 'L':
+                                        $styleData['borders']['left']['style'] = PHPExcel_Style_Border::BORDER_THIN;
+                                        break;
+                                    case 'R':
+                                        $styleData['borders']['right']['style'] = PHPExcel_Style_Border::BORDER_THIN;
+                                        break;
+                                }
+                            }
+                            break;
+                    }
+                }
+                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 ((!empty($styleData)) && ($column > '') && ($row > '')) {
+                    $columnLetter = PHPExcel_Cell::stringFromColumnIndex($column-1);
+                    $objPHPExcel->getActiveSheet()->getStyle($columnLetter.$row)->applyFromArray($styleData);
+                }
+                if ($columnWidth > '') {
+                    if ($startCol == $endCol) {
+                        $startCol = PHPExcel_Cell::stringFromColumnIndex($startCol-1);
+                        $objPHPExcel->getActiveSheet()->getColumnDimension($startCol)->setWidth($columnWidth);
+                    } else {
+                        $startCol = PHPExcel_Cell::stringFromColumnIndex($startCol-1);
+                        $endCol = PHPExcel_Cell::stringFromColumnIndex($endCol-1);
+                        $objPHPExcel->getActiveSheet()->getColumnDimension($startCol)->setWidth($columnWidth);
+                        do {
+                            $objPHPExcel->getActiveSheet()->getColumnDimension(++$startCol)->setWidth($columnWidth);
+                        } while ($startCol != $endCol);
+                    }
+                }
+            } else {
+                foreach ($rowData as $rowDatum) {
+                    switch ($rowDatum{0}) {
+                        case 'C':
+                        case 'X':
+                            $column = substr($rowDatum, 1);
+                            break;
+                        case 'R':
+                        case 'Y':
+                            $row = substr($rowDatum, 1);
+                            break;
+                    }
+                }
+            }
+        }
 
-				// Set cell value
+        // Close file
-				$objPHPExcel->getActiveSheet()->getCell($columnLetter.$row)->setValue(($hasCalculatedValue) ? $cellDataFormula : $cellData);
+        fclose($fileHandle);
-				if ($hasCalculatedValue) {
-					$cellData = PHPExcel_Calculation::_unwrapResult($cellData);
-					$objPHPExcel->getActiveSheet()->getCell($columnLetter.$row)->setCalculatedValue($cellData);
-				}
-			//	Read cell formatting
-			} elseif ($dataType == 'F') {
-				$formatStyle = $columnWidth = $styleSettings = '';
-				$styleData = array();
-				foreach($rowData as $rowDatum) {
-					switch($rowDatum{0}) {
-						case 'C' :
-						case 'X' :	$column = substr($rowDatum,1);
-									break;
-						case 'R' :
-						case 'Y' :	$row = substr($rowDatum,1);
-									break;
-						case 'P' :	$formatStyle = $rowDatum;
-									break;
-						case 'W' :	list($startCol,$endCol,$columnWidth) = explode(' ',substr($rowDatum,1));
-									break;
-						case 'S' :	$styleSettings = substr($rowDatum,1);
-									for ($i=0;$i<strlen($styleSettings);++$i) {
-										switch ($styleSettings{$i}) {
-											case 'I' :	$styleData['font']['italic'] = true;
-														break;
-											case 'D' :	$styleData['font']['bold'] = true;
-														break;
-											case 'T' :	$styleData['borders']['top']['style'] = PHPExcel_Style_Border::BORDER_THIN;
-														break;
-											case 'B' :	$styleData['borders']['bottom']['style'] = PHPExcel_Style_Border::BORDER_THIN;
-														break;
-											case 'L' :	$styleData['borders']['left']['style'] = PHPExcel_Style_Border::BORDER_THIN;
-														break;
-											case 'R' :	$styleData['borders']['right']['style'] = PHPExcel_Style_Border::BORDER_THIN;
-														break;
-										}
-									}
-									break;
-					}
-				}
-				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 ((!empty($styleData)) && ($column > '') && ($row > '')) {
-					$columnLetter = PHPExcel_Cell::stringFromColumnIndex($column-1);
-					$objPHPExcel->getActiveSheet()->getStyle($columnLetter.$row)->applyFromArray($styleData);
-				}
-				if ($columnWidth > '') {
-					if ($startCol == $endCol) {
-						$startCol = PHPExcel_Cell::stringFromColumnIndex($startCol-1);
-						$objPHPExcel->getActiveSheet()->getColumnDimension($startCol)->setWidth($columnWidth);
-					} else {
-						$startCol = PHPExcel_Cell::stringFromColumnIndex($startCol-1);
-						$endCol = PHPExcel_Cell::stringFromColumnIndex($endCol-1);
-						$objPHPExcel->getActiveSheet()->getColumnDimension($startCol)->setWidth($columnWidth);
-						do {
-							$objPHPExcel->getActiveSheet()->getColumnDimension(++$startCol)->setWidth($columnWidth);
-						} while ($startCol != $endCol);
-					}
-				}
-			} else {
-				foreach($rowData as $rowDatum) {
-					switch($rowDatum{0}) {
-						case 'C' :
-						case 'X' :	$column = substr($rowDatum,1);
-									break;
-						case 'R' :
-						case 'Y' :	$row = substr($rowDatum,1);
-									break;
-					}
-				}
-			}
-		}
 
-		// Close file
+        // Return
-		fclose($fileHandle);
+        return $objPHPExcel;
+    }
 
-		// Return
+    /**
-		return $objPHPExcel;
+     * Get sheet index
-	}
+     *
-
+     * @return int
-	/**
+     */
-	 * Get sheet index
+    public function getSheetIndex()
-	 *
+    {
-	 * @return int
+        return $this->sheetIndex;
-	 */
+    }
-	public function getSheetIndex() {
-		return $this->_sheetIndex;
-	}
-
-	/**
-	 * Set sheet index
-	 *
-	 * @param	int		$pValue		Sheet index
-	 * @return PHPExcel_Reader_SYLK
-	 */
-	public function setSheetIndex($pValue = 0) {
-		$this->_sheetIndex = $pValue;
-		return $this;
-	}
 
+    /**
+     * Set sheet index
+     *
+     * @param    int        $pValue        Sheet index
+     * @return PHPExcel_Reader_SYLK
+     */
+    public function setSheetIndex($pValue = 0)
+    {
+        $this->sheetIndex = $pValue;
+        return $this;
+    }
 }

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
+            $hashElements .
-            . __CLASS__
+            __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,47 +19,38 @@
  *
  * @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
+ * @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
 {
-	/**
+    /**
-	 * Get text
+     * Get text
-	 *
+     *
-	 * @return string	Text
+     * @return string    Text
-	 */
+     */
-	public function getText();
+    public function getText();
 
-	/**
+    /**
-	 * Set text
+     * Set text
-	 *
+     *
-	 * @param 	$pText string	Text
+     * @param     $pText string    Text
-	 * @return PHPExcel_RichText_ITextElement
+     * @return PHPExcel_RichText_ITextElement
-	 */
+     */
-	public function setText($pText = '');
+    public function setText($pText = '');
 
-	/**
+    /**
-	 * Get font
+     * Get font
-	 *
+     *
-	 * @return PHPExcel_Style_Font
+     * @return PHPExcel_Style_Font
-	 */
+     */
-	public function getFont();
+    public function getFont();
 
-	/**
+    /**
-	 * Get hash code
+     * Get hash code
-	 *
+     *
-	 * @return string	Hash code
+     * @return string    Hash code
-	 */
+     */
-	public function getHashCode();
+    public function getHashCode();
 }

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,85 +19,80 @@
  *
  * @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
+ * @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
 {
-	/**
+    /**
-	 * Font
+     * Font
-	 *
+     *
-	 * @var PHPExcel_Style_Font
+     * @var PHPExcel_Style_Font
-	 */
+     */
-	private $_font;
+    private $font;
 
     /**
      * Create a new PHPExcel_RichText_Run instance
      *
-     * @param 	string		$pText		Text
+     * @param     string        $pText        Text
      */
     public function __construct($pText = '')
     {
-    	// Initialise variables
+        // Initialise variables
-    	$this->setText($pText);
+        $this->setText($pText);
-    	$this->_font = new PHPExcel_Style_Font();
+        $this->font = new PHPExcel_Style_Font();
     }
 
-	/**
+    /**
-	 * Get font
+     * Get font
-	 *
+     *
-	 * @return PHPExcel_Style_Font
+     * @return PHPExcel_Style_Font
-	 */
+     */
-	public function getFont() {
+    public function getFont()
-		return $this->_font;
+    {
-	}
+        return $this->font;
-
-	/**
-	 * Set font
-	 *
-	 * @param	PHPExcel_Style_Font		$pFont		Font
-	 * @throws 	PHPExcel_Exception
-	 * @return PHPExcel_RichText_ITextElement
-	 */
-	public function setFont(PHPExcel_Style_Font $pFont = null) {
-		$this->_font = $pFont;
-		return $this;
-	}
-
-	/**
-	 * Get hash code
-	 *
-	 * @return string	Hash code
-	 */
-	public function getHashCode() {
-    	return md5(
-    		  $this->getText()
-    		. $this->_font->getHashCode()
-    		. __CLASS__
-    	);
     }
 
-	/**
+    /**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     * Set font
-	 */
+     *
-	public function __clone() {
+     * @param    PHPExcel_Style_Font        $pFont        Font
-		$vars = get_object_vars($this);
+     * @throws     PHPExcel_Exception
-		foreach ($vars as $key => $value) {
+     * @return PHPExcel_RichText_ITextElement
-			if (is_object($value)) {
+     */
-				$this->$key = clone $value;
+    public function setFont(PHPExcel_Style_Font $pFont = null)
-			} else {
+    {
-				$this->$key = $value;
+        $this->font = $pFont;
-			}
+        return $this;
-		}
+    }
-	}
+
+    /**
+     * Get hash code
+     *
+     * @return string    Hash code
+     */
+    public function getHashCode()
+    {
+        return md5(
+            $this->getText() .
+            $this->font->getHashCode() .
+            __CLASS__
+        );
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $vars = get_object_vars($this);
+        foreach ($vars as $key => $value) {
+            if (is_object($value)) {
+                $this->$key = clone $value;
+            } else {
+                $this->$key = $value;
+            }
+        }
+    }
 }

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,91 +19,87 @@
  *
  * @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
+ * @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
 {
-	/**
+    /**
-	 * Text
+     * Text
-	 *
+     *
-	 * @var string
+     * @var string
-	 */
+     */
-	private $_text;
+    private $text;
 
     /**
      * Create a new PHPExcel_RichText_TextElement instance
      *
-     * @param 	string		$pText		Text
+     * @param     string        $pText        Text
      */
     public function __construct($pText = '')
     {
-    	// Initialise variables
+        // Initialise variables
-    	$this->_text = $pText;
+        $this->text = $pText;
     }
 
-	/**
+    /**
-	 * Get text
+     * Get text
-	 *
+     *
-	 * @return string	Text
+     * @return string    Text
-	 */
+     */
-	public function getText() {
+    public function getText()
-		return $this->_text;
+    {
-	}
+        return $this->text;
-
-	/**
-	 * Set text
-	 *
-	 * @param 	$pText string	Text
-	 * @return PHPExcel_RichText_ITextElement
-	 */
-	public function setText($pText = '') {
-		$this->_text = $pText;
-		return $this;
-	}
-
-	/**
-	 * Get font
-	 *
-	 * @return PHPExcel_Style_Font
-	 */
-	public function getFont() {
-		return null;
-	}
-
-	/**
-	 * Get hash code
-	 *
-	 * @return string	Hash code
-	 */
-	public function getHashCode() {
-    	return md5(
-    		  $this->_text
-    		. __CLASS__
-    	);
     }
 
-	/**
+    /**
-	 * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     * Set text
-	 */
+     *
-	public function __clone() {
+     * @param     $pText string    Text
-		$vars = get_object_vars($this);
+     * @return PHPExcel_RichText_ITextElement
-		foreach ($vars as $key => $value) {
+     */
-			if (is_object($value)) {
+    public function setText($pText = '')
-				$this->$key = clone $value;
+    {
-			} else {
+        $this->text = $pText;
-				$this->$key = $value;
+        return $this;
-			}
+    }
-		}
+
-	}
+    /**
+     * Get font
+     *
+     * @return PHPExcel_Style_Font
+     */
+    public function getFont()
+    {
+        return null;
+    }
+
+    /**
+     * Get hash code
+     *
+     * @return string    Hash code
+     */
+    public function getHashCode()
+    {
+        return md5(
+            $this->text .
+            __CLASS__
+        );
+    }
+
+    /**
+     * Implement PHP __clone to create a deep clone, not just a shallow copy.
+     */
+    public function __clone()
+    {
+        $vars = get_object_vars($this);
+        foreach ($vars as $key => $value) {
+            if (is_object($value)) {
+                $this->$key = clone $value;
+            } else {
+                $this->$key = $value;
+            }
+        }
+    }
 }

Classes/PHPExcel/Settings.php

@@ -1,8 +1,18 @@
 <?php
+
+/** PHPExcel root directory */
+if (!defined('PHPEXCEL_ROOT')) {
+    /**
+     * @ignore
+     */
+    define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../');
+    require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+}
+
 /**
- * PHPExcel
+ * 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,42 +30,31 @@
  *
  * @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 */
     /**    Available Zip library classes */
-    const PCLZIP        = 'PHPExcel_Shared_ZipArchive';
+    const PCLZIP     = 'PHPExcel_Shared_ZipArchive';
-    const ZIPARCHIVE    = 'ZipArchive';
+    const ZIPARCHIVE = 'ZipArchive';
 
     /**    Optional Chart Rendering libraries */
-    const CHART_RENDERER_JPGRAPH    = 'jpgraph';
+    const CHART_RENDERER_JPGRAPH = 'jpgraph';
 
     /**    Optional PDF Rendering libraries */
-    const PDF_RENDERER_TCPDF		= 'tcPDF';
+    const PDF_RENDERER_TCPDF  = 'tcPDF';
-    const PDF_RENDERER_DOMPDF		= 'DomPDF';
+    const PDF_RENDERER_DOMPDF = 'DomPDF';
-    const PDF_RENDERER_MPDF 		= 'mPDF';
+    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,
@@ -64,78 +63,84 @@ class PHPExcel_Settings
 
     /**
      * Name of the class used for Zip file management
-     *	e.g.
+     *    e.g.
-     *		ZipArchive
+     *        ZipArchive
      *
      * @var string
      */
-    private static $_zipClass    = self::ZIPARCHIVE;
+    private static $zipClass = self::ZIPARCHIVE;
 
 
     /**
      * Name of the external Library used for rendering charts
-     *	e.g.
+     *    e.g.
-     *		jpgraph
+     *        jpgraph
      *
      * @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;
 
 
     /**
      * Name of the external Library used for rendering PDF files
-     *	e.g.
+     *    e.g.
-     * 		mPDF
+     *         mPDF
      *
      * @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)
      *
-     * @param string $zipClass	The Zip handler class that PHPExcel should use for Zip file management
+     * @param string $zipClass    The Zip handler class that PHPExcel should use for Zip file management
-     * 	 e.g. PHPExcel_Settings::PCLZip or PHPExcel_Settings::ZipArchive
+     *      e.g. PHPExcel_Settings::PCLZip or PHPExcel_Settings::ZipArchive
-     * @return	boolean	Success or failure
+     * @return    boolean    Success or failure
      */
     public static function setZipClass($zipClass)
     {
         if (($zipClass === self::PCLZIP) ||
             ($zipClass === self::ZIPARCHIVE)) {
-            self::$_zipClass = $zipClass;
+            self::$zipClass = $zipClass;
-            return TRUE;
+            return true;
         }
-        return FALSE;
+        return false;
-    } // function setZipClass()
+    }
 
 
     /**
      * Return the name of the Zip handler Class that PHPExcel is configured to use (PCLZip or ZipArchive)
-     *	or Zip file management
+     *    or Zip file management
      *
      * @return string Name of the Zip handler Class that PHPExcel is configured to use
-     *	for Zip file management
+     *    for Zip file management
-     *	e.g. PHPExcel_Settings::PCLZip or PHPExcel_Settings::ZipArchive
+     *    e.g. PHPExcel_Settings::PCLZip or PHPExcel_Settings::ZipArchive
      */
     public static function getZipClass()
     {
-        return self::$_zipClass;
+        return self::$zipClass;
-    } // function getZipClass()
+    }
 
 
     /**
@@ -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(
+    public static function setCacheStorageMethod($method = PHPExcel_CachedObjectStorageFactory::cache_in_memory, $arguments = array())
-    	$method = PHPExcel_CachedObjectStorageFactory::cache_in_memory,
-      $arguments = array()
-    )
     {
         return PHPExcel_CachedObjectStorageFactory::initialize($method, $arguments);
-    } // function setCacheStorageMethod()
+    }
 
 
     /**
@@ -182,97 +184,97 @@ class PHPExcel_Settings
      * @param string $locale The locale code to use (e.g. "fr" or "pt_br" or "en_uk")
      * @return boolean Success or failure
      */
-    public static function setLocale($locale='en_us')
+    public static function setLocale($locale = 'en_us')
     {
         return PHPExcel_Calculation::getInstance()->setLocale($locale);
-    } // function setLocale()
+    }
 
 
     /**
      * Set details of the external library that PHPExcel should use for rendering charts
      *
-     * @param string $libraryName	Internal reference name of the library
+     * @param string $libraryName    Internal reference name of the library
-     *	e.g. PHPExcel_Settings::CHART_RENDERER_JPGRAPH
+     *    e.g. PHPExcel_Settings::CHART_RENDERER_JPGRAPH
      * @param string $libraryBaseDir Directory path to the library's base folder
      *
-     * @return	boolean	Success or failure
+     * @return    boolean    Success or failure
      */
     public static function setChartRenderer($libraryName, $libraryBaseDir)
     {
-        if (!self::setChartRendererName($libraryName))
+        if (!self::setChartRendererName($libraryName)) {
-            return FALSE;
+            return false;
+        }
         return self::setChartRendererPath($libraryBaseDir);
-    } // function setChartRenderer()
+    }
 
 
     /**
      * Identify to PHPExcel the external library to use for rendering charts
      *
-     * @param string $libraryName	Internal reference name of the library
+     * @param string $libraryName    Internal reference name of the library
-     *	e.g. PHPExcel_Settings::CHART_RENDERER_JPGRAPH
+     *    e.g. PHPExcel_Settings::CHART_RENDERER_JPGRAPH
      *
-     * @return	boolean	Success or failure
+     * @return    boolean    Success or failure
      */
     public static function setChartRendererName($libraryName)
     {
-        if (!in_array($libraryName,self::$_chartRenderers)) {
+        if (!in_array($libraryName, self::$chartRenderers)) {
-            return FALSE;
+            return false;
         }
+        self::$chartRendererName = $libraryName;
 
-        self::$_chartRendererName = $libraryName;
+        return true;
-
+    }
-        return TRUE;
-    } // function setChartRendererName()
 
 
     /**
      * Tell PHPExcel where to find the external library to use for rendering charts
      *
-     * @param string $libraryBaseDir	Directory path to the library's base folder
+     * @param string $libraryBaseDir    Directory path to the library's base folder
-     * @return	boolean	Success or failure
+     * @return    boolean    Success or failure
      */
     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;
+        return true;
-    } // function setChartRendererPath()
+    }
 
 
     /**
      * Return the Chart Rendering Library that PHPExcel is currently configured to use (e.g. jpgraph)
      *
      * @return string|NULL Internal reference name of the Chart Rendering Library that PHPExcel is
-     *	currently configured to use
+     *    currently configured to use
-     *	e.g. PHPExcel_Settings::CHART_RENDERER_JPGRAPH
+     *    e.g. PHPExcel_Settings::CHART_RENDERER_JPGRAPH
      */
     public static function getChartRendererName()
     {
-        return self::$_chartRendererName;
+        return self::$chartRendererName;
-    } // function getChartRendererName()
+    }
 
 
     /**
      * Return the directory path to the Chart Rendering Library that PHPExcel is currently configured to use
      *
      * @return string|NULL Directory Path to the Chart Rendering Library that PHPExcel is
-     * 	currently configured to use
+     *     currently configured to use
      */
     public static function getChartRendererPath()
     {
-        return self::$_chartRendererPath;
+        return self::$chartRendererPath;
-    } // function getChartRendererPath()
+    }
 
 
     /**
      * Set details of the external library that PHPExcel should use for rendering PDF files
      *
      * @param string $libraryName Internal reference name of the library
-     * 	e.g. PHPExcel_Settings::PDF_RENDERER_TCPDF,
+     *     e.g. PHPExcel_Settings::PDF_RENDERER_TCPDF,
-     * 	PHPExcel_Settings::PDF_RENDERER_DOMPDF
+     *     PHPExcel_Settings::PDF_RENDERER_DOMPDF
      *  or PHPExcel_Settings::PDF_RENDERER_MPDF
      * @param string $libraryBaseDir Directory path to the library's base folder
      *
@@ -280,32 +282,32 @@ class PHPExcel_Settings
      */
     public static function setPdfRenderer($libraryName, $libraryBaseDir)
     {
-        if (!self::setPdfRendererName($libraryName))
+        if (!self::setPdfRendererName($libraryName)) {
-            return FALSE;
+            return false;
+        }
         return self::setPdfRendererPath($libraryBaseDir);
-    } // function setPdfRenderer()
+    }
 
 
     /**
      * Identify to PHPExcel the external library to use for rendering PDF files
      *
      * @param string $libraryName Internal reference name of the library
-     * 	e.g. PHPExcel_Settings::PDF_RENDERER_TCPDF,
+     *     e.g. PHPExcel_Settings::PDF_RENDERER_TCPDF,
-     *	PHPExcel_Settings::PDF_RENDERER_DOMPDF
+     *    PHPExcel_Settings::PDF_RENDERER_DOMPDF
-     * 	or PHPExcel_Settings::PDF_RENDERER_MPDF
+     *     or PHPExcel_Settings::PDF_RENDERER_MPDF
      *
      * @return boolean Success or failure
      */
     public static function setPdfRendererName($libraryName)
     {
-        if (!in_array($libraryName,self::$_pdfRenderers)) {
+        if (!in_array($libraryName, self::$pdfRenderers)) {
-            return FALSE;
+            return false;
         }
+        self::$pdfRendererName = $libraryName;
 
-        self::$_pdfRendererName = $libraryName;
+        return true;
-
+    }
-        return TRUE;
-    } // function setPdfRendererName()
 
 
     /**
@@ -317,38 +319,71 @@ 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;
+        return true;
-    } // function setPdfRendererPath()
+    }
 
 
     /**
      * Return the PDF Rendering Library that PHPExcel is currently configured to use (e.g. dompdf)
      *
      * @return string|NULL Internal reference name of the PDF Rendering Library that PHPExcel is
-     * 	currently configured to use
+     *     currently configured to use
      *  e.g. PHPExcel_Settings::PDF_RENDERER_TCPDF,
      *  PHPExcel_Settings::PDF_RENDERER_DOMPDF
      *  or PHPExcel_Settings::PDF_RENDERER_MPDF
      */
     public static function getPdfRendererName()
     {
-        return self::$_pdfRendererName;
+        return self::$pdfRendererName;
-    } // function getPdfRendererName()
+    }
-
 
     /**
      * Return the directory path to the PDF Rendering Library that PHPExcel is currently configured to use
      *
      * @return string|NULL Directory Path to the PDF Rendering Library that PHPExcel is
-     *		currently configured to use
+     *        currently configured to use
      */
     public static function getPdfRendererPath()
     {
-        return self::$_pdfRendererPath;
+        return self::$pdfRendererPath;
-    } // function getPdfRendererPath()
+    }
 
+    /**
+     * 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,82 +21,136 @@
  *
  * @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
+ * @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
 {
-	/**
+    /**
-	 * Convert Microsoft Code Page Identifier to Code Page Name which iconv
+     * Convert Microsoft Code Page Identifier to Code Page Name which iconv
-	 * and mbstring understands
+     * and mbstring understands
-	 *
+     *
-	 * @param integer $codePage Microsoft Code Page Indentifier
+     * @param integer $codePage Microsoft Code Page Indentifier
-	 * @return string Code Page Name
+     * @return string Code Page Name
-	 * @throws PHPExcel_Exception
+     * @throws PHPExcel_Exception
-	 */
+     */
-	public static function NumberToName($codePage = 1252)
+    public static function NumberToName($codePage = 1252)
-	{
+    {
-		switch ($codePage) {
+        switch ($codePage) {
-			case 367:	return 'ASCII';				break;	//	ASCII
+            case 367:
-			case 437:	return 'CP437';				break;	//	OEM US
+                return 'ASCII';    //    ASCII
-			case 720:	throw new PHPExcel_Exception('Code page 720 not supported.');
+            case 437:
-													break;	//	OEM Arabic
+                return 'CP437';    //    OEM US
-			case 737:	return 'CP737';				break;	//	OEM Greek
+            case 720:
-			case 775:	return 'CP775';				break;	//	OEM Baltic
+                throw new PHPExcel_Exception('Code page 720 not supported.');    //    OEM Arabic
-			case 850:	return 'CP850';				break;	//	OEM Latin I
+            case 737:
-			case 852:	return 'CP852';				break;	//	OEM Latin II (Central European)
+                return 'CP737';    //    OEM Greek
-			case 855:	return 'CP855';				break;	//	OEM Cyrillic
+            case 775:
-			case 857:	return 'CP857';				break;	//	OEM Turkish
+                return 'CP775';    //    OEM Baltic
-			case 858:	return 'CP858';				break;	//	OEM Multilingual Latin I with Euro
+            case 850:
-			case 860:	return 'CP860';				break;	//	OEM Portugese
+                return 'CP850';    //    OEM Latin I
-			case 861:	return 'CP861';				break;	//	OEM Icelandic
+            case 852:
-			case 862:	return 'CP862';				break;	//	OEM Hebrew
+                return 'CP852';    //    OEM Latin II (Central European)
-			case 863:	return 'CP863';				break;	//	OEM Canadian (French)
+            case 855:
-			case 864:	return 'CP864';				break;	//	OEM Arabic
+                return 'CP855';    //    OEM Cyrillic
-			case 865:	return 'CP865';				break;	//	OEM Nordic
+            case 857:
-			case 866:	return 'CP866';				break;	//	OEM Cyrillic (Russian)
+                return 'CP857';    //    OEM Turkish
-			case 869:	return 'CP869';				break;	//	OEM Greek (Modern)
+            case 858:
-			case 874:	return 'CP874';				break;	//	ANSI Thai
+                return 'CP858';    //    OEM Multilingual Latin I with Euro
-			case 932:	return 'CP932';				break;	//	ANSI Japanese Shift-JIS
+            case 860:
-			case 936:	return 'CP936';				break;	//	ANSI Chinese Simplified GBK
+                return 'CP860';    //    OEM Portugese
-			case 949:	return 'CP949';				break;	//	ANSI Korean (Wansung)
+            case 861:
-			case 950:	return 'CP950';				break;	//	ANSI Chinese Traditional BIG5
+                return 'CP861';    //    OEM Icelandic
-			case 1200:	return 'UTF-16LE';			break;	//	UTF-16 (BIFF8)
+            case 862:
-			case 1250:	return 'CP1250';			break;	//	ANSI Latin II (Central European)
+                return 'CP862';    //    OEM Hebrew
-			case 1251:	return 'CP1251';			break;	//	ANSI Cyrillic
+            case 863:
-			case 0:		//	CodePage is not always correctly set when the xls file was saved by Apple's Numbers program
+                return 'CP863';    //    OEM Canadian (French)
-			case 1252:	return 'CP1252';			break;	//	ANSI Latin I (BIFF4-BIFF7)
+            case 864:
-			case 1253:	return 'CP1253';			break;	//	ANSI Greek
+                return 'CP864';    //    OEM Arabic
-			case 1254:	return 'CP1254';			break;	//	ANSI Turkish
+            case 865:
-			case 1255:	return 'CP1255';			break;	//	ANSI Hebrew
+                return 'CP865';    //    OEM Nordic
-			case 1256:	return 'CP1256';			break;	//	ANSI Arabic
+            case 866:
-			case 1257:	return 'CP1257';			break;	//	ANSI Baltic
+                return 'CP866';    //    OEM Cyrillic (Russian)
-			case 1258:	return 'CP1258';			break;	//	ANSI Vietnamese
+            case 869:
-			case 1361:	return 'CP1361';			break;	//	ANSI Korean (Johab)
+                return 'CP869';    //    OEM Greek (Modern)
-			case 10000:	return 'MAC';				break;	//	Apple Roman
+            case 874:
-			case 10006:	return 'MACGREEK';			break;	//	Macintosh Greek
+                return 'CP874';    //    ANSI Thai
-			case 10007:	return 'MACCYRILLIC';		break;	//	Macintosh Cyrillic
+            case 932:
-			case 10029:	return 'MACCENTRALEUROPE';	break;	//	Macintosh Central Europe
+                return 'CP932';    //    ANSI Japanese Shift-JIS
-			case 10079: return 'MACICELAND';		break;	//	Macintosh Icelandic
+            case 936:
-			case 10081: return 'MACTURKISH';		break;	//	Macintosh Turkish
+                return 'CP936';    //    ANSI Chinese Simplified GBK
-			case 32768:	return 'MAC';				break;	//	Apple Roman
+            case 949:
-			case 32769:	throw new PHPExcel_Exception('Code page 32769 not supported.');
+                return 'CP949';    //    ANSI Korean (Wansung)
-													break;	//	ANSI Latin I (BIFF2-BIFF3)
+            case 950:
-			case 65000:	return 'UTF-7';				break;	//	Unicode (UTF-7)
+                return 'CP950';    //    ANSI Chinese Traditional BIG5
-			case 65001:	return 'UTF-8';				break;	//	Unicode (UTF-8)
+            case 1200:
-		}
+                return 'UTF-16LE'; //    UTF-16 (BIFF8)
-
+            case 1250:
-		throw new PHPExcel_Exception('Unknown codepage: ' . $codePage);
+                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
@@ -20,357 +20,379 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  * @category   PHPExcel
- * @package	PHPExcel_Shared
+ * @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
+ * @license    http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt    LGPL
- * @version	##VERSION##, ##DATE##
+ * @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 */
+    /** constants */
-	const CALENDAR_WINDOWS_1900 = 1900;		//	Base date of 1st Jan 1900 = 1.0
+    const CALENDAR_WINDOWS_1900 = 1900;        //    Base date of 1st Jan 1900 = 1.0
-	const CALENDAR_MAC_1904 = 1904;			//	Base date of 2nd Jan 1904 = 1.0
+    const CALENDAR_MAC_1904 = 1904;            //    Base date of 2nd Jan 1904 = 1.0
 
-	/*
+    /*
-	 * Names of the months of the year, indexed by shortname
+     * Names of the months of the year, indexed by shortname
-	 * Planned usage for locale settings
+     * Planned usage for locale settings
-	 *
+     *
-	 * @public
+     * @public
-	 * @var	string[]
+     * @var    string[]
-	 */
+     */
-	public static $_monthNames = array(	'Jan' => 'January',
+    public static $monthNames = array(
-										'Feb' => 'February',
+        'Jan' => 'January',
-										'Mar' => 'March',
+        'Feb' => 'February',
-										'Apr' => 'April',
+        'Mar' => 'March',
-										'May' => 'May',
+        'Apr' => 'April',
-										'Jun' => 'June',
+        'May' => 'May',
-										'Jul' => 'July',
+        'Jun' => 'June',
-										'Aug' => 'August',
+        'Jul' => 'July',
-										'Sep' => 'September',
+        'Aug' => 'August',
-										'Oct' => 'October',
+        'Sep' => 'September',
-										'Nov' => 'November',
+        'Oct' => 'October',
-										'Dec' => 'December',
+        'Nov' => 'November',
-									  );
+        'Dec' => 'December',
+    );
 
-	/*
+    /*
-	 * Names of the months of the year, indexed by shortname
+     * Names of the months of the year, indexed by shortname
-	 * Planned usage for locale settings
+     * Planned usage for locale settings
-	 *
+     *
-	 * @public
+     * @public
-	 * @var	string[]
+     * @var    string[]
-	 */
+     */
-	public static $_numberSuffixes = array(	'st',
+    public static $numberSuffixes = array(
-											'nd',
+        'st',
-											'rd',
+        'nd',
-											'th',
+        'rd',
-										  );
+        'th',
+    );
 
-	/*
+    /*
-	 * Base calendar year to use for calculations
+     * Base calendar year to use for calculations
-	 *
+     *
-	 * @private
+     * @private
-	 * @var	int
+     * @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)
+     * Set the Excel calendar (Windows 1900 or Mac 1904)
-	 *
+     *
-	 * @param	 integer	$baseDate			Excel base date (1900 or 1904)
+     * @param     integer    $baseDate           Excel base date (1900 or 1904)
-	 * @return	 boolean						Success or failure
+     * @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)) {
+        if (($baseDate == self::CALENDAR_WINDOWS_1900) ||
-			self::$_excelBaseDate = $baseDate;
+            ($baseDate == self::CALENDAR_MAC_1904)) {
-			return TRUE;
+            self::$excelBaseDate = $baseDate;
-		}
+            return true;
-		return FALSE;
+        }
-	}	//	function setExcelCalendar()
+        return false;
+    }
 
 
-	/**
+    /**
-	 * Return the Excel calendar (Windows 1900 or Mac 1904)
+     * Return the Excel calendar (Windows 1900 or Mac 1904)
-	 *
+     *
-	 * @return	 integer	Excel base date (1900 or 1904)
+     * @return     integer    Excel base date (1900 or 1904)
-	 */
+     */
-	public static function getExcelCalendar() {
+    public static function getExcelCalendar()
-		return self::$_excelBaseDate;
+    {
-	}	//	function getExcelCalendar()
+        return self::$excelBaseDate;
+    }
 
 
-	/**
+    /**
-	 *	Convert a date from Excel to PHP
+     *    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
+     *    @param        boolean        $adjustToTimezone    Flag indicating whether $dateValue should be treated as
-	 *													a UST timestamp, or adjusted to UST
+     *                                                    a UST timestamp, or adjusted to UST
-	 *	@param		string	 	$timezone			The timezone for finding the adjustment from 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) {
+    public static function ExcelToPHP($dateValue = 0, $adjustToTimezone = false, $timezone = null)
-		if (self::$_excelBaseDate == self::CALENDAR_WINDOWS_1900) {
+    {
-			$my_excelBaseDate = 25569;
+        if (self::$excelBaseDate == self::CALENDAR_WINDOWS_1900) {
-			//	Adjust for the spurious 29-Feb-1900 (Day 60)
+            $myexcelBaseDate = 25569;
-			if ($dateValue < 60) {
+            //    Adjust for the spurious 29-Feb-1900 (Day 60)
-				--$my_excelBaseDate;
+            if ($dateValue < 60) {
-			}
+                --$myexcelBaseDate;
-		} else {
+            }
-			$my_excelBaseDate = 24107;
+        } else {
-		}
+            $myexcelBaseDate = 24107;
+        }
 
-		// Perform conversion
+        // Perform conversion
-		if ($dateValue >= 1) {
+        if ($dateValue >= 1) {
-			$utcDays = $dateValue - $my_excelBaseDate;
+            $utcDays = $dateValue - $myexcelBaseDate;
-			$returnValue = round($utcDays * 86400);
+            $returnValue = round($utcDays * 86400);
-			if (($returnValue <= PHP_INT_MAX) && ($returnValue >= -PHP_INT_MAX)) {
+            if (($returnValue <= PHP_INT_MAX) && ($returnValue >= -PHP_INT_MAX)) {
-				$returnValue = (integer) $returnValue;
+                $returnValue = (integer) $returnValue;
-			}
+            }
-		} else {
+        } else {
-			$hours = round($dateValue * 24);
+            $hours = round($dateValue * 24);
-			$mins = round($dateValue * 1440) - round($hours * 60);
+            $mins = round($dateValue * 1440) - round($hours * 60);
-			$secs = round($dateValue * 86400) - round($hours * 3600) - round($mins * 60);
+            $secs = round($dateValue * 86400) - round($hours * 3600) - round($mins * 60);
-			$returnValue = (integer) gmmktime($hours, $mins, $secs);
+            $returnValue = (integer) gmmktime($hours, $mins, $secs);
-		}
+        }
 
-		$timezoneAdjustment = ($adjustToTimezone) ?
+        $timezoneAdjustment = ($adjustToTimezone) ?
-		    PHPExcel_Shared_TimeZone::getTimezoneAdjustment($timezone, $returnValue) :
+            PHPExcel_Shared_TimeZone::getTimezoneAdjustment($timezone, $returnValue) :
-		    0;
+            0;
 
-		// Return
+        return $returnValue + $timezoneAdjustment;
-		return $returnValue + $timezoneAdjustment;
+    }
-	}	//	function ExcelToPHP()
 
 
-	/**
+    /**
-	 * Convert a date from Excel to a PHP Date/Time object
+     * Convert a date from Excel to a PHP Date/Time object
-	 *
+     *
-	 * @param	integer		$dateValue		Excel date/time value
+     * @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);
+        $dateTime = self::ExcelToPHP($dateValue);
-		$time = round((($dateTime / 86400) - $days) * 86400);
+        $days = floor($dateTime / 86400);
-		$hours = round($time / 3600);
+        $time = round((($dateTime / 86400) - $days) * 86400);
-		$minutes = round($time / 60) - ($hours * 60);
+        $hours = round($time / 3600);
-		$seconds = round($time) - ($hours * 3600) - ($minutes * 60);
+        $minutes = round($time / 60) - ($hours * 60);
+        $seconds = round($time) - ($hours * 3600) - ($minutes * 60);
 
-		$dateObj = date_create('1-Jan-1970+'.$days.' days');
+        $dateObj = date_create('1-Jan-1970+'.$days.' days');
-		$dateObj->setTime($hours,$minutes,$seconds);
+        $dateObj->setTime($hours, $minutes, $seconds);
 
-		return $dateObj;
+        return $dateObj;
-	}	//	function ExcelToPHPObject()
+    }
 
 
-	/**
+    /**
-	 *	Convert a date from PHP to Excel
+     *    Convert a date from PHP to Excel
-	 *
+     *
-	 *	@param	mixed		$dateValue			PHP serialized date/time or date object
+     *    @param    mixed        $dateValue            PHP serialized date/time or date object
-	 *	@param	boolean		$adjustToTimezone	Flag indicating whether $dateValue should be treated as
+     *    @param    boolean        $adjustToTimezone    Flag indicating whether $dateValue should be treated as
-	 *													a UST timestamp, or adjusted to UST
+     *                                                    a UST timestamp, or adjusted to UST
-	 *	@param	string	 	$timezone			The timezone for finding the adjustment from UST
+     *    @param    string         $timezone            The timezone for finding the adjustment from UST
-	 *	@return	mixed		Excel date/time value
+     *    @return    mixed        Excel date/time value
-	 *							or boolean FALSE on failure
+     *                            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');
+        $saveTimeZone = date_default_timezone_get();
-		$retValue = FALSE;
+        date_default_timezone_set('UTC');
-		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')
-												 );
-		} 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)
-												 );
-		}
-		date_default_timezone_set($saveTimeZone);
 
-		return $retValue;
+        $timezoneAdjustment = ($adjustToTimezone) ?
-	}	//	function PHPToExcel()
+            PHPExcel_Shared_TimeZone::getTimezoneAdjustment($timezone ? $timezone : $saveTimeZone, $dateValue) :
+            0;
+
+        $retValue = false;
+        if ((is_object($dateValue)) && ($dateValue instanceof DateTime)) {
+            $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)) {
+            $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;
+    }
 
 
-	/**
+    /**
-	 * FormattedPHPToExcel
+     * FormattedPHPToExcel
-	 *
+     *
-	 * @param	long	$year
+     * @param    integer    $year
-	 * @param	long	$month
+     * @param    integer    $month
-	 * @param	long	$day
+     * @param    integer    $day
-	 * @param	long	$hours
+     * @param    integer    $hours
-	 * @param	long	$minutes
+     * @param    integer    $minutes
-	 * @param	long	$seconds
+     * @param    integer    $seconds
-	 * @return  long				Excel date/time value
+     * @return   integer    Excel date/time value
-	 */
+     */
-	public static function FormattedPHPToExcel($year, $month, $day, $hours=0, $minutes=0, $seconds=0) {
+    public static function FormattedPHPToExcel($year, $month, $day, $hours = 0, $minutes = 0, $seconds = 0)
-		if (self::$_excelBaseDate == self::CALENDAR_WINDOWS_1900) {
+    {
-			//
+        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
+            //    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; }
+            $excel1900isLeapYear = true;
-			$my_excelBaseDate = 2415020;
+            if (($year == 1900) && ($month <= 2)) {
-		} else {
+                $excel1900isLeapYear = false;
-			$my_excelBaseDate = 2416481;
+            }
-			$excel1900isLeapYear = FALSE;
+            $myexcelBaseDate = 2415020;
-		}
+        } else {
+            $myexcelBaseDate = 2416481;
+            $excel1900isLeapYear = false;
+        }
 
-		//	Julian base date Adjustment
+        //    Julian base date Adjustment
-		if ($month > 2) {
+        if ($month > 2) {
-			$month -= 3;
+            $month -= 3;
-		} else {
+        } else {
-			$month += 9;
+            $month += 9;
-			--$year;
+            --$year;
-		}
+        }
 
-		//	Calculate the Julian Date, then subtract the Excel base date (JD 2415020 = 31-Dec-1899 Giving Excel Date of 0)
+        //    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);
+        $century = substr($year, 0, 2);
-		$decade = substr($year,2,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;
+        $excelTime = (($hours * 3600) + ($minutes * 60) + $seconds) / 86400;
 
-		return (float) $excelDate + $excelTime;
+        return (float) $excelDate + $excelTime;
-	}	//	function FormattedPHPToExcel()
+    }
 
 
-	/**
+    /**
-	 * Is a given cell a date/time?
+     * Is a given cell a date/time?
-	 *
+     *
-	 * @param	 PHPExcel_Cell	$pCell
+     * @param     PHPExcel_Cell    $pCell
-	 * @return	 boolean
+     * @return     boolean
-	 */
+     */
-	public static function isDateTime(PHPExcel_Cell $pCell) {
+    public static function isDateTime(PHPExcel_Cell $pCell)
-		return self::isDateTimeFormat(
+    {
-			$pCell->getWorksheet()->getStyle(
+        return self::isDateTimeFormat(
-				$pCell->getCoordinate()
+            $pCell->getWorksheet()->getStyle(
-			)->getNumberFormat()
+                $pCell->getCoordinate()
-		);
+            )->getNumberFormat()
-	}	//	function isDateTime()
+        );
+    }
 
 
-	/**
+    /**
-	 * Is a given number format a date/time?
+     * Is a given number format a date/time?
-	 *
+     *
-	 * @param	 PHPExcel_Style_NumberFormat	$pFormat
+     * @param     PHPExcel_Style_NumberFormat    $pFormat
-	 * @return	 boolean
+     * @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()
+        return self::isDateTimeFormatCode($pFormat->getFormatCode());
+    }
 
 
-	private static	$possibleDateFormatCharacters = 'eymdHs';
+    private static $possibleDateFormatCharacters = 'eymdHs';
 
-	/**
+    /**
-	 * Is a given number format code a date/time?
+     * Is a given number format code a date/time?
-	 *
+     *
-	 * @param	 string	$pFormatCode
+     * @param     string    $pFormatCode
-	 * @return	 boolean
+     * @return     boolean
-	 */
+     */
-	public static function isDateTimeFormatCode($pFormatCode = '') {
+    public static function isDateTimeFormatCode($pFormatCode = '')
-		// Switch on formatcode
+    {
-		switch ($pFormatCode) {
+        if (strtolower($pFormatCode) === strtolower(PHPExcel_Style_NumberFormat::FORMAT_GENERAL)) {
-			//	General contains an epoch letter 'e', so we trap for it explicitly here
+            //    "General" contains an epoch letter 'e', so we trap for it explicitly here (case-insensitive check)
-			case PHPExcel_Style_NumberFormat::FORMAT_GENERAL:
+            return false;
-				return FALSE;
+        }
-			//	Explicitly defined date formats
+        if (preg_match('/[0#]E[+-]0/i', $pFormatCode)) {
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_YYYYMMDD:
+            //    Scientific format
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_YYYYMMDD2:
+            return false;
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_DDMMYYYY:
+        }
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_DMYSLASH:
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_DMYMINUS:
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_DMMINUS:
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_MYMINUS:
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_DATETIME:
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME1:
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME2:
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME3:
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME4:
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME5:
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME6:
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME7:
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME8:
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_YYYYMMDDSLASH:
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_XLSX14:
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_XLSX15:
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_XLSX16:
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_XLSX17:
-			case PHPExcel_Style_NumberFormat::FORMAT_DATE_XLSX22:
-				return TRUE;
-		}
 
-		//	Typically number, currency or accounting (or occasionally fraction) formats
+        // Switch on formatcode
-		if ((substr($pFormatCode,0,1) == '_') || (substr($pFormatCode,0,2) == '0 ')) {
+        switch ($pFormatCode) {
-			return FALSE;
+            //    Explicitly defined date formats
-		}
+            case PHPExcel_Style_NumberFormat::FORMAT_DATE_YYYYMMDD:
-		// Try checking for any of the date formatting characters that don't appear within square braces
+            case PHPExcel_Style_NumberFormat::FORMAT_DATE_YYYYMMDD2:
-		if (preg_match('/(^|\])[^\[]*['.self::$possibleDateFormatCharacters.']/i',$pFormatCode)) {
+            case PHPExcel_Style_NumberFormat::FORMAT_DATE_DDMMYYYY:
-			//	We might also have a format mask containing quoted strings...
+            case PHPExcel_Style_NumberFormat::FORMAT_DATE_DMYSLASH:
-			//		we don't want to test for any of our characters within the quoted blocks
+            case PHPExcel_Style_NumberFormat::FORMAT_DATE_DMYMINUS:
-			if (strpos($pFormatCode,'"') !== FALSE) {
+            case PHPExcel_Style_NumberFormat::FORMAT_DATE_DMMINUS:
-				$segMatcher = FALSE;
+            case PHPExcel_Style_NumberFormat::FORMAT_DATE_MYMINUS:
-				foreach(explode('"',$pFormatCode) as $subVal) {
+            case PHPExcel_Style_NumberFormat::FORMAT_DATE_DATETIME:
-					//	Only test in alternate array entries (the non-quoted blocks)
+            case PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME1:
-					if (($segMatcher = !$segMatcher) &&
+            case PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME2:
-						(preg_match('/(^|\])[^\[]*['.self::$possibleDateFormatCharacters.']/i',$subVal))) {
+            case PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME3:
-						return TRUE;
+            case PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME4:
-					}
+            case PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME5:
-				}
+            case PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME6:
-				return FALSE;
+            case PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME7:
-			}
+            case PHPExcel_Style_NumberFormat::FORMAT_DATE_TIME8:
-			return TRUE;
+            case PHPExcel_Style_NumberFormat::FORMAT_DATE_YYYYMMDDSLASH:
-		}
+            case PHPExcel_Style_NumberFormat::FORMAT_DATE_XLSX14:
+            case PHPExcel_Style_NumberFormat::FORMAT_DATE_XLSX15:
+            case PHPExcel_Style_NumberFormat::FORMAT_DATE_XLSX16:
+            case PHPExcel_Style_NumberFormat::FORMAT_DATE_XLSX17:
+            case PHPExcel_Style_NumberFormat::FORMAT_DATE_XLSX22:
+                return true;
+        }
 
-		// No date...
+        //    Typically number, currency or accounting (or occasionally fraction) formats
-		return FALSE;
+        if ((substr($pFormatCode, 0, 1) == '_') || (substr($pFormatCode, 0, 2) == '0 ')) {
-	}	//	function isDateTimeFormatCode()
+            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;
+                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 false;
+            }
+            return true;
+        }
+
+        // No date...
+        return false;
+    }
 
 
-	/**
+    /**
-	 * Convert a date/time string to Excel time
+     * Convert a date/time string to Excel time
-	 *
+     *
-	 * @param	string	$dateValue		Examples: '2009-12-31', '2009-12-31 15:59', '2009-12-31 15:59:10'
+     * @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
+     * @return    float|FALSE        Excel date/time serial value
-	 */
+     */
-	public static function stringToExcel($dateValue = '') {
+    public static function stringToExcel($dateValue = '')
-		if (strlen($dateValue) < 2)
+    {
-			return FALSE;
+        if (strlen($dateValue) < 2) {
-		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;
-			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);
+        $dateValueNew = PHPExcel_Calculation_DateTime::DATEVALUE($dateValue);
 
-		if ($dateValueNew === PHPExcel_Calculation_Functions::VALUE()) {
+        if ($dateValueNew === PHPExcel_Calculation_Functions::VALUE()) {
-			return FALSE;
+            return false;
-		} else {
+        }
-			if (strpos($dateValue, ':') !== FALSE) {
-				$timeValue = PHPExcel_Calculation_DateTime::TIMEVALUE($dateValue);
-				if ($timeValue === PHPExcel_Calculation_Functions::VALUE()) {
-					return FALSE;
-				}
-				$dateValueNew += $timeValue;
-			}
-			return $dateValueNew;
-		}
 
+        if (strpos($dateValue, ':') !== false) {
+            $timeValue = PHPExcel_Calculation_DateTime::TIMEVALUE($dateValue);
+            if ($timeValue === PHPExcel_Calculation_Functions::VALUE()) {
+                return false;
+            }
+            $dateValueNew += $timeValue;
+        }
+        return $dateValueNew;
+    }
 
-	}
+    /**
-
+     * Converts a month name (either a long or a short name) to a month number
-    public static function monthStringToNumber($month) {
+     *
+     * @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
-		if (is_numeric($strippedDayValue)) {
+     *
-		    return $strippedDayValue;
+     * @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
-		return $day;
+     */
+    public static function dayStringToNumber($day)
+    {
+        $strippedDayValue = (str_replace(self::$numberSuffixes, '', $day));
+        if (is_numeric($strippedDayValue)) {
+            return (integer) $strippedDayValue;
+        }
+        return $day;
     }
-
 }