From 7c21e540b018541053ae5bacff7d9c54a9ceedb3 Mon Sep 17 00:00:00 2001 From: Ivan Lanin Date: Sun, 4 May 2014 17:06:24 +0700 Subject: [PATCH 1/4] 0.10 release date: 4 May 2014 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e23edf91..34c57b24 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ 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.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. From 232a30a1c41e9dbfb52a02610311072e37308dd7 Mon Sep 17 00:00:00 2001 From: Ivan Lanin Date: Tue, 6 May 2014 17:32:32 +0700 Subject: [PATCH 2/4] Enable code coverage in Scrutinizer --- .scrutinizer.yml | 16 ++++++++++++++++ .travis.yml | 5 +++++ phpunit.xml.dist | 3 +++ 3 files changed, 24 insertions(+) create mode 100644 .scrutinizer.yml diff --git a/.scrutinizer.yml b/.scrutinizer.yml new file mode 100644 index 00000000..8efd68d3 --- /dev/null +++ b/.scrutinizer.yml @@ -0,0 +1,16 @@ +filter: + excluded_paths: [ 'vendor/*', 'tests/*', 'samples/*', 'src/PhpWord/Shared/PCLZip/*' ] + +before_commands: + - "composer install --prefer-source --dev" + +tools: + external_code_coverage: + enabled: true + timeout: 900 + php_code_coverage: + enabled: false + test_command: phpunit -c phpunit.xml.dist + php_sim: true + php_pdepend: true + php_analyzer: true diff --git a/.travis.yml b/.travis.yml index ad3df613..8cc348f8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,3 +48,8 @@ script: #- php phploc.phar src/ ## PHPUnit - phpunit -c ./ --coverage-text + +after_script: + ## Scrutinizer + - wget https://scrutinizer-ci.com/ocular.phar + - php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml diff --git a/phpunit.xml.dist b/phpunit.xml.dist index f77b9ce3..c7e59676 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -21,4 +21,7 @@ + + + \ No newline at end of file From 4e190b10cf90f45a69b67e158af88d25cf1b57aa Mon Sep 17 00:00:00 2001 From: Brandon Skrtich Date: Wed, 21 May 2014 10:35:40 -0600 Subject: [PATCH 3/4] Update composer requirements for php-zip With PCLZip support added php-zip isn't a requirement any more. --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index fafa9a28..f9fad331 100644 --- a/composer.json +++ b/composer.json @@ -33,13 +33,13 @@ ], "require": { "php": ">=5.3.3", - "ext-xml": "*", - "ext-zip": "*" + "ext-xml": "*" }, "require-dev": { "phpunit/phpunit": "3.7.*" }, "suggest": { + "ext-zip": "Used to write DOCX and ODT", "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", From 3e0d37ec94d1f82a006fb7d962693d9e82fffe42 Mon Sep 17 00:00:00 2001 From: Ivan Lanin Date: Thu, 22 May 2014 00:05:12 +0700 Subject: [PATCH 4/4] Update changelog --- CHANGELOG.md | 6 ++++++ composer.json | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 34c57b24..02439e1b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ 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.1 - 21 May 2014 + +This is a bugfix release for `php-zip` requirement in Composer. + +- Change Composer requirements for php-zip from `require` to `suggest` - @bskrtich GH-246 + ## 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. diff --git a/composer.json b/composer.json index f9fad331..e9daa890 100644 --- a/composer.json +++ b/composer.json @@ -40,10 +40,10 @@ }, "suggest": { "ext-zip": "Used to write DOCX and ODT", - "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", - "dompdf/dompdf": "Required to write PDF" + "ext-gd2": "Used to add images", + "ext-xmlwriter": "Used to write DOCX and ODT", + "ext-xsl": "Used to apply XSL style sheet to template part", + "dompdf/dompdf": "Used to write PDF" }, "autoload": { "psr-4": {