Skip to content

FBnil patch blocks #1147

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

Open
wants to merge 80 commits into
base: master
Choose a base branch
from
Open

FBnil patch blocks #1147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
80 commits
Select commit Hold shift + click to select a range
9c3fbc6
Add style ID to font style, so indesign import works
DaanMeijer Dec 18, 2016
0ced913
New tests for the TemplateProcessor.php functionality
FBnil Sep 25, 2017
d68bb3c
Fixes Block functions with documents edited by LibreOffice
FBnil Sep 25, 2017
ce79bd8
passed through phpunit and corrected style
Sep 26, 2017
bf840cb
phpcs also discovered a test function without coverage header
Sep 26, 2017
ff9415c
phpcs wants shorter lines
Sep 26, 2017
93ab05b
phpcs did not like the helperclass, worked around it. At least phpcs …
Sep 26, 2017
baf594a
Inline helperclass (phpcs workaround)
Sep 26, 2017
5e60e23
Update TemplateProcessorTest.php
FBnil Sep 26, 2017
003ad96
Update TemplateProcessor.php
FBnil Sep 26, 2017
c39c9b4
Update TemplateProcessor.php
FBnil Sep 26, 2017
0df4d6d
refactoring
Sep 26, 2017
17609eb
Merge branch 'FBnil-patch-blocks' of https://github.com/FBnil/PHPWord…
Sep 26, 2017
ba7fcb9
Update TemplateProcessor.php
FBnil Sep 26, 2017
3d50682
new test case for getRow()
FBnil Sep 26, 2017
15ac072
Merge branch 'FBnil-patch-blocks' of https://github.com/FBnil/PHPWord…
Sep 26, 2017
f32d00d
Should be <=7 if not found. By ensuring 0 when not found, we have cle…
Sep 26, 2017
5675bcd
More generic error message
Sep 26, 2017
553ba17
Merge remote-tracking branch 'DaanMeijer_develop/develop' into FBnil-…
Sep 29, 2017
07e21d4
Adding multiline string support in setValue() (contributed by various…
Sep 29, 2017
5bd9bfa
Allow Shift-Enter/newlines in setValue
Sep 30, 2017
5bb24f0
expose $templateProcessor->zipClass->AddFromString() to replace image…
Sep 30, 2017
c8847be
Merge develop into FBnil-patch-blocks branch.
Sep 30, 2017
52d4173
Make scrutinizer happier.
Sep 30, 2017
d6a3b80
camelCased a few variables to keep phpunit happy.
Sep 30, 2017
a1c1614
oops, foreach loops through values, not keys
Sep 30, 2017
496ea70
Introducing *Segment functions; Inline-Blocks and cleanup/indenting.
Oct 7, 2017
6137d9a
Make it harder for fixBrokenMacros() to magically break a document
Oct 7, 2017
e3c23ac
camelCase for Scrutinizer
Oct 9, 2017
d5c888c
Add a test for inline blocks
Oct 9, 2017
d4588ca
More camelCase variables!
Oct 10, 2017
9dbd834
Adding setBlock() for closed block only
Oct 10, 2017
9370411
backslash, not forwardslash in classes.
Oct 10, 2017
392635b
Added testcase testMakeTable
Oct 10, 2017
15b07b6
Make a part that Scrutinizer found too complex, recursive
Oct 10, 2017
ba94739
add an assertion test for zipAddFromString() to get a better CRAP score
Oct 10, 2017
880443c
failGraciously() for all new functions that have mixed failure results.
Oct 11, 2017
947ea09
forgot to return from this in failGraciously()
Oct 11, 2017
4d0ec75
new bool variable TemplateProcessor::$ensureMacroCompletion
Oct 11, 2017
66fbbe7
setValueForPart needs strings, not arrays. Thanks to Scrutinizer for …
Oct 11, 2017
9f63a84
setValueForPart needs strings, not arrays. Thanks to Scrutinizer for …
Oct 11, 2017
ddfa934
fixes *Segment() functions when trying to replace Footers and Headers
Oct 11, 2017
56f3588
modified findTagRight, findTagLeft and getSlice to be aware of Header…
Oct 11, 2017
aafb1ac
make $tempDocumentFooters protected again (was debugging)
Oct 11, 2017
af358ad
Stronger typecasting to quench Scrutinizer....
Oct 11, 2017
d7ede2e
More testcases, better documentation
Oct 11, 2017
84173c8
Fix fixBrokenMacros() but it is slower. Remove makeTable() and toXML(…
Oct 13, 2017
0c935c5
New test document with broken macros to test new fixBrokenMacros() fu…
Oct 13, 2017
82475a9
coding style changes [] to array()
Oct 14, 2017
760d3cb
documentation and splitting too long line
Oct 14, 2017
9f716a5
small update to the function Documentation
Oct 14, 2017
0b8a89e
small cleanups
Oct 14, 2017
6ceee2f
Revert back something I should not have touched
Oct 14, 2017
e90362c
More return types... (documentation)
Oct 14, 2017
330a7cf
Trying to get Scrutinizer to not complain about the @return values
Oct 14, 2017
2700fde
removed eval in favour of Reflections. Added more test for coverage
Oct 14, 2017
1e78c85
Multi-line function call not indented correctly; expected 12 spaces b…
Oct 14, 2017
85394d1
Make everything depend on Segments
Oct 19, 2017
4f65333
Stop using this in callback function
Oct 19, 2017
27dce1e
Testing protected functions (first steps into 100% test coverage)
Oct 19, 2017
9fd0fd0
Incorporating changes from @abcdmitry (unset of references)
Oct 19, 2017
ceb20e8
Merge remote-tracking branch 'PHPOffice_PHPWord/develop' into FBnil-p…
Oct 19, 2017
883d072
More static, better inheritance!
Oct 20, 2017
dfa1d69
Private -> Protected due to static
Oct 20, 2017
e7faad1
Methods with the same name as their class will not be constructors in…
Oct 20, 2017
641c2d5
PHP4 style contructor name = class name to __construct
Oct 20, 2017
44b173d
revert!
Oct 20, 2017
f3f8f41
undo unintended
Oct 20, 2017
37a11d4
Eat your own dogfood. setBlock: preg_match is only for strings
Oct 20, 2017
e7ab8b5
Bold decision to allow recursive callbacks, this will allow to nest f…
Oct 27, 2017
89d60bb
Make the ${ detection harder to grab too much
Nov 1, 2017
95da7b9
added param integer $direction in which direction should be searched…
Nov 11, 2017
eeb5402
add same changes as in original tree
Nov 15, 2017
4cc08b4
Make Segments also look left/right of the needle to find a block
Nov 15, 2017
1137923
A bug was introduced when search direction was introduced in Segments
Nov 16, 2017
58eb173
Replace file to latest develop version, where indentation is different
Nov 16, 2017
9ee923e
Merge branch 'develop' into FBnil-patch-blocks
troosan Nov 29, 2017
157f325
Change syntax to please new Travis rules
Dec 11, 2017
602fecf
a return must be preceded by an empty line. Quotes are preferred to b…
Dec 12, 2017
a8290f7
Parsed through php-cs-fixer
Dec 14, 2017
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
Loading