Skip to content

Commit 2fc685b

Browse files
authored
Merge pull request #1138 from troosan/fix-travis-build
do not force dependency to old ZF version
2 parents c653377 + 15585dd commit 2fc685b

File tree

5 files changed

+16
-10
lines changed

5 files changed

+16
-10
lines changed

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
language: php
22

3+
dist: precise
4+
35
php:
46
- 5.3
57
- 5.4

CHANGELOG.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,20 @@ This project adheres to [Semantic Versioning](http://semver.org/).
55

66
v0.14.0 (?? ???? 2017)
77
----------------------
8-
This release fixes several bugs and adds some new features
8+
This release fixes several bugs and adds some new features.
9+
This is the last version to support PHP 5.3
910

1011
### Added
1112
- Possibility to control the footnote numbering - @troosan #1068
1213
- Image creation from string - @troosan #937
1314
- Introduced the `\PhpOffice\PhpWord\SimpleType\NumberFormat` simple type. - @troosan
1415
- Support for ContextualSpacing - @postHawk #1088
1516
- Possiblity to hide spelling and/or grammatical errors - @troosan #542
17+
- Support for Comments - @troosan #1067
18+
- Add support for changing the document language - @troosan #1108
1619

1720
### Fixed
21+
- Loosen dependency to Zend
1822
- Images are not being printed when generating PDF - @hubertinio #1074 #431
1923
- Fixed some PHP 7 warnings - @ likeuntomurphy #927
2024
- Fixed Word 97 reader - @alsofronie @Benpxpx @mario-rivera #912 #920 #892
@@ -23,7 +27,8 @@ This release fixes several bugs and adds some new features
2327
- Fixed Word2007 reader where unnecessary paragraphs were being created - @donghaobo #1043 #620
2428
- Fixed Word2007 reader where margins were not being read correctly - @slowprog #885 #1008
2529
- Impossible to add element PreserveText in Section - @rvanlaak #452
26-
- Missing options for numbering format - @troosan #1041
30+
- Added missing options for numbering format - @troosan #1041
31+
- Fixed impossibility to set a different footer for first page - @ctrlaltca #1116
2732

2833
v0.13.0 (31 July 2016)
2934
-------------------

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,7 @@ PHPWord requires the following:
5757
- PHP 5.3.3+
5858
- [XML Parser extension](http://www.php.net/manual/en/xml.installation.php)
5959
- [Zend\Escaper component](http://framework.zend.com/manual/current/en/modules/zend.escaper.introduction.html)
60-
- Zend\Stdlib component
61-
- [Zend\Validator component](http://framework.zend.com/manual/current/en/modules/zend.validator.html)
60+
- [Zend\Stdlib component](http://framework.zend.com/manual/current/en/modules/zend.stdlib.hydrator.html)
6261
- [Zip extension](http://php.net/manual/en/book.zip.php) (optional, used to write OOXML and ODF)
6362
- [GD extension](http://php.net/manual/en/book.image.php) (optional, used to add images)
6463
- [XMLWriter extension](http://php.net/manual/en/book.xmlwriter.php) (optional, used to write OOXML and ODF)

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
"require": {
3535
"php": ">=5.3.3",
3636
"ext-xml": "*",
37-
"zendframework/zend-escaper": "2.4.*",
38-
"zendframework/zend-stdlib": "2.4.*",
39-
"phpoffice/common": "0.2.*"
37+
"zendframework/zend-escaper": "^2.2",
38+
"zendframework/zend-stdlib": "^2.2",
39+
"phpoffice/common": "^0.2"
4040
},
4141
"require-dev": {
4242
"phpunit/phpunit": "3.7.*",

docs/elements.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,8 @@ Parameters:
158158
- ``$text``. Text that appears in the document.
159159
- ``$depth``. Depth of list item.
160160
- ``$fontStyle``. See :ref:`font-style`.
161-
- ``$listStyle``. List style of the current element TYPE\_NUMBER,
162-
TYPE\_ALPHANUM, TYPE\_BULLET\_FILLED, etc. See list of constants in PHPWord\_Style\_ListItem.
161+
- ``$listStyle``. List style of the current element TYPE\_NUMBER,
162+
TYPE\_ALPHANUM, TYPE\_BULLET\_FILLED, etc. See list of constants in PHPWord\\Style\\ListItem.
163163
- ``$paragraphStyle``. See :ref:`paragraph-style`.
164164

165165
Advanced usage:
@@ -297,7 +297,7 @@ Your TOC can only be generated if you have add at least one title (See "Titles")
297297

298298
Options for ``$tocStyle``:
299299

300-
- ``tabLeader``. Fill type between the title text and the page number. Use the defined constants in PHPWord\_Style\_TOC.
300+
- ``tabLeader``. Fill type between the title text and the page number. Use the defined constants in PHPWord\\Style\\TOC.
301301
- ``tabPos``. The position of the tab where the page number appears in twips.
302302
- ``indent``. The indent factor of the titles in twips.
303303

0 commit comments

Comments
 (0)