Add a way to disable text wrapping through the api (Fix #247) (#311)

* Add a way to disable text wrapping (Fix #247)
* Fix PHPDoc boolean notation
* Fix PHPDoc param notation
This commit is contained in:
Hastegan authored and Adrien Loison committed 2016-09-16 11:24:36 -07:00
1 parent a07a96f523
commit ddb7365a79
4 files changed
+20 -11

No files matched your search

@@ -122,7 +122,7 @@ abstract class AbstractStyleHelper
protected function applyWrapTextIfCellContainsNewLine($style, $dataRow)
{
// if the "wrap text" option is already set, no-op
if ($style->shouldWrapText()) {
if ($style->hasSetWrapText()) {
return $style;
}
+11 -2
View File
@@ -269,15 +269,24 @@ class Style
}
/**
* @param bool|void $shouldWrap Should the text be wrapped
* @return Style
*/
public function setShouldWrapText()
public function setShouldWrapText($shouldWrap = true)
{
$this->shouldWrapText = true;
$this->shouldWrapText = $shouldWrap;
$this->hasSetWrapText = true;
return $this;
}
/**
* @return bool
*/
public function hasSetWrapText()
{
return $this->hasSetWrapText;
}
/**
* @return bool Whether specific font properties should be applied
*/
+5 -5
View File
@@ -109,15 +109,15 @@ class StyleBuilder
}
/**
* Makes the text wrap in the cell if it's too long or
* on multiple lines.
* Makes the text wrap in the cell if requested
*
* @api
* @param bool $shouldWrap Should the text be wrapped
* @return StyleBuilder
*/
public function setShouldWrapText()
public function setShouldWrapText($shouldWrap = true)
{
$this->style->setShouldWrapText();
$this->style->setShouldWrapText($shouldWrap);
return $this;
}
@@ -138,7 +138,7 @@ class StyleBuilder
*
* @api
* @param string $color ARGB color (@see Color)
* @return StyleBuilder
* @return StyleBuilder
*/
public function setBackgroundColor($color)
{