__destroy methods for Excel and Worksheet objects

Author: Mark Baker

Classes/PHPExcel.php

@@ -133,6 +133,7 @@ public function __construct()
      *
      */
     public function disconnectWorksheets() {
+    	$worksheet = NULL;
         foreach($this->_workSheetCollection as $k => &$worksheet) {
             $worksheet->disconnectCells();
             $this->_workSheetCollection[$k] = null;
@@ -141,6 +142,14 @@ public function disconnectWorksheets() {
         $this->_workSheetCollection = array();
     }
 
+    /**
+     * Code to execute when this worksheet is unset()
+     *
+     */
+	function __destruct() {
+		$this->disconnectWorksheets();
+	}
+
     /**
      * Get properties
      *

Classes/PHPExcel/Worksheet.php

@@ -379,13 +379,23 @@ public function __construct(PHPExcel $pParent = null, $pTitle = 'Worksheet')
     public function disconnectCells()
     {
         $this->_cellCollection->unsetWorksheetCells();
-        $this->_cellCollection = null;
+        $this->_cellCollection = NULL;
 
         //    detach ourself from the workbook, so that it can then delete this worksheet successfully
         $this->_parent = null;
     }
 
     /**
+     * Code to execute when this worksheet is unset()
+     *
+     */
+	function __destruct() {
+		if ($this->_cellCollection !== NULL) {
+			$this->disconnectCells();
+		}
+	}
+
+   /**
      * Return the cache controller for the cell collection
      *
      * @return PHPExcel_CachedObjectStorage_xxx