PHPExcel_Worksheet::getCellCollection() may not return last cached cell

Classes/PHPExcel/CachedObjectStorage/DiscISAM.php

@@ -132,13 +132,25 @@ public function getCacheData($pCoord) {
 	}	//	function getCacheData()
 
 
+	/**
+	 * Get a list of all cell addresses currently held in cache
+	 *
+	 * @return	array of string
+	 */
+	public function getCellList() {
+		$this->_storeData();
+		return parent::getCellList();
+	}
+
+
 	/**
 	 * Clone the cell collection
 	 *
 	 * @param	PHPExcel_Worksheet	$parent		The new worksheet
 	 * @return	void
 	 */
 	public function copyCellCollection(PHPExcel_Worksheet $parent) {
+		$this->_storeData();
 		parent::copyCellCollection($parent);
 		//	Get a new id for the new file name
 		$baseUnique = $this->_getUniqueID();

Classes/PHPExcel/CachedObjectStorage/Igbinary.php

@@ -104,6 +104,17 @@ public function getCacheData($pCoord) {
 	}	//	function getCacheData()
 
 
+	/**
+	 * Get a list of all cell addresses currently held in cache
+	 *
+	 * @return	array of string
+	 */
+	public function getCellList() {
+		$this->_storeData();
+		return parent::getCellList();
+	}
+
+
 	/**
 	 * Clear the cell collection and disconnect from our parent
 	 *

Classes/PHPExcel/CachedObjectStorage/MemoryGZip.php

@@ -104,6 +104,17 @@ public function getCacheData($pCoord) {
 	}	//	function getCacheData()
 
 
+	/**
+	 * Get a list of all cell addresses currently held in cache
+	 *
+	 * @return	array of string
+	 */
+	public function getCellList() {
+		$this->_storeData();
+		return parent::getCellList();
+	}
+
+
 	/**
 	 * Clear the cell collection and disconnect from our parent
 	 *

Classes/PHPExcel/CachedObjectStorage/MemorySerialized.php

@@ -104,6 +104,17 @@ public function getCacheData($pCoord) {
 	}	//	function getCacheData()
 
 
+	/**
+	 * Get a list of all cell addresses currently held in cache
+	 *
+	 * @return	array of string
+	 */
+	public function getCellList() {
+		$this->_storeData();
+		return parent::getCellList();
+	}
+
+
 	/**
 	 * Clear the cell collection and disconnect from our parent
 	 *

Classes/PHPExcel/CachedObjectStorage/PHPTemp.php

@@ -124,13 +124,25 @@ public function getCacheData($pCoord) {
 	}	//	function getCacheData()
 
 
+	/**
+	 * Get a list of all cell addresses currently held in cache
+	 *
+	 * @return	array of string
+	 */
+	public function getCellList() {
+		$this->_storeData();
+		return parent::getCellList();
+	}
+
+
 	/**
 	 * Clone the cell collection
 	 *
 	 * @param	PHPExcel_Worksheet	$parent		The new worksheet
 	 * @return	void
 	 */
 	public function copyCellCollection(PHPExcel_Worksheet $parent) {
+		$this->_storeData();
 		parent::copyCellCollection($parent);
 		//	Open a new stream for the cell cache data
 		$newFileHandle = fopen('php://temp/maxmemory:'.$this->_memoryCacheSize,'a+');

Classes/PHPExcel/CachedObjectStorage/SQLite3.php

@@ -179,6 +179,7 @@ public function deleteCacheData($pCoord) {
 	 * @return	array of string
 	 */
 	public function getCellList() {
+		$this->_storeData();
 		$query = "SELECT id FROM kvp_".$this->_TableName;
 		$cellIdsResult = $this->_DBHandle->query($query);
 		if ($cellIdsResult === false)
@@ -200,6 +201,7 @@ public function getCellList() {
 	 * @return	void
 	 */
 	public function copyCellCollection(PHPExcel_Worksheet $parent) {
+		$this->_storeData();
 		//	Get a new id for the new table name
 		$tableName = str_replace('.','_',$this->_getUniqueID());
 		if (!$this->_DBHandle->exec('CREATE TABLE kvp_'.$tableName.' (id VARCHAR(12) PRIMARY KEY, value BLOB)

Classes/PHPExcel/CachedObjectStorageFactory.php

@@ -210,6 +210,12 @@ public static function initialize($method = self::cache_in_memory, $arguments =
 		return TRUE;
 	}	//	function initialize()
 
+	public static function finalize()
+	{
+		self::$_cacheStorageMethod = NULL;
+		self::$_cacheStorageClass = NULL;
+		self::$_storageMethodParameters = array();
+	}
 
 	/**
 	 * Initialise the cache storage
@@ -236,4 +242,4 @@ public static function getInstance(PHPExcel_Worksheet $parent)
 		return FALSE;
 	}	//	function getInstance()
 
-}
+}

unitTests/Classes/PHPExcel/Worksheet/CellCollectionTest.php

@@ -0,0 +1,35 @@
+<?php
+
+class CellCollectionTest extends PHPUnit_Framework_TestCase
+{
+
+	public function setUp()
+	{
+		if (!defined('PHPEXCEL_ROOT'))
+		{
+			define('PHPEXCEL_ROOT', APPLICATION_PATH . '/');
+		}
+		require_once(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+	}
+
+	public function testCacheLastCell()
+	{
+		$methods = PHPExcel_CachedObjectStorageFactory::getCacheStorageMethods();
+
+		foreach ($methods as $method) {
+			PHPExcel_CachedObjectStorageFactory::initialize($method);
+
+			$workbook = new PHPExcel();
+
+			$cells = array('A1', 'A2');
+			$worksheet = $workbook->getActiveSheet();
+			$worksheet->setCellValue('A1', 1);
+			$worksheet->setCellValue('A2', 2);
+
+			$this->assertEquals($cells, $worksheet->getCellCollection(), "Cache method \"$method\".");
+
+			PHPExcel_CachedObjectStorageFactory::finalize();
+		}
+	}
+
+}