Rename property to 'hidden'

added unit test
docx reader
html reader/writer
odt writer
updated samples

Author: troosan

composer.json

@@ -45,7 +45,7 @@
             "php-cs-fixer fix --ansi --dry-run --diff",
             "phpcs --report-width=200 --report-summary  --report-full samples/ src/ tests/ --ignore=src/PhpWord/Shared/PCLZip --standard=PSR2 -n",
             "phpmd src/,tests/ text ./phpmd.xml.dist --exclude pclzip.lib.php",
-            "@test"
+            "@test-no-coverage"
         ],
         "fix": [
             "php-cs-fixer fix --ansi"

samples/Sample_04_Textrun.php

@@ -39,6 +39,9 @@
 $textrun->addObject('resources/_sheet.xls');
 $textrun->addText(' Here is some more text. ');
 
+$textrun = $section->addTextRun();
+$textrun->addText('This text is not visible.', array('hidden' => true));
+
 // Save file
 echo write($phpWord, basename(__FILE__, '.php'), $writers);
 if (!CLI) {

samples/Sample_26_Html.php

@@ -89,6 +89,9 @@
     <tr><td style="text-align: center;">Cell in parent table</td></tr>
 </table>';
 
+$html .= '<p style="margin-top: 240pt;">The text below is not visible, click on show/hide to reveil it:</p>';
+$html .= '<p style="display: none">This is hidden text</p>';
+
 \PhpOffice\PhpWord\Shared\Html::addHtml($section, $html, false, false);
 
 // Save file

src/PhpWord/Reader/Word2007/AbstractPart.php

@@ -444,6 +444,7 @@ protected function readFontStyle(XMLReader $xmlReader, \DOMElement $domNode)
             'rtl'                 => array(self::READ_TRUE,  'w:rtl'),
             'lang'                => array(self::READ_VALUE, 'w:lang'),
             'position'            => array(self::READ_VALUE, 'w:position'),
+            'hidden'              => array(self::READ_TRUE,  'w:vanish'),
         );
 
         return $this->readStyleDefs($xmlReader, $styleNode, $styleDefs);

src/PhpWord/Reader/Word2007/Styles.php

@@ -68,6 +68,7 @@ public function read(PhpWord $phpWord)
                 if (is_null($name)) {
                     $name = $xmlReader->getAttribute('w:val', $node, 'w:name');
                 }
+                $headingMatches = array();
                 preg_match('/Heading(\d)/', $name, $headingMatches);
                 // $default = ($xmlReader->getAttribute('w:default', $node) == 1);
                 switch ($type) {

src/PhpWord/Shared/Html.php

@@ -515,6 +515,9 @@ private static function parseStyle($attribute, $styles)
                 case 'text-align':
                     $styles['alignment'] = self::mapAlign($cValue);
                     break;
+                case 'display':
+                    $styles['hidden'] = $cValue === 'none';
+                    break;
                 case 'direction':
                     $styles['rtl'] = $cValue === 'rtl';
                     break;

src/PhpWord/Style/Font.php

@@ -258,7 +258,7 @@ class Font extends AbstractStyle
      * @var bool
      * @see  http://www.datypic.com/sc/ooxml/e-w_vanish-1.html
      */
-    private $hiddenText = false;
+    private $hidden = false;
 
     /**
      * Vertically Raised or Lowered Text
@@ -307,7 +307,7 @@ public function getStyleValues()
                 'smallCaps' => $this->isSmallCaps(),
                 'allCaps'   => $this->isAllCaps(),
                 'fgColor'   => $this->getFgColor(),
-                'hiddenText'=> $this->isHiddenText(),
+                'hidden'    => $this->isHidden(),
             ),
             'spacing'       => array(
                 'scale'     => $this->getScale(),
@@ -952,9 +952,9 @@ public function getParagraphStyle()
      *
      * @return bool
      */
-    public function isHiddenText()
+    public function isHidden()
     {
-        return $this->hiddenText;
+        return $this->hidden;
     }
 
     /**
@@ -963,9 +963,9 @@ public function isHiddenText()
      * @param bool $value
      * @return self
      */
-    public function setHiddenText($value = true)
+    public function setHidden($value = true)
     {
-        $this->hiddenText = $this->setBoolVal($value, $this->hiddenText);
+        $this->hidden = $this->setBoolVal($value, $this->hidden);
 
         return $this;
     }

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

@@ -60,6 +60,7 @@ public function write()
         $css['text-decoration'] .= $this->getValueIf($lineThrough, 'line-through ');
         $css['text-transform'] = $this->getValueIf($style->isAllCaps(), 'uppercase');
         $css['font-variant'] = $this->getValueIf($style->isSmallCaps(), 'small-caps');
+        $css['display'] = $this->getValueIf($style->isHidden(), 'none');
 
         $spacing = $style->getSpacing();
         $css['letter-spacing'] = $this->getValueIf(!is_null($spacing), ($spacing / 20) . 'pt');

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

@@ -75,6 +75,9 @@ public function write()
         $xmlWriter->writeAttributeIf($style->isSmallCaps(), 'fo:font-variant', 'small-caps');
         $xmlWriter->writeAttributeIf($style->isAllCaps(), 'fo:text-transform', 'uppercase');
 
+        //Hidden text
+        $xmlWriter->writeAttributeIf($style->isHidden(), 'text:display', 'none');
+
         // Superscript/subscript
         $xmlWriter->writeAttributeIf($style->isSuperScript(), 'style:text-position', 'super');
         $xmlWriter->writeAttributeIf($style->isSubScript(), 'style:text-position', 'sub');

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

@@ -121,7 +121,7 @@ private function writeStyle()
         $xmlWriter->writeElementIf($style->isAllCaps(), 'w:caps');
 
         //Hidden text
-        $xmlWriter->writeElementIf($style->isHiddenText(), 'w:vanish');
+        $xmlWriter->writeElementIf($style->isHidden(), 'w:vanish');
 
         // Underline
         $xmlWriter->writeElementIf($style->getUnderline() != 'none', 'w:u', 'w:val', $style->getUnderline());