Skip to content

Commit ac6f5a3

Browse files
committed
Merge pull request #177 from PHPOffice/develop
Version 0.9.0
2 parents 17ab0ce + 72bb688 commit ac6f5a3

File tree

251 files changed

+10348
-8753
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

251 files changed

+10348
-8753
lines changed

.gitignore

+2-7
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,12 @@
55
Thumbs.db
66
Desktop.ini
77
.idea
8+
_build
89
phpunit.xml
910
composer.lock
1011
composer.phar
1112
vendor
1213
/report
1314
/.settings
1415
/.buildpath
15-
/.project
16-
/docs
17-
*.odt
18-
*.docx
19-
*.rtf
20-
*.txt
21-
*.xml
16+
/.project

.travis.yml

+21-18
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,49 @@
11
language: php
2+
23
php:
4+
- 5.3.3
35
- 5.3
46
- 5.4
57
- 5.5
6-
## @reference https://github.com/travis-ci/travis-ci/issues/1749
8+
- 5.6
79
- hhvm
10+
811
matrix:
912
allow_failures:
13+
- php: 5.3.3
14+
- php: 5.6
1015
- php: hhvm
11-
16+
1217
before_script:
1318
## Composer
14-
- curl -s http://getcomposer.org/installer | php
15-
- php composer.phar install --prefer-source
19+
# - curl -s http://getcomposer.org/installer | php
20+
# - php composer.phar install --prefer-source
21+
- composer install --prefer-source
22+
- composer selfupdate --quiet
1623
## PHP_CodeSniffer
1724
- pyrus install pear/PHP_CodeSniffer
1825
- phpenv rehash
1926
## PHP Copy/Paste Detector
20-
- curl -o phpcpd.phar https://phar.phpunit.de/phpcpd.phar
27+
#- curl -o phpcpd.phar https://phar.phpunit.de/phpcpd.phar
2128
## PHP Mess Detector
22-
- pear config-set preferred_state beta
23-
- printf "\n" | pecl install imagick
29+
#- pear config-set preferred_state beta
30+
#- printf "\n" | pecl install imagick
2431
#- pear channel-discover pear.phpmd.org
2532
#- pear channel-discover pear.pdepend.org
2633
#- pear install --alldeps phpmd/PHP_PMD
27-
- phpenv rehash
34+
#- phpenv rehash
2835
## PHPLOC
29-
- curl -o phploc.phar https://phar.phpunit.de/phploc.phar
36+
#- curl -o phploc.phar https://phar.phpunit.de/phploc.phar
3037

3138
script:
3239
## PHP_CodeSniffer
33-
- phpcs --standard=PSR1 Classes/
34-
- phpcs --standard=PSR2 Classes/
40+
- phpcs --standard=PSR2 -n src/
41+
- phpcs --standard=PSR2 -n tests/
3542
## PHP Copy/Paste Detector
36-
- php phpcpd.phar --verbose Classes/
43+
#- php phpcpd.phar --verbose src/
3744
## PHP Mess Detector
38-
#- phpmd Classes/ text unusedcode,naming,design
45+
#- phpmd src/ text unusedcode,naming,design
3946
## PHPLOC
40-
- php phploc.phar Classes/
47+
#- php phploc.phar src/
4148
## PHPUnit
4249
- phpunit -c ./ --coverage-text
43-
44-
notifications:
45-
email:
46-

CHANGELOG.md

+111
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,111 @@
1+
# Changelog
2+
3+
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.
4+
5+
## 0.9.0 - Not yet released
6+
7+
This release marked the transformation to namespaces (PHP 5.3+).
8+
9+
### Features
10+
11+
- Image: Ability to use remote or GD images using `addImage()` on sections, headers, footer, cells, and textruns - @ivanlanin
12+
- Header: Ability to use remote or GD images using `addWatermark()` - @ivanlanin
13+
14+
### Bugfixes
15+
16+
- Preserve text doesn't render correctly when the text is not the first word, e.g. 'Page {PAGE}' - @ivanlanin
17+
18+
### Miscellaneous
19+
20+
- Move documentation to [Read The Docs](http://phpword.readthedocs.org/en/develop/) - @Progi1984 @ivanlanin GH-82
21+
- Reorganize and redesign samples folder - @ivanlanin GH-137
22+
- Use `PhpOffice\PhpWord` namespace for PSR compliance - @RomanSyroeshko @gabrielbull GH-159 GH-58
23+
- Restructure folders and change folder name `Classes` to `src` and `Tests` to `test` for PSR compliance - @RomanSyroeshko @gabrielbull
24+
- Compliance to phpDocumentor - @ivanlanin
25+
- Merge Style\TableFull into Style\Table. Style\TableFull is deprecated - @ivanlanin GH-160
26+
- Merge Section\MemoryImage into Section\Image. Section\Image is deprecated - @ivanlanin GH-160
27+
28+
## 0.8.1 - 17 Mar 2014
29+
30+
This is a bugfix release for image detection functionality.
31+
32+
- Added fallback for computers that do not have exif_imagetype - @bskrtich, @gabrielbull
33+
34+
## 0.8.0 - 15 Mar 2014
35+
36+
This release merged a lot of improvements from the community. Unit tests introduced in this release and has reached 90% code coverage.
37+
38+
### Features
39+
40+
- Template: Permit to save a template generated as a file (PHPWord_Template::saveAs()) - @RomanSyroeshko GH-56 GH-57
41+
- Word2007: Support sections page numbering - @gabrielbull
42+
- Word2007: Added line height methods to mirror the line height settings in Word in the paragraph styling - @gabrielbull
43+
- Word2007: Added support for page header & page footer height - @JillElaine GH-5
44+
- General: Add ability to manage line breaks after image insertion - @bskrtich GH-6 GH-66 GH-84
45+
- Template: Ability to limit number of replacements performed by setValue() method of Template class - @RomanSyroeshko GH-52 GH-53 GH-85
46+
- Table row: Repeat as header row & allow row to break across pages - @ivanlanin GH-48 GH-86
47+
- Table: Table width in percentage - @ivanlanin GH-48 GH-86
48+
- Font: Superscript and subscript - @ivanlanin GH-48 GH-86
49+
- Paragraph: Hanging paragraph - @ivanlanin GH-48 GH-86
50+
- Section: Multicolumn and section break - @ivanlanin GH-48 GH-86
51+
- Template: Ability to apply XSL style sheet to Template - @RomanSyroeshko GH-46 GH-47 GH-83
52+
- General: PHPWord_Shared_Font::pointSizeToTwips() converter - @ivanlanin GH-87
53+
- Paragraph: Ability to define normal paragraph style with PHPWord::setNormalStyle() - @ivanlanin GH-87
54+
- Paragraph: Ability to define parent style (basedOn) and style for following paragraph (next) - @ivanlanin GH-87
55+
- Clone table rows on the fly when using a template document - @jeroenmoors GH-44 GH-88
56+
- Initial addition of basic footnote support - @deds GH-16
57+
- Paragraph: Ability to define paragraph pagination: widow control, keep next, keep lines, and page break before - @ivanlanin GH-92
58+
- General: PHPWord_Style_Font refactoring - @ivanlanin GH-93
59+
- Font: Use points instead of halfpoints internally. Conversion to halfpoints done during XML Writing. - @ivanlanin GH-93
60+
- Paragraph: setTabs() function - @ivanlanin GH-92
61+
- General: Basic support for TextRun on ODT and RTF - @ivanlanin GH-99
62+
- Reader: Basic Reader for Word2007 - @ivanlanin GH-104
63+
- TextRun: Allow Text Break in Text Run - @bskrtich GH-109
64+
- General: Support for East Asian fontstyle - @jhfangying GH-111 GH-118
65+
- Image: Use exif_imagetype to check image format instead of extension name - @gabrielbull GH-114
66+
- General: Setting for XMLWriter Compatibility option - @bskrtich GH-103
67+
- MemoryImage: Allow remote image when allow_url_open = on - @ivanlanin GH-122
68+
- TextBreak: Allow font and paragraph style for text break - @ivanlanin GH-18
69+
70+
### Bugfixes
71+
72+
- Fixed bug with cell styling - @gabrielbull
73+
- Fixed bug list items inside of cells - @gabrielbull
74+
- Adding a value that contains "&" in a template breaks it - @SiebelsTim GH-51
75+
- Example in README.md is broken - @Progi1984 GH-89
76+
- General: PHPWord_Shared_Drawing::centimetersToPixels() conversion - @ivanlanin GH-94
77+
- Footnote: Corrupt DOCX reported by MS Word when sections > 1 and not every sections have footnote - @ivanlanin GH-125
78+
79+
### Miscellaneous
80+
81+
- UnitTests - @Progi1984
82+
83+
## 0.7.0 - 28 Jan 2014
84+
85+
This is the first release after a long development hiatus in [CodePlex](https://phpword.codeplex.com/). This release initialized ODT and RTF Writer, along with some other new features for the existing Word2007 Writer, e.g. tab, multiple header, rowspan and colspan. [Composer](https://packagist.org/packages/phpoffice/phpword) and [Travis](https://travis-ci.org/PHPOffice/PHPWord) were added.
86+
87+
### Features
88+
89+
- Implement RTF Writer - @Progi1984 GH-1
90+
- Implement ODT Writer - @Progi1984 GH-2
91+
- Word2007: Add rowspan and colspan to cells - @kaystrobach
92+
- Word2007: Support for tab stops - @RLovelett
93+
- Word2007: Support Multiple headers - @RLovelett
94+
- Word2007: Wrapping Styles to Images - @gabrielbull
95+
- Added support for image wrapping style - @gabrielbull
96+
97+
### Bugfixes
98+
99+
- "Warning: Invalid error type specified in ...\PHPWord.php on line 226" is thrown when the specified template file is not found - @RomanSyroeshko GH-32
100+
- PHPWord_Shared_String.IsUTF8 returns FALSE for Cyrillic UTF-8 input - @RomanSyroeshko GH-34
101+
- Temporary files naming logic in PHPWord_Template can lead to a collision - @RomanSyroeshko GH-38
102+
103+
### Miscellaneous
104+
105+
- Add superscript/subscript styling in Excel2007 Writer - @MarkBaker
106+
- add indentation support to paragraphs - @deds
107+
- Support for Composer - @Progi1984 GH-27
108+
- Basic CI with Travis - @Progi1984
109+
- Added PHPWord_Exception and exception when could not copy the template - @Progi1984
110+
- IMPROVED: Moved examples out of Classes directory - @Progi1984
111+
- IMPROVED: Advanced string replace in setValue for Template - @Esmeraldo CP-49

CONTRIBUTING.md

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Contributing to PHPWord
2+
3+
PHPWord is build by the crowd and for the crowd. Every contributions are welcomed; either by [submitting](https://github.com/PHPOffice/PHPWord/issues) bug issues or suggesting improvements, or in a more active form like [requesting](https://github.com/PHPOffice/PHPWord/pulls) a pull.
4+
5+
We want to create a high quality document writer and reader library that people can use with more confidence and less bugs. We want to collaborate happily, code joyfully, and get a life merrily. Thus, below are some guidelines that we expect to be followed by each contributor.
6+
7+
- **Be brief, but be bold**: State your issues briefly, but speak out your ideas loudly, even if you can't or don't know how to implement it right away. The world will be better with limitless innovations.
8+
- **Code in PSR**: We use PHP Standards Recommendation (PSR) from as the PHP Framework Interoperability Group (PHP-FIG). If you're not familiar with this standard, please [familiarize yourself now](https://github.com/php-fig/fig-standards). Use [PHPCodeSniffer](http://pear.php.net/package/PHP_CodeSniffer/) to check your code against this standard.
9+
- **Test your code**: Nobody else knows your code better than you. So, please, test your own code before submitting your pull request. PHPWord uses [PHPUnit](http://phpunit.de/) as our testing framework.
10+
- **Request pull in separate branch**: Do not submit your request to the master branch, but create a separate branch named specifically for the issue that you addressed. Read [GitHub manual](https://help.github.com/articles/using-pull-requests) to find out more about this. If you are new to GitHub, read [this short manual](https://help.github.com/articles/fork-a-repo) to get you familiar with forks and how git works in general.
11+
12+
That's it. Thank you for your interest in PHPWord, and welcome!
13+
14+
May the Force be with you.

0 commit comments

Comments
 (0)