Again

Author: rasamassen

tests/PhpWordTests/Writer/HTML/ElementTest.php

@@ -201,10 +201,11 @@ public function testWriteRowSpanAndColSpan(): void
         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');
+        $query = $xpath->query('/html/body/div/table/tr[2]/td[1]');
         self::assertNotFalse($query);
         self::assertCount(1, $query);
-        self::assertEquals('3', $xpath->query('/html/body/div/table/tr[2]/td[1]')->item(0)->attributes->getNamedItem('colspan')->textContent);
+        self::assertInstanceOf(DOMNode::class, $query->item(0));
+        self::assertEquals('3', $query->item(0)->attributes->getNamedItem('colspan')->textContent);
 
         $query = $xpath->query('/html/body/div/table/tr[3]/td');
         self::assertNotFalse($query);

tests/PhpWordTests/Writer/HTML/Helper.php

@@ -41,22 +41,22 @@ public static function getTextContent(DOMXPath $xpath, string $query, string $na
             if ($item2 === null) {
                 self::fail('Unexpected null return requesting item');
             } elseif ($namedItem !== '') {
-                if (!property_exists('attributes', $item2)) {
+                if (!property_exists($item2, 'attributes')) {
                     self::fail('Unexpected incorrect object');
                 } else {
                     $item3 = $item2->attributes->getNamedItem($namedItem);
                     if ($item3 === null) {
                         self::fail('Unexpected null return requesting namedItem');
                     } else {
-                        if (!property_exists('textContent', $item3)) {
+                        if (!property_exists($item3, 'textContent')) {
                             self::fail('Unexpected incorrect object');
                         } else {
                             $returnVal = $item3->textContent;
                         }
                     }
                 }
             } else {
-                if (!property_exists('textContent', $item2)) {
+                if (!property_exists($item2, 'textContent')) {
                     self::fail('Unexpected incorrect object');
                 } else {
                     $returnVal = $item2->textContent;
@@ -78,7 +78,7 @@ 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)) {
+            } elseif (!property_exists($item2, 'attributes')) {
                 self::fail('Unexpected incorrect object');
             } else {
                 $returnValue = $item2->attributes->getNamedItem($namedItem);