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

Author: Bas-Jan 't Jong

.gitignore

@@ -6,6 +6,7 @@ Thumbs.db
 Desktop.ini
 composer.phar
 phpunit.xml
+phpword.ini
 /.buildpath
 /.idea
 /.project

.scrutinizer.yml

@@ -9,16 +9,16 @@ tools:
         enabled: true
         config:
             standard: PSR2
-    php_cpd: true
     php_mess_detector:
         enabled: true
         config:
             ruleset: phpmd.xml.dist
     external_code_coverage:
         enabled: true
         timeout: 900
-    php_sim:
-        min_mass: 30
+    php_cpd: true
+    # php_sim: # Temporarily disabled to allow focus on things other than duplicates
+    #    min_mass: 40
     php_pdepend: true
     php_analyzer: true
     sensiolabs_security_checker: true

.travis.yml

@@ -10,8 +10,6 @@ php:
 
 matrix:
     allow_failures:
-        - php: 5.3.3
-        - php: 5.6
         - php: hhvm
 
 env:
@@ -23,14 +21,8 @@ before_script:
     - sudo apt-get -qq update > /dev/null
     - sudo apt-get -qq install graphviz > /dev/null
     ## Composer
-    # - curl -s http://getcomposer.org/installer | php
-    # - php composer.phar install --prefer-source
     - composer self-update
-    - composer require dompdf/dompdf:0.6.*
     - composer install --prefer-source --dev
-    ## PHP_CodeSniffer
-    - pyrus install pear/PHP_CodeSniffer
-    - phpenv rehash
     ## PHP Copy/Paste Detector
     - curl -o phpcpd.phar https://phar.phpunit.de/phpcpd.phar
     ## PHP Mess Detector
@@ -48,7 +40,7 @@ before_script:
 
 script:
     ## PHP_CodeSniffer
-    - phpcs src/ tests/ --standard=PSR2 -n --ignore=src/PhpWord/Shared/PCLZip
+    - ./vendor/bin/phpcs src/ tests/ --standard=PSR2 -n --ignore=src/PhpWord/Shared/PCLZip
     ## PHP Copy/Paste Detector
     - php phpcpd.phar src/ tests/ --verbose
     ## PHP Mess Detector
@@ -58,7 +50,7 @@ script:
     ## PHPUnit
     - phpunit -c ./ --coverage-text --coverage-html ./build/coverage
     ## PHPDocumentor
-    - vendor/bin/phpdoc.php -d ./src -t ./build/docs --ignore "*/src/PhpWord/Shared/PCLZip/*" --template="responsive-twig"
+    - vendor/bin/phpdoc.php -d ./src -t ./build/docs --ignore "*/src/PhpWord/Shared/*/*" --template="responsive-twig"
 
 after_script:
     ## PHPDocumentor

CHANGELOG.md

@@ -4,7 +4,7 @@ This is the changelog between releases of PHPWord. Releases are listed in revers
 
 ## 0.11.0 - Not yet released
 
-This release changed PHPWord license from LGPL 2.1 to LGPL 3.
+This release marked the change of PHPWord license from LGPL 2.1 to LGPL 3; new relative and absolute positioning for image; new `TextBox` and `ListItemRun` element; refactorings of writer classes into parts, elements, and styles; and ability to add elements to PHPWord object via HTML.
 
 ### Features
 
@@ -15,17 +15,30 @@ This release changed PHPWord license from LGPL 2.1 to LGPL 3.
 - HTML: Ability to add elements to PHPWord object via html - @basjan GH-231
 - ListItemRun: New element that can add a list item with inline formatting like a textrun - @basjan GH-235
 - Table: Ability to add table inside a cell (nested table) - @ivanlanin GH-149
+- RTF Writer: UTF8 support for RTF: Internal UTF8 text is converted to Unicode before writing - @ivanlanin GH-158
+- Table: Ability to define table width (in percent and twip) and position - @ivanlanin GH-237
+- RTF Writer: Ability to add links and page breaks in RTF - @ivanlanin GH-196
+- ListItemRun: Remove fontStyle parameter because ListItemRun is inherited from TextRun and TextRun doesn't have fontStyle - @ivanlanin
+- Config: Ability to use a config file to store various common settings - @ivanlanin GH-200
+- ODT Writer: Enable inline font style in TextRun - @ivanlanin
+- ODT Writer: Enable underline, strike/doublestrike, smallcaps/allcaps, superscript/subscript font style - @ivanlanin
+- ODT Writer: Enable section and column - @ivanlanin
+- PDF Writer: Add TCPDF and mPDF as optional PDF renderer library - @ivanlanin
+- ODT Writer: Enable title element and custom document properties - @ivanlanin
+- ODT Reader: Ability to read standard and custom document properties - @ivanlanin
 
 ### Bugfixes
 
 - Header: All images added to the second header were assigned to the first header - @basjan GH-222
 - Conversion: Fix conversion from cm to pixel, pixel to cm, and pixel to point - @basjan GH-233 GH-234
+- PageBreak: Page break adds new line in the beginning of the new page - @ivanlanin GH-150
 
 ### Deprecated
 
 - Static classes `Footnotes`, `Endnotes`, and `TOC`
 - `Writer\Word2007\Part`: `Numbering::writeNumbering()`, `Settings::writeSettings()`, `WebSettings::writeWebSettings()`, `ContentTypes::writeContentTypes()`, `Styles::writeStyles()`, `Document::writeDocument()` all changed into `write()`
 - `Writer\Word2007\Part\DocProps`: Split into `Writer\Word2007\Part\DocPropsCore` and `Writer\Word2007\Part\DocPropsApp`
+- `Element\Title::getBookmarkId()` replaced by `Element\Title::getRelationId()`
 
 ### Miscellaneous
 
@@ -38,6 +51,8 @@ This release changed PHPWord license from LGPL 2.1 to LGPL 3.
 - QA: Add `.scrutinizer.yml` and include `composer.lock` for preparation to Scrutinizer - @ivanlanin GH-186
 - Writer: Refactor writer parts using composite pattern - @ivanlanin
 - Docs: Show code quality and test code coverage badge on README
+- Style: Change behaviour of `set...` function of boolean properties; when none is defined, assumed true - @ivanlanin
+- Shared: Unify PHP ZipArchive and PCLZip features into PhpWord ZipArchive - @ivanlanin
 
 ## 0.10.0 - 4 May 2014
 

composer.json

@@ -33,14 +33,18 @@
     ],
     "require": {
         "php": ">=5.3.3",
-        "ext-xml": "*",
-        "ext-zip": "*"
+        "ext-xml": "*"
     },
     "require-dev": {
         "phpunit/phpunit": "3.7.*",
-        "phpdocumentor/phpdocumentor":"2.*"
+        "phpdocumentor/phpdocumentor":"2.*",
+        "squizlabs/php_codesniffer": "1.*",
+        "dompdf/dompdf":"0.6.*",
+        "tecnick.com/tcpdf": "6.*",
+        "mpdf/mpdf": "5.*"
     },
     "suggest": {
+        "ext-zip": "Used to create docx files",
         "ext-gd2": "Required to add images",
         "ext-xmlwriter": "Required to write DOCX and ODT",
         "ext-xsl": "Required to apply XSL style sheet to template part",