Merge branch 'develop' into nonstatic

.travis.yml

@@ -14,13 +14,20 @@ matrix:
     - php: 5.6
     - php: hhvm
 
+env:
+  global:
+    - secure: "Sq+6bVtnPsu0mWX8DWQ+9bGAjxMcGorksUiHc4YIXEJsuDfVmVlH8tTD547IeCjDAx9MxXerZ2Z4HSjxTB70VEnJPvZMHI/EZn4Ny31YLHEthdZbV5Gd1h0TGp8VOzPKGShvGrtGBX6MvMfgpK4zuieVWbSfdKeecm8ZNLMpUd4="
+
 before_script:
+  ## Packages
+  - sudo apt-get -qq update > /dev/null
+  - sudo apt-get -qq install graphviz > /dev/null
   ## Composer
   # - curl -s https://getcomposer.org/installer | php
   # - php composer.phar install --prefer-source
   - composer self-update
   - composer require dompdf/dompdf:0.6.*
-  - composer install --prefer-source
+  - composer install --prefer-source --dev
   ## PHP_CodeSniffer
   - pyrus install pear/PHP_CodeSniffer
   - phpenv rehash
@@ -35,6 +42,9 @@ before_script:
   - phpenv rehash
   ## PHPLOC
   #- curl -o phploc.phar https://phar.phpunit.de/phploc.phar
+  ## PHPDocumentor
+  - mkdir -p build/docs
+  - mkdir -p build/coverage
 
 script:
   ## PHP_CodeSniffer
@@ -46,4 +56,10 @@ script:
   ## PHPLOC
   #- php phploc.phar src/
   ## PHPUnit
-  - phpunit -c ./ --coverage-text
+  - phpunit -c ./ --coverage-text --coverage-html ./build/coverage
+  ## PHPDocumentor
+  - vendor/bin/phpdoc.php -d ./src -t ./build/docs
+
+after_script:
+  ## PHPDocumentor
+  - bash .travis_shell_after_success.sh

.travis_shell_after_success.sh

@@ -0,0 +1,39 @@
+#!/bin/bash
+
+echo "--DEBUG--"
+echo "TRAVIS_REPO_SLUG: $TRAVIS_REPO_SLUG"
+echo "TRAVIS_PHP_VERSION: $TRAVIS_PHP_VERSION"
+echo "TRAVIS_PULL_REQUEST: $TRAVIS_PULL_REQUEST"
+
+if [ "$TRAVIS_REPO_SLUG" == "PHPOffice/PHPWord" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_PHP_VERSION" == "5.5" ]; then
+
+  echo -e "Publishing PHPDoc...\n"
+
+  cp -R build/docs $HOME/docs-latest
+  cp -R build/coverage $HOME/coverage-latest
+
+  cd $HOME
+  git config --global user.email "[email protected]"
+  git config --global user.name "travis-ci"
+  git clone --quiet --branch=gh-pages https://${GH_TOKEN}@github.com/PHPOffice/PHPWord gh-pages > /dev/null
+
+  cd gh-pages
+  echo "--DEBUG : Suppression"
+  git rm -rf ./docs/$TRAVIS_BRANCH
+
+  echo "--DEBUG : Dossier"
+  mkdir -p docs/$TRAVIS_BRANCH
+  mkdir -p coverage/$TRAVIS_BRANCH
+
+  echo "--DEBUG : Copie"
+  cp -Rf $HOME/docs-latest/* ./docs/$TRAVIS_BRANCH/
+  cp -Rf $HOME/coverage-latest/* ./coverage/$TRAVIS_BRANCH/
+
+  echo "--DEBUG : Git"
+  git add -f .
+  git commit -m "PHPDocumentor (Travis Build : $TRAVIS_BUILD_NUMBER  - Branch : $TRAVIS_BRANCH)"
+  git push -fq origin gh-pages > /dev/null
+
+  echo -e "Published PHPDoc to gh-pages.\n"
+
+fi

CHANGELOG.md

@@ -2,7 +2,31 @@
 
 This is the changelog between releases of PHPWord. Releases are listed in reverse chronological order with the latest version listed on top, while additions/changes in each release are listed in chronological order. Changes in each release are divided into three parts: added or change features, bugfixes, and miscellaneous improvements. Each line contains short information about the change made, the person who made it, and the related issue number(s) in GitHub.
 
-## 0.10.0 - Not yet released
+## 0.11.0 - Not yet released
+
+PHPWord license is changed from LGPL 2.1 to LGPL 3 in this release.
+
+### Features
+
+- Image: Ability to define relative and absolute positioning - @basjan GH-217
+
+### Bugfixes
+
+- ...
+
+### Deprecated
+
+- Static classes `Footnotes`, `Endnotes`, and `TOC`
+
+### Miscellaneous
+
+- License: Change the project license from LGPL 2.1 into LGPL 3.0 - GH-211
+- Word2007 Writer: New `Style\Image` class - @ivanlanin
+- Refactor: Replace static classes `Footnotes`, `Endnotes`, and `TOC` with `Collections` - @ivanlanin GH-206
+- QA: Reactivate `phpcpd` and `phpmd` on Travis - @ivanlanin
+- Refactor: PHPMD recommendation: Change all `get...` method that returns `boolean` into `is...` or `has...` - @ivanlanin
+
+## 0.10.0 - 4 May 2014
 
 This release marked heavy refactorings on internal code structure with the creation of some abstract classes to reduce code duplication. `Element` subnamespace is introduced in this release to replace `Section`. Word2007 reader capability is greatly enhanced. Endnote is introduced. List numbering is now customizable. Basic HTML and PDF writing support is enabled. Basic ODText reader is introduced.
 
@@ -66,7 +90,6 @@ This release marked heavy refactorings on internal code structure with the creat
 - `Element\Link::getLinkSrc` replaced by `Element\Link::getTarget`
 - `Element\Link::getLinkName` replaced by `Element\Link::getText`
 - `Style\Cell::getDefaultBorderColor`
-- Static classes `Footnotes`, `Endnotes`, and `TOC`
 
 ### Miscellaneous
 
@@ -88,9 +111,6 @@ This release marked heavy refactorings on internal code structure with the creat
 - Refactor: Apply composite pattern for writers - @ivanlanin
 - Refactor: Split `AbstractContainer` from `AbstractElement` - @ivanlanin
 - Refactor: Apply composite pattern for Word2007 reader - @ivanlanin
-- Refactor: Replace static classes `Footnotes`, `Endnotes`, and `TOC` with `Collections` - @ivanlanin GH-206
-- QA: Reactivate `phpcpd` and `phpmd` on Travis - @ivanlanin
-- Refactor: PHPMD recommendation: Change all `get...` method that returns `boolean` into `is...` or `has...` - @ivanlanin
 
 ## 0.9.1 - 27 Mar 2014