Commit 49a10ec

authored

Merge branch 'master' into styleid

2 parents 7c4eb21 + a7b9030 commit 49a10ecCopy full SHA for 49a10ec

37 files changed

+1326

-217

lines changed

composer.json
composer.lock
docs
- changes/2.x
  - 2.0.0.md
- usage
  - elements
    - comment.md
    - field.md
  - writers.md
phpstan-baseline.neon
phpstan.neon
src/PhpWord
- Element
- Reader/Word2007
  - AbstractPart.php
- Shared
- Style
  - Border.php
- TemplateProcessor.php
- Writer
  - HTML/Element
    - Table.php
  - RTF
    - Element
      - AbstractElement.php
      - Table.php
    - Part
      - Header.php
  - Word2007
    - Element
    - Part
      - Footnotes.php
    - Style
      - MarginBorder.php
tests/PhpWordTests
- Reader
  - Word2007
    - ElementTest.php
  - Word2007Test.php
- Shared
  - HtmlTest.php
  - XMLReaderTest.php
- TemplateProcessorTest.php
- Writer
  - RTF
    - Element
      - TableTest.php
    - Element2Test.php
  - Word2007
    - Element
      - FieldTest.php
      - TableTest.php
    - Part
      - FootnotesTest.php
- _files/documents
  - reader-styles.docx

37 files changed

+1326

-217

lines changed

`‎composer.json`

+1-1

-Original file line number
+Diff line change
         "ext-dom": "*",
         "ext-json": "*",
         "ext-xml": "*",
 -        "phpoffice/math": "^0.1"
 +        "phpoffice/math": "^0.2"
     },
     "require-dev": {
         "ext-zip": "*",

`‎composer.lock`

+69-61

Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Comments

(0)