Replaced the polyfill implementation

.github/workflows/tests.yml

@@ -2,7 +2,7 @@ name: Tests
 
 on:
   push:
-    branches: [ master, Workarounds ]
+    branches: [ master ]
   pull_request:
     branches: [ master ]
 

src/ForwardCompatibleNodes/DocumentFragment.php

@@ -8,7 +8,9 @@
 namespace s9e\SweetDOM\ForwardCompatibleNodes;
 
 use s9e\SweetDOM\DocumentFragment as ParentClass;
+use s9e\SweetDOM\NodeTraits\ParentNodePolyfill;
 
 class DocumentFragment extends ParentClass
 {
+	use ParentNodePolyfill;
 }

src/ForwardCompatibleNodes/Element.php

@@ -9,8 +9,10 @@
 
 use s9e\SweetDOM\Element as ParentClass;
 use s9e\SweetDOM\NodeTraits\ChildNodeForwardCompatibility;
+use s9e\SweetDOM\NodeTraits\ParentNodePolyfill;
 
 class Element extends ParentClass
 {
 	use ChildNodeForwardCompatibility;
+	use ParentNodePolyfill;
 }

src/NodeTraits/DeprecatedMethods.php

@@ -7,17 +7,18 @@
 */
 namespace s9e\SweetDOM\NodeTraits;
 
-use const ENT_COMPAT, ENT_XML1, E_USER_DEPRECATED;
+use DOMException;
+use const DOM_SYNTAX_ERR, ENT_COMPAT, ENT_XML1, E_USER_DEPRECATED;
 use function array_flip, htmlspecialchars, preg_match, preg_match_all, preg_replace_callback, strtolower, trigger_error;
 
 /**
-* @method mixed polyfillMethodsCall(string $name, array $arguments)
+* @method mixed magicMethodsCall(string $name, array $arguments)
 */
 trait DeprecatedMethods
 {
-	use PolyfillMethods
+	use MagicMethods
 	{
-		PolyfillMethods::__call as polyfillMethodsCall;
+		MagicMethods::__call as magicMethodsCall;
 	}
 
 	public function __call(string $name, array $arguments)
@@ -45,7 +46,7 @@ public function __call(string $name, array $arguments)
 
 		}
 
-		return $this->polyfillMethodsCall($name, $arguments);
+		return $this->magicMethodsCall($name, $arguments);
 	}
 
 	/**
@@ -58,7 +59,14 @@ public function insertAdjacentXML(string $where, string $xml): void
 		$fragment = $this->ownerDocument->createDocumentFragment();
 		$fragment->appendXML($this->addMissingNamespaceDeclarations($xml));
 
-		$this->insertAdjacentNode($where, $fragment);
+		match (strtolower($where))
+		{
+			'afterbegin'  => $this->prepend($fragment),
+			'afterend'    => $this->after($fragment),
+			'beforebegin' => $this->before($fragment),
+			'beforeend'   => $this->appendChild($fragment),
+			default       => throw new DOMException("'$where' is not one of 'beforebegin', 'afterbegin', 'beforeend', or 'afterend'", DOM_SYNTAX_ERR)
+		};
 	}
 
 	/**

src/NodeTraits/ParentNodePolyfill.php

@@ -0,0 +1,58 @@
+<?php declare(strict_types=1);
+
+/**
+* @package   s9e\SweetDOM
+* @copyright Copyright (c) The s9e authors
+* @license   http://www.opensource.org/licenses/mit-license.php The MIT License
+*/
+namespace s9e\SweetDOM\NodeTraits;
+
+use DOMElement;
+use DOMException;
+use DOMNode;
+use const DOM_SYNTAX_ERR;
+use function strtolower;
+
+trait ParentNodePolyfill
+{
+	public function insertAdjacentElement(string $where, DOMElement $element): ?DOMElement
+	{
+		$this->insertAdjacentNode($where, $element);
+
+		return $element;
+	}
+
+	public function insertAdjacentText(string $where, string $data): void
+	{
+		$node = $this->ownerDocument->createTextNode($data);
+		$this->insertAdjacentNode($where, $node);
+	}
+
+	public function replaceChildren(...$nodes): void
+	{
+		while (isset($this->lastChild))
+		{
+			$this->lastChild->remove();
+		}
+		$this->append(...$nodes);
+	}
+
+	/**
+	* Insert given node relative to this element's position
+	*
+	* @param  string  $where One of 'beforebegin', 'afterbegin', 'beforeend', 'afterend'
+	* @param  DOMNode $node
+	* @return void
+	*/
+	private function insertAdjacentNode(string $where, DOMNode $node): void
+	{
+		match (strtolower($where))
+		{
+			'afterbegin'  => $this->prepend($node),
+			'afterend'    => $this->after($node),
+			'beforebegin' => $this->before($node),
+			'beforeend'   => $this->appendChild($node),
+			default       => throw new DOMException("'$where' is not one of 'beforebegin', 'afterbegin', 'beforeend', or 'afterend'", DOM_SYNTAX_ERR)
+		};
+	}
+}

src/PatchedNodes/DocumentFragment.php

@@ -8,9 +8,11 @@
 namespace s9e\SweetDOM\PatchedNodes;
 
 use s9e\SweetDOM\DocumentFragment as ParentClass;
+use s9e\SweetDOM\NodeTraits\ParentNodePolyfill;
 use s9e\SweetDOM\NodeTraits\ParentNodeWorkarounds;
 
 class DocumentFragment extends ParentClass
 {
+	use ParentNodePolyfill;
 	use ParentNodeWorkarounds;
 }

src/PatchedNodes/Element.php

@@ -9,10 +9,12 @@
 
 use s9e\SweetDOM\Element as ParentClass;
 use s9e\SweetDOM\NodeTraits\ChildNodeWorkarounds;
+use s9e\SweetDOM\NodeTraits\ParentNodePolyfill;
 use s9e\SweetDOM\NodeTraits\ParentNodeWorkarounds;
 
 class Element extends ParentClass
 {
 	use ChildNodeWorkarounds;
+	use ParentNodePolyfill;
 	use ParentNodeWorkarounds;
 }

tests/ElementTest.php

@@ -633,17 +633,9 @@ protected function runPolyfillTest(string $expected, string $methodName, callabl
 		$dom = new Document;
 		$dom->loadXML('<p xmlns:xsl="http://www.w3.org/1999/XSL/Transform"><span><br/></span></p>');
 
-		$dom->firstOf('//span')->__call($methodName, $argumentsCallback($dom));
+		$dom->firstOf('//span')->$methodName(...$argumentsCallback($dom));
 		$this->assertXmlStringEqualsXmlString($expected, $dom->saveXML($dom->documentElement));
 
-		if (method_exists('DOMElement', $methodName))
-		{
-			$dom = new Document;
-			$dom->loadXML('<p xmlns:xsl="http://www.w3.org/1999/XSL/Transform"><span><br/></span></p>');
-
-			$dom->firstOf('//span')->$methodName(...$argumentsCallback($dom));
-			$this->assertXmlStringEqualsXmlString($expected, $dom->saveXML($dom->documentElement), 'Reference does not match');
-		}
 	}
 
 	#[DataProvider('getInsertAdjacentElementTests')]
@@ -710,35 +702,47 @@ public static function getInsertAdjacentElementTests()
 
 	#[DataProvider('getInsertAdjacentTextTests')]
 	#[Group('polyfill')]
-	public function testInsertAdjacentText($position, $expected)
+	public function testInsertAdjacentText($position, $data, $expected)
 	{
-		$this->runPolyfillTest($expected, 'insertAdjacentText', fn() => [$position, $position]);
+		$this->runPolyfillTest($expected, 'insertAdjacentText', fn() => [$position, $data]);
 	}
 
 	public static function getInsertAdjacentTextTests()
 	{
 		return [
 			[
+				'afterbegin',
 				'afterbegin',
 				'<p xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 					<span>afterbegin<br/></span>
 				</p>'
 			],
 			[
+				'afterbegin',
+				'after&<>\'"begin',
+				'<p xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+					<span>after&amp;&lt;&gt;\'"begin<br/></span>
+				</p>'
+			],
+			[
+				'afterend',
 				'afterend',
 				'<p xmlns:xsl="http://www.w3.org/1999/XSL/Transform"><span><br/></span>afterend</p>'
 			],
 			[
+				'beforebegin',
 				'beforebegin',
 				'<p xmlns:xsl="http://www.w3.org/1999/XSL/Transform">beforebegin<span><br/></span></p>'
 			],
 			[
+				'beforeend',
 				'beforeend',
 				'<p xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 					<span><br/>beforeend</span>
 				</p>'
 			],
 			[
+				'BeforeEnd',
 				'BeforeEnd',
 				'<p xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 					<span><br/>BeforeEnd</span>