Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove static classes #206; Reactivate PHPCPD and PHPMD #220

Merged
merged 7 commits into from
May 4, 2014
Merged

Remove static classes #206; Reactivate PHPCPD and PHPMD #220

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
725162b
Deprecate static classes Footnotes, Endnotes, and TOC (#206); Reactiv…
ivanlanin May 3, 2014
f6f52af
Fix Travis build error
ivanlanin May 4, 2014
c21e28f
More refactoring for PHPMD compliance
ivanlanin May 4, 2014
3d19256
Merge branch 'develop' into nonstatic
ivanlanin May 4, 2014
d1022a9
QA: PHPMD fixes for `tests`; Some adjustment for Travis build
ivanlanin May 4, 2014
dd01ed1
Fix .travis.yml
ivanlanin May 4, 2014
fd4fa11
Merge remote-tracking branch 'upstream/develop' into nonstatic
ivanlanin May 4, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Merge remote-tracking branch 'upstream/develop' into nonstatic
  • Loading branch information
@ivanlanin
ivanlanin committed May 4, 2014
commit fd4fa11390acba2df2170b246c67278968c23365
2 changes: 1 addition & 1 deletion docs/intro.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ 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 <https://en.wikipedia.org/wiki/List_of_word_processors>`__.

PHPWord is an open source project licensed under LGPL. PHPWord is `unit
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.

Expand Down
2 changes: 1 addition & 1 deletion docs/src/documentation.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ PHPWord is a library written in pure PHP that provides a set of classes to write

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](https://en.wikipedia.org/wiki/List_of_word_processors).

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

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

Expand Down
2 changes: 1 addition & 1 deletion src/PhpWord/Autoloader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @link https://github.com/PHPOffice/PHPWord
* @copyright 2014 PHPWord
* @license https://www.gnu.org/licenses/lgpl.txt LGPL
* @license https://www.gnu.org/licenses/lgpl.txt LGPL version 3
*/

namespace PhpOffice\PhpWord;
Expand Down
2 changes: 1 addition & 1 deletion src/PhpWord/DocumentProperties.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @link https://github.com/PHPOffice/PHPWord
* @copyright 2014 PHPWord
* @license https://www.gnu.org/licenses/lgpl.txt LGPL
* @license https://www.gnu.org/licenses/lgpl.txt LGPL version 3
*/

namespace PhpOffice\PhpWord;
Expand Down
6 changes: 3 additions & 3 deletions src/PhpWord/Element/AbstractContainer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@
*
* @link https://github.com/PHPOffice/PHPWord
* @copyright 2014 PHPWord
* @license https://www.gnu.org/licenses/lgpl.txt LGPL
* @license https://www.gnu.org/licenses/lgpl.txt LGPL version 3
*/

namespace PhpOffice\PhpWord\Element;

use PhpOffice\PhpWord\PhpWord;
use PhpOffice\PhpWord\Media;
use PhpOffice\PhpWord\Element\CheckBox;
use PhpOffice\PhpWord\Element\Image;
use PhpOffice\PhpWord\Element\Link;
use PhpOffice\PhpWord\Element\ListItem;
use PhpOffice\PhpWord\Element\Object;
use PhpOffice\PhpWord\Element\TextBreak;
use PhpOffice\PhpWord\Element\TextRun;
use PhpOffice\PhpWord\Media;
use PhpOffice\PhpWord\PhpWord;

/**
* Container abstract class
Expand Down
2 changes: 1 addition & 1 deletion src/PhpWord/Element/AbstractElement.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @link https://github.com/PHPOffice/PHPWord
* @copyright 2014 PHPWord
* @license https://www.gnu.org/licenses/lgpl.txt LGPL
* @license https://www.gnu.org/licenses/lgpl.txt LGPL version 3
*/

namespace PhpOffice\PhpWord\Element;
Expand Down
2 changes: 1 addition & 1 deletion src/PhpWord/Element/Cell.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @link https://github.com/PHPOffice/PHPWord
* @copyright 2014 PHPWord
* @license https://www.gnu.org/licenses/lgpl.txt LGPL
* @license https://www.gnu.org/licenses/lgpl.txt LGPL version 3
*/

namespace PhpOffice\PhpWord\Element;
Expand Down
2 changes: 1 addition & 1 deletion src/PhpWord/Element/CheckBox.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @link https://github.com/PHPOffice/PHPWord
* @copyright 2014 PHPWord
* @license https://www.gnu.org/licenses/lgpl.txt LGPL
* @license https://www.gnu.org/licenses/lgpl.txt LGPL version 3
*/

namespace PhpOffice\PhpWord\Element;
Expand Down
2 changes: 1 addition & 1 deletion src/PhpWord/Element/Endnote.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @link https://github.com/PHPOffice/PHPWord
* @copyright 2014 PHPWord
* @license https://www.gnu.org/licenses/lgpl.txt LGPL
* @license https://www.gnu.org/licenses/lgpl.txt LGPL version 3
*/

namespace PhpOffice\PhpWord\Element;
Expand Down
2 changes: 1 addition & 1 deletion src/PhpWord/Element/Footer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @link https://github.com/PHPOffice/PHPWord
* @copyright 2014 PHPWord
* @license https://www.gnu.org/licenses/lgpl.txt LGPL
* @license https://www.gnu.org/licenses/lgpl.txt LGPL version 3
*/

namespace PhpOffice\PhpWord\Element;
Expand Down
2 changes: 1 addition & 1 deletion src/PhpWord/Element/Footnote.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @link https://github.com/PHPOffice/PHPWord
* @copyright 2014 PHPWord
* @license https://www.gnu.org/licenses/lgpl.txt LGPL
* @license https://www.gnu.org/licenses/lgpl.txt LGPL version 3
*/

namespace PhpOffice\PhpWord\Element;
Expand Down
4 changes: 1 addition & 3 deletions src/PhpWord/Element/Header.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,11 @@
*
* @link https://github.com/PHPOffice/PHPWord
* @copyright 2014 PHPWord
* @license https://www.gnu.org/licenses/lgpl.txt LGPL
* @license https://www.gnu.org/licenses/lgpl.txt LGPL version 3
*/

namespace PhpOffice\PhpWord\Element;

use PhpOffice\PhpWord\Element\Image;

/**
* Header element
*/
Expand Down
4 changes: 2 additions & 2 deletions src/PhpWord/Element/Image.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
*
* @link https://github.com/PHPOffice/PHPWord
* @copyright 2014 PHPWord
* @license https://www.gnu.org/licenses/lgpl.txt LGPL
* @license https://www.gnu.org/licenses/lgpl.txt LGPL version 3
*/

namespace PhpOffice\PhpWord\Element;

use PhpOffice\PhpWord\Settings;
use PhpOffice\PhpWord\Exception\InvalidImageException;
use PhpOffice\PhpWord\Exception\UnsupportedImageTypeException;
use PhpOffice\PhpWord\Settings;
use PhpOffice\PhpWord\Style\Image as ImageStyle;

/**
Expand Down
2 changes: 1 addition & 1 deletion src/PhpWord/Element/Link.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @link https://github.com/PHPOffice/PHPWord
* @copyright 2014 PHPWord
* @license https://www.gnu.org/licenses/lgpl.txt LGPL
* @license https://www.gnu.org/licenses/lgpl.txt LGPL version 3
*/

namespace PhpOffice\PhpWord\Element;
Expand Down
2 changes: 1 addition & 1 deletion src/PhpWord/Element/ListItem.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @link https://github.com/PHPOffice/PHPWord
* @copyright 2014 PHPWord
* @license https://www.gnu.org/licenses/lgpl.txt LGPL
* @license https://www.gnu.org/licenses/lgpl.txt LGPL version 3
*/

namespace PhpOffice\PhpWord\Element;
Expand Down
2 changes: 1 addition & 1 deletion src/PhpWord/Element/Object.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @link https://github.com/PHPOffice/PHPWord
* @copyright 2014 PHPWord
* @license https://www.gnu.org/licenses/lgpl.txt LGPL
* @license https://www.gnu.org/licenses/lgpl.txt LGPL version 3
*/

namespace PhpOffice\PhpWord\Element;
Expand Down
2 changes: 1 addition & 1 deletion src/PhpWord/Element/PageBreak.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @link https://github.com/PHPOffice/PHPWord
* @copyright 2014 PHPWord
* @license https://www.gnu.org/licenses/lgpl.txt LGPL
* @license https://www.gnu.org/licenses/lgpl.txt LGPL version 3
*/

namespace PhpOffice\PhpWord\Element;
Expand Down
2 changes: 1 addition & 1 deletion src/PhpWord/Element/PreserveText.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @link https://github.com/PHPOffice/PHPWord
* @copyright 2014 PHPWord
* @license https://www.gnu.org/licenses/lgpl.txt LGPL
* @license https://www.gnu.org/licenses/lgpl.txt LGPL version 3
*/

namespace PhpOffice\PhpWord\Element;
Expand Down
2 changes: 1 addition & 1 deletion src/PhpWord/Element/Row.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @link https://github.com/PHPOffice/PHPWord
* @copyright 2014 PHPWord
* @license https://www.gnu.org/licenses/lgpl.txt LGPL
* @license https://www.gnu.org/licenses/lgpl.txt LGPL version 3
*/

namespace PhpOffice\PhpWord\Element;
Expand Down
6 changes: 3 additions & 3 deletions src/PhpWord/Element/Section.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@
*
* @link https://github.com/PHPOffice/PHPWord
* @copyright 2014 PHPWord
* @license https://www.gnu.org/licenses/lgpl.txt LGPL
* @license https://www.gnu.org/licenses/lgpl.txt LGPL version 3
*/

namespace PhpOffice\PhpWord\Element;

use PhpOffice\PhpWord\PhpWord;
use PhpOffice\PhpWord\Element\PageBreak;
use PhpOffice\PhpWord\Element\Table;
use PhpOffice\PhpWord\Element\TOC;
use PhpOffice\PhpWord\Element\Table;
use PhpOffice\PhpWord\Element\Title;
use PhpOffice\PhpWord\Exception\Exception;
use PhpOffice\PhpWord\PhpWord;
use PhpOffice\PhpWord\Style\Section as SectionSettings;

/**
Expand Down
2 changes: 1 addition & 1 deletion src/PhpWord/Element/Table.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @link https://github.com/PHPOffice/PHPWord
* @copyright 2014 PHPWord
* @license https://www.gnu.org/licenses/lgpl.txt LGPL
* @license https://www.gnu.org/licenses/lgpl.txt LGPL version 3
*/

namespace PhpOffice\PhpWord\Element;
Expand Down
2 changes: 1 addition & 1 deletion src/PhpWord/Element/Text.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @link https://github.com/PHPOffice/PHPWord
* @copyright 2014 PHPWord
* @license https://www.gnu.org/licenses/lgpl.txt LGPL
* @license https://www.gnu.org/licenses/lgpl.txt LGPL version 3
*/

namespace PhpOffice\PhpWord\Element;
Expand Down
2 changes: 1 addition & 1 deletion src/PhpWord/Element/TextBreak.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @link https://github.com/PHPOffice/PHPWord
* @copyright 2014 PHPWord
* @license https://www.gnu.org/licenses/lgpl.txt LGPL
* @license https://www.gnu.org/licenses/lgpl.txt LGPL version 3
*/

namespace PhpOffice\PhpWord\Element;
Expand Down
2 changes: 1 addition & 1 deletion src/PhpWord/Element/TextRun.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @link https://github.com/PHPOffice/PHPWord
* @copyright 2014 PHPWord
* @license https://www.gnu.org/licenses/lgpl.txt LGPL
* @license https://www.gnu.org/licenses/lgpl.txt LGPL version 3
*/

namespace PhpOffice\PhpWord\Element;
Expand Down
2 changes: 1 addition & 1 deletion src/PhpWord/Element/Title.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @link https://github.com/PHPOffice/PHPWord
* @copyright 2014 PHPWord
* @license https://www.gnu.org/licenses/lgpl.txt LGPL
* @license https://www.gnu.org/licenses/lgpl.txt LGPL version 3
*/

namespace PhpOffice\PhpWord\Element;
Expand Down
2 changes: 1 addition & 1 deletion src/PhpWord/Exception/Exception.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @link https://github.com/PHPOffice/PHPWord
* @copyright 2014 PHPWord
* @license https://www.gnu.org/licenses/lgpl.txt LGPL
* @license https://www.gnu.org/licenses/lgpl.txt LGPL version 3
*/

namespace PhpOffice\PhpWord\Exception;
Expand Down
2 changes: 1 addition & 1 deletion src/PhpWord/Exception/InvalidImageException.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @link https://github.com/PHPOffice/PHPWord
* @copyright 2014 PHPWord
* @license https://www.gnu.org/licenses/lgpl.txt LGPL
* @license https://www.gnu.org/licenses/lgpl.txt LGPL version 3
*/

namespace PhpOffice\PhpWord\Exception;
Expand Down
2 changes: 1 addition & 1 deletion src/PhpWord/Exception/InvalidObjectException.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @link https://github.com/PHPOffice/PHPWord
* @copyright 2014 PHPWord
* @license https://www.gnu.org/licenses/lgpl.txt LGPL
* @license https://www.gnu.org/licenses/lgpl.txt LGPL version 3
*/

namespace PhpOffice\PhpWord\Exception;
Expand Down
2 changes: 1 addition & 1 deletion src/PhpWord/Exception/InvalidStyleException.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @link https://github.com/PHPOffice/PHPWord
* @copyright 2014 PHPWord
* @license https://www.gnu.org/licenses/lgpl.txt LGPL
* @license https://www.gnu.org/licenses/lgpl.txt LGPL version 3
*/

namespace PhpOffice\PhpWord\Exception;
Expand Down
2 changes: 1 addition & 1 deletion src/PhpWord/Exception/UnsupportedImageTypeException.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @link https://github.com/PHPOffice/PHPWord
* @copyright 2014 PHPWord
* @license https://www.gnu.org/licenses/lgpl.txt LGPL
* @license https://www.gnu.org/licenses/lgpl.txt LGPL version 3
*/

namespace PhpOffice\PhpWord\Exception;
Expand Down
2 changes: 1 addition & 1 deletion src/PhpWord/IOFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @link https://github.com/PHPOffice/PHPWord
* @copyright 2014 PHPWord
* @license https://www.gnu.org/licenses/lgpl.txt LGPL
* @license https://www.gnu.org/licenses/lgpl.txt LGPL version 3
*/

namespace PhpOffice\PhpWord;
Expand Down
2 changes: 1 addition & 1 deletion src/PhpWord/Media.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @link https://github.com/PHPOffice/PHPWord
* @copyright 2014 PHPWord
* @license https://www.gnu.org/licenses/lgpl.txt LGPL
* @license https://www.gnu.org/licenses/lgpl.txt LGPL version 3
*/

namespace PhpOffice\PhpWord;
Expand Down
12 changes: 6 additions & 6 deletions src/PhpWord/PhpWord.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@
*
* @link https://github.com/PHPOffice/PHPWord
* @copyright 2014 PHPWord
* @license https://www.gnu.org/licenses/lgpl.txt LGPL
* @license https://www.gnu.org/licenses/lgpl.txt LGPL version 3
*/

namespace PhpOffice\PhpWord;

use PhpOffice\PhpWord\Collection\Endnotes;
use PhpOffice\PhpWord\Collection\Footnotes;
use PhpOffice\PhpWord\Collection\Titles;
use PhpOffice\PhpWord\DocumentProperties;
use PhpOffice\PhpWord\Element\Section;
use PhpOffice\PhpWord\Exception\Exception;
use PhpOffice\PhpWord\Style;
use PhpOffice\PhpWord\Template;
use PhpOffice\PhpWord\Collection\Titles;
use PhpOffice\PhpWord\Collection\Footnotes;
use PhpOffice\PhpWord\Collection\Endnotes;
use PhpOffice\PhpWord\Exception\Exception;
use PhpOffice\PhpWord\Element\Section;

/**
* PHPWord main class
Expand Down
2 changes: 1 addition & 1 deletion src/PhpWord/Reader/AbstractReader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @link https://github.com/PHPOffice/PHPWord
* @copyright 2014 PHPWord
* @license https://www.gnu.org/licenses/lgpl.txt LGPL
* @license https://www.gnu.org/licenses/lgpl.txt LGPL version 3
*/

namespace PhpOffice\PhpWord\Reader;
Expand Down
2 changes: 1 addition & 1 deletion src/PhpWord/Reader/ODText.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @link https://github.com/PHPOffice/PHPWord
* @copyright 2014 PHPWord
* @license https://www.gnu.org/licenses/lgpl.txt LGPL
* @license https://www.gnu.org/licenses/lgpl.txt LGPL version 3
*/

namespace PhpOffice\PhpWord\Reader;
Expand Down
2 changes: 1 addition & 1 deletion src/PhpWord/Reader/ODText/AbstractPart.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @link https://github.com/PHPOffice/PHPWord
* @copyright 2014 PHPWord
* @license https://www.gnu.org/licenses/lgpl.txt LGPL
* @license https://www.gnu.org/licenses/lgpl.txt LGPL version 3
*/

namespace PhpOffice\PhpWord\Reader\ODText;
Expand Down
2 changes: 1 addition & 1 deletion src/PhpWord/Reader/ODText/Content.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @link https://github.com/PHPOffice/PHPWord
* @copyright 2014 PHPWord
* @license https://www.gnu.org/licenses/lgpl.txt LGPL
* @license https://www.gnu.org/licenses/lgpl.txt LGPL version 3
*/

namespace PhpOffice\PhpWord\Reader\ODText;
Expand Down
2 changes: 1 addition & 1 deletion src/PhpWord/Reader/ReaderInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @link https://github.com/PHPOffice/PHPWord
* @copyright 2014 PHPWord
* @license https://www.gnu.org/licenses/lgpl.txt LGPL
* @license https://www.gnu.org/licenses/lgpl.txt LGPL version 3
*/

namespace PhpOffice\PhpWord\Reader;
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.