From 86db0b8535c2e84df122166d614d95f49dcf48e3 Mon Sep 17 00:00:00 2001 From: Mark Baker Date: Fri, 30 Dec 2011 00:04:06 +0000 Subject: [PATCH] General: Change iterators to implement Iterator rather than extend CachingIterator, as a fix for PHP 5.4. changes in SPL git-svn-id: https://phpexcel.svn.codeplex.com/svn/trunk@84516 2327b42d-5241-43d6-9e2a-de5ac946f064 --- Classes/PHPExcel/Worksheet/CellIterator.php | 2 +- Classes/PHPExcel/Worksheet/RowIterator.php | 2 +- Classes/PHPExcel/WorksheetIterator.php | 2 +- changelog.txt | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Classes/PHPExcel/Worksheet/CellIterator.php b/Classes/PHPExcel/Worksheet/CellIterator.php index 5bdfbfa6..fd81fd05 100644 --- a/Classes/PHPExcel/Worksheet/CellIterator.php +++ b/Classes/PHPExcel/Worksheet/CellIterator.php @@ -35,7 +35,7 @@ * @package PHPExcel_Worksheet * @copyright Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel) */ -class PHPExcel_Worksheet_CellIterator extends CachingIterator +class PHPExcel_Worksheet_CellIterator implements Iterator { /** * PHPExcel_Worksheet to iterate diff --git a/Classes/PHPExcel/Worksheet/RowIterator.php b/Classes/PHPExcel/Worksheet/RowIterator.php index 6d81b25c..d3b9c356 100644 --- a/Classes/PHPExcel/Worksheet/RowIterator.php +++ b/Classes/PHPExcel/Worksheet/RowIterator.php @@ -35,7 +35,7 @@ * @package PHPExcel_Worksheet * @copyright Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel) */ -class PHPExcel_Worksheet_RowIterator extends CachingIterator +class PHPExcel_Worksheet_RowIterator implements Iterator { /** * PHPExcel_Worksheet to iterate diff --git a/Classes/PHPExcel/WorksheetIterator.php b/Classes/PHPExcel/WorksheetIterator.php index 14eeb934..17a0b2a4 100644 --- a/Classes/PHPExcel/WorksheetIterator.php +++ b/Classes/PHPExcel/WorksheetIterator.php @@ -35,7 +35,7 @@ * @package PHPExcel * @copyright Copyright (c) 2006 - 2011 PHPExcel (http://www.codeplex.com/PHPExcel) */ -class PHPExcel_WorksheetIterator extends CachingIterator +class PHPExcel_WorksheetIterator implements Iterator { /** * Spreadsheet to iterate diff --git a/changelog.txt b/changelog.txt index 7d466237..adab419a 100644 --- a/changelog.txt +++ b/changelog.txt @@ -32,6 +32,7 @@ Fixed in SVN: - General: (MBaker) Improved speed and memory usage in Excel5 Writer - General: (MBaker) Experimental - Added getHighestDataColumn(), getHighestDataRow(), getHighestRowAndColumn() and calculateWorksheetDataDimension() methods for the worksheet that return the highest row and column that have cell records +- General: (MBaker) Change iterators to implement Iterator rather than extend CachingIterator, as a fix for PHP 5.4. changes in SPL - Bugfix: (MBaker) Work item 15459 - Invalid cell coordinate in Autofilter for Excel2007 Writer - Bugfix: (MBaker) Work item 15518 - PCLZip library issue - Bugfix: (MBaker) Work item 15537 - Excel2007 Reader canRead function bug