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

Merge pull request #84 from box/rename_strikethrough

Browse Source 
Rename StrikeThrough to Strikethrough
This commit is contained in:
Adrien Loison committed 2015-08-13 23:18:26 -07:00
2 parents 353d4e86a5 f043f8d4d0
commit 444308d42c
5 files changed
+17 -17
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

tests/Spout/Writer/Style/StyleTest.php
+4 -4
View File
@@ -71,14 +71,14 @@ class StyleTest extends \PHPUnit_Framework_TestCase
public function testMergeWithShouldPreferCurrentStylePropertyIfSetOnCurrentButNotOnBase()
{
$baseStyle = (new StyleBuilder())->build();
$currentStyle = (new StyleBuilder())->setFontItalic()->setFontStrikeThrough()->build();
$currentStyle = (new StyleBuilder())->setFontItalic()->setFontStrikethrough()->build();
$mergedStyle = $currentStyle->mergeWith($baseStyle);
$this->assertFalse($baseStyle->isFontItalic());
$this->assertFalse($baseStyle->isFontStrikeThrough());
$this->assertFalse($baseStyle->isFontStrikethrough());
$this->assertTrue($mergedStyle->isFontItalic());
$this->assertTrue($mergedStyle->isFontStrikeThrough());
$this->assertTrue($mergedStyle->isFontStrikethrough());
}
/**
@@ -89,7 +89,7 @@ class StyleTest extends \PHPUnit_Framework_TestCase
$baseStyle = (new StyleBuilder())
->setFontItalic()
->setFontUnderline()
->setFontStrikeThrough()
->setFontStrikethrough()
->setShouldWrapText()
->build();
$currentStyle = (new StyleBuilder())->build();
tests/Spout/Writer/XLSX/WriterWithStyleTest.php
+1 -1
View File
@@ -106,7 +106,7 @@ class WriterWithStyleTest extends \PHPUnit_Framework_TestCase
->setFontBold()
->setFontItalic()
->setFontUnderline()
->setFontStrikeThrough()
->setFontStrikethrough()
->build();
$style2 = (new StyleBuilder())
->setFontSize(15)