|
20 | 20 |
|
21 | 21 | use DateTime; |
22 | 22 | use DOMDocument; |
| 23 | +use DOMNode; |
23 | 24 | use DOMXPath; |
24 | 25 | use PhpOffice\PhpWord\Element\Text as TextElement; |
25 | 26 | use PhpOffice\PhpWord\Element\TextRun; |
@@ -107,16 +108,18 @@ public function testWriteColSpan(): void |
107 | 108 |
|
108 | 109 | $query = $xpath->query('/html/body/div/table/tr[1]/td'); |
109 | 110 | self::assertNotFalse($query); |
110 | | - self::assertEquals(1, $query->length); |
111 | | - self::assertEquals('2', $xpath->query('/html/body/div/table/tr/td[1]')->item(0)->attributes->getNamedItem('colspan')->textContent); |
| 111 | + self::assertCount(1, $query); |
| 112 | + self::assertInstanceOf(DOMNode::class, $query->item(0)); |
| 113 | + self::assertEquals('2', $query->item(0)->attributes->getNamedItem('colspan')->textContent); |
| 114 | + self::assertEquals('#6086B8', $query->item(0)->attributes->getNamedItem('bgcolor')->textContent); |
| 115 | + self::assertEquals('#ffffff', $query->item(0)->attributes->getNamedItem('color')->textContent); |
| 116 | + |
112 | 117 | $query = $xpath->query('/html/body/div/table/tr[2]/td'); |
113 | 118 | self::assertNotFalse($query); |
114 | | - self::assertEquals(2, $query->length); |
115 | | - |
116 | | - self::assertEquals('#6086B8', $xpath->query('/html/body/div/table/tr[1]/td')->item(0)->attributes->getNamedItem('bgcolor')->textContent); |
117 | | - self::assertEquals('#ffffff', $xpath->query('/html/body/div/table/tr[1]/td')->item(0)->attributes->getNamedItem('color')->textContent); |
118 | | - self::assertEquals('#ffffff', $xpath->query('/html/body/div/table/tr[2]/td')->item(0)->attributes->getNamedItem('bgcolor')->textContent); |
119 | | - self::assertNull($xpath->query('/html/body/div/table/tr[2]/td')->item(0)->attributes->getNamedItem('color')); |
| 119 | + self::assertCount(2, $query); |
| 120 | + self::assertInstanceOf(DOMNode::class, $query->item(0)); |
| 121 | + self::assertEquals('#ffffff', $query->item(0)->attributes->getNamedItem('bgcolor')->textContent); |
| 122 | + self::assertNull($query->item(0)->attributes->getNamedItem('color')); |
120 | 123 | } |
121 | 124 |
|
122 | 125 | /** |
@@ -145,8 +148,15 @@ public function testWriteRowSpan(): void |
145 | 148 |
|
146 | 149 | $query = $xpath->query('/html/body/div/table/tr[1]/td'); |
147 | 150 | self::assertNotFalse($query); |
148 | | - self::assertEquals(2, $query->length); |
149 | | - self::assertEquals('3', $xpath->query('/html/body/div/table/tr[1]/td[1]')->item(0)->attributes->getNamedItem('rowspan')->textContent); |
| 151 | + self::assertCount(2, $query); |
| 152 | + self::assertInstanceOf(DOMNode::class, $query->item(0)); |
| 153 | + self::assertEquals('2', $query->item(0)->attributes->getNamedItem('colspan')->textContent); |
| 154 | + |
| 155 | + $query = $xpath->query('/html/body/div/table/tr[1]/td[1]'); |
| 156 | + self::assertNotFalse($query); |
| 157 | + self::assertInstanceOf(DOMNode::class, $query->item(0)); |
| 158 | + self::assertEquals('3', $query->item(0)->attributes->getNamedItem('rowspan')->textContent); |
| 159 | + |
150 | 160 | $query = $xpath->query('/html/body/div/table/tr[2]/td'); |
151 | 161 | self::assertNotFalse($query); |
152 | 162 | self::assertEquals(1, $query->length); |
|
0 commit comments