From bc40ec183027b7129ede526ffa892a84547435fd Mon Sep 17 00:00:00 2001 From: madflow Date: Tue, 16 Aug 2016 10:35:42 +0200 Subject: [PATCH] Failing test #267 --- src/Spout/Writer/XLSX/Helper/StyleHelper.php | 2 +- tests/Spout/Writer/XLSX/WriterWithStyleTest.php | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Spout/Writer/XLSX/Helper/StyleHelper.php b/src/Spout/Writer/XLSX/Helper/StyleHelper.php index 63678f2..2dd44fe 100644 --- a/src/Spout/Writer/XLSX/Helper/StyleHelper.php +++ b/src/Spout/Writer/XLSX/Helper/StyleHelper.php @@ -91,7 +91,7 @@ class StyleHelper extends AbstractStyleHelper { $styleId = $style->getId(); - if (true === $style->shouldApplyBorder()) { + if ($style->shouldApplyBorder()) { $border = $style->getBorder(); $serializedBorder = serialize($border); diff --git a/tests/Spout/Writer/XLSX/WriterWithStyleTest.php b/tests/Spout/Writer/XLSX/WriterWithStyleTest.php index e9240e0..dbf4090 100644 --- a/tests/Spout/Writer/XLSX/WriterWithStyleTest.php +++ b/tests/Spout/Writer/XLSX/WriterWithStyleTest.php @@ -380,11 +380,14 @@ class WriterWithStyleTest extends \PHPUnit_Framework_TestCase $fontStyle = (new StyleBuilder())->setFontBold()->build(); $emptyStyle = (new StyleBuilder())->build(); + $borderRightFontBoldStyle = $borderRightStyle->mergeWith($fontStyle); + $dataRows = [ ['Border-Left'], ['Empty'], ['Font-Bold'], - ['Border-Right'] + ['Border-Right'], + ['Border-Right-Font-Bold'], ]; $styles = [ @@ -392,6 +395,7 @@ class WriterWithStyleTest extends \PHPUnit_Framework_TestCase $emptyStyle, $fontStyle, $borderRightStyle, + $borderRightFontBoldStyle ]; $this->writeToXLSXFileWithMultipleStyles($dataRows, $fileName, $styles);