ITST-16721 IPP xls2csv: wrong handling of custom format

- adjust format matching, so that the custom format does correctly get replaced - adapt test
AsperaGmbH · Jul 22, 2019 · 87245aa · 87245aa
1 parent 38628f0
commit 87245aa
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/lib/Reader.php b/lib/Reader.php
@@ -960,7 +960,8 @@ private function formatValue($value, $format_index)
                         } else {
                             $value = sprintf($format['Pattern'], $value);
                         }
-                        $value = preg_replace('{(0+)(\.?)(0*)}', $value, $format['Code']);
+                        $format_code = preg_replace('{\[\$.*\]}', '', $format['Code']);
+                        $value = preg_replace('{(0+)(\.?)(0*)}', $value, $format_code);
                     }
                 }
 

diff --git a/tests/CellContentTest.php b/tests/CellContentTest.php
@@ -31,7 +31,7 @@ public function testCellContent()
         $reader->close();
 
         self::assertSame(
-            array('', 'Value', '0123', '0123', '   '),
+            array('', 'Value', '0123', '0123', '   ', '268.02'),
             $output_cells,
             'The retrieved sheet content was not as expected.'
         );

diff --git a/tests/input_files/cell_content_test.xlsx b/tests/input_files/cell_content_test.xlsx