From 3e5ef284a51f82bd16f9b2bc4e4d06eb816e732e Mon Sep 17 00:00:00 2001
From: Adrien Loison <aloison@box.com>
Date: Thu, 16 Apr 2015 12:59:59 -0700
Subject: [PATCH] Fix empty shared string bug

Replaced !$sharedString by $sharedString === null to avoid the case
when $sharedString = ''
---
 .../Reader/Helper/XLSX/SharedStringsHelper.php   |   2 +-
 tests/Spout/Reader/XLSXTest.php                  |  13 +++++++++++++
 .../xlsx/sheet_with_empty_shared_string.xlsx     | Bin 0 -> 3628 bytes
 3 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 tests/resources/xlsx/sheet_with_empty_shared_string.xlsx

diff --git a/src/Spout/Reader/Helper/XLSX/SharedStringsHelper.php b/src/Spout/Reader/Helper/XLSX/SharedStringsHelper.php
index 89f0004..6a88d2d 100644
--- a/src/Spout/Reader/Helper/XLSX/SharedStringsHelper.php
+++ b/src/Spout/Reader/Helper/XLSX/SharedStringsHelper.php
@@ -257,7 +257,7 @@ class SharedStringsHelper
             $sharedString = $this->unescapeLineFeed($escapedSharedString);
         }
 
-        if (!$sharedString) {
+        if ($sharedString === null) {
             throw new SharedStringNotFoundException("Shared string not found for index: $sharedStringIndex");
         }
 
diff --git a/tests/Spout/Reader/XLSXTest.php b/tests/Spout/Reader/XLSXTest.php
index 823490b..20e89d3 100644
--- a/tests/Spout/Reader/XLSXTest.php
+++ b/tests/Spout/Reader/XLSXTest.php
@@ -140,6 +140,19 @@ class XLSXTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expectedRows, $allRows);
     }
 
+    /**
+     * @return void
+     */
+    public function testReadShouldSupportEmptySharedString()
+    {
+        $allRows = $this->getAllRowsForFile('sheet_with_empty_shared_string.xlsx');
+
+        $expectedRows = [
+            ['s1--A1', '', 's1--C1'],
+        ];
+        $this->assertEquals($expectedRows, $allRows);
+    }
+
     /**
      * @return void
      */
diff --git a/tests/resources/xlsx/sheet_with_empty_shared_string.xlsx b/tests/resources/xlsx/sheet_with_empty_shared_string.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..f44da69ed47f32d1998eefb55408bf047419a66c
GIT binary patch
literal 3628
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
F{sZ(DG<X02

literal 0
HcmV?d00001