';
+
+ if ($color instanceof SystemColor) {
+ $str .= '';
+ } else {
+ $str .= '';
+ }
+
+ $str .= '';
+ }
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
$str .= '';
return $str;
@@ -106,78 +95,30 @@ private function writeColorScheme()
*/
private function writeFontScheme()
{
+ $fontScheme = $this->theme->getFontScheme();
+
$str = '';
$str .= '';
+ $headingFonts = $fontScheme->getHeadingFonts();
$str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
+ $str .= '';
+ $str .= '';
+ $str .= '';
+ foreach ($headingFonts->getFonts() as $script => $font) {
+ $str .= '';
+ }
$str .= '';
+ $bodyFonts = $fontScheme->getBodyFonts();
$str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
- $str .= '';
+ $str .= '';
+ $str .= '';
+ $str .= '';
+ foreach ($bodyFonts->getFonts() as $script => $font) {
+ $str .= '';
+ }
$str .= '';
$str .= '';
diff --git a/src/PhpWord/Writer/Word2007/Part/WebSettings.php b/src/PhpWord/Writer/Word2007/Part/WebSettings.php
index 46252e8701..9e2992f9f8 100644
--- a/src/PhpWord/Writer/Word2007/Part/WebSettings.php
+++ b/src/PhpWord/Writer/Word2007/Part/WebSettings.php
@@ -1,4 +1,5 @@
style;
}
- /**
- * Convert twip value
- *
- * @param int|float $value
- * @param int $default (int|float)
- * @return int|float
- */
- protected function convertTwip($value, $default = 0)
- {
- $factors = array(
- Settings::UNIT_CM => 567,
- Settings::UNIT_MM => 56.7,
- Settings::UNIT_INCH => 1440,
- Settings::UNIT_POINT => 20,
- Settings::UNIT_PICA => 240,
- );
- $unit = Settings::getMeasurementUnit();
- $factor = 1;
- if (in_array($unit, $factors) && $value != $default) {
- $factor = $factors[$unit];
- }
-
- return $value * $factor;
- }
-
/**
* Write child style.
*
- * @param \PhpOffice\Common\XMLWriter $xmlWriter
* @param string $name
- * @param mixed $value
*/
protected function writeChildStyle(XMLWriter $xmlWriter, $name, $value)
{
diff --git a/src/PhpWord/Writer/Word2007/Style/Border.php b/src/PhpWord/Writer/Word2007/Style/Border.php
new file mode 100644
index 0000000000..d841053e2f
--- /dev/null
+++ b/src/PhpWord/Writer/Word2007/Style/Border.php
@@ -0,0 +1,58 @@
+getSize()->toInt('eop') ?? 0) === 0) {
+ // Don't write 0 width borders
+ return;
+ }
+
+ $xmlWriter->startElement('w:' . $side);
+ $xmlWriter->writeAttribute('w:val', $border->getStyle()->getStyle());
+ $xmlWriter->writeAttribute('w:sz', max(2, min(96, $border->getSize()->toInt('eop'))));
+ $xmlWriter->writeAttribute('w:space', $border->getSpace()->toInt('pt'));
+ $xmlWriter->writeAttribute('w:color', $border->getColor()->toHexOrName() ?? 'auto');
+ $xmlWriter->writeAttribute('w:shadow', $border->getShadow() ? 'true' : 'false');
+ $xmlWriter->endElement();
+ }
+}
diff --git a/src/PhpWord/Writer/Word2007/Style/Cell.php b/src/PhpWord/Writer/Word2007/Style/Cell.php
index 733b7b434e..818ef3a54e 100644
--- a/src/PhpWord/Writer/Word2007/Style/Cell.php
+++ b/src/PhpWord/Writer/Word2007/Style/Cell.php
@@ -1,4 +1,5 @@
startElement('w:tcPr');
// Width
- if (!is_null($this->width) || !is_null($style->getWidth())) {
- $width = is_null($this->width) ? $style->getWidth() : $this->width;
-
- $xmlWriter->startElement('w:tcW');
- $xmlWriter->writeAttribute('w:w', $width);
- $xmlWriter->writeAttribute('w:type', $style->getUnit());
- $xmlWriter->endElement(); // w:tcW
- }
+ $this->writeWidth($xmlWriter, $style);
// Text direction
$textDir = $style->getTextDirection();
@@ -63,18 +65,7 @@ public function write()
$xmlWriter->writeElementIf(!is_null($vAlign), 'w:vAlign', 'w:val', $vAlign);
// Border
- if ($style->hasBorder()) {
- $xmlWriter->startElement('w:tcBorders');
-
- $styleWriter = new MarginBorder($xmlWriter);
- $styleWriter->setSizes($style->getBorderSize());
- $styleWriter->setColors($style->getBorderColor());
- $styleWriter->setStyles($style->getBorderStyle());
- $styleWriter->setAttributes(array('defaultColor' => CellStyle::DEFAULT_BORDER_COLOR));
- $styleWriter->write();
-
- $xmlWriter->endElement();
- }
+ $this->writeBorders($xmlWriter, $style);
// Shading
$shading = $style->getShading();
@@ -92,13 +83,58 @@ public function write()
$xmlWriter->endElement(); // w:tcPr
}
+ protected function writeWidth(XmlWriter $xmlWriter, CellStyle $style)
+ {
+ $width = is_null($this->width) ? $style->getWidth() : $this->width;
+
+ if ($width instanceof Absolute) {
+ $width = $width->toFloat('twip');
+ $unit = 'dxa';
+ } elseif ($width instanceof Percent) {
+ $width = $width->toFloat() . '%';
+ $unit = 'pct';
+ } elseif ($width instanceof Auto) {
+ $width = null;
+ $unit = 'auto';
+ } else {
+ throw new Exception('Unsupported width `' . get_class($width) . '` provided');
+ }
+
+ if ($width === null && $unit !== 'auto') {
+ return;
+ } elseif ($width !== null && $width == 0) {
+ $width = null;
+ $unit = 'nil';
+ }
+
+ $xmlWriter->startElement('w:tcW');
+ $xmlWriter->writeAttributeIf(null !== $width, 'w:w', $width);
+ $xmlWriter->writeAttribute('w:type', $unit);
+ $xmlWriter->endElement(); // w:tcW
+ }
+
+ protected function writeBorders(XmlWriter $xmlWriter, CellStyle $style)
+ {
+ if (!$style->hasBorder()) {
+ return;
+ }
+
+ $xmlWriter->startElement('w:tcBorders');
+
+ foreach ($style->getBorders() as $side => $border) {
+ $this->writeBorder($xmlWriter, $side, $border);
+ }
+
+ $xmlWriter->endElement();
+ }
+
/**
- * Set width.
- *
- * @param int $value
+ * Override width set in style.
*/
- public function setWidth($value = null)
+ public function setWidth(Length $value): self
{
- $this->width = $value;
+ $this->width = $value->isSpecified() ? $value : null;
+
+ return $this;
}
}
diff --git a/src/PhpWord/Writer/Word2007/Style/Extrusion.php b/src/PhpWord/Writer/Word2007/Style/Extrusion.php
index 193993485d..6aae5936e6 100644
--- a/src/PhpWord/Writer/Word2007/Style/Extrusion.php
+++ b/src/PhpWord/Writer/Word2007/Style/Extrusion.php
@@ -1,4 +1,5 @@
startElement('o:extrusion');
$xmlWriter->writeAttribute('on', 't');
$xmlWriter->writeAttributeIf($style->getType() !== null, 'type', $style->getType());
- $xmlWriter->writeAttributeIf($style->getColor() !== null, 'color', $style->getColor());
+ $xmlWriter->writeAttributeIf($style->getColor()->isSpecified(), 'color', $style->getColor()->toHexOrName());
$xmlWriter->endElement();
}
}
diff --git a/src/PhpWord/Writer/Word2007/Style/Fill.php b/src/PhpWord/Writer/Word2007/Style/Fill.php
index 53d039742b..8951440785 100644
--- a/src/PhpWord/Writer/Word2007/Style/Fill.php
+++ b/src/PhpWord/Writer/Word2007/Style/Fill.php
@@ -1,4 +1,5 @@
getXmlWriter();
$xmlWriter->writeAttribute('on', 't');
- $xmlWriter->writeAttributeIf($style->getColor() !== null, 'fillcolor', $style->getColor());
+ $xmlWriter->writeAttributeIf($style->getColor()->isSpecified(), 'fillcolor', $style->getColor()->toHexOrName());
}
}
diff --git a/src/PhpWord/Writer/Word2007/Style/Font.php b/src/PhpWord/Writer/Word2007/Style/Font.php
index dd4fac4f0d..efb62c8573 100644
--- a/src/PhpWord/Writer/Word2007/Style/Font.php
+++ b/src/PhpWord/Writer/Word2007/Style/Font.php
@@ -1,4 +1,5 @@
getColor();
+ $color = $style->getColor()->toHexOrName();
$xmlWriter->writeElementIf($color !== null, 'w:color', 'w:val', $color);
// Size
- $size = $style->getSize();
- $xmlWriter->writeElementIf($size !== null, 'w:sz', 'w:val', $size * 2);
- $xmlWriter->writeElementIf($size !== null, 'w:szCs', 'w:val', $size * 2);
+ $size = $style->getSize()->toInt('hpt');
+ $xmlWriter->writeElementIf($size !== null, 'w:sz', 'w:val', $size);
+ $xmlWriter->writeElementIf($size !== null, 'w:szCs', 'w:val', $size);
// Bold, italic
$xmlWriter->writeElementIf($style->isBold() !== null, 'w:b', 'w:val', $this->writeOnOf($style->isBold()));
@@ -127,22 +128,24 @@ private function writeStyle()
$xmlWriter->writeElementIf($style->getUnderline() != 'none', 'w:u', 'w:val', $style->getUnderline());
// Foreground-Color
- $xmlWriter->writeElementIf($style->getFgColor() !== null, 'w:highlight', 'w:val', $style->getFgColor());
+ $fgColor = $style->getFgColor()->toHexOrName();
+ $xmlWriter->writeElementIf($fgColor !== null, 'w:highlight', 'w:val', $fgColor);
// Superscript/subscript
$xmlWriter->writeElementIf($style->isSuperScript(), 'w:vertAlign', 'w:val', 'superscript');
$xmlWriter->writeElementIf($style->isSubScript(), 'w:vertAlign', 'w:val', 'subscript');
// Spacing
- $xmlWriter->writeElementIf($style->getScale() !== null, 'w:w', 'w:val', $style->getScale());
- $xmlWriter->writeElementIf($style->getSpacing() !== null, 'w:spacing', 'w:val', $style->getSpacing());
- $xmlWriter->writeElementIf($style->getKerning() !== null, 'w:kern', 'w:val', $style->getKerning() * 2);
+ $xmlWriter->writeElementIf($style->getScale()->isSpecified(), 'w:w', 'w:val', $style->getScale()->toInt());
+ $spacing = $style->getSpacing()->toInt('twip');
+ $xmlWriter->writeElementIf($spacing !== null, 'w:spacing', 'w:val', $spacing);
+ $xmlWriter->writeElementIf($style->getKerning()->isSpecified(), 'w:kern', 'w:val', $style->getKerning()->toInt('hpt'));
// noProof
$xmlWriter->writeElementIf($style->isNoProof() !== null, 'w:noProof', $this->writeOnOf($style->isNoProof()));
// Background-Color
- $shading = $style->getShading();
+ $shading = $style->getShading()->getColor()->toHexOrName();
if (!is_null($shading)) {
$styleWriter = new Shading($xmlWriter, $shading);
$styleWriter->write();
@@ -155,7 +158,7 @@ private function writeStyle()
}
// Position
- $xmlWriter->writeElementIf($style->getPosition() !== null, 'w:position', 'w:val', $style->getPosition());
+ $xmlWriter->writeElementIf($style->getPosition()->toInt('hpt') !== null, 'w:position', 'w:val', $style->getPosition()->toInt('hpt'));
$xmlWriter->endElement();
}
diff --git a/src/PhpWord/Writer/Word2007/Style/Frame.php b/src/PhpWord/Writer/Word2007/Style/Frame.php
index 10e5b151f7..ecd6ec0778 100644
--- a/src/PhpWord/Writer/Word2007/Style/Frame.php
+++ b/src/PhpWord/Writer/Word2007/Style/Frame.php
@@ -1,4 +1,5 @@
'mso-wrap-distance-left',
'wrapDistanceRight' => 'mso-wrap-distance-right',
);
- $sizeStyles = $this->getStyles($style, $properties, $style->getUnit());
+ $sizeStyles = $this->getSizeStyles($style, $properties);
$properties = array(
'pos' => 'position',
@@ -108,8 +110,6 @@ public function writeAlignment()
/**
* Write wrap.
*
- * @param \PhpOffice\Common\XMLWriter $xmlWriter
- * @param \PhpOffice\PhpWord\Style\Frame $style
* @param string $wrap
*/
private function writeWrap(XMLWriter $xmlWriter, FrameStyle $style, $wrap)
@@ -149,12 +149,10 @@ private function writeWrap(XMLWriter $xmlWriter, FrameStyle $style, $wrap)
/**
* Get style values in associative array
*
- * @param \PhpOffice\PhpWord\Style\Frame $style
* @param array $properties
- * @param string $suffix
* @return array
*/
- private function getStyles(FrameStyle $style, $properties, $suffix = '')
+ private function getStyles(FrameStyle $style, $properties)
{
$styles = array();
@@ -162,7 +160,29 @@ private function getStyles(FrameStyle $style, $properties, $suffix = '')
$method = "get{$key}";
$value = $style->$method();
if ($value !== null) {
- $styles[$property] = $style->$method() . $suffix;
+ $styles[$property] = $style->$method();
+ }
+ }
+
+ return $styles;
+ }
+
+ /**
+ * Get style values in associative array
+ *
+ * @param array $properties
+ * @return array
+ */
+ private function getSizeStyles(FrameStyle $style, $properties)
+ {
+ $styles = array();
+
+ $dpi = new Dpi();
+ foreach ($properties as $key => $property) {
+ $method = "get{$key}";
+ $value = $style->$method()->toPixels($dpi);
+ if ($value !== null) {
+ $styles[$property] = $value . 'px';
}
}
diff --git a/src/PhpWord/Writer/Word2007/Style/Image.php b/src/PhpWord/Writer/Word2007/Style/Image.php
index ef23ed103c..b0bdcfa9fb 100644
--- a/src/PhpWord/Writer/Word2007/Style/Image.php
+++ b/src/PhpWord/Writer/Word2007/Style/Image.php
@@ -1,4 +1,5 @@
startElement('w:ind');
- $xmlWriter->writeAttribute('w:left', $this->convertTwip($style->getLeft()));
- $xmlWriter->writeAttribute('w:right', $this->convertTwip($style->getRight()));
+ $xmlWriter->writeAttribute('w:left', $style->getLeft()->toInt('twip'));
+ $xmlWriter->writeAttribute('w:right', $style->getRight()->toInt('twip'));
- $firstLine = $style->getFirstLine();
- $xmlWriter->writeAttributeIf(!is_null($firstLine), 'w:firstLine', $this->convertTwip($firstLine));
+ $firstLine = $style->getFirstLine()->toInt('twip');
+ $xmlWriter->writeAttributeIf(!is_null($firstLine), 'w:firstLine', $firstLine);
- $hanging = $style->getHanging();
- $xmlWriter->writeAttributeIf(!is_null($hanging), 'w:hanging', $this->convertTwip($hanging));
+ $hanging = $style->getHanging()->toInt('twip');
+ $xmlWriter->writeAttributeIf(!is_null($hanging), 'w:hanging', $hanging);
$xmlWriter->endElement();
}
diff --git a/src/PhpWord/Writer/Word2007/Style/Line.php b/src/PhpWord/Writer/Word2007/Style/Line.php
index 154a42c13d..425efe0524 100644
--- a/src/PhpWord/Writer/Word2007/Style/Line.php
+++ b/src/PhpWord/Writer/Word2007/Style/Line.php
@@ -1,4 +1,5 @@
startElement('v:stroke');
- $xmlWriter->writeAttributeIf($style->getWeight() !== null, 'weight', $style->getWeight() . 'pt');
+ $xmlWriter->writeAttributeIf($style->getWeight()->isSpecified(), 'weight', $style->getWeight()->toInt('pt') . 'pt');
$xmlWriter->writeAttributeIf($style->getColor() !== null, 'color', $style->getColor());
$xmlWriter->writeAttributeIf($style->getBeginArrow() !== null, 'startarrow', $style->getBeginArrow());
$xmlWriter->writeAttributeIf($style->getEndArrow() !== null, 'endarrow', $style->getEndArrow());
diff --git a/src/PhpWord/Writer/Word2007/Style/LineNumbering.php b/src/PhpWord/Writer/Word2007/Style/LineNumbering.php
index 4bf08b65ab..df99443e39 100644
--- a/src/PhpWord/Writer/Word2007/Style/LineNumbering.php
+++ b/src/PhpWord/Writer/Word2007/Style/LineNumbering.php
@@ -1,4 +1,5 @@
startElement('w:lnNumType');
$xmlWriter->writeAttribute('w:start', $style->getStart() - 1);
$xmlWriter->writeAttribute('w:countBy', $style->getIncrement());
- $xmlWriter->writeAttribute('w:distance', $style->getDistance());
+ $xmlWriter->writeAttribute('w:distance', $style->getDistance()->toInt('twip'));
$xmlWriter->writeAttribute('w:restart', $style->getRestart());
$xmlWriter->endElement();
}
diff --git a/src/PhpWord/Writer/Word2007/Style/MarginBorder.php b/src/PhpWord/Writer/Word2007/Style/MarginBorder.php
deleted file mode 100644
index f5c4b0153b..0000000000
--- a/src/PhpWord/Writer/Word2007/Style/MarginBorder.php
+++ /dev/null
@@ -1,150 +0,0 @@
-getXmlWriter();
-
- $sides = array('top', 'left', 'right', 'bottom', 'insideH', 'insideV');
-
- foreach ($this->sizes as $i => $size) {
- if ($size !== null) {
- $color = null;
- if (isset($this->colors[$i])) {
- $color = $this->colors[$i];
- }
- $style = isset($this->styles[$i]) ? $this->styles[$i] : 'single';
- $this->writeSide($xmlWriter, $sides[$i], $this->sizes[$i], $color, $style);
- }
- }
- }
-
- /**
- * Write side.
- *
- * @param \PhpOffice\Common\XMLWriter $xmlWriter
- * @param string $side
- * @param int $width
- * @param string $color
- * @param string $borderStyle
- */
- private function writeSide(XMLWriter $xmlWriter, $side, $width, $color = null, $borderStyle = 'solid')
- {
- $xmlWriter->startElement('w:' . $side);
- if (!empty($this->colors)) {
- if ($color === null && !empty($this->attributes)) {
- if (isset($this->attributes['defaultColor'])) {
- $color = $this->attributes['defaultColor'];
- }
- }
- $xmlWriter->writeAttribute('w:val', $borderStyle);
- $xmlWriter->writeAttribute('w:sz', $width);
- $xmlWriter->writeAttributeIf($color != null, 'w:color', $color);
- if (!empty($this->attributes)) {
- if (isset($this->attributes['space'])) {
- $xmlWriter->writeAttribute('w:space', $this->attributes['space']);
- }
- }
- } else {
- $xmlWriter->writeAttribute('w:w', $width);
- $xmlWriter->writeAttribute('w:type', 'dxa');
- }
- $xmlWriter->endElement();
- }
-
- /**
- * Set sizes.
- *
- * @param int[] $value
- */
- public function setSizes($value)
- {
- $this->sizes = $value;
- }
-
- /**
- * Set colors.
- *
- * @param string[] $value
- */
- public function setColors($value)
- {
- $this->colors = $value;
- }
-
- /**
- * Set border styles.
- *
- * @param string[] $value
- */
- public function setStyles($value)
- {
- $this->styles = $value;
- }
-
- /**
- * Set attributes.
- *
- * @param array $value
- */
- public function setAttributes($value)
- {
- $this->attributes = $value;
- }
-}
diff --git a/src/PhpWord/Writer/Word2007/Style/Outline.php b/src/PhpWord/Writer/Word2007/Style/Outline.php
index ae4c1da386..8c99c09bbb 100644
--- a/src/PhpWord/Writer/Word2007/Style/Outline.php
+++ b/src/PhpWord/Writer/Word2007/Style/Outline.php
@@ -1,4 +1,5 @@
startElement('v:stroke');
$xmlWriter->writeAttribute('on', 't');
- $xmlWriter->writeAttributeIf($style->getColor() !== null, 'color', $style->getColor());
- $xmlWriter->writeAttributeIf($style->getWeight() !== null, 'weight', $style->getWeight() . $style->getUnit());
+ $xmlWriter->writeAttributeIf($style->getColor()->isSpecified(), 'color', $style->getColor()->toHexOrName());
+ $xmlWriter->writeAttributeIf($style->getWeight()->isSpecified(), 'weight', $style->getWeight()->toInt('emu'));
$xmlWriter->writeAttributeIf($style->getDash() !== null, 'dashstyle', $style->getDash());
$xmlWriter->writeAttributeIf($style->getLine() !== null, 'linestyle', $style->getLine());
$xmlWriter->writeAttributeIf($style->getEndCap() !== null, 'endcap', $style->getEndCap());
diff --git a/src/PhpWord/Writer/Word2007/Style/Paragraph.php b/src/PhpWord/Writer/Word2007/Style/Paragraph.php
index 6761608608..0fd10a3ce5 100644
--- a/src/PhpWord/Writer/Word2007/Style/Paragraph.php
+++ b/src/PhpWord/Writer/Word2007/Style/Paragraph.php
@@ -1,4 +1,5 @@
writeNumbering($xmlWriter, $styles['numbering']);
// Border
- if ($style->hasBorder()) {
- $xmlWriter->startElement('w:pBdr');
-
- $styleWriter = new MarginBorder($xmlWriter);
- $styleWriter->setSizes($style->getBorderSize());
- $styleWriter->setColors($style->getBorderColor());
- $styleWriter->write();
-
- $xmlWriter->endElement();
- }
+ $this->writeBorders($xmlWriter, $style);
if (!$this->withoutPPR) {
$xmlWriter->endElement(); // w:pPr
@@ -146,7 +140,6 @@ private function writeStyle()
/**
* Write tabs.
*
- * @param \PhpOffice\Common\XMLWriter $xmlWriter
* @param \PhpOffice\PhpWord\Style\Tab[] $tabs
*/
private function writeTabs(XMLWriter $xmlWriter, $tabs)
@@ -164,7 +157,6 @@ private function writeTabs(XMLWriter $xmlWriter, $tabs)
/**
* Write numbering.
*
- * @param \PhpOffice\Common\XMLWriter $xmlWriter
* @param array $numbering
*/
private function writeNumbering(XMLWriter $xmlWriter, $numbering)
@@ -190,6 +182,25 @@ private function writeNumbering(XMLWriter $xmlWriter, $numbering)
}
}
+ /**
+ * Writes paragraph borders
+ * @see http://officeopenxml.com/WPborders.php
+ */
+ private function writeBorders(XMLWriter $xmlWriter, ParagraphStyle $style)
+ {
+ if (!$style->hasBorder()) {
+ return;
+ }
+
+ $xmlWriter->startElement('w:pBdr');
+
+ foreach ($style->getBorders() as $side => $border) {
+ $this->writeBorder($xmlWriter, $side, $border);
+ }
+
+ $xmlWriter->endElement();
+ }
+
/**
* Set without w:pPr.
*
diff --git a/src/PhpWord/Writer/Word2007/Style/Row.php b/src/PhpWord/Writer/Word2007/Style/Row.php
index 82028d24c4..0beb562404 100644
--- a/src/PhpWord/Writer/Word2007/Style/Row.php
+++ b/src/PhpWord/Writer/Word2007/Style/Row.php
@@ -1,4 +1,5 @@
height !== null) {
$xmlWriter->startElement('w:trHeight');
- $xmlWriter->writeAttribute('w:val', $this->height);
+ $xmlWriter->writeAttribute('w:val', $this->height->toInt('twip'));
$xmlWriter->writeAttribute('w:hRule', ($style->isExactHeight() ? 'exact' : 'atLeast'));
$xmlWriter->endElement();
}
@@ -56,10 +59,8 @@ public function write()
/**
* Set height.
- *
- * @param int $value
*/
- public function setHeight($value = null)
+ public function setHeight(Absolute $value)
{
$this->height = $value;
}
diff --git a/src/PhpWord/Writer/Word2007/Style/Section.php b/src/PhpWord/Writer/Word2007/Style/Section.php
index 1122b6ff76..36cb4883c3 100644
--- a/src/PhpWord/Writer/Word2007/Style/Section.php
+++ b/src/PhpWord/Writer/Word2007/Style/Section.php
@@ -1,4 +1,5 @@
startElement('w:pgSz');
$xmlWriter->writeAttribute('w:orient', $style->getOrientation());
- $xmlWriter->writeAttribute('w:w', $style->getPageSizeW());
- $xmlWriter->writeAttribute('w:h', $style->getPageSizeH());
+ $xmlWriter->writeAttribute('w:w', $style->getPageSizeW()->toInt('twip'));
+ $xmlWriter->writeAttribute('w:h', $style->getPageSizeH()->toInt('twip'));
$xmlWriter->endElement(); // w:pgSz
// Vertical alignment
@@ -65,29 +69,18 @@ public function write()
$xmlWriter->startElement('w:pgMar');
foreach ($margins as $attribute => $value) {
list($method, $default) = $value;
- $xmlWriter->writeAttribute($attribute, $this->convertTwip($style->$method(), $default));
+ $xmlWriter->writeAttribute($attribute, $style->$method()->toInt('twip') ?? $default);
}
$xmlWriter->endElement();
// Borders
- if ($style->hasBorder()) {
- $xmlWriter->startElement('w:pgBorders');
- $xmlWriter->writeAttribute('w:offsetFrom', 'page');
-
- $styleWriter = new MarginBorder($xmlWriter);
- $styleWriter->setSizes($style->getBorderSize());
- $styleWriter->setColors($style->getBorderColor());
- $styleWriter->setAttributes(array('space' => '24'));
- $styleWriter->write();
-
- $xmlWriter->endElement();
- }
+ $this->writeBorders($xmlWriter, $style);
// Columns
$colsSpace = $style->getColsSpace();
$xmlWriter->startElement('w:cols');
$xmlWriter->writeAttribute('w:num', $style->getColsNum());
- $xmlWriter->writeAttribute('w:space', $this->convertTwip($colsSpace, SectionStyle::DEFAULT_COLUMN_SPACING));
+ $xmlWriter->writeAttribute('w:space', $colsSpace->toInt('twip') ?? SectionStyle::DEFAULT_COLUMN_SPACING);
$xmlWriter->endElement();
// Page numbering start
@@ -98,4 +91,29 @@ public function write()
$styleWriter = new LineNumbering($xmlWriter, $style->getLineNumbering());
$styleWriter->write();
}
+
+ /**
+ * Writes section borders
+ * @see http://www.officeopenxml.com/WPsectionBorders.php
+ */
+ private function writeBorders(XMLWriter $xmlWriter, SectionStyle $style)
+ {
+ if (!$style->hasBorder()) {
+ return;
+ }
+
+ $xmlWriter->startElement('w:pgBorders');
+ // Border should be drawn on 'allPages', 'firstPage', or 'notFirstPage'
+ $xmlWriter->writeAttribute('w:display', 'allPages');
+ // Distance should be from 'page' edge or 'text' margin
+ $xmlWriter->writeAttribute('w:offsetFrom', 'page');
+ // Drawn in 'back' or 'front' of text
+ $xmlWriter->writeAttribute('w:zOrder', 'back');
+
+ foreach ($style->getBorders() as $side => $border) {
+ $this->writeBorder($xmlWriter, $side, $border);
+ }
+
+ $xmlWriter->endElement();
+ }
}
diff --git a/src/PhpWord/Writer/Word2007/Style/Shading.php b/src/PhpWord/Writer/Word2007/Style/Shading.php
index 0f9d6ccc08..67d6ac474b 100644
--- a/src/PhpWord/Writer/Word2007/Style/Shading.php
+++ b/src/PhpWord/Writer/Word2007/Style/Shading.php
@@ -1,4 +1,5 @@
startElement('w:shd');
$xmlWriter->writeAttributeIf(!is_null($style->getPattern()), 'w:val', $style->getPattern());
- $xmlWriter->writeAttributeIf(!is_null($style->getColor()), 'w:color', $style->getColor());
- $xmlWriter->writeAttributeIf(!is_null($style->getFill()), 'w:fill', $style->getFill());
+ $xmlWriter->writeAttributeIf(!is_null($style->getColor()->toHexOrName()), 'w:color', $style->getColor()->toHexOrName());
+ $xmlWriter->writeAttributeIf(!is_null($style->getFill()), 'w:fill', $style->getFill()->toHexOrName());
$xmlWriter->endElement();
}
}
diff --git a/src/PhpWord/Writer/Word2007/Style/Shadow.php b/src/PhpWord/Writer/Word2007/Style/Shadow.php
index 7fcb12a960..0dd98fb8ef 100644
--- a/src/PhpWord/Writer/Word2007/Style/Shadow.php
+++ b/src/PhpWord/Writer/Word2007/Style/Shadow.php
@@ -1,4 +1,5 @@
startElement('v:shadow');
$xmlWriter->writeAttribute('on', 't');
- $xmlWriter->writeAttributeIf($style->getColor() !== null, 'color', $style->getColor());
+ $xmlWriter->writeAttributeIf($style->getColor()->isSpecified(), 'color', $style->getColor()->toHexOrName());
$xmlWriter->writeAttributeIf($style->getOffset() !== null, 'offset', $style->getOffset());
$xmlWriter->endElement();
}
diff --git a/src/PhpWord/Writer/Word2007/Style/Shape.php b/src/PhpWord/Writer/Word2007/Style/Shape.php
index 2def6842a9..9c2028923c 100644
--- a/src/PhpWord/Writer/Word2007/Style/Shape.php
+++ b/src/PhpWord/Writer/Word2007/Style/Shape.php
@@ -1,4 +1,5 @@
startElement('w:spacing');
- $before = $style->getBefore();
- $xmlWriter->writeAttributeIf(!is_null($before), 'w:before', $this->convertTwip($before));
+ $before = $style->getBefore()->toInt('twip');
+ $xmlWriter->writeAttributeIf(!is_null($before), 'w:before', $before);
- $after = $style->getAfter();
- $xmlWriter->writeAttributeIf(!is_null($after), 'w:after', $this->convertTwip($after));
+ $after = $style->getAfter()->toInt('twip');
+ $xmlWriter->writeAttributeIf(!is_null($after), 'w:after', $after);
- $line = $style->getLine();
+ $line = $style->getLine()->toInt('twip');
+ // @see http://www.datypic.com/sc/ooxml/a-w_line-1.html
//if linerule is auto, the spacing is supposed to include the height of the line itself, which is 240 twips
if (null !== $line && 'auto' === $style->getLineRule()) {
$line += \PhpOffice\PhpWord\Style\Paragraph::LINE_HEIGHT;
diff --git a/src/PhpWord/Writer/Word2007/Style/Tab.php b/src/PhpWord/Writer/Word2007/Style/Tab.php
index b41653f6c4..d29f0e2f57 100644
--- a/src/PhpWord/Writer/Word2007/Style/Tab.php
+++ b/src/PhpWord/Writer/Word2007/Style/Tab.php
@@ -1,4 +1,5 @@
startElement('w:tab');
$xmlWriter->writeAttribute('w:val', $style->getType());
$xmlWriter->writeAttribute('w:leader', $style->getLeader());
- $xmlWriter->writeAttribute('w:pos', $this->convertTwip($style->getPosition()));
+ $xmlWriter->writeAttribute('w:pos', $style->getPosition()->toInt('twip'));
$xmlWriter->endElement();
}
}
diff --git a/src/PhpWord/Writer/Word2007/Style/Table.php b/src/PhpWord/Writer/Word2007/Style/Table.php
index 443d670582..c69d33f450 100644
--- a/src/PhpWord/Writer/Word2007/Style/Table.php
+++ b/src/PhpWord/Writer/Word2007/Style/Table.php
@@ -1,4 +1,5 @@
writeAttribute('w:val', $style);
$xmlWriter->endElement();
if (null !== $this->width) {
- $this->writeTblWidth($xmlWriter, 'w:tblW', TblWidth::PERCENT, $this->width);
+ $this->writeTblWidth($xmlWriter, 'w:tblW', $this->width);
}
$xmlWriter->endElement();
}
@@ -58,9 +65,6 @@ public function write()
/**
* Write full style.
- *
- * @param \PhpOffice\Common\XMLWriter $xmlWriter
- * @param \PhpOffice\PhpWord\Style\Table $style
*/
private function writeStyle(XMLWriter $xmlWriter, TableStyle $style)
{
@@ -77,8 +81,8 @@ private function writeStyle(XMLWriter $xmlWriter, TableStyle $style)
$xmlWriter->endElement();
}
- $this->writeTblWidth($xmlWriter, 'w:tblW', $style->getUnit(), $style->getWidth());
- $this->writeTblWidth($xmlWriter, 'w:tblCellSpacing', TblWidth::TWIP, $style->getCellSpacing());
+ $this->writeTblWidth($xmlWriter, 'w:tblW', $style->getWidth());
+ $this->writeTblWidth($xmlWriter, 'w:tblCellSpacing', $style->getCellSpacing());
$this->writeIndent($xmlWriter, $style);
$this->writeLayout($xmlWriter, $style->getLayout());
@@ -90,7 +94,7 @@ private function writeStyle(XMLWriter $xmlWriter, TableStyle $style)
$xmlWriter->writeElementIf($style->isBidiVisual() !== null, 'w:bidiVisual', 'w:val', $this->writeOnOf($style->isBidiVisual()));
$this->writeMargin($xmlWriter, $style);
- $this->writeBorder($xmlWriter, $style);
+ $this->writeBorders($xmlWriter, $style);
$xmlWriter->endElement(); // w:tblPr
@@ -106,7 +110,6 @@ private function writeStyle(XMLWriter $xmlWriter, TableStyle $style)
/**
* Enable/Disable automatic resizing of the table
*
- * @param \PhpOffice\Common\XMLWriter $xmlWriter
* @param string $layout autofit / fixed
*/
private function writeLayout(XMLWriter $xmlWriter, $layout)
@@ -118,56 +121,71 @@ private function writeLayout(XMLWriter $xmlWriter, $layout)
/**
* Write margin.
- *
- * @param \PhpOffice\Common\XMLWriter $xmlWriter
- * @param \PhpOffice\PhpWord\Style\Table $style
*/
private function writeMargin(XMLWriter $xmlWriter, TableStyle $style)
{
if ($style->hasMargin()) {
$xmlWriter->startElement('w:tblCellMar');
- $styleWriter = new MarginBorder($xmlWriter);
- $styleWriter->setSizes($style->getCellMargin());
- $styleWriter->write();
+ $sides = array('top', 'bottom', 'start', 'end');
+ foreach ($style->getCellMargin() as $key => $width) {
+ $width = $width->toInt('twip') ?? 0;
+
+ $xmlWriter->startElement('w:' . $sides[$key]);
+ $xmlWriter->writeAttributeIf($width !== 0, 'w:w', $width);
+ $xmlWriter->writeAttribute('w:type', $width === 0 ? 'nil' : 'dxa');
+ $xmlWriter->endElement();
+ }
- $xmlWriter->endElement(); // w:tblCellMar
+ $xmlWriter->endElement();
}
}
/**
* Write border.
- *
- * @param \PhpOffice\Common\XMLWriter $xmlWriter
- * @param \PhpOffice\PhpWord\Style\Table $style
*/
- private function writeBorder(XMLWriter $xmlWriter, TableStyle $style)
+ private function writeBorders(XMLWriter $xmlWriter, TableStyle $style)
{
- if ($style->hasBorder()) {
- $xmlWriter->startElement('w:tblBorders');
+ if (!$style->hasBorder()) {
+ return;
+ }
- $styleWriter = new MarginBorder($xmlWriter);
- $styleWriter->setSizes($style->getBorderSize());
- $styleWriter->setColors($style->getBorderColor());
- $styleWriter->write();
+ $xmlWriter->startElement('w:tblBorders');
- $xmlWriter->endElement(); // w:tblBorders
+ foreach ($style->getBorders() as $side => $border) {
+ $this->writeBorder($xmlWriter, $side, $border);
}
+
+ $xmlWriter->endElement(); // w:tblBorders
}
/**
* Writes a table width
*
- * @param \PhpOffice\Common\XMLWriter $xmlWriter
* @param string $elementName
- * @param string $unit
- * @param int|float $width
*/
- private function writeTblWidth(XMLWriter $xmlWriter, $elementName, $unit, $width = null)
+ private function writeTblWidth(XMLWriter $xmlWriter, $elementName, Length $width)
{
- if (null === $width) {
+ if ($width instanceof Absolute) {
+ $width = $width->toFloat('twip');
+ $unit = 'dxa';
+ } elseif ($width instanceof Percent) {
+ $width = $width->toFloat();
+ $unit = 'pct';
+ } elseif ($width instanceof Auto) {
+ $width = null;
+ $unit = 'auto';
+ } else {
+ throw new Exception('Unsupported width `' . get_class($width) . '` provided');
+ }
+
+ if ($width === null && $unit !== 'auto') {
return;
+ } elseif ($width !== null && $width == 0) {
+ $width = null;
+ $unit = 'nil';
}
+
$xmlWriter->startElement($elementName);
$xmlWriter->writeAttributeIf(null !== $width, 'w:w', $width);
$xmlWriter->writeAttribute('w:type', $unit);
@@ -176,9 +194,6 @@ private function writeTblWidth(XMLWriter $xmlWriter, $elementName, $unit, $width
/**
* Write row style.
- *
- * @param \PhpOffice\Common\XMLWriter $xmlWriter
- * @param \PhpOffice\PhpWord\Style\Table $style
*/
private function writeFirstRow(XMLWriter $xmlWriter, TableStyle $style)
{
@@ -186,7 +201,7 @@ private function writeFirstRow(XMLWriter $xmlWriter, TableStyle $style)
$xmlWriter->writeAttribute('w:type', 'firstRow');
$xmlWriter->startElement('w:tcPr');
- $this->writeBorder($xmlWriter, $style);
+ $this->writeBorders($xmlWriter, $style);
$this->writeShading($xmlWriter, $style);
$xmlWriter->endElement(); // w:tcPr
@@ -195,9 +210,6 @@ private function writeFirstRow(XMLWriter $xmlWriter, TableStyle $style)
/**
* Write shading.
- *
- * @param \PhpOffice\Common\XMLWriter $xmlWriter
- * @param \PhpOffice\PhpWord\Style\Table $style
*/
private function writeShading(XMLWriter $xmlWriter, TableStyle $style)
{
@@ -213,26 +225,14 @@ private function writeShading(XMLWriter $xmlWriter, TableStyle $style)
/**
* Set width.
- *
- * @param int $value
*/
- public function setWidth($value = null)
+ public function setWidth(Length $value)
{
$this->width = $value;
}
- /**
- * @param XMLWriter $xmlWriter
- * @param TableStyle $style
- */
private function writeIndent(XMLWriter $xmlWriter, TableStyle $style)
{
- $indent = $style->getIndent();
-
- if ($indent === null) {
- return;
- }
-
- $this->writeTblWidth($xmlWriter, 'w:tblInd', $indent->getType(), $indent->getValue());
+ $this->writeTblWidth($xmlWriter, 'w:tblInd', $style->getIndent());
}
}
diff --git a/src/PhpWord/Writer/Word2007/Style/TablePosition.php b/src/PhpWord/Writer/Word2007/Style/TablePosition.php
index fa57b93c2f..b887d7c7f3 100644
--- a/src/PhpWord/Writer/Word2007/Style/TablePosition.php
+++ b/src/PhpWord/Writer/Word2007/Style/TablePosition.php
@@ -1,4 +1,5 @@
getXmlWriter();
$xmlWriter->startElement('w:tblpPr');
foreach ($values as $property => $value) {
+ if ($value instanceof Absolute) {
+ $value = $value->toInt('twip');
+ }
$xmlWriter->writeAttribute('w:' . $property, $value);
}
$xmlWriter->endElement();
diff --git a/src/PhpWord/Writer/Word2007/Style/TextBox.php b/src/PhpWord/Writer/Word2007/Style/TextBox.php
index 627d0c86e5..f702aa016c 100644
--- a/src/PhpWord/Writer/Word2007/Style/TextBox.php
+++ b/src/PhpWord/Writer/Word2007/Style/TextBox.php
@@ -1,4 +1,5 @@
getXmlWriter();
- $margins = implode(', ', $style->getInnerMargin());
+ $margins = implode(', ', array_map(function ($value) {
+ return $value->toInt('twip');
+ }, $style->getInnerMargin()));
$xmlWriter->writeAttribute('inset', $margins);
}
@@ -54,8 +57,9 @@ public function writeBorder()
$xmlWriter = $this->getXmlWriter();
$xmlWriter->startElement('v:stroke');
- $xmlWriter->writeAttributeIf($style->getBorderSize() !== null, 'weight', $style->getBorderSize() . 'pt');
- $xmlWriter->writeAttributeIf($style->getBorderColor() !== null, 'color', $style->getBorderColor());
+ $borderSize = $style->getBorderSize()->toInt('pt');
+ $xmlWriter->writeAttributeIf($borderSize !== null, 'weight', $borderSize . 'pt');
+ $xmlWriter->writeAttributeIf($style->getBorderColor()->isSpecified(), 'color', $style->getBorderColor()->toHexOrName());
$xmlWriter->endElement(); // v:stroke
}
}
diff --git a/src/PhpWord/Writer/WriterInterface.php b/src/PhpWord/Writer/WriterInterface.php
index 499cde3bb1..6783bc9e9e 100644
--- a/src/PhpWord/Writer/WriterInterface.php
+++ b/src/PhpWord/Writer/WriterInterface.php
@@ -1,4 +1,5 @@
assertInstanceOf('PhpOffice\\PhpWord\\Element\\Cell', $oCell);
- $this->assertNull($oCell->getWidth());
+ $this->assertNull($oCell->getWidth()->toInt('twip'));
}
/**
@@ -45,7 +47,7 @@ public function testConstructWithStyleArray()
$oCell = new Cell(null, array('valign' => 'center'));
$this->assertInstanceOf('PhpOffice\\PhpWord\\Style\\Cell', $oCell->getStyle());
- $this->assertNull($oCell->getWidth());
+ $this->assertNull($oCell->getWidth()->toInt('twip'));
}
/**
@@ -141,7 +143,7 @@ public function testAddImageSection()
public function testAddImageHeader()
{
$src = __DIR__ . '/../_files/images/earth.jpg';
- $oCell = new Cell('header', 1);
+ $oCell = new Cell(Absolute::from('twip', 1), 'header');
$element = $oCell->addImage($src);
$this->assertCount(1, $oCell->getElements());
@@ -154,7 +156,7 @@ public function testAddImageHeader()
public function testAddImageFooter()
{
$src = __DIR__ . '/../_files/images/earth.jpg';
- $oCell = new Cell('footer', 1);
+ $oCell = new Cell(Absolute::from('twip', 1), 'footer');
$element = $oCell->addImage($src);
$this->assertCount(1, $oCell->getElements());
diff --git a/tests/PhpWord/Element/CheckBoxTest.php b/tests/PhpWord/Element/CheckBoxTest.php
index f732407b06..e4ca1b952e 100644
--- a/tests/PhpWord/Element/CheckBoxTest.php
+++ b/tests/PhpWord/Element/CheckBoxTest.php
@@ -1,4 +1,5 @@
assertEquals('fontStyle', $oCheckBox->getFontStyle());
- $oCheckBox->setFontStyle(array('bold' => true, 'italic' => true, 'size' => 16));
+ $oCheckBox->setFontStyle(array('bold' => true, 'italic' => true, 'size' => Absolute::from('pt', 16)));
$this->assertInstanceOf('PhpOffice\\PhpWord\\Style\\Font', $oCheckBox->getFontStyle());
}
@@ -81,7 +83,7 @@ public function testParagraph()
$oCheckBox = new CheckBox('chkBox', 'CheckBox', 'fontStyle', 'paragraphStyle');
$this->assertEquals('paragraphStyle', $oCheckBox->getParagraphStyle());
- $oCheckBox->setParagraphStyle(array('alignment' => Jc::CENTER, 'spaceAfter' => 100));
+ $oCheckBox->setParagraphStyle(array('alignment' => Jc::CENTER, 'spaceAfter' => Absolute::from('twip', 100)));
$this->assertInstanceOf('PhpOffice\\PhpWord\\Style\\Paragraph', $oCheckBox->getParagraphStyle());
}
}
diff --git a/tests/PhpWord/Element/CommentTest.php b/tests/PhpWord/Element/CommentTest.php
index b9c3dfce5a..3ee0f6e5a2 100644
--- a/tests/PhpWord/Element/CommentTest.php
+++ b/tests/PhpWord/Element/CommentTest.php
@@ -1,4 +1,5 @@
100));
+ $oFootnote = new Footnote(array('spacing' => Absolute::from('twip', 100)));
$this->assertInstanceOf(
'PhpOffice\\PhpWord\\Style\\Paragraph',
diff --git a/tests/PhpWord/Element/HeaderTest.php b/tests/PhpWord/Element/HeaderTest.php
index 4bbf7b74f3..330a1d96d9 100644
--- a/tests/PhpWord/Element/HeaderTest.php
+++ b/tests/PhpWord/Element/HeaderTest.php
@@ -1,4 +1,5 @@
210,
- 'height' => 210,
+ 'width' => Absolute::from('twip', 210),
+ 'height' => Absolute::from('twip', 210),
'alignment' => Jc::CENTER,
'wrappingStyle' => \PhpOffice\PhpWord\Style\Image::WRAPPING_STYLE_BEHIND,
)
@@ -98,7 +100,7 @@ public function testStyle()
{
$oImage = new Image(
__DIR__ . '/../_files/images/earth.jpg',
- array('height' => 210, 'alignment' => Jc::CENTER)
+ array('height' => Absolute::from('twip', 210), 'alignment' => Jc::CENTER)
);
$this->assertInstanceOf('PhpOffice\\PhpWord\\Style\\Image', $oImage->getStyle());
@@ -149,7 +151,7 @@ public function testUnsupportedImage()
*/
public function testRelationID()
{
- $oImage = new Image(__DIR__ . '/../_files/images/earth.jpg', array('width' => 100));
+ $oImage = new Image(__DIR__ . '/../_files/images/earth.jpg', array('width' => Absolute::from('twip', 100)));
$iVal = rand(1, 1000);
$oImage->setRelationId($iVal);
$this->assertEquals($iVal, $oImage->getRelationId());
diff --git a/tests/PhpWord/Element/LineTest.php b/tests/PhpWord/Element/LineTest.php
index 20eee74f38..12357ec152 100644
--- a/tests/PhpWord/Element/LineTest.php
+++ b/tests/PhpWord/Element/LineTest.php
@@ -1,4 +1,5 @@
\PhpOffice\PhpWord\Shared\Converter::cmToPixel(14),
- 'height' => \PhpOffice\PhpWord\Shared\Converter::cmToPixel(4),
+ 'width' => Absolute::from('cm', 14),
+ 'height' => Absolute::from('cm', 4),
'positioning' => 'absolute',
'posHorizontalRel' => 'page',
'posVerticalRel' => 'page',
'flip' => true,
- 'marginLeft' => \PhpOffice\PhpWord\Shared\Converter::cmToPixel(5),
- 'marginTop' => \PhpOffice\PhpWord\Shared\Converter::cmToPixel(3),
+ 'marginLeft' => Absolute::from('cm', 5),
+ 'marginTop' => Absolute::from('cm', 3),
'wrappingStyle' => \PhpOffice\PhpWord\Style\Image::WRAPPING_STYLE_SQUARE,
'beginArrow' => \PhpOffice\PhpWord\Style\Line::ARROW_STYLE_BLOCK,
'endArrow' => \PhpOffice\PhpWord\Style\Line::ARROW_STYLE_OVAL,
'dash' => \PhpOffice\PhpWord\Style\Line::DASH_STYLE_LONG_DASH_DOT_DOT,
- 'weight' => 10,
+ 'weight' => Absolute::from('pt', 10),
)
);
diff --git a/tests/PhpWord/Element/LinkTest.php b/tests/PhpWord/Element/LinkTest.php
index e1be7521a6..359519c771 100644
--- a/tests/PhpWord/Element/LinkTest.php
+++ b/tests/PhpWord/Element/LinkTest.php
@@ -1,4 +1,5 @@
'0000FF', 'underline' => Font::UNDERLINE_SINGLE),
- array('marginLeft' => 600, 'marginRight' => 600, 'marginTop' => 600, 'marginBottom' => 600)
+ array('color' => new Hex('0000FF'), 'underline' => Font::UNDERLINE_SINGLE),
+ array('alignment' => 'center')
);
$this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\Link', $oLink);
diff --git a/tests/PhpWord/Element/ListItemRunTest.php b/tests/PhpWord/Element/ListItemRunTest.php
index 95eb17eb29..a7ee70ad24 100644
--- a/tests/PhpWord/Element/ListItemRunTest.php
+++ b/tests/PhpWord/Element/ListItemRunTest.php
@@ -1,4 +1,5 @@
100));
+ $oListItemRun = new ListItemRun(0, null, array('spacing' => Absolute::from('twip', 100)));
$this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\ListItemRun', $oListItemRun);
$this->assertCount(0, $oListItemRun->getElements());
diff --git a/tests/PhpWord/Element/ListItemTest.php b/tests/PhpWord/Element/ListItemTest.php
index e5c815ec69..c19e63678b 100644
--- a/tests/PhpWord/Element/ListItemTest.php
+++ b/tests/PhpWord/Element/ListItemTest.php
@@ -1,4 +1,5 @@
'230px'));
+ $oObject = new OLEObject($src, array('width' => Absolute::from('in', 230 / 96)));
$this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\OLEObject', $oObject);
$this->assertInstanceOf('PhpOffice\\PhpWord\\Style\\Image', $oObject->getStyle());
diff --git a/tests/PhpWord/Element/PageBreakTest.php b/tests/PhpWord/Element/PageBreakTest.php
index d4491fe1b3..15b08f143b 100644
--- a/tests/PhpWord/Element/PageBreakTest.php
+++ b/tests/PhpWord/Element/PageBreakTest.php
@@ -1,4 +1,5 @@
16, 'color' => '1B2232'), array('alignment' => Jc::CENTER));
+ $oPreserveText = new PreserveText('text', array('size' => Absolute::from('pt', 16), 'color' => new Hex('1B2232')), array('alignment' => Jc::CENTER));
$this->assertInstanceOf('PhpOffice\\PhpWord\\Style\\Font', $oPreserveText->getFontStyle());
$this->assertInstanceOf('PhpOffice\\PhpWord\\Style\\Paragraph', $oPreserveText->getParagraphStyle());
}
diff --git a/tests/PhpWord/Element/RowTest.php b/tests/PhpWord/Element/RowTest.php
index 3c53450294..bafc51af02 100644
--- a/tests/PhpWord/Element/RowTest.php
+++ b/tests/PhpWord/Element/RowTest.php
@@ -1,4 +1,5 @@
assertInstanceOf('PhpOffice\\PhpWord\\Element\\Row', $oRow);
- $this->assertNull($oRow->getHeight());
+ $this->assertNull($oRow->getHeight()->toInt('twip'));
$this->assertInternalType('array', $oRow->getCells());
$this->assertCount(0, $oRow->getCells());
$this->assertInstanceOf('PhpOffice\\PhpWord\\Style\\Row', $oRow->getStyle());
@@ -45,9 +48,9 @@ public function testConstruct()
public function testConstructWithParams()
{
$iVal = rand(1, 1000);
- $oRow = new Row($iVal, array('borderBottomSize' => 18, 'borderBottomColor' => '0000FF', 'bgColor' => '66BBFF'));
+ $oRow = new Row(Absolute::from('twip', $iVal));
- $this->assertEquals($iVal, $oRow->getHeight());
+ $this->assertEquals($iVal, $oRow->getHeight()->toInt('twip'));
$this->assertInstanceOf('PhpOffice\\PhpWord\\Style\\Row', $oRow->getStyle());
}
diff --git a/tests/PhpWord/Element/SDTTest.php b/tests/PhpWord/Element/SDTTest.php
index 2328dd76be..d63439a0c6 100644
--- a/tests/PhpWord/Element/SDTTest.php
+++ b/tests/PhpWord/Element/SDTTest.php
@@ -1,4 +1,5 @@
setStyle(array('orientation' => $expected, 'foo' => null));
+ $object->setStyle(array('orientation' => $expected));
$this->assertEquals($expected, $object->getStyle()->getOrientation());
}
@@ -125,7 +127,7 @@ public function testAddObjectException()
*/
public function testAddTitleWithStyle()
{
- Style::addTitleStyle(1, array('size' => 14));
+ Style::addTitleStyle(1, array('size' => Absolute::from('pt', 14)));
$section = new Section(0);
$section->setPhpWord(new PhpWord());
$section->addTitle('Test', 1);
diff --git a/tests/PhpWord/Element/TOCTest.php b/tests/PhpWord/Element/TOCTest.php
index 5f5f518f43..74fa591043 100644
--- a/tests/PhpWord/Element/TOCTest.php
+++ b/tests/PhpWord/Element/TOCTest.php
@@ -1,4 +1,5 @@
9062,
+ 'position' => Absolute::from('twip', 9062),
'leader' => \PhpOffice\PhpWord\Style\Tab::TAB_LEADER_DOT,
- 'indent' => 200,
+ 'indent' => Absolute::from('twip', 200),
);
- $object = new TOC(array('size' => 11), array('position' => $expected['position']));
+ $object = new TOC(array('size' => Absolute::from('pt', 11)), array('position' => $expected['position']));
$tocStyle = $object->getStyleTOC();
$this->assertInstanceOf('PhpOffice\\PhpWord\\Style\\TOC', $tocStyle);
diff --git a/tests/PhpWord/Element/TableTest.php b/tests/PhpWord/Element/TableTest.php
index 8ae5306c82..b8b8c29a02 100644
--- a/tests/PhpWord/Element/TableTest.php
+++ b/tests/PhpWord/Element/TableTest.php
@@ -1,4 +1,5 @@
assertInstanceOf('PhpOffice\\PhpWord\\Element\\Table', $oTable);
$this->assertNull($oTable->getStyle());
- $this->assertNull($oTable->getWidth());
+ $this->assertNull($oTable->getWidth()->toInt('twip'));
$this->assertEquals(array(), $oTable->getRows());
$this->assertCount(0, $oTable->getRows());
}
@@ -54,7 +58,7 @@ public function testStyleText()
*/
public function testStyleArray()
{
- $oTable = new Table(array('borderSize' => 6, 'borderColor' => '006699', 'cellMargin' => 80));
+ $oTable = new Table(array('borderSize' => Absolute::from('eop', 6), 'borderColor' => new Colors\Hex('006699'), 'cellMargin' => Absolute::from('eop', 80)));
$this->assertInstanceOf('PhpOffice\\PhpWord\\Style\\Table', $oTable->getStyle());
}
@@ -66,8 +70,8 @@ public function testWidth()
{
$oTable = new Table();
$iVal = rand(1, 1000);
- $oTable->setWidth($iVal);
- $this->assertEquals($iVal, $oTable->getWidth());
+ $oTable->setWidth(Absolute::from('twip', $iVal));
+ $this->assertEquals($iVal, $oTable->getWidth()->toInt('twip'));
}
/**
diff --git a/tests/PhpWord/Element/TextBoxTest.php b/tests/PhpWord/Element/TextBoxTest.php
index cd50acd4a6..b23e95b0c7 100644
--- a/tests/PhpWord/Element/TextBoxTest.php
+++ b/tests/PhpWord/Element/TextBoxTest.php
@@ -1,4 +1,5 @@
\PhpOffice\PhpWord\Shared\Converter::cmToPixel(4.5),
- 'height' => \PhpOffice\PhpWord\Shared\Converter::cmToPixel(17.5),
+ 'width' => Absolute::from('cm', 4.5),
+ 'height' => Absolute::from('cm', 17.5),
'positioning' => 'absolute',
- 'marginLeft' => \PhpOffice\PhpWord\Shared\Converter::cmToPixel(15.4),
- 'marginTop' => \PhpOffice\PhpWord\Shared\Converter::cmToPixel(9.9),
- 'stroke' => 0,
- 'innerMargin' => 0,
- 'borderSize' => 1,
- 'borderColor' => '',
+ 'marginLeft' => Absolute::from('cm', 15.4),
+ 'marginTop' => Absolute::from('cm', 9.9),
+ 'innerMargin' => Absolute::from('eop', 0),
+ 'borderSize' => Absolute::from('eop', 1),
)
);
diff --git a/tests/PhpWord/Element/TextBreakTest.php b/tests/PhpWord/Element/TextBreakTest.php
index 13084c679a..da29a15e6b 100644
--- a/tests/PhpWord/Element/TextBreakTest.php
+++ b/tests/PhpWord/Element/TextBreakTest.php
@@ -1,4 +1,5 @@
12);
- $pStyle = array('spacing' => 240);
+ $fStyle = array('size' => Absolute::from('pt', 12));
+ $pStyle = array('spacing' => Absolute::from('eop', 240));
$object = new TextBreak($fStyle, $pStyle);
$this->assertInstanceOf('PhpOffice\\PhpWord\\Style\\Font', $object->getFontStyle());
$this->assertInstanceOf('PhpOffice\\PhpWord\\Style\\Paragraph', $object->getParagraphStyle());
diff --git a/tests/PhpWord/Element/TextRunTest.php b/tests/PhpWord/Element/TextRunTest.php
index 2168bcc49a..eef1068d9f 100644
--- a/tests/PhpWord/Element/TextRunTest.php
+++ b/tests/PhpWord/Element/TextRunTest.php
@@ -1,4 +1,5 @@
100));
+ $oTextRun = new TextRun(array('spacing' => Absolute::from('twip', 100)));
$this->assertInstanceOf('PhpOffice\\PhpWord\\Element\\TextRun', $oTextRun);
$this->assertCount(0, $oTextRun->getElements());
@@ -178,7 +180,7 @@ public function testParagraph()
$oText = new TextRun('paragraphStyle');
$this->assertEquals('paragraphStyle', $oText->getParagraphStyle());
- $oText->setParagraphStyle(array('alignment' => Jc::CENTER, 'spaceAfter' => 100));
+ $oText->setParagraphStyle(array('alignment' => Jc::CENTER, 'spaceAfter' => Absolute::from('twip', 100)));
$this->assertInstanceOf('PhpOffice\\PhpWord\\Style\\Paragraph', $oText->getParagraphStyle());
}
}
diff --git a/tests/PhpWord/Element/TextTest.php b/tests/PhpWord/Element/TextTest.php
index 97be7ae5b6..b814762f9c 100644
--- a/tests/PhpWord/Element/TextTest.php
+++ b/tests/PhpWord/Element/TextTest.php
@@ -1,4 +1,5 @@
assertEquals('fontStyle', $oText->getFontStyle());
- $oText->setFontStyle(array('bold' => true, 'italic' => true, 'size' => 16));
+ $oText->setFontStyle(array('bold' => true, 'italic' => true, 'size' => Absolute::from('pt', 16)));
$this->assertInstanceOf('PhpOffice\\PhpWord\\Style\\Font', $oText->getFontStyle());
}
@@ -80,7 +82,7 @@ public function testParagraph()
$oText = new Text('text', 'fontStyle', 'paragraphStyle');
$this->assertEquals('paragraphStyle', $oText->getParagraphStyle());
- $oText->setParagraphStyle(array('alignment' => Jc::CENTER, 'spaceAfter' => 100));
+ $oText->setParagraphStyle(array('alignment' => Jc::CENTER, 'spaceAfter' => Absolute::from('twip', 100)));
$this->assertInstanceOf('PhpOffice\\PhpWord\\Style\\Paragraph', $oText->getParagraphStyle());
}
}
diff --git a/tests/PhpWord/Element/TitleTest.php b/tests/PhpWord/Element/TitleTest.php
index 6ef87c3e8e..0c824387e0 100644
--- a/tests/PhpWord/Element/TitleTest.php
+++ b/tests/PhpWord/Element/TitleTest.php
@@ -1,4 +1,5 @@
setHyphenationZone($hyphenationZoneInTwip);
- $this->assertSame($hyphenationZoneInTwip, $oSettings->getHyphenationZone());
+ $oSettings->setHyphenationZone($hyphenationZone);
+ $this->assertSame($hyphenationZone->toInt('twip'), $oSettings->getHyphenationZone()->toInt('twip'));
}
public function testDefaultHyphenationZone()
{
$oSettings = new Settings();
- $this->assertNull($oSettings->getHyphenationZone());
+ $this->assertNull($oSettings->getHyphenationZone()->toInt('twip'));
}
public function testDoNotHyphenateCaps()
diff --git a/tests/PhpWord/PhpWordTest.php b/tests/PhpWord/PhpWordTest.php
index d818e0f8bb..4617db1d29 100644
--- a/tests/PhpWord/PhpWordTest.php
+++ b/tests/PhpWord/PhpWordTest.php
@@ -1,4 +1,5 @@
assertEquals(new DocInfo(), $phpWord->getDocInfo());
$this->assertEquals(Settings::DEFAULT_FONT_NAME, $phpWord->getDefaultFontName());
- $this->assertEquals(Settings::DEFAULT_FONT_SIZE, $phpWord->getDefaultFontSize());
+ $this->assertEquals(Settings::DEFAULT_FONT_SIZE, $phpWord->getDefaultFontSize()->toInt('pt'));
}
/**
@@ -66,9 +68,9 @@ public function testSetGetDefaultFontSize()
{
$phpWord = new PhpWord();
$fontSize = 16;
- $this->assertEquals(Settings::DEFAULT_FONT_SIZE, $phpWord->getDefaultFontSize());
- $phpWord->setDefaultFontSize($fontSize);
- $this->assertEquals($fontSize, $phpWord->getDefaultFontSize());
+ $this->assertEquals(Settings::DEFAULT_FONT_SIZE, $phpWord->getDefaultFontSize()->toInt('pt'));
+ $phpWord->setDefaultFontSize(Absolute::from('pt', $fontSize));
+ $this->assertEquals($fontSize, $phpWord->getDefaultFontSize()->toInt('pt'));
}
/**
diff --git a/tests/PhpWord/Reader/HTMLTest.php b/tests/PhpWord/Reader/HTMLTest.php
index 38588afc17..17e77f3ac7 100644
--- a/tests/PhpWord/Reader/HTMLTest.php
+++ b/tests/PhpWord/Reader/HTMLTest.php
@@ -1,4 +1,5 @@
assertInstanceOf('PhpOffice\PhpWord\Style\Table', $elements[0]->getStyle());
/** @var \PhpOffice\PhpWord\Style\Table $tableStyle */
$tableStyle = $elements[0]->getStyle();
- $this->assertEquals(TblWidth::AUTO, $tableStyle->getUnit());
- $this->assertEquals(10.5, $tableStyle->getCellSpacing());
+ $this->assertEquals(10.5, $tableStyle->getCellSpacing()->toFloat('twip'));
+ }
+
+ /**
+ * Test reading of cell spacing
+ */
+ public function testReadCellWidth()
+ {
+ $documentXml = '
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ';
+
+ $phpWord = $this->getDocumentFromString(array('document' => $documentXml));
+
+ $cells = $phpWord->getSection(0)->getElement(0)->getRows()[0]->getCells();
+
+ $this->assertEquals(Absolute::from('twip', 10.3), $cells[0]->getWidth());
+ $this->assertEquals(new Absolute(0), $cells[1]->getWidth());
+ $this->assertEquals(new Percent(50), $cells[2]->getWidth());
+ $this->assertEquals(new Absolute(0), $cells[3]->getWidth());
+ $this->assertEquals(new Auto(), $cells[4]->getWidth());
+ }
+
+ /**
+ * Test reading of cell spacing
+ * @depends testReadCellWidth
+ * @expectedException \PHPUnit\Framework\Error\Warning
+ * @expectedExceptionMessage Cell width type `bad` is not supported
+ */
+ public function testReadCellWidthBadType()
+ {
+ $documentXml = '
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ';
+
+ $this->getDocumentFromString(array('document' => $documentXml));
+ }
+
+ /**
+ * Test reading of cell spacing
+ * @depends testReadCellWidthBadType
+ */
+ public function testReadCellWidthBadTypeReturn()
+ {
+ $documentXml = '
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ';
+
+ $phpWord = @$this->getDocumentFromString(array('document' => $documentXml));
+
+ $cells = $phpWord->getSection(0)->getElement(0)->getRows()[0]->getCells();
+
+ $this->assertEquals(new Absolute(null), $cells[0]->getWidth());
}
/**
@@ -90,16 +219,16 @@ public function testReadTablePosition()
$this->assertInstanceOf('PhpOffice\PhpWord\Style\TablePosition', $elements[0]->getStyle()->getPosition());
/** @var \PhpOffice\PhpWord\Style\TablePosition $tableStyle */
$tableStyle = $elements[0]->getStyle()->getPosition();
- $this->assertEquals(10, $tableStyle->getLeftFromText());
- $this->assertEquals(20, $tableStyle->getRightFromText());
- $this->assertEquals(30, $tableStyle->getTopFromText());
- $this->assertEquals(40, $tableStyle->getBottomFromText());
+ $this->assertEquals(10, $tableStyle->getLeftFromText()->toInt('twip'));
+ $this->assertEquals(20, $tableStyle->getRightFromText()->toInt('twip'));
+ $this->assertEquals(30, $tableStyle->getTopFromText()->toInt('twip'));
+ $this->assertEquals(40, $tableStyle->getBottomFromText()->toInt('twip'));
$this->assertEquals(TablePosition::VANCHOR_PAGE, $tableStyle->getVertAnchor());
$this->assertEquals(TablePosition::HANCHOR_MARGIN, $tableStyle->getHorzAnchor());
$this->assertEquals(TablePosition::XALIGN_CENTER, $tableStyle->getTblpXSpec());
- $this->assertEquals(50, $tableStyle->getTblpX());
+ $this->assertEquals(50, $tableStyle->getTblpX()->toInt('twip'));
$this->assertEquals(TablePosition::YALIGN_TOP, $tableStyle->getTblpYSpec());
- $this->assertEquals(60, $tableStyle->getTblpY());
+ $this->assertEquals(60, $tableStyle->getTblpY()->toInt('twip'));
}
/**
@@ -126,26 +255,70 @@ public function testReadPosition()
$this->assertInstanceOf('PhpOffice\PhpWord\Style\Font', $textRun->getElement(0)->getFontStyle());
/** @var \PhpOffice\PhpWord\Style\Font $fontStyle */
$fontStyle = $textRun->getElement(0)->getFontStyle();
- $this->assertEquals(15, $fontStyle->getPosition());
+ $this->assertEquals(15, $fontStyle->getPosition()->toInt('twip'));
}
public function testReadIndent()
+ {
+ $indents = array(
+ array(2160, 'dxa', Absolute::from('twip', 2160)),
+ array('', 'nil', new Absolute(0)),
+ array('', 'auto', new Absolute(null)),
+ array(50, 'pct', new Absolute(null)),
+ );
+ foreach ($indents as $indent) {
+ $documentXml = '
+
+
+
+ ';
+
+ $phpWord = $this->getDocumentFromString(array('document' => $documentXml));
+
+ $elements = $phpWord->getSection(0)->getElements();
+ $this->assertInstanceOf('PhpOffice\PhpWord\Element\Table', $elements[0]);
+ $this->assertInstanceOf('PhpOffice\PhpWord\Style\Table', $elements[0]->getStyle());
+ /** @var \PhpOffice\PhpWord\Style\Table $tableStyle */
+ $tableStyle = $elements[0]->getStyle();
+ $this->assertEquals($indent[2], $tableStyle->getIndent());
+ }
+ }
+
+ /**
+ * @depends testReadIndent
+ * @expectedException \PHPUnit\Framework\Error\Warning
+ * @expectedExceptionMessage Table indent type `bad` is not supported
+ */
+ public function testReadIndentBadType()
{
$documentXml = '
-
+
';
- $phpWord = $this->getDocumentFromString(array('document' => $documentXml));
+ $this->getDocumentFromString(array('document' => $documentXml));
+ }
+
+ /**
+ * @depends testReadIndent
+ */
+ public function testReadIndentBadTypeReturn()
+ {
+ $documentXml = '
+
+
+
+ ';
+
+ $phpWord = @$this->getDocumentFromString(array('document' => $documentXml));
$elements = $phpWord->getSection(0)->getElements();
$this->assertInstanceOf('PhpOffice\PhpWord\Element\Table', $elements[0]);
$this->assertInstanceOf('PhpOffice\PhpWord\Style\Table', $elements[0]->getStyle());
/** @var \PhpOffice\PhpWord\Style\Table $tableStyle */
$tableStyle = $elements[0]->getStyle();
- $this->assertSame(TblWidth::TWIP, $tableStyle->getIndent()->getType());
- $this->assertSame(2160, $tableStyle->getIndent()->getValue());
+ $this->assertEquals(new Absolute(null), $tableStyle->getIndent());
}
public function testReadTableRTL()
diff --git a/tests/PhpWord/Reader/Word2007Test.php b/tests/PhpWord/Reader/Word2007Test.php
index 6d660ce5ef..cc460c824d 100644
--- a/tests/PhpWord/Reader/Word2007Test.php
+++ b/tests/PhpWord/Reader/Word2007Test.php
@@ -1,4 +1,5 @@
assertEquals(Settings::DEFAULT_FONT_SIZE, Settings::getDefaultFontSize());
- $this->assertTrue(Settings::setDefaultFontSize(12));
- $this->assertFalse(Settings::setDefaultFontSize(null));
+ $this->assertEquals(Settings::DEFAULT_FONT_SIZE, Settings::getDefaultFontSize()->toInt('pt'));
+ $this->assertTrue(Settings::setDefaultFontSize(Absolute::from('pt', 12)));
+ $this->assertFalse(Settings::setDefaultFontSize(Absolute::from('pt', null)));
}
/**
@@ -137,4 +140,14 @@ public function testLoadConfig()
// Test with invalid file
$this->assertEmpty(Settings::loadConfig(__DIR__ . '/../../phpunit.xml.dist'));
}
+
+ /**
+ * Test loading bad config
+ * @expectedException \Exception
+ * @expectedExceptionMessage No method found for key `defaultFontClr` to set config value
+ */
+ public function testLoadBadConfig()
+ {
+ Settings::loadConfig(__DIR__ . '/_files/broken-phpword.ini');
+ }
}
diff --git a/tests/PhpWord/Shared/ConverterTest.php b/tests/PhpWord/Shared/ConverterTest.php
deleted file mode 100644
index 15be8ec12a..0000000000
--- a/tests/PhpWord/Shared/ConverterTest.php
+++ /dev/null
@@ -1,139 +0,0 @@
-assertEquals($value / 2.54 * 1440, $result);
-
- $result = Converter::cmToInch($value);
- $this->assertEquals($value / 2.54, $result);
-
- $result = Converter::cmToPixel($value);
- $this->assertEquals($value / 2.54 * 96, $result);
-
- $result = Converter::cmToPoint($value);
- $this->assertEquals($value / 2.54 * 72, $result);
-
- $result = Converter::cmToEmu($value);
- $this->assertEquals(round($value / 2.54 * 96 * 9525), $result);
-
- $result = Converter::inchToTwip($value);
- $this->assertEquals($value * 1440, $result);
-
- $result = Converter::inchToCm($value);
- $this->assertEquals($value * 2.54, $result);
-
- $result = Converter::inchToPixel($value);
- $this->assertEquals($value * 96, $result);
-
- $result = Converter::inchToPoint($value);
- $this->assertEquals($value * 72, $result);
-
- $result = Converter::inchToEmu($value);
- $this->assertEquals(round($value * 96 * 9525), $result);
-
- $result = Converter::pixelToTwip($value);
- $this->assertEquals($value / 96 * 1440, $result);
-
- $result = Converter::pixelToCm($value);
- $this->assertEquals($value / 96 * 2.54, $result);
-
- $result = Converter::pixelToPoint($value);
- $this->assertEquals($value / 96 * 72, $result);
-
- $result = Converter::pixelToEmu($value);
- $this->assertEquals(round($value * 9525), $result);
-
- $result = Converter::pointToTwip($value);
- $this->assertEquals($value * 20, $result);
-
- $result = Converter::pointToCm($value);
- $this->assertEquals($value * 0.035277778, $result, '', 0.00001);
-
- $result = Converter::pointToPixel($value);
- $this->assertEquals($value / 72 * 96, $result);
-
- $result = Converter::pointToEmu($value);
- $this->assertEquals(round($value / 72 * 96 * 9525), $result);
-
- $result = Converter::emuToPixel($value);
- $this->assertEquals(round($value / 9525), $result);
-
- $result = Converter::picaToPoint($value);
- $this->assertEquals($value / 6 * 72, $result, '', 0.00001);
-
- $result = Converter::degreeToAngle($value);
- $this->assertEquals((int) round($value * 60000), $result);
-
- $result = Converter::angleToDegree($value);
- $this->assertEquals(round($value / 60000), $result);
- }
- }
-
- /**
- * Test htmlToRGB()
- */
- public function testHtmlToRGB()
- {
- // Prepare test values [ original, expected ]
- $values = array();
- $values[] = array('#FF99DD', array(255, 153, 221)); // With #
- $values[] = array('FF99DD', array(255, 153, 221)); // 6 characters
- $values[] = array('F9D', array(255, 153, 221)); // 3 characters
- $values[] = array('0F9D', false); // 4 characters
- // Conduct test
- foreach ($values as $value) {
- $result = Converter::htmlToRgb($value[0]);
- $this->assertEquals($value[1], $result);
- }
- }
-
- /**
- * Test css size to point
- */
- public function testCssSizeParser()
- {
- $this->assertNull(Converter::cssToPoint('10em'));
- $this->assertEquals(0, Converter::cssToPoint('0'));
- $this->assertEquals(10, Converter::cssToPoint('10pt'));
- $this->assertEquals(7.5, Converter::cssToPoint('10px'));
- $this->assertEquals(720, Converter::cssToPoint('10in'));
- $this->assertEquals(7.2, Converter::cssToPoint('0.1in'));
- $this->assertEquals(120, Converter::cssToPoint('10pc'));
- $this->assertEquals(28.346457, Converter::cssToPoint('10mm'), '', 0.000001);
- $this->assertEquals(283.464567, Converter::cssToPoint('10cm'), '', 0.000001);
- }
-}
diff --git a/tests/PhpWord/Shared/HtmlTest.php b/tests/PhpWord/Shared/HtmlTest.php
index 5bc9e2411a..63ad727302 100644
--- a/tests/PhpWord/Shared/HtmlTest.php
+++ b/tests/PhpWord/Shared/HtmlTest.php
@@ -1,4 +1,5 @@
addSection();
- Html::addHtml($section, 'test
');
- Html::addHtml($section, 'test
');
- Html::addHtml($section, 'test
');
- Html::addHtml($section, 'test
');
+
+ $heights = array(
+ array('1', Paragraph::LINE_HEIGHT, LineSpacingRule::AUTO),
+ array('1.5', Paragraph::LINE_HEIGHT * 1.5, LineSpacingRule::AUTO),
+ array('2', Paragraph::LINE_HEIGHT * 2, LineSpacingRule::AUTO),
+ array('15pt', 300, LineSpacingRule::EXACT),
+ array('15.5pt', 310, LineSpacingRule::EXACT),
+ array('120%', Paragraph::LINE_HEIGHT * 1.2, LineSpacingRule::AUTO),
+ array('120.5%', round(Paragraph::LINE_HEIGHT * 1.205), LineSpacingRule::AUTO),
+ array('0.17in', 245, LineSpacingRule::EXACT),
+ array('1in', 1440, LineSpacingRule::EXACT),
+ );
+
+ foreach ($heights as $info) {
+ list($height, $expected, $rule) = $info;
+ Html::addHtml($section, 'test
');
+ }
$doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
- $this->assertTrue($doc->elementExists('/w:document/w:body/w:p[1]/w:pPr/w:spacing'));
- $this->assertEquals(Paragraph::LINE_HEIGHT * 1.5, $doc->getElementAttribute('/w:document/w:body/w:p[1]/w:pPr/w:spacing', 'w:line'));
- $this->assertEquals(LineSpacingRule::AUTO, $doc->getElementAttribute('/w:document/w:body/w:p[1]/w:pPr/w:spacing', 'w:lineRule'));
- $this->assertTrue($doc->elementExists('/w:document/w:body/w:p[2]/w:pPr/w:spacing'));
- $this->assertEquals(300, $doc->getElementAttribute('/w:document/w:body/w:p[2]/w:pPr/w:spacing', 'w:line'));
- $this->assertEquals(LineSpacingRule::EXACT, $doc->getElementAttribute('/w:document/w:body/w:p[2]/w:pPr/w:spacing', 'w:lineRule'));
+ $elem = 0;
+ foreach ($heights as $info) {
+ list($height, $expected, $rule) = $info;
+ $elem += 1;
+ $this->assertTrue($doc->elementExists('/w:document/w:body/w:p[' . $elem . ']/w:pPr/w:spacing'));
+ $this->assertEquals($expected, $doc->getElementAttribute('/w:document/w:body/w:p[' . $elem . ']/w:pPr/w:spacing', 'w:line'));
+ $this->assertEquals($rule, $doc->getElementAttribute('/w:document/w:body/w:p[' . $elem . ']/w:pPr/w:spacing', 'w:lineRule'));
+ }
+ }
+
+ /**
+ * Test text-indent style
+ */
+ public function testParagraphBorderWidths()
+ {
+ $dpi = new HtmlDpi();
+ $borders = array(
+ 'border-width: 1px' => array(
+ 'top' => new BorderSide(Absolute::fromPixels($dpi, 1)),
+ 'right' => new BorderSide(Absolute::fromPixels($dpi, 1)),
+ 'bottom' => new BorderSide(Absolute::fromPixels($dpi, 1)),
+ 'left' => new BorderSide(Absolute::fromPixels($dpi, 1)),
+ ),
+ 'border-width: 1px 2px' => array(
+ 'top' => new BorderSide(Absolute::fromPixels($dpi, 1)),
+ 'right' => new BorderSide(Absolute::fromPixels($dpi, 2)),
+ 'bottom' => new BorderSide(Absolute::fromPixels($dpi, 1)),
+ 'left' => new BorderSide(Absolute::fromPixels($dpi, 2)),
+ ),
+ 'border-width: 1px 2px 3px' => array(
+ 'top' => new BorderSide(Absolute::fromPixels($dpi, 1)),
+ 'right' => new BorderSide(Absolute::fromPixels($dpi, 2)),
+ 'bottom' => new BorderSide(Absolute::fromPixels($dpi, 3)),
+ 'left' => new BorderSide(Absolute::fromPixels($dpi, 2)),
+ ),
+ 'border-width: 1px 2px 3px 4px' => array(
+ 'top' => new BorderSide(Absolute::fromPixels($dpi, 1)),
+ 'right' => new BorderSide(Absolute::fromPixels($dpi, 2)),
+ 'bottom' => new BorderSide(Absolute::fromPixels($dpi, 3)),
+ 'left' => new BorderSide(Absolute::fromPixels($dpi, 4)),
+ ),
+ );
+ $phpWord = new \PhpOffice\PhpWord\PhpWord();
+ $section = $phpWord->addSection();
+ $key = -1;
+ foreach ($borders as $css => $borderSides) {
+ $key += 1;
+ Html::addHtml($section, 'test
');
+ foreach ($borderSides as $side => $border) {
+ $this->assertEquals($border, $section->getElement($key)->getParagraphStyle()->getBorder($side), "$side border width should match expectation for css `$css`");
+ }
+ }
+ }
- $this->assertTrue($doc->elementExists('/w:document/w:body/w:p[3]/w:pPr/w:spacing'));
- $this->assertEquals(Paragraph::LINE_HEIGHT * 1.2, $doc->getElementAttribute('/w:document/w:body/w:p[3]/w:pPr/w:spacing', 'w:line'));
- $this->assertEquals(LineSpacingRule::AUTO, $doc->getElementAttribute('/w:document/w:body/w:p[3]/w:pPr/w:spacing', 'w:lineRule'));
+ /**
+ * Test text-indent style
+ */
+ public function testParagraphBorderColors()
+ {
+ $borders = array(
+ 'border-color: #f00' => array(
+ 'top' => new BorderSide(null, new Hex('f00')),
+ 'right' => new BorderSide(null, new Hex('f00')),
+ 'bottom' => new BorderSide(null, new Hex('f00')),
+ 'left' => new BorderSide(null, new Hex('f00')),
+ ),
+ 'border-color: #f00 blue' => array(
+ 'top' => new BorderSide(null, new Hex('f00')),
+ 'right' => new BorderSide(null, new Hex('00f')),
+ 'bottom' => new BorderSide(null, new Hex('f00')),
+ 'left' => new BorderSide(null, new Hex('00f')),
+ ),
+ 'border-color: #f00 blue lime' => array(
+ 'top' => new BorderSide(null, new Hex('f00')),
+ 'right' => new BorderSide(null, new Hex('00f')),
+ 'bottom' => new BorderSide(null, new Hex('0f0')),
+ 'left' => new BorderSide(null, new Hex('00f')),
+ ),
+ 'border-color: #f00 blue lime #ff0' => array(
+ 'top' => new BorderSide(null, new Hex('f00')),
+ 'right' => new BorderSide(null, new Hex('00f')),
+ 'bottom' => new BorderSide(null, new Hex('0f0')),
+ 'left' => new BorderSide(null, new Hex('ff0')),
+ ),
+ );
+ $phpWord = new \PhpOffice\PhpWord\PhpWord();
+ $section = $phpWord->addSection();
+ $key = -1;
+ foreach ($borders as $css => $borderSides) {
+ $key += 1;
+ Html::addHtml($section, 'test
');
+ foreach ($borderSides as $side => $border) {
+ $this->assertEquals($border, $section->getElement($key)->getParagraphStyle()->getBorder($side), "$side border width should match expectation for css `$css`");
+ }
+ }
+ }
- $this->assertTrue($doc->elementExists('/w:document/w:body/w:p[4]/w:pPr/w:spacing'));
- $this->assertEquals(244.8, $doc->getElementAttribute('/w:document/w:body/w:p[4]/w:pPr/w:spacing', 'w:line'));
- $this->assertEquals(LineSpacingRule::EXACT, $doc->getElementAttribute('/w:document/w:body/w:p[4]/w:pPr/w:spacing', 'w:lineRule'));
+ /**
+ * Test text-indent style
+ */
+ public function testParagraphBorderStyles()
+ {
+ $borders = array(
+ 'border-style: solid' => array(
+ 'top' => new BorderSide(null, null, new BorderStyle('single')),
+ 'right' => new BorderSide(null, null, new BorderStyle('single')),
+ 'bottom' => new BorderSide(null, null, new BorderStyle('single')),
+ 'left' => new BorderSide(null, null, new BorderStyle('single')),
+ ),
+ 'border-style: solid double' => array(
+ 'top' => new BorderSide(null, null, new BorderStyle('single')),
+ 'right' => new BorderSide(null, null, new BorderStyle('double')),
+ 'bottom' => new BorderSide(null, null, new BorderStyle('single')),
+ 'left' => new BorderSide(null, null, new BorderStyle('double')),
+ ),
+ 'border-style: solid double dotted' => array(
+ 'top' => new BorderSide(null, null, new BorderStyle('single')),
+ 'right' => new BorderSide(null, null, new BorderStyle('double')),
+ 'bottom' => new BorderSide(null, null, new BorderStyle('dotted')),
+ 'left' => new BorderSide(null, null, new BorderStyle('double')),
+ ),
+ 'border-style: solid double dotted dashed' => array(
+ 'top' => new BorderSide(null, null, new BorderStyle('single')),
+ 'right' => new BorderSide(null, null, new BorderStyle('double')),
+ 'bottom' => new BorderSide(null, null, new BorderStyle('dotted')),
+ 'left' => new BorderSide(null, null, new BorderStyle('dashed')),
+ ),
+ );
+ $phpWord = new \PhpOffice\PhpWord\PhpWord();
+ $section = $phpWord->addSection();
+ $key = -1;
+ foreach ($borders as $css => $borderSides) {
+ $key += 1;
+ Html::addHtml($section, 'test
');
+ foreach ($borderSides as $side => $border) {
+ $this->assertEquals($border, $section->getElement($key)->getParagraphStyle()->getBorder($side), "$side border width should match expectation for css `$css`");
+ }
+ }
}
/**
@@ -297,7 +439,7 @@ public function testParseTable()
| header a |
- header b |
+ header b |
header c |
@@ -316,14 +458,14 @@ public function testParseTable()
//check border colors
$this->assertEquals('00EE00', $doc->getElementAttribute('/w:document/w:body/w:tbl/w:tr[1]/w:tc[2]/w:tcPr/w:tcBorders/w:top', 'w:color'));
- $this->assertEquals('00EE00', $doc->getElementAttribute('/w:document/w:body/w:tbl/w:tr[1]/w:tc[2]/w:tcPr/w:tcBorders/w:right', 'w:color'));
+ $this->assertEquals('00EE00', $doc->getElementAttribute('/w:document/w:body/w:tbl/w:tr[1]/w:tc[2]/w:tcPr/w:tcBorders/w:end', 'w:color'));
$this->assertEquals('00EE00', $doc->getElementAttribute('/w:document/w:body/w:tbl/w:tr[1]/w:tc[2]/w:tcPr/w:tcBorders/w:bottom', 'w:color'));
- $this->assertEquals('00EE00', $doc->getElementAttribute('/w:document/w:body/w:tbl/w:tr[1]/w:tc[2]/w:tcPr/w:tcBorders/w:left', 'w:color'));
+ $this->assertEquals('00EE00', $doc->getElementAttribute('/w:document/w:body/w:tbl/w:tr[1]/w:tc[2]/w:tcPr/w:tcBorders/w:start', 'w:color'));
$this->assertEquals('00AA00', $doc->getElementAttribute('/w:document/w:body/w:tbl/w:tr[1]/w:tc[3]/w:tcPr/w:tcBorders/w:top', 'w:color'));
- $this->assertEquals('00BB00', $doc->getElementAttribute('/w:document/w:body/w:tbl/w:tr[1]/w:tc[3]/w:tcPr/w:tcBorders/w:right', 'w:color'));
+ $this->assertEquals('00BB00', $doc->getElementAttribute('/w:document/w:body/w:tbl/w:tr[1]/w:tc[3]/w:tcPr/w:tcBorders/w:end', 'w:color'));
$this->assertEquals('00CC00', $doc->getElementAttribute('/w:document/w:body/w:tbl/w:tr[1]/w:tc[3]/w:tcPr/w:tcBorders/w:bottom', 'w:color'));
- $this->assertEquals('00DD00', $doc->getElementAttribute('/w:document/w:body/w:tbl/w:tr[1]/w:tc[3]/w:tcPr/w:tcBorders/w:left', 'w:color'));
+ $this->assertEquals('00DD00', $doc->getElementAttribute('/w:document/w:body/w:tbl/w:tr[1]/w:tc[3]/w:tcPr/w:tcBorders/w:start', 'w:color'));
}
/**
@@ -605,11 +747,11 @@ public function testParseMalformedStyleIsIgnored()
/**
* Tests parsing hidden text
*/
- public function testParseHiddenText()
+ public function testParseDisplayNone()
{
$phpWord = new \PhpOffice\PhpWord\PhpWord();
$section = $phpWord->addSection();
- $html = 'This is some hidden text.
';
+ $html = 'This is some hidden text.
';
Html::addHtml($section, $html);
$doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
@@ -617,6 +759,51 @@ public function testParseHiddenText()
$this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:r/w:rPr/w:vanish'));
}
+ /**
+ * Tests parsing hidden text
+ */
+ public function testParseDisplayFoo()
+ {
+ $phpWord = new \PhpOffice\PhpWord\PhpWord();
+ $section = $phpWord->addSection();
+ $html = 'This is some hidden text.
';
+ Html::addHtml($section, $html);
+
+ $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
+
+ $this->assertFalse($doc->elementExists('/w:document/w:body/w:p/w:r/w:rPr/w:vanish'));
+ }
+
+ /**
+ * Tests parsing hidden text
+ */
+ public function testParseVisibilityHidden()
+ {
+ $phpWord = new \PhpOffice\PhpWord\PhpWord();
+ $section = $phpWord->addSection();
+ $html = 'This is some hidden text.
';
+ Html::addHtml($section, $html);
+
+ $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
+
+ $this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:r/w:rPr/w:vanish'));
+ }
+
+ /**
+ * Tests parsing unrecognized visibility values
+ */
+ public function testParseVisibilityFoo()
+ {
+ $phpWord = new \PhpOffice\PhpWord\PhpWord();
+ $section = $phpWord->addSection();
+ $html = 'This is some hidden text.
';
+ Html::addHtml($section, $html);
+
+ $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
+
+ $this->assertFalse($doc->elementExists('/w:document/w:body/w:p/w:r/w:rPr/w:vanish'));
+ }
+
/**
* Tests parsing letter spacing
*/
@@ -632,4 +819,45 @@ public function testParseLetterSpacing()
$this->assertTrue($doc->elementExists('/w:document/w:body/w:p/w:r/w:rPr/w:spacing'));
$this->assertEquals(150 * 15, $doc->getElement('/w:document/w:body/w:p/w:r/w:rPr/w:spacing')->getAttribute('w:val'));
}
+
+ /**
+ * Test css size to point
+ * @covers \PhpOffice\PhpWord\Shared\Html::cssToLength()
+ */
+ public function testCssToLength()
+ {
+ $this->assertEquals(900, Html::cssToLength('9em')->toFloat());
+ $this->assertEquals(0, Html::cssToLength('0')->toFloat('pt'));
+ $this->assertEquals(10, Html::cssToLength('10pt')->toFloat('pt'));
+ $this->assertEquals(7.5, Html::cssToLength('10px')->toFloat('pt'));
+ $this->assertEquals(720, Html::cssToLength('10in')->toFloat('pt'));
+ $this->assertEquals(7.2, Html::cssToLength('0.1in')->toFloat('pt'));
+ $this->assertEquals(120, Html::cssToLength('10pc')->toFloat('pt'));
+ $this->assertEquals(28.346457, Html::cssToLength('10mm')->toFloat('pt'), '', .00001);
+ $this->assertEquals(283.464567, Html::cssToLength('10cm')->toFloat('pt'), '', .0000001);
+ $this->assertEquals('10', Html::cssToLength('10%')->toFloat(), '', .0000001);
+ // Invalid length
+ $this->assertNull(Html::cssToLength('54mb')->toFloat('pt'), '', .0000001);
+ }
+
+ /**
+ * Test css size to point
+ * @covers \PhpOffice\PhpWord\Shared\Html::cssToAbsolute()
+ */
+ public function testCssToAbsolute()
+ {
+ $this->assertNull(Html::cssToAbsolute('10em')->toFloat('pt'));
+ $this->assertEquals(0, Html::cssToAbsolute('0')->toFloat('pt'));
+ $this->assertEquals(10, Html::cssToAbsolute('10pt')->toFloat('pt'));
+ $this->assertEquals(7.5, Html::cssToAbsolute('10px')->toFloat('pt'));
+ $this->assertEquals(720, Html::cssToAbsolute('10in')->toFloat('pt'));
+ $this->assertEquals(7.2, Html::cssToAbsolute('0.1in')->toFloat('pt'));
+ $this->assertEquals(120, Html::cssToAbsolute('10pc')->toFloat('pt'));
+ $this->assertEquals(28.346457, Html::cssToAbsolute('10mm')->toFloat('pt'), '', .00001);
+ $this->assertEquals(283.464567, Html::cssToAbsolute('10cm')->toFloat('pt'), '', .0000001);
+ // Percents only work for length
+ $this->assertNull(Html::cssToAbsolute('10%')->toFloat('pt'), '', .0000001);
+ // Invalid length
+ $this->assertNull(Html::cssToAbsolute('10mb')->toFloat('pt'), '', .0000001);
+ }
}
diff --git a/tests/PhpWord/Shared/ZipArchiveTest.php b/tests/PhpWord/Shared/ZipArchiveTest.php
index ecd0961e24..399c456cc0 100644
--- a/tests/PhpWord/Shared/ZipArchiveTest.php
+++ b/tests/PhpWord/Shared/ZipArchiveTest.php
@@ -1,4 +1,5 @@
assertTrue(self::callProtectedMethod($stub, 'setBoolVal', array(true, false)));
$this->assertEquals(12, self::callProtectedMethod($stub, 'setIntVal', array(12, 200)));
- $this->assertEquals(871.1, self::callProtectedMethod($stub, 'setFloatVal', array(871.1, 2.1)));
- $this->assertEquals(871.1, self::callProtectedMethod($stub, 'setFloatVal', array('871.1', 2.1)));
$this->assertEquals('a', self::callProtectedMethod($stub, 'setEnumVal', array('a', array('a', 'b'), 'b')));
}
/**
- * Test setBoolVal, setIntVal, setFloatVal, setEnumVal with default value
+ * Test setBoolVal, setIntVal, setEnumVal with default value
*/
public function testSetValDefault()
{
@@ -58,7 +57,6 @@ public function testSetValDefault()
$this->assertNotTrue(self::callProtectedMethod($stub, 'setBoolVal', array('a', false)));
$this->assertEquals(200, self::callProtectedMethod($stub, 'setIntVal', array('foo', 200)));
- $this->assertEquals(2.1, self::callProtectedMethod($stub, 'setFloatVal', array('foo', 2.1)));
$this->assertEquals('b', self::callProtectedMethod($stub, 'setEnumVal', array(null, array('a', 'b'), 'b')));
}
@@ -77,9 +75,7 @@ public function testSetValEnumException()
/**
* Helper function to call protected method
*
- * @param mixed $object
* @param string $method
- * @param array $args
*/
public static function callProtectedMethod($object, $method, array $args = array())
{
diff --git a/tests/PhpWord/Style/BorderStyleTest.php b/tests/PhpWord/Style/BorderStyleTest.php
new file mode 100644
index 0000000000..18a87126dd
--- /dev/null
+++ b/tests/PhpWord/Style/BorderStyleTest.php
@@ -0,0 +1,110 @@
+assertEquals($style, $borderStyle->getStyle());
+
+ $borderStyle = BorderStyle::fromMixed($style);
+ $this->assertEquals($style, $borderStyle->getStyle());
+ }
+ }
+
+ /**
+ * Test setting style with invalid value
+ * @expectedException \Exception
+ * @expectedExceptionMessage Provided border style must be valid. 'badstyle' provided. Allowed: 'single', 'dashDotStroked', 'dashed', 'dashSmallGap', 'dotDash', 'dotDotDash', 'dotted', 'double', 'doubleWave', 'inset', 'nil', 'none', 'outset', 'thick', 'thickThinLargeGap', 'thickThinMediumGap', 'thickThinSmallGap', 'thinThickLargeGap', 'thinThickMediumGap', 'thinThickSmallGap', 'thinThickThinLargeGap', 'thinThickThinMediumGap', 'thinThickThinSmallGap', 'threeDEmboss', 'threeDEngrave', 'triple', 'wave'
+ */
+ public function testSetGetBad()
+ {
+ new BorderStyle('badstyle');
+ }
+
+ /**
+ * Test setting style with wrong type
+ * @expectedException \TypeError
+ * @expectedExceptionMessage Argument 1 passed to PhpOffice\PhpWord\Style\BorderStyle::__construct() must be of the type string
+ */
+ public function testSetGetWrongType()
+ {
+ new BorderStyle(54);
+ }
+
+ /**
+ * Test getting style from bad value
+ * @expectedException \PHPUnit\Framework\Error\Warning
+ * @expectedExceptionMessage Border style `badstyle` is not a valid option
+ */
+ public function testFromMixedBadValue()
+ {
+ BorderStyle::fromMixed('badstyle');
+ }
+
+ /**
+ * Test getting style from bad value
+ */
+ public function testValueFromMixedBadValue()
+ {
+ $borderStyle = @BorderStyle::fromMixed('badstyle');
+ $this->assertEquals('single', $borderStyle->getStyle());
+ }
+}
diff --git a/tests/PhpWord/Style/CellTest.php b/tests/PhpWord/Style/CellTest.php
index 3c31a45794..b885924adb 100644
--- a/tests/PhpWord/Style/CellTest.php
+++ b/tests/PhpWord/Style/CellTest.php
@@ -1,4 +1,5 @@
VerticalJc::TOP,
'textDirection' => Cell::TEXT_DIR_BTLR,
- 'bgColor' => 'FFFF00',
- 'borderTopSize' => 120,
- 'borderTopColor' => 'FFFF00',
- 'borderLeftSize' => 120,
- 'borderLeftColor' => 'FFFF00',
- 'borderRightSize' => 120,
- 'borderRightColor' => 'FFFF00',
- 'borderBottomSize' => 120,
- 'borderBottomColor' => 'FFFF00',
+ 'bgColor' => new Hex('FFFF00'),
'gridSpan' => 2,
'vMerge' => Cell::VMERGE_RESTART,
);
foreach ($attributes as $key => $value) {
- $set = "set{$key}";
- $get = "get{$key}";
+ $get = "get$key";
+ $result = $cell->$get();
+ if ($result instanceof BasicColor) {
+ $result = $result->toHex();
+ } elseif ($result instanceof Absolute) {
+ $result = $result->toInt('eop');
+ }
+
+ $this->assertNull($result);
- $this->assertNull($object->$get()); // Init with null value
+ $set = "set{$key}";
+ $cell->$set($value);
- $object->$set($value);
+ $get = "get$key";
+ $result = $cell->$get();
+ if ($result instanceof BasicColor) {
+ $result = $result->toHex();
+ $value = $value->toHex();
+ }
- $this->assertEquals($value, $object->$get());
+ $this->assertEquals($value, $result);
}
}
/**
- * Test border color
+ * Test borders
*/
- public function testBorderColor()
+ public function testBorders()
{
- $object = new Cell();
+ $cell = new Cell();
+
+ $this->assertFalse($cell->hasBorder());
+ $borders = array('top', 'end', 'bottom', 'start');
+ $borderSides = array(
+ array(Absolute::from('pt', rand(1, 20)), new Hex('f93de1'), new BorderStyle('double'), Absolute::from('pt', rand(1, 20)), true),
+ array(Absolute::from('twip', rand(1, 400)), new Hex('000000'), new BorderStyle('outset'), Absolute::from('twip', rand(1, 400)), false),
+ array(Absolute::from('eop', rand(1, 160)), new Rgb(255, 0, 100), new BorderStyle('dotted'), Absolute::from('eop', rand(1, 160)), true),
+ );
+ $lastBorderSide = array(new Absolute(0), new Hex(null), new BorderStyle('single'), new Absolute(0), false);
+ foreach ($borderSides as $key => $borderSide) {
+ $newBorder = new BorderSide(...$borderSide);
+
+ foreach ($borders as $side) {
+ $currentBorder = $cell->getBorder($side);
+ $this->assertEquals($lastBorderSide[0], $currentBorder->getSize(), "Size for border side #$key for side $side should match last border side still");
+ $this->assertEquals($lastBorderSide[1], $currentBorder->getColor(), "Color for border side #$key for side $side should match last border side still");
+ $this->assertEquals($lastBorderSide[2], $currentBorder->getStyle(), "Style for border side #$key for side $side should match last border side still");
+ $this->assertEquals($lastBorderSide[3], $currentBorder->getSpace(), "Space for border side #$key for side $side should match last border side still");
+ $this->assertEquals($lastBorderSide[4], $currentBorder->getShadow(), "Shadow for border side #$key for side $side should match last border side still");
- $value = 'FF0000';
+ $cell->setBorder($side, $newBorder);
+ $updatedBorder = $cell->getBorder($side);
+ $this->assertEquals($borderSide[0], $updatedBorder->getSize(), "Size for border side #$key for side $side should match new border");
+ $this->assertEquals($borderSide[1], $updatedBorder->getColor(), "Color for border side #$key for side $side should match new border");
+ $this->assertEquals($borderSide[2], $updatedBorder->getStyle(), "Style for border side #$key for side $side should match new border");
+ $this->assertEquals($borderSide[3], $updatedBorder->getSpace(), "Space for border side #$key for side $side should match new border");
+ $this->assertEquals($borderSide[4], $updatedBorder->getShadow(), "Shadow for border side #$key for side $side should match new border");
+ }
- $object->setStyleValue('borderColor', $value);
- $expected = array($value, $value, $value, $value);
- $this->assertEquals($expected, $object->getBorderColor());
+ $lastBorderSide = $borderSide;
+ }
}
/**
- * Test border size
+ * Test width
*/
- public function testBorderSize()
+ public function testWidth()
{
- $object = new Cell();
+ $cell = new Cell();
+
+ // Undefined
+ $width = $cell->getWidth();
+ $this->assertInstanceOf(Length::class, $width);
+ $this->assertNull($width->toInt('twip'));
+
+ // Null
+ $cell->setWidth(new Absolute(null));
+ $width = $cell->getWidth();
+ $this->assertInstanceOf(Absolute::class, $width);
+ $this->assertNull($width->toInt('twip'));
+
+ // Absolute
+ $cell->setWidth(Absolute::from('twip', 204));
+ $width = $cell->getWidth();
+ $this->assertInstanceOf(Length::class, $width);
+ $this->assertEquals(204, $width->toInt('twip'));
+
+ // Percent
+ $cell->setWidth(new Percent(50));
+ $width = $cell->getWidth();
+ $this->assertInstanceOf(Percent::class, $width);
+ $this->assertEquals(50, $width->toInt());
- $value = 120;
- $expected = array($value, $value, $value, $value);
- $object->setStyleValue('borderSize', $value);
- $this->assertEquals($expected, $object->getBorderSize());
+ // Auto
+ $cell->setWidth(new Auto());
+ $width = $cell->getWidth();
+ $this->assertInstanceOf(Auto::class, $width);
}
}
diff --git a/tests/PhpWord/Style/ChartTest.php b/tests/PhpWord/Style/ChartTest.php
index 9929a8f5a7..91398a96bc 100644
--- a/tests/PhpWord/Style/ChartTest.php
+++ b/tests/PhpWord/Style/ChartTest.php
@@ -1,4 +1,5 @@
assertEquals($chart->getWidth(), 1000000);
+ $this->assertEquals($chart->getWidth()->toInt('emu'), 1000000);
- $chart->setWidth(200);
+ $chart->setWidth(Absolute::from('emu', 200));
- $this->assertEquals($chart->getWidth(), 200);
+ $this->assertEquals($chart->getWidth()->toInt('emu'), 200);
}
/**
@@ -46,11 +49,11 @@ public function testSetGetHeight()
{
$chart = new Chart();
- $this->assertEquals($chart->getHeight(), 1000000);
+ $this->assertEquals($chart->getHeight()->toInt('emu'), 1000000);
- $chart->setHeight(200);
+ $chart->setHeight(Absolute::from('emu', 200));
- $this->assertEquals($chart->getHeight(), 200);
+ $this->assertEquals($chart->getHeight()->toInt('emu'), 200);
}
/**
diff --git a/tests/PhpWord/Style/Colors/ColorTest.php b/tests/PhpWord/Style/Colors/ColorTest.php
new file mode 100644
index 0000000000..d32dd9b960
--- /dev/null
+++ b/tests/PhpWord/Style/Colors/ColorTest.php
@@ -0,0 +1,97 @@
+assertInstanceOf($value[1], $color, $message);
+ $this->assertEquals($value[2], $color->toHexOrName(), $message);
+ }
+ }
+
+ /**
+ * @expectedException \Exception
+ * @expectedExceptionMessage All colors must implement NamedColorInterface or StaticColorInterface. 'class@anonymous
+ */
+ public function testBadClass()
+ {
+ $color = BasicColor::fromMixed(new class() extends BasicColor {
+ public function isSpecified(): bool
+ {
+ return false;
+ }
+ });
+ $color->toHexOrName();
+ }
+
+ /**
+ * @expectedException \PHPUnit\Framework\Error\Warning
+ * @expectedExceptionMessage Color `fakeColor` is not a valid color
+ */
+ public function testInvalidColor()
+ {
+ BasicColor::fromMixed('fakeColor');
+ }
+
+ public function testValueInvalidColor()
+ {
+ $color = @BasicColor::fromMixed('fakeColor');
+ $this->assertInstanceOf(BasicColor::class, $color);
+ $this->assertNull($color->toHexOrName());
+ }
+
+ /**
+ * @expectedException \Error
+ * @expectedExceptionMessage Cannot instantiate abstract class PhpOffice\PhpWord\Style\Colors\BasicColor
+ */
+ public function testBasicInstantiation()
+ {
+ new BasicColor();
+ }
+
+ /**
+ * @expectedException \Error
+ * @expectedExceptionMessage Cannot instantiate abstract class PhpOffice\PhpWord\Style\Colors\SpecialColor
+ */
+ public function testSpecialInstantiation()
+ {
+ new SpecialColor();
+ }
+}
diff --git a/tests/PhpWord/Style/Colors/HexTest.php b/tests/PhpWord/Style/Colors/HexTest.php
new file mode 100644
index 0000000000..f44f4d8856
--- /dev/null
+++ b/tests/PhpWord/Style/Colors/HexTest.php
@@ -0,0 +1,64 @@
+assertEquals($value[1], $result->toHex(), $message);
+ $this->assertEquals($value[1] === null ? null : '#' . $value[1], $result->toHex(true), $message);
+ $this->assertEquals($value[1], $result->toHexOrName(), $message);
+ $this->assertEquals($value[1] === null ? null : '#' . $value[1], $result->toHexOrName(true), $message);
+ $this->assertEquals($value[2], $result->toRgb(), $message);
+ }
+ }
+}
diff --git a/tests/PhpWord/Style/Colors/HighlightColorTest.php b/tests/PhpWord/Style/Colors/HighlightColorTest.php
new file mode 100644
index 0000000000..fb69a2c85f
--- /dev/null
+++ b/tests/PhpWord/Style/Colors/HighlightColorTest.php
@@ -0,0 +1,70 @@
+assertEquals($value[2], $result->toHex(), $message);
+ $this->assertEquals($value[2] === null ? null : '#' . $value[2], $result->toHex(true), $message);
+ $this->assertEquals($value[0], $result->toHexOrName(), $message);
+ $this->assertEquals($value[0], $result->toHexOrName(true), $message);
+ $this->assertEquals($value[1], $result->isSpecified(), $message);
+ $this->assertEquals($value[3], $result->toRgb(), $message);
+ $this->assertEquals($value[0], $result->getName(), $message);
+ }
+ }
+}
diff --git a/tests/PhpWord/Style/Colors/RgbTest.php b/tests/PhpWord/Style/Colors/RgbTest.php
new file mode 100644
index 0000000000..fae2dc6e6d
--- /dev/null
+++ b/tests/PhpWord/Style/Colors/RgbTest.php
@@ -0,0 +1,120 @@
+assertEquals($value[2], $result->toHex(), $message);
+ $this->assertEquals($value[2] === null ? null : '#' . $value[2], $result->toHex(true), $message);
+ $this->assertEquals($value[2], $result->toHexOrName(), $message);
+ $this->assertEquals($value[2] === null ? null : '#' . $value[2], $result->toHexOrName(true), $message);
+ $this->assertEquals($value[1], $result->isSpecified(), $message);
+ $this->assertEquals($value[0], $result->toRgb(), $message);
+ }
+ }
+
+ /**
+ * @expectedException \Exception
+ * @expectedExceptionMessage Provided values must be 0–255. Provided `Rgb(-1, 131, 253)`
+ */
+ public function testLowRed()
+ {
+ new Rgb(-1, 131, 253);
+ }
+
+ /**
+ * @expectedException \Exception
+ * @expectedExceptionMessage Provided values must be 0–255. Provided `Rgb(131, -1, 253)`
+ */
+ public function testLowGreen()
+ {
+ new Rgb(131, -1, 253);
+ }
+
+ /**
+ * @expectedException \Exception
+ * @expectedExceptionMessage Provided values must be 0–255. Provided `Rgb(131, 253, -1)`
+ */
+ public function testLowBlue()
+ {
+ new Rgb(131, 253, -1);
+ }
+
+ /**
+ * @expectedException \Exception
+ * @expectedExceptionMessage Provided values must be 0–255. Provided `Rgb(256, 131, 253)`
+ */
+ public function testHighRed()
+ {
+ new Rgb(256, 131, 253);
+ }
+
+ /**
+ * @expectedException \Exception
+ * @expectedExceptionMessage Provided values must be 0–255. Provided `Rgb(131, 256, 253)`
+ */
+ public function testHighGreen()
+ {
+ new Rgb(131, 256, 253);
+ }
+
+ /**
+ * @expectedException \Exception
+ * @expectedExceptionMessage Provided values must be 0–255. Provided `Rgb(131, 253, 256)`
+ */
+ public function testHighBlue()
+ {
+ new Rgb(131, 253, 256);
+ }
+
+ /**
+ * @expectedException \TypeError
+ * @expectedExceptionMessageRegEx (Argument 3 passed to PhpOffice\\PhpWord\\Style\\Colors\\Rgb::\_\_construct\(\) must be of the type integer, none given|Too few arguments to function PhpOffice\\PhpWord\\Style\\Colors\\Rgb::\_\_construct\(\), 2 passed)
+ */
+ public function testTooFewArgs()
+ {
+ new Rgb(131, 253);
+ }
+}
diff --git a/tests/PhpWord/Style/Colors/SystemColorTest.php b/tests/PhpWord/Style/Colors/SystemColorTest.php
new file mode 100644
index 0000000000..0c5bf3aa73
--- /dev/null
+++ b/tests/PhpWord/Style/Colors/SystemColorTest.php
@@ -0,0 +1,81 @@
+assertEquals($value, $result->getName(), $message);
+ $this->assertEquals($value, $result->toHexOrName(), $message);
+ $this->assertTrue($result->isSpecified(), $message);
+
+ // Last color
+ $this->assertEquals('#000000', $result->getLastColor()->toHex(true));
+ $this->assertEquals('000000', $result->getLastColor()->toHex());
+ $this->assertEquals(array(0, 0, 0), $result->getLastColor()->toRgb());
+ }
+ }
+}
diff --git a/tests/PhpWord/Style/Colors/ThemeColorTest.php b/tests/PhpWord/Style/Colors/ThemeColorTest.php
new file mode 100644
index 0000000000..26eaccb9c4
--- /dev/null
+++ b/tests/PhpWord/Style/Colors/ThemeColorTest.php
@@ -0,0 +1,60 @@
+assertInstanceOf(BasicColor::class, $result);
+ $this->assertInstanceOf(NamedColorInterface::class, $result);
+ $this->assertEquals($value, $result->getName(), $message);
+ $this->assertEquals($value, $result->toHexOrName(), $message);
+ $this->assertTrue($result->isSpecified());
+ }
+ }
+}
diff --git a/tests/PhpWord/Style/FontTest.php b/tests/PhpWord/Style/FontTest.php
index 84916fc277..ac295dd942 100644
--- a/tests/PhpWord/Style/FontTest.php
+++ b/tests/PhpWord/Style/FontTest.php
@@ -1,4 +1,5 @@
null,
- 'size' => null,
+ 'size' => new Absolute(null),
'hint' => null,
- 'color' => null,
+ 'color' => new Hex(null),
'bold' => false,
'italic' => false,
'underline' => Font::UNDERLINE_NONE,
@@ -70,21 +76,23 @@ public function testSetStyleValueWithNullOrEmpty()
'smallCaps' => false,
'allCaps' => false,
'rtl' => false,
- 'fgColor' => null,
- 'bgColor' => null,
- 'scale' => null,
- 'spacing' => null,
- 'kerning' => null,
+ 'fgColor' => new HighlightColor(null),
+ 'bgColor' => new Hex(null),
+ 'scale' => new Percent(null),
+ 'spacing' => new Absolute(null),
+ 'kerning' => new Absolute(null),
'lang' => null,
'hidden' => false,
);
foreach ($attributes as $key => $default) {
$get = is_bool($default) ? "is{$key}" : "get{$key}";
- $this->assertEquals($default, $object->$get());
- $object->setStyleValue($key, null);
- $this->assertEquals($default, $object->$get());
- $object->setStyleValue($key, '');
- $this->assertEquals($default, $object->$get());
+ $new = $default;
+ if ($key === 'underline') {
+ $new = null;
+ }
+ $this->assertEquals($default, $object->$get(), "Attribute `$key` should start at default");
+ $object->setStyleValue($key, $new);
+ $this->assertEquals($default, $object->$get(), "Attribute `$key` should remain at default if set to `null`");
}
}
@@ -97,8 +105,8 @@ public function testSetStyleValueNormal()
$attributes = array(
'name' => 'Times New Roman',
- 'size' => 9,
- 'color' => '999999',
+ 'size' => Absolute::from('pt', 9),
+ 'color' => new Hex('999999'),
'hint' => 'eastAsia',
'bold' => true,
'italic' => true,
@@ -109,12 +117,12 @@ public function testSetStyleValueNormal()
'doubleStrikethrough' => false,
'smallCaps' => true,
'allCaps' => false,
- 'fgColor' => Font::FGCOLOR_YELLOW,
- 'bgColor' => 'FFFF00',
- 'lineHeight' => 2,
- 'scale' => 150,
- 'spacing' => 240,
- 'kerning' => 10,
+ 'fgColor' => new HighlightColor('yellow'),
+ 'bgColor' => new Hex('FFFF00'),
+ 'lineHeight' => new Percent(200),
+ 'scale' => new Percent(150),
+ 'spacing' => Absolute::from('twip', 240),
+ 'kerning' => Absolute::from('hpt', 10),
'rtl' => true,
'noProof' => true,
'lang' => new Language(Language::EN_US),
@@ -123,7 +131,15 @@ public function testSetStyleValueNormal()
$object->setStyleByArray($attributes);
foreach ($attributes as $key => $value) {
$get = is_bool($value) ? "is{$key}" : "get{$key}";
- $this->assertEquals($value, $object->$get());
+ $result = $object->$get();
+ if ($result instanceof BasicColor) {
+ $result = $result->toHexOrName();
+ $value = $value->toHexOrName();
+ } elseif ($result instanceof Absolute) {
+ $result = $result->toInt('hpt');
+ $value = $value->toInt('hpt');
+ }
+ $this->assertEquals($value, $result);
}
}
@@ -136,7 +152,7 @@ public function testLineHeight()
$section = $phpWord->addSection();
// Test style array
- $text = $section->addText('This is a test', array('line-height' => 2.0));
+ $text = $section->addText('This is a test', array('line-height' => new Percent(200)));
$doc = TestHelperDOCX::getDocument($phpWord);
$element = $doc->getElement('/w:document/w:body/w:p/w:pPr/w:spacing');
@@ -148,7 +164,7 @@ public function testLineHeight()
$this->assertEquals('auto', $lineRule);
// Test setter
- $text->getFontStyle()->setLineHeight(3.0);
+ $text->getFontStyle()->setLineHeight(new Percent(300));
$doc = TestHelperDOCX::getDocument($phpWord);
$element = $doc->getElement('/w:document/w:body/w:p/w:pPr/w:spacing');
@@ -165,14 +181,14 @@ public function testLineHeight()
public function testLineHeightFloatval()
{
$object = new Font(null, array('alignment' => Jc::CENTER));
- $object->setLineHeight('1.5pt');
- $this->assertEquals(1.5, $object->getLineHeight());
+ $object->setLineHeight(new Percent(1.5));
+ $this->assertEquals(1.5, $object->getLineHeight()->toFloat());
}
/**
* Test line height exception by using nonnumeric value
*
- * @expectedException \PhpOffice\PhpWord\Exception\InvalidStyleException
+ * @expectedException \TypeError
*/
public function testLineHeightException()
{
diff --git a/tests/PhpWord/Style/ImageTest.php b/tests/PhpWord/Style/ImageTest.php
index 1d43d92152..4b2eb42dab 100644
--- a/tests/PhpWord/Style/ImageTest.php
+++ b/tests/PhpWord/Style/ImageTest.php
@@ -1,4 +1,5 @@
200,
- 'height' => 200,
+ 'width' => Absolute::from('twip', 200),
+ 'height' => Absolute::from('twip', 200),
'alignment' => Jc::START,
- 'marginTop' => 240,
- 'marginLeft' => 240,
+ 'marginTop' => Absolute::from('twip', 240),
+ 'marginLeft' => Absolute::from('twip', 240),
'wrappingStyle' => 'inline',
- 'wrapDistanceLeft' => 10,
- 'wrapDistanceRight' => 20,
- 'wrapDistanceTop' => 30,
- 'wrapDistanceBottom' => 40,
+ 'wrapDistanceLeft' => Absolute::from('twip', 10),
+ 'wrapDistanceRight' => Absolute::from('twip', 20),
+ 'wrapDistanceTop' => Absolute::from('twip', 30),
+ 'wrapDistanceBottom' => Absolute::from('twip', 40),
);
foreach ($properties as $key => $value) {
$set = "set{$key}";
$get = "get{$key}";
$object->$set($value);
- $this->assertEquals($value, $object->$get());
+ $result = $object->$get();
+ if ($result instanceof Absolute) {
+ $result = $result->toInt('twip');
+ $value = $value->toInt('twip');
+ }
+ $this->assertEquals($value, $result);
}
}
@@ -62,26 +69,31 @@ public function testSetStyleValue()
$object = new Image();
$properties = array(
- 'width' => 200,
- 'height' => 200,
+ 'width' => Absolute::from('twip', 200),
+ 'height' => Absolute::from('twip', 200),
'alignment' => Jc::START,
- 'marginTop' => 240,
- 'marginLeft' => 240,
- 'position' => 10,
+ 'marginTop' => Absolute::from('twip', 240),
+ 'marginLeft' => Absolute::from('twip', 240),
+ 'position' => Absolute::from('twip', 10),
'positioning' => \PhpOffice\PhpWord\Style\Image::POSITION_ABSOLUTE,
'posHorizontal' => \PhpOffice\PhpWord\Style\Image::POSITION_HORIZONTAL_CENTER,
'posVertical' => \PhpOffice\PhpWord\Style\Image::POSITION_VERTICAL_TOP,
'posHorizontalRel' => \PhpOffice\PhpWord\Style\Image::POSITION_RELATIVE_TO_COLUMN,
'posVerticalRel' => \PhpOffice\PhpWord\Style\Image::POSITION_RELATIVE_TO_IMARGIN,
- 'wrapDistanceLeft' => 10,
- 'wrapDistanceRight' => 20,
- 'wrapDistanceTop' => 30,
- 'wrapDistanceBottom' => 40,
+ 'wrapDistanceLeft' => Absolute::from('twip', 10),
+ 'wrapDistanceRight' => Absolute::from('twip', 20),
+ 'wrapDistanceTop' => Absolute::from('twip', 30),
+ 'wrapDistanceBottom' => Absolute::from('twip', 40),
);
foreach ($properties as $key => $value) {
$get = "get{$key}";
$object->setStyleValue("{$key}", $value);
- $this->assertEquals($value, $object->$get());
+ $result = $object->$get();
+ if ($result instanceof Absolute) {
+ $result = $result->toInt('twip');
+ $value = $value->toInt('twip');
+ }
+ $this->assertEquals($value, $result);
}
}
diff --git a/tests/PhpWord/Style/IndentationTest.php b/tests/PhpWord/Style/IndentationTest.php
index b39a4d771d..a284e75c37 100644
--- a/tests/PhpWord/Style/IndentationTest.php
+++ b/tests/PhpWord/Style/IndentationTest.php
@@ -1,4 +1,5 @@
array(0, 10),
- 'right' => array(0, 10),
- 'firstLine' => array(null, 20),
- 'hanging' => array(null, 20),
+ 'left' => array(0, Absolute::from('twip', 10)),
+ 'right' => array(0, Absolute::from('twip', 10)),
+ 'firstLine' => array(null, Absolute::from('twip', 20)),
+ 'hanging' => array(null, Absolute::from('twip', 20)),
);
foreach ($properties as $property => $value) {
list($default, $expected) = $value;
$get = "get{$property}";
$set = "set{$property}";
- $this->assertEquals($default, $object->$get()); // Default value
+ $result = $object->$get();
+ if ($expected instanceof Absolute) {
+ $result = $result->toInt('twip');
+ }
+ $this->assertEquals($default, $result); // Default value
$object->$set($expected);
- $this->assertEquals($expected, $object->$get()); // New value
+ $result = $object->$get();
+ if ($expected instanceof Absolute) {
+ $expected = $expected->toInt('twip');
+ $result = $result->toInt('twip');
+ }
+ $this->assertEquals($expected, $result); // New value
}
}
}
diff --git a/tests/PhpWord/Style/LanguageTest.php b/tests/PhpWord/Style/LanguageTest.php
index 3bf516f8ae..ee072e14dd 100644
--- a/tests/PhpWord/Style/LanguageTest.php
+++ b/tests/PhpWord/Style/LanguageTest.php
@@ -1,4 +1,5 @@
assertEquals($value / 2.54 * 1440, $result->toFloat('twip'));
+
+ $result = Absolute::from('cm', $value);
+ $this->assertEquals($value / 2.54, $result->toFloat('in'));
+
+ $result = Absolute::from('cm', $value);
+ $this->assertEquals(round($value / 2.54 * 96), $result->toPixels(new DpiHelper(96)));
+
+ $result = Absolute::from('cm', $value);
+ $this->assertEquals($value / 2.54 * 72, $result->toFloat('pt'));
+
+ $result = Absolute::from('cm', $value);
+ $this->assertEquals($value / 2.54 * 72 * 8, $result->toFloat('eop'));
+
+ $result = Absolute::from('cm', $value);
+ $this->assertEquals($value / 2.54 * 72 * 12700, $result->toFloat('emu'), '', 0.00000001);
+
+ $result = Absolute::from('in', $value);
+ $this->assertEquals($value * 1440, $result->toFloat('twip'));
+
+ $result = Absolute::from('in', $value);
+ $this->assertEquals($value * 2.54, $result->toFloat('cm'));
+
+ $result = Absolute::from('in', $value);
+ $this->assertEquals(round($value * 96), $result->toPixels(new DpiHelper(96)));
+
+ $result = Absolute::from('in', $value);
+ $this->assertEquals($value * 72, $result->toFloat('pt'));
+
+ $result = Absolute::from('in', $value);
+ $this->assertEquals($value * 1440 / 2.5, $result->toFloat('eop'));
+
+ $result = Absolute::from('in', $value);
+ $this->assertEquals($value * 72 * 12700, $result->toFloat('emu'), '', .000000001);
+
+ $result = Absolute::fromPixels(new DpiHelper(96), $value);
+ $this->assertEquals($value / 96 * 1440, $result->toFloat('twip'));
+
+ $result = Absolute::fromPixels(new DpiHelper(96), $value);
+ $this->assertEquals($value / 96 * 2.54, $result->toFloat('cm'));
+
+ $result = Absolute::fromPixels(new DpiHelper(96), $value);
+ $this->assertEquals($value / 96 * 72, $result->toFloat('pt'));
+
+ $result = Absolute::fromPixels(new DpiHelper(96), $value);
+ $this->assertEquals($value / 96 * 1440 / 2.5, $result->toFloat('eop'));
+
+ $result = Absolute::fromPixels(new DpiHelper(96), $value);
+ $this->assertEquals($value / 96 * 72 * 12700, $result->toFloat('emu'));
+
+ $result = Absolute::from('pt', $value);
+ $this->assertEquals($value * 20, $result->toFloat('twip'));
+
+ $result = Absolute::from('pt', $value);
+ $this->assertEquals($value * 0.035277778, $result->toFloat('cm'), '', 0.00001);
+
+ $result = Absolute::from('pt', $value);
+ $this->assertEquals(round($value / 72 * 96), $result->toPixels(new DpiHelper(96)));
+
+ $result = Absolute::from('pt', $value);
+ $this->assertEquals($value * 20 / 2.5, $result->toFloat('eop'));
+
+ $result = Absolute::from('pt', $value);
+ $this->assertEquals($value * 12700, $result->toFloat('emu'), '', 0.00000000001);
+
+ $result = Absolute::from('eop', $value);
+ $this->assertEquals(round($value * 2.5 / 1440 * 96), $result->toPixels(new DpiHelper(96)));
+
+ $result = Absolute::from('pc', $value);
+ $this->assertEquals($value, $result->toFloat('pc'), '', 0.00001);
+ }
+ }
+
+ public function testTwips()
+ {
+ $this->assertEquals(
+ Absolute::from('twip', 5),
+ new Absolute(5),
+ 'Constructor should use twips'
+ );
+ }
+
+ public function testFromAbsolute()
+ {
+ $original = Absolute::from('twip', 5);
+ $new = Absolute::fromMixed('twip', $original);
+ $this->assertNotSame($original, $new, 'Lengths should be cloned to avoid accidental manipulation');
+ $this->assertEquals($original->toInt('twip'), $new->toInt('twip'));
+ $this->assertEquals($original->toFloat('twip'), $new->toFloat('twip'));
+ }
+
+ public function testFromNumeric()
+ {
+ $numbers = array(
+ '0',
+ '5143',
+ '5143.03',
+ );
+ foreach ($numbers as $number) {
+ $length = Absolute::fromMixed('twip', $number);
+ $this->assertEquals((int) $number, $length->toInt('twip'));
+ $this->assertEquals((float) $number, $length->toFloat('twip'));
+ }
+ }
+
+ public function testFromFloat()
+ {
+ $numbers = array(
+ 0,
+ 5143,
+ 5143.03,
+ );
+ foreach ($numbers as $number) {
+ $length = Absolute::fromMixed('twip', $number);
+ $this->assertEquals((int) $number, $length->toInt('twip'));
+ $this->assertEquals((float) $number, $length->toFloat('twip'));
+ }
+ }
+
+ public function testFromNull()
+ {
+ $length = Absolute::fromMixed('twip', null);
+ $this->assertNull($length->toInt('twip'));
+ $this->assertNull($length->toFloat('twip'));
+ }
+
+ /**
+ * @expectedException \PHPUnit\Framework\Error\Warning
+ * @expectedExceptionMessage Border size `not a number` could not be converted to a float
+ */
+ public function testFromInvalid()
+ {
+ Absolute::fromMixed('twip', 'not a number');
+ }
+
+ public function testValueFromInvalid()
+ {
+ $length = @Absolute::fromMixed('twip', 'not a number');
+ $this->assertNull($length->toInt('twip'), 'Invalid values should be converted to null');
+ }
+
+ /**
+ * @expectedException \Exception
+ * @expectedExceptionMessage Cannot convert from unit `badunit`
+ */
+ public function testInvalidUnit()
+ {
+ Absolute::from('badunit', 5);
+ }
+
+ public function testToPixels()
+ {
+ $dpis = array(
+ 72,
+ 96,
+ 254.3,
+ 400,
+ );
+ $floats = array(
+ 0,
+ -2,
+ -.5,
+ .5,
+ 2,
+ 4,
+ 42,
+ );
+ foreach ($dpis as $dpi) {
+ $dpi = new DpiHelper($dpi);
+ foreach ($floats as $float) {
+ $length = Absolute::from('in', $float);
+ $this->assertEquals(round($float * $dpi->getDpi()), $length->toPixels($dpi));
+ }
+ }
+ }
+
+ public function testNullToPixels()
+ {
+ $length = Absolute::from('in', null);
+ $this->assertNull($length->toPixels(new DpiHelper(96)));
+ }
+}
diff --git a/src/PhpWord/SimpleType/TblWidth.php b/tests/PhpWord/Style/Lengths/AutoTest.php
similarity index 60%
rename from src/PhpWord/SimpleType/TblWidth.php
rename to tests/PhpWord/Style/Lengths/AutoTest.php
index 7fd753deb0..0d06f17de5 100644
--- a/src/PhpWord/SimpleType/TblWidth.php
+++ b/tests/PhpWord/Style/Lengths/AutoTest.php
@@ -1,4 +1,5 @@
assertInstanceOf(Auto::class, new Auto());
+ $this->assertInstanceOf(Auto::class, new Auto());
+ $this->assertTrue((new Auto())->isSpecified());
+ }
}
diff --git a/tests/PhpWord/Style/Lengths/DpiHelper.php b/tests/PhpWord/Style/Lengths/DpiHelper.php
new file mode 100644
index 0000000000..41dd8949aa
--- /dev/null
+++ b/tests/PhpWord/Style/Lengths/DpiHelper.php
@@ -0,0 +1,19 @@
+dpi = $dpi;
+ }
+
+ public function getDpi(): float
+ {
+ return $this->dpi;
+ }
+}
diff --git a/tests/PhpWord/Style/Lengths/PercentTest.php b/tests/PhpWord/Style/Lengths/PercentTest.php
new file mode 100644
index 0000000000..bee4d6616d
--- /dev/null
+++ b/tests/PhpWord/Style/Lengths/PercentTest.php
@@ -0,0 +1,92 @@
+assertEquals(round($float), $length->toInt());
+ $this->assertEquals((float) $float, $length->toFloat());
+ }
+ }
+
+ /**
+ * Test initialization
+ */
+ public function testFromMixed()
+ {
+ $values = array(
+ '0' => 0,
+ '2.5' => 0.05,
+ '50' => 1,
+ '100' => 2,
+ '250' => 5,
+ '0%' => 0,
+ '2.5%' => 2.5,
+ '50%' => 50,
+ '100%' => 100,
+ '250%' => 250,
+ );
+ foreach ($values as $input => $expected) {
+ $length = Percent::fromMixed($input);
+ $this->assertEquals(round($expected), $length->toInt(), sprintf('Value \'%s\' should convert to \'%s\'', $input, round($expected)));
+ $this->assertEquals($expected, $length->toFloat(), sprintf('Value \'%s\' should convert to \'%s\'', $input, $expected));
+ }
+ }
+
+ public function testFromPercent()
+ {
+ $original = new Percent(5);
+ $new = Percent::fromMixed($original);
+ $this->assertNotSame($original, $new, 'Lengths should be cloned to avoid accidental manipulation');
+ $this->assertEquals($original->toInt(), $new->toInt());
+ $this->assertEquals($original->toFloat(), $new->toFloat());
+ }
+
+ /**
+ * @expectedException \PHPUnit\Framework\Error\Warning
+ * @expectedExceptionMessage Percent length `not a number` could not be converted to a float
+ */
+ public function testInvalidUnit()
+ {
+ Percent::fromMixed('not a number');
+ }
+
+ public function testValueInvalidUnit()
+ {
+ $length = @Percent::fromMixed('not a number');
+ $this->assertNull($length->toInt());
+ }
+}
diff --git a/tests/PhpWord/Style/LineNumberingTest.php b/tests/PhpWord/Style/LineNumberingTest.php
index 0d3f4e0563..945acd695f 100644
--- a/tests/PhpWord/Style/LineNumberingTest.php
+++ b/tests/PhpWord/Style/LineNumberingTest.php
@@ -1,4 +1,5 @@
array(1, 2),
'increment' => array(1, 10),
- 'distance' => array(null, 10),
+ 'distance' => array(null, Absolute::from('twip', 10)),
'restart' => array(null, 'continuous'),
);
foreach ($properties as $property => $value) {
@@ -41,11 +44,20 @@ public function testGetSetProperties()
$get = "get{$property}";
$set = "set{$property}";
- $this->assertEquals($default, $object->$get()); // Default value
+ $result = $object->$get();
+ if ($expected instanceof Absolute) {
+ $result = $result->toInt('twip');
+ }
+ $this->assertEquals($default, $result); // Default value
$object->$set($expected);
- $this->assertEquals($expected, $object->$get()); // New value
+ $result = $object->$get();
+ if ($expected instanceof Absolute) {
+ $expected = $expected->toInt('twip');
+ $result = $result->toInt('twip');
+ }
+ $this->assertEquals($expected, $result); // New value
}
}
}
diff --git a/tests/PhpWord/Style/LineTest.php b/tests/PhpWord/Style/LineTest.php
index fba09f708d..c80c023d5c 100644
--- a/tests/PhpWord/Style/LineTest.php
+++ b/tests/PhpWord/Style/LineTest.php
@@ -1,4 +1,5 @@
\PhpOffice\PhpWord\Style\Line::ARROW_STYLE_BLOCK,
'endArrow' => \PhpOffice\PhpWord\Style\Line::ARROW_STYLE_OVAL,
'dash' => \PhpOffice\PhpWord\Style\Line::DASH_STYLE_LONG_DASH_DOT_DOT,
- 'weight' => 10,
+ 'weight' => Absolute::from('pt', 10),
'color' => 'red',
);
foreach ($properties as $key => $value) {
$set = "set{$key}";
$get = "get{$key}";
$object->$set($value);
- $this->assertEquals($value, $object->$get());
+ $result = $object->$get();
+ if ($value instanceof Absolute) {
+ $value = $value->toInt('pt');
+ $result = $result->toInt('pt');
+ }
+ $this->assertEquals($value, $result);
}
}
@@ -60,13 +68,18 @@ public function testSetStyleValue()
'beginArrow' => \PhpOffice\PhpWord\Style\Line::ARROW_STYLE_BLOCK,
'endArrow' => \PhpOffice\PhpWord\Style\Line::ARROW_STYLE_OVAL,
'dash' => \PhpOffice\PhpWord\Style\Line::DASH_STYLE_LONG_DASH_DOT_DOT,
- 'weight' => 10,
+ 'weight' => Absolute::from('pt', 10),
'color' => 'red',
);
foreach ($properties as $key => $value) {
$get = "get{$key}";
$object->setStyleValue("{$key}", $value);
- $this->assertEquals($value, $object->$get());
+ $result = $object->$get();
+ if ($value instanceof Absolute) {
+ $value = $value->toInt('pt');
+ $result = $result->toInt('pt');
+ }
+ $this->assertEquals($value, $result);
}
}
@@ -97,10 +110,10 @@ public function testSetGetConnectorType()
*/
public function testSetGetWeight()
{
- $expected = 10;
+ $expected = Absolute::from('pt', 10);
$object = new Line();
$object->setWeight($expected);
- $this->assertEquals($expected, $object->getWeight());
+ $this->assertEquals($expected->toInt('pt'), $object->getWeight()->toInt('pt'));
}
/**
diff --git a/tests/PhpWord/Style/ListItemTest.php b/tests/PhpWord/Style/ListItemTest.php
index 71598e8030..1fd9fc8bc1 100644
--- a/tests/PhpWord/Style/ListItemTest.php
+++ b/tests/PhpWord/Style/ListItemTest.php
@@ -1,4 +1,5 @@
'space',
'text' => '%1.',
'alignment' => Jc::START,
- 'left' => 360,
- 'hanging' => 360,
- 'tabPos' => 360,
+ 'left' => Absolute::from('twip', 360),
+ 'hanging' => Absolute::from('twip', 360),
+ 'tabPos' => Absolute::from('twip', 360),
'font' => 'Arial',
'hint' => 'default',
);
@@ -55,4 +57,70 @@ public function testSetGetNormal()
$this->assertEquals($value, $object->$get());
}
}
+
+ /**
+ * @covers \PhpOffice\PhpWord\Style\NumberingLevel::getLeft
+ */
+ public function testGetLeft()
+ {
+ $level = new NumberingLevel();
+ $this->assertEquals(new Absolute(null), $level->getLeft());
+ }
+
+ /**
+ * @covers \PhpOffice\PhpWord\Style\NumberingLevel::setLeft
+ * @depends testGetLeft
+ */
+ public function testSetLeft()
+ {
+ $level = new NumberingLevel();
+ $this->assertEquals(new Absolute(null), $level->getLeft());
+ $level->setLeft(Absolute::from('pt', 5));
+ $this->assertNotEquals(new Absolute(null), $level->getLeft());
+ $this->assertEquals(Absolute::from('pt', 5), $level->getLeft());
+ }
+
+ /**
+ * @covers \PhpOffice\PhpWord\Style\NumberingLevel::getHanging
+ */
+ public function testGetHanging()
+ {
+ $level = new NumberingLevel();
+ $this->assertEquals(new Absolute(null), $level->getHanging());
+ }
+
+ /**
+ * @covers \PhpOffice\PhpWord\Style\NumberingLevel::setHanging
+ * @depends testGetHanging
+ */
+ public function testSetHanging()
+ {
+ $level = new NumberingLevel();
+ $this->assertEquals(new Absolute(null), $level->getHanging());
+ $level->setHanging(Absolute::from('pt', 5));
+ $this->assertNotEquals(new Absolute(null), $level->getHanging());
+ $this->assertEquals(Absolute::from('pt', 5), $level->getHanging());
+ }
+
+ /**
+ * @covers \PhpOffice\PhpWord\Style\NumberingLevel::getTabPos
+ */
+ public function testGetTabPos()
+ {
+ $level = new NumberingLevel();
+ $this->assertEquals(new Absolute(null), $level->getTabPos());
+ }
+
+ /**
+ * @covers \PhpOffice\PhpWord\Style\NumberingLevel::setTabPos
+ * @depends testGetTabPos
+ */
+ public function testSetTabPos()
+ {
+ $level = new NumberingLevel();
+ $this->assertEquals(new Absolute(null), $level->getTabPos());
+ $level->setTabPos(Absolute::from('pt', 5));
+ $this->assertNotEquals(new Absolute(null), $level->getTabPos());
+ $this->assertEquals(Absolute::from('pt', 5), $level->getTabPos());
+ }
}
diff --git a/tests/PhpWord/Style/NumberingTest.php b/tests/PhpWord/Style/NumberingTest.php
index 2090f9f6fc..0fc4f3b795 100644
--- a/tests/PhpWord/Style/NumberingTest.php
+++ b/tests/PhpWord/Style/NumberingTest.php
@@ -1,4 +1,5 @@
assertEquals(new Absolute(null), $outline->getWeight());
+ }
+
+ /**
+ * covers PhpOffice\PhpWord\Style\Outline::setWeight
+ * @depends testGetWeight
+ */
+ public function testSetWeight()
+ {
+ $outline = new Outline();
+ $this->assertEquals(new Absolute(null), $outline->getWeight());
+ $outline->setWeight(Absolute::from('cm', 1));
+ $this->assertEquals(Absolute::from('cm', 1), $outline->getWeight());
+ }
+
+ /**
+ * covers PhpOffice\PhpWord\Style\Outline::getColor
+ */
+ public function testGetColor()
+ {
+ $outline = new Outline();
+ $this->assertEquals(new Hex(null), $outline->getColor());
+ }
+
+ /**
+ * covers PhpOffice\PhpWord\Style\Outline::setColor
+ * @depends testGetColor
+ */
+ public function testSetColor()
+ {
+ $outline = new Outline();
+ $this->assertEquals(new Hex(null), $outline->getColor());
+ $outline->setColor(new Hex('123456'));
+ $this->assertNotEquals(new Hex(null), $outline->getColor());
+ $this->assertEquals(new Hex('123456'), $outline->getColor());
+ }
+}
diff --git a/tests/PhpWord/Style/PaperTest.php b/tests/PhpWord/Style/PaperTest.php
index f8f0070180..9a6518a869 100644
--- a/tests/PhpWord/Style/PaperTest.php
+++ b/tests/PhpWord/Style/PaperTest.php
@@ -1,4 +1,5 @@
assertEquals('B5', $object->getSize());
- $this->assertEquals(9977.9527559055, $object->getWidth(), '', 0.000000001);
- $this->assertEquals(14173.228346457, $object->getHeight(), '', 0.000000001);
+ $this->assertEquals(9977.9527559055, $object->getWidth()->toFloat('twip'), '', 0.000000001);
+ $this->assertEquals(14173.228346457, $object->getHeight()->toFloat('twip'), '', 0.000000001);
}
/**
@@ -65,7 +66,7 @@ public function testFolioSize()
$object->setSize('Folio');
$this->assertEquals('Folio', $object->getSize());
- $this->assertEquals(12240, $object->getWidth(), '', 0.1);
- $this->assertEquals(18720, $object->getHeight(), '', 0.1);
+ $this->assertEquals(12240, $object->getWidth()->toInt('twip'), '', 0.1);
+ $this->assertEquals(18720, $object->getHeight()->toInt('twip'), '', 0.1);
}
}
diff --git a/tests/PhpWord/Style/ParagraphTest.php b/tests/PhpWord/Style/ParagraphTest.php
index 4fa0ef5a70..14bf7fff81 100644
--- a/tests/PhpWord/Style/ParagraphTest.php
+++ b/tests/PhpWord/Style/ParagraphTest.php
@@ -1,4 +1,5 @@
240,
- 'spaceBefore' => 240,
- 'indent' => 1,
- 'hanging' => 1,
- 'spacing' => 120,
+ 'spaceAfter' => Absolute::from('twip', 240),
+ 'spaceBefore' => Absolute::from('twip', 240),
+ 'indent' => Absolute::from('twip', 1),
+ 'hanging' => Absolute::from('twip', 1),
+ 'spacing' => Absolute::from('twip', 120),
'spacingLineRule' => LineSpacingRule::AT_LEAST,
'basedOn' => 'Normal',
'next' => 'Normal',
@@ -88,11 +91,13 @@ public function testSetStyleValueNormal()
);
foreach ($attributes as $key => $value) {
$get = $this->findGetter($key, $value, $object);
- $object->setStyleValue("$key", $value);
- if ('indent' == $key || 'hanging' == $key) {
- $value = $value * 720;
+ $object->setStyleValue($key, $value);
+ $result = $object->$get();
+ if ($value instanceof Absolute) {
+ $result = $result->toInt('twip');
+ $value = $value->toInt('twip');
}
- $this->assertEquals($value, $object->$get());
+ $this->assertEquals($value, $result);
}
}
@@ -119,7 +124,11 @@ public function testGetNullStyleValue()
$attributes = array('spacing', 'indent', 'hanging', 'spaceBefore', 'spaceAfter', 'textAlignment');
foreach ($attributes as $key) {
$get = $this->findGetter($key, null, $object);
- $this->assertNull($object->$get());
+ $result = $object->$get();
+ if ($result instanceof Absolute) {
+ $result = $result->toInt('twip');
+ }
+ $this->assertNull($result);
}
}
@@ -129,7 +138,7 @@ public function testGetNullStyleValue()
public function testTabs()
{
$object = new Paragraph();
- $object->setTabs(array(new Tab('left', 1550), new Tab('right', 5300)));
+ $object->setTabs(array(new Tab('left', Absolute::from('twip', 1550)), new Tab('right', Absolute::from('twip', 5300))));
$this->assertCount(2, $object->getTabs());
}
@@ -142,7 +151,7 @@ public function testLineHeight()
$section = $phpWord->addSection();
// Test style array
- $text = $section->addText('This is a test', array(), array('line-height' => 2.0));
+ $text = $section->addText('This is a test', array(), array('line-height' => new Percent(200)));
$doc = TestHelperDOCX::getDocument($phpWord);
$element = $doc->getElement('/w:document/w:body/w:p/w:pPr/w:spacing');
@@ -154,7 +163,7 @@ public function testLineHeight()
$this->assertEquals('auto', $lineRule);
// Test setter
- $text->getParagraphStyle()->setLineHeight(3.0);
+ $text->getParagraphStyle()->setLineHeight(new Percent(300));
$doc = TestHelperDOCX::getDocument($phpWord);
$element = $doc->getElement('/w:document/w:body/w:p/w:pPr/w:spacing');
@@ -171,14 +180,15 @@ public function testLineHeight()
public function testLineHeightValidation()
{
$object = new Paragraph();
- $object->setLineHeight('12.5pt');
- $this->assertEquals(12.5, $object->getLineHeight());
+ $object->setLineHeight(new Percent(12.5));
+ $this->assertEquals(12.5, $object->getLineHeight()->toFloat());
+ $this->assertEquals(13, $object->getLineHeight()->toInt());
}
/**
* Test line height exception by using nonnumeric value
*
- * @expectedException \PhpOffice\PhpWord\Exception\InvalidStyleException
+ * @expectedException \TypeError
*/
public function testLineHeightException()
{
diff --git a/tests/PhpWord/Style/RowTest.php b/tests/PhpWord/Style/RowTest.php
index 534815b1b4..2524a678a6 100644
--- a/tests/PhpWord/Style/RowTest.php
+++ b/tests/PhpWord/Style/RowTest.php
@@ -1,4 +1,5 @@
assertEquals('portrait', $oSettings->getOrientation());
- $this->assertEquals(Section::DEFAULT_WIDTH, $oSettings->getPageSizeW(), '', 0.000000001);
- $this->assertEquals(Section::DEFAULT_HEIGHT, $oSettings->getPageSizeH(), '', 0.000000001);
+ $this->assertEquals(Section::DEFAULT_WIDTH, $oSettings->getPageSizeW()->toFloat('twip'), '', .00000001);
+ $this->assertEquals(Section::DEFAULT_HEIGHT, $oSettings->getPageSizeH()->toFloat('twip'), '', .00000001);
$this->assertEquals('A4', $oSettings->getPaperSize());
$oSettings->setSettingValue('orientation', 'landscape');
$this->assertEquals('landscape', $oSettings->getOrientation());
- $this->assertEquals(Section::DEFAULT_HEIGHT, $oSettings->getPageSizeW(), '', 0.000000001);
- $this->assertEquals(Section::DEFAULT_WIDTH, $oSettings->getPageSizeH(), '', 0.000000001);
+ $this->assertEquals(Section::DEFAULT_HEIGHT, $oSettings->getPageSizeW()->toFloat('twip'), '', .00000001);
+ $this->assertEquals(Section::DEFAULT_WIDTH, $oSettings->getPageSizeH()->toFloat('twip'), '', .00000001);
$iVal = rand(1, 1000);
- $oSettings->setSettingValue('borderSize', $iVal);
- $this->assertEquals(array($iVal, $iVal, $iVal, $iVal), $oSettings->getBorderSize());
- $this->assertEquals($iVal, $oSettings->getBorderBottomSize());
- $this->assertEquals($iVal, $oSettings->getBorderLeftSize());
- $this->assertEquals($iVal, $oSettings->getBorderRightSize());
- $this->assertEquals($iVal, $oSettings->getBorderTopSize());
-
- $oSettings->setSettingValue('borderColor', 'FF00AA');
- $this->assertEquals(array('FF00AA', 'FF00AA', 'FF00AA', 'FF00AA'), $oSettings->getBorderColor());
- $this->assertEquals('FF00AA', $oSettings->getBorderBottomColor());
- $this->assertEquals('FF00AA', $oSettings->getBorderLeftColor());
- $this->assertEquals('FF00AA', $oSettings->getBorderRightColor());
- $this->assertEquals('FF00AA', $oSettings->getBorderTopColor());
-
- $iVal = rand(1, 1000);
- $oSettings->setSettingValue('headerHeight', $iVal);
- $this->assertEquals($iVal, $oSettings->getHeaderHeight());
+ $oSettings->setSettingValue('headerHeight', Absolute::from('twip', $iVal));
+ $this->assertEquals($iVal, $oSettings->getHeaderHeight()->toInt('twip'));
$oSettings->setSettingValue('lineNumbering', array());
$oSettings->setSettingValue(
@@ -69,7 +58,7 @@ public function testSettingValue()
array(
'start' => 1,
'increment' => 1,
- 'distance' => 240,
+ 'distance' => Absolute::from('twip', 240),
'restart' => 'newPage',
)
);
@@ -88,20 +77,20 @@ public function testMargin()
$oSettings = new Section();
$iVal = rand(1, 1000);
- $oSettings->setMarginTop($iVal);
- $this->assertEquals($iVal, $oSettings->getMarginTop());
+ $oSettings->setMarginTop(Absolute::from('twip', $iVal));
+ $this->assertEquals($iVal, $oSettings->getMarginTop()->toInt('twip'));
$iVal = rand(1, 1000);
- $oSettings->setMarginBottom($iVal);
- $this->assertEquals($iVal, $oSettings->getMarginBottom());
+ $oSettings->setMarginBottom(Absolute::from('twip', $iVal));
+ $this->assertEquals($iVal, $oSettings->getMarginBottom()->toInt('twip'));
$iVal = rand(1, 1000);
- $oSettings->setMarginLeft($iVal);
- $this->assertEquals($iVal, $oSettings->getMarginLeft());
+ $oSettings->setMarginLeft(Absolute::from('twip', $iVal));
+ $this->assertEquals($iVal, $oSettings->getMarginLeft()->toInt('twip'));
$iVal = rand(1, 1000);
- $oSettings->setMarginRight($iVal);
- $this->assertEquals($iVal, $oSettings->getMarginRight());
+ $oSettings->setMarginRight(Absolute::from('twip', $iVal));
+ $this->assertEquals($iVal, $oSettings->getMarginRight()->toInt('twip'));
}
/**
@@ -112,10 +101,10 @@ public function testPageWidth()
// Section Settings
$oSettings = new Section();
- $this->assertEquals(Section::DEFAULT_WIDTH, $oSettings->getPageSizeW(), '', 0.000000001);
+ $this->assertEquals(Section::DEFAULT_WIDTH, $oSettings->getPageSizeW()->toFloat('twip'), '', 0.000000001);
$iVal = rand(1, 1000);
- $oSettings->setSettingValue('pageSizeW', $iVal);
- $this->assertEquals($iVal, $oSettings->getPageSizeW());
+ $oSettings->setSettingValue('pageSizeW', Absolute::from('twip', $iVal));
+ $this->assertEquals($iVal, $oSettings->getPageSizeW()->toFloat('twip'));
}
/**
@@ -126,10 +115,10 @@ public function testPageHeight()
// Section Settings
$oSettings = new Section();
- $this->assertEquals(Section::DEFAULT_HEIGHT, $oSettings->getPageSizeH(), '', 0.000000001);
+ $this->assertEquals(Section::DEFAULT_HEIGHT, $oSettings->getPageSizeH()->toFloat('twip'), '', 0.000000001);
$iVal = rand(1, 1000);
- $oSettings->setSettingValue('pageSizeH', $iVal);
- $this->assertEquals($iVal, $oSettings->getPageSizeH());
+ $oSettings->setSettingValue('pageSizeH', Absolute::from('twip', $iVal));
+ $this->assertEquals($iVal, $oSettings->getPageSizeH()->toInt('twip'));
}
/**
@@ -142,8 +131,8 @@ public function testOrientationLandscape()
$oSettings->setLandscape();
$this->assertEquals('landscape', $oSettings->getOrientation());
- $this->assertEquals(Section::DEFAULT_HEIGHT, $oSettings->getPageSizeW(), '', 0.000000001);
- $this->assertEquals(Section::DEFAULT_WIDTH, $oSettings->getPageSizeH(), '', 0.000000001);
+ $this->assertEquals(Section::DEFAULT_HEIGHT, $oSettings->getPageSizeW()->toFloat('twip'), '', 0.000000001);
+ $this->assertEquals(Section::DEFAULT_WIDTH, $oSettings->getPageSizeH()->toFloat('twip'), '', 0.000000001);
}
/**
@@ -156,69 +145,47 @@ public function testOrientationPortrait()
$oSettings->setPortrait();
$this->assertEquals('portrait', $oSettings->getOrientation());
- $this->assertEquals(Section::DEFAULT_WIDTH, $oSettings->getPageSizeW(), '', 0.000000001);
- $this->assertEquals(Section::DEFAULT_HEIGHT, $oSettings->getPageSizeH(), '', 0.000000001);
+ $this->assertEquals(Section::DEFAULT_WIDTH, $oSettings->getPageSizeW()->toFloat('twip'), '', 0.000000001);
+ $this->assertEquals(Section::DEFAULT_HEIGHT, $oSettings->getPageSizeH()->toFloat('twip'), '', 0.000000001);
}
/**
- * Set/get border size
+ * Test border color
*/
- public function testBorderSize()
+ public function testBorders()
{
- // Section Settings
- $oSettings = new Section();
-
- $iVal = rand(1, 1000);
- $oSettings->setBorderSize($iVal);
- $this->assertEquals(array($iVal, $iVal, $iVal, $iVal), $oSettings->getBorderSize());
- $this->assertEquals($iVal, $oSettings->getBorderBottomSize());
- $this->assertEquals($iVal, $oSettings->getBorderLeftSize());
- $this->assertEquals($iVal, $oSettings->getBorderRightSize());
- $this->assertEquals($iVal, $oSettings->getBorderTopSize());
-
- $iVal = rand(1, 1000);
- $oSettings->setBorderBottomSize($iVal);
- $this->assertEquals($iVal, $oSettings->getBorderBottomSize());
-
- $iVal = rand(1, 1000);
- $oSettings->setBorderLeftSize($iVal);
- $this->assertEquals($iVal, $oSettings->getBorderLeftSize());
-
- $iVal = rand(1, 1000);
- $oSettings->setBorderRightSize($iVal);
- $this->assertEquals($iVal, $oSettings->getBorderRightSize());
-
- $iVal = rand(1, 1000);
- $oSettings->setBorderTopSize($iVal);
- $this->assertEquals($iVal, $oSettings->getBorderTopSize());
- }
-
- /**
- * Set/get border color
- */
- public function testBorderColor()
- {
- // Section Settings
- $oSettings = new Section();
-
- $oSettings->setBorderColor('FF00AA');
- $this->assertEquals(array('FF00AA', 'FF00AA', 'FF00AA', 'FF00AA'), $oSettings->getBorderColor());
- $this->assertEquals('FF00AA', $oSettings->getBorderBottomColor());
- $this->assertEquals('FF00AA', $oSettings->getBorderLeftColor());
- $this->assertEquals('FF00AA', $oSettings->getBorderRightColor());
- $this->assertEquals('FF00AA', $oSettings->getBorderTopColor());
-
- $oSettings->setBorderBottomColor('BBCCDD');
- $this->assertEquals('BBCCDD', $oSettings->getBorderBottomColor());
-
- $oSettings->setBorderLeftColor('CCDDEE');
- $this->assertEquals('CCDDEE', $oSettings->getBorderLeftColor());
-
- $oSettings->setBorderRightColor('11EE22');
- $this->assertEquals('11EE22', $oSettings->getBorderRightColor());
-
- $oSettings->setBorderTopColor('22FF33');
- $this->assertEquals('22FF33', $oSettings->getBorderTopColor());
+ $section = new Section();
+
+ $this->assertFalse($section->hasBorder());
+ $borders = array('top', 'right', 'bottom', 'left');
+ $borderSides = array(
+ array(Absolute::from('pt', rand(1, 20)), new Hex('f93de1'), new BorderStyle('double'), Absolute::from('pt', rand(1, 20)), true),
+ array(Absolute::from('twip', rand(1, 400)), new Hex('000000'), new BorderStyle('outset'), Absolute::from('twip', rand(1, 400)), false),
+ array(Absolute::from('eop', rand(1, 160)), new Rgb(255, 0, 100), new BorderStyle('dotted'), Absolute::from('eop', rand(1, 160)), true),
+ );
+ $lastBorderSide = array(new Absolute(0), new Hex(null), new BorderStyle('single'), new Absolute(0), false);
+ foreach ($borderSides as $key => $borderSide) {
+ $newBorder = new BorderSide(...$borderSide);
+
+ foreach ($borders as $side) {
+ $currentBorder = $section->getBorder($side);
+ $this->assertEquals($lastBorderSide[0], $currentBorder->getSize(), "Size for border side #$key for side $side should match last border side still");
+ $this->assertEquals($lastBorderSide[1], $currentBorder->getColor(), "Color for border side #$key for side $side should match last border side still");
+ $this->assertEquals($lastBorderSide[2], $currentBorder->getStyle(), "Style for border side #$key for side $side should match last border side still");
+ $this->assertEquals($lastBorderSide[3], $currentBorder->getSpace(), "Space for border side #$key for side $side should match last border side still");
+ $this->assertEquals($lastBorderSide[4], $currentBorder->getShadow(), "Shadow for border side #$key for side $side should match last border side still");
+
+ $section->setBorder($side, $newBorder);
+ $updatedBorder = $section->getBorder($side);
+ $this->assertEquals($borderSide[0], $updatedBorder->getSize(), "Size for border side #$key for side $side should match new border");
+ $this->assertEquals($borderSide[1], $updatedBorder->getColor(), "Color for border side #$key for side $side should match new border");
+ $this->assertEquals($borderSide[2], $updatedBorder->getStyle(), "Style for border side #$key for side $side should match new border");
+ $this->assertEquals($borderSide[3], $updatedBorder->getSpace(), "Space for border side #$key for side $side should match new border");
+ $this->assertEquals($borderSide[4], $updatedBorder->getShadow(), "Shadow for border side #$key for side $side should match new border");
+ }
+
+ $lastBorderSide = $borderSide;
+ }
}
/**
@@ -246,14 +213,22 @@ public function testHeader()
{
$oSettings = new Section();
- $this->assertEquals(720, $oSettings->getHeaderHeight());
+ $this->assertEquals(720, $oSettings->getHeaderHeight()->toInt('twip'));
$iVal = rand(1, 1000);
- $oSettings->setHeaderHeight($iVal);
- $this->assertEquals($iVal, $oSettings->getHeaderHeight());
+ $oSettings->setHeaderHeight(Absolute::from('twip', $iVal));
+ $this->assertEquals($iVal, $oSettings->getHeaderHeight()->toInt('twip'));
+ }
+ /**
+ * Set/get header height
+ * @expectedException \TypeError
+ * @expectedExceptionMessageRegExp /^(Argument 1 passed to PhpOffice\\PhpWord\\Style\\Section::setHeaderHeight\(\) must be an instance of PhpOffice\\PhpWord\\Style\\Lengths\\Absolute, none given|Too few arguments to function PhpOffice\\PhpWord\\Style\\Section::setHeaderHeight\(\), 0 passed)/
+ */
+ public function testHeaderMissing()
+ {
+ $oSettings = new Section();
$oSettings->setHeaderHeight();
- $this->assertEquals(720, $oSettings->getHeaderHeight());
}
/**
@@ -264,14 +239,22 @@ public function testFooter()
// Section Settings
$oSettings = new Section();
- $this->assertEquals(720, $oSettings->getFooterHeight());
+ $this->assertEquals(720, $oSettings->getFooterHeight()->toInt('twip'));
$iVal = rand(1, 1000);
- $oSettings->setFooterHeight($iVal);
- $this->assertEquals($iVal, $oSettings->getFooterHeight());
+ $oSettings->setFooterHeight(Absolute::from('twip', $iVal));
+ $this->assertEquals($iVal, $oSettings->getFooterHeight()->toInt('twip'));
+ }
+ /**
+ * Set/get footer height
+ * @expectedException \TypeError
+ * @expectedExceptionMessageRegExp /^(Argument 1 passed to PhpOffice\\PhpWord\\Style\\Section::setFooterHeight\(\) must be an instance of PhpOffice\\PhpWord\\Style\\Lengths\\Absolute, none given|Too few arguments to function PhpOffice\\PhpWord\\Style\\Section::setFooterHeight\(\), 0 passed)/
+ */
+ public function testFooterEmpty()
+ {
+ $oSettings = new Section();
$oSettings->setFooterHeight();
- $this->assertEquals(720, $oSettings->getFooterHeight());
}
/**
@@ -304,14 +287,23 @@ public function testColumnsSpace()
$oSettings = new Section();
// Default
- $this->assertEquals(720, $oSettings->getColsSpace());
+ $this->assertEquals(720, $oSettings->getColsSpace()->toInt('twip'));
$iVal = rand(1, 1000);
- $this->assertInstanceOf('PhpOffice\\PhpWord\\Style\\Section', $oSettings->setColsSpace($iVal));
- $this->assertEquals($iVal, $oSettings->getColsSpace());
+ $this->assertInstanceOf('PhpOffice\\PhpWord\\Style\\Section', $oSettings->setColsSpace(Absolute::from('twip', $iVal)));
+ $this->assertEquals($iVal, $oSettings->getColsSpace()->toInt('twip'));
+ }
+ /**
+ * Set/get column spacing
+ * PHP 7.1+
+ * @expectedException \TypeError
+ * @expectedExceptionMessageRegExp /^(Argument 1 passed to PhpOffice\\PhpWord\\Style\\Section::setColsSpace\(\) must be an instance of PhpOffice\\PhpWord\\Style\\Lengths\\Absolute, none given|Too few arguments to function PhpOffice\\PhpWord\\Style\\Section::setColsSpace\(\), 0 passed)/
+ */
+ public function testColumnsSpaceEmpty()
+ {
+ $oSettings = new Section();
$this->assertInstanceOf('PhpOffice\\PhpWord\\Style\\Section', $oSettings->setColsSpace());
- $this->assertEquals(720, $oSettings->getColsSpace());
}
/**
diff --git a/tests/PhpWord/Style/ShadingTest.php b/tests/PhpWord/Style/ShadingTest.php
index 7aba03a122..b37f771e88 100644
--- a/tests/PhpWord/Style/ShadingTest.php
+++ b/tests/PhpWord/Style/ShadingTest.php
@@ -1,4 +1,5 @@
array('clear', 'solid'),
- 'color' => array(null, 'FF0000'),
- 'fill' => array(null, 'FF0000'),
+ 'color' => array(null, new Hex('FF0000')),
+ 'fill' => array(null, new Hex('FF0000')),
);
foreach ($properties as $property => $value) {
list($default, $expected) = $value;
- $get = "get{$property}";
- $set = "set{$property}";
- $this->assertEquals($default, $object->$get()); // Default value
+ $this->assertEquals($default, $this->get($object, $property)); // Default value
+
+ $this->set($object, $property, $expected);
+
+ if ($expected instanceof BasicColor) {
+ $expected = $expected->toHex();
+ }
+ $this->assertEquals($expected, $this->get($object, $property)); // New value
+ }
+ }
- $object->$set($expected);
+ private function get(Shading $object, string $property)
+ {
+ $get = "get{$property}";
- $this->assertEquals($expected, $object->$get()); // New value
+ $result = $object->$get();
+ if ($result instanceof BasicColor) {
+ $result = $result->toHex();
}
+
+ return $result;
+ }
+
+ private function set(Shading $object, string $property, $expected)
+ {
+ $set = "set$property";
+
+ return $object->$set($expected);
}
}
diff --git a/tests/PhpWord/Style/ShapeTest.php b/tests/PhpWord/Style/ShapeTest.php
new file mode 100644
index 0000000000..72b1e56d6b
--- /dev/null
+++ b/tests/PhpWord/Style/ShapeTest.php
@@ -0,0 +1,75 @@
+assertEquals(new Percent(0), $object->getRoundness());
+ }
+
+ /**
+ * @covers \PhpOffice\PhpWord\Style\Shape::setRoundness
+ * @depends testGetRoundness
+ */
+ public function testSetRoundness()
+ {
+ $shape = new Shape();
+ $this->assertEquals(new Percent(0), $shape->getRoundness());
+ $shape->setRoundness(new Percent(50));
+ $this->assertNotEquals(new Percent(0), $shape->getRoundness());
+ $this->assertEquals(new Percent(50), $shape->getRoundness());
+ }
+
+ /**
+ * @covers \PhpOffice\PhpWord\Style\Shape::setRoundness
+ * @depends testSetRoundness
+ * @expectedException \PhpOffice\PhpWord\Exception\Exception
+ * @expectedExceptionMessage Provided roundness -1.000000% must be no less than 0%
+ */
+ public function testSetRoundnessNegative()
+ {
+ $shape = new Shape();
+ $shape->setRoundness(new Percent(-1));
+ }
+
+ /**
+ * @covers \PhpOffice\PhpWord\Style\Shape::setRoundness
+ * @depends testSetRoundness
+ * @expectedException \PhpOffice\PhpWord\Exception\Exception
+ * @expectedExceptionMessage Provided roundness 101.000000% must be no greater than 100%
+ */
+ public function testSetRoundnessTooLarge()
+ {
+ $shape = new Shape();
+ $shape->setRoundness(new Percent(101));
+ }
+}
diff --git a/tests/PhpWord/Style/SpacingTest.php b/tests/PhpWord/Style/SpacingTest.php
index f7402edd12..deca6ac5ff 100644
--- a/tests/PhpWord/Style/SpacingTest.php
+++ b/tests/PhpWord/Style/SpacingTest.php
@@ -1,4 +1,5 @@
array(null, 10),
- 'after' => array(null, 10),
- 'line' => array(null, 10),
+ 'before' => array(null, Absolute::from('twip', 10)),
+ 'after' => array(null, Absolute::from('twip', 10)),
+ 'line' => array(null, Absolute::from('pt', 10)),
'lineRule' => array('auto', 'exact'),
);
foreach ($properties as $property => $value) {
@@ -41,11 +44,20 @@ public function testGetSetProperties()
$get = "get{$property}";
$set = "set{$property}";
- $this->assertEquals($default, $object->$get()); // Default value
+ $result = $object->$get();
+ if ($expected instanceof Absolute) {
+ $result = $result->toInt('twip');
+ }
+ $this->assertEquals($default, $result); // Default value
$object->$set($expected);
- $this->assertEquals($expected, $object->$get()); // New value
+ $result = $object->$get();
+ if ($expected instanceof Absolute) {
+ $expected = $expected->toInt('twip');
+ $result = $result->toInt('twip');
+ }
+ $this->assertEquals($expected, $result); // New value
}
}
}
diff --git a/tests/PhpWord/Style/TOCTest.php b/tests/PhpWord/Style/TOCTest.php
index 445c5e4315..a00d262ab4 100644
--- a/tests/PhpWord/Style/TOCTest.php
+++ b/tests/PhpWord/Style/TOCTest.php
@@ -1,4 +1,5 @@
array(TOC::TAB_LEADER_DOT, TOC::TAB_LEADER_UNDERSCORE),
- 'tabPos' => array(9062, 10),
- 'indent' => array(200, 10),
+ 'tabPos' => array(9062, Absolute::from('twip', 10)),
+ 'indent' => array(200, Absolute::from('twip', 10)),
);
foreach ($properties as $property => $value) {
list($default, $expected) = $value;
$get = "get{$property}";
$set = "set{$property}";
- $this->assertEquals($default, $object->$get()); // Default value
+ $result = $object->$get();
+ if ($result instanceof Absolute) {
+ $result = $result->toInt('twip');
+ }
+ $this->assertEquals($default, $result); // Default value
$object->$set($expected);
- $this->assertEquals($expected, $object->$get()); // New value
+ $result = $object->$get();
+ if ($expected instanceof Absolute) {
+ $expected = $expected->toInt('twip');
+ $result = $result->toInt('twip');
+ }
+
+ $this->assertEquals($expected, $result); // New value
}
}
}
diff --git a/tests/PhpWord/Style/TabTest.php b/tests/PhpWord/Style/TabTest.php
index 8d8d3f6cf0..36c003abc5 100644
--- a/tests/PhpWord/Style/TabTest.php
+++ b/tests/PhpWord/Style/TabTest.php
@@ -1,4 +1,5 @@
array(Tab::TAB_STOP_CLEAR, Tab::TAB_STOP_RIGHT),
'leader' => array(Tab::TAB_LEADER_NONE, Tab::TAB_LEADER_DOT),
- 'position' => array(0, 10),
+ 'position' => array(0, Absolute::from('twip', 10)),
);
foreach ($properties as $property => $value) {
list($default, $expected) = $value;
$get = "get{$property}";
$set = "set{$property}";
- $this->assertEquals($default, $object->$get()); // Default value
+ $result = $object->$get();
+ if ($expected instanceof Absolute) {
+ $result = $result->toInt('twip');
+ }
+ $this->assertEquals($default, $result); // Default value
$object->$set($expected);
- $this->assertEquals($expected, $object->$get()); // New value
+ $result = $object->$get();
+ if ($expected instanceof Absolute) {
+ $expected = $expected->toInt('twip');
+ $result = $result->toInt('twip');
+ }
+ $this->assertEquals($expected, $result); // New value
}
}
}
diff --git a/tests/PhpWord/Style/TablePositionTest.php b/tests/PhpWord/Style/TablePositionTest.php
index 1243c3d595..098b4e557f 100644
--- a/tests/PhpWord/Style/TablePositionTest.php
+++ b/tests/PhpWord/Style/TablePositionTest.php
@@ -1,4 +1,5 @@
TablePosition::VANCHOR_PAGE, 'bottomFromText' => 20);
+ $styleTable = array('vertAnchor' => TablePosition::VANCHOR_PAGE, 'bottomFromText' => Absolute::from('twip', 20));
$object = new TablePosition($styleTable);
$this->assertEquals(TablePosition::VANCHOR_PAGE, $object->getVertAnchor());
- $this->assertEquals(20, $object->getBottomFromText());
+ $this->assertEquals(20, $object->getBottomFromText()->toInt('twip'));
}
/**
@@ -44,22 +47,53 @@ public function testSetGetNormal()
$object = new TablePosition();
$attributes = array(
- 'leftFromText' => 4,
- 'rightFromText' => 4,
- 'topFromText' => 4,
- 'bottomFromText' => 4,
+ 'leftFromText' => Absolute::from('twip', 4),
+ 'rightFromText' => Absolute::from('twip', 4),
+ 'topFromText' => Absolute::from('twip', 4),
+ 'bottomFromText' => Absolute::from('twip', 4),
'vertAnchor' => TablePosition::VANCHOR_PAGE,
'horzAnchor' => TablePosition::HANCHOR_TEXT,
'tblpXSpec' => TablePosition::XALIGN_CENTER,
- 'tblpX' => 5,
+ 'tblpX' => Absolute::from('twip', 5),
'tblpYSpec' => TablePosition::YALIGN_OUTSIDE,
- 'tblpY' => 6,
+ 'tblpY' => Absolute::from('twip', 6),
);
foreach ($attributes as $key => $value) {
$set = "set{$key}";
$get = "get{$key}";
$object->$set($value);
- $this->assertEquals($value, $object->$get());
+ $result = $object->$get();
+ if ($value instanceof Absolute) {
+ $value = $value->toInt('twip');
+ $result = $result->toInt('twip');
+ }
+ $this->assertEquals($value, $result, "Read value for attribute $key should be the same as the written value");
+ }
+ }
+
+ /**
+ * @covers \PhpOffice\PhpWord\Style\TablePosition
+ */
+ public function testSetGetAbsolute()
+ {
+ $attributes = array(
+ 'TopFromText',
+ 'BottomFromText',
+ 'LeftFromText',
+ 'RightFromText',
+ 'TblpX',
+ 'TblpY',
+ );
+
+ $level = new TablePosition();
+ foreach ($attributes as $attribute) {
+ $get = "get$attribute";
+ $set = "set$attribute";
+
+ $this->assertEquals(new Absolute(null), $level->$get());
+ $level->$set(Absolute::from('pt', 5));
+ $this->assertNotEquals(new Absolute(null), $level->$get());
+ $this->assertEquals(Absolute::from('pt', 5), $level->$get());
}
}
}
diff --git a/tests/PhpWord/Style/TableTest.php b/tests/PhpWord/Style/TableTest.php
index 91fc35509c..0a56d80006 100644
--- a/tests/PhpWord/Style/TableTest.php
+++ b/tests/PhpWord/Style/TableTest.php
@@ -1,4 +1,5 @@
'FF0000');
- $styleFirstRow = array('borderBottomSize' => 3);
+ $styleTable = array('bgColor' => new Hex('FF0000'));
+ $styleFirstRow = array('bordersFromArray' => array(
+ 'top' => new BorderSide(Absolute::from('eop', 3)),
+ ));
$object = new Table($styleTable, $styleFirstRow);
- $this->assertEquals('FF0000', $object->getBgColor());
+ $this->assertEquals('FF0000', $object->getBgColor()->toHex());
$firstRow = $object->getFirstRow();
$this->assertInstanceOf('PhpOffice\\PhpWord\\Style\\Table', $firstRow);
- $this->assertEquals(3, $firstRow->getBorderBottomSize());
+ $this->assertEquals(3, $firstRow->getBorder('top')->getSize()->toInt('eop'));
+ $this->assertEquals(0, $firstRow->getBorder('bottom')->getSize()->toInt('eop'));
}
/**
@@ -55,10 +63,9 @@ public function testDefaultValues()
{
$object = new Table();
- $this->assertNull($object->getBgColor());
+ $this->assertNull($object->getBgColor()->toHex());
$this->assertEquals(Table::LAYOUT_AUTO, $object->getLayout());
- $this->assertEquals(TblWidth::AUTO, $object->getUnit());
- $this->assertNull($object->getIndent());
+ $this->assertInstanceOf(Auto::class, $object->getIndent());
}
/**
@@ -69,79 +76,119 @@ public function testSetGetNormal()
$object = new Table();
$attributes = array(
- 'bgColor' => 'FF0000',
- 'borderTopSize' => 4,
- 'borderTopColor' => 'FF0000',
- 'borderLeftSize' => 4,
- 'borderLeftColor' => 'FF0000',
- 'borderRightSize' => 4,
- 'borderRightColor' => 'FF0000',
- 'borderBottomSize' => 4,
- 'borderBottomColor' => 'FF0000',
- 'borderInsideHSize' => 4,
- 'borderInsideHColor' => 'FF0000',
- 'borderInsideVSize' => 4,
- 'borderInsideVColor' => 'FF0000',
- 'cellMarginTop' => 240,
- 'cellMarginLeft' => 240,
- 'cellMarginRight' => 240,
- 'cellMarginBottom' => 240,
+ 'bgColor' => new Hex('FF0000'),
+ 'cellMarginTop' => Absolute::from('eop', 240),
+ 'cellMarginLeft' => Absolute::from('eop', 240),
+ 'cellMarginRight' => Absolute::from('eop', 240),
+ 'cellMarginBottom' => Absolute::from('eop', 240),
'alignment' => JcTable::CENTER,
- 'width' => 100,
- 'unit' => 'pct',
+ 'width' => new Percent(100),
'layout' => Table::LAYOUT_FIXED,
);
foreach ($attributes as $key => $value) {
$set = "set{$key}";
$get = "get{$key}";
$object->$set($value);
- $this->assertEquals($value, $object->$get());
+ $result = $object->$get();
+ if ($result instanceof Absolute) {
+ $result = $result->toInt('eop');
+ $value = $value->toInt('eop');
+ } elseif ($result instanceof Percent) {
+ $result = $result->toInt();
+ $value = $value->toInt();
+ } elseif ($result instanceof BasicColor) {
+ $result = $result->toHex();
+ $value = $value->toHex();
+ }
+ $this->assertEquals($value, $result);
}
}
/**
- * Test border color
- *
- * Set border color and test if each part has the same color
- * While looping, push values array to be asserted with getBorderColor
+ * Test borders
*/
- public function testBorderColor()
+ public function testBorders()
{
- $object = new Table();
- $parts = array('Top', 'Left', 'Right', 'Bottom', 'InsideH', 'InsideV');
+ $table = new Table();
- $value = 'FF0000';
- $object->setBorderColor($value);
- $values = array();
- foreach ($parts as $part) {
- $get = "getBorder{$part}Color";
- $values[] = $value;
- $this->assertEquals($value, $object->$get());
+ $this->assertFalse($table->hasBorder());
+ $borders = array('top', 'bottom', 'start', 'end', 'insideH', 'insideV');
+ $borderSides = array(
+ array(Absolute::from('pt', rand(1, 20)), new Hex('f93de1'), new BorderStyle('double'), Absolute::from('pt', rand(1, 20)), true),
+ array(Absolute::from('twip', rand(1, 400)), new Hex('000000'), new BorderStyle('outset'), Absolute::from('twip', rand(1, 400)), false),
+ array(Absolute::from('eop', rand(1, 160)), new Rgb(255, 0, 100), new BorderStyle('dotted'), Absolute::from('eop', rand(1, 160)), true),
+ );
+ $lastBorderSide = array(new Absolute(0), new Hex(null), new BorderStyle('single'), new Absolute(0), false);
+ foreach ($borderSides as $key => $borderSide) {
+ $newBorder = new BorderSide(...$borderSide);
+
+ foreach ($borders as $side) {
+ $currentBorder = $table->getBorder($side);
+ $this->assertEquals($lastBorderSide[0], $currentBorder->getSize(), "Size for border side #$key for side $side should match last border side still");
+ $this->assertEquals($lastBorderSide[1], $currentBorder->getColor(), "Color for border side #$key for side $side should match last border side still");
+ $this->assertEquals($lastBorderSide[2], $currentBorder->getStyle(), "Style for border side #$key for side $side should match last border side still");
+ $this->assertEquals($lastBorderSide[3], $currentBorder->getSpace(), "Space for border side #$key for side $side should match last border side still");
+ $this->assertEquals($lastBorderSide[4], $currentBorder->getShadow(), "Shadow for border side #$key for side $side should match last border side still");
+
+ $table->setBorder($side, $newBorder);
+ $updatedBorder = $table->getBorder($side);
+ $this->assertEquals($borderSide[0], $updatedBorder->getSize(), "Size for border side #$key for side $side should match new border");
+ $this->assertEquals($borderSide[1], $updatedBorder->getColor(), "Color for border side #$key for side $side should match new border");
+ $this->assertEquals($borderSide[2], $updatedBorder->getStyle(), "Style for border side #$key for side $side should match new border");
+ $this->assertEquals($borderSide[3], $updatedBorder->getSpace(), "Space for border side #$key for side $side should match new border");
+ $this->assertEquals($borderSide[4], $updatedBorder->getShadow(), "Shadow for border side #$key for side $side should match new border");
+ }
+
+ $lastBorderSide = $borderSide;
}
- $this->assertEquals($values, $object->getBorderColor());
}
/**
- * Test border size
- *
- * Set border size and test if each part has the same size
- * While looping, push values array to be asserted with getBorderSize
- * Value is in eights of a point, i.e. 4 / 8 = .5pt
+ * Test invalid border
+ * @depends testBorders
+ * @expectedException \PhpOffice\PhpWord\Exception\Exception
+ * @expectedExceptionMessage Invalid side `badside` provided
*/
- public function testBorderSize()
+ public function testGetBorderInvalid()
{
- $object = new Table();
- $parts = array('Top', 'Left', 'Right', 'Bottom', 'InsideH', 'InsideV');
+ $table = new Table();
+ $table->getBorder('badside');
+ }
- $value = 4;
- $object->setBorderSize($value);
- $values = array();
- foreach ($parts as $part) {
- $get = "getBorder{$part}Size";
- $values[] = $value;
- $this->assertEquals($value, $object->$get());
- }
- $this->assertEquals($values, $object->getBorderSize());
+ /**
+ * Test invalid border
+ * @depends testBorders
+ * @expectedException \PhpOffice\PhpWord\Exception\Exception
+ * @expectedExceptionMessage Size must be specified
+ */
+ public function testSetBorderNullSize()
+ {
+ $table = new Table();
+ $table->getBorder('top')->setSize(new Absolute(null));
+ }
+
+ /**
+ * Test invalid border
+ * @depends testBorders
+ * @expectedException \PhpOffice\PhpWord\Exception\Exception
+ * @expectedExceptionMessage Space must be specified
+ */
+ public function testSetBorderNullSpace()
+ {
+ $table = new Table();
+ $table->getBorder('top')->setSpace(new Absolute(null));
+ }
+
+ /**
+ * Test invalid border
+ * @depends testBorders
+ * @expectedException \PhpOffice\PhpWord\Exception\Exception
+ * @expectedExceptionMessage Invalid side `badside` provided
+ */
+ public function testSetBorderInvalid()
+ {
+ $table = new Table();
+ $table->setBorder('badside', new BorderSide());
}
/**
@@ -157,14 +204,16 @@ public function testCellMargin()
$parts = array('Top', 'Left', 'Right', 'Bottom');
$value = 240;
- $object->setCellMargin($value);
+ $object->setCellMargin(Absolute::from('twip', $value));
$values = array();
foreach ($parts as $part) {
$get = "getCellMargin{$part}";
$values[] = $value;
- $this->assertEquals($value, $object->$get());
+ $this->assertEquals($value, $object->$get()->toInt('twip'));
}
- $this->assertEquals($values, $object->getCellMargin());
+ $this->assertEquals($values, array_map(function ($value) {
+ return $value->toInt('twip');
+ }, $object->getCellMargin()));
$this->assertTrue($object->hasMargin());
}
@@ -174,16 +223,22 @@ public function testCellMargin()
public function testSetStyleValue()
{
$object = new Table();
- $object->setStyleValue('borderSize', 120);
- $object->setStyleValue('cellMargin', 240);
- $object->setStyleValue('borderColor', '999999');
-
- $this->assertEquals(array(120, 120, 120, 120, 120, 120), $object->getBorderSize());
- $this->assertEquals(array(240, 240, 240, 240), $object->getCellMargin());
- $this->assertEquals(
- array('999999', '999999', '999999', '999999', '999999', '999999'),
- $object->getBorderColor()
- );
+ $object->setStyleValue('bordersFromArray', array(
+ 'top' => new BorderSide(Absolute::from('twip', 120)),
+ 'bottom' => new BorderSide(Absolute::from('twip', 120)),
+ 'start' => new BorderSide(Absolute::from('twip', 120)),
+ 'end' => new BorderSide(Absolute::from('twip', 120)),
+ 'insideH' => new BorderSide(Absolute::from('twip', 120)),
+ 'insideV' => new BorderSide(Absolute::from('twip', 120)),
+ ));
+ $object->setStyleValue('cellMargin', Absolute::from('twip', 240));
+
+ $this->assertEquals(array('top' => 120, 'bottom' => 120, 'insideH' => 120, 'insideV' => 120, 'start' => 120, 'end' => 120), array_map(function ($value) {
+ return $value->getSize()->toInt('twip');
+ }, $object->getBorders()));
+ $this->assertEquals(array(240, 240, 240, 240), array_map(function ($value) {
+ return $value->toInt('twip');
+ }, $object->getCellMargin()));
}
/**
@@ -192,10 +247,10 @@ public function testSetStyleValue()
public function testTableCellSpacing()
{
$object = new Table();
- $this->assertNull($object->getCellSpacing());
+ $this->assertNull($object->getCellSpacing()->toInt('twip'));
- $object = new Table(array('cellSpacing' => 20));
- $this->assertEquals(20, $object->getCellSpacing());
+ $object = new Table(array('cellSpacing' => Absolute::from('twip', 20)));
+ $this->assertEquals(20, $object->getCellSpacing()->toInt('twip'));
}
/**
@@ -213,7 +268,7 @@ public function testTablePosition()
public function testIndent()
{
- $indent = new TblWidthComplexType(100, TblWidth::TWIP);
+ $indent = Absolute::from('twip', 100);
$table = new Table(array('indent' => $indent));
diff --git a/tests/PhpWord/Style/TextBoxTest.php b/tests/PhpWord/Style/TextBoxTest.php
index 803189cd19..26bf205078 100644
--- a/tests/PhpWord/Style/TextBoxTest.php
+++ b/tests/PhpWord/Style/TextBoxTest.php
@@ -1,4 +1,5 @@
200,
- 'height' => 200,
+ // 'width' => Absolute::from("twip", 200),
+ // 'height' => Absolute::from("twip", 200),
'alignment' => Jc::START,
- 'marginTop' => 240,
- 'marginLeft' => 240,
+ 'marginTop' => Absolute::from('twip', 240),
+ 'marginLeft' => Absolute::from('twip', 240),
'wrappingStyle' => 'inline',
'positioning' => 'absolute',
'posHorizontal' => 'center',
'posVertical' => 'top',
'posHorizontalRel' => 'margin',
'posVerticalRel' => 'page',
- 'innerMarginTop' => '5',
- 'innerMarginRight' => '5',
- 'innerMarginBottom' => '5',
- 'innerMarginLeft' => '5',
- 'borderSize' => '2',
- 'borderColor' => 'red',
+ 'innerMarginTop' => Absolute::from('twip', 5),
+ 'innerMarginRight' => Absolute::from('twip', 5),
+ 'innerMarginBottom' => Absolute::from('twip', 5),
+ 'innerMarginLeft' => Absolute::from('twip', 5),
+ 'borderSize' => Absolute::from('twip', 2),
+ 'borderColor' => new HighlightColor('red'),
);
foreach ($properties as $key => $value) {
$set = "set{$key}";
$get = "get{$key}";
$object->$set($value);
- $this->assertEquals($value, $object->$get());
+ $result = $object->$get();
+ if ($value instanceof Absolute) {
+ try {
+ $value = $value->toInt('twip');
+ $result = $result->toInt('twip');
+ } catch (Throwable $ex) {
+ throw new Exception("Failed to convert values for property `$key`", 1, $ex);
+ }
+ }
+ $this->assertEquals($value, $result);
}
}
@@ -69,28 +83,33 @@ public function testSetStyleValue()
$object = new TextBox();
$properties = array(
- 'width' => 200,
- 'height' => 200,
+ 'width' => Absolute::from('twip', 200),
+ 'height' => Absolute::from('twip', 200),
'alignment' => Jc::START,
- 'marginTop' => 240,
- 'marginLeft' => 240,
+ 'marginTop' => Absolute::from('twip', 240),
+ 'marginLeft' => Absolute::from('twip', 240),
'wrappingStyle' => 'inline',
'positioning' => 'absolute',
'posHorizontal' => 'center',
'posVertical' => 'top',
'posHorizontalRel' => 'margin',
'posVerticalRel' => 'page',
- 'innerMarginTop' => '5',
- 'innerMarginRight' => '5',
- 'innerMarginBottom' => '5',
- 'innerMarginLeft' => '5',
- 'borderSize' => '2',
- 'borderColor' => 'red',
+ 'innerMarginTop' => Absolute::from('twip', 5),
+ 'innerMarginRight' => Absolute::from('twip', 5),
+ 'innerMarginBottom' => Absolute::from('twip', 5),
+ 'innerMarginLeft' => Absolute::from('twip', 5),
+ 'borderSize' => Absolute::from('twip', 2),
+ 'borderColor' => new HighlightColor('red'),
);
foreach ($properties as $key => $value) {
$get = "get{$key}";
$object->setStyleValue("{$key}", $value);
- $this->assertEquals($value, $object->$get());
+ $result = $object->$get();
+ if ($value instanceof Absolute) {
+ $result = $result->toInt('twip');
+ $value = $value->toInt('twip');
+ }
+ $this->assertEquals($value, $result);
}
}
@@ -112,8 +131,8 @@ public function testSetGetWidth()
{
$expected = 200;
$object = new TextBox();
- $object->setWidth($expected);
- $this->assertEquals($expected, $object->getWidth());
+ $object->setWidth(Absolute::from('twip', $expected));
+ $this->assertEquals($expected, $object->getWidth()->toInt('twip'));
}
/**
@@ -123,8 +142,8 @@ public function testSetGetHeight()
{
$expected = 200;
$object = new TextBox();
- $object->setHeight($expected);
- $this->assertEquals($expected, $object->getHeight());
+ $object->setHeight(Absolute::from('twip', $expected));
+ $this->assertEquals($expected, $object->getHeight()->toInt('twip'));
}
/**
@@ -146,8 +165,8 @@ public function testSetGetMarginTop()
{
$expected = 5;
$object = new TextBox();
- $object->setMarginTop($expected);
- $this->assertEquals($expected, $object->getMarginTop());
+ $object->setMarginTop(Absolute::from('twip', $expected));
+ $this->assertEquals($expected, $object->getMarginTop()->toInt('twip'));
}
/**
@@ -157,8 +176,8 @@ public function testSetGetMarginLeft()
{
$expected = 5;
$object = new TextBox();
- $object->setMarginLeft($expected);
- $this->assertEquals($expected, $object->getMarginLeft());
+ $object->setMarginLeft(Absolute::from('twip', $expected));
+ $this->assertEquals($expected, $object->getMarginLeft()->toInt('twip'));
}
/**
@@ -168,8 +187,8 @@ public function testSetGetInnerMarginTop()
{
$expected = 5;
$object = new TextBox();
- $object->setInnerMarginTop($expected);
- $this->assertEquals($expected, $object->getInnerMarginTop());
+ $object->setInnerMarginTop(Absolute::from('twip', $expected));
+ $this->assertEquals($expected, $object->getInnerMarginTop()->toInt('twip'));
}
/**
@@ -245,8 +264,8 @@ public function testSetGetInnerMarginRight()
{
$expected = 5;
$object = new TextBox();
- $object->setInnerMarginRight($expected);
- $this->assertEquals($expected, $object->getInnerMarginRight());
+ $object->setInnerMarginRight(Absolute::from('twip', $expected));
+ $this->assertEquals($expected, $object->getInnerMarginRight()->toInt('twip'));
}
/**
@@ -256,8 +275,8 @@ public function testSetGetInnerMarginBottom()
{
$expected = 5;
$object = new TextBox();
- $object->setInnerMarginBottom($expected);
- $this->assertEquals($expected, $object->getInnerMarginBottom());
+ $object->setInnerMarginBottom(Absolute::from('twip', $expected));
+ $this->assertEquals($expected, $object->getInnerMarginBottom()->toInt('twip'));
}
/**
@@ -267,8 +286,8 @@ public function testSetGetInnerMarginLeft()
{
$expected = 5;
$object = new TextBox();
- $object->setInnerMarginLeft($expected);
- $this->assertEquals($expected, $object->getInnerMarginLeft());
+ $object->setInnerMarginLeft(Absolute::from('twip', $expected));
+ $this->assertEquals($expected, $object->getInnerMarginLeft()->toInt('twip'));
}
/**
@@ -278,8 +297,10 @@ public function testSetGetInnerMargin()
{
$expected = 5;
$object = new TextBox();
- $object->setInnerMargin($expected);
- $this->assertEquals(array($expected, $expected, $expected, $expected), $object->getInnerMargin());
+ $object->setInnerMargin(Absolute::from('twip', $expected));
+ $this->assertEquals(array($expected, $expected, $expected, $expected), array_map(function ($value) {
+ return $value->toInt('twip');
+ }, $object->getInnerMargin()));
}
/**
@@ -289,8 +310,8 @@ public function testSetGetBorderSize()
{
$expected = 2;
$object = new TextBox();
- $object->setBorderSize($expected);
- $this->assertEquals($expected, $object->getBorderSize());
+ $object->setBorderSize(Absolute::from('twip', $expected));
+ $this->assertEquals($expected, $object->getBorderSize()->toInt('twip'));
}
/**
@@ -298,7 +319,7 @@ public function testSetGetBorderSize()
*/
public function testSetGetBorderColor()
{
- $expected = 'red';
+ $expected = new HighlightColor('red');
$object = new TextBox();
$object->setBorderColor($expected);
$this->assertEquals($expected, $object->getBorderColor());
diff --git a/tests/PhpWord/Style/Theme/BodyFontsTest.php b/tests/PhpWord/Style/Theme/BodyFontsTest.php
new file mode 100644
index 0000000000..d3d2e4dcb3
--- /dev/null
+++ b/tests/PhpWord/Style/Theme/BodyFontsTest.php
@@ -0,0 +1,107 @@
+assertEquals('Calibri', $fontScheme->getLatin());
+ $this->assertEquals('', $fontScheme->getEastAsian());
+ $this->assertEquals('', $fontScheme->getComplexScript());
+ $this->assertEquals('ＭＳ 明朝', $fontScheme->getFont('Jpan'));
+ $this->assertEquals('ＭＳ 明朝', $fontScheme->getFonts()['Jpan']);
+ }
+
+ public function testCustomLatin()
+ {
+ $fontScheme = new BodyFonts(array('Latin' => 'Custom Font'));
+
+ $this->assertEquals('Custom Font', $fontScheme->getLatin());
+ $this->assertEquals('', $fontScheme->getEastAsian());
+ $this->assertEquals('', $fontScheme->getComplexScript());
+ $this->assertEquals('ＭＳ 明朝', $fontScheme->getFont('Jpan'));
+ $this->assertEquals('ＭＳ 明朝', $fontScheme->getFonts()['Jpan']);
+ }
+
+ public function testCustomEastAsian()
+ {
+ $fontScheme = new BodyFonts(array('EastAsian' => 'Custom Font'));
+
+ $this->assertEquals('Calibri', $fontScheme->getLatin());
+ $this->assertEquals('Custom Font', $fontScheme->getEastAsian());
+ $this->assertEquals('', $fontScheme->getComplexScript());
+ $this->assertEquals('ＭＳ 明朝', $fontScheme->getFont('Jpan'));
+ $this->assertEquals('ＭＳ 明朝', $fontScheme->getFonts()['Jpan']);
+ }
+
+ public function testCustomComplexScript()
+ {
+ $fontScheme = new BodyFonts(array('ComplexScript' => 'Custom Font'));
+
+ $this->assertEquals('Calibri', $fontScheme->getLatin());
+ $this->assertEquals('', $fontScheme->getEastAsian());
+ $this->assertEquals('Custom Font', $fontScheme->getComplexScript());
+ $this->assertEquals('ＭＳ 明朝', $fontScheme->getFont('Jpan'));
+ $this->assertEquals('ＭＳ 明朝', $fontScheme->getFonts()['Jpan']);
+ }
+
+ public function testCustomFont()
+ {
+ $fontScheme = new BodyFonts(array('Jpan' => 'Custom Font'));
+
+ $this->assertEquals('Calibri', $fontScheme->getLatin());
+ $this->assertEquals('', $fontScheme->getEastAsian());
+ $this->assertEquals('', $fontScheme->getComplexScript());
+ $this->assertEquals('Custom Font', $fontScheme->getFont('Jpan'));
+ $this->assertEquals('Custom Font', $fontScheme->getFonts()['Jpan']);
+ }
+
+ /**
+ * @expectedException \Exception
+ * @expectedExceptionMessage Invalid script 'BadScript' provided
+ */
+ public function testSettingBadFont()
+ {
+ new BodyFonts(array('BadScript' => 'Custom Font'));
+ }
+
+ /**
+ * @expectedException \Exception
+ * @expectedExceptionMessage No font found for script 'BadScript' in color scheme 'PhpOffice\PhpWord\Style\Theme\BodyFonts'
+ */
+ public function testGettingBadFont()
+ {
+ $bodyFonts = new BodyFonts();
+ $bodyFonts->getFont('BadScript');
+ }
+
+ /**
+ * @expectedException \Exception
+ * @expectedExceptionMessage No font found for script 'BadScript' in color scheme 'PhpOffice\PhpWord\Style\Theme\Fonts'
+ */
+ public function testGettingBadDefaultFont()
+ {
+ HeadingFonts::getDefaultFont('BadScript');
+ }
+}
diff --git a/tests/PhpWord/Style/Theme/ColorSchemeTest.php b/tests/PhpWord/Style/Theme/ColorSchemeTest.php
new file mode 100644
index 0000000000..2e614e0b4d
--- /dev/null
+++ b/tests/PhpWord/Style/Theme/ColorSchemeTest.php
@@ -0,0 +1,154 @@
+ new SystemColor('windowText', new Hex('000')),
+ 'dk2' => new Hex('1F497D'),
+ 'lt1' => new SystemColor('window', new Hex('fff')),
+ 'lt2' => new Hex('EEECE1'),
+ 'accent1' => new Hex('4F81BD'),
+ 'accent2' => new Hex('C0504D'),
+ 'accent3' => new Hex('9BBB59'),
+ 'accent4' => new Hex('8064A2'),
+ 'accent5' => new Hex('4BACC6'),
+ 'accent6' => new Hex('F79646'),
+ 'hlink' => new Hex('0000FF'),
+ 'folHlink' => new Hex('800080'),
+ );
+ $colorScheme = new ColorScheme($colors);
+
+ foreach ($colors as $name => $color) {
+ $this->assertInstanceOf(get_class($color), $colorScheme->getColor($name));
+ $this->assertEquals($color->toHexOrName(), $colorScheme->getColor($name)->toHexOrName());
+ $this->assertEquals($color->toHexOrName(), $colorScheme->getColors()[$name]->toHexOrName());
+ }
+ }
+
+ /**
+ * @expectedException \Exception
+ * @expectedExceptionMessage 12 colors expected, but 1 colors provided
+ */
+ public function testTooFewColors()
+ {
+ new ColorScheme(array(
+ 'dk1' => new SystemColor('windowText', new Hex('000')),
+ ));
+ }
+
+ /**
+ * @expectedException \Exception
+ * @expectedExceptionMessage 12 colors expected, but 13 colors provided
+ */
+ public function testTooManyColors()
+ {
+ new ColorScheme(array(
+ 'dk1' => new SystemColor('windowText', new Hex('000')),
+ 'dk2' => new Hex('1F497D'),
+ 'dk3' => new Hex('3D5CA3'),
+ 'lt1' => new SystemColor('window', new Hex('fff')),
+ 'lt2' => new Hex('EEECE1'),
+ 'accent1' => new Hex('4F81BD'),
+ 'accent2' => new Hex('C0504D'),
+ 'accent3' => new Hex('9BBB59'),
+ 'accent4' => new Hex('8064A2'),
+ 'accent5' => new Hex('4BACC6'),
+ 'accent6' => new Hex('F79646'),
+ 'hlink' => new Hex('0000FF'),
+ 'folHlink' => new Hex('800080'),
+ ));
+ }
+
+ /**
+ * @expectedException \Exception
+ * @expectedExceptionMessage Missing 'dk2' from provided color scheme
+ */
+ public function testWrongName()
+ {
+ new ColorScheme(array(
+ 'dk1' => new SystemColor('windowText', new Hex('000')),
+ 'dk3' => new Hex('1F497D'),
+ 'lt1' => new SystemColor('window', new Hex('fff')),
+ 'lt2' => new Hex('EEECE1'),
+ 'accent1' => new Hex('4F81BD'),
+ 'accent2' => new Hex('C0504D'),
+ 'accent3' => new Hex('9BBB59'),
+ 'accent4' => new Hex('8064A2'),
+ 'accent5' => new Hex('4BACC6'),
+ 'accent6' => new Hex('F79646'),
+ 'hlink' => new Hex('0000FF'),
+ 'folHlink' => new Hex('800080'),
+ ));
+ }
+
+ /**
+ * @expectedException \Exception
+ * @expectedExceptionMessage Provided color for 'dk1' must be an instance of 'PhpOffice\PhpWord\Style\Colors\SpecialColor', 'string' provided
+ */
+ public function testSettingBadColor()
+ {
+ new ColorScheme(array(
+ 'dk1' => '000000',
+ 'dk2' => new Hex('1F497D'),
+ 'lt1' => new SystemColor('window', new Hex('fff')),
+ 'lt2' => new Hex('EEECE1'),
+ 'accent1' => new Hex('4F81BD'),
+ 'accent2' => new Hex('C0504D'),
+ 'accent3' => new Hex('9BBB59'),
+ 'accent4' => new Hex('8064A2'),
+ 'accent5' => new Hex('4BACC6'),
+ 'accent6' => new Hex('F79646'),
+ 'hlink' => new Hex('0000FF'),
+ 'folHlink' => new Hex('800080'),
+ ));
+ }
+
+ /**
+ * @expectedException \Exception
+ * @expectedExceptionMessage No color exists for 'dk3'
+ */
+ public function testGettingBadColor()
+ {
+ $colorScheme = new ColorScheme(array(
+ 'dk1' => new SystemColor('windowText', new Hex('000')),
+ 'dk2' => new Hex('1F497D'),
+ 'lt1' => new SystemColor('window', new Hex('fff')),
+ 'lt2' => new Hex('EEECE1'),
+ 'accent1' => new Hex('4F81BD'),
+ 'accent2' => new Hex('C0504D'),
+ 'accent3' => new Hex('9BBB59'),
+ 'accent4' => new Hex('8064A2'),
+ 'accent5' => new Hex('4BACC6'),
+ 'accent6' => new Hex('F79646'),
+ 'hlink' => new Hex('0000FF'),
+ 'folHlink' => new Hex('800080'),
+ ));
+ $colorScheme->getColor('dk3');
+ }
+}
diff --git a/tests/PhpWord/Style/Theme/FontSchemeTest.php b/tests/PhpWord/Style/Theme/FontSchemeTest.php
new file mode 100644
index 0000000000..01754bfe1a
--- /dev/null
+++ b/tests/PhpWord/Style/Theme/FontSchemeTest.php
@@ -0,0 +1,80 @@
+assertEquals('Office', $fontScheme->getName());
+
+ $this->assertInstanceOf(HeadingFonts::class, $fontScheme->getHeadingFonts());
+
+ $this->assertInstanceOf(BodyFonts::class, $fontScheme->getBodyFonts());
+ }
+
+ public function testCustomName()
+ {
+ $fontScheme = new FontScheme('New Name');
+
+ $this->assertEquals('New Name', $fontScheme->getName());
+ }
+
+ public function testCustomFonts()
+ {
+ $fontScheme = new FontScheme(
+ 'Custom Heading Fonts',
+ new HeadingFonts(array('Latin' => 'Custom Font')),
+ new BodyFonts(array('Latin' => 'Another Custom Font'))
+ );
+ $this->assertEquals('Custom Font', $fontScheme->getHeadingFonts()->getLatin());
+ $this->assertEquals('Another Custom Font', $fontScheme->getBodyFonts()->getLatin());
+ }
+
+ /**
+ * @expectedException \TypeError
+ * @expectedExceptionMessage Argument 2 passed to PhpOffice\PhpWord\Style\Theme\FontScheme::__construct() must be an instance of PhpOffice\PhpWord\Style\Theme\HeadingFonts
+ */
+ public function testBodyAsHeading()
+ {
+ new FontScheme(
+ 'Body as Heading',
+ new BodyFonts(),
+ new BodyFonts()
+ );
+ }
+
+ /**
+ * @expectedException \TypeError
+ * @expectedExceptionMessage Argument 3 passed to PhpOffice\PhpWord\Style\Theme\FontScheme::__construct() must be an instance of PhpOffice\PhpWord\Style\Theme\BodyFonts
+ */
+ public function testHeadingAsBody()
+ {
+ new FontScheme(
+ 'Heading as Body',
+ new HeadingFonts(),
+ new HeadingFonts()
+ );
+ }
+}
diff --git a/tests/PhpWord/Style/Theme/HeadingFontsTest.php b/tests/PhpWord/Style/Theme/HeadingFontsTest.php
new file mode 100644
index 0000000000..6911ab4f92
--- /dev/null
+++ b/tests/PhpWord/Style/Theme/HeadingFontsTest.php
@@ -0,0 +1,116 @@
+assertEquals('Cambria', $fontScheme->getLatin());
+ $this->assertEquals('', $fontScheme->getEastAsian());
+ $this->assertEquals('', $fontScheme->getComplexScript());
+ $this->assertEquals('ＭＳ ゴシック', $fontScheme->getFont('Jpan'));
+ $this->assertEquals('ＭＳ ゴシック', $fontScheme->getFonts()['Jpan']);
+ }
+
+ public function testCustomLatin()
+ {
+ $fontScheme = new HeadingFonts(array('Latin' => 'Custom Font'));
+
+ $this->assertEquals('Custom Font', $fontScheme->getLatin());
+ $this->assertEquals('', $fontScheme->getEastAsian());
+ $this->assertEquals('', $fontScheme->getComplexScript());
+ $this->assertEquals('ＭＳ ゴシック', $fontScheme->getFont('Jpan'));
+ $this->assertEquals('ＭＳ ゴシック', $fontScheme->getFonts()['Jpan']);
+ }
+
+ public function testCustomEastAsian()
+ {
+ $fontScheme = new HeadingFonts(array('EastAsian' => 'Custom Font'));
+
+ $this->assertEquals('Cambria', $fontScheme->getLatin());
+ $this->assertEquals('Custom Font', $fontScheme->getEastAsian());
+ $this->assertEquals('', $fontScheme->getComplexScript());
+ $this->assertEquals('ＭＳ ゴシック', $fontScheme->getFont('Jpan'));
+ $this->assertEquals('ＭＳ ゴシック', $fontScheme->getFonts()['Jpan']);
+ }
+
+ public function testCustomComplexScript()
+ {
+ $fontScheme = new HeadingFonts(array('ComplexScript' => 'Custom Font'));
+
+ $this->assertEquals('Cambria', $fontScheme->getLatin());
+ $this->assertEquals('', $fontScheme->getEastAsian());
+ $this->assertEquals('Custom Font', $fontScheme->getComplexScript());
+ $this->assertEquals('ＭＳ ゴシック', $fontScheme->getFont('Jpan'));
+ $this->assertEquals('ＭＳ ゴシック', $fontScheme->getFonts()['Jpan']);
+ }
+
+ public function testCustomFont()
+ {
+ $fontScheme = new HeadingFonts(array('Jpan' => 'Custom Font'));
+
+ $this->assertEquals('Cambria', $fontScheme->getLatin());
+ $this->assertEquals('', $fontScheme->getEastAsian());
+ $this->assertEquals('', $fontScheme->getComplexScript());
+ $this->assertEquals('Custom Font', $fontScheme->getFont('Jpan'));
+ $this->assertEquals('Custom Font', $fontScheme->getFonts()['Jpan']);
+ }
+
+ /**
+ * @expectedException \Exception
+ * @expectedExceptionMessage Font name expected, 'object' provided
+ */
+ public function testSettingFontWrong()
+ {
+ new HeadingFonts(array('Latin' => new HeadingFonts()));
+ }
+
+ /**
+ * @expectedException \Exception
+ * @expectedExceptionMessage Invalid script 'BadScript' provided
+ */
+ public function testSettingBadFont()
+ {
+ new HeadingFonts(array('BadScript' => 'Custom Font'));
+ }
+
+ /**
+ * @expectedException \Exception
+ * @expectedExceptionMessage No font found for script 'BadScript' in color scheme 'PhpOffice\PhpWord\Style\Theme\HeadingFonts'
+ */
+ public function testGettingBadFont()
+ {
+ $headingFonts = new HeadingFonts();
+ $headingFonts->getFont('BadScript');
+ }
+
+ /**
+ * @expectedException \Exception
+ * @expectedExceptionMessage No font found for script 'BadScript' in color scheme 'PhpOffice\PhpWord\Style\Theme\Fonts'
+ */
+ public function testGettingBadDefaultFont()
+ {
+ HeadingFonts::getDefaultFont('BadScript');
+ }
+}
diff --git a/tests/PhpWord/Style/Theme/ThemeTest.php b/tests/PhpWord/Style/Theme/ThemeTest.php
new file mode 100644
index 0000000000..88fc401ea2
--- /dev/null
+++ b/tests/PhpWord/Style/Theme/ThemeTest.php
@@ -0,0 +1,36 @@
+getColorScheme();
+ $this->assertInstanceOf(ColorScheme::class, $colorScheme);
+
+ $fontScheme = $theme->getFontScheme();
+ $this->assertInstanceOf(FontScheme::class, $fontScheme);
+ }
+}
diff --git a/tests/PhpWord/StyleTest.php b/tests/PhpWord/StyleTest.php
index cbc39c871e..816b5286f2 100644
--- a/tests/PhpWord/StyleTest.php
+++ b/tests/PhpWord/StyleTest.php
@@ -1,4 +1,5 @@
Jc::CENTER);
$font = array('italic' => true, '_bold' => true);
- $table = array('bgColor' => 'CCCCCC');
+ $table = array('bgColor' => new Hex('CCCCCC'));
$styles = array(
'Paragraph' => 'Paragraph',
'Font' => 'Font',
diff --git a/tests/PhpWord/TemplateProcessorTest.php b/tests/PhpWord/TemplateProcessorTest.php
index 4caca77aeb..a71e7b8d7c 100644
--- a/tests/PhpWord/TemplateProcessorTest.php
+++ b/tests/PhpWord/TemplateProcessorTest.php
@@ -1,4 +1,5 @@
1, 'userName' => 'Batman', 'userLocation' => 'Gotham City'),
- array('userId' => 2, 'userName' => 'Superman', 'userLocation' => 'Metropolis'),
+ array('userId' => '1', 'userName' => 'Batman', 'userLocation' => 'Gotham City'),
+ array('userId' => '2', 'userName' => 'Superman', 'userLocation' => 'Metropolis'),
);
$templateProcessor->setValue('tableHeader', 'My clonable table');
$templateProcessor->cloneRowAndSetValues('userId', $values);
@@ -310,6 +311,26 @@ public function testSetValue()
);
}
+ /**
+ * @covers ::setValue
+ * @test
+ */
+ public function testSetValueMultipleReplacements()
+ {
+ $mainPart = '
+
+
+ Hello ${firstname} ${lastname}
+
+ ';
+
+ Settings::setOutputEscapingEnabled(true);
+ $templateProcessor = new TestableTemplateProcesor($mainPart);
+ $templateProcessor->setValue(array('firstname', 'lastname'), array('Jane', 'Doe'));
+
+ $this->assertContains('Hello Jane Doe', $templateProcessor->getMainPart());
+ }
+
public function testSetComplexValue()
{
$title = new TextRun();
@@ -382,6 +403,82 @@ public function testSetValues()
$this->assertContains('Hello John Doe', $templateProcessor->getMainPart());
}
+ /**
+ * @covers \PhpOffice\PhpWord\TemplateProcessor::getSlice
+ */
+ public function testGetSlice()
+ {
+ $mainPart = '
+
+
+ Hello ${firstname} ${lastname}
+
+ ';
+
+ $stub = new TestableTemplateProcesor($mainPart);
+ $this->assertEquals(substr($mainPart, 0, 1), $stub->getSlice(0, 1));
+ $this->assertEquals(substr($mainPart, 1, 1), $stub->getSlice(1, 2));
+ $this->assertEquals(substr($mainPart, 1, 182), $stub->getSlice(1, 183));
+ $this->assertEquals(substr($mainPart, 0, 183), $stub->getSlice(0, 183));
+ }
+
+ /**
+ * @depends testGetSlice
+ * @covers \PhpOffice\PhpWord\TemplateProcessor::getSlice
+ * @expectedException \PhpOffice\PhpWord\Exception\Exception
+ * @expectedExceptionMessage Start position must be at least 0. `-1` provided
+ */
+ public function testGetSliceNegative()
+ {
+ $mainPart = '
+
+
+ Hello ${firstname} ${lastname}
+
+ ';
+
+ $stub = new TestableTemplateProcesor($mainPart);
+ $stub->getSlice(-1);
+ }
+
+ /**
+ * @depends testGetSlice
+ * @covers \PhpOffice\PhpWord\TemplateProcessor::getSlice
+ * @expectedException \PhpOffice\PhpWord\Exception\Exception
+ * @expectedExceptionMessage Provided end position `5` is smaller than the start position `9`
+ */
+ public function testGetSliceFlipped()
+ {
+ $mainPart = '
+
+
+ Hello ${firstname} ${lastname}
+
+ ';
+
+ $stub = new TestableTemplateProcesor($mainPart);
+ $stub->getSlice(9, 5);
+ }
+
+ /**
+ * @depends testGetSlice
+ * @covers \PhpOffice\PhpWord\TemplateProcessor::getSlice
+ * @expectedException \PhpOffice\PhpWord\Exception\Exception
+ * @expectedExceptionMessage Provided end position `184` is longer than the length `183`
+ */
+ public function testGetSliceLong()
+ {
+ $mainPart = '
+
+
+ Hello ${firstname} ${lastname}
+
+ ';
+
+ $stub = new TestableTemplateProcesor($mainPart);
+ $stub->getSlice(0, 184);
+ }
+
/**
* @covers ::setImageValue
* @test
@@ -394,7 +491,7 @@ public function testSetImageValue()
$variablesReplace = array(
'headerValue' => $imagePath,
'documentContent' => array('path' => $imagePath, 'width' => 500, 'height' => 500),
- 'footerValue' => array('path' => $imagePath, 'width' => 100, 'height' => 50, 'ratio' => false),
+ 'footerValue' => array('path' => $imagePath, 'width' => 100, 'height' => 50, 'ratio' => null),
);
$templateProcessor->setImageValue(array_keys($variablesReplace), $variablesReplace);
@@ -844,4 +941,18 @@ public function testShouldMakeFieldsUpdateOnOpen()
$templateProcessor->setUpdateFields(false);
$this->assertContains('', $templateProcessor->getSettingsPart());
}
+
+ /**
+ * Helper function to call protected method
+ *
+ * @param string $method
+ */
+ public static function callProtectedMethod($object, $method, array $args = array())
+ {
+ $class = new \ReflectionClass(get_class($object));
+ $method = $class->getMethod($method);
+ $method->setAccessible(true);
+
+ return $method->invokeArgs($object, $args);
+ }
}
diff --git a/tests/PhpWord/Writer/HTML/ElementTest.php b/tests/PhpWord/Writer/HTML/ElementTest.php
index 101e226f50..70404e3573 100644
--- a/tests/PhpWord/Writer/HTML/ElementTest.php
+++ b/tests/PhpWord/Writer/HTML/ElementTest.php
@@ -1,4 +1,5 @@
addSection();
$table = $section->addTable();
$row1 = $table->addRow();
- $cell11 = $row1->addCell(1000, array('gridSpan' => 2, 'bgColor' => '6086B8'));
+ $cell11 = $row1->addCell(Absolute::from('twip', 1000), array('gridSpan' => 2, 'bgColor' => new Hex('6086B8')));
$cell11->addText('cell spanning 2 bellow');
$row2 = $table->addRow();
- $cell21 = $row2->addCell(500, array('bgColor' => 'ffffff'));
+ $cell21 = $row2->addCell(Absolute::from('twip', 500), array('bgColor' => new Hex('ffffff')));
$cell21->addText('first cell');
- $cell22 = $row2->addCell(500);
+ $cell22 = $row2->addCell(Absolute::from('twip', 500));
$cell22->addText('second cell');
$dom = $this->getAsHTML($phpWord);
@@ -102,8 +105,8 @@ public function testWriteColSpan()
$this->assertEquals(2, $xpath->query('/html/body/table/tr[2]/td')->length);
$this->assertEquals('#6086B8', $xpath->query('/html/body/table/tr[1]/td')->item(0)->attributes->getNamedItem('bgcolor')->textContent);
- $this->assertEquals('#ffffff', $xpath->query('/html/body/table/tr[1]/td')->item(0)->attributes->getNamedItem('color')->textContent);
- $this->assertEquals('#ffffff', $xpath->query('/html/body/table/tr[2]/td')->item(0)->attributes->getNamedItem('bgcolor')->textContent);
+ $this->assertEquals('#FFFFFF', $xpath->query('/html/body/table/tr[1]/td')->item(0)->attributes->getNamedItem('color')->textContent);
+ $this->assertEquals('#FFFFFF', $xpath->query('/html/body/table/tr[2]/td')->item(0)->attributes->getNamedItem('bgcolor')->textContent);
$this->assertNull($xpath->query('/html/body/table/tr[2]/td')->item(0)->attributes->getNamedItem('color'));
}
@@ -117,16 +120,16 @@ public function testWriteRowSpan()
$table = $section->addTable();
$row1 = $table->addRow();
- $row1->addCell(1000, array('vMerge' => 'restart'))->addText('row spanning 3 bellow');
- $row1->addCell(500)->addText('first cell being spanned');
+ $row1->addCell(Absolute::from('twip', 1000), array('vMerge' => 'restart'))->addText('row spanning 3 bellow');
+ $row1->addCell(Absolute::from('twip', 500))->addText('first cell being spanned');
$row2 = $table->addRow();
$row2->addCell(null, array('vMerge' => 'continue'));
- $row2->addCell(500)->addText('second cell being spanned');
+ $row2->addCell(Absolute::from('twip', 500))->addText('second cell being spanned');
$row3 = $table->addRow();
$row3->addCell(null, array('vMerge' => 'continue'));
- $row3->addCell(500)->addText('third cell being spanned');
+ $row3->addCell(Absolute::from('twip', 500))->addText('third cell being spanned');
$dom = $this->getAsHTML($phpWord);
$xpath = new \DOMXPath($dom);
diff --git a/tests/PhpWord/Writer/HTML/PartTest.php b/tests/PhpWord/Writer/HTML/PartTest.php
index f83034143c..edb179f2da 100644
--- a/tests/PhpWord/Writer/HTML/PartTest.php
+++ b/tests/PhpWord/Writer/HTML/PartTest.php
@@ -1,4 +1,5 @@
addTitleStyle(1, array('bold' => true));
$phpWord->addFontStyle(
'Font',
- array('name' => 'Verdana', 'size' => 11, 'color' => 'FF0000', 'fgColor' => 'FF0000')
+ array('name' => 'Verdana', 'size' => Absolute::from('pt', 11), 'color' => new Hex('FF0000'))
);
- $phpWord->addParagraphStyle('Paragraph', array('alignment' => Jc::CENTER, 'spaceAfter' => 20, 'spaceBefore' => 20));
+ $phpWord->addParagraphStyle('Paragraph', array('alignment' => Jc::CENTER, 'spaceAfter' => Absolute::from('eop', 20), 'spaceBefore' => Absolute::from('eop', 20)));
$section = $phpWord->addSection();
$section->addBookmark('top');
$section->addText(htmlspecialchars('Test 1', ENT_COMPAT, 'UTF-8'), 'Font', 'Paragraph');
diff --git a/tests/PhpWord/Writer/ODText/ElementTest.php b/tests/PhpWord/Writer/ODText/ElementTest.php
index 37f0d1ef52..12b7579e28 100644
--- a/tests/PhpWord/Writer/ODText/ElementTest.php
+++ b/tests/PhpWord/Writer/ODText/ElementTest.php
@@ -1,4 +1,5 @@
setCustomProperty('Company', 'PHPWord');
$phpWord->setDefaultFontName('Verdana');
- $phpWord->addFontStyle('Font', array('size' => 11));
+ $phpWord->addFontStyle('Font', array('size' => Absolute::from('pt', 11)));
$phpWord->addParagraphStyle('Paragraph', array('alignment' => Jc::CENTER));
- $phpWord->addTableStyle('tblStyle', array('width' => 100));
+ $phpWord->addTableStyle('tblStyle', array('width' => Absolute::from('twip', 100)));
$section = $phpWord->addSection(array('colsNum' => 2));
$section->addText($expected);
@@ -65,14 +67,14 @@ public function testWriteContent()
$section->addTextBreak();
$section->addPageBreak();
$section->addListItem('Test list item');
- $section->addImage($imageSrc, array('width' => 50));
+ $section->addImage($imageSrc, array('width' => Absolute::from('twip', 50)));
$section->addObject($objectSrc);
$section->addTOC();
$textrun = $section->addTextRun();
$textrun->addText('Test text run');
- $table = $section->addTable(array('width' => 50));
+ $table = $section->addTable(array('width' => Absolute::from('twip', 50)));
$cell = $table->addRow()->addCell();
$cell = $table->addRow()->addCell();
$cell->addText('Test');
@@ -102,7 +104,7 @@ public function testWriteContent()
public function testWriteNoStyle()
{
$phpWord = new PhpWord();
- $phpWord->addFontStyle('Font', array('size' => 11));
+ $phpWord->addFontStyle('Font', array('size' => Absolute::from('pt', 11)));
$doc = TestHelperDOCX::getDocument($phpWord, 'ODText');
diff --git a/tests/PhpWord/Writer/ODText/Style/TableTest.php b/tests/PhpWord/Writer/ODText/Style/TableTest.php
new file mode 100644
index 0000000000..35933cca04
--- /dev/null
+++ b/tests/PhpWord/Writer/ODText/Style/TableTest.php
@@ -0,0 +1,99 @@
+ array(
+ new Auto(),
+ Absolute::from('in', 1),
+ new Percent(15),
+ ),
+ )));
+ $table->write();
+
+ $this->assertEquals("\n \n\n\n \n\n\n \n\n\n \n\n", $xmlWriter->getData());
+ }
+
+ /**
+ * Test wrong type of column width
+ * @expectedException \Exception
+ * @expectedExceptionMessage Column widths must be specified with `PhpOffice\PhpWord\Style\Lengths\Length`
+ */
+ public function testWrongColumnWidthType()
+ {
+ new Table(new XMLWriter(), new TableStyle(array(
+ 'ColumnWidths' => array(
+ '5pt',
+ ),
+ )));
+ }
+
+ /**
+ * Test wrong type of column width
+ * @expectedException \Exception
+ * @expectedExceptionMessage Unsupported width `class@anonymous
+ */
+ public function testWrongColumnWidthClass()
+ {
+ $table = new Table(new XMLWriter(), new TableStyle(array(
+ 'ColumnWidths' => array(
+ new class() extends Length {
+ public function isSpecified(): bool
+ {
+ return true;
+ }
+ },
+ ),
+ )));
+ $table->write();
+ }
+
+ /**
+ * Test wrong type of style
+ * @expectedException \Exception
+ * @expectedExceptionMessage Incorrect value provided for style. PhpOffice\PhpWord\Style\Table expected, PhpOffice\PhpWord\Style\Row provided
+ */
+ public function testWrongStyle()
+ {
+ $xmlWriter = new XMLWriter();
+ $table = new Table($xmlWriter, new RowStyle());
+ $table->write();
+
+ $this->assertEquals('', $xmlWriter->getData());
+ }
+}
diff --git a/tests/PhpWord/Writer/ODText/StyleTest.php b/tests/PhpWord/Writer/ODText/StyleTest.php
index b1bf417d59..54931c276d 100644
--- a/tests/PhpWord/Writer/ODText/StyleTest.php
+++ b/tests/PhpWord/Writer/ODText/StyleTest.php
@@ -1,4 +1,5 @@
addFontStyle('Font', array('size' => 11));
+ $phpWord->addFontStyle('Font', array('size' => Absolute::from('pt', 11)));
$phpWord->addParagraphStyle('Paragraph', array('alignment' => Jc::CENTER));
$section = $phpWord->addSection();
$section->addText('Test 1', 'Font');
diff --git a/tests/PhpWord/Writer/PDF/DomPDFTest.php b/tests/PhpWord/Writer/PDF/DomPDFTest.php
index bc229d5186..4768c978e8 100644
--- a/tests/PhpWord/Writer/PDF/DomPDFTest.php
+++ b/tests/PhpWord/Writer/PDF/DomPDFTest.php
@@ -1,4 +1,5 @@
setSizes(array(1, 2, 3, 4));
- $border->setColors(array('#FF0000', '#FF0000', '#FF0000', '#FF0000'));
- $border->setSizes(array(20, 20, 20, 20));
+ $border->setBorder('top', new BorderSide(
+ Absolute::from('pt', 1),
+ new Hex('FF0000'),
+ null,
+ Absolute::from('twip', 20)
+ ));
+ $border->setBorder('left', new BorderSide(
+ Absolute::from('pt', 1),
+ new Hex('FF0000'),
+ null,
+ Absolute::from('twip', 20)
+ ));
+ $border->setBorder('right', new BorderSide(
+ Absolute::from('pt', 1),
+ new Hex('FF0000'),
+ null,
+ Absolute::from('twip', 20)
+ ));
+ $border->setBorder('bottom', new BorderSide(
+ Absolute::from('pt', 1),
+ new Hex('FF0000'),
+ null,
+ Absolute::from('twip', 20)
+ ));
$content = $border->write();
@@ -61,9 +86,9 @@ public function testBorderWithNonRegisteredColors()
public function testIndentation()
{
$indentation = new \PhpOffice\PhpWord\Style\Indentation();
- $indentation->setLeft(1);
- $indentation->setRight(2);
- $indentation->setFirstLine(3);
+ $indentation->setLeft(Absolute::from('twip', 1));
+ $indentation->setRight(Absolute::from('twip', 2));
+ $indentation->setFirstLine(Absolute::from('twip', 3));
$indentWriter = new \PhpOffice\PhpWord\Writer\RTF\Style\Indentation($indentation);
$indentWriter->setParentWriter(new RTF());
@@ -76,7 +101,7 @@ public function testRightTab()
{
$tabRight = new \PhpOffice\PhpWord\Style\Tab();
$tabRight->setType(\PhpOffice\PhpWord\Style\Tab::TAB_STOP_RIGHT);
- $tabRight->setPosition(5);
+ $tabRight->setPosition(Absolute::from('twip', 5));
$tabWriter = new \PhpOffice\PhpWord\Writer\RTF\Style\Tab($tabRight);
$tabWriter->setParentWriter(new RTF());
diff --git a/tests/PhpWord/Writer/RTFTest.php b/tests/PhpWord/Writer/RTFTest.php
index 010720bd12..a18a4c2dee 100644
--- a/tests/PhpWord/Writer/RTFTest.php
+++ b/tests/PhpWord/Writer/RTFTest.php
@@ -1,4 +1,5 @@
addFontStyle(
'Font',
- array('name' => 'Verdana', 'size' => 11, 'color' => 'FF0000', 'fgColor' => '00FF00')
+ array('name' => 'Verdana', 'size' => Absolute::from('pt', 11), 'color' => new Hex('FF0000'))
);
$phpWord->addParagraphStyle('Paragraph', array('alignment' => Jc::CENTER));
$section = $phpWord->addSection();
diff --git a/tests/PhpWord/Writer/Word2007/ElementTest.php b/tests/PhpWord/Writer/Word2007/ElementTest.php
index 6a295965f7..9a12af4ae9 100644
--- a/tests/PhpWord/Writer/Word2007/ElementTest.php
+++ b/tests/PhpWord/Writer/Word2007/ElementTest.php
@@ -1,4 +1,5 @@
addSection();
- $section->addLine(array('width' => 1000, 'height' => 1000, 'positioning' => 'absolute', 'flip' => true));
+ $section->addLine(array('width' => Absolute::from('pt', 1000), 'height' => Absolute::from('pt', 1000), 'positioning' => 'absolute', 'flip' => true));
$doc = TestHelperDOCX::getDocument($phpWord);
$element = '/w:document/w:body/w:p/w:r/w:pict/v:shapetype';
@@ -121,11 +125,11 @@ public function testTableElements()
$section = $phpWord->addSection();
$table = $section->addTable(array('alignment' => \PhpOffice\PhpWord\SimpleType\JcTable::CENTER));
- $table->addRow(900);
- $table->addCell(2000)->addText('Row 1');
- $table->addCell(2000)->addText('Row 2');
- $table->addCell(2000)->addText('Row 3');
- $table->addCell(2000)->addText('Row 4');
+ $table->addRow(Absolute::from('twip', 900));
+ $table->addCell(Absolute::from('twip', 2000))->addText('Row 1');
+ $table->addCell(Absolute::from('twip', 2000))->addText('Row 2');
+ $table->addCell(Absolute::from('twip', 2000))->addText('Row 3');
+ $table->addCell(Absolute::from('twip', 2000))->addText('Row 4');
$doc = TestHelperDOCX::getDocument($phpWord);
@@ -144,8 +148,8 @@ public function testTableWithStyleName()
$section = $phpWord->addSection();
$table = $section->addTable('my_predefined_style');
- $table->setWidth(75);
- $table->addRow(900);
+ $table->setWidth(Absolute::from('twip', 75));
+ $table->addRow(Absolute::from('twip', 900));
$doc = TestHelperDOCX::getDocument($phpWord);
@@ -167,8 +171,8 @@ public function testShapeElements()
'arc',
array(
'points' => '-90 20',
- 'frame' => array('width' => 120, 'height' => 120),
- 'outline' => array('color' => '#333333', 'weight' => 2, 'startArrow' => 'oval', 'endArrow' => 'open'),
+ 'frame' => array('width' => Absolute::from('pt', 120), 'height' => Absolute::from('pt', 120)),
+ 'outline' => array('color' => new Hex('333333'), 'weight' => Absolute::from('pt', 2), 'startArrow' => 'oval', 'endArrow' => 'open'),
)
);
@@ -176,10 +180,11 @@ public function testShapeElements()
$section->addShape(
'curve',
array(
- 'points' => '1,100 200,1 1,50 200,50', 'connector' => 'elbow',
- 'outline' => array(
- 'color' => '#66cc00',
- 'weight' => 2,
+ 'points' => '1,100 200,1 1,50 200,50',
+ 'connector' => 'elbow',
+ 'outline' => array(
+ 'color' => new Hex('66cc00'),
+ 'weight' => Absolute::from('emu', 2),
'dash' => 'dash',
'startArrow' => 'diamond',
'endArrow' => 'block',
@@ -193,9 +198,9 @@ public function testShapeElements()
array(
'points' => '1,1 150,30',
'outline' => array(
- 'color' => '#cc00ff',
+ 'color' => new Hex('cc00ff'),
'line' => 'thickThin',
- 'weight' => 3,
+ 'weight' => Absolute::from('emu', 3),
'startArrow' => 'oval',
'endArrow' => 'classic',
'endCap' => 'round',
@@ -209,8 +214,8 @@ public function testShapeElements()
array(
'points' => '1,30 20,10 55,20 75,10 100,40 115,50, 120,15 200,50',
'outline' => array(
- 'color' => '#cc6666',
- 'weight' => 2,
+ 'color' => new Hex('cc6666'),
+ 'weight' => Absolute::from('emu', 2),
'startArrow' => 'none',
'endArrow' => 'classic',
),
@@ -221,11 +226,11 @@ public function testShapeElements()
$section->addShape(
'rect',
array(
- 'roundness' => 0.2,
- 'frame' => array('width' => 100, 'height' => 100, 'left' => 1, 'top' => 1),
- 'fill' => array('color' => '#FFCC33'),
- 'outline' => array('color' => '#990000', 'weight' => 1),
- 'shadow' => array('color' => '#EEEEEE', 'offset' => '3pt,3pt'),
+ 'roundness' => new Percent(20),
+ 'frame' => array('width' => Absolute::from('pt', 100), 'height' => Absolute::from('pt', 100), 'left' => Absolute::from('pt', 1), 'top' => Absolute::from('pt', 1)),
+ 'fill' => array('color' => new Hex('FFCC33')),
+ 'outline' => array('color' => new Hex('990000'), 'weight' => Absolute::from('emu', 1)),
+ 'shadow' => array('color' => new Hex('EEEEEE'), 'offset' => '3pt,3pt'),
)
);
@@ -233,10 +238,10 @@ public function testShapeElements()
$section->addShape(
'oval',
array(
- 'frame' => array('width' => 100, 'height' => 70, 'left' => 1, 'top' => 1),
- 'fill' => array('color' => '#33CC99'),
- 'outline' => array('color' => '#333333', 'weight' => 2),
- 'extrusion' => array('type' => 'perspective', 'color' => '#EEEEEE'),
+ 'frame' => array('width' => Absolute::from('pt', 100), 'height' => Absolute::from('pt', 70), 'left' => Absolute::from('pt', 1), 'top' => Absolute::from('pt', 1)),
+ 'fill' => array('color' => new Hex('33CC99')),
+ 'outline' => array('color' => new Hex('333333'), 'weight' => Absolute::from('emu', 2)),
+ 'extrusion' => array('type' => 'perspective', 'color' => new Hex('EEEEEE')),
)
);
@@ -256,7 +261,7 @@ public function testChartElements()
{
$phpWord = new PhpWord();
$section = $phpWord->addSection();
- $style = array('width' => 1000000, 'height' => 1000000, 'showAxisLabels' => true, 'showGridX' => true, 'showGridY' => true);
+ $style = array('width' => Absolute::from('emu', 1000000), 'height' => Absolute::from('emu', 1000000), 'showAxisLabels' => true, 'showGridX' => true, 'showGridY' => true);
$chartTypes = array('pie', 'doughnut', 'bar', 'line', 'area', 'scatter', 'radar');
$categories = array('A', 'B', 'C', 'D', 'E');
@@ -476,8 +481,8 @@ public function testTrackChange()
public function testTitleAndHeading()
{
$phpWord = new PhpWord();
- $phpWord->addTitleStyle(0, array('size' => 14, 'italic' => true));
- $phpWord->addTitleStyle(1, array('size' => 20, 'color' => '333333', 'bold' => true));
+ $phpWord->addTitleStyle(0, array('size' => Absolute::from('pt', 14), 'italic' => true));
+ $phpWord->addTitleStyle(1, array('size' => Absolute::from('pt', 20), 'color' => new Hex('333333'), 'bold' => true));
$section = $phpWord->addSection();
$section->addTitle('This is a title', 0);
@@ -517,7 +522,7 @@ public function testTextWithAmpersant()
public function testListItemRunStyleWriting()
{
$phpWord = new PhpWord();
- $phpWord->addParagraphStyle('MyParagraphStyle', array('spaceBefore' => 400));
+ $phpWord->addParagraphStyle('MyParagraphStyle', array('spaceBefore' => Absolute::from('twip', 400)));
$section = $phpWord->addSection();
$listItemRun = $section->addListItemRun(0, null, 'MyParagraphStyle');
diff --git a/tests/PhpWord/Writer/Word2007/Part/AbstractPartTest.php b/tests/PhpWord/Writer/Word2007/Part/AbstractPartTest.php
index fac94882d2..e580ba116b 100644
--- a/tests/PhpWord/Writer/Word2007/Part/AbstractPartTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/AbstractPartTest.php
@@ -1,4 +1,5 @@
getStyle();
$style->setLandscape();
$style->setPageNumberingStart(2);
- $style->setBorderSize(240);
+ $style->setBorders(new BorderSide(Absolute::from('eop', 240)));
$style->setBreakType('nextPage');
$doc = TestHelperDOCX::getDocument($phpWord);
@@ -126,8 +131,8 @@ public function testElements()
$objectSrc = __DIR__ . '/../../../_files/documents/sheet.xls';
$phpWord = new PhpWord();
- $phpWord->addTitleStyle(1, array('color' => '333333', 'bold' => true));
- $phpWord->addTitleStyle(2, array('color' => '666666'));
+ $phpWord->addTitleStyle(1, array('color' => new Colors\Hex('333333'), 'bold' => true));
+ $phpWord->addTitleStyle(2, array('color' => new Colors\Hex('666666')));
$section = $phpWord->addSection();
$section->addTOC();
$section->addPageBreak();
@@ -147,9 +152,9 @@ public function testElements()
'positioning' => 'relative',
'posHorizontalRel' => 'margin',
'posVerticalRel' => 'margin',
- 'innerMargin' => 10,
- 'borderSize' => 1,
- 'borderColor' => '#FF0',
+ 'innerMargin' => Absolute::from('eop', 10),
+ 'borderSize' => Absolute::from('eop', 1),
+ 'borderColor' => new Colors\Hex('FF0'),
)
);
$section->addTextBox(array('wrappingStyle' => 'tight', 'positioning' => 'absolute', 'alignment' => Jc::CENTER));
@@ -172,13 +177,13 @@ public function testElements()
$section->addField('PAGE', array('format' => 'ArabicDash'));
$section->addLine(
array(
- 'width' => 10,
- 'height' => 10,
+ 'width' => Absolute::from('eop', 10),
+ 'height' => Absolute::from('eop', 10),
'positioning' => 'absolute',
'beginArrow' => 'block',
'endArrow' => 'open',
'dash' => 'rounddot',
- 'weight' => 10,
+ 'weight' => Absolute::from('eop', 10),
)
);
@@ -214,30 +219,30 @@ public function testElementStyles()
{
$objectSrc = __DIR__ . '/../../../_files/documents/sheet.xls';
- $tabs = array(new \PhpOffice\PhpWord\Style\Tab('right', 9090));
+ $tabs = array(new \PhpOffice\PhpWord\Style\Tab('right', Absolute::from('twip', 9090)));
$phpWord = new PhpWord();
$phpWord->addParagraphStyle(
'pStyle',
array(
'alignment' => Jc::CENTER,
'tabs' => $tabs,
- 'shading' => array('fill' => 'FFFF99'),
- 'borderSize' => 4,
+ 'shading' => array('fill' => new Colors\Hex('FFFF99')),
+ 'borderSize' => Absolute::from('eop', 4),
)
); // Style #1
$phpWord->addFontStyle(
'fStyle',
array(
- 'size' => '20',
+ 'size' => Absolute::from('pt', 20),
'bold' => true,
'allCaps' => true,
- 'scale' => 200,
- 'spacing' => 240,
- 'kerning' => 10,
+ 'scale' => new Percent(200),
+ 'spacing' => Absolute::from('pt', 240),
+ 'kerning' => Absolute::from('pt', 10),
)
); // Style #2
- $phpWord->addTitleStyle(1, array('color' => '333333', 'doubleStrikethrough' => true)); // Style #3
- $phpWord->addTableStyle('tStyle', array('borderSize' => 1));
+ $phpWord->addTitleStyle(1, array('color' => new Colors\Hex('333333'), 'doubleStrikethrough' => true)); // Style #3
+ $phpWord->addTableStyle('tStyle', array('borderSize' => Absolute::from('eop', 1)));
$fontStyle = new Font('text', array('alignment' => Jc::CENTER));
$section = $phpWord->addSection();
@@ -247,7 +252,7 @@ public function testElementStyles()
$section->addTitle('Title 1', 1);
$section->addTOC('fStyle');
$table = $section->addTable('tStyle');
- $table->setWidth(100);
+ $table->setWidth(Absolute::from('eop', 100));
$doc = TestHelperDOCX::getDocument($phpWord);
// List item
@@ -275,7 +280,7 @@ public function testWriteText()
$phpWord = new PhpWord();
$phpWord->addFontStyle($rStyle, array('bold' => true));
- $phpWord->addParagraphStyle($pStyle, array('hanging' => 120, 'indent' => 120));
+ $phpWord->addParagraphStyle($pStyle, array('hanging' => Absolute::from('eop', 120), 'indent' => Absolute::from('eop', 120)));
$section = $phpWord->addSection();
$section->addText('Test', $rStyle, $pStyle);
$doc = TestHelperDOCX::getDocument($phpWord);
@@ -292,7 +297,7 @@ public function testWriteText()
public function testWriteTextRun()
{
$pStyle = 'pStyle';
- $aStyle = array('alignment' => Jc::BOTH, 'spaceBefore' => 120, 'spaceAfter' => 120);
+ $aStyle = array('alignment' => Jc::BOTH, 'spaceBefore' => Absolute::from('eop', 120), 'spaceAfter' => Absolute::from('eop', 120));
$imageSrc = __DIR__ . '/../../../_files/images/earth.jpg';
$phpWord = new PhpWord();
@@ -363,8 +368,8 @@ public function testWritePreserveText()
*/
public function testWriteTextBreak()
{
- $fArray = array('size' => 12);
- $pArray = array('spacing' => 240);
+ $fArray = array('size' => Absolute::from('pt', 12));
+ $pArray = array('spacing' => Absolute::from('twip', 240));
$fName = 'fStyle';
$pName = 'pStyle';
@@ -389,7 +394,7 @@ public function testWriteTextBreak()
public function testWriteImage()
{
$phpWord = new PhpWord();
- $styles = array('alignment' => Jc::START, 'width' => 40, 'height' => 40, 'marginTop' => -1, 'marginLeft' => -1);
+ $styles = array('alignment' => Jc::START, 'width' => Absolute::from('eop', 40), 'height' => Absolute::from('eop', 40), 'marginTop' => Absolute::from('eop', -1), 'marginLeft' => Absolute::from('eop', -1));
$wraps = array('inline', 'behind', 'infront', 'square', 'tight');
$section = $phpWord->addSection();
foreach ($wraps as $wrap) {
@@ -437,7 +442,7 @@ public function testWriteWatermark()
public function testWriteTitle()
{
$phpWord = new PhpWord();
- $phpWord->addTitleStyle(1, array('bold' => true), array('spaceAfter' => 240));
+ $phpWord->addTitleStyle(1, array('bold' => true), array('spaceAfter' => Absolute::from('eop', 240)));
$phpWord->addSection()->addTitle('Test', 1);
$doc = TestHelperDOCX::getDocument($phpWord);
@@ -454,8 +459,8 @@ public function testWriteCheckbox()
$pStyle = 'pStyle';
$phpWord = new PhpWord();
- // $phpWord->addFontStyle($rStyle, array('bold' => true));
- // $phpWord->addParagraphStyle($pStyle, array('hanging' => 120, 'indent' => 120));
+ $phpWord->addFontStyle($rStyle, array('bold' => true));
+ $phpWord->addParagraphStyle($pStyle, array('hanging' => Absolute::from('eop', 120), 'indent' => Absolute::from('eop', 120)));
$section = $phpWord->addSection();
$section->addCheckBox('Check1', 'Test', $rStyle, $pStyle);
$doc = TestHelperDOCX::getDocument($phpWord);
@@ -505,15 +510,15 @@ public function testWriteFontStyle()
{
$phpWord = new PhpWord();
$styles['name'] = 'Verdana';
- $styles['size'] = 14;
+ $styles['size'] = Absolute::from('pt', 14);
$styles['bold'] = true;
$styles['italic'] = true;
$styles['underline'] = 'dash';
$styles['strikethrough'] = true;
$styles['superScript'] = true;
- $styles['color'] = 'FF0000';
- $styles['fgColor'] = 'yellow';
- $styles['bgColor'] = 'FFFF00';
+ $styles['color'] = new Colors\Hex('FF0000');
+ $styles['fgColor'] = new Colors\HighlightColor('yellow');
+ $styles['bgColor'] = new Colors\Hex('FFFF00');
$styles['hint'] = 'eastAsia';
$styles['smallCaps'] = true;
@@ -523,26 +528,28 @@ public function testWriteFontStyle()
$parent = '/w:document/w:body/w:p/w:r/w:rPr';
$this->assertEquals($styles['name'], $doc->getElementAttribute("{$parent}/w:rFonts", 'w:ascii'));
- $this->assertEquals($styles['size'] * 2, $doc->getElementAttribute("{$parent}/w:sz", 'w:val'));
+ $this->assertEquals($styles['size']->toInt('hpt'), $doc->getElementAttribute("{$parent}/w:sz", 'w:val'));
$this->assertTrue($doc->elementExists("{$parent}/w:b"));
$this->assertTrue($doc->elementExists("{$parent}/w:i"));
$this->assertEquals($styles['underline'], $doc->getElementAttribute("{$parent}/w:u", 'w:val'));
$this->assertTrue($doc->elementExists("{$parent}/w:strike"));
$this->assertEquals('superscript', $doc->getElementAttribute("{$parent}/w:vertAlign", 'w:val'));
- $this->assertEquals($styles['color'], $doc->getElementAttribute("{$parent}/w:color", 'w:val'));
- $this->assertEquals($styles['fgColor'], $doc->getElementAttribute("{$parent}/w:highlight", 'w:val'));
+ $this->assertEquals($styles['color']->toHexOrName(), $doc->getElementAttribute("{$parent}/w:color", 'w:val'));
+ $this->assertEquals($styles['fgColor']->toHexOrName(), $doc->getElementAttribute("{$parent}/w:highlight", 'w:val'));
$this->assertTrue($doc->elementExists("{$parent}/w:smallCaps"));
}
/**
- * Tests that if no color is set on a cell a border gets writen with the default color
+ * Tests that if no color is set on a cell a border gets writen with auto color
*/
public function testWriteDefaultColor()
{
$phpWord = new PhpWord();
$section = $phpWord->addSection();
- $cStyles['borderTopSize'] = 120;
+ $cStyles['bordersFromArray'] = array(
+ 'top' => new BorderSide(Absolute::from('eop', 120)),
+ );
$table = $section->addTable();
$table->addRow();
@@ -550,7 +557,7 @@ public function testWriteDefaultColor()
$cell->addText('Test');
$doc = TestHelperDOCX::getDocument($phpWord);
- $this->assertEquals(Cell::DEFAULT_BORDER_COLOR, $doc->getElementAttribute('/w:document/w:body/w:tbl/w:tr/w:tc/w:tcPr/w:tcBorders/w:top', 'w:color'));
+ $this->assertEquals('auto', $doc->getElementAttribute('/w:document/w:body/w:tbl/w:tr/w:tc/w:tcPr/w:tcBorders/w:top', 'w:color'));
}
/**
@@ -559,34 +566,34 @@ public function testWriteDefaultColor()
public function testWriteTableStyle()
{
$phpWord = new PhpWord();
- $rHeight = 120;
- $cWidth = 120;
+ $rHeight = Absolute::from('eop', 120);
+ $cWidth = Absolute::from('eop', 120);
$imageSrc = __DIR__ . '/../../../_files/images/earth.jpg';
$objectSrc = __DIR__ . '/../../../_files/documents/sheet.xls';
- $tStyles['width'] = 50;
- $tStyles['cellMarginTop'] = 120;
- $tStyles['cellMarginRight'] = 120;
- $tStyles['cellMarginBottom'] = 120;
- $tStyles['cellMarginLeft'] = 120;
+ $tStyles['width'] = Absolute::from('eop', 50);
+ $tStyles['cellMarginTop'] = Absolute::from('eop', 120);
+ $tStyles['cellMarginRight'] = Absolute::from('eop', 120);
+ $tStyles['cellMarginBottom'] = Absolute::from('eop', 120);
+ $tStyles['cellMarginLeft'] = Absolute::from('eop', 120);
$rStyles['tblHeader'] = true;
$rStyles['cantSplit'] = true;
$cStyles['valign'] = 'top';
$cStyles['textDirection'] = 'btLr';
- $cStyles['bgColor'] = 'FF0000';
- $cStyles['borderTopSize'] = 120;
- $cStyles['borderBottomSize'] = 120;
- $cStyles['borderLeftSize'] = 120;
- $cStyles['borderRightSize'] = 120;
- $cStyles['borderTopColor'] = 'FF0000';
- $cStyles['borderBottomColor'] = 'FF0000';
- $cStyles['borderLeftColor'] = 'FF0000';
- $cStyles['borderRightColor'] = 'FF0000';
+ $cStyles['bgColor'] = new Colors\Hex('FF0000');
+ $cStyles['borderTopSize'] = Absolute::from('eop', 120);
+ $cStyles['borderBottomSize'] = Absolute::from('eop', 120);
+ $cStyles['borderLeftSize'] = Absolute::from('eop', 120);
+ $cStyles['borderRightSize'] = Absolute::from('eop', 120);
+ $cStyles['borderTopColor'] = new Colors\Hex('FF0000');
+ $cStyles['borderBottomColor'] = new Colors\Hex('FF0000');
+ $cStyles['borderLeftColor'] = new Colors\Hex('FF0000');
+ $cStyles['borderRightColor'] = new Colors\Hex('FF0000');
$cStyles['vMerge'] = 'restart';
$section = $phpWord->addSection();
$table = $section->addTable($tStyles);
- $table->setWidth(100);
+ $table->setWidth(Absolute::from('eop', 100));
$table->addRow($rHeight, $rStyles);
$cell = $table->addCell($cWidth, $cStyles);
$cell->addText('Test');
@@ -603,12 +610,12 @@ public function testWriteTableStyle()
$parent = '/w:document/w:body/w:tbl/w:tblPr/w:tblCellMar';
$parent = '/w:document/w:body/w:tbl/w:tr/w:trPr';
- $this->assertEquals($rHeight, $doc->getElementAttribute("{$parent}/w:trHeight", 'w:val'));
+ $this->assertEquals($rHeight->toInt('twip'), $doc->getElementAttribute("{$parent}/w:trHeight", 'w:val'));
$this->assertEquals($rStyles['tblHeader'], $doc->getElementAttribute("{$parent}/w:tblHeader", 'w:val'));
$this->assertEquals($rStyles['cantSplit'], $doc->getElementAttribute("{$parent}/w:cantSplit", 'w:val'));
$parent = '/w:document/w:body/w:tbl/w:tr/w:tc/w:tcPr';
- $this->assertEquals($cWidth, $doc->getElementAttribute("{$parent}/w:tcW", 'w:w'));
+ $this->assertEquals($cWidth->toInt('twip'), $doc->getElementAttribute("{$parent}/w:tcW", 'w:w'));
$this->assertEquals($cStyles['valign'], $doc->getElementAttribute("{$parent}/w:vAlign", 'w:val'));
$this->assertEquals($cStyles['textDirection'], $doc->getElementAttribute("{$parent}/w:textDirection", 'w:val'));
}
@@ -624,18 +631,18 @@ public function testWriteCellStyleCellGridSpan()
$table = $section->addTable();
$table->addRow();
- $cell = $table->addCell(200);
+ $cell = $table->addCell(Absolute::from('eop', 200));
$cell->getStyle()->setGridSpan(5);
$table->addRow();
- $table->addCell(40);
- $table->addCell(40);
- $table->addCell(40);
- $table->addCell(40);
- $table->addCell(40);
+ $table->addCell(Absolute::from('eop', 40));
+ $table->addCell(Absolute::from('eop', 40));
+ $table->addCell(Absolute::from('eop', 40));
+ $table->addCell(Absolute::from('eop', 40));
+ $table->addCell(Absolute::from('eop', 40));
$table->addRow();
- $cell = $table->addCell(200, array('borderRightColor' => 'FF0000'));
+ $cell = $table->addCell(Absolute::from('eop', 200), array('borderRightColor' => new Colors\Hex('FF0000')));
$cell->getStyle()->setGridSpan(5);
$doc = TestHelperDOCX::getDocument($phpWord);
@@ -653,7 +660,7 @@ public function testWriteGutterAndLineNumbering()
$lineNumberingPath = '/w:document/w:body/w:sectPr/w:lnNumType';
$phpWord = new PhpWord();
- $phpWord->addSection(array('gutter' => 240, 'lineNumbering' => array()));
+ $phpWord->addSection(array('gutter' => Absolute::from('twip', 240), 'lineNumbering' => array()));
$doc = TestHelperDOCX::getDocument($phpWord);
$this->assertEquals(240, $doc->getElement($pageMarginPath)->getAttribute('w:gutter'));
diff --git a/tests/PhpWord/Writer/Word2007/Part/FooterTest.php b/tests/PhpWord/Writer/Word2007/Part/FooterTest.php
index 1f9bba0dd0..45158202ac 100644
--- a/tests/PhpWord/Writer/Word2007/Part/FooterTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/FooterTest.php
@@ -1,4 +1,5 @@
addText('');
- $container->addPreserveText('');
- $container->addTextBreak();
- $container->addTextRun();
+ // $container->addText('');
+ // $container->addPreserveText('');
+ // $container->addTextBreak();
+ // $container->addTextRun();
$container->addTable()->addRow()->addCell()->addText('');
- $container->addImage($imageSrc);
-
+ // $container->addImage($imageSrc);
+ //
$writer = new Word2007();
- $writer->setUseDiskCaching(true);
+ // $writer->setUseDiskCaching(true);
$object = new Footer();
$object->setParentWriter($writer);
$object->setElement($container);
diff --git a/tests/PhpWord/Writer/Word2007/Part/FootnotesTest.php b/tests/PhpWord/Writer/Word2007/Part/FootnotesTest.php
index 4b0e94df30..3ce9169a39 100644
--- a/tests/PhpWord/Writer/Word2007/Part/FootnotesTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/FootnotesTest.php
@@ -1,4 +1,5 @@
'space',
'text' => '%1.',
'alignment' => Jc::START,
- 'left' => 360,
- 'hanging' => 360,
- 'tabPos' => 360,
+ 'left' => Absolute::from('twip', 360),
+ 'hanging' => Absolute::from('twip', 360),
+ 'tabPos' => Absolute::from('twip', 360),
'font' => 'Arial',
'hint' => 'default',
),
diff --git a/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php b/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
index 8a21e827cd..f75102716b 100644
--- a/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
@@ -1,4 +1,5 @@
getSettings()->setHyphenationZone(100);
+ $phpWord->getSettings()->setHyphenationZone(Absolute::from('twip', 100));
$doc = TestHelperDOCX::getDocument($phpWord);
diff --git a/tests/PhpWord/Writer/Word2007/Part/StylesTest.php b/tests/PhpWord/Writer/Word2007/Part/StylesTest.php
index 91f371841d..6afe207448 100644
--- a/tests/PhpWord/Writer/Word2007/Part/StylesTest.php
+++ b/tests/PhpWord/Writer/Word2007/Part/StylesTest.php
@@ -1,4 +1,5 @@
Jc::BOTH);
$pBase = array('basedOn' => 'Normal');
$pNew = array('basedOn' => 'Base Style', 'next' => 'Normal');
- $rStyle = array('size' => 20);
- $tStyle = array('bgColor' => 'FF0000', 'cellMargin' => 120, 'borderSize' => 120);
- $firstRowStyle = array('bgColor' => '0000FF', 'borderSize' => 120, 'borderColor' => '00FF00');
+ $rStyle = array('size' => Absolute::from('pt', 20));
+ $tStyle = array('bgColor' => new Colors\Hex('FF0000'), 'cellMargin' => Absolute::from('eop', 120), 'borderSize' => Absolute::from('eop', 120));
+ $firstRowStyle = array('bgColor' => new Colors\Hex('0000FF'), 'borderSize' => Absolute::from('eop', 120), 'borderColor' => new Colors\Hex('00FF00'));
$phpWord->setDefaultParagraphStyle($pStyle);
$phpWord->addParagraphStyle('Base Style', $pBase);
$phpWord->addParagraphStyle('New Style', $pNew);
@@ -88,11 +91,11 @@ public function testFontStyleBasedOn()
$childFont = new Font();
$childFont->setParagraph($baseParagraphStyle);
- $childFont->setSize(16);
+ $childFont->setSize(Absolute::from('pt', 16));
$childFont = $phpWord->addFontStyle('ChildFontStyle', $childFont);
$otherFont = new Font();
- $otherFont->setSize(20);
+ $otherFont->setSize(Absolute::from('pt', 20));
$otherFont = $phpWord->addFontStyle('OtherFontStyle', $otherFont);
$doc = TestHelperDOCX::getDocument($phpWord);
@@ -124,7 +127,7 @@ public function testFontStyleBasedOnOtherFontStyle()
$styleGeneration = new Font();
$styleGeneration->setParagraph($styleGenerationP);
- $styleGeneration->setSize(9.5);
+ $styleGeneration->setSize(Absolute::from('pt', 9.5));
$phpWord->addFontStyle('Generation', $styleGeneration);
$styleGenerationEteinteP = new Paragraph();
@@ -132,7 +135,7 @@ public function testFontStyleBasedOnOtherFontStyle()
$styleGenerationEteinte = new Font();
$styleGenerationEteinte->setParagraph($styleGenerationEteinteP);
- $styleGenerationEteinte->setSize(8.5);
+ $styleGenerationEteinte->setSize(Absolute::from('pt', 8.5));
$phpWord->addFontStyle('GeneratEteinte', $styleGenerationEteinte);
$doc = TestHelperDOCX::getDocument($phpWord);
diff --git a/tests/PhpWord/Writer/Word2007/PartTest.php b/tests/PhpWord/Writer/Word2007/PartTest.php
index 277f61e1be..7158047aca 100644
--- a/tests/PhpWord/Writer/Word2007/PartTest.php
+++ b/tests/PhpWord/Writer/Word2007/PartTest.php
@@ -1,4 +1,5 @@
setWidth(Absolute::from('twip', 10.3));
+ $width = $cellStyle->getWidth();
+ $this->assertInstanceOf(Absolute::class, $width);
+ $this->assertEquals($width->toFloat('twip'), 10.3);
+
+ $cellStyle->setWidth(Absolute::from('twip', 0));
+ $width = $cellStyle->getWidth();
+ $this->assertInstanceOf(Absolute::class, $width);
+ $this->assertEquals($width->toInt('twip'), 0);
+
+ $cellStyle->setWidth(new Percent(10));
+ $width = $cellStyle->getWidth();
+ $this->assertInstanceOf(Percent::class, $width);
+ $this->assertEquals($width->toInt(), 10);
+
+ $cellStyle->setWidth(new Percent(0));
+ $width = $cellStyle->getWidth();
+ $this->assertInstanceOf(Percent::class, $width);
+ $this->assertEquals($width->toInt(), 0);
+
+ $cellStyle->setWidth(new Auto());
+ $width = $cellStyle->getWidth();
+ $this->assertInstanceOf(Auto::class, $width);
+ }
+
+ /**
+ * @covers \PhpOffice\PhpWord\Writer\Word2007\Style\Cell
+ * @expectedException \Exception
+ * @expectedExceptionMessage Unsupported width `class@anonymous
+ */
+ public function testSetBadWidth()
+ {
+ $phpWord = new \PhpOffice\PhpWord\PhpWord();
+ $section = $phpWord->addSection();
+ $table = $section->addTable(new Table());
+ $row = $table->addRow();
+ $cellStyle = new CellStyle();
+ $cellStyle->setWidth(new class() extends Length {
+ public function isSpecified(): bool
+ {
+ return true;
+ }
+ });
+ $row->addCell(null, $cellStyle);
+
+ TestHelperDOCX::getDocument($phpWord, 'Word2007');
+ }
+
+ public function testWidth()
+ {
+ $widths = array(
+ array(Absolute::from('twip', 10.3), 'dxa', 10.3),
+ array(Absolute::from('twip', 0), 'nil', null),
+ array(new Percent(50), 'pct', '50%'),
+ array(new Percent(0), 'nil', null),
+ array(new Auto(), 'auto', null),
+ );
+
+ $phpWord = new \PhpOffice\PhpWord\PhpWord();
+ $section = $phpWord->addSection();
+ $table = $section->addTable(new Table());
+ $row = $table->addRow();
+ foreach ($widths as $info) {
+ list($width, $expectedType, $expectedWidth) = $info;
+ $cellStyle = new CellStyle();
+ $cellStyle->setWidth($width);
+ $row->addCell(null, $cellStyle);
+ }
+
+ $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
+
+ $cellId = 0;
+ foreach ($widths as $info) {
+ $cellId += 1;
+ list($width, $expectedType, $expectedWidth) = $info;
+ $message = get_class($width) . ' expecting [' . $expectedType . ', ' . $expectedWidth . '] should be valid';
+ $path = '/w:document/w:body/w:tbl/w:tr/w:tc[' . $cellId . ']/w:tcPr/w:tcW';
+ $this->assertTrue($doc->elementExists($path), $message);
+ $this->assertEquals($expectedType, $doc->getElementAttribute($path, 'w:type'), $message);
+ $this->assertEquals($expectedWidth, $doc->getElementAttribute($path, 'w:w'), $message);
+ }
+ }
+
+ public function testSetBgColor()
+ {
+ $colors = array(
+ new Hex('0a1b2c'),
+ new HighlightColor('yellow'),
+ new Rgb(134, 230, 9),
+ new ThemeColor('dk1'),
+ );
+
+ $cellStyle = new CellStyle();
+
+ foreach ($colors as $color) {
+ $cellStyle->setBgColor($color);
+ $bgColor = $cellStyle->getBgColor();
+ $this->assertEquals($color->toHexOrName(), $bgColor->toHexOrName());
+ }
+ }
+
+ /**
+ * @expectedException \TypeError
+ * @expectedExceptionMessage Argument 1 passed to PhpOffice\PhpWord\Style\Cell::setBgColor() must be an instance of PhpOffice\PhpWord\Style\Colors\BasicColor, instance of PhpOffice\PhpWord\Style\Colors\SystemColor given
+ */
+ public function testSetBgColorSystemColor()
+ {
+ $cellStyle = new CellStyle();
+ $cellStyle->setBgColor(new SystemColor('window', new Hex('123456')));
+ }
+
+ public function testBgColor()
+ {
+ $colors = array(
+ new Hex('0a1b2c'),
+ new HighlightColor('yellow'),
+ new Rgb(134, 230, 9),
+ new ThemeColor('dk1'),
+ );
+
+ $phpWord = new \PhpOffice\PhpWord\PhpWord();
+ $section = $phpWord->addSection();
+ $table = $section->addTable(new Table());
+ $row = $table->addRow();
+ foreach ($colors as $color) {
+ $cellStyle = new CellStyle();
+ $cellStyle->setBgColor($color);
+ $row->addCell(null, $cellStyle);
+ }
+
+ $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
+
+ $cellId = 0;
+ foreach ($colors as $color) {
+ $cellId += 1;
+ $message = get_class($color) . '(' . $color->toHexOrName() . ') should be valid';
+ $path = '/w:document/w:body/w:tbl/w:tr/w:tc[' . $cellId . ']/w:tcPr/w:shd';
+ $this->assertTrue($doc->elementExists($path), $message);
+ $this->assertEquals('clear', $doc->getElementAttribute($path, 'w:val'), $message);
+ $this->assertEquals($color->toHexOrName(), $doc->getElementAttribute($path, 'w:fill'), $message);
+ }
+ }
+}
diff --git a/tests/PhpWord/Writer/Word2007/Style/FontTest.php b/tests/PhpWord/Writer/Word2007/Style/FontTest.php
index ccfffbfb01..431fc52f40 100644
--- a/tests/PhpWord/Writer/Word2007/Style/FontTest.php
+++ b/tests/PhpWord/Writer/Word2007/Style/FontTest.php
@@ -1,4 +1,5 @@
addSection();
- $section->addText('This text is lowered', array('position' => -20));
+ $section->addText('This text is lowered', array('position' => Absolute::from('hpt', -20)));
$doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
$path = '/w:document/w:body/w:p/w:r/w:rPr/w:position';
diff --git a/tests/PhpWord/Writer/Word2007/Style/ImageTest.php b/tests/PhpWord/Writer/Word2007/Style/ImageTest.php
index efa0a10534..120d35958e 100644
--- a/tests/PhpWord/Writer/Word2007/Style/ImageTest.php
+++ b/tests/PhpWord/Writer/Word2007/Style/ImageTest.php
@@ -1,4 +1,5 @@
Image::WRAP_INLINE,
- 'wrapDistanceLeft' => 10,
- 'wrapDistanceRight' => 20,
- 'wrapDistanceTop' => 30,
- 'wrapDistanceBottom' => 40,
+ 'wrapDistanceLeft' => Absolute::from('pt', 10),
+ 'wrapDistanceRight' => Absolute::from('pt', 20),
+ 'wrapDistanceTop' => Absolute::from('pt', 30),
+ 'wrapDistanceBottom' => Absolute::from('pt', 40),
);
$phpWord = new \PhpOffice\PhpWord\PhpWord();
@@ -61,9 +63,9 @@ public function testWrapping()
$this->assertTrue($doc->elementExists($path));
$style = $doc->getElement($path)->getAttribute('style');
$this->assertNotNull($style);
- $this->assertContains('mso-wrap-distance-left:10pt;', $style);
- $this->assertContains('mso-wrap-distance-right:20pt;', $style);
- $this->assertContains('mso-wrap-distance-top:30pt;', $style);
- $this->assertContains('mso-wrap-distance-bottom:40pt;', $style);
+ $this->assertContains('mso-wrap-distance-left:13px;', $style);
+ $this->assertContains('mso-wrap-distance-right:27px;', $style);
+ $this->assertContains('mso-wrap-distance-top:40px;', $style);
+ $this->assertContains('mso-wrap-distance-bottom:53px;', $style);
}
}
diff --git a/tests/PhpWord/Writer/Word2007/Style/ParagraphTest.php b/tests/PhpWord/Writer/Word2007/Style/ParagraphTest.php
index 843f98807f..6a72fa54c5 100644
--- a/tests/PhpWord/Writer/Word2007/Style/ParagraphTest.php
+++ b/tests/PhpWord/Writer/Word2007/Style/ParagraphTest.php
@@ -1,4 +1,5 @@
addParagraphStyle('testStyle', array('indent' => '10'));
+ $phpWord->addParagraphStyle('testStyle', array('indent' => Absolute::from('twip', 10)));
$section = $phpWord->addSection();
$section->addText('test', null, array('numStyle' => 'testStyle', 'numLevel' => '1'));
$doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
@@ -55,7 +60,7 @@ public function testLineSpacingExact()
{
$phpWord = new \PhpOffice\PhpWord\PhpWord();
$section = $phpWord->addSection();
- $section->addText('test', null, array('spacing' => 240, 'spacingLineRule' => 'exact'));
+ $section->addText('test', null, array('spacing' => Absolute::from('twip', 240), 'spacingLineRule' => 'exact'));
$doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
$path = '/w:document/w:body/w:p/w:pPr/w:spacing';
@@ -68,7 +73,7 @@ public function testLineSpacingAuto()
{
$phpWord = new \PhpOffice\PhpWord\PhpWord();
$section = $phpWord->addSection();
- $section->addText('test', null, array('spacing' => 240, 'spacingLineRule' => 'auto'));
+ $section->addText('test', null, array('spacing' => Absolute::from('twip', 240), 'spacingLineRule' => 'auto'));
$doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
$path = '/w:document/w:body/w:p/w:pPr/w:spacing';
@@ -90,4 +95,78 @@ public function testSuppressAutoHyphens()
$path = '/w:document/w:body/w:p/w:pPr/w:suppressAutoHyphens';
$this->assertTrue($doc->elementExists($path));
}
+
+ public function testDefaultNoBorders()
+ {
+ $paragraphStyle = new ParagraphStyle();
+
+ $phpWord = new \PhpOffice\PhpWord\PhpWord();
+ $section = $phpWord->addSection();
+ $section->addText('test', null, $paragraphStyle);
+ $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
+
+ $path = '/w:document/w:body/w:p/w:pPr';
+ $this->assertTrue($doc->elementExists($path));
+ $this->assertFalse($doc->elementExists("$path/w:pBdr"));
+ }
+
+ public function testDefaultBorders()
+ {
+ $paragraphStyle = new ParagraphStyle();
+ $paragraphStyle->setBorders(new BorderSide(Absolute::from('pt', 1)));
+
+ $phpWord = new \PhpOffice\PhpWord\PhpWord();
+ $section = $phpWord->addSection();
+ $section->addText('test', null, $paragraphStyle);
+ $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
+
+ $path = '/w:document/w:body/w:p/w:pPr/w:pBdr';
+ $this->assertTrue($doc->elementExists($path));
+ $sides = array(
+ 'top',
+ 'bottom',
+ 'left',
+ 'right',
+ );
+ foreach ($sides as $side) {
+ $sidePath = "$path/w:$side";
+ $this->assertTrue($doc->elementExists($sidePath));
+ $this->assertEquals('single', $doc->getElementAttribute($sidePath, 'w:val'), "$side was not set properly");
+ $this->assertEquals('8', $doc->getElementAttribute($sidePath, 'w:sz'), "$side was not set properly");
+ $this->assertEquals('auto', $doc->getElementAttribute($sidePath, 'w:color'), "$side was not set properly");
+ $this->assertEquals('false', $doc->getElementAttribute($sidePath, 'w:shadow'), "$side was not set properly");
+ }
+ }
+
+ public function testBorders()
+ {
+ $paragraphStyle = new ParagraphStyle();
+ $paragraphStyle->setBorders(new BorderSide(
+ Absolute::from('pt', 1),
+ new Rgb(255, 0, 0),
+ new BorderStyle('double')
+ ));
+
+ $phpWord = new \PhpOffice\PhpWord\PhpWord();
+ $section = $phpWord->addSection();
+ $section->addText('test', null, $paragraphStyle);
+ $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
+
+ $path = '/w:document/w:body/w:p/w:pPr/w:pBdr';
+ $this->assertTrue($doc->elementExists($path));
+ $sides = array(
+ 'top',
+ 'bottom',
+ 'left',
+ 'right',
+ );
+ foreach ($sides as $side) {
+ $sidePath = "$path/w:$side";
+ $this->assertTrue($doc->elementExists($sidePath));
+ $this->assertEquals('double', $doc->getElementAttribute($sidePath, 'w:val'), "$side was not set properly");
+ $this->assertEquals('8', $doc->getElementAttribute($sidePath, 'w:sz'), "$side was not set properly");
+ $this->assertEquals('FF0000', $doc->getElementAttribute($sidePath, 'w:color'), "$side was not set properly");
+ $this->assertEquals('false', $doc->getElementAttribute($sidePath, 'w:shadow'), "$side was not set properly");
+ }
+ }
}
diff --git a/tests/PhpWord/Writer/Word2007/Style/TableTest.php b/tests/PhpWord/Writer/Word2007/Style/TableTest.php
index 8e5cb63415..4792d9aa15 100644
--- a/tests/PhpWord/Writer/Word2007/Style/TableTest.php
+++ b/tests/PhpWord/Writer/Word2007/Style/TableTest.php
@@ -1,4 +1,5 @@
assertEquals(Table::LAYOUT_FIXED, $doc->getElementAttribute($path, 'w:type'));
}
+ /**
+ * Test write styles
+ * @expectedException \Exception
+ * @expectedExceptionMessage Unsupported width `class@anonymous
+ */
+ public function testWidths()
+ {
+ $widths = array(
+ array(new Auto(), 'auto', null),
+ array(Absolute::from('twip', 54), 'dxa', 54),
+ array(new Absolute(0), 'nil', ''),
+ array(new Percent(50), 'pct', 50),
+
+ // Invalid class must be last
+ array(new class() extends Length {
+ public function isSpecified(): bool
+ {
+ return true;
+ }
+ }, null, null),
+ );
+ foreach ($widths as $info) {
+ list($width, $expectedType, $expectedWidth) = $info;
+
+ $tableStyle = new Table();
+ $tableStyle->setWidth($width);
+
+ $phpWord = new \PhpOffice\PhpWord\PhpWord();
+ $section = $phpWord->addSection();
+ $table = $section->addTable($tableStyle);
+ $table->addRow();
+
+ $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
+
+ $path = '/w:document/w:body/w:tbl/w:tblPr/w:tblW';
+ $this->assertTrue($doc->elementExists($path));
+ $this->assertEquals($expectedType, $doc->getElementAttribute($path, 'w:type'));
+ $this->assertEquals($expectedWidth, $doc->getElementAttribute($path, 'w:w'));
+ }
+ }
+
/**
* Test write styles
*/
public function testCellSpacing()
{
$tableStyle = new Table();
- $tableStyle->setCellSpacing(10.3);
+ $tableStyle->setCellSpacing(Absolute::from('twip', 10.3));
$phpWord = new \PhpOffice\PhpWord\PhpWord();
$section = $phpWord->addSection();
@@ -77,7 +121,6 @@ public function testCellSpacing()
$path = '/w:document/w:body/w:tbl/w:tblPr/w:tblCellSpacing';
$this->assertTrue($doc->elementExists($path));
$this->assertEquals(10.3, $doc->getElementAttribute($path, 'w:w'));
- $this->assertEquals(TblWidth::TWIP, $doc->getElementAttribute($path, 'w:type'));
}
/**
@@ -86,16 +129,16 @@ public function testCellSpacing()
public function testTablePosition()
{
$tablePosition = array(
- 'leftFromText' => 10,
- 'rightFromText' => 20,
- 'topFromText' => 30,
- 'bottomFromText' => 40,
+ 'leftFromText' => Absolute::from('twip', 10),
+ 'rightFromText' => Absolute::from('twip', 20),
+ 'topFromText' => Absolute::from('twip', 30),
+ 'bottomFromText' => Absolute::from('twip', 40),
'vertAnchor' => TablePosition::VANCHOR_PAGE,
'horzAnchor' => TablePosition::HANCHOR_MARGIN,
'tblpXSpec' => TablePosition::XALIGN_CENTER,
- 'tblpX' => 50,
+ 'tblpX' => Absolute::from('twip', 50),
'tblpYSpec' => TablePosition::YALIGN_TOP,
- 'tblpY' => 60,
+ 'tblpY' => Absolute::from('twip', 60),
);
$tableStyle = new Table();
$tableStyle->setPosition($tablePosition);
@@ -124,10 +167,9 @@ public function testTablePosition()
public function testIndent()
{
$value = 100;
- $type = TblWidth::TWIP;
$tableStyle = new Table();
- $tableStyle->setIndent(new TblWidthComplexType($value, $type));
+ $tableStyle->setIndent(Absolute::from('twip', $value));
$phpWord = new \PhpOffice\PhpWord\PhpWord();
$section = $phpWord->addSection();
@@ -139,10 +181,10 @@ public function testIndent()
$path = '/w:document/w:body/w:tbl/w:tblPr/w:tblInd';
$this->assertTrue($doc->elementExists($path));
$this->assertSame($value, (int) $doc->getElementAttribute($path, 'w:w'));
- $this->assertSame($type, $doc->getElementAttribute($path, 'w:type'));
+ $this->assertSame('dxa', $doc->getElementAttribute($path, 'w:type'));
}
- public function testRigthToLeft()
+ public function testRightToLeft()
{
$tableStyle = new Table();
$tableStyle->setBidiVisual(true);
diff --git a/tests/PhpWord/Writer/Word2007/StyleTest.php b/tests/PhpWord/Writer/Word2007/StyleTest.php
index 48cff8713a..650eaf2919 100644
--- a/tests/PhpWord/Writer/Word2007/StyleTest.php
+++ b/tests/PhpWord/Writer/Word2007/StyleTest.php
@@ -1,4 +1,5 @@
addFontStyle('Font', array('size' => 11));
+ $phpWord->addFontStyle('Font', array('size' => Absolute::from('pt', 11)));
$phpWord->addParagraphStyle('Paragraph', array('alignment' => Jc::CENTER));
$section = $phpWord->addSection();
$section->addText('Test 1', 'Font', 'Paragraph');
diff --git a/tests/PhpWord/_files/broken-phpword.ini b/tests/PhpWord/_files/broken-phpword.ini
new file mode 100644
index 0000000000..c16f404428
--- /dev/null
+++ b/tests/PhpWord/_files/broken-phpword.ini
@@ -0,0 +1,17 @@
+; Default config file for PHPWord
+; Copy this file into phpword.ini and use Settings::loadConfig to load
+
+[General]
+
+compatibility = true
+zipClass = ZipArchive
+pdfRendererName = DomPDF
+pdfRendererPath =
+; tempDir = "C:\PhpWordTemp"
+outputEscapingEnabled = false
+
+[Font]
+
+defaultFontName = Arial
+defaultFontSize = 10
+defaultFontClr = blue
diff --git a/tests/PhpWord/_includes/AbstractTestReader.php b/tests/PhpWord/_includes/AbstractTestReader.php
index d9097d717f..9888ad9d59 100644
--- a/tests/PhpWord/_includes/AbstractTestReader.php
+++ b/tests/PhpWord/_includes/AbstractTestReader.php
@@ -1,4 +1,5 @@