Skip to content

Commit 292c197

Browse files
authored
Merge branch 'PHPOffice:master' into patch-1
2 parents f643049 + feadceb commit 292c197

File tree

84 files changed

+2458
-602
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+2458
-602
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ Fixes # (issue)
99
- [ ] My CI is :green_circle:
1010
- [ ] I have covered by unit tests my new code (check build/coverage for coverage report)
1111
- [ ] I have updated the [documentation](https://github.com/PHPOffice/PHPWord/tree/master/docs) to describe the changes
12-
- [ ] I have updated the [changelog](https://github.com/PHPOffice/PHPWord/blob/master/docs/changes/2.x/2.0.0.md)
12+
- [ ] I have updated the [changelog](https://github.com/PHPOffice/PHPWord/blob/master/docs/changes/1.x/1.4.0.md)

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# ![PHPWord](https://rawgit.com/PHPOffice/PHPWord/develop/docs/images/phpword.svg "PHPWord")
22

3-
[![Latest Stable Version](https://poser.pugx.org/phpoffice/phpword/v/stable.png)](https://packagist.org/packages/phpoffice/phpword)
3+
[![Latest Stable Version](https://poser.pugx.org/phpoffice/phpword/v)](https://packagist.org/packages/phpoffice/phpword)
44
[![Coverage Status](https://coveralls.io/repos/github/PHPOffice/PHPWord/badge.svg?branch=master)](https://coveralls.io/github/PHPOffice/PHPWord?branch=master)
5-
[![Total Downloads](https://poser.pugx.org/phpoffice/phpword/downloads.png)](https://packagist.org/packages/phpoffice/phpword)
6-
[![License](https://poser.pugx.org/phpoffice/phpword/license.png)](https://packagist.org/packages/phpoffice/phpword)
7-
[![CI](https://github.com/PHPOffice/PHPWord/actions/workflows/ci.yml/badge.svg)](https://github.com/PHPOffice/PHPWord/actions/workflows/ci.yml)
8-
[![Join the chat at https://gitter.im/PHPOffice/PHPWord](https://img.shields.io/badge/GITTER-join%20chat-green.svg)](https://gitter.im/PHPOffice/PHPWord)
5+
[![Total Downloads](https://poser.pugx.org/phpoffice/phpword/downloads)](https://packagist.org/packages/phpoffice/phpword)
6+
[![License](https://poser.pugx.org/phpoffice/phpword/license)](https://packagist.org/packages/phpoffice/phpword)
7+
8+
Branch Master : [![PHPWord](https://github.com/PHPOffice/PHPWord/actions/workflows/php.yml/badge.svg?branch=master)](https://github.com/PHPOffice/PHPWord/actions/workflows/php.yml)
99

1010
PHPWord is a library written in pure PHP that provides a set of classes to write to and read from different document file formats. The current version of PHPWord supports Microsoft [Office Open XML](http://en.wikipedia.org/wiki/Office_Open_XML) (OOXML or OpenXML), OASIS [Open Document Format for Office Applications](http://en.wikipedia.org/wiki/OpenDocument) (OpenDocument or ODF), [Rich Text Format](http://en.wikipedia.org/wiki/Rich_Text_Format) (RTF), HTML, and PDF.
1111

composer.json

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,20 +36,19 @@
3636
],
3737
"scripts": {
3838
"test": [
39-
"phpunit --color=always"
39+
"@php vendor/bin/phpunit --color=always"
4040
],
4141
"test-no-coverage": [
42-
"phpunit --color=always --no-coverage"
42+
"@php vendor/bin/phpunit --color=always --no-coverage"
4343
],
4444
"check": [
45-
"php-cs-fixer fix --ansi --dry-run --diff",
46-
"phpcs --report-width=200 --report-summary --report-full samples/ src/ tests/ --ignore=src/PhpWord/Shared/PCLZip --standard=PSR2 -n",
47-
"phpmd src/,tests/ text ./phpmd.xml.dist --exclude pclzip.lib.php",
45+
"@php vendor/bin/php-cs-fixer fix --ansi --dry-run --diff",
46+
"@php vendor/bin/phpmd src/,tests/ text ./phpmd.xml.dist --exclude pclzip.lib.php",
4847
"@test-no-coverage",
49-
"phpstan analyse --ansi"
48+
"@php vendor/bin/phpstan analyse --ansi"
5049
],
5150
"fix": [
52-
"php-cs-fixer fix --ansi"
51+
"@php vendor/bin/php-cs-fixer fix --ansi"
5352
]
5453
},
5554
"scripts-descriptions": {
@@ -68,13 +67,13 @@
6867
"ext-dom": "*",
6968
"ext-json": "*",
7069
"ext-xml": "*",
71-
"phpoffice/math": "^0.1"
70+
"phpoffice/math": "^0.2"
7271
},
7372
"require-dev": {
7473
"ext-zip": "*",
7574
"ext-gd": "*",
7675
"ext-libxml": "*",
77-
"dompdf/dompdf": "^2.0",
76+
"dompdf/dompdf": "^2.0 || ^3.0",
7877
"mpdf/mpdf": "^8.1",
7978
"phpmd/phpmd": "^2.13",
8079
"phpunit/phpunit": ">=7.0",

0 commit comments

Comments
 (0)