Merge branch 'develop' of https://github.com/PHPOffice/PHPWord into PHPOffice-develop

Author: Premixedpie

.travis.yml

@@ -24,8 +24,6 @@ matrix:
         - php: 5.3
         - php: 7.0
         - php: 7.3
-    allow_failures:
-        - php: 7.3
 
 cache:
     directories:

CHANGELOG.md

@@ -3,19 +3,42 @@ Change Log
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-v0.16.0 (xx dec 2018)
+v0.17.0 (?? ??? 2019)
 ----------------------
 ### Added
+- Add RightToLeft table presentation. @troosan #1550
+
+### Fixed
+
+### Miscelaneous
+- Use embedded http server to test loading of remote images @troosan #
+
+v0.16.0 (30 dec 2018)
+----------------------
+### Added
+- Add getVariableCount method in TemplateProcessor. @nicoder #1272
 - Add setting Chart Title and Legend visibility @Tom-Magill #1433
+- Add ability to pass a Style object in Section constructor @ndench #1416
+- Add support for hidden text @Alexmg86 #1527
+- Add support for setting images in TemplateProcessor @SailorMax #1170
+- Add "Plain Text" type to SDT (Structured Document Tags) @morrisdj #1541
+- Added possibility to index variables inside cloned block in TemplateProcessor @JPBetley #817
+- Added possibility to replace variables inside cloned block with values in TemplateProcessor @DIDoS #1392
 
 ### Fixed
 - Fix regex in `cloneBlock` function @nicoder #1269
 - HTML Title Writer loses text when Title contains a TextRun instead a string. @begnini #1436
+- Fix regex in fixBrokenMacros, make it less greedy @MuriloSo @brainwood @yurii-sio2 #1502 #1345
 - 240 twips are being added to line spacing, should not happen when using lineRule fixed @troosan #1509 #1505
 - Adding table layout to the generated HTML @aarangara #1441
 - Fix loading of Sharepoint document @Garrcomm #1498
 - RTF writer: Round getPageSizeW and getPageSizeH to avoid decimals @Patrick64 #1493
 - Fix parsing of Office 365 documents @Timanx #1485
+- For RTF writers, sizes should should never have decimals @Samuel-BF #1536
+- Style Name Parsing fails if document generated by a non-english word version @begnini #1434
+
+### Miscelaneous
+- Get rid of duplicated code in TemplateProcessor @abcdmitry #1161
 
 v0.15.0 (14 Jul 2018)
 ----------------------

README.md

@@ -1,13 +1,20 @@
 # ![PHPWord](https://rawgit.com/PHPOffice/PHPWord/develop/docs/images/phpword.svg "PHPWord")
 
+Master: 
 [![Latest Stable Version](https://poser.pugx.org/phpoffice/phpword/v/stable.png)](https://packagist.org/packages/phpoffice/phpword)
 [![Build Status](https://travis-ci.org/PHPOffice/PHPWord.svg?branch=master)](https://travis-ci.org/PHPOffice/PHPWord)
-[![Code Quality](https://scrutinizer-ci.com/g/PHPOffice/PHPWord/badges/quality-score.png?s=b5997ce59ac2816b4514f3a38de9900f6d492c1d)](https://scrutinizer-ci.com/g/PHPOffice/PHPWord/)
-[![Coverage Status](https://coveralls.io/repos/github/PHPOffice/PHPWord/badge.svg?branch=develop)](https://coveralls.io/github/PHPOffice/PHPWord?branch=develop)
+[![Code Quality](https://scrutinizer-ci.com/g/PHPOffice/PHPWord/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/PHPOffice/PHPWord/)
+[![Coverage Status](https://coveralls.io/repos/github/PHPOffice/PHPWord/badge.svg?branch=master)](https://coveralls.io/github/PHPOffice/PHPWord?branch=master)
 [![Total Downloads](https://poser.pugx.org/phpoffice/phpword/downloads.png)](https://packagist.org/packages/phpoffice/phpword)
 [![License](https://poser.pugx.org/phpoffice/phpword/license.png)](https://packagist.org/packages/phpoffice/phpword)
 [![Join the chat at https://gitter.im/PHPOffice/PHPWord](https://img.shields.io/badge/GITTER-join%20chat-green.svg)](https://gitter.im/PHPOffice/PHPWord)
 
+Develop:
+[![Latest Development Version](https://img.shields.io/badge/unstable-dev--develop-orange.svg)](https://packagist.org/packages/phpoffice/phpword#dev-develop)
+[![Build Status](https://travis-ci.org/PHPOffice/PHPWord.svg?branch=develop)](https://travis-ci.org/PHPOffice/PHPWord/branches)
+[![Code Quality](https://scrutinizer-ci.com/g/PHPOffice/PHPWord/badges/quality-score.png?b=develop)](https://scrutinizer-ci.com/g/PHPOffice/PHPWord/?branch=develop)
+[![Coverage Status](https://coveralls.io/repos/github/PHPOffice/PHPWord/badge.svg?branch=develop)](https://coveralls.io/github/PHPOffice/PHPWord?branch=develop)
+
 PHPWord is a library written in pure PHP that provides a set of classes to write to and read from different document file formats. The current version of PHPWord supports Microsoft [Office Open XML](http://en.wikipedia.org/wiki/Office_Open_XML) (OOXML or OpenXML), OASIS [Open Document Format for Office Applications](http://en.wikipedia.org/wiki/OpenDocument) (OpenDocument or ODF), [Rich Text Format](http://en.wikipedia.org/wiki/Rich_Text_Format) (RTF), HTML, and PDF.
 
 PHPWord is an open source project licensed under the terms of [LGPL version 3](https://github.com/PHPOffice/PHPWord/blob/develop/COPYING.LESSER). PHPWord is aimed to be a high quality software product by incorporating [continuous integration](https://travis-ci.org/PHPOffice/PHPWord) and [unit testing](http://phpoffice.github.io/PHPWord/coverage/develop/). You can learn more about PHPWord by reading the [Developers' Documentation](http://phpword.readthedocs.org/).
@@ -81,7 +88,7 @@ You can of course also manually edit your composer.json file
 ```json
 {
     "require": {
-       "phpoffice/phpword": "v0.14.*"
+       "phpoffice/phpword": "v0.16.*"
     }
 }
 ```

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"
@@ -90,7 +90,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-develop": "0.16-dev"
+            "dev-develop": "0.17-dev"
         }
     }
 }

docs/conf.py

@@ -48,7 +48,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.14.0'
+version = '0.16.0'
 # The full version, including alpha/beta/rc tags.
 release = version
 

docs/containers.rst

@@ -104,6 +104,12 @@ You can pass an optional parameter to specify where the header/footer should be
 -  ``Footer::FIRST`` each first page of the section
 -  ``Footer::EVEN`` each even page of the section. Will only be applied if the evenAndOddHeaders is set to true in phpWord->settings
 
+To change the evenAndOddHeaders use the ``getSettings`` method to return the Settings object, and then call the ``setEvenAndOddHeaders`` method:
+
+.. code-block:: php
+
+    $phpWord->getSettings()->setEvenAndOddHeaders(true);
+
 Footers
 -------
 

docs/elements.rst

@@ -61,7 +61,7 @@ Legend:
 Texts
 -----
 
-Text can be added by using ``addText`` and ``addTextRun`` method.
+Text can be added by using ``addText`` and ``addTextRun`` methods.
 ``addText`` is used for creating simple paragraphs that only contain texts with the same style.
 ``addTextRun`` is used for creating complex paragraphs that contain text with different style (some bold, other
 italics, etc) or other elements, e.g. images or links. The syntaxes are as follow:
@@ -155,13 +155,18 @@ method or using the ``pageBreakBefore`` style of paragraph.
 Lists
 -----
 
-To add a list item use the function ``addListItem``.
+Lists can be added by using ``addListItem`` and ``addListItemRun`` methods.
+``addListItem`` is used for creating lists that only contain plain text.
+``addListItemRun`` is used for creating complex list items that contains texts
+with different style (some bold, other italics, etc) or other elements, e.g.
+images or links. The syntaxes are as follow:
 
 Basic usage:
 
 .. code-block:: php
 
     $section->addListItem($text, [$depth], [$fontStyle], [$listStyle], [$paragraphStyle]);
+    $listItemRun = $section->addListItemRun([$depth], [$listStyle], [$paragraphStyle])
 
 Parameters:
 
@@ -172,6 +177,8 @@ Parameters:
   TYPE\_ALPHANUM, TYPE\_BULLET\_FILLED, etc. See list of constants in PHPWord\\Style\\ListItem.
 - ``$paragraphStyle``. See :ref:`paragraph-style`.
 
+See ``Sample_09_Tables.php`` for more code sample.
+
 Advanced usage:
 
 You can also create your own numbering style by changing the ``$listStyle`` parameter with the name of your numbering style.

docs/styles.rst

@@ -61,6 +61,7 @@ Available Font style options:
 - ``lang``. Language, either a language code like *en-US*, *fr-BE*, etc. or an object (or as an array) if you need to set eastAsian or bidirectional languages
    See ``\PhpOffice\PhpWord\Style\Language`` class for some language codes.
 - ``position``. The text position, raised or lowered, in half points
+- ``hidden``. Hidden text, *true* or *false*.
 
 .. _paragraph-style:
 
@@ -107,11 +108,12 @@ Available Table style options:
 - ``border(Top|Right|Bottom|Left)Size``. Border size in *twip*.
 - ``cellMargin(Top|Right|Bottom|Left)``. Cell margin in *twip*.
 - ``indent``. Table indent from leading margin. Must be an instance of ``\PhpOffice\PhpWord\ComplexType\TblWidth``.
-- ``width``. Table width in percent.
+- ``width``. Table width in Fiftieths of a Percent or Twentieths of a Point.
 - ``unit``. The unit to use for the width. One of ``\PhpOffice\PhpWord\SimpleType\TblWidth``. Defaults to *auto*.
 - ``layout``. Table layout, either *fixed* or *autofit*  See ``\PhpOffice\PhpWord\Style\Table`` for constants.
 - ``cellSpacing`` Cell spacing in *twip*
 - ``position`` Floating Table Positioning, see below for options
+- ``bidiVisual`` Present table as Right-To-Left
 
 Floating Table Positioning options: