Skip to content

Commit b2daeed

Browse files
committed
Merge branch 'develop' into sdt
2 parents cd54792 + 6e175ab commit b2daeed

File tree

17 files changed

+598
-108
lines changed

17 files changed

+598
-108
lines changed

.travis.yml

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,6 @@ before_script:
2323
## Composer
2424
- composer self-update
2525
- composer install --prefer-source --dev
26-
## PHP Copy/Paste Detector
27-
- curl -o phpcpd.phar https://phar.phpunit.de/phpcpd.phar
28-
## PHP Mess Detector
29-
- pear config-set preferred_state beta
30-
- printf "\n" | pecl install imagick
31-
- pear channel-discover pear.phpmd.org
32-
- pear channel-discover pear.pdepend.org
33-
- pear install --alldeps phpmd/PHP_PMD
34-
- phpenv rehash
35-
## PHPLOC
36-
#- curl -o phploc.phar https://phar.phpunit.de/phploc.phar
3726
## PHPDocumentor
3827
- mkdir -p build/docs
3928
- mkdir -p build/coverage
@@ -42,15 +31,15 @@ script:
4231
## PHP_CodeSniffer
4332
- ./vendor/bin/phpcs src/ tests/ --standard=PSR2 -n --ignore=src/PhpWord/Shared/PCLZip
4433
## PHP Copy/Paste Detector
45-
- php phpcpd.phar src/ tests/ --verbose
34+
- ./vendor/bin/phpcpd src/ tests/ --verbose
4635
## PHP Mess Detector
47-
- phpmd src/,tests/ text ./phpmd.xml.dist --exclude pclzip.lib.php
48-
## PHPLOC
49-
#- php phploc.phar src/
36+
- ./vendor/bin/phpmd src/,tests/ text ./phpmd.xml.dist --exclude pclzip.lib.php
5037
## PHPUnit
51-
- phpunit -c ./ --coverage-text --coverage-html ./build/coverage
38+
- ./vendor/bin/phpunit -c ./ --coverage-text --coverage-html ./build/coverage
39+
## PHPLOC
40+
- ./vendor/bin/phploc src/
5241
## PHPDocumentor
53-
- vendor/bin/phpdoc -q -d ./src -t ./build/docs --ignore "*/src/PhpWord/Shared/*/*" --template="responsive-twig"
42+
- ./vendor/bin/phpdoc -q -d ./src -t ./build/docs --ignore "*/src/PhpWord/Shared/*/*" --template="responsive-twig"
5443

5544
after_script:
5645
## PHPDocumentor

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ This release added form fields (textinput, checkbox, and dropdown), drawing shap
1818
- Chart: Basic 2D chart (pie, doughnut, bar, line, area, scatter, radar) - @ivanlanin GH-278
1919
- Chart: 3D charts and ability to set width and height - @ivanlanin
2020
- FormField: Ability to add textinput, checkbox, and dropdown form elements - @ivanlanin GH-266
21-
- Security: Ability to define document protection (readOnly, comments, trackedChanges, forms) - @ivanlanin
21+
- Setting: Ability to define document protection (readOnly, comments, trackedChanges, forms) - @ivanlanin
22+
- Setting: Ability to remove [Compatibility Mode] text in the MS Word title bar - @ivanlanin
2223

2324
### Bugfixes
2425

composer.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@
3939
"phpunit/phpunit": "3.7.*",
4040
"phpdocumentor/phpdocumentor":"2.*",
4141
"squizlabs/php_codesniffer": "1.*",
42+
"phpmd/phpmd": "2.*",
43+
"sebastian/phpcpd": "2.*",
44+
"phploc/phploc": "2.*",
4245
"dompdf/dompdf":"0.6.*",
4346
"tecnick.com/tcpdf": "6.*",
4447
"mpdf/mpdf": "5.*"

0 commit comments

Comments
 (0)