WIP Do Not Install

.github/workflows/php.yml

@@ -48,7 +48,7 @@ jobs:
       fail-fast: false
       matrix:
         # Disabled PHPStan in '7.1'
-        php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
+        php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5']
     steps:
         -   name: Setup PHP
             uses: shivammathur/setup-php@v2
@@ -60,65 +60,88 @@ jobs:
         -   name: Composer Install
             run: composer install --ansi --prefer-dist --no-interaction --no-progress
 
-        -   name: Run phpstan
+        -   name: Run phpstan Php7.2/Php7.3
+            if: matrix.php == '7.2' || matrix.php == '7.3'
+            run: ./vendor/bin/phpstan analyse -c phpstan.neon.php73.dist
+
+        -   name: Run phpstan Php8/Php7.4
+            if: matrix.php == '7.4' || matrix.php == '8.0' || matrix.php == '8.1' || matrix.php == '8.2' || matrix.php == '8.3' || matrix.php == '8.4' || matrix.php == '8.5'
             run: ./vendor/bin/phpstan analyse -c phpstan.neon.dist
 
   phpunit:
-    name: PHPUnit ${{ matrix.php }}
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        php: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
+        experimental:
+          - false
+        php:
+          - '7.1'
+          - '7.2'
+          - '7.3'
+          - '7.4'
+          - '8.0'
+          - '8.1'
+          - '8.2'
+          - '8.3'
+          - '8.4'
+          - '8.5'
+
+        include:
+          - php: 'nightly'
+            experimental: true
+
+    name: PHPUnit ${{ matrix.php }}
+
     steps:
       -   name: Setup PHP
           uses: shivammathur/setup-php@v2
           with:
               php-version: ${{ matrix.php }}
-              extensions: gd, xml, zip
-              coverage: ${{ (matrix.php == '7.3') && 'xdebug' || 'none' }}
+              extensions: dom, gd, mbstring, xml, zip
+              coverage: ${{ (matrix.php == '8.3') && 'xdebug' || 'none' }}
 
       -   uses: actions/checkout@v2
 
+      -   name: Composer Config nightly
+          if: matrix.php == 'nightly'
+          run: composer config platform.php 8.5.99
+
       -   name: Composer Install
           run: composer install --ansi --prefer-dist --no-interaction --no-progress
 
-      -   name: Run phpunit
-          if: matrix.php != '7.3'
-          run: ./vendor/bin/phpunit -c phpunit.xml.dist --no-coverage
+      -   name: Run phpunit 7.1 7.2
+          if: matrix.php == '7.1' || matrix.php == '7.2'
+          run: ./vendor/bin/phpunit -c phpunit.7.8.xml.dist --no-coverage
 
-      -   name: Run phpunit
-          if: matrix.php == '7.3'
-          run: ./vendor/bin/phpunit -c phpunit.xml.dist --coverage-clover build/clover.xml
+      -   name: Run phpunit 7.3 7.4 8.0
+          if: matrix.php == '7.3' || matrix.php == '7.4' || matrix.php == '8.0'
+          run: ./vendor/bin/phpunit -c phpunit9.xml.dist --no-coverage
 
-      -   name: Upload coverage results to Coveralls
-          if: matrix.php == '7.3'
+      -   name: Run phpunit 8.1 8.2 8.4 8.5
+          if: matrix.php == '8.1' || matrix.php == '8.2' || matrix.php == '8.4' || matrix.php == '8.5'
+          run: ./vendor/bin/phpunit -c phpunit10.xml.dist --no-coverage
+
+      -   name: Run phpunit nightly experimental
+          if: matrix.php == 'nightly'
           env:
-            COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          run: |
-            wget https://github.com/php-coveralls/php-coveralls/releases/download/v2.4.3/php-coveralls.phar
-            chmod +x php-coveralls.phar
-            php php-coveralls.phar --coverage_clover=build/clover.xml --json_path=build/coveralls-upload.json -vvv
-
-  samples:
-    name: Check samples
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        php: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
-    steps:
-      -   name: Setup PHP
-          uses: shivammathur/setup-php@v2
-          with:
-              php-version: ${{ matrix.php }}
-              extensions: gd, xml, zip
-              coverage: xdebug
+            FAILURE_ACTION: "${{ matrix.experimental == true }}"
+          run: ./vendor/bin/phpunit -c phpunit10.xml.dist --no-coverage || $FAILURE_ACTION
 
-      -   uses: actions/checkout@v2
+      -   name: Test non-Composer Autoloader
+          env:
+            FAILURE_ACTION: "${{ matrix.experimental == true }}"
+          run: php samples/Sample_45_Autoloader.php
 
-      -   name: Composer Install
-          run: composer install --ansi --prefer-dist --no-interaction --no-progress
+      -   name: Run phpunit 8.3
+          if: matrix.php == '8.3'
+          run: ./vendor/bin/phpunit -c phpunit10.xml.dist --coverage-clover build/clover.xml
 
-      -   name: Generate samples files
-          run: composer run samples
+      -   name: Upload coverage results to Coveralls
+          if: matrix.php == '8.3'
+          uses: coverallsapp/github-action@v2
+          with:
+              github-token: ${{ secrets.GITHUB_TOKEN }}
+              file: build/clover.xml
+              format: clover
+              fail-on-error: false

.gitignore

@@ -8,14 +8,14 @@
 Thumbs.db
 Desktop.ini
 .idea
+/analysis
 _build
 /build
 phpunit.xml
 composer.phar
 composer.lock
 vendor
 /report
-/build
 /samples/results
 /.settings
 phpword.ini
@@ -25,4 +25,5 @@ phpword.ini
 /nbproject
 /.php_cs.cache
 /.phpunit.result.cache
-/public
+/.phpunit.cache
+/public

README.md

@@ -54,7 +54,6 @@ PHPWord requires the following:
 
 - PHP 7.1+
 - [XML Parser extension](http://www.php.net/manual/en/xml.installation.php)
-- [Laminas Escaper component](https://docs.laminas.dev/laminas-escaper/intro/)
 - [Zip extension](http://php.net/manual/en/book.zip.php) (optional, used to write OOXML and ODF)
 - [GD extension](http://php.net/manual/en/book.image.php) (optional, used to add images)
 - [XMLWriter extension](http://php.net/manual/en/book.xmlwriter.php) (optional, used to write OOXML and ODF)
@@ -129,7 +128,7 @@ $fontStyle = new \PhpOffice\PhpWord\Style\Font();
 $fontStyle->setBold(true);
 $fontStyle->setName('Tahoma');
 $fontStyle->setSize(13);
-$myTextElement = $section->addText('"Believe you can and you\'re halfway there." (Theodor Roosevelt)');
+$myTextElement = $section->addText('"Believe you can and you\'re halfway there." (Theodore Roosevelt)');
 $myTextElement->setFontStyle($fontStyle);
 
 // Saving the document as OOXML file...

composer.json

@@ -96,7 +96,9 @@
             "php samples/Sample_42_TemplateSetCheckbox.php",
             "php samples/Sample_43_RTLDefault.php",
             "php samples/Sample_44_ExtractVariablesFromReaderWord2007.php",
-            "php samples/Sample_45_Autoloader.php"
+            "php samples/Sample_45_Autoloader.php",
+            "php samples/Sample_46_RubyPhoneticGuide.php",
+            "php samples/Sample_47_RTLTitles.php"
         ]
     },
     "scripts-descriptions": {
@@ -108,22 +110,23 @@
     "require": {
         "php": "^7.1|^8.0",
         "ext-dom": "*",
-        "ext-gd": "*",  
-        "ext-zip": "*",
-        "ext-json": "*",
+        "ext-gd": "*",
+        "ext-mbstring": "*",
         "ext-xml": "*",
-        "phpoffice/math": "^0.3"
+        "ext-zip": "*",
+        "phpoffice/math": "^0.3",
+        "symfony/polyfill-php72": "^1.30"
     },
     "require-dev": {
         "ext-libxml": "*",
         "dompdf/dompdf": "^2.0 || ^3.0",
         "friendsofphp/php-cs-fixer": "^3.3",
         "mpdf/mpdf": "^7.0 || ^8.0",
         "phpmd/phpmd": "^2.13",
-        "phpstan/phpstan": "^0.12.88 || ^1.0.0 || ^2.0.0",
+        "phpstan/phpstan": "<=2.1.32",
         "phpstan/phpstan-phpunit": "^1.0 || ^2.0",
-        "phpunit/phpunit": ">=7.0",
-        "symfony/process": "^4.4 || ^5.0",
+        "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0 || ^10.0",
+        "symfony/process": "^4.4 || ^5.0 || ^6.0 || ^7.0 || 7.4.x-dev",
         "tecnickcom/tcpdf": "^6.5"
     },
     "suggest": {

docs/usage/introduction.md

@@ -55,7 +55,7 @@ $fontStyle = new \PhpOffice\PhpWord\Style\Font();
 $fontStyle->setBold(true);
 $fontStyle->setName('Tahoma');
 $fontStyle->setSize(13);
-$myTextElement = $section->addText('"Believe you can and you\'re halfway there." (Theodor Roosevelt)');
+$myTextElement = $section->addText('"Believe you can and you\'re halfway there." (Theodore Roosevelt)');
 $myTextElement->setFontStyle($fontStyle);
 
 // Saving the document as OOXML file...

docs/usage/template.md

@@ -166,7 +166,7 @@ Customer: ${customer_name#3}
 Address: ${customer_address#3}
 ```
 
-It is also possible to pass an array with the values to replace the marcros with.
+It is also possible to pass an array with the values to replace the macros with.
 If an array with replacements is passed, the ``count`` argument is ignored, it is the size of the array that counts.
 
 ``` php