Fix scrutinizer issues

Author: 0b10011

src/PhpWord/Metadata/Settings.php

@@ -148,7 +148,7 @@ class Settings
 
     /**
      * The allowed amount of whitespace before hyphenation is applied
-     * @var float|null
+     * @var Absolute
      */
     private $hyphenationZone;
 

src/PhpWord/Shared/Html.php

@@ -22,6 +22,7 @@
 use PhpOffice\PhpWord\Element\AbstractContainer;
 use PhpOffice\PhpWord\Element\Row;
 use PhpOffice\PhpWord\Element\Table;
+use PhpOffice\PhpWord\Exception\Exception;
 use PhpOffice\PhpWord\Settings;
 use PhpOffice\PhpWord\Shared\HtmlDpi as Dpi;
 use PhpOffice\PhpWord\SimpleType\Jc;
@@ -953,7 +954,7 @@ protected static function mapBorderWidth(DOMNode $node, &$styles, string $cssSiz
         }
     }
 
-    protected static function expandBorderSides(DOMNode $node, string $values)
+    protected static function expandBorderSides(DOMNode $node, string $valuesString)
     {
         $side_mapping = array(
             'table' => array('top', 'end', 'bottom', 'start'),
@@ -962,12 +963,19 @@ protected static function expandBorderSides(DOMNode $node, string $values)
             'p'     => array('top', 'right', 'bottom', 'left'),
         );
         if (!array_key_exists($node->nodeName, $side_mapping)) {
-            trigger_error(sprintf('Node ``%s` does not support borders', $node->nodeName), E_USER_WARNING);
+            trigger_error(sprintf('Node `%s` does not support borders', $node->nodeName), E_USER_WARNING);
         }
 
         $sides = $side_mapping[$node->nodeName];
-        $values = explode(' ', $values);
+        $values = explode(' ', $valuesString);
+        if (count($values) > count($sides)) {
+            trigger_error(sprintf('Provided `%s` style `%s` had more than %d values', $node->nodeName, $valuesString, count($sides)), E_USER_WARNING);
+            $values = array_slice($values, 0, count($sides));
+        }
         $values = array_combine(array_slice($sides, 0, count($values)), $values);
+        if ($values === false) {
+            throw new Exception(sprintf('Mismatch between number of items in `$sides` and `$values`. This should never happen. Provided values: `%s`, Sides: `%s`, Values: `%s`', $valuesString, serialize($sides), serialize($values)));
+        }
 
         if (count($values) === 1) {
             $values[$sides[1]] = $values[$sides[0]];

src/PhpWord/Style/LineNumbering.php

@@ -50,7 +50,7 @@ class LineNumbering extends AbstractStyle
     /**
      * Distance between text and line numbering in twip
      *
-     * @var int|float
+     * @var Absolute
      */
     private $distance;
 
@@ -69,7 +69,6 @@ class LineNumbering extends AbstractStyle
      */
     public function __construct($style = array())
     {
-        $this->setDistance(new Absolute(null));
         $this->setStyleByArray($style);
     }
 
@@ -124,6 +123,10 @@ public function setIncrement($value = null)
      */
     public function getDistance(): Absolute
     {
+        if ($this->distance === null) {
+            $this->distance = new Absolute(null);
+        }
+
         return $this->distance;
     }
 

src/PhpWord/Style/NumberingLevel.php

@@ -95,14 +95,14 @@ class NumberingLevel extends AbstractStyle
     /**
      * Left
      *
-     * @var int
+     * @var Absolute
      */
     private $left;
 
     /**
      * Hanging
      *
-     * @var int
+     * @var Absolute
      */
     private $hanging;
 

src/PhpWord/Style/Spacing.php

@@ -46,7 +46,7 @@ class Spacing extends AbstractStyle
     /**
      * Spacing between lines in paragraph
      *
-     * @var int|float
+     * @var Absolute
      */
     private $line;
 

src/PhpWord/Writer/HTML/Element/Table.php

@@ -18,6 +18,8 @@
 
 namespace PhpOffice\PhpWord\Writer\HTML\Element;
 
+use PhpOffice\PhpWord\Style\Colors\StaticColorInterface;
+
 /**
  * Table element HTML writer
  *
@@ -54,9 +56,11 @@ public function write()
                     $cellStyle = $rowCells[$j]->getStyle();
                     $cellBgColor = $cellStyle->getBgColor();
                     $cellFgColor = null;
-                    if ($cellBgColor->toRgb()) {
+                    if ($cellBgColor instanceof StaticColorInterface) {
                         list($red, $green, $blue) = $cellBgColor->toRgb();
-                        $cellFgColor = (($red * 0.299 + $green * 0.587 + $blue * 0.114) > 186) ? null : 'FFFFFF';
+                        if (($red * 0.299 + $green * 0.587 + $blue * 0.114) <= 186) {
+                            $cellFgColor = 'FFFFFF';
+                        }
                     }
                     $cellColSpan = $cellStyle->getGridSpan();
                     $cellRowSpan = 1;

src/PhpWord/Writer/HTML/Style/Font.php

@@ -42,7 +42,7 @@ public function write()
 
         $font = $style->getName();
         $size = $style->getSize()->toInt('pt');
-        $color = $style->getColor()->toHex(true);
+        $color = $style->getColor()->toHexOrName(true);
         $fgColor = $style->getFgColor()->getName();
         $underline = $style->getUnderline() != FontStyle::UNDERLINE_NONE;
         $lineThrough = $style->isStrikethrough() || $style->isDoubleStrikethrough();

src/PhpWord/Writer/ODText/Style/Font.php

@@ -53,7 +53,7 @@ public function write()
         $xmlWriter->writeAttributeIf($size !== null, 'style:font-size-complex', $size . 'pt');
 
         // Color
-        $color = $style->getColor()->toHex(true);
+        $color = $style->getColor()->toHexOrName(true);
         $xmlWriter->writeAttributeIf($color != '', 'fo:color', $color);
 
         // Bold & italic

src/PhpWord/Writer/ODText/Style/Table.php

@@ -39,6 +39,8 @@ public function write()
         $style = $this->getStyle();
         if ($style === null) {
             return;
+        } elseif (is_string($style)) {
+            throw new Exception(sprintf('Incorrect value provided for style. `%s` expected, `string(%s)` provided', TableStyle::class, $style));
         } elseif (!$style instanceof TableStyle) {
             throw new Exception(sprintf('Incorrect value provided for style. %s expected, %s provided', TableStyle::class, get_class($style)));
         }

src/PhpWord/Writer/RTF/Element/Table.php

@@ -21,6 +21,7 @@
 use PhpOffice\PhpWord\Element\Cell as CellElement;
 use PhpOffice\PhpWord\Element\Row as RowElement;
 use PhpOffice\PhpWord\Element\Table as TableElement;
+use PhpOffice\PhpWord\Style\Lengths\Absolute;
 
 /**
  * Table element RTF writer
@@ -67,6 +68,7 @@ public function write()
     /**
      * Write column
      *
+     * @todo Add support for percentage widths and auto (https://stackoverflow.com/a/5531449/526741)
      * @return string
      */
     private function writeRowDef(RowElement $row)
@@ -76,7 +78,10 @@ private function writeRowDef(RowElement $row)
         $rightMargin = 0;
         foreach ($row->getCells() as $cell) {
             // Arbitrary default width
-            $width = $cell->getWidth()->toInt('twip') ?? 720;
+            $width = 720;
+            if ($width instanceof Absolute && $width->isSpecified()) {
+                $width = $width->toInt('twip');
+            }
 
             $vMerge = $this->getVMerge($cell->getStyle()->getVMerge());
             $rightMargin += $width;

src/PhpWord/Writer/RTF/Part/Header.php

@@ -220,7 +220,7 @@ private function registerBorderColor(SectionStyle $style): self
         foreach ($borders as $border) {
             $color = $border->getColor();
             if ($color->isSpecified()) {
-                $this->registerTableItem($this->colorTable, $color);
+                $this->registerTableItem($this->colorTable, $color, new Hex('000000'));
             }
         }