PHPOffice · oleibman · Feb 6, 2024 · Feb 6, 2024 · Feb 7, 2024 · May 9, 2024
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -83,13 +83,21 @@ jobs:
       -   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
+      -   name: Run phpunit 7.4 8.0
+          if: matrix.php == '7.4' || matrix.php == '8.0'
+          run: ./vendor/bin/phpunit -c phpunit9.xml.dist --no-coverage
+
+      -   name: Run phpunit 8.1 8.2 8.3 8.4
+          if: matrix.php == '8.1' || matrix.php == '8.2' || matrix.php == '8.3' || matrix.php == '8.4'
+          run: ./vendor/bin/phpunit -c phpunit10.xml.dist --no-coverage
+
+      -   name: Run phpunit 7.3
           if: matrix.php == '7.3'
-          run: ./vendor/bin/phpunit -c phpunit.xml.dist --coverage-clover build/clover.xml
+          run: ./vendor/bin/phpunit -c phpunit9.xml.dist --coverage-clover build/clover.xml
 
       -   name: Upload coverage results to Coveralls
           if: matrix.php == '7.3'

diff --git a/.gitignore b/.gitignore
@@ -25,4 +25,5 @@ phpword.ini
 /nbproject
 /.php_cs.cache
 /.phpunit.result.cache
-/public
+/.phpunit.cache
+/public
diff --git a/composer.json b/composer.json
@@ -108,9 +108,8 @@
     "require": {
         "php": "^7.1|^8.0",
         "ext-dom": "*",
-        "ext-gd": "*",  
+        "ext-gd": "*",
         "ext-zip": "*",
-        "ext-json": "*",
         "ext-xml": "*",
         "phpoffice/math": "^0.2"
     },
@@ -122,7 +121,7 @@
         "phpmd/phpmd": "^2.13",
         "phpstan/phpstan": "^0.12.88 || ^1.0.0",
         "phpstan/phpstan-phpunit": "^1.0 || ^2.0",
-        "phpunit/phpunit": ">=7.0",
+        "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0 || ^10.0",
         "symfony/process": "^4.4 || ^5.0",
         "tecnickcom/tcpdf": "^6.5"
     },

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -380,11 +380,6 @@ parameters:
 			count: 1
 			path: src/PhpWord/Shared/Html.php
 
-		-
-			message: "#^Cannot call method setBorderSize\\(\\) on PhpOffice\\\\PhpWord\\\\Style\\\\Table\\|string\\.$#"
-			count: 1
-			path: src/PhpWord/Shared/Html.php
-
 		-
 			message: "#^Cannot call method setStyleName\\(\\) on PhpOffice\\\\PhpWord\\\\Style\\\\Table\\|string\\.$#"
 			count: 1

diff --git a/phpunit.7.8.xml.dist b/phpunit.7.8.xml.dist
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" bootstrap="./tests/bootstrap.php" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" convertDeprecationsToExceptions="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <php>
+    <ini name="error_reporting" value="E_ALL"/>
+  </php>
+  <testsuites>
+    <testsuite name="PhpWord Test Suite">
+      <directory>./tests/PhpWordTests</directory>
+    </testsuite>
+  </testsuites>
+</phpunit>
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,17 +1,5 @@
 <?xml version="1.0"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" bootstrap="./tests/bootstrap.php" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" convertDeprecationsToExceptions="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-  <coverage>
-    <include>
-      <directory suffix=".php">./src</directory>
-    </include>
-    <exclude>
-      <directory suffix=".php">./src/PhpWord/Shared/PCLZip</directory>
-    </exclude>
-    <report>
-      <clover outputFile="./build/logs/clover.xml"/>
-      <html outputDirectory="./build/coverage"/>
-    </report>
-  </coverage>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" bootstrap="./tests/bootstrap.php" colors="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
   <php>
     <ini name="error_reporting" value="E_ALL"/>
   </php>
@@ -21,4 +9,12 @@
     </testsuite>
   </testsuites>
   <logging/>
+  <source>
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+    <exclude>
+      <directory suffix=".php">./src/PhpWord/Shared/PCLZip</directory>
+    </exclude>
+  </source>
 </phpunit>
diff --git a/phpunit10.xml.dist b/phpunit10.xml.dist
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" bootstrap="./tests/bootstrap.php" colors="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
+  <php>
+    <ini name="error_reporting" value="E_ALL"/>
+  </php>
+  <testsuites>
+    <testsuite name="PhpWord Test Suite">
+      <directory>./tests/PhpWordTests</directory>
+    </testsuite>
+  </testsuites>
+  <logging/>
+  <source>
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+    <exclude>
+      <directory suffix=".php">./src/PhpWord/Shared/PCLZip</directory>
+    </exclude>
+  </source>
+</phpunit>
diff --git a/phpunit9.xml.dist b/phpunit9.xml.dist
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" bootstrap="./tests/bootstrap.php" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" convertDeprecationsToExceptions="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage>
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+    <exclude>
+      <directory suffix=".php">./src/PhpWord/Shared/PCLZip</directory>
+    </exclude>
+    <!--report>
+      <clover outputFile="./build/logs/clover.xml"/>
+      <html outputDirectory="./build/coverage"/>
+    </report-->
+  </coverage>
+  <php>
+    <ini name="error_reporting" value="E_ALL"/>
+  </php>
+  <testsuites>
+    <testsuite name="PhpWord Test Suite">
+      <directory>./tests/PhpWordTests</directory>
+    </testsuite>
+  </testsuites>
+  <logging/>
+</phpunit>
diff --git a/samples/Sample_45_RTLTitles.php b/samples/Sample_45_RTLTitles.php
@@ -0,0 +1,35 @@
+<?php
+
+include_once 'Sample_Header.php';
+
+use PhpOffice\PhpWord\PhpWord;
+use PhpOffice\PhpWord\Settings;
+use PhpOffice\PhpWord\Shared\Html as SharedHtml;
+
+// Suggested by issue #2427.
+echo date('H:i:s'), ' Create new PhpWord object', EOL;
+$phpWord = new PhpWord();
+Settings::setDefaultRtl(true);
+$phpWord->setDefaultFontName('DejaVu Sans'); // for good rendition of PDF
+$rendererName = Settings::PDF_RENDERER_MPDF;
+$rendererLibraryPath = $vendorDirPath . '/mpdf/mpdf';
+Settings::setPdfRenderer($rendererName, $rendererLibraryPath);
+
+// Define styles for headers
+$phpWord->addTitleStyle(1, ['bold' => true, 'name' => 'Arial', 'size' => 16], []);
+//var_dump($x);
+$phpWord->addTitleStyle(2, ['bold' => true, 'name' => 'Arial', 'size' => 14], []);
+$phpWord->addTitleStyle(3, ['bold' => true, 'name' => 'Arial', 'size' => 12], []);
+$phpWord->addTitleStyle(4, ['bold' => true, 'name' => 'Arial', 'size' => 10], []);
+
+// New section
+$section = $phpWord->addSection();
+$htmlContent = '<h1>مرحبا 1</h1><h2>تجربة 2</h2><h3>تجربة تجربة</h3><h4 dir="rtl">هناك hello هنا 4</h4><p>مرحبا here كلمة انجليزي.</p>';
+SharedHtml::addHtml($section, $htmlContent, false, false);
+
+// Save file
+echo write($phpWord, basename(__FILE__, '.php'), $writers);
+if (!CLI) {
+    include_once 'Sample_Footer.php';
+}
+Settings::setDefaultRtl(false);
diff --git a/src/PhpWord/PhpWord.php b/src/PhpWord/PhpWord.php
@@ -21,6 +21,7 @@
 use BadMethodCallException;
 use PhpOffice\PhpWord\Element\Section;
 use PhpOffice\PhpWord\Exception\Exception;
+use PhpOffice\PhpWord\Style\Font;
 
 /**
  * PHPWord main class.
@@ -318,9 +319,9 @@ public function setDefaultFontSize($fontSize): void
      *
      * @return Style\Paragraph
      */
-    public function setDefaultParagraphStyle($styles)
+    public function setDefaultParagraphStyle($styles, ?Font $fontStyles = null)
     {
-        return Style::setDefaultParagraphStyle($styles);
+        return Style::setDefaultParagraphStyle($styles, $fontStyles);
     }
 
     /**

diff --git a/src/PhpWord/Reader/Word2007/AbstractPart.php b/src/PhpWord/Reader/Word2007/AbstractPart.php
@@ -792,35 +792,46 @@ protected function readTableStyle(XMLReader $xmlReader, DOMElement $domNode)
         $borders = array_merge($margins, ['insideH', 'insideV']);
 
         if ($xmlReader->elementExists('w:tblPr', $domNode)) {
+            $tblStyleName = '';
             if ($xmlReader->elementExists('w:tblPr/w:tblStyle', $domNode)) {
-                $style = $xmlReader->getAttribute('w:val', $domNode, 'w:tblPr/w:tblStyle');
-            } else {
-                $styleNode = $xmlReader->getElement('w:tblPr', $domNode);
-                $styleDefs = [];
-                foreach ($margins as $side) {
-                    $ucfSide = ucfirst($side);
-                    $styleDefs["cellMargin$ucfSide"] = [self::READ_VALUE, "w:tblCellMar/w:$side", 'w:w'];
-                }
-                foreach ($borders as $side) {
-                    $ucfSide = ucfirst($side);
-                    $styleDefs["border{$ucfSide}Size"] = [self::READ_VALUE, "w:tblBorders/w:$side", 'w:sz'];
-                    $styleDefs["border{$ucfSide}Color"] = [self::READ_VALUE, "w:tblBorders/w:$side", 'w:color'];
-                    $styleDefs["border{$ucfSide}Style"] = [self::READ_VALUE, "w:tblBorders/w:$side", 'w:val'];
-                }
-                $styleDefs['layout'] = [self::READ_VALUE, 'w:tblLayout', 'w:type'];
-                $styleDefs['bidiVisual'] = [self::READ_TRUE, 'w:bidiVisual'];
-                $styleDefs['cellSpacing'] = [self::READ_VALUE, 'w:tblCellSpacing', 'w:w'];
-                $style = $this->readStyleDefs($xmlReader, $styleNode, $styleDefs);
-
-                $tablePositionNode = $xmlReader->getElement('w:tblpPr', $styleNode);
-                if ($tablePositionNode !== null) {
-                    $style['position'] = $this->readTablePosition($xmlReader, $tablePositionNode);
-                }
+                $tblStyleName = $xmlReader->getAttribute('w:val', $domNode, 'w:tblPr/w:tblStyle');
+            }
+            $styleNode = $xmlReader->getElement('w:tblPr', $domNode);
+            $styleDefs = [];
 
-                $indentNode = $xmlReader->getElement('w:tblInd', $styleNode);
-                if ($indentNode !== null) {
-                    $style['indent'] = $this->readTableIndent($xmlReader, $indentNode);
-                }
+            foreach ($margins as $side) {
+                $ucfSide = ucfirst($side);
+                $styleDefs["cellMargin$ucfSide"] = [self::READ_VALUE, "w:tblCellMar/w:$side", 'w:w'];
+            }
+            foreach ($borders as $side) {
+                $ucfSide = ucfirst($side);
+                $styleDefs["border{$ucfSide}Size"] = [self::READ_VALUE, "w:tblBorders/w:$side", 'w:sz'];
+                $styleDefs["border{$ucfSide}Color"] = [self::READ_VALUE, "w:tblBorders/w:$side", 'w:color'];
+                $styleDefs["border{$ucfSide}Style"] = [self::READ_VALUE, "w:tblBorders/w:$side", 'w:val'];
+            }
+            $styleDefs['layout'] = [self::READ_VALUE, 'w:tblLayout', 'w:type'];
+            $styleDefs['bidiVisual'] = [self::READ_TRUE, 'w:bidiVisual'];
+            $styleDefs['cellSpacing'] = [self::READ_VALUE, 'w:tblCellSpacing', 'w:w'];
+            $style = $this->readStyleDefs($xmlReader, $styleNode, $styleDefs);
+
+            $tablePositionNode = $xmlReader->getElement('w:tblpPr', $styleNode);
+            if ($tablePositionNode !== null) {
+                $style['position'] = $this->readTablePosition($xmlReader, $tablePositionNode);
+            }
+
+            $indentNode = $xmlReader->getElement('w:tblInd', $styleNode);
+            if ($indentNode !== null) {
+                $style['indent'] = $this->readTableIndent($xmlReader, $indentNode);
+            }
+            if ($xmlReader->elementExists('w:basedOn', $domNode)) {
+                $style['basedOn'] = $xmlReader->getAttribute('w:val', $domNode, 'w:basedOn');
+            }
+            if ($tblStyleName !== '') {
+                $style['tblStyle'] = $tblStyleName;
+            }
+            // this may be unneeded
+            if ($xmlReader->elementExists('w:name', $domNode)) {
+                $style['styleName'] = $xmlReader->getAttribute('w:val', $domNode, 'w:name');
             }
         }
 

diff --git a/src/PhpWord/Reader/Word2007/Styles.php b/src/PhpWord/Reader/Word2007/Styles.php
@@ -69,8 +69,9 @@ public function read(PhpWord $phpWord): void
             foreach ($nodes as $node) {
                 $type = $xmlReader->getAttribute('w:type', $node);
                 $name = $xmlReader->getAttribute('w:val', $node, 'w:name');
+                $styleId = $xmlReader->getAttribute('w:styleId', $node);
                 if (null === $name) {
-                    $name = $xmlReader->getAttribute('w:styleId', $node);
+                    $name = $styleId;
                 }
                 $headingMatches = [];
                 preg_match('/Heading\s*(\d)/i', $name, $headingMatches);
@@ -102,7 +103,8 @@ public function read(PhpWord $phpWord): void
                     case 'table':
                         $tStyle = $this->readTableStyle($xmlReader, $node);
                         if (!empty($tStyle)) {
-                            $phpWord->addTableStyle($name, $tStyle);
+                            $newTable = $phpWord->addTableStyle($styleId, $tStyle);
+                            $newTable->setStyleName($name);
                         }
 
                         break;

diff --git a/src/PhpWord/Settings.php b/src/PhpWord/Settings.php
@@ -16,6 +16,8 @@
 
 namespace PhpOffice\PhpWord;
 
+use PhpOffice\PhpWord\SimpleType\TextDirection;
+
 /**
  * PHPWord settings class.
  *
@@ -453,6 +455,9 @@ public static function setDefaultFontSize($value): bool
     public static function setDefaultRtl(?bool $defaultRtl): void
     {
         self::$defaultRtl = $defaultRtl;
+        if ($defaultRtl === true && Style::getStyle('Normal') === null) {
+            Style::setDefaultParagraphStyle(['bidi' => true, 'textDirection' => TextDirection::RLTB], ['rtl' => true]);
+        }
     }
 
     public static function isDefaultRtl(): ?bool