From 0204c9accef5ad6373d54bf18c62585224cec89a Mon Sep 17 00:00:00 2001 From: jaberu Date: Thu, 3 Sep 2015 00:42:28 +0200 Subject: [PATCH] fix MsDoc reader --- src/PhpWord/Reader/MsDoc.php | 2 +- tests/PhpWord/Tests/Reader/MsDocTest.php | 60 ++++++++++++++++++ .../PhpWord/Tests/_files/documents/reader.doc | Bin 0 -> 12800 bytes 3 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 tests/PhpWord/Tests/Reader/MsDocTest.php create mode 100644 tests/PhpWord/Tests/_files/documents/reader.doc diff --git a/src/PhpWord/Reader/MsDoc.php b/src/PhpWord/Reader/MsDoc.php index c63d8d9e22..92b00392b5 100644 --- a/src/PhpWord/Reader/MsDoc.php +++ b/src/PhpWord/Reader/MsDoc.php @@ -141,7 +141,7 @@ private function loadOLE($filename) // Get Summary Information data $this->_SummaryInformation = $ole->getStream($ole->summaryInformation); // Get Document Summary Information data - $this->_DocumentSummaryInformation = $ole->getStream($ole->documentSummaryInformation); + $this->_DocumentSummaryInformation = $ole->getStream($ole->docSummaryInfos); } private function getNumInLcb($lcb, $iSize) diff --git a/tests/PhpWord/Tests/Reader/MsDocTest.php b/tests/PhpWord/Tests/Reader/MsDocTest.php new file mode 100644 index 0000000000..593c64fd01 --- /dev/null +++ b/tests/PhpWord/Tests/Reader/MsDocTest.php @@ -0,0 +1,60 @@ +assertTrue($object->canRead($filename)); + } + + /** + * Can read exception + */ + public function testCanReadFailed() + { + $object = new MsDoc(); + $filename = __DIR__ . '/../_files/documents/foo.doc'; + $this->assertFalse($object->canRead($filename)); + } + + /** + * Load + */ + public function testLoad() + { + $filename = __DIR__ . '/../_files/documents/reader.doc'; + $phpWord = IOFactory::load($filename, 'MsDoc'); + $this->assertInstanceOf('PhpOffice\\PhpWord\\PhpWord', $phpWord); + } +} diff --git a/tests/PhpWord/Tests/_files/documents/reader.doc b/tests/PhpWord/Tests/_files/documents/reader.doc new file mode 100644 index 0000000000000000000000000000000000000000..4e92b2deb25d4cdb043670e36a5a5f2b354d43b7 GIT binary patch literal 12800 zcmeI2e{2-T6~|}q&d2!|9LBhWkgz!BN1VhM2w;+i9JT?+V9v!58Z`wQ`@k3Qook;} zK#^*-jv7_1L{llLs;DI@l@eM-?vFpJrczPWqEuCb^G8%tRh27MD6LWnEE3zx>yCX@(rG=oOD`q?De9M`d)SB+n=(4m#w5c z+y2h_EqR5^|8nTP=D)lnWd1J$_krc$ey{>O03HM@feBWDYVZ)K0jt3puokQX4})6p z2zV4c2I|0iP!BeMjbIaa9Bc+#z*f)zwt*+Wli<_fDX<+p4MgW1#EtfIGx1Ka3+x6h zK(zK_#NQadQWYrQMEP3)*54Tjj^f5*ipj>YOGaJ`ua1Vsdbqe zY$*;1_OuwPy)~c`ErHPC)*{tK*^!oQffP{tlo4KKY&7=4w_N>M9aS+}8C2b>mpHDD z>9tix=@O)jtWhOvROv3miI_`Gt)|)>GP;PK4`B{>XjD5Q6X`ef7`;#Jfd3$Rq|_N^ zLat`+Rz=&Ci&?X}wQ?eTUCB7FfY%Vxol$>7(vv(V)Ny#9LH@XwK1Pnb0o#wz1Wa>Ri>VSe@as%_)Q^0oSYMsne;?) zf3H%*^g&uX^rGB9YqHBc%`HjeQ2NOiOjjm6Gn)*H4LJmy(8D96M(0TTt)-WWlrd`H zzRp}b;_Do_IH_w#e4e$(s9kT>9`ml<>F*pl_g~Gs)9=aq8nwe#?Q7n(hXb7>!~fB| zhXbCx!$qAV*Z!?*hl@OGpQCoCRr{QG?fPKn$k`#ulQEqq?b$RsE&HuO zU1y5tf!_F_$$yt=m6*qb+A7bbmoAYrvItOR4~$C`ksmumh=;%Q)mPScUpDmftM9(^ zaO$#{X~vMx{?eZBgFk%mdfoluZ@q^7AHDf@GkHZhdC!w4=SUD&XWS`IZR9Et3SE9knb?I3gs8TgzJUcjkos-Uu(`@o( zK1n~yv-FSioLl#0ov}i?nBc@#YWiQPQ#pN+E4Q9{kCW3wEHkg)j-5*H^M1X;aC(t^ znYnWfqt1JJmJHrPsG~BR?eI(Z$gSFZn41M&p&#Xhss}qp=EmZ-Qk_Q*8Fx;Qagv>O z^6zx)Qy<>xCg%CiTVUP-ceMp9N853#%kf|3_CxM6Onj>(uD9Ip$X$@+9MjIX$xVof zgZ>;Y`c4j9_HviAj~h~xTanx4-dE!pRNC7BN4ll75M{UG+|S5iPmF^DIfNKs^H9z) zL@yE!aoo{EUAc=hDL+bDo>G*V)U;?UZ5+M2&@xWF)7&zf=pWZNVe)Jp3-#!H*{aB4 zifl=&dh*3YoSUMUogT99i{z$9O8TL&YRU#DH&^bxy0zrx+z*M|BB|UXiTu)z^n`4c z%CWKJ_mRKBmD)(E9Q#W@S+|dFYH!-RdVtOgcV{htpT7k(fbW3U!FR!rz}p~*cTxeW zz=NO~)Pg$j1lSI^%u)M*cv!vQ43NEpnpFRqoS0PqR3EW-9#?^8^A}uO5c8xZD~0W$%Ki_6AvF}C$45E#HBtJ}SM*mUc3q zoj6}bsPbyHa&&CHIXeE-s?kKC8a#A15vT#1+BtREs1{DM@xR+`Ixk=6jbSkuck=Hq?+JHCfc&KxcVIl3y;hnTCp%5M-YpHy|O=zZd@oDE89R01< z3u`|@V{-2xp$MPd`hrZpS39l03bS?@a*3P515UE{$RF0Bznm$`Sz@93H&M4!1}nkY sTQt*7_Fl&-_5NLM_y274*LMW=xoHtS;BI+#_Gp+x`_G`(6