Add test & update documentation
This commit is contained in:
parent
d5dbfb98b0
commit
0f649f3f37
|
|
@ -77,6 +77,7 @@ See ``\PhpOffice\PhpWord\SimpleType\Jc`` class for the details.
|
|||
- ``spaceAfter``. Space after paragraph.
|
||||
- ``tabs``. Set of custom tab stops.
|
||||
- ``widowControl``. Allow first/last line to display on a separate page, *true* or *false*.
|
||||
- ``contextualSpacing``. Ignore Spacing Above and Below When Using Identical Styles, *true* or *false*.
|
||||
|
||||
.. _table-style:
|
||||
|
||||
|
|
|
|||
|
|
@ -159,11 +159,11 @@ class Paragraph extends Border
|
|||
private $shading;
|
||||
|
||||
/**
|
||||
* Do not add an interval between paragraphs of the same style
|
||||
* Ignore Spacing Above and Below When Using Identical Styles
|
||||
*
|
||||
* @var bool
|
||||
*/
|
||||
private $contextualSpacing = true;
|
||||
private $contextualSpacing = false;
|
||||
|
||||
/**
|
||||
* Set Style value
|
||||
|
|
@ -215,7 +215,7 @@ class Paragraph extends Border
|
|||
),
|
||||
'tabs' => $this->getTabs(),
|
||||
'shading' => $this->getShading(),
|
||||
'contextualSpacing' => $this->getContextualSpacing(),
|
||||
'contextualSpacing' => $this->hasContextualSpacing(),
|
||||
);
|
||||
|
||||
return $styles;
|
||||
|
|
@ -741,15 +741,20 @@ class Paragraph extends Border
|
|||
}
|
||||
|
||||
/**
|
||||
* Get contextualSpacing
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
public function getContextualSpacing()
|
||||
public function hasContextualSpacing()
|
||||
{
|
||||
return $this->contextualSpacing;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set contextualSpacing
|
||||
*
|
||||
* @param bool $contextualSpacing
|
||||
* @return self
|
||||
*/
|
||||
public function setContextualSpacing($contextualSpacing)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -47,9 +47,10 @@ class ParagraphTest extends \PHPUnit_Framework_TestCase
|
|||
'keepNext' => false,
|
||||
'keepLines' => false,
|
||||
'pageBreakBefore' => false,
|
||||
'contextualSpacing' => false,
|
||||
);
|
||||
foreach ($attributes as $key => $default) {
|
||||
$get = "get{$key}";
|
||||
$get = $this->findGetter($key, $default, $object);
|
||||
$object->setStyleValue($key, null);
|
||||
$this->assertEquals($default, $object->$get());
|
||||
$object->setStyleValue($key, '');
|
||||
|
|
@ -78,9 +79,10 @@ class ParagraphTest extends \PHPUnit_Framework_TestCase
|
|||
'keepNext' => true,
|
||||
'keepLines' => true,
|
||||
'pageBreakBefore' => true,
|
||||
'contextualSpacing' => true,
|
||||
);
|
||||
foreach ($attributes as $key => $value) {
|
||||
$get = "get{$key}";
|
||||
$get = $this->findGetter($key, $value, $object);
|
||||
$object->setStyleValue("$key", $value);
|
||||
if ('indent' == $key || 'hanging' == $key) {
|
||||
$value = $value * 720;
|
||||
|
|
@ -91,6 +93,18 @@ class ParagraphTest extends \PHPUnit_Framework_TestCase
|
|||
}
|
||||
}
|
||||
|
||||
private function findGetter($key, $value, $object)
|
||||
{
|
||||
if (is_bool($value)) {
|
||||
if (method_exists($object, "is{$key}")) {
|
||||
return "is{$key}";
|
||||
} else if (method_exists($object, "has{$key}")) {
|
||||
return "has{$key}";
|
||||
}
|
||||
}
|
||||
return "get{$key}";
|
||||
}
|
||||
|
||||
/**
|
||||
* Test get null style value
|
||||
*/
|
||||
|
|
@ -100,7 +114,7 @@ class ParagraphTest extends \PHPUnit_Framework_TestCase
|
|||
|
||||
$attributes = array('spacing', 'indent', 'hanging', 'spaceBefore', 'spaceAfter');
|
||||
foreach ($attributes as $key) {
|
||||
$get = "get{$key}";
|
||||
$get = $this->findGetter($key, null, $object);
|
||||
$this->assertNull($object->$get());
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue