Skip to content

Commit

Permalink
Support for shape style ending with ;
Browse files Browse the repository at this point in the history
Valid CSS style can end with `;` and that is the case for some 3rd party
software such as WPS Office.

Closes PHPOffice#304
  • Loading branch information
PowerKiKi authored and Frederic Delaunay committed Oct 29, 2018
1 parent 27000ab commit 07a84c2
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
### Fixed

- Better auto-detection of CSV separators - [#305](https://github.com/PHPOffice/PhpSpreadsheet/issues/305)
- Support for shape style ending with `;` - [#304](https://github.com/PHPOffice/PhpSpreadsheet/issues/304)

## [1.0.0] - 2017-12-25

Expand Down
2 changes: 1 addition & 1 deletion src/PhpSpreadsheet/Reader/Xlsx.php
Original file line number Diff line number Diff line change
Expand Up @@ -2157,7 +2157,7 @@ private static function dirAdd($base, $add)

private static function toCSSArray($style)
{
$style = str_replace(["\r", "\n"], '', $style);
$style = trim(str_replace(["\r", "\n"], '', $style), ';');

$temp = explode(';', $style);
$style = [];
Expand Down

0 comments on commit 07a84c2

Please sign in to comment.