Fixed bug in tag::getIndex() where it was generating the indexes from only the tag objects, meaning that when there were other node types such as text nodes, the index would be out of step, causing nodes to be inserted into the wrong position.

hexydec · hexydec · commit 0157bf84036a · 2023-08-07T12:44:57.000+01:00
Added tests.
Updated workflow configuration to add codecov secret.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -25,7 +25,7 @@ jobs:
         env:
           XDEBUG_MODE: coverage
 
-      - name: Upload coverage to Codecov
+      - name: Upload coverage reports to Codecov
         uses: codecov/codecov-action@v3
-        with:
-            files: ./coverage/result.xml
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
diff --git a/composer.lock b/composer.lock
diff --git a/src/tokens/tag.php b/src/tokens/tag.php
@@ -346,7 +346,7 @@ public function prepend(array $nodes) : void {
 	 */
 	protected function getIndex() : ?int {
 		if ($this->parent) {
-			foreach ($this->parent->children() AS $key => $item) {
+			foreach ($this->parent->children AS $key => $item) {
 				if ($item === $this) {
 					return $key;
 				}
diff --git a/tests/editHtmldocTest.php b/tests/editHtmldocTest.php
@@ -90,7 +90,7 @@ public function testCanPrependHtml() {
 		}
 	}
 
-	public function testCanInserHtmlBefore() {
+	public function testCanInsertHtmlBefore() {
 		$obj = new htmldoc();
 		$obj->load('Data to <span>insert</span> before');
 		$tests = [
@@ -133,7 +133,7 @@ public function testCanInserHtmlBefore() {
 		}
 	}
 
-	public function testCanInserHtmlAfter() {
+	public function testCanInsertHtmlAfter() {
 		$obj = new htmldoc();
 		$obj->load('Data to <span>insert</span> after');
 		$tests = [
@@ -166,6 +166,20 @@ public function testCanInserHtmlAfter() {
 				'find' => 'div',
 				'after' => '<h3>After</h3><p>Test <span>this</span></p>',
 				'output' => '<body><div><div></div><h3>After</h3><p>Test <span>this</span></p></div><h3>After</h3><p>Test <span>this</span></p></body>',
+			],
+			[ // test with text nodes
+				'input' => '<body>
+						<div>
+							<div>Text Node</div>
+						</div>
+					</body>',
+				'find' => 'div',
+				'after' => '<h3>After</h3><p>Test <span>this</span></p>',
+				'output' => '<body>
+						<div>
+							<div>Text Node</div><h3>After</h3><p>Test <span>this</span></p>
+						</div><h3>After</h3><p>Test <span>this</span></p>
+					</body>',
 			]
 		];
 		$doc = new htmldoc();

Original file line number	Diff line number	Diff line change
`@@ -346,7 +346,7 @@ public function prepend(array $nodes) : void {`
`346`	`346`	`*/`
`347`	`347`	`protected function getIndex() : ?int {`
`348`	`348`	`if ($this->parent) {`
`349`		`- foreach ($this->parent->children() AS $key => $item) {`
	`349`	`+ foreach ($this->parent->children AS $key => $item) {`
`350`	`350`	`if ($item === $this) {`
`351`	`351`	`return $key;`
`352`	`352`	`}`