From 5e64b264512265f8bdd3510b86f758be9cffd210 Mon Sep 17 00:00:00 2001
From: owen <eclipsechasers2@yahoo.com>
Date: Thu, 5 Dec 2019 23:24:03 -0800
Subject: [PATCH] Additional Scrutinizer Recommendations

Some more editorial changes.
---
 src/PhpWord/Writer/RTF/Element/Title.php   | 30 ++++++++++------------
 src/PhpWord/Writer/RTF/Style/Paragraph.php |  2 --
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/src/PhpWord/Writer/RTF/Element/Title.php b/src/PhpWord/Writer/RTF/Element/Title.php
index d5c8d455..77ebff17 100644
--- a/src/PhpWord/Writer/RTF/Element/Title.php
+++ b/src/PhpWord/Writer/RTF/Element/Title.php
@@ -29,24 +29,22 @@ class Title extends Text
         /** @var \PhpOffice\PhpWord\Element\Title $element Type hint */
         $element = $this->element;
         $style = $element->getStyle();
-        if (is_string($style)) {
-            $style = str_replace('Heading', 'Heading_', $style);
-            $style = \PhpOffice\PhpWord\Style::getStyle($style);
-            if ($style instanceof \PhpOffice\PhpWord\Style\Font) {
-                $this->fontStyle = $style;
-                $pstyle = $style->getParagraph();
-                if ($pstyle instanceof \PhpOffice\PhpWord\Style\Paragraph && $pstyle->hasPageBreakBefore()) {
-                    $sect = $element->getParent();
-                    if ($sect instanceof \PhpOffice\PhpWord\Element\Section) {
-                        $elems = $sect->getElements();
-                        if ($elems[0] === $element) {
-                            $pstyle = clone $pstyle;
-                            $pstyle->setPageBreakBefore(false);
-                        }
+        $style = str_replace('Heading', 'Heading_', $style);
+        $style = \PhpOffice\PhpWord\Style::getStyle($style);
+        if ($style instanceof \PhpOffice\PhpWord\Style\Font) {
+            $this->fontStyle = $style;
+            $pstyle = $style->getParagraph();
+            if ($pstyle instanceof \PhpOffice\PhpWord\Style\Paragraph && $pstyle->hasPageBreakBefore()) {
+                $sect = $element->getParent();
+                if ($sect instanceof \PhpOffice\PhpWord\Element\Section) {
+                    $elems = $sect->getElements();
+                    if ($elems[0] === $element) {
+                        $pstyle = clone $pstyle;
+                        $pstyle->setPageBreakBefore(false);
                     }
                 }
-                $this->paragraphStyle = $pstyle;
             }
+            $this->paragraphStyle = $pstyle;
         }
     }
 
@@ -57,7 +55,7 @@ class Title extends Text
      */
     public function write()
     {
-        /** @var \PhpOffice\PhpWord\Element\Text $element Type hint */
+        /** @var \PhpOffice\PhpWord\Element\Title $element Type hint */
         $element = $this->element;
         $elementClass = str_replace('\\Writer\\RTF', '', get_class($this));
         if (!$element instanceof $elementClass || !is_string($element->getText())) {
diff --git a/src/PhpWord/Writer/RTF/Style/Paragraph.php b/src/PhpWord/Writer/RTF/Style/Paragraph.php
index a9c060ac..9f8cf9df 100644
--- a/src/PhpWord/Writer/RTF/Style/Paragraph.php
+++ b/src/PhpWord/Writer/RTF/Style/Paragraph.php
@@ -52,8 +52,6 @@ class Paragraph extends AbstractStyle
             Jc::END    => '\qr',
             Jc::CENTER => '\qc',
             Jc::BOTH   => '\qj',
-            "left"     => '\ql',
-            "right"    => '\qr',
         );
 
         $spaceAfter = $style->getSpaceAfter();