From 5f6436cc703aac0380e9ca07e1aee4c7d02e6f2a Mon Sep 17 00:00:00 2001
From: Adrien Loison <adrilo@users.noreply.github.com>
Date: Mon, 17 Oct 2016 10:46:47 -0700
Subject: [PATCH] ODS Reader should support num-rows-repeated for non empty
 rows

---
 src/Spout/Reader/ODS/RowIterator.php             |  12 ++++--------
 tests/Spout/Reader/ODS/ReaderTest.php            |  13 +++++++++++++
 .../ods/sheet_with_number_rows_repeated.ods      | Bin 0 -> 2558 bytes
 3 files changed, 17 insertions(+), 8 deletions(-)
 create mode 100644 tests/resources/ods/sheet_with_number_rows_repeated.ods

diff --git a/src/Spout/Reader/ODS/RowIterator.php b/src/Spout/Reader/ODS/RowIterator.php
index 4051583..e85e4dd 100644
--- a/src/Spout/Reader/ODS/RowIterator.php
+++ b/src/Spout/Reader/ODS/RowIterator.php
@@ -131,13 +131,10 @@ class RowIterator implements IteratorInterface
 
     /**
      * Returns whether we need data for the next row to be processed.
-     * We don't need to read data if:
-     *   we have already read at least one row
-     *     AND
-     *   we need to preserve empty rows
-     *     AND
-     *   the last row that was read is not the row that need to be processed
-     *   (i.e. if we need to return empty rows)
+     * We DO need to read data if:
+     *   - we have not read any rows yet
+     *      OR
+     *   - the next row to be processed immediately follows the last read row
      *
      * @return bool Whether we need data for the next row to be processed.
      */
@@ -147,7 +144,6 @@ class RowIterator implements IteratorInterface
 
         return (
             !$hasReadAtLeastOneRow ||
-            !$this->shouldPreserveEmptyRows ||
             $this->lastRowIndexProcessed === $this->nextRowIndexToBeProcessed - 1
         );
     }
diff --git a/tests/Spout/Reader/ODS/ReaderTest.php b/tests/Spout/Reader/ODS/ReaderTest.php
index d8ec39b..77fd3d6 100644
--- a/tests/Spout/Reader/ODS/ReaderTest.php
+++ b/tests/Spout/Reader/ODS/ReaderTest.php
@@ -78,6 +78,19 @@ class ReaderTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals([['foo']], $allRows);
     }
 
+    /**
+     * @return void
+     */
+    public function testReadShouldSupportNumberRowsRepeated()
+    {
+        $allRows = $this->getAllRowsForFile('sheet_with_number_rows_repeated.ods');
+        $expectedRows = [
+            ['foo', 10.43],
+            ['foo', 10.43],
+        ];
+        $this->assertEquals($expectedRows, $allRows);
+    }
+
     /**
      * @return void
      */
diff --git a/tests/resources/ods/sheet_with_number_rows_repeated.ods b/tests/resources/ods/sheet_with_number_rows_repeated.ods
new file mode 100644
index 0000000000000000000000000000000000000000..450148fd2e2d8286b61486dd8959955c5bd8b387
GIT binary patch
literal 2558
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
Qz6N4H7uj%5`A!_bAJ0%k{r~^~

literal 0
HcmV?d00001