phpmd fixes

PHPOffice · Aug 28, 2019 · bf81af2 · bf81af2
1 parent 3ef1ef2
commit bf81af2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/phpmd.xml.dist b/phpmd.xml.dist
@@ -18,9 +18,9 @@
  <rule ref="rulesets/design.xml/DepthOfInheritance" />
  <rule ref="rulesets/design.xml/CouplingBetweenObjects">
  <!-- AbstractContainer needs more coupling (default: 13) -->
- <!-- Html needs 22 (default: 13) -->
+ <!-- Html needs 23 (default: 13) -->
  <properties>
- <property name="maximum" value="23" />
+ <property name="maximum" value="24" />
  </properties>
  </rule>
  <rule ref="rulesets/design.xml/NumberOfChildren">

diff --git a/src/PhpWord/Shared/Html.php b/src/PhpWord/Shared/Html.php
@@ -956,17 +956,17 @@ protected static function mapBorderWidth(DOMNode $node, &$styles, string $cssSiz
 
  protected static function expandBorderSides(DOMNode $node, string $valuesString)
  {
- $side_mapping = array(
+ $sideMapping = array(
  'table' => array('top', 'end', 'bottom', 'start'),
  'th' => array('top', 'end', 'bottom', 'start'),
  'td' => array('top', 'end', 'bottom', 'start'),
  'p' => array('top', 'right', 'bottom', 'left'),
  );
- if (!array_key_exists($node->nodeName, $side_mapping)) {
+ if (!array_key_exists($node->nodeName, $sideMapping)) {
  trigger_error(sprintf('Node `%s` does not support borders', $node->nodeName), E_USER_WARNING);
  }
 
- $sides = $side_mapping[$node->nodeName];
+ $sides = $sideMapping[$node->nodeName];
  $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);

diff --git a/tests/PhpWord/Reader/Word2007/StyleTest.php b/tests/PhpWord/Reader/Word2007/StyleTest.php
@@ -162,7 +162,7 @@ public function testReadCellWidthBadType()
  </w:tr>
  </w:tbl>';
 
- $phpWord = $this->getDocumentFromString(array('document' => $documentXml));
+ $this->getDocumentFromString(array('document' => $documentXml));
  }
 
  /**
@@ -297,7 +297,7 @@ public function testReadIndentBadType()
  </w:tblPr>
  </w:tbl>';
 
- $phpWord = $this->getDocumentFromString(array('document' => $documentXml));
+ $this->getDocumentFromString(array('document' => $documentXml));
  }
 
  /**

diff --git a/tests/PhpWord/Writer/Word2007/Style/CellTest.php b/tests/PhpWord/Writer/Word2007/Style/CellTest.php
@@ -88,7 +88,7 @@ public function isSpecified(): bool
  });
  $row->addCell(null, $cellStyle);
 
- $doc = TestHelperDOCX::getDocument($phpWord, 'Word2007');
+ TestHelperDOCX::getDocument($phpWord, 'Word2007');
  }
 
  public function testWidth()