make FontStyle basedOn paragraph if the paragraph is set on the font (#…

…926) * make FontStyle based on paragraph if it set * replace tab with spaces * basedOn not correctly set if FontStyle is based on other FontStyle * Fix warnings
PHPOffice · Sep 17, 2017 · 8ce1a19 · 8ce1a19
1 parent 2fc685b
commit 8ce1a19
Show file tree

Hide file tree

Showing 35 changed files with 153 additions and 89 deletions.
diff --git a/src/PhpWord/ComplexType/FootnoteProperties.php b/src/PhpWord/ComplexType/FootnoteProperties.php
@@ -65,7 +65,7 @@ final class FootnoteProperties
 
  /**
  * Get the Footnote Positioning Location
- * 
+ *
  * @return string
  */
  public function getPos()
@@ -75,7 +75,7 @@ public function getPos()
 
  /**
  * Set the Footnote Positioning Location (pageBottom, beneathText, sectEnd, docEnd)
- * 
+ *
  * @param string $pos
  * @throws \InvalidArgumentException
  * @return self
@@ -99,7 +99,7 @@ public function setPos($pos)
 
  /**
  * Get the Footnote Numbering Format
- * 
+ *
  * @return string
  */
  public function getNumFmt()
@@ -109,7 +109,7 @@ public function getNumFmt()
 
  /**
  * Set the Footnote Numbering Format
- * 
+ *
  * @param string $numFmt One of NumberFormat
  * @return self
  */
@@ -122,7 +122,7 @@ public function setNumFmt($numFmt)
 
  /**
  * Get the Footnote Numbering Format
- * 
+ *
  * @return double
  */
  public function getNumStart()
@@ -132,7 +132,7 @@ public function getNumStart()
 
  /**
  * Set the Footnote Numbering Format
- * 
+ *
  * @param double $numStart
  * @return self
  */
@@ -144,7 +144,7 @@ public function setNumStart($numStart)
 
  /**
  * Get the Footnote and Endnote Numbering Starting Value
- * 
+ *
  * @return string
  */
  public function getNumRestart()
@@ -154,7 +154,7 @@ public function getNumRestart()
 
  /**
  * Set the Footnote and Endnote Numbering Starting Value (continuous, eachSect, eachPage)
- * 
+ *
  * @param string $numRestart
  * @throws \InvalidArgumentException
  * @return self

diff --git a/src/PhpWord/ComplexType/ProofState.php b/src/PhpWord/ComplexType/ProofState.php
@@ -51,7 +51,7 @@ final class ProofState
  /**
  * Set the Spell Checking State (dirty or clean)
  *
- * @param string $spelling 
+ * @param string $spelling
  * @throws \InvalidArgumentException
  * @return self
  */
@@ -78,7 +78,7 @@ public function getSpelling()
  /**
  * Set the Grammatical Checking State (dirty or clean)
  *
- * @param string $grammar 
+ * @param string $grammar
  * @throws \InvalidArgumentException
  * @return self
  */

diff --git a/src/PhpWord/Element/AbstractElement.php b/src/PhpWord/Element/AbstractElement.php
@@ -116,14 +116,14 @@ abstract class AbstractElement
 
  /**
  * The start position for the linked comment
- * 
+ *
  * @var Comment
  */
  protected $commentRangeStart;
 
  /**
  * The end position for the linked comment
- * 
+ *
  * @var Comment
  */
  protected $commentRangeEnd;
@@ -291,7 +291,7 @@ public function getCommentRangeStart()
 
  /**
  * Set comment start
- * 
+ *
  * @param Comment $value
  */
  public function setCommentRangeStart(Comment $value)

diff --git a/src/PhpWord/Element/Comment.php b/src/PhpWord/Element/Comment.php
@@ -31,14 +31,14 @@ class Comment extends TrackChange
 
  /**
  * The Element where this comment starts
- * 
+ *
  * @var AbstractElement
  */
  private $startElement;
 
  /**
  * The Element where this comment ends
- * 
+ *
  * @var AbstractElement
  */
  private $endElement;
@@ -76,7 +76,7 @@ public function getInitials()
 
  /**
  * Sets the element where this comment starts
- * 
+ *
  * @param \PhpOffice\PhpWord\Element\AbstractElement $value
  */
  public function setStartElement(AbstractElement $value)
@@ -89,7 +89,7 @@ public function setStartElement(AbstractElement $value)
 
  /**
  * Get the element where this comment starts
- * 
+ *
  * @return \PhpOffice\PhpWord\Element\AbstractElement
  */
  public function getStartElement()
@@ -99,7 +99,7 @@ public function getStartElement()
 
  /**
  * Sets the element where this comment ends
- * 
+ *
  * @param \PhpOffice\PhpWord\Element\AbstractElement $value
  */
  public function setEndElement(AbstractElement $value)
@@ -112,7 +112,7 @@ public function setEndElement(AbstractElement $value)
 
  /**
  * Get the element where this comment ends
- * 
+ *
  * @return \PhpOffice\PhpWord\Element\AbstractElement
  */
  public function getEndElement()

diff --git a/src/PhpWord/Element/Image.php b/src/PhpWord/Element/Image.php
@@ -476,9 +476,9 @@ private function getArchiveImageSize($source)
 
  /**
  * get image size from string
- * 
+ *
  * @param string $source
- * 
+ *
  * @codeCoverageIgnore this method is just a replacement for getimagesizefromstring which exists only as of PHP 5.4
  */
  private function getStringImageSize($source)

diff --git a/src/PhpWord/Element/Section.php b/src/PhpWord/Element/Section.php
@@ -50,7 +50,7 @@ class Section extends AbstractContainer
 
  /**
  * The properties for the footnote of this section
- * 
+ *
  * @var FootnoteProperties
  */
  private $footnoteProperties;
@@ -148,7 +148,7 @@ public function getFooters()
 
  /**
  * Get the footnote properties
- * 
+ *
  * @return \PhpOffice\PhpWord\Element\FooterProperties
  */
  public function getFootnotePropoperties()
@@ -158,7 +158,7 @@ public function getFootnotePropoperties()
 
  /**
  * Set the footnote properties
- * 
+ *
  * @param FootnoteProperties $footnoteProperties
  */
  public function setFootnoteProperties(FootnoteProperties $footnoteProperties = null)
@@ -219,7 +219,6 @@ private function addHeaderFooter($type = Header::AUTO, $header = true)
  } else {
  throw new \Exception('Invalid header/footer type.');
  }
-
  }
 
  /**

diff --git a/src/PhpWord/Escaper/AbstractEscaper.php b/src/PhpWord/Escaper/AbstractEscaper.php
@@ -19,7 +19,7 @@
 
 /**
  * @since 0.13.0
- * 
+ *
  * @codeCoverageIgnore
  */
 abstract class AbstractEscaper implements EscaperInterface

diff --git a/src/PhpWord/Escaper/EscaperInterface.php b/src/PhpWord/Escaper/EscaperInterface.php
@@ -19,7 +19,7 @@
 
 /**
  * @since 0.13.0
- * 
+ *
  * @codeCoverageIgnore
  */
 interface EscaperInterface

diff --git a/src/PhpWord/Escaper/RegExp.php b/src/PhpWord/Escaper/RegExp.php
@@ -19,7 +19,7 @@
 
 /**
  * @since 0.13.0
- * 
+ *
  * @codeCoverageIgnore
  */
 class RegExp extends AbstractEscaper

diff --git a/src/PhpWord/Escaper/Rtf.php b/src/PhpWord/Escaper/Rtf.php
@@ -19,7 +19,7 @@
 
 /**
  * @since 0.13.0
- * 
+ *
  * @codeCoverageIgnore
  */
 class Rtf extends AbstractEscaper

diff --git a/src/PhpWord/Escaper/Xml.php b/src/PhpWord/Escaper/Xml.php
@@ -19,7 +19,7 @@
 
 /**
  * @since 0.13.0
- * 
+ *
  * @codeCoverageIgnore
  */
 class Xml extends AbstractEscaper

diff --git a/src/PhpWord/Metadata/Settings.php b/src/PhpWord/Metadata/Settings.php
@@ -203,7 +203,7 @@ public function setEvenAndOddHeaders($evenAndOddHeaders)
 
  /**
  * Get the Visibility of Annotation Types
- * 
+ *
  * @return \PhpOffice\PhpWord\ComplexType\TrackChangesView
  */
  public function getRevisionView()
@@ -213,7 +213,7 @@ public function getRevisionView()
 
  /**
  * Set the Visibility of Annotation Types
- * 
+ *
  * @param TrackChangesView $trackChangesView
  */
  public function setRevisionView(TrackChangesView $trackChangesView = null)
@@ -293,7 +293,7 @@ public function setZoom($zoom)
 
  /**
  * Returns the Radix Point for Field Code Evaluation
- * 
+ *
  * @return string
  */
  public function getDecimalSymbol()
@@ -303,7 +303,7 @@ public function getDecimalSymbol()
 
  /**
  * sets the Radix Point for Field Code Evaluation
- * 
+ *
  * @param string $decimalSymbol
  */
  public function setDecimalSymbol($decimalSymbol)