Aix/PHPWord
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,709 Commits 6 Branches 21 Tags
Commit Graph

48 Commits

Author SHA1 Message Date
troosan
575c5531b8 replace self with static 2018-12-26 20:07:53 +01:00
troosan
6cf10b4562
Merge pull request #1161 from abcdmitry/patch-1 
Get rid of duplicated code in TemplateProcessor
call static methods with static:: instead of self::
 2018-12-26 20:04:18 +01:00
Maxim
d5da80b56e Support adding images in Templates (#1170) 
* setImageValue() + fix adding files via ZipArchive
* fix phpdoc variable name
* Changed logic that determines extension image file extension for document to depend on MIME type. This same logic is used in Element/Image.php
* support <w:t> tags with arguments
* allow setup size of image into template variable
* support of 'ratio' replace attribute + documentation
 2018-12-26 14:35:21 +01:00
troosan
b188ab94e1
Merge branch 'develop' into add-getVariableCount-method 2018-12-11 21:31:18 +01:00
Yurii.sio2
260bb75fc2 Fix TemplateProcessor :: fixBrokenMacros; (#1502) 
* Fix TemplateProcessor :: fixBrokenMacros;
* add unit test for fixBrokenMacros
 2018-12-07 23:22:04 +01:00
troosan
7b3b723646
Merge pull request #1430 from nicoder/patch-4 
allow to override TemplateProcessor#ensureUtf8Encoded
 2018-12-03 01:01:51 +01:00
troosan
c12f98f69a fix check style warning 2018-11-20 22:40:54 +01:00
troosan
925e9e0919
remove trailing spaces 2018-11-16 23:33:38 +01:00
troosan
c51b6febc0
rename variable to comply with rules 2018-11-16 23:00:23 +01:00
Martin Hanzl
e19de8e8a4 #1253 - add explanatory comment 2018-10-11 11:28:44 +02:00
Martin Hanzl
7f55816eba detect actual filename of document xml (prevent mismatching document22.xml as in #1253) 2018-10-11 08:55:38 +02:00
troosan
aa49536e3e
Merge branch 'develop' into add-getVariableCount-method 2018-07-21 14:48:24 +02:00
troosan
affccc7937 Merge branch 'improve-cloneBlock-regex' of https://github.com/nicoder/PHPWord into fix_clone_block 2018-07-17 08:03:35 +02:00
Nicolas Dermine
198165ce59
allow to override TemplateProcessor#ensureUtf8Encoded 
the method is `protected`,
but since it is called with `self` instead of `static`
it does not allow for subclasses to override it
 2018-07-16 19:49:30 +02:00
troosan
536a1b89d7 disable entity loader 2018-07-14 00:50:01 +02:00
troosan
77f2b16bc1 update copyright to 2018 2018-03-08 23:52:25 +01:00
Frank Liepert
d061c6dc7c Remove zend-stdlib dependency 2018-02-17 00:03:41 +01:00
Nicolas Dermine
623bd993d8 refactor: use extracted method in original method 2018-02-05 17:49:23 +01:00
Nicolas Dermine
07e97c38cd add getVariableCount method to TemplateProcessor 
returns how many times each placeholder is present in the document

almost the same code as `getVariables`

useful when cloning a block a number of times and want to replace
placeholders that are present more than once in the block
(using the `$limit` parameter of `setValue`)
 2018-02-05 17:45:24 +01:00
Nicolas Dermine
4105a9aad1 improve cloneBlock regex 
it wrongly matched `<w:pPr` when looking for `<w:p`

in that case the cloned block would not be valid XML,
and so the generated docx document could not be opened by Word

adding the `\b` word boundary to the regex fixes this.

the accompanying unit test failed with this message when trying to load
the generated file:

```
ErrorException: DOMDocument::loadXML(): Opening and ending tag mismatch:
p line 2 and body in Entity, line: 2
```

This might solve issues such as #681 and #664.
 2018-02-02 17:03:49 +01:00
Nicolas Dermine
30183e2881
fix typo in comment 2018-01-26 18:31:35 +01:00
troosan
0459670a9c
Enable php-cs-fixer in build & fix resulting warnings (#1099) 
* enable php 7.1 build
* upgrade to dompdf/dompdf 0.8.*
* update phpunit & hide output during tests
* run code coverage analysis on 1 build only
* Add php-cs
* Update Copyright
 2017-11-04 22:44:12 +01:00
Dmitry Lukashin
ba9e8958d7 Replace self:: with static:: calls 2017-10-19 18:51:57 +03:00
Dmitry Lukashin
f7cb73e8a6 Get rid of duplicated code in TemplateProcessor.php 2017-10-19 17:33:46 +03:00
troosan
8ce1a19ec4 make FontStyle basedOn paragraph if the paragraph is set on the font (#926) 
* make FontStyle based on paragraph if it set
* replace tab with spaces
* basedOn not correctly set if FontStyle is based on other FontStyle
* Fix warnings
 2017-09-17 21:38:00 +02:00
Roman Syroeshko
2bcfacfbf9 Updated copyright. 2016-07-31 12:35:08 +04:00
Roman Syroeshko
54013a6164 https://github.com/PHPOffice/PHPWord/issues/399. 2016-07-30 22:32:32 +04:00
Roman Syroeshko
fb863cdf21 https://github.com/PHPOffice/PHPWord/issues/335. 2016-07-30 16:02:23 +04:00
Roman Syroeshko
ec3c62b051 #483. Output escaping for OOXML. 2016-06-04 20:06:37 +04:00
Roman Syroeshko
d57973693d #618. 2016-04-23 19:49:10 +04:00
Roman Syroeshko
1c5bb3a911 #548. 2016-04-09 22:03:21 +04:00
Roman Syroeshko
f359825cb7 Reviewed and merged #658. 2016-01-23 19:16:34 +04:00
Roman Syroeshko
529edcb68e Merge pull request #617 from kazitanvirahsan/develop 
Template processor setValue() improvements #614
 2015-12-12 21:01:31 +04:00
Roman Syroeshko
43fb23d896 Copyright update. 2015-12-05 21:26:01 +04:00
kazi Tanvir Ahsan
b446a23b61 Update 2 Template processor setValue() improvements #614 2015-09-10 23:50:23 +10:00
kazi Tanvir Ahsan
873d41a872 Update Template processor setValue() improvements #614 2015-09-10 23:46:48 +10:00
kazi Tanvir Ahsan
a123ce41e5 Template processor setValue() improvements #614 2015-09-10 23:33:02 +10:00
Roman Syroeshko
adf20d318f #513. 2015-08-30 18:03:31 +04:00
Roman Syroeshko
90295fe09c #532. 2015-08-16 19:50:47 +04:00
Roman Syroeshko
db8221d303 Fix for #532. 2015-07-02 21:46:29 +03:00
Roman Syroeshko
988eaca87e Fix for #532. 2015-07-02 21:39:54 +03:00
Roman Syroeshko
1cd4fbf5ae Performance improvement for #513. 2015-06-02 22:15:58 +03:00
Roman Syroeshko
9770f44877 Shortened names of `TemplateProcessor` properties. 2015-04-15 00:12:37 +03:00
Roman Syroeshko
b7387be3fd Reimplemented #498. 2015-04-14 22:47:41 +03:00
Roman Syroeshko
a5c3645717 Performance improvement for #513. 2015-04-11 21:41:58 +04:00
Roman Syroeshko
f33abcdcc4 Performance improvement for #513. 2015-04-11 21:25:40 +04:00
Roman Syroeshko
c0e04fac51 Reverted #51. 2014-11-07 20:54:24 +04:00
Roman Syroeshko
ec25dd338b https://github.com/PHPOffice/PHPWord/issues/216 2014-08-16 15:21:58 +04:00