From 5305dd4092de6d3a7c3d3ab02a7d4f16410347d9 Mon Sep 17 00:00:00 2001
From: JoshyPHP <s9e.dev@gmail.com>
Date: Tue, 19 Dec 2023 17:41:05 +0100
Subject: [PATCH] WiP

---
 src/Document.php                              | 21 ++++++++++++++-----
 src/ForwardCompatibleNodes/Attr.php           | 14 +++++++++++++
 src/ForwardCompatibleNodes/CdataSection.php   | 16 ++++++++++++++
 src/ForwardCompatibleNodes/Comment.php        | 16 ++++++++++++++
 .../DocumentFragment.php                      | 14 +++++++++++++
 src/ForwardCompatibleNodes/Element.php        | 16 ++++++++++++++
 src/ForwardCompatibleNodes/Text.php           | 16 ++++++++++++++
 7 files changed, 108 insertions(+), 5 deletions(-)
 create mode 100644 src/ForwardCompatibleNodes/Attr.php
 create mode 100644 src/ForwardCompatibleNodes/CdataSection.php
 create mode 100644 src/ForwardCompatibleNodes/Comment.php
 create mode 100644 src/ForwardCompatibleNodes/DocumentFragment.php
 create mode 100644 src/ForwardCompatibleNodes/Element.php
 create mode 100644 src/ForwardCompatibleNodes/Text.php

diff --git a/src/Document.php b/src/Document.php
index 7cc04f9..ac47bb8 100644
--- a/src/Document.php
+++ b/src/Document.php
@@ -46,11 +46,7 @@ public function __construct(string $version = '1.0', string $encoding = '')
 		$this->nodeCreator = new NodeCreator($this);
 
 		$classes   = ['Attr', 'CdataSection', 'Comment', 'DocumentFragment', 'Element', 'Text'];
-		$namespace = __NAMESPACE__;
-		if ($this->needsWorkarounds())
-		{
-			$namespace .= '\\PatchedNodes';
-		}
+		$namespace = $this->getNodesNamespace();
 		foreach ($classes as $className)
 		{
 			$this->registerNodeClass('DOM' . $className, $namespace . '\\' . $className);
@@ -89,6 +85,21 @@ public function query(string $expression, ?DOMNode $contextNode = null, bool $re
 		return $result;
 	}
 
+	protected function getNodesNamespace(): string
+	{
+		$namespace = __NAMESPACE__;
+		if ($this->needsWorkarounds())
+		{
+			$namespace .= '\\PatchedNodes';
+		}
+		elseif (version_compare(PHP_VERSION, '8.3.0', '<'))
+		{
+			$namespace .= '\\ForwardCompatibleNodes';
+		}
+
+		return $namespace;
+	}
+
 	protected function needsWorkarounds(): bool
 	{
 		if (version_compare(PHP_VERSION, '8.2.10', '>='))
diff --git a/src/ForwardCompatibleNodes/Attr.php b/src/ForwardCompatibleNodes/Attr.php
new file mode 100644
index 0000000..1141bdd
--- /dev/null
+++ b/src/ForwardCompatibleNodes/Attr.php
@@ -0,0 +1,14 @@
+<?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\ForwardCompatibleNodes;
+
+use s9e\SweetDOM\Attr as ParentClass;
+
+class Attr extends ParentClass
+{
+}
\ No newline at end of file
diff --git a/src/ForwardCompatibleNodes/CdataSection.php b/src/ForwardCompatibleNodes/CdataSection.php
new file mode 100644
index 0000000..10763e4
--- /dev/null
+++ b/src/ForwardCompatibleNodes/CdataSection.php
@@ -0,0 +1,16 @@
+<?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\ForwardCompatibleNodes;
+
+use s9e\SweetDOM\CdataSection as ParentClass;
+use s9e\SweetDOM\NodeTraits\ChildNodeForwardCompatibility;
+
+class CdataSection extends ParentClass
+{
+	use ChildNodeForwardCompatibility;
+}
\ No newline at end of file
diff --git a/src/ForwardCompatibleNodes/Comment.php b/src/ForwardCompatibleNodes/Comment.php
new file mode 100644
index 0000000..143448c
--- /dev/null
+++ b/src/ForwardCompatibleNodes/Comment.php
@@ -0,0 +1,16 @@
+<?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\ForwardCompatibleNodes;
+
+use s9e\SweetDOM\Comment as ParentClass;
+use s9e\SweetDOM\NodeTraits\ChildNodeForwardCompatibility;
+
+class Comment extends ParentClass
+{
+	use ChildNodeForwardCompatibility;
+}
\ No newline at end of file
diff --git a/src/ForwardCompatibleNodes/DocumentFragment.php b/src/ForwardCompatibleNodes/DocumentFragment.php
new file mode 100644
index 0000000..6e49bb5
--- /dev/null
+++ b/src/ForwardCompatibleNodes/DocumentFragment.php
@@ -0,0 +1,14 @@
+<?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\ForwardCompatibleNodes;
+
+use s9e\SweetDOM\DocumentFragment as ParentClass;
+
+class DocumentFragment extends ParentClass
+{
+}
\ No newline at end of file
diff --git a/src/ForwardCompatibleNodes/Element.php b/src/ForwardCompatibleNodes/Element.php
new file mode 100644
index 0000000..cbaa782
--- /dev/null
+++ b/src/ForwardCompatibleNodes/Element.php
@@ -0,0 +1,16 @@
+<?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\ForwardCompatibleNodes;
+
+use s9e\SweetDOM\Element as ParentClass;
+use s9e\SweetDOM\NodeTraits\ChildNodeForwardCompatibility;
+
+class Element extends ParentClass
+{
+	use ChildNodeForwardCompatibility;
+}
\ No newline at end of file
diff --git a/src/ForwardCompatibleNodes/Text.php b/src/ForwardCompatibleNodes/Text.php
new file mode 100644
index 0000000..54f32d1
--- /dev/null
+++ b/src/ForwardCompatibleNodes/Text.php
@@ -0,0 +1,16 @@
+<?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\ForwardCompatibleNodes;
+
+use s9e\SweetDOM\NodeTraits\ChildNodeForwardCompatibility;
+use s9e\SweetDOM\Text as ParentClass;
+
+class Text extends ParentClass
+{
+	use ChildNodeForwardCompatibility;
+}
\ No newline at end of file