Additional PHPStan fixes

Author: rasamassen

tests/PhpWordTests/Writer/HTML/ElementTest.php

@@ -149,8 +149,6 @@ public function testWriteRowSpan(): void
         $query = $xpath->query('/html/body/div/table/tr[1]/td');
         self::assertNotFalse($query);
         self::assertCount(2, $query);
-        self::assertInstanceOf(DOMNode::class, $query->item(0));
-        self::assertEquals('2', $query->item(0)->attributes->getNamedItem('colspan')->textContent);
 
         $query = $xpath->query('/html/body/div/table/tr[1]/td[1]');
         self::assertNotFalse($query);
@@ -159,7 +157,7 @@ public function testWriteRowSpan(): void
 
         $query = $xpath->query('/html/body/div/table/tr[2]/td');
         self::assertNotFalse($query);
-        self::assertEquals(1, $query->length);
+        self::assertCount(1, $query);
     }
 
     /**
@@ -191,18 +189,26 @@ public function testWriteRowSpanAndColSpan(): void
 
         $query = $xpath->query('/html/body/div/table/tr[1]/td');
         self::assertNotFalse($query);
-        self::assertEquals(3, $query->length);
-        self::assertEquals('2', $xpath->query('/html/body/div/table/tr[1]/td[2]')->item(0)->attributes->getNamedItem('colspan')->textContent);
-        self::assertEquals('3', $xpath->query('/html/body/div/table/tr[1]/td[3]')->item(0)->attributes->getNamedItem('rowspan')->textContent);
+        self::assertCount(3, $query);
+
+        $query = $xpath->query('/html/body/div/table/tr[1]/td[2]');
+        self::assertNotFalse($query);
+        self::assertInstanceOf(DOMNode::class, $query->item(0));
+        self::assertEquals('2', $query->item(0)->attributes->getNamedItem('colspan')->textContent);
+
+        $query = $xpath->query('/html/body/div/table/tr[1]/td[3]');
+        self::assertNotFalse($query);
+        self::assertInstanceOf(DOMNode::class, $query->item(0));
+        self::assertEquals('3', $query->item(0)->attributes->getNamedItem('rowspan')->textContent);
 
         $query = $xpath->query('/html/body/div/table/tr[2]/td');
         self::assertNotFalse($query);
-        self::assertEquals(1, $query->length);
+        self::assertCount(1, $query);
         self::assertEquals('3', $xpath->query('/html/body/div/table/tr[2]/td[1]')->item(0)->attributes->getNamedItem('colspan')->textContent);
 
         $query = $xpath->query('/html/body/div/table/tr[3]/td');
         self::assertNotFalse($query);
-        self::assertEquals(3, $query->length);
+        self::assertCount(3, $query);
     }
 
     public function testWriteTitleTextRun(): void
@@ -268,7 +274,14 @@ public function testWriteTableLayout(): void
         $dom = Helper::getAsHTML($phpWord);
         $xpath = new DOMXPath($dom);
 
-        self::assertEquals('table-layout: fixed;', $xpath->query('/html/body/div/table[1]')->item(0)->attributes->getNamedItem('style')->textContent);
-        self::assertEquals('table-layout: auto;', $xpath->query('/html/body/div/table[2]')->item(0)->attributes->getNamedItem('style')->textContent);
+        $query = $xpath->query('/html/body/div/table[1]');
+        self::assertNotFalse($query);
+        self::assertInstanceOf(DOMNode::class, $query->item(0));
+        self::assertEquals('table-layout: fixed;', $query->item(0)->attributes->getNamedItem('style')->textContent);
+
+        $query = $xpath->query('/html/body/div/table[2]');
+        self::assertNotFalse($query);
+        self::assertInstanceOf(DOMNode::class, $query->item(0));
+        self::assertEquals('table-layout: auto;', $query->item(0)->attributes->getNamedItem('style')->textContent);
     }
 }

tests/PhpWordTests/Writer/HTML/Helper.php

@@ -41,14 +41,26 @@ public static function getTextContent(DOMXPath $xpath, string $query, string $na
             if ($item2 === null) {
                 self::fail('Unexpected null return requesting item');
             } elseif ($namedItem !== '') {
-                $item3 = $item2->attributes->getNamedItem($namedItem);
-                if ($item3 === null) {
-                    self::fail('Unexpected null return requesting namedItem');
+                if (!property_exists('attributes', $item2)) {
+                    self::fail('Unexpected incorrect object');
                 } else {
-                    $returnVal = $item3->textContent;
+                    $item3 = $item2->attributes->getNamedItem($namedItem);
+                    if ($item3 === null) {
+                        self::fail('Unexpected null return requesting namedItem');
+                    } else {
+                        if (!property_exists('textContent', $item3)) {
+                            self::fail('Unexpected incorrect object');
+                        } else {
+                            $returnVal = $item3->textContent;
+                        }
+                    }
                 }
             } else {
-                $returnVal = $item2->textContent;
+                if (!property_exists('textContent', $item2)) {
+                    self::fail('Unexpected incorrect object');
+                } else {
+                    $returnVal = $item2->textContent;
+                }
             }
         }
 
@@ -66,6 +78,8 @@ public static function getNamedItem(DOMXPath $xpath, string $query, string $name
             $item2 = $item->item($itemNumber);
             if ($item2 === null) {
                 self::fail('Unexpected null return requesting item');
+            } elseif (!property_exists('attributes', $item2)) {
+                self::fail('Unexpected incorrect object');
             } else {
                 $returnValue = $item2->attributes->getNamedItem($namedItem);
             }