Skip to content

Commit f1eded7

Browse files
committed
Merge branch 'master' into develop
2 parents 991016a + 3e0d37e commit f1eded7

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,12 @@ This release marked the change of PHPWord license from LGPL 2.1 to LGPL 3; new r
5858
- Style: Change behaviour of `set...` function of boolean properties; when none is defined, assumed true - @ivanlanin
5959
- Shared: Unify PHP ZipArchive and PCLZip features into PhpWord ZipArchive - @ivanlanin
6060

61+
## 0.10.1 - 21 May 2014
62+
63+
This is a bugfix release for `php-zip` requirement in Composer.
64+
65+
- Change Composer requirements for php-zip from `require` to `suggest` - @bskrtich GH-246
66+
6167
## 0.10.0 - 4 May 2014
6268

6369
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.

composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@
4444
"mpdf/mpdf": "5.*"
4545
},
4646
"suggest": {
47-
"ext-zip": "Used to create docx files",
48-
"ext-gd2": "Required to add images",
49-
"ext-xmlwriter": "Required to write DOCX and ODT",
50-
"ext-xsl": "Required to apply XSL style sheet to template part",
51-
"dompdf/dompdf": "Required to write PDF"
47+
"ext-zip": "Used to write DOCX and ODT",
48+
"ext-gd2": "Used to add images",
49+
"ext-xmlwriter": "Used to write DOCX and ODT",
50+
"ext-xsl": "Used to apply XSL style sheet to template part",
51+
"dompdf/dompdf": "Used to write PDF"
5252
},
5353
"autoload": {
5454
"psr-4": {

0 commit comments

Comments
 (0)