Use section "style" instead of "settings" for consistency

Author: ivanlanin

CHANGELOG.md

@@ -21,6 +21,7 @@ This release added drawing shapes (arc, curve, line, polyline, rect, oval) eleme
 ### Deprecated
 
 - `Element\Link::getTarget()` replaced by `Element\Link::getSource()`
+- `Element\Section::getSettings()` and `Element\Section::setSettings()` replaced by `Element\Section::getStyle()` and `Element\Section::setStyle()`
 
 ### Miscellaneous
 

docs/containers.rst

@@ -32,7 +32,7 @@ section. Example:
 Section settings
 ~~~~~~~~~~~~~~~~
 
-Below are the available settings for section:
+Below are the available styles for section:
 
 -  ``orientation`` Page orientation, i.e. 'portrait' (default) or
    'landscape'
@@ -56,8 +56,8 @@ Below are the available settings for section:
 -  ``breakType`` Section break type (nextPage, nextColumn, continuous,
    evenPage, oddPage)
 
-The following two settings are automatically set by the use of the
-``orientation`` setting. You can alter them but that's not recommended.
+The following two styles are automatically set by the use of the
+``orientation`` style. You can alter them but that's not recommended.
 
 -  ``pageSizeW`` Page width in twips
 -  ``pageSizeH`` Page height in twips
@@ -66,7 +66,7 @@ Page number
 ~~~~~~~~~~~
 
 You can change a section page number by using the ``pageNumberingStart``
-property of the section.
+style of the section.
 
 .. code-block:: php
 
@@ -75,13 +75,13 @@ property of the section.
 
     // Method 2
     $section = $phpWord->addSection();
-    $section->getSettings()->setPageNumberingStart(1);
+    $section->getStyle()->setPageNumberingStart(1);
 
 Multicolumn
 ~~~~~~~~~~~
 
 You can change a section layout to multicolumn (like in a newspaper) by
-using the ``breakType`` and ``colsNum`` property of the section.
+using the ``breakType`` and ``colsNum`` style of the section.
 
 .. code-block:: php
 
@@ -90,14 +90,14 @@ using the ``breakType`` and ``colsNum`` property of the section.
 
     // Method 2
     $section = $phpWord->addSection();
-    $section->getSettings()->setBreakType('continuous');
-    $section->getSettings()->setColsNum(2);
+    $section->getStyle()->setBreakType('continuous');
+    $section->getStyle()->setColsNum(2);
 
 
 ### Line numbering
 
 You can apply line numbering to a section by using the ``lineNumbering``
-property of the section.
+style of the section.
 
 .. code-block:: php
 
@@ -106,7 +106,7 @@ property of the section.
 
     // Method 2
     $section = $phpWord->addSection();
-    $section->getSettings()->setLineNumbering(array());
+    $section->getStyle()->setLineNumbering(array());
 
 Below are the properties of the line numbering style.
 

docs/general.rst

@@ -138,7 +138,7 @@ points to twips.
     );
 
     $section = $phpWord->addSection();
-    $sectionStyle = $section->getSettings();
+    $sectionStyle = $section->getStyle();
     // half inch left margin
     $sectionStyle->setMarginLeft(\PhpOffice\PhpWord\Shared\Font::inchSizeToTwips(.5));
     // 2 cm right margin

docs/src/documentation.md

@@ -304,7 +304,7 @@ $phpWord->addParagraphStyle('My Style', array(
 );
 
 $section = $phpWord->addSection();
-$sectionStyle = $section->getSettings();
+$sectionStyle = $section->getStyle();
 // half inch left margin
 $sectionStyle->setMarginLeft(\PhpOffice\PhpWord\Shared\Font::inchSizeToTwips(.5));
 // 2 cm right margin
@@ -333,9 +333,9 @@ $sectionSettings = array(
 );
 ```
 
-### Section settings
+### Section style
 
-Below are the available settings for section:
+Below are the available styles for section:
 
 - `orientation` Page orientation, i.e. 'portrait' (default) or 'landscape'
 - `marginTop` Page margin top in twips
@@ -357,49 +357,49 @@ Below are the available settings for section:
 - `colsSpace` Spacing between columns
 - `breakType` Section break type (nextPage, nextColumn, continuous, evenPage, oddPage)
 
-The following two settings are automatically set by the use of the `orientation` setting. You can alter them but that's not recommended.
+The following two styles are automatically set by the use of the `orientation` style. You can alter them but that's not recommended.
 
 - `pageSizeW` Page width in twips
 - `pageSizeH` Page height in twips
 
 ### Page number
 
-You can change a section page number by using the `pageNumberingStart` property of the section.
+You can change a section page number by using the `pageNumberingStart` style of the section.
 
 ```php
 // Method 1
 $section = $phpWord->addSection(array('pageNumberingStart' => 1));
 
 // Method 2
 $section = $phpWord->addSection();
-$section->getSettings()->setPageNumberingStart(1);
+$section->getStyle()->setPageNumberingStart(1);
 ```
 
 ### Multicolumn
 
-You can change a section layout to multicolumn (like in a newspaper) by using the `breakType` and `colsNum` property of the section.
+You can change a section layout to multicolumn (like in a newspaper) by using the `breakType` and `colsNum` style of the section.
 
 ```php
 // Method 1
 $section = $phpWord->addSection(array('breakType' => 'continuous', 'colsNum' => 2));
 
 // Method 2
 $section = $phpWord->addSection();
-$section->getSettings()->setBreakType('continuous');
-$section->getSettings()->setColsNum(2);
+$section->getStyle()->setBreakType('continuous');
+$section->getStyle()->setColsNum(2);
 ```
 
 ### Line numbering
 
-You can apply line numbering to a section by using the `lineNumbering` property of the section.
+You can apply line numbering to a section by using the `lineNumbering` style of the section.
 
 ```php
 // Method 1
 $section = $phpWord->addSection(array('lineNumbering' => array()));
 
 // Method 2
 $section = $phpWord->addSection();
-$section->getSettings()->setLineNumbering(array());
+$section->getStyle()->setLineNumbering(array());
 ```
 
 Below are the properties of the line numbering style.

src/PhpWord/Element/AbstractElement.php

@@ -343,14 +343,14 @@ public function isInSection()
     }
 
     /**
-     * Set style value
+     * Set new style value
      *
      * @param mixed $styleObject Style object
      * @param mixed $styleValue Style value
      * @param bool $returnObject Always return object
      * @return mixed
      */
-    protected function setStyle($styleObject, $styleValue = null, $returnObject = false)
+    protected function setNewStyle($styleObject, $styleValue = null, $returnObject = false)
     {
         if (!is_null($styleValue) && is_array($styleValue)) {
             $styleObject->setStyleByArray($styleValue);

src/PhpWord/Element/Cell.php

@@ -52,7 +52,7 @@ class Cell extends AbstractContainer
     public function __construct($width = null, $style = null)
     {
         $this->width = $width;
-        $this->style = $this->setStyle(new CellStyle(), $style, true);
+        $this->style = $this->setNewStyle(new CellStyle(), $style, true);
     }
 
     /**

src/PhpWord/Element/Endnote.php

@@ -38,6 +38,6 @@ class Endnote extends Footnote
      */
     public function __construct($paragraphStyle = null)
     {
-        $this->paragraphStyle = $this->setStyle(new Paragraph(), $paragraphStyle);
+        $this->paragraphStyle = $this->setNewStyle(new Paragraph(), $paragraphStyle);
     }
 }

src/PhpWord/Element/Footnote.php

@@ -50,7 +50,7 @@ class Footnote extends AbstractContainer
      */
     public function __construct($paragraphStyle = null)
     {
-        $this->paragraphStyle = $this->setStyle(new Paragraph(), $paragraphStyle);
+        $this->paragraphStyle = $this->setNewStyle(new Paragraph(), $paragraphStyle);
         $this->setDocPart($this->container);
     }
 

src/PhpWord/Element/Image.php

@@ -131,7 +131,7 @@ public function __construct($source, $style = null, $watermark = false)
     {
         $this->source = $source;
         $this->setIsWatermark($watermark);
-        $this->style = $this->setStyle(new ImageStyle(), $style, true);
+        $this->style = $this->setNewStyle(new ImageStyle(), $style, true);
 
         $this->checkImage($source);
     }

src/PhpWord/Element/Line.php

@@ -38,7 +38,7 @@ class Line extends AbstractElement
      */
     public function __construct($style = null)
     {
-        $this->style = $this->setStyle(new LineStyle(), $style);
+        $this->style = $this->setNewStyle(new LineStyle(), $style);
     }
 
     /**