Remove unnecessary ternary expressions

PHPOffice · Nov 19, 2018 · 3cf0770 · 3cf0770
1 parent 49eb9d1
commit 3cf0770
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/src/PhpWord/Metadata/DocInfo.php b/src/PhpWord/Metadata/DocInfo.php
@@ -507,7 +507,7 @@ public static function convertProperty($propertyValue, $propertyType)
  case 'date': // Date
  return strtotime($propertyValue);
  case 'bool': // Boolean
- return ($propertyValue == 'true') ? true : false;
+ return $propertyValue == 'true';
  }
 
  return $propertyValue;

diff --git a/src/PhpWord/Reader/MsDoc.php b/src/PhpWord/Reader/MsDoc.php
@@ -1619,7 +1619,7 @@ private function readPrl($data, $pos, $cbNum)
  break;
  // sprmCFData
  case 0x06:
- $sprmCFData = dechex($operand) == 0x00 ? false : true;
+ $sprmCFData = dechex($operand) != 0x00;
  break;
  // sprmCFItalic
  case 0x36:

diff --git a/src/PhpWord/Reader/Word2007/AbstractPart.php b/src/PhpWord/Reader/Word2007/AbstractPart.php
@@ -336,7 +336,7 @@ protected function readTable(XMLReader $xmlReader, \DOMElement $domNode, $parent
  } elseif ('w:tr' == $tblNode->nodeName) { // Row
  $rowHeight = $xmlReader->getAttribute('w:val', $tblNode, 'w:trPr/w:trHeight');
  $rowHRule = $xmlReader->getAttribute('w:hRule', $tblNode, 'w:trPr/w:trHeight');
- $rowHRule = $rowHRule == 'exact' ? true : false;
+ $rowHRule = $rowHRule == 'exact';
  $rowStyle = array(
  'tblHeader' => $xmlReader->elementExists('w:trPr/w:tblHeader', $tblNode),
  'cantSplit' => $xmlReader->elementExists('w:trPr/w:cantSplit', $tblNode),

diff --git a/src/PhpWord/Shared/ZipArchive.php b/src/PhpWord/Shared/ZipArchive.php
@@ -252,7 +252,7 @@ public function pclzipAddFile($filename, $localname = null)
  unlink($this->tempDir . DIRECTORY_SEPARATOR . $localnameParts['basename']);
  }
 
- return ($res == 0) ? false : true;
+ return $res != 0;
  }
 
  /**
@@ -283,7 +283,7 @@ public function pclzipAddFromString($localname, $contents)
  // Remove temp file
  @unlink($this->tempDir . DIRECTORY_SEPARATOR . $filenameParts['basename']);
 
- return ($res == 0) ? false : true;
+ return $res != 0;
  }
 
  /**
@@ -303,7 +303,7 @@ public function pclzipExtractTo($destination, $entries = null)
  if (is_null($entries)) {
  $result = $zip->extract(PCLZIP_OPT_PATH, $destination);
 
- return ($result > 0) ? true : false;
+ return $result > 0;
  }
 
  // Extract by entries

diff --git a/tests/PhpWord/_includes/XmlDocument.php b/tests/PhpWord/_includes/XmlDocument.php
@@ -163,7 +163,7 @@ public function elementExists($path, $file = 'word/document.xml')
  {
  $nodeList = $this->getNodeList($path, $file);
 
- return !($nodeList->length == 0);
+ return $nodeList->length != 0;
  }
 
  /**