Commit Graph

178 Commits

Author SHA1 Message Date
SRG Group 3e6745f146 HTML image support & TextRun paragraph style (#934)
* Adding setParagraphStyle to Textrun for indentation
* Html Image support added
* fix formatting, add tests & update changelog
2017-12-21 00:03:52 +01:00
troosan 200c2f1eb0
Merge pull request #1019 from jun-i-corn/feature/EnablePasswordProtection
enable password protection (Word)
2017-12-20 22:00:34 +01:00
Gabriel Caruso 87acd3764b Clean elses 2017-12-14 12:21:16 -02:00
troosan 5a57409df0 fix tests 2017-12-13 23:55:48 +01:00
troosan ad38d4c20f Merge branch 'feature/EnablePasswordProtection' of https://github.com/jun-i-corn/PHPWord into feature/EnablePasswordProtection 2017-12-13 23:25:32 +01:00
troosan f7d2ad7201 formatting 2017-12-13 23:24:37 +01:00
troosan 9e029415cc align with pull request submitted in PHPOffice/Commom 2017-12-13 23:17:01 +01:00
troosan fd156bf12a
Merge branch 'develop' into html_br 2017-12-05 20:50:13 +01:00
troosan 9081ed9868 fix warning 2017-12-05 17:40:23 +01:00
troosan 8f512bf618 Merge branch 'develop-html-br' of https://github.com/anrikun/PHPWord
into develop

Conflicts:
	src/PhpWord/Shared/Html.php
2017-12-05 17:33:51 +01:00
troosan cfc89b7853
Merge branch 'develop' into feature/EnablePasswordProtection 2017-12-05 00:34:14 +01:00
troosan 274f50ce5a Add unit tests & add array type checks 2017-12-04 22:30:49 +01:00
troosan ca25eba8aa Scrutinizer fixes 2017-11-26 22:55:37 +01:00
troosan 23bc837666 Scrutinizer fixes 2017-11-26 17:54:47 +01:00
troosan 2e562512f4 Add unit tests for PasswordEncoder 2017-11-24 14:45:05 +01:00
troosan ad83196a05 move password encoding in separate class
fix PHPCS errors
add documentation
add sample
2017-11-23 22:49:21 +01:00
troosan e07195c512 add test, fix warnings 2017-11-22 08:14:22 +01:00
troosan 670d46e543 add getter/setter on paragraph for child spacing rule 2017-11-22 00:14:31 +01:00
troosan ac357d10d5 Various fixes
- parse text inside list items
- add tests
- rename Cell widthType attribute to unit
2017-11-18 15:55:05 +01:00
troosan 8eb72c976a add HTML table parsing 2017-11-15 22:49:13 +01:00
troosan a01d22ed67 improve HTML parser and add tests 2017-11-11 23:49:23 +01:00
troosan 9e7e07d0bc Add unit tests for Html parser 2017-11-09 00:41:56 +01:00
troosan c8b55b8e59 Merge branch 'bring_back_bold_and_italic' of https://github.com/FBnil/PHPWord into bring_back_bold_and_italic 2017-11-08 21:46:55 +01:00
Nilton fcdafeedd4 Bring back b, i, <span style="font-style: italic;"> and <span style="font-weight: bold;"> 2017-11-08 21:46:37 +01:00
troosan ce377b9b58 fix php-cs error 2017-11-05 02:16:04 +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
Nilton 87a355bb82 Bring back b, i, <span style="font-style: italic;"> and <span style="font-weight: bold;"> 2017-10-21 00:07:52 +02: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
troosan cf76b1f217 Simplify SimpleType validation 2017-07-22 00:06:04 +02:00
troosan 8a5433e5df add new NumberFormat values and refactor other uses 2017-07-04 15:04:30 +02:00
Roman Syroeshko 2bcfacfbf9 Updated copyright. 2016-07-31 12:35:08 +04:00
Roman Syroeshko f359825cb7 Reviewed and merged #658. 2016-01-23 19:16:34 +04:00
Roman Syroeshko 7bd6cbdb64 Copyright update. 2015-12-05 21:28:46 +04:00
Roman Syroeshko 43fb23d896 Copyright update. 2015-12-05 21:26:01 +04:00
Henri MEDOT f7afdebb03 Added support for linebreaks <br /> in Shared\Html::addHtml() 2015-11-12 18:51:04 +01:00
Roman Syroeshko 94c0d02330 Next round of refactoring of alignment-related functionality. 2015-10-10 19:06:23 +04:00
Roman Syroeshko 4445fd3258 Replaced `array_key_exists` with `isset` for better performance. 2014-10-10 21:10:29 +04:00
Progi1984 90d64bd347 #23 : Implement Word97 aka MsDoc Reader (PHPCS-PHPMD Fixes) 2014-08-16 12:44:12 +02:00
Progi1984 4ade9c3c6e #23 : Implement Word97 aka MsDoc Reader (PHPCS-PHPMD Fixes) 2014-08-16 12:33:37 +02:00
Progi1984 e561d54661 Merge branch 'develop' of https://github.com/PHPOffice/PHPWord into develop 2014-08-16 11:55:13 +02:00
Progi1984 ca69de3962 #23 : Implement Word97 aka MsDoc Reader 2014-08-15 19:26:23 +02:00
Roman Syroeshko 3d06c77fc1 Minor refactoring of "Shared\ZipArchive" class. 2014-08-10 21:01:46 +04:00
Roman Syroeshko e6d88a27e8 Refactored usages of "tempnam()" function. 2014-08-10 20:30:14 +04:00
Roman Syroeshko 56c3d8eda2 https://github.com/PHPOffice/PHPWord/issues/310 2014-08-10 20:00:19 +04:00
Roman Syroeshko 8056b6926c [CHANGED] Docblock for pass-by-reference parameters. 2014-07-03 16:11:15 +04:00
Roman Syroeshko d0a609bc95 [CHANGED] Added "@return" annotation where it as missed. 2014-07-03 15:40:24 +04:00
Progi1984 b527d06608 #23 : Implement Word97 aka MsDoc Reader 2014-06-21 09:18:57 +02:00
Progi1984 71b4ac9c56 FIXED : #282 : problem converting docx to pdf
PHP Catchable fatal error: Argument 2 passed to DOMXPath::query() must be an instance of DOMNode, null given, called in /var/www/xxx/PhpWord/Reader/Word2007.php on line 145 and defined in /var/www/xxx/PhpWord/Shared/XMLReader.php on line 99, referer: XXX
2014-06-17 15:48:39 +02:00
Ivan Lanin 6a81691d45 #266: Ability to add textinput, checkbox, and dropdown form elements 2014-06-16 00:31:17 +07:00
Ivan Lanin a13e5b20f9 #278: 3D charts and ability to set width and height 2014-06-15 20:48:26 +07:00
Ivan Lanin 0f085f71e0 Merge branch 'chart' into develop 2014-06-14 12:51:41 +07:00
Ivan Lanin 3fef19093c #278: Basic chart 2014-06-14 12:49:39 +07:00
Ivan Lanin 8c2b099dbc Merge `Shared\Drawing` and `Shared\Font` into `Shared\Converter` 2014-06-14 10:54:33 +07:00
Ivan Lanin 9a5f91afc6 Merge branch 'develop' into chart 2014-06-12 12:17:49 +07:00
Ivan Lanin 056ff5e676 Basic chart support 2014-06-11 02:03:04 +07:00
Brandon Skrtich d17a806305 Small fixes for addHtml.
Adding some HTML Entities to the test for addHTML
2014-06-09 16:32:12 -06:00
Ivan Lanin 01853f7aac Update change log and adjust some coding standards for #261, #265, and #267 2014-06-07 17:52:48 +07:00
Ivan Lanin bc6b40dde5 Merge branch 'fix-rare-pclzip-temp-file-issue' of github.com:andrew-kzoo/PHPWord into develop 2014-06-07 17:36:37 +07:00
Andrew Collins 3d2cd163d3 Ensure temp file in pclzipAddFile() removed
Make pclzipAddFile() similar to pclzipAddFromString() in removing
temporary files.
2014-06-05 13:45:18 -04:00
Andrew Collins d57606082d Fix rare PclZip/realpath/PHP version problem
In PHP 5.4.4 realpath() handles absolute paths correctly, but in PHP 5.3.8 returns false.
2014-06-04 13:27:18 -04:00
Ivan Lanin 38d3d7be20 Bugfix for #257: HTML Reader: `<p>` and header tags puts no output 2014-06-02 18:30:51 +07:00
Ivan Lanin 9839222492 QA: Additional unit tests 2014-05-31 22:28:13 +07:00
Ivan Lanin ec85d7d641 #80: Basic HTML reader 2014-05-31 03:06:11 +07:00
Ivan Lanin 0164e37873 Decompose Shared\Html 2014-05-31 02:01:09 +07:00
Ivan Lanin 4f9399899a QA: Docblock improvements and -q parameter for phpdoc 2014-05-30 20:44:06 +07:00
Ivan Lanin 87f071d1b6 #72: Basic RTF Reader 2014-05-28 21:27:20 +07:00
Ivan Lanin 92c7a24c38 QA: Additional unit tests and docblock fixes 2014-05-25 23:08:02 +07: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 991016a48b Additional writer test 2014-05-24 10:05:39 +07:00
Ivan Lanin e00b551aa2 Breakdown HTML Writer to head and body parts and more cyclomatic complexity reductions 2014-05-23 16:48:11 +07:00
Ivan Lanin 3569271277 Word2007 Writer: Enable the missing custom document properties writer 2014-05-21 19:20:13 +07:00
Ivan Lanin 553371f088 Type hinting and docblock update 2014-05-19 14:27:55 +07:00
Ivan Lanin f825ef50c0 Reorder code 2014-05-18 02:21:26 +07:00
Ivan Lanin 3f61d1807c Test fixes 2014-05-18 00:40:29 +07:00
Ivan Lanin 5519131f3e Unify PHP ZipArchive and PCLZip features into PhpWord ZipArchive 2014-05-17 23:30:13 +07:00
Ivan Lanin 048436cd04 Use INI instead of YML 2014-05-16 15:02:57 +07:00
Ivan Lanin f380c29eef Add `writeRaw` annotation and disambiguate `Settings` 2014-05-16 01:22:34 +07:00
Ivan Lanin 5511378eca #200: Ability to use a config file to store various common settings 2014-05-16 00:59:38 +07:00
Ivan Lanin 04a62f3255 QA: Code cleanup and some additional tests 2014-05-14 19:41:44 +07:00
Ivan Lanin 6ba6ed40fc Reactivate php_sim in Scrutinizer and fix some minor issues 2014-05-14 08:40:21 +07:00
Ivan Lanin 8745c5ee30 Change behaviour of `set...` function of boolean properties; Some bug fixing based on Scrutinizer; New `Row` Word2007 style writer 2014-05-13 12:50:18 +07:00
Ivan Lanin f8f98cccab #237: Ability to define table width (in percent and twip) and position 2014-05-13 01:32:44 +07:00
Ivan Lanin e589961e68 #158: Convert UTF8 text to Unicode before writing RTF (support UTF8 in RTF) 2014-05-12 23:12:07 +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
Bas-Jan 't Jong afc3d5cb64 Minor fix. If conversion factor from pointToPixel is 1.333333, then the
conversion factor for PixelTopoint should be 0.75
2014-05-11 09:16:36 +02:00
Bas-Jan 't Jong c524394f5f Fixed conversion factor Centimeters to Pixels and vice versa. 2014-05-10 23:52:10 +02:00
Ivan Lanin 516c13e032 Some unit tests for the new features 2014-05-10 23:40:34 +07: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 aa151c4010 Added function to add elements via HTML 2014-05-10 14:03:16 +02:00
Ivan Lanin 88560de601 Refactor writers 2014-05-08 02:19:57 +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
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 35d06cc2ce Change PHPWord license to LGPL 3 as per #211 2014-05-04 17:55:54 +07:00