Commit Graph

381 Commits

Author SHA1 Message Date
troosan 481f2c7310 fix code indenting 2018-12-29 23:30:23 +01:00
troosan 23407c99dd Add unit tests 2018-12-29 22:03:01 +01:00
troosan b2c627d57c Merge branch 'parsing_heading2' develop
Conflicts:
	src/PhpWord/Reader/Word2007/Styles.php
	tests/PhpWord/Reader/Word2007/StyleTest.php
2018-12-28 22:33:48 +01:00
troosan d8d697c848 added convertors with test 2018-12-28 18:04:36 +01:00
troosan 7790b6a6b0 Pass values to replace macros with in cloneBlock 2018-12-27 22:13:48 +01:00
troosan 75620caf51 add parameter to keep backward compatibility + add test 2018-12-27 01:44:37 +01:00
troosan 1bcef04ddc Merge remote-tracking branch 'JPBetley/PHPWord/clone-block-variables' into rebase_pull_request 2018-12-27 01:29:51 +01:00
troosan 1717bd4978 add test for cloneBlock operation 2018-12-27 00:30:04 +01:00
troosan bbe517aa60
Merge pull request #1541 from morrisdj/develop
Add "Plain Text" type to SDT (Structured Document Tags)
2018-12-26 23:16:06 +01:00
troosan 254d300ea7
Merge pull request #1511 from carusogabriel/ternary-expressions
Remove unnecessary ternary expressions
2018-12-26 23:15:49 +01:00
troosan d84da93a36 Add test and fix warnings 2018-12-26 22:50:19 +01:00
troosan 8ffaa1c8b7 add test to cover get TemplateProcessor::getVariables 2018-12-26 22:27:17 +01:00
Daniel Morris a5ec49d99d Add plain text SDT type 2018-12-26 21:45:32 +02: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
Nathan Dench cf3132acac Add ability to pass a Style object to a Section element (#1416)
* Add ability to pass a Style object to a Section
* Fix typo
* update changelog
2018-12-08 23:35:32 +01:00
Alex Morozov c2b54cc343 add support for hidden text (#1527)
* added hidden text word 2007
* update changelog
* update documentation
* added unit test
* docx reader
* html reader/writer
* odt writer
* updated samples
2018-12-08 23:21:59 +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 af5a271e9e
Line spacing is wrong when using "exact" line spacing rule (#1509)
* Only add 240 twips when in auto lineRule
* don't add 1 line when using EXACT line spacing rule
* fix style & scrutinizer warning
2018-12-03 16:09:20 +01:00
troosan d9165f00fa
Merge pull request #1513 from carusogabriel/phpunit
Use dedicated PHPUnit assertions
2018-11-30 22:58:01 +01:00
troosan f472bfbc75
Merge branch 'develop' into add_html_table_layout 2018-11-28 22:58:29 +01:00
troosan b50de97a41 support `auto` table layout too 2018-11-28 22:54:57 +01:00
troosan 7aef21faca add test for parsing HTML containing entities 2018-11-28 22:03:43 +01:00
Gabriel Caruso 663fb036d0
Use dedicated PHPUnit assertions 2018-11-19 01:36:23 -02:00
Gabriel Caruso 3cf0770376
Remove unnecessary ternary expressions 2018-11-19 01:32:28 -02:00
troosan 9f28ece4e9
Fix path to test document 2018-11-16 22:40:37 +01:00
Martin Hanzl 7eb19c8f76 add test case for issue #1253 2018-10-11 09:40:12 +02:00
Abubakkar Rangara e61c40e71d Adding table layout to the generated HTML if element has layout style. This is useful when using creating PDF from PHPWord (e.g. using dompdf), otherwise the PDF does not contain any layout for table. 2018-07-24 13:59:16 +01:00
troosan aa49536e3e
Merge branch 'develop' into add-getVariableCount-method 2018-07-21 14:48:24 +02:00
troosan 18c26f9218
Merge pull request #1436 from begnini/fixing_title
HTML Title Writer loses text when Title contains a TextRun instead a string.
2018-07-19 02:00:36 +02:00
troosan e07c6559a9 adapt test 2018-07-19 00:52:22 +02:00
Humberto Pereira 8c62cea580 Fix Writer losing text when Title contains a TextRun instead a string. 2018-07-17 21:10:53 -04:00
Humberto Pereira f5e3807654 Improving Style Parsing - handling Heading style 2018-07-17 19:35:31 -04: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
troosan fe454dbaf3
Merge pull request #1428 from troosan/parse_short_lang_code
Allow passing short lang code
2018-07-14 18:11:50 +02:00
troosan 87498e43e1 Allow passing short lang code 2018-07-14 17:21:30 +02:00
troosan af4f834149
Merge branch 'develop' into develop 2018-07-14 17:12:45 +02:00
troosan de83da2bbf
Merge branch 'develop' into parse_drawings 2018-07-14 03:30:11 +02:00
troosan 32907215ed fix phpstan issues 2018-07-14 02:54:17 +02:00
troosan adc1428607 use PasswordEncoder from phpoffice/common instead 2018-07-14 02:51:08 +02:00
smaug1985 3906be19ee Added Support for Indentation & Tabs on RTF Writer. (#1405)
* Added Support for Indentation  & Tabs on RTF Writer.
* add decimal tab writer + tests
* Update CHANGELOG.md
2018-07-14 02:13:45 +02:00
troosan 536a1b89d7 disable entity loader 2018-07-14 00:50:01 +02:00
Javier Garcia 2593e9e200 Merge branch 'develop' of github.com:jgpATs2w/PHPWord into develop 2018-06-13 17:57:55 +02:00
Javier Garcia fe647f6e55 fix when style line-height size comes in decimal number 2018-06-13 17:41:17 +02:00
troosan 5b9719071e remove unused imports 2018-06-03 22:36:30 +02:00
javier 1a06173e1b Add parsing of html image in base64 format (#1382)
* increased test coverage of new lines
* added exception control to file_get_contents error
* update changelog
2018-05-31 01:28:14 +02:00
troosan da604a80c4 use annotation instead 2018-05-27 20:53:42 +02:00
Javier Garcia a89e4c93a7 added exception control to file_get_contents error 2018-05-25 08:01:17 +02:00
Javier Garcia 46b7bea097 increased test coverage of new lines 2018-05-24 07:19:45 +02:00
Javier Garcia a228811a61 fixes 2018-05-23 18:48:28 +02:00