mcndave/spout
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support for style per column for XLSX and ODS - test with styles array

Browse Source
This commit is contained in:
Jan 2015-10-09 14:30:37 +02:00
parent cdc7a93771
commit d5d188a658
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Spout/Writer/Common/Helper/AbstractStyleHelper.php
View File

@ -34,7 +34,7 @@ abstract class AbstractStyleHelper
*/ */
public function registerStyle($style) public function registerStyle($style)
{ {
$return = [];
$styles = is_array($style) ? $style : [$style]; $styles = is_array($style) ? $style : [$style];
foreach ($styles as $style) { foreach ($styles as $style) {
@ -43,10 +43,15 @@ abstract class AbstractStyleHelper
if (!$this->hasStyleAlreadyBeenRegistered($style)) { if (!$this->hasStyleAlreadyBeenRegistered($style)) {
$nextStyleId = count($this->serializedStyleToStyleIdMappingTable); $nextStyleId = count($this->serializedStyleToStyleIdMappingTable);
$style->setId($nextStyleId); $style->setId($nextStyleId);
$this->serializedStyleToStyleIdMappingTable[$serializedStyle] = $nextStyleId; $this->serializedStyleToStyleIdMappingTable[$serializedStyle] = $nextStyleId;
$this->styleIdToStyleMappingTable[$nextStyleId] = $style; $this->styleIdToStyleMappingTable[$nextStyleId] = $style;
} }
$return[] = $this->getStyleFromSerializedStyle($serializedStyle); }
$return = [];
foreach ($this->serializedStyleToStyleIdMappingTable as $serializedStyle => $styleId) {
$return[$styleId] = $this->styleIdToStyleMappingTable[$styleId];
} }
return $return; return $return;

3
tests/Spout/Writer/ODS/Helper/StyleHelperTest.php
View File

@ -35,7 +35,8 @@ class StyleHelperTest extends \PHPUnit_Framework_TestCase
$this->assertNull($style2->getId()); $this->assertNull($style2->getId());
$styleHelper = new StyleHelper($this->defaultStyle); $styleHelper = new StyleHelper($this->defaultStyle);
$registeredStyles = $styleHelper->registerStyle([$style1, $style2]); $registeredStyles = $styleHelper->registerStyle($style1);
$registeredStyles = $styleHelper->registerStyle($style2);
$this->assertEquals(1, $registeredStyles[0]->getId()); $this->assertEquals(1, $registeredStyles[0]->getId());
$this->assertEquals(2, $registeredStyles[1]->getId()); $this->assertEquals(2, $registeredStyles[1]->getId());

7
tests/Spout/Writer/XLSX/Helper/StyleHelperTest.php
View File

@ -35,7 +35,8 @@ class StyleHelperTest extends \PHPUnit_Framework_TestCase
$this->assertNull($style2->getId()); $this->assertNull($style2->getId());
$styleHelper = new StyleHelper($this->defaultStyle); $styleHelper = new StyleHelper($this->defaultStyle);
$registeredStyles = $styleHelper->registerStyle([$style1, $style2]); $registeredStyles = $styleHelper->registerStyle($style1);
$registeredStyles = $styleHelper->registerStyle($style2);
$this->assertEquals(1, $registeredStyles[0]->getId()); $this->assertEquals(1, $registeredStyles[0]->getId());
$this->assertEquals(2, $registeredStyles[1]->getId()); $this->assertEquals(2, $registeredStyles[1]->getId());
@ -52,8 +53,8 @@ class StyleHelperTest extends \PHPUnit_Framework_TestCase
$registeredStyles = $styleHelper->registerStyle($style); $registeredStyles = $styleHelper->registerStyle($style);
$registeredStyles = $styleHelper->registerStyle($style); $registeredStyles = $styleHelper->registerStyle($style);
$this->assertEquals(1, $registeredStyles[0]->getId()); $this->assertEquals(1, $registeredStyle1->getId());
$this->assertEquals(1, $registeredStyles[0]->getId()); $this->assertEquals(1, $registeredStyle2->getId());
} }
/** /**