From e334ecf059aa19b7ba82fa8600501efcb0b45ff4 Mon Sep 17 00:00:00 2001
From: Libor M <liborm85@gmail.com>
Date: Sat, 17 Oct 2020 13:39:22 +0200
Subject: [PATCH] compatibility with phpmd 2.9

---
 phpmd.xml.dist                      |  2 ++
 src/PhpWord/Reader/MsDoc.php        | 16 ++++++++--------
 tests/PhpWord/Element/TableTest.php |  6 +++---
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/phpmd.xml.dist b/phpmd.xml.dist
index 2077e02b04..cfb9353b57 100644
--- a/phpmd.xml.dist
+++ b/phpmd.xml.dist
@@ -5,6 +5,8 @@
     xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd"
     xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd">
     <rule ref="rulesets/naming.xml">
+        <exclude name="ShortVariable" />
+        <exclude name="ShortClassName" />
         <exclude name="LongVariable" />
     </rule>
     <rule ref="rulesets/naming.xml/LongVariable">
diff --git a/src/PhpWord/Reader/MsDoc.php b/src/PhpWord/Reader/MsDoc.php
index 1a9e4988bf..eb64e00ae9 100644
--- a/src/PhpWord/Reader/MsDoc.php
+++ b/src/PhpWord/Reader/MsDoc.php
@@ -1581,7 +1581,7 @@ private function readPrl($data, $pos, $cbNum)
         // Variables
         $sprmCPicLocation = null;
         $sprmCFData = null;
-        $sprmCFSpec = null;
+        //$sprmCFSpec = null;
 
         do {
             // Variables
@@ -1830,7 +1830,7 @@ private function readPrl($data, $pos, $cbNum)
                             break;
                         // sprmCFSpec
                         case 0x55:
-                            $sprmCFSpec = $operand;
+                            //$sprmCFSpec = $operand;
                             break;
                         // sprmCFtcBi
                         case 0x5E:
@@ -2094,11 +2094,11 @@ private function readPrl($data, $pos, $cbNum)
                     $sprmCPicLocation += 1;
 
                     // stPicName
-                    $stPicName = '';
+                    //$stPicName = '';
                     for ($inc = 0; $inc <= $cchPicName; $inc++) {
-                        $chr = self::getInt1d($this->dataData, $sprmCPicLocation);
+                        //$chr = self::getInt1d($this->dataData, $sprmCPicLocation);
                         $sprmCPicLocation += 1;
-                        $stPicName .= chr($chr);
+                        //$stPicName .= chr($chr);
                     }
                 }
 
@@ -2143,11 +2143,11 @@ private function readPrl($data, $pos, $cbNum)
                             $sprmCPicLocation += 1;
                             // nameData
                             if ($cbName > 0) {
-                                $nameData = '';
+                                //$nameData = '';
                                 for ($inc = 0; $inc <= ($cbName / 2); $inc++) {
-                                    $chr = self::getInt2d($this->dataData, $sprmCPicLocation);
+                                    //$chr = self::getInt2d($this->dataData, $sprmCPicLocation);
                                     $sprmCPicLocation += 2;
-                                    $nameData .= chr($chr);
+                                    //$nameData .= chr($chr);
                                 }
                             }
                             // embeddedBlip
diff --git a/tests/PhpWord/Element/TableTest.php b/tests/PhpWord/Element/TableTest.php
index 8ae5306c82..17aa13a38f 100644
--- a/tests/PhpWord/Element/TableTest.php
+++ b/tests/PhpWord/Element/TableTest.php
@@ -99,10 +99,10 @@ public function testCountColumns()
     {
         $oTable = new Table();
         $oTable->addRow();
-        $element = $oTable->addCell();
+        $oTable->addCell();
         $this->assertEquals($oTable->countColumns(), 1);
-        $element = $oTable->addCell();
-        $element = $oTable->addCell();
+        $oTable->addCell();
+        $oTable->addCell();
         $this->assertEquals($oTable->countColumns(), 3);
     }
 }