Skip to content
Closed

Develop #2423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
04b224c
Fixed setting width of Cell Style
rikvdlooi Apr 15, 2020
5bd4ad3
fixed code example
brammeleman Jun 29, 2021
d9c1daa
Added Swedish language
amgad-naiem Dec 6, 2021
26757c2
Add softhyphen support to word reader
amir9480 Aug 12, 2022
c4bcba9
allow to customize macro in TemplateProcessor
ismail1432 Jul 15, 2022
024fdf9
call static instead of self on protected method
Oct 7, 2022
9ed82d1
delete blank lines
fbclol Nov 18, 2022
ecd2fcb
add blank lines
fbclol Nov 18, 2022
a075740
remove espaces
fbclol Nov 18, 2022
9afd53d
remove -
fbclol Nov 18, 2022
0189977
improve phpdoc
nicoder Nov 20, 2022
573f1c3
set default value on empty value attribute
kernusr Nov 22, 2022
b457ff5
set default value for vMerge
kernusr Nov 22, 2022
02a92c8
HTML Reader : Set style name from the CSS class
Progi1984 Nov 22, 2022
02e3aa9
Merge pull request #2338 from Progi1984/className
Progi1984 Nov 22, 2022
d721b5e
HTML Reader : Set style name from the CSS class (and if not CSS is lo…
Progi1984 Nov 23, 2022
83f6b02
Merge pull request #2329 from nicoder/improve-phpdoc
Progi1984 Nov 23, 2022
9658c12
Merge pull request #2308 from fbclol/develop
Progi1984 Nov 23, 2022
249e049
Merge pull request #2171 from amgad-naiem/patch-1
Progi1984 Nov 23, 2022
6041bb3
Merge pull request #2339 from Progi1984/className
Progi1984 Nov 23, 2022
25de4b8
Fixed PHPCSFixer error
Progi1984 Nov 23, 2022
803cdee
Use local install of friendsofphp/php-cs-fixer
PowerKiKi Nov 29, 2022
20f3a3e
Use pcov instead of xdebug because it is much faster
PowerKiKi Nov 29, 2022
be49938
Merge pull request #2336 from kernusr/read-empty-vmerge
Progi1984 Nov 29, 2022
b2dfa65
Merge pull request #1848 from rikvdlooi/patch-1
Progi1984 Nov 29, 2022
f195d28
Merge pull request #2111 from brammeleman/patch-1
Progi1984 Nov 29, 2022
b453cf0
Merge pull request #2261 from ismail1432/customize-macro
Progi1984 Dec 23, 2022
1dc3dc6
Add background color support for textboxes
hazington Dec 30, 2022
25575c8
Add background color support for text boxes for Word writer
hazington Dec 30, 2022
143e01b
Added period to the comments to match the cs-fixer configuration
hazington Dec 30, 2022
40d5770
Fixed cs-fixer issues.
hazington Dec 30, 2022
1a80aac
Added type hints and matching PHPDoc. Also added @return void.
Jan 3, 2023
a215501
Added bgcolor unit test coverage
Jan 3, 2023
050802b
Removed @return void as not compatible with projects coding standard.
Jan 3, 2023
0f6fbf2
Fixed several CS-Fixer issues
Jan 3, 2023
679a738
Replaced deprecated "assertRegExp" test method by assertMatchesRegula…
Jan 3, 2023
53d34fd
Address the CI coverage issue for the regex match assertion.
Jan 3, 2023
a379577
Merge pull request #2364 from hazington/patch-5
Progi1984 Jan 4, 2023
ed8d9ff
Fixed some stylelint
Progi1984 Jan 5, 2023
60734dd
Merge pull request #2277 from amir9480/patch-1
Progi1984 Jan 5, 2023
ef99fac
Add support table row height when importing HTML (#2350)
ytilotti Jan 6, 2023
aac3a60
Add support for fractional font sizes (#2363)
hazington Jan 6, 2023
0806448
Update recipes.rst (#2367)
ahmadsyamim Jan 8, 2023
30c101d
Lock all dependencies
PowerKiKi May 30, 2023
dd07483
Update templates-processing.rst
pebosi May 16, 2023
2c56271
Update TemplateProcessor.php
pebosi May 16, 2023
c5a1f91
Update Language.php
SarahTrees May 4, 2023
6742f47
Update Language.php
SarahTrees May 4, 2023
338ff0b
Update Language.php IT_CH
SarahTrees May 4, 2023
4ea4abc
docs: Better suited sample for list item
sevjan Apr 11, 2023
ee42aa3
Code style
PowerKiKi May 30, 2023
34eb13b
Added image quality support, with the maximum quality as default
MegaChriz Oct 25, 2022
fda4498
Re-add support for reading nested tables
Dec 8, 2022
8e0285d
Add required CS fixes
Dec 8, 2022
90a5595
1.1.0
PowerKiKi May 30, 2023
7743802
Introduce PHPStan
PowerKiKi May 30, 2023
ca6f51b
1、增加默认字体获取与设置功能逻辑;
presleylee Jul 3, 2023
d1ad6b7
1、修复输入html格式文档的部份文本缩进丢失问题;
presleylee Jul 4, 2023
24b791e
1、增加创建指定某个元素的功能,用来插入元素与替换元素的功能;
presleylee Jul 6, 2023
1cb7ebe
移除调试代码
presleylee Jul 7, 2023
d7da30e
1、解决了输出html时空格被合并问题;
presleylee Jul 13, 2023
9432da2
1、优化tabs制表符转换为html时字符宽度计算精度;
presleylee Jul 14, 2023
372da20
1、文档媒体元素增加Drawing元素支持;
presleylee Aug 15, 2023
d6235c1
1、排查页脚异常问题:
presleylee Aug 16, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
58 changes: 46 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
strategy:
matrix:
php-version:
- "7.1"
- "7.1.3"
- "7.2"
- "7.3"
- "7.4"
Expand Down Expand Up @@ -39,6 +39,10 @@ jobs:
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
restore-keys: ${{ runner.os }}-composer-

- name: Remove lock for old EOL PHP versions
if: matrix.php-version == '7.1.3' || matrix.php-version == '7.2' || matrix.php-version == '7.3' || matrix.php-version == '7.4'
run: rm composer.lock && composer config platform.php ${{ matrix.php-version }}

- name: Install dependencies
run: composer install --no-progress --prefer-dist --optimize-autoloader

Expand All @@ -63,7 +67,7 @@ jobs:
- name: Setup PHP, with composer and extensions
uses: shivammathur/setup-php@v2
with:
php-version: 7.4
php-version: 8.0
extensions: ctype, dom, gd, iconv, fileinfo, libxml, mbstring, simplexml, xml, xmlreader, xmlwriter, zip, zlib
coverage: none
tools: cs2pr
Expand All @@ -79,27 +83,57 @@ jobs:
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
restore-keys: ${{ runner.os }}-composer-

- name: Composer Install
run: composer global require friendsofphp/php-cs-fixer

- name: Add environment path
run: export PATH="$PATH:$HOME/.composer/vendor/bin"
- name: Install dependencies
run: composer install --no-progress --prefer-dist --optimize-autoloader

- name: Code style with PHP-CS-Fixer
run: php-cs-fixer fix --dry-run --diff
run: ./vendor/bin/php-cs-fixer fix --dry-run --diff

phpstan:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3

- name: Setup PHP, with composer and extensions
uses: shivammathur/setup-php@v2
with:
php-version: 8.0
extensions: ctype, dom, gd, iconv, fileinfo, libxml, mbstring, simplexml, xml, xmlreader, xmlwriter, zip, zlib
coverage: none
tools: cs2pr

- name: Get composer cache directory
id: composer-cache
run: echo "::set-output name=dir::$(composer config cache-files-dir)"

- name: Cache composer dependencies
uses: actions/cache@v3
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
restore-keys: ${{ runner.os }}-composer-

- name: Install dependencies
run: composer install --no-progress --prefer-dist --optimize-autoloader

- name: Static analysis with PHPStan
run: ./vendor/bin/phpstan analyse

coverage:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Setup PHP, with composer and extensions
uses: shivammathur/setup-php@v2
with:
php-version: 7.4
php-version: 8.0
extensions: ctype, dom, gd, iconv, fileinfo, libxml, mbstring, simplexml, xml, xmlreader, xmlwriter, zip, zlib
coverage: xdebug
coverage: pcov

- name: Get composer cache directory
id: composer-cache
Expand All @@ -118,5 +152,5 @@ jobs:
- name: Coverage
run: |
./vendor/bin/phpunit --coverage-clover coverage-clover.xml
curl -LO https://scrutinizer-ci.com/ocular.phar
php ocular.phar code-coverage:upload --format=php-clover coverage-clover.xml
composer global require scrutinizer/ocular
~/.composer/vendor/bin/ocular code-coverage:upload --format=php-clover coverage-clover.xml
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ Desktop.ini
_build
/build
phpunit.xml
composer.lock
composer.phar
vendor
/report
Expand Down
25 changes: 25 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,31 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

## [1.1.0](https://github.com/PHPOffice/PHPWord/tree/1.1.0) (2023-05-30)

[Full Changelog](https://github.com/PHPOffice/PHPWord/compare/1.0.0...1.1.0)

### Enhancements

- Introduce deleteRow() method for TemplateProcessor
- HTML Reader: Add basic support for CSS Style Tag
- Allow customizing macro syntax in TemplateProcessor
- Add background color support for textboxes
- Add softhyphen support to word reader
- Add support table row height when importing HTML
- Add support for fractional font sizes
- Added image quality support, with the maximum quality as default
- Support for reading nested tables

### Bug fixes

- DOCX reader: Read empty vmerge
- Fixed setting width of Cell Style

### Miscellaneous

- `master` is the new default branch

## [1.0.0](https://github.com/PHPOffice/PHPWord/tree/1.0.0) (2022-11-15)

[Full Changelog](https://github.com/PHPOffice/PHPWord/compare/0.18.3...1.0.0)
Expand Down
12 changes: 10 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@
"php-cs-fixer fix --ansi --dry-run --diff",
"phpcs --report-width=200 --report-summary --report-full samples/ src/ tests/ --ignore=src/PhpWord/Shared/PCLZip --standard=PSR2 -n",
"phpmd src/,tests/ text ./phpmd.xml.dist --exclude pclzip.lib.php",
"@test-no-coverage"
"@test-no-coverage",
"phpstan analyse --ansi"
],
"fix": [
"php-cs-fixer fix --ansi"
Expand All @@ -57,6 +58,11 @@
"check": "Runs PHP CheckStyle and PHP Mess detector",
"fix": "Fixes issues found by PHP-CS"
},
"config": {
"platform": {
"php": "8.0"
}
},
"require": {
"php": "^7.1|^8.0",
"ext-dom": "*",
Expand All @@ -73,7 +79,9 @@
"phpmd/phpmd": "^2.13",
"phpunit/phpunit": ">=7.0",
"tecnickcom/tcpdf": "^6.5",
"symfony/process": "^4.4"
"symfony/process": "^4.4",
"friendsofphp/php-cs-fixer": "^3.3",
"phpstan/phpstan-phpunit": "@stable"
},
"suggest": {
"ext-zip": "Allows writing OOXML and ODF",
Expand Down
Loading