Skip to content

Commit fd4fa11

Browse files
ivanlaninivanlanin
committed
Merge remote-tracking branch 'upstream/develop' into nonstatic
2 parents dd01ed1 + 6c3d1e7 commit fd4fa11

File tree

239 files changed

+287
-324
lines changed

Some content is hidden

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

239 files changed

+287
-324
lines changed

‎docs/intro.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ No Windows operating system is needed for usage because the resulting
1616
DOCX, ODT, or RTF files can be opened by all major `word processing
1717
softwares <http://en.wikipedia.org/wiki/List_of_word_processors>`__.
1818

19-
PHPWord is an open source project licensed under LGPL. PHPWord is `unit
19+
PHPWord is an open source project licensed under LGPL version 3. PHPWord is `unit
2020
tested <https://travis-ci.org/PHPOffice/PHPWord>`__ to make sure that
2121
the released versions are stable.
2222

‎docs/src/documentation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ PHPWord is a library written in pure PHP that provides a set of classes to write
4949

5050
No Windows operating system is needed for usage because the resulting DOCX, ODT, or RTF files can be opened by all major [word processing softwares](http://en.wikipedia.org/wiki/List_of_word_processors).
5151

52-
PHPWord is an open source project licensed under LGPL. PHPWord is [unit tested](https://travis-ci.org/PHPOffice/PHPWord) to make sure that the released versions are stable.
52+
PHPWord is an open source project licensed under LGPL version 3. PHPWord is [unit tested](https://travis-ci.org/PHPOffice/PHPWord) to make sure that the released versions are stable.
5353

5454
**Want to contribute?** [Fork us](https://github.com/PHPOffice/PHPWord/fork) or [submit](https://github.com/PHPOffice/PHPWord/issues) your bug reports or feature requests to us.
5555

‎src/PhpWord/Autoloader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* @link https://github.com/PHPOffice/PHPWord
66
* @copyright 2014 PHPWord
7-
* @license http://www.gnu.org/licenses/lgpl.txt LGPL
7+
* @license http://www.gnu.org/licenses/lgpl.txt LGPL version 3
88
*/
99

1010
namespace PhpOffice\PhpWord;

‎src/PhpWord/DocumentProperties.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* @link https://github.com/PHPOffice/PHPWord
66
* @copyright 2014 PHPWord
7-
* @license http://www.gnu.org/licenses/lgpl.txt LGPL
7+
* @license http://www.gnu.org/licenses/lgpl.txt LGPL version 3
88
*/
99

1010
namespace PhpOffice\PhpWord;

‎src/PhpWord/Element/AbstractContainer.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@
44
*
55
* @link https://github.com/PHPOffice/PHPWord
66
* @copyright 2014 PHPWord
7-
* @license http://www.gnu.org/licenses/lgpl.txt LGPL
7+
* @license http://www.gnu.org/licenses/lgpl.txt LGPL version 3
88
*/
99

1010
namespace PhpOffice\PhpWord\Element;
1111

12-
use PhpOffice\PhpWord\PhpWord;
13-
use PhpOffice\PhpWord\Media;
1412
use PhpOffice\PhpWord\Element\CheckBox;
1513
use PhpOffice\PhpWord\Element\Image;
1614
use PhpOffice\PhpWord\Element\Link;
1715
use PhpOffice\PhpWord\Element\ListItem;
1816
use PhpOffice\PhpWord\Element\Object;
1917
use PhpOffice\PhpWord\Element\TextBreak;
2018
use PhpOffice\PhpWord\Element\TextRun;
19+
use PhpOffice\PhpWord\Media;
20+
use PhpOffice\PhpWord\PhpWord;
2121

2222
/**
2323
* Container abstract class

‎src/PhpWord/Element/AbstractElement.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* @link https://github.com/PHPOffice/PHPWord
66
* @copyright 2014 PHPWord
7-
* @license http://www.gnu.org/licenses/lgpl.txt LGPL
7+
* @license http://www.gnu.org/licenses/lgpl.txt LGPL version 3
88
*/
99

1010
namespace PhpOffice\PhpWord\Element;

‎src/PhpWord/Element/Cell.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* @link https://github.com/PHPOffice/PHPWord
66
* @copyright 2014 PHPWord
7-
* @license http://www.gnu.org/licenses/lgpl.txt LGPL
7+
* @license http://www.gnu.org/licenses/lgpl.txt LGPL version 3
88
*/
99

1010
namespace PhpOffice\PhpWord\Element;

‎src/PhpWord/Element/CheckBox.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* @link https://github.com/PHPOffice/PHPWord
66
* @copyright 2014 PHPWord
7-
* @license http://www.gnu.org/licenses/lgpl.txt LGPL
7+
* @license http://www.gnu.org/licenses/lgpl.txt LGPL version 3
88
*/
99

1010
namespace PhpOffice\PhpWord\Element;

‎src/PhpWord/Element/Endnote.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* @link https://github.com/PHPOffice/PHPWord
66
* @copyright 2014 PHPWord
7-
* @license http://www.gnu.org/licenses/lgpl.txt LGPL
7+
* @license http://www.gnu.org/licenses/lgpl.txt LGPL version 3
88
*/
99

1010
namespace PhpOffice\PhpWord\Element;

‎src/PhpWord/Element/Footer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* @link https://github.com/PHPOffice/PHPWord
66
* @copyright 2014 PHPWord
7-
* @license http://www.gnu.org/licenses/lgpl.txt LGPL
7+
* @license http://www.gnu.org/licenses/lgpl.txt LGPL version 3
88
*/
99

1010
namespace PhpOffice\PhpWord\Element;

‎src/PhpWord/Element/Footnote.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* @link https://github.com/PHPOffice/PHPWord
66
* @copyright 2014 PHPWord
7-
* @license http://www.gnu.org/licenses/lgpl.txt LGPL
7+
* @license http://www.gnu.org/licenses/lgpl.txt LGPL version 3
88
*/
99

1010
namespace PhpOffice\PhpWord\Element;

‎src/PhpWord/Element/Header.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,11 @@
44
*
55
* @link https://github.com/PHPOffice/PHPWord
66
* @copyright 2014 PHPWord
7-
* @license http://www.gnu.org/licenses/lgpl.txt LGPL
7+
* @license http://www.gnu.org/licenses/lgpl.txt LGPL version 3
88
*/
99

1010
namespace PhpOffice\PhpWord\Element;
1111

12-
use PhpOffice\PhpWord\Element\Image;
13-
1412
/**
1513
* Header element
1614
*/

‎src/PhpWord/Element/Image.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
*
55
* @link https://github.com/PHPOffice/PHPWord
66
* @copyright 2014 PHPWord
7-
* @license http://www.gnu.org/licenses/lgpl.txt LGPL
7+
* @license http://www.gnu.org/licenses/lgpl.txt LGPL version 3
88
*/
99

1010
namespace PhpOffice\PhpWord\Element;
1111

12-
use PhpOffice\PhpWord\Settings;
1312
use PhpOffice\PhpWord\Exception\InvalidImageException;
1413
use PhpOffice\PhpWord\Exception\UnsupportedImageTypeException;
14+
use PhpOffice\PhpWord\Settings;
1515
use PhpOffice\PhpWord\Style\Image as ImageStyle;
1616

1717
/**

‎src/PhpWord/Element/Link.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* @link https://github.com/PHPOffice/PHPWord
66
* @copyright 2014 PHPWord
7-
* @license http://www.gnu.org/licenses/lgpl.txt LGPL
7+
* @license http://www.gnu.org/licenses/lgpl.txt LGPL version 3
88
*/
99

1010
namespace PhpOffice\PhpWord\Element;

‎src/PhpWord/Element/ListItem.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* @link https://github.com/PHPOffice/PHPWord
66
* @copyright 2014 PHPWord
7-
* @license http://www.gnu.org/licenses/lgpl.txt LGPL
7+
* @license http://www.gnu.org/licenses/lgpl.txt LGPL version 3
88
*/
99

1010
namespace PhpOffice\PhpWord\Element;

‎src/PhpWord/Element/Object.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* @link https://github.com/PHPOffice/PHPWord
66
* @copyright 2014 PHPWord
7-
* @license http://www.gnu.org/licenses/lgpl.txt LGPL
7+
* @license http://www.gnu.org/licenses/lgpl.txt LGPL version 3
88
*/
99

1010
namespace PhpOffice\PhpWord\Element;

‎src/PhpWord/Element/PageBreak.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* @link https://github.com/PHPOffice/PHPWord
66
* @copyright 2014 PHPWord
7-
* @license http://www.gnu.org/licenses/lgpl.txt LGPL
7+
* @license http://www.gnu.org/licenses/lgpl.txt LGPL version 3
88
*/
99

1010
namespace PhpOffice\PhpWord\Element;

‎src/PhpWord/Element/PreserveText.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* @link https://github.com/PHPOffice/PHPWord
66
* @copyright 2014 PHPWord
7-
* @license http://www.gnu.org/licenses/lgpl.txt LGPL
7+
* @license http://www.gnu.org/licenses/lgpl.txt LGPL version 3
88
*/
99

1010
namespace PhpOffice\PhpWord\Element;

‎src/PhpWord/Element/Row.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* @link https://github.com/PHPOffice/PHPWord
66
* @copyright 2014 PHPWord
7-
* @license http://www.gnu.org/licenses/lgpl.txt LGPL
7+
* @license http://www.gnu.org/licenses/lgpl.txt LGPL version 3
88
*/
99

1010
namespace PhpOffice\PhpWord\Element;

‎src/PhpWord/Element/Section.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
*
55
* @link https://github.com/PHPOffice/PHPWord
66
* @copyright 2014 PHPWord
7-
* @license http://www.gnu.org/licenses/lgpl.txt LGPL
7+
* @license http://www.gnu.org/licenses/lgpl.txt LGPL version 3
88
*/
99

1010
namespace PhpOffice\PhpWord\Element;
1111

12-
use PhpOffice\PhpWord\PhpWord;
1312
use PhpOffice\PhpWord\Element\PageBreak;
14-
use PhpOffice\PhpWord\Element\Table;
1513
use PhpOffice\PhpWord\Element\TOC;
14+
use PhpOffice\PhpWord\Element\Table;
1615
use PhpOffice\PhpWord\Element\Title;
1716
use PhpOffice\PhpWord\Exception\Exception;
17+
use PhpOffice\PhpWord\PhpWord;
1818
use PhpOffice\PhpWord\Style\Section as SectionSettings;
1919

2020
/**

‎src/PhpWord/Element/Table.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* @link https://github.com/PHPOffice/PHPWord
66
* @copyright 2014 PHPWord
7-
* @license http://www.gnu.org/licenses/lgpl.txt LGPL
7+
* @license http://www.gnu.org/licenses/lgpl.txt LGPL version 3
88
*/
99

1010
namespace PhpOffice\PhpWord\Element;

‎src/PhpWord/Element/Text.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* @link https://github.com/PHPOffice/PHPWord
66
* @copyright 2014 PHPWord
7-
* @license http://www.gnu.org/licenses/lgpl.txt LGPL
7+
* @license http://www.gnu.org/licenses/lgpl.txt LGPL version 3
88
*/
99

1010
namespace PhpOffice\PhpWord\Element;

‎src/PhpWord/Element/TextBreak.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* @link https://github.com/PHPOffice/PHPWord
66
* @copyright 2014 PHPWord
7-
* @license http://www.gnu.org/licenses/lgpl.txt LGPL
7+
* @license http://www.gnu.org/licenses/lgpl.txt LGPL version 3
88
*/
99

1010
namespace PhpOffice\PhpWord\Element;

‎src/PhpWord/Element/TextRun.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* @link https://github.com/PHPOffice/PHPWord
66
* @copyright 2014 PHPWord
7-
* @license http://www.gnu.org/licenses/lgpl.txt LGPL
7+
* @license http://www.gnu.org/licenses/lgpl.txt LGPL version 3
88
*/
99

1010
namespace PhpOffice\PhpWord\Element;

‎src/PhpWord/Element/Title.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* @link https://github.com/PHPOffice/PHPWord
66
* @copyright 2014 PHPWord
7-
* @license http://www.gnu.org/licenses/lgpl.txt LGPL
7+
* @license http://www.gnu.org/licenses/lgpl.txt LGPL version 3
88
*/
99

1010
namespace PhpOffice\PhpWord\Element;

‎src/PhpWord/Exception/Exception.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* @link https://github.com/PHPOffice/PHPWord
66
* @copyright 2014 PHPWord
7-
* @license http://www.gnu.org/licenses/lgpl.txt LGPL
7+
* @license http://www.gnu.org/licenses/lgpl.txt LGPL version 3
88
*/
99

1010
namespace PhpOffice\PhpWord\Exception;

‎src/PhpWord/Exception/InvalidImageException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* @link https://github.com/PHPOffice/PHPWord
66
* @copyright 2014 PHPWord
7-
* @license http://www.gnu.org/licenses/lgpl.txt LGPL
7+
* @license http://www.gnu.org/licenses/lgpl.txt LGPL version 3
88
*/
99

1010
namespace PhpOffice\PhpWord\Exception;

‎src/PhpWord/Exception/InvalidObjectException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* @link https://github.com/PHPOffice/PHPWord
66
* @copyright 2014 PHPWord
7-
* @license http://www.gnu.org/licenses/lgpl.txt LGPL
7+
* @license http://www.gnu.org/licenses/lgpl.txt LGPL version 3
88
*/
99

1010
namespace PhpOffice\PhpWord\Exception;

‎src/PhpWord/Exception/InvalidStyleException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* @link https://github.com/PHPOffice/PHPWord
66
* @copyright 2014 PHPWord
7-
* @license http://www.gnu.org/licenses/lgpl.txt LGPL
7+
* @license http://www.gnu.org/licenses/lgpl.txt LGPL version 3
88
*/
99

1010
namespace PhpOffice\PhpWord\Exception;

‎src/PhpWord/Exception/UnsupportedImageTypeException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* @link https://github.com/PHPOffice/PHPWord
66
* @copyright 2014 PHPWord
7-
* @license http://www.gnu.org/licenses/lgpl.txt LGPL
7+
* @license http://www.gnu.org/licenses/lgpl.txt LGPL version 3
88
*/
99

1010
namespace PhpOffice\PhpWord\Exception;

‎src/PhpWord/IOFactory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* @link https://github.com/PHPOffice/PHPWord
66
* @copyright 2014 PHPWord
7-
* @license http://www.gnu.org/licenses/lgpl.txt LGPL
7+
* @license http://www.gnu.org/licenses/lgpl.txt LGPL version 3
88
*/
99

1010
namespace PhpOffice\PhpWord;

‎src/PhpWord/Media.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* @link https://github.com/PHPOffice/PHPWord
66
* @copyright 2014 PHPWord
7-
* @license http://www.gnu.org/licenses/lgpl.txt LGPL
7+
* @license http://www.gnu.org/licenses/lgpl.txt LGPL version 3
88
*/
99

1010
namespace PhpOffice\PhpWord;

‎src/PhpWord/PhpWord.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@
44
*
55
* @link https://github.com/PHPOffice/PHPWord
66
* @copyright 2014 PHPWord
7-
* @license http://www.gnu.org/licenses/lgpl.txt LGPL
7+
* @license http://www.gnu.org/licenses/lgpl.txt LGPL version 3
88
*/
99

1010
namespace PhpOffice\PhpWord;
1111

12+
use PhpOffice\PhpWord\Collection\Endnotes;
13+
use PhpOffice\PhpWord\Collection\Footnotes;
14+
use PhpOffice\PhpWord\Collection\Titles;
1215
use PhpOffice\PhpWord\DocumentProperties;
16+
use PhpOffice\PhpWord\Element\Section;
17+
use PhpOffice\PhpWord\Exception\Exception;
1318
use PhpOffice\PhpWord\Style;
1419
use PhpOffice\PhpWord\Template;
15-
use PhpOffice\PhpWord\Collection\Titles;
16-
use PhpOffice\PhpWord\Collection\Footnotes;
17-
use PhpOffice\PhpWord\Collection\Endnotes;
18-
use PhpOffice\PhpWord\Exception\Exception;
19-
use PhpOffice\PhpWord\Element\Section;
2020

2121
/**
2222
* PHPWord main class

‎src/PhpWord/Reader/AbstractReader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* @link https://github.com/PHPOffice/PHPWord
66
* @copyright 2014 PHPWord
7-
* @license http://www.gnu.org/licenses/lgpl.txt LGPL
7+
* @license http://www.gnu.org/licenses/lgpl.txt LGPL version 3
88
*/
99

1010
namespace PhpOffice\PhpWord\Reader;

‎src/PhpWord/Reader/ODText.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* @link https://github.com/PHPOffice/PHPWord
66
* @copyright 2014 PHPWord
7-
* @license http://www.gnu.org/licenses/lgpl.txt LGPL
7+
* @license http://www.gnu.org/licenses/lgpl.txt LGPL version 3
88
*/
99

1010
namespace PhpOffice\PhpWord\Reader;

‎src/PhpWord/Reader/ODText/AbstractPart.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* @link https://github.com/PHPOffice/PHPWord
66
* @copyright 2014 PHPWord
7-
* @license http://www.gnu.org/licenses/lgpl.txt LGPL
7+
* @license http://www.gnu.org/licenses/lgpl.txt LGPL version 3
88
*/
99

1010
namespace PhpOffice\PhpWord\Reader\ODText;

‎src/PhpWord/Reader/ODText/Content.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* @link https://github.com/PHPOffice/PHPWord
66
* @copyright 2014 PHPWord
7-
* @license http://www.gnu.org/licenses/lgpl.txt LGPL
7+
* @license http://www.gnu.org/licenses/lgpl.txt LGPL version 3
88
*/
99

1010
namespace PhpOffice\PhpWord\Reader\ODText;

‎src/PhpWord/Reader/ReaderInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* @link https://github.com/PHPOffice/PHPWord
66
* @copyright 2014 PHPWord
7-
* @license http://www.gnu.org/licenses/lgpl.txt LGPL
7+
* @license http://www.gnu.org/licenses/lgpl.txt LGPL version 3
88
*/
99

1010
namespace PhpOffice\PhpWord\Reader;

0 commit comments

Comments
 (0)