Fix box#245 (box#246)

kravcik · Jun 8, 2016 · cd38ba0 · cd38ba0
1 parent 70c81e8
commit cd38ba0
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/src/Spout/Reader/ODS/Helper/CellValueFormatter.php b/src/Spout/Reader/ODS/Helper/CellValueFormatter.php
@@ -24,6 +24,7 @@ class CellValueFormatter
     const XML_NODE_P = 'p';
     const XML_NODE_S = 'text:s';
     const XML_NODE_A = 'text:a';
+    const XML_NODE_SPAN = 'text:span';
 
     /** Definition of XML attribute used to parse data */
     const XML_ATTRIBUTE_TYPE = 'office:value-type';
@@ -104,7 +105,7 @@ protected function formatStringCellValue($node)
                     $spaceAttribute = $childNode->getAttribute(self::XML_ATTRIBUTE_C);
                     $numSpaces = (!empty($spaceAttribute)) ? intval($spaceAttribute) : 1;
                     $currentPValue .= str_repeat(' ', $numSpaces);
-                } else if ($childNode->nodeName === self::XML_NODE_A) {
+                } else if ($childNode->nodeName === self::XML_NODE_A || $childNode->nodeName === self::XML_NODE_SPAN) {
                     $currentPValue .= $childNode->nodeValue;
                 }
             }

diff --git a/tests/Spout/Reader/ODS/ReaderTest.php b/tests/Spout/Reader/ODS/ReaderTest.php
@@ -468,6 +468,20 @@ public function testReaderShouldReadTextInHyperlinks()
         $this->assertEquals($expectedRows, $allRows, 'Text in hyperlinks should be read');
     }
 
+    /**
+     * @return void
+     */
+    public function testReaderShouldReadInlineFontFormattingAsText()
+    {
+        $allRows = $this->getAllRowsForFile('sheet_with_inline_font_formatting.ods');
+
+        $expectedRows = [
+            ['I am a yellow bird']
+        ];
+
+        $this->assertEquals($expectedRows, $allRows, 'Text formatted inline should be read');
+    }
+
     /**
      * @param string $fileName
      * @param bool|void $shouldFormatDates

diff --git a/tests/resources/ods/sheet_with_inline_font_formatting.ods b/tests/resources/ods/sheet_with_inline_font_formatting.ods