Commit Graph

210 Commits

Author SHA1 Message Date
Ivan Lanin d97602fa98 Reduce duplications and fix some docblocks 2014-06-05 23:47:39 +07:00
Ivan Lanin a66f93ccdc #123: New drawing shapes (arc, curve, line, polyline, rect, oval) 2014-06-02 21:55:44 +07:00
Ivan Lanin e0d2c6584c Refactor IOFactory and AbstractContainer to allow more dynamic inclusion. 2014-06-01 01:08:06 +07:00
Ivan Lanin 9839222492 QA: Additional unit tests 2014-05-31 22:28:13 +07:00
Ivan Lanin e7540c079e Add $nestedLevel to elements 2014-05-31 09:29:09 +07:00
Ivan Lanin a57b28de8f Some adjustments for the new `Line` element #253 2014-05-30 01:05:55 +07:00
Bas-Jan 't Jong 1580113d7b Added Line element 2014-05-29 16:44:00 +02:00
Ivan Lanin e81d92e265 Update changelog, docs, and unit tests for new `Field` element #251 2014-05-29 16:25:39 +07:00
Bas-Jan 't Jong 8f74f26fd4 Travis build error fix 2014-05-28 20:35:24 +02:00
Bas-Jan 't Jong 079d08e94a Added Field Element 2014-05-28 17:59:44 +02:00
Bas-Jan 't Jong 36080c14ca Merge branch 'develop' of https://github.com/PHPOffice/PHPWord.git into develop 2014-05-25 22:57:01 +02:00
Ivan Lanin dc6c487cd0 Fix test error 2014-05-25 00:43:38 +07:00
Ivan Lanin 1e9a498ca2 QA: Reduce some complexities: https://scrutinizer-ci.com/g/PHPOffice/PHPWord/code-structure/develop?elementType=operation 2014-05-24 15:38:41 +07:00
Ivan Lanin a65c3c3cf1 RTF Writer: Ability to write image 2014-05-23 19:22:40 +07:00
Bas-Jan 't Jong 343f378782 Merge branch 'develop' of https://github.com/PHPOffice/PHPWord.git into develop 2014-05-20 22:29:26 +02:00
Bas-Jan 't Jong 5aac7f4782 From upstream 2014-05-20 22:28:34 +02:00
Ivan Lanin 553371f088 Type hinting and docblock update 2014-05-19 14:27:55 +07:00
Ivan Lanin 5519131f3e Unify PHP ZipArchive and PCLZip features into PhpWord ZipArchive 2014-05-17 23:30:13 +07:00
Ivan Lanin 27fa3ba233 Remove fontStyle parameter from ListItemRun and various small fixes 2014-05-15 01:13:22 +07:00
Ivan Lanin 04a62f3255 QA: Code cleanup and some additional tests 2014-05-14 19:41:44 +07:00
Ivan Lanin 1ee43da4de #196: RTF link styling 2014-05-13 23:41:16 +07:00
Ivan Lanin 55e715b5b1 Add variable type hints 2014-05-12 15:54:10 +07:00
Ivan Lanin c9179d681f Refactor elements and containers 2014-05-12 01:36:28 +07:00
Ivan Lanin c243a11e57 Additional type checks in style writers 2014-05-11 19:06:36 +07:00
Ivan Lanin 7d5c62ab34 Merge branch 'nestedtable' into develop 2014-05-11 18:22:09 +07:00
Ivan Lanin ded651d947 #149: Ability to add table inside a cell (nested table) 2014-05-11 17:30:23 +07:00
Bas-Jan 't Jong 467f15a480 Added ListItemRun Element 2014-05-11 11:08:39 +02:00
Ivan Lanin feff87e769 Fix Travis test errors 2014-05-10 21:56:06 +07:00
Ivan Lanin 62ed725032 Some modifications for the new `Html::addHtml` feature 2014-05-10 21:38:44 +07:00
Ivan Lanin a595e6d78c Merge branch 'AddHtml' of github.com:basjan/PHPWord 2014-05-10 20:13:33 +07:00
Bas-Jan 't Jong 07b4ae2c0f Added possiblity to add tables inside textbox 2014-05-10 14:04:15 +02:00
Ivan Lanin 246557e3be Reactivate PHPMD and fix some rules for textbox 2014-05-09 03:15:26 +07:00
Ivan Lanin 6f0579c78f Fix Travis build error 2014-05-09 00:34:08 +07:00
Ivan Lanin 8a1d07f71a Fix Travis test errors 2014-05-08 23:13:45 +07:00
Ivan Lanin f7dd9dd07c Refactor writers and styles 2014-05-08 20:46:13 +07:00
Ivan Lanin ea41b08a9a Refactor the new textbox element 2014-05-08 13:05:27 +07:00
Ivan Lanin e12daacc0b Merge branch 'refactor' into develop 2014-05-08 12:17:14 +07:00
Ivan Lanin 6a0bfe3314 Move `addTextBox` to `AbstractContainer` and add sample for textbox 2014-05-08 10:58:19 +07:00
Ivan Lanin c7a940cc4c Merge branch 'textbox' of github.com:basjan/PHPWord 2014-05-08 08:56:34 +07:00
Bas-Jan 't Jong 364131aa5d Added TextBox functionality 2014-05-07 21:27:51 +02:00
Ivan Lanin 88560de601 Refactor writers 2014-05-08 02:19:57 +07:00
Ivan Lanin c4e8fdac84 Refactoring for code quality improvement (based on Scrutinizer) 2014-05-06 22:08:39 +07:00
Ivan Lanin c28f28ea25 Refactoring for code quality improvement (based on Scrutinizer) 2014-05-06 21:22:24 +07:00
Roman Syroeshko 2add5541ce [CHANGED] https://github.com/PHPOffice/PHPWord/pull/179 - copyright notice has been added. 2014-05-05 13:06:53 +04:00
Roman Syroeshko 89f94b793d [CHANGED] https://github.com/PHPOffice/PHPWord/pull/179 - copyright info has been changed. 2014-05-05 12:38:32 +04:00
Bas-Jan 't Jong 11b3941103 Fixed a bug, that when a second header was added to a section, all
images added to the second header were assigned to the first header,
resulting in at least a corrupted DOCX.
2014-05-04 22:48:17 +02:00
Ivan Lanin fd4fa11390 Merge remote-tracking branch 'upstream/develop' into nonstatic 2014-05-05 00:26:02 +07:00
Roman Syroeshko 6c3d1e721d License version has been added. 2014-05-04 21:03:29 +04:00
Ivan Lanin 3d19256c9c Merge branch 'develop' into nonstatic 2014-05-04 22:30:06 +07:00
Ivan Lanin 6898ada0e0 Merge branch 'develop' of github.com:basjan/PHPWord into #217-basjan 2014-05-04 18:16:33 +07:00
Ivan Lanin 35d06cc2ce Change PHPWord license to LGPL 3 as per #211 2014-05-04 17:55:54 +07:00
Ivan Lanin c21e28f974 More refactoring for PHPMD compliance 2014-05-04 16:57:39 +07:00
Bas-Jan 't Jong 1a544cb2fa Fixed bug in header / footer, in which media elements were all assigned
to the first header element. This resulted in a corrupted DOCX, when a
media element was assigned to a second header in the same section.
2014-05-04 10:36:13 +02:00
Bas-Jan 't Jong 15dcb384c6 Messed up something. Resetting 2014-05-04 10:34:40 +02:00
Bas-Jan 't Jong 2187954b56 Fixed bug in header, wherein all images were assigned to the first
header in a section. This resulted in a corrupt DOCX
2014-05-04 10:16:28 +02:00
Ivan Lanin f6f52afa68 Fix Travis build error 2014-05-04 14:15:44 +07:00
Ivan Lanin 725162bc6b Deprecate static classes Footnotes, Endnotes, and TOC (#206); Reactivate `phpcpd` and `phpmd` on Travis 2014-05-04 03:40:54 +07:00
Shawn Iwinski 6606d5c5c4 Remove spurious executable bits 2014-05-02 14:43:43 -04:00
Ivan Lanin 9b1f2f210c Add style class checker and rename $fStyle/$pStyle variables 2014-05-01 14:37:58 +07:00
Ivan Lanin 4a3400c5b2 Refactor: Create writers' `Part` folders and remove all static parts 2014-04-30 13:49:48 +07:00
Ivan Lanin 1ed8f0dfc2 Refactor: Remove some duplication found by phpcpd. One more to go. 2014-04-28 23:33:26 +07:00
Ivan Lanin a4fa3dfb55 Refactor: Apply composite pattern for Word2007 reader 2014-04-27 12:09:43 +07:00
Ivan Lanin d25dc965c9 ODT Writer: Link writing 2014-04-26 16:06:56 +07:00
Ivan Lanin 0f79eb5186 Refactor: Split `AbstractContainer` from `AbstractElement` 2014-04-26 13:29:43 +07:00
Ivan Lanin 2567a2223c Update changelog and fine tune changes 2014-04-25 18:56:19 +07:00
Ivan Lanin b7480d81c0 Refactor: Apply composite design pattern to Word2007/OOXML writer 2014-04-25 14:48:44 +07:00
Ivan Lanin 0060e4316c PHPMD fixes and remove Style\Tabs (not needed) 2014-04-22 17:54:08 +07:00
Ivan Lanin f829559f65 ODT Writer: Basic image writing support 2014-04-18 23:12:51 +07:00
Ivan Lanin f5f03a5b2b Emulate \ZipArchive::extractTo for PCLZip 2014-04-18 02:58:38 +07:00
Ivan Lanin 4db75c37a9 QA: Additional tests for Word2007 writer 2014-04-17 16:19:23 +07:00
Roman Syroeshko db1d89ab23 Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
	src/PhpWord/Element/Section.php
	src/PhpWord/Endnotes.php
	src/PhpWord/Footnotes.php
	src/PhpWord/Media.php
	src/PhpWord/PhpWord.php
	src/PhpWord/Reader/Word2007.php
	src/PhpWord/Writer/AbstractWriter.php
	src/PhpWord/Writer/ODText/Content.php
	src/PhpWord/Writer/Word2007.php
	src/PhpWord/Writer/Word2007/Notes.php
2014-04-16 17:39:26 +04:00
Roman Syroeshko 2c1c1ea60f [IMPROVED] Dockblocks as per https://github.com/PHPOffice/PHPWord/pull/187. 2014-04-16 17:22:30 +04:00
Ivan Lanin 2829fd8216 Enable image in HTML writer 2014-04-16 12:12:32 +07:00
Ivan Lanin 9c738f7eae Refactor Element\Image and some samples 2014-04-16 09:50:56 +07:00
Ivan Lanin 3cb6d86e22 Unit tests for PDF writer; Enable `zip://zipFilename#archiveFilename` construct for image source 2014-04-16 07:50:39 +07:00
Ivan Lanin 15ca8f294c Merge branch 'develop' into html 2014-04-13 22:11:31 +07:00
Ivan Lanin 19a69e2c39 Basic HTML writer 2014-04-13 22:04:07 +07:00
Ivan Lanin e78489b36e Update unit test and changelog 2014-04-13 18:03:59 +07:00
Ivan Lanin abc67edb50 Merge branch 'develop' of https://github.com/japonicus/PHPWord into develop 2014-04-13 17:45:50 +07:00
Ivan Lanin a5c815d50c ODT: Basic table writing support 2014-04-11 23:46:12 +07:00
Ivan Lanin a3a9af51e5 Additional unit tests and some code deduplication 2014-04-11 21:28:43 +07:00
Ivan Lanin ae652a6379 Update upcoming version number to 0.10.0 as per #178 2014-04-11 19:04:53 +07:00
Ivan Lanin 39a5e8c51e Merge branch 'numbering' into develop 2014-04-11 17:11:21 +07:00
Ivan Lanin 47669f501a Ability to create custom list #10 and to read list definition from DOCX 2014-04-11 17:08:47 +07:00
Roman Syroeshko 5b4ed10999 [FIXED] Dockblock for https://github.com/PHPOffice/PHPWord/pull/187 2014-04-10 11:06:39 +04:00
Ivan Lanin f837381238 Ability to add Endnotes 2014-04-10 01:36:41 +07:00
Ivan Lanin 0ccea9620c Merge remote-tracking branch 'upstream/develop' into xml-reader 2014-04-09 18:48:04 +07:00
Ivan Lanin 2cdad4b247 Reader: Ability to read header, footer, footnotes, link, preservetext, textbreak, pagebreak, table 2014-04-09 18:13:43 +07:00
Roman Syroeshko 191d37b280 Leading backslashes in global function/constant calls were removed. 2014-04-08 21:56:18 +04:00
japonicus 833dfea1e0 Keep image aspect ratio if only 1 dimension styled
If only one of image width or height is specified, then scale missing
dimension to maintain the aspect ratio.
2014-04-08 17:42:01 +01:00
Ivan Lanin 6456255300 Merge branch '#160-element-container' into xml-reader 2014-04-08 08:21:52 +07:00
Ivan Lanin cd2dba0848 Element inheritance refinements 2014-04-08 03:27:19 +07:00
Ivan Lanin dadfc2903c Merge branch '#160-element-container' into xml-reader 2014-04-08 01:15:14 +07:00
Ivan Lanin f1108c48e6 Add Abstract- prefix and -Interface suffix for corresponding classes 2014-04-08 01:09:06 +07:00
Ivan Lanin b594e32f04 Move container files 2014-04-08 00:03:53 +07:00
Ivan Lanin 177c523799 Remove underscore prefix from all private properties name 2014-04-06 18:16:28 +07:00
Ivan Lanin a218202dbd Enhance unit tests 2014-04-06 15:19:09 +07:00
Ivan Lanin 50e9e0f029 Merge branch 'develop' into #160-element-container 2014-04-06 11:44:37 +07:00
Ivan Lanin 03934af334 Refactor header/footer and media model 2014-04-05 22:39:04 +07:00
Ivan Lanin d7c18fe4b8 Move OOXML specific feature from Media to Word2007\Base 2014-04-05 00:19:45 +07:00
Ivan Lanin b75403f9a1 Refactor Media, addObject to header and footer 2014-04-04 15:28:35 +07:00
Ivan Lanin 1751ab09ee Remove unused ZipStreamWrapper.php and cleanup some scripts 2014-04-03 13:05:07 +07:00
Ivan Lanin 7c549f5802 DocBlock and use fixes 2014-04-03 10:13:13 +07:00
Ivan Lanin 1ebd26ddc6 Fix some test error 2014-04-03 09:20:21 +07:00
Ivan Lanin 637c9fce6f Create new Element abstract class 2014-04-03 09:12:11 +07:00
Ivan Lanin 06ba9e7093 Make one level Element folder structure (move Cell and Row up one level) 2014-04-02 11:27:02 +07:00
Ivan Lanin 495930be9d Add element availability matrix and enable `addObject` in footnote and textrun 2014-04-02 10:05:24 +07:00
Ivan Lanin 07be5eaea3 Adding more functionalities to containers:
- Table: Ability to add footnote in table cell
- Footnote: Ability to add image in footnote
- ListItem: Ability to add list item in header/footer
- CheckBox: Ability to add checkbox in header/footer
- Link: Ability to add link in header/footer
2014-04-01 18:36:35 +07:00
Ivan Lanin faba46cc05 Extends `Container` abstract class into `Footnote`, `TextRun`, and `Cell` element class. 2014-04-01 00:56:24 +07:00
Ivan Lanin 13e5ca0a84 #160 Refactor folders: Element, Container, and Exception
- Rename folder Section to Element
- Rename folder Exceptions to Exception
- Move Section, Header, Footer, Settings to Container folder
- Move Element\Footer\PreserveText to Element\PreserveText
2014-03-31 10:11:52 +07:00