From 1891c0b053d43597aaa4c1d7152e5c7f0b52ce91 Mon Sep 17 00:00:00 2001
From: Adrien Loison <adrilo@users.noreply.github.com>
Date: Thu, 16 Jun 2016 10:06:11 -0700
Subject: [PATCH] Fix XLSX reading when shared strings is missing the
 uniqueCount attribute (#255)

Use "count" attribute as a fallback
---
 .../Reader/XLSX/Helper/SharedStringsHelper.php   |  10 +++++++++-
 tests/Spout/Reader/XLSX/ReaderTest.php           |  14 ++++++++++++++
 ...with_shared_strings_missing_unique_count.xlsx | Bin 0 -> 3616 bytes
 3 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 tests/resources/xlsx/one_sheet_with_shared_strings_missing_unique_count.xlsx

diff --git a/src/Spout/Reader/XLSX/Helper/SharedStringsHelper.php b/src/Spout/Reader/XLSX/Helper/SharedStringsHelper.php
index 750c53e..350024a 100644
--- a/src/Spout/Reader/XLSX/Helper/SharedStringsHelper.php
+++ b/src/Spout/Reader/XLSX/Helper/SharedStringsHelper.php
@@ -159,7 +159,15 @@ class SharedStringsHelper
             $xmlReader->read();
         }
 
-        return intval($xmlReader->getAttribute('uniqueCount'));
+        $uniqueCount = $xmlReader->getAttribute('uniqueCount');
+
+        // some software do not add the "uniqueCount" attribute but only use the "count" one
+        // @see https://github.com/box/spout/issues/254
+        if ($uniqueCount === null) {
+            $uniqueCount = $xmlReader->getAttribute('count');
+        }
+
+        return intval($uniqueCount);
     }
 
     /**
diff --git a/tests/Spout/Reader/XLSX/ReaderTest.php b/tests/Spout/Reader/XLSX/ReaderTest.php
index 2703799..c705f2f 100644
--- a/tests/Spout/Reader/XLSX/ReaderTest.php
+++ b/tests/Spout/Reader/XLSX/ReaderTest.php
@@ -112,6 +112,20 @@ class ReaderTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expectedRows, $allRows);
     }
 
+    /**
+     * @return void
+     */
+    public function testReadShouldSupportSheetWithSharedStringsMissingUniqueCountAttribute()
+    {
+        $allRows = $this->getAllRowsForFile('one_sheet_with_shared_strings_missing_unique_count.xlsx');
+
+        $expectedRows = [
+            ['s1--A1', 's1--B1'],
+            ['s1--A2', 's1--B2'],
+        ];
+        $this->assertEquals($expectedRows, $allRows);
+    }
+
     /**
      * @return void
      */
diff --git a/tests/resources/xlsx/one_sheet_with_shared_strings_missing_unique_count.xlsx b/tests/resources/xlsx/one_sheet_with_shared_strings_missing_unique_count.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..8001e4ba670bf93f66c142a81b83c0606f3d7fa6
GIT binary patch
literal 3616
zcmai12{_by7anBB){s3}VzQQfY*E$_!^o1QD9eP28N0ED&{g(axmn7Rijt+MaHWy5
zM|MJGUvjOJ!S(%z7}58Azvr3fnP>jz{hj}L&pGcoW28@YfE5G+(SQt6&Ch_H=11TZ
zAW+l+5Qqi%^@1iA<AuU_T{87^LwQ<D;9OlQlhpO`QmpT1!v-^l#a!hX1==u>>TGD5
zV^rM~SEtaIO2snlto~;$t>-8_FPFyP#>VQ4_~ZrGt}92>iU-W>tPomY!vOowdCbU$
z@-?eQ$1%qd4~`HSULVsap;|YX-~{;OnFz+AA7^KZOcKgoCaO=ounMh6LlopJON8C>
zL-2(4$^2ap$<30B7iX;v=uj6NmetTN*7Z&J99+ZvidihY6U}C6f=OGcZ6s7AO*=j+
z3YEaAeHg^``NRb-ybPWTwssr7G)Id#sCKMJ@{@xU^!rpVTFR!%hg($SsK}=~bLD}{
zjHOC}kt}+PS6fA=z?Me+FVr6TjO*W+I}&l37dFqY_^P(+dzI@;ROsn=htXD{!jT+`
z+mM0-(d@OHPH|E;U)*GjiNYAsRn>-R9;2TmgFp_5kGcS_I|mGWyX1j#@s!-Q*-C`3
zCSTDQ@XU@91ft)uksw(<O*GK2kz$IR4cp*v3`(6;*Xp&_I<zcQ{M8SU>*};neGI)$
zfC^0BG^O^`pKo3`9S%?JK~5$pmUCJu=An&P5zi$S#rwY(oPSto$;S&<fZHY@crVuL
zMQUJdMFi8G)0@<IJ=s{OUrh)EoG2c#5r)H-bK<6mS__U~8ne1ySpHMj(6VKTc^uz2
z8Z;qoT;WX7R9a?(6R%3dyusj|@c4uPG4aOR!T$OA2k89IP7BDao7GF``iVIe-Iu4d
z5oD*~&{@$$<~|!ytP%=lS3ypw^2Lm5R3}=W$0rRmaa9t`I(PWk&lxSihXdB$$OG%P
zmp0aOor9IY<C8!QGwn9Bb#o&XZ+d+7O-gAdty%hiH9uI(eplC$fra60+&Tkv{ozs*
z(6h&hgwmIf#%3;fS7+x<6Ypw!hZ@6d^T$fGkE<d1zZP{=tz%xd=N03Jv^AWT4(8eT
z-j-Z75z+iYV@6APH6PjNhe9j~>lQTEXuE^O>WV&iz~Kz7_~bPuisBW_-H6cRRA8D<
zYm}41?%rQEG^kc|{`McoTH+GT>v}S}V}cML<vJ_g-7By2iykOC(K^E~V6m{0*gR_e
zx}56Q3IVm98)pZ?oB=+Ec86+@^+1tgbxlx5;*SE2DinMpGJyX16_Yj}NR#2+6pL(g
z%9dCQ5sHgtSjneXt-bnf2IBbQ2$Bkr&w>GNHcPo0aF_@M%>OasLT1;M)PbxT2<F(V
zKNZ`_Fr8E)F^@GlYM{DgO8n*hH^QwBDlDZM<xD5=-M4t0zL)5xbgzx4kMbuMyi2}?
z9H4BbwX{7Ls?V#)8}ZmWdORn|?p&{AmjR`yl-K?0198sUbCUUHidHXi_Lz)TinL{p
zFON&&A<x*+oRKafLK4l$xz$hK8WuZD|8h5{H0n2EM*8`O&_Yx~5LuDy(F(o;H&<_5
zxiy*gF*PX>F3IKpex9wNOVm<ULvKw-rre$qx{O8?#J2k#UZ~!n%&Vf<CUJjRQ2`|4
zT>ekp0S3QoS1~3Zn@#|)2ed2K);(KhzF3c|c3A9HQbK-qZxb3X#Sk(ZQF*;J$h}ze
zupmYf^>M26RET?$BD^SOcztmuUz(_(-KXg-oj8r;(_Z=-z}+s)OpxY$bd#AC%#nK9
z3p~&z8P`&nqKcR_=XOa}o?fld<E54#@-&ov+T+J9&LM3ZZ+OJ{xux->S24z3xgCj8
z>hP)uWr{_~7F)@IojNK;W<nUyl?J$ml<v|>Jj#m?7P-~}ZwknI04)g}tYCtU-x3;N
zzR6g3qu+d-5jX2?^>=~!XOoHJZIP$!PET^{slN3vg*>pj_p~Muvdt<DNFNY5be2fM
zJ%9yDpfpLd1t87S$<_nqVB+QBjB)fNkr5PKP4`v`=)|xMrsaWLaRGs|dZ&I+6DcyS
z`!q^Kd(0MRo6a$vykk2mZQtu_(N53Ol5nCOMNRiO4v)x=Se>y-Q!B!8tufPz2gYZ5
zucq6w|5;YUE|jqJM2^4$Zb4m4knyWwtr$+xZn~<W`cJrsZL5J9kM}>ap_AWk*Sw{e
ze^4)@q6~|j${I&!zdM|ss_N5o*}9}?71d+W&p{4|G!`xN^2U^aU`BxS9{d@Qm!Au2
zGZJrO11$b1LnX5Jnp(ekF>kK3p4Aew^O$#A0bH7vnezaqW4bF2K4D($F~1-i%=j%Z
z=y@d1QLUN6p=Y<EW#80yaHWP_!#3RUZ5BBD<bgX4_3Y94rO6f1xc0+8&=h|>VCSSC
zU|wP5x9bS|)BTIeWxFK$^TuJBhgu==-qVtnuw=_+p(pJhOjMH%3%HFP{_KMZN{%f?
zysmzDaSa7=Hb&LHOVV_<y{w?FFDq%(hW>O=utE7Ghk_l|9~?J&Q*@v#a%^*nG?d9v
zcJ>uBfn2a$Tf;NY2oNUohqy6~^nb^$wT7nEa~Z({+&&s8w<Io<^fw<;Qr7RXl7~Kc
zRTeZh#Go_9#<`HqYoRI@8F0ah_=G;Av*6x>65<&jK68*J7R``D$USa7xJV?t;#?vw
zv39LrT;FNMt%=8YB?<o?;8qUcnQ@Eb-OUpdr*4Q>V>m<5?YA91m7YT%o|W_2RM)zU
z`|=0HrbmaBi*J<n^WHJ;{u;CHI<d0h6I6FwIn&8*^1hAfP`rO^6qKi8=F&ZzH_o)I
z_?mE@z^u3aOFuqlSjNsa>NtYhptZ)MwE;6ajp`gKupZRqy3CZM>s^*oT0DpJGuDdp
zGJ>E{L)uQmstml5?cX9-<DyM5Ox2>SCC}{dvNfibpsO~<<A{BVbUk*{1)i?01wlu|
zl@y&54;IJB{ZM|lVP|y>SwW=SuB-j>10~1o>4ZXg?H+CRKvTtzy82B4HjF?Ga_+O;
zgh-PbD<+|pBrs<NA*+yVg4tQHJ*zS*dz!wKQ7X1Ayw<0%|M}{w^8{yv7b<w6W2qzI
ziGr}|qbQQRh?rB0&`HP#bszqLyB2^0zw3#tg-XYVBJH}{3BE+mPZ`QtPmb{yhDwaN
z$9yP&Vg1;2=!~81=j9vZX5!y#mHx%ILXn?^)4;BR#=^acNNtzCfmZp~*B{2W@JE4D
zBkq+4J1{8<>a+xv%J=cvvYV)gO_;omP~_+@TQjaN1Uo=_LXJ&5mVg_+(Dv=vc)fT>
zze;<;pE`?3m1PxvUV%UP-}ik?T#~-obA;nlfK*ceWc>H-6<}%C`OPj%zF>boNShh?
zpn$5}7XDwI?%mYLn5Z4hrt<$UXQY*eeEtHW+O^>P>TmCgLx#QC4g0z9kezOI+1{;z
zjLrw<-;UGm9fAzsPY`KdlFvWDKZecex&5~L0lx-$h<X$7ds6q#Q?eh$-LTyPv4`W|
zPa^U?+CYAPH<!o}ZxOav`pGwNK(=n!83cQwdliig4WQYC?tXnTct3F@X&@ggz$5VH
nB=C+<Y?Dp{`khpev8ns8WZ^K<r{1i2C<qEN1d>}pN5cIF(^xrF

literal 0
HcmV?d00001