WiP

s9e · Dec 19, 2023 · c640021 · c640021
1 parent 99f61bf
commit c640021
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 84 deletions.
diff --git a/src/NodeTraits/DeprecatedMethods.php b/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))
+		{
+			'beforebegin' => $this->before($fragment),
+			'beforeend'   => $this->appendChild($fragment),
+			'afterend'    => $this->after($fragment),
+			'afterbegin'  => $this->prepend($fragment),
+			default       => throw new DOMException("'$where' is not one of 'beforebegin', 'afterbegin', 'beforeend', or 'afterend'", DOM_SYNTAX_ERR)
+		};
 	}
 
 	/**

diff --git a/src/NodeTraits/ParentNodePolyfill.php b/src/NodeTraits/ParentNodePolyfill.php
@@ -8,6 +8,9 @@
 namespace s9e\SweetDOM\NodeTraits;
 
 use DOMElement;
+use DOMException;
+use DOMNode;
+use const DOM_SYNTAX_ERR;
 use function strtolower;
 
 trait ParentNodePolyfill

diff --git a/src/NodeTraits/PolyfillMethods.php b/src/NodeTraits/PolyfillMethods.php
diff --git a/src/PatchedNodes/DocumentFragment.php b/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;
 }
diff --git a/src/PatchedNodes/Element.php b/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;
 }
diff --git a/tests/ElementTest.php b/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')]