[REFACTOR] PHP 8 Syntax, Add Types

ThomasWeinert · Oct 17, 2023 · c4136e0 · c4136e0
1 parent e2d6c90
commit c4136e0
Show file tree

Hide file tree

Showing 14 changed files with 24 additions and 423 deletions.
diff --git a/src/FluentDOM/DOM/CdataSection.php b/src/FluentDOM/DOM/CdataSection.php
@@ -1,9 +1,9 @@
 <?php
-/**
+/*
  * FluentDOM
  *
  * @link https://thomas.weinert.info/FluentDOM/
- * @copyright Copyright 2009-2019 FluentDOM Contributors
+ * @copyright Copyright 2009-2023 FluentDOM Contributors
  * @license http://www.opensource.org/licenses/mit-license.php The MIT License
  *
  */
@@ -24,7 +24,6 @@ class CdataSection
     implements Node\NonDocumentTypeChildNode {
 
     use Node\ChildNode\Implementation;
-    use Node\NonDocumentTypeChildNode\Properties;
     use Node\StringCast;
     use Node\WholeText;
     use Node\Xpath;

diff --git a/src/FluentDOM/DOM/Comment.php b/src/FluentDOM/DOM/Comment.php
@@ -1,9 +1,9 @@
 <?php
-/**
+/*
  * FluentDOM
  *
  * @link https://thomas.weinert.info/FluentDOM/
- * @copyright Copyright 2009-2019 FluentDOM Contributors
+ * @copyright Copyright 2009-2023 FluentDOM Contributors
  * @license http://www.opensource.org/licenses/mit-license.php The MIT License
  *
  */
@@ -24,7 +24,6 @@ class Comment
     implements Node\NonDocumentTypeChildNode  {
 
     use Node\ChildNode\Implementation;
-    use Node\NonDocumentTypeChildNode\Properties;
     use Node\StringCast;
     use Node\Xpath;
   }

diff --git a/src/FluentDOM/DOM/Document.php b/src/FluentDOM/DOM/Document.php
@@ -30,7 +30,7 @@
   class Document extends \DOMDocument implements Node\ParentNode {
 
     use
-      Node\ParentNode\Properties,
+      Node\ParentNode\Implementation,
       Node\QuerySelector\Implementation,
       Node\Xpath;
 

diff --git a/src/FluentDOM/DOM/DocumentFragment.php b/src/FluentDOM/DOM/DocumentFragment.php
@@ -32,8 +32,8 @@ class DocumentFragment
       Node\ParentNode {
 
     use
+      Node\ParentNode\Implementation,
       /** @noinspection TraitsPropertiesConflictsInspection */
-      Node\ParentNode\Properties,
       Node\QuerySelector\Implementation,
       /** @noinspection TraitsPropertiesConflictsInspection */
       Node\Xpath;

diff --git a/src/FluentDOM/DOM/Element.php b/src/FluentDOM/DOM/Element.php
@@ -42,7 +42,6 @@ class Element
 
     use
       Node\ChildNode\Implementation,
-      Node\NonDocumentTypeChildNode\Implementation,
       Node\QuerySelector\Implementation,
       Node\StringCast,
       Node\Xpath,

diff --git a/src/FluentDOM/DOM/Node/NonDocumentTypeChildNode/Implementation.php b/src/FluentDOM/DOM/Node/NonDocumentTypeChildNode/Implementation.php
diff --git a/src/FluentDOM/DOM/Node/NonDocumentTypeChildNode/Properties.php b/src/FluentDOM/DOM/Node/NonDocumentTypeChildNode/Properties.php
diff --git a/src/FluentDOM/DOM/Node/ParentNode/Implementation.php b/src/FluentDOM/DOM/Node/ParentNode/Implementation.php
@@ -29,43 +29,6 @@ abstract public function insertBefore(\DOMNode $newChild, \DOMNode $refChild = N
 
     abstract public function appendChild(\DOMNode $newChild);
 
-    /**
-     * Returns the first element child node
-     * @return Element|NULL
-     */
-    public function getFirstElementChild(): ?Element {
-      if ($this instanceof Document) {
-        return $this->documentElement;
-      }
-      $node = $this->firstChild;
-      while ($node instanceof \DOMNode) {
-        if ($node instanceof Element) {
-          return $node;
-        }
-        $node = $node->nextSibling;
-      }
-      return NULL;
-    }
-
-    /**
-     * Returns the last element child node
-     * @return Element|NULL
-     */
-    public function getLastElementChild(): ?Element {
-      if ($this instanceof Document) {
-        return $this->documentElement;
-      }
-      /** @var \DOMNode $this */
-      $node = $this->lastChild;
-      while ($node instanceof \DOMNode) {
-        if ($node instanceof Element) {
-          return $node;
-        }
-        $node = $node->previousSibling;
-      }
-      return NULL;
-    }
-
     /**
      * Insert nodes before the first child node
      *

diff --git a/src/FluentDOM/DOM/Node/ParentNode/Properties.php b/src/FluentDOM/DOM/Node/ParentNode/Properties.php
diff --git a/src/FluentDOM/DOM/ProcessingInstruction.php b/src/FluentDOM/DOM/ProcessingInstruction.php
@@ -1,9 +1,9 @@
 <?php
-/**
+/*
  * FluentDOM
  *
  * @link https://thomas.weinert.info/FluentDOM/
- * @copyright Copyright 2009-2019 FluentDOM Contributors
+ * @copyright Copyright 2009-2023 FluentDOM Contributors
  * @license http://www.opensource.org/licenses/mit-license.php The MIT License
  *
  */
@@ -24,7 +24,6 @@ class ProcessingInstruction
     implements Node\NonDocumentTypeChildNode  {
 
     use Node\ChildNode\Implementation;
-    use Node\NonDocumentTypeChildNode\Properties;
     use Node\StringCast;
     use Node\Xpath;
   }

diff --git a/src/FluentDOM/DOM/Text.php b/src/FluentDOM/DOM/Text.php
@@ -1,9 +1,9 @@
 <?php
-/**
+/*
  * FluentDOM
  *
  * @link https://thomas.weinert.info/FluentDOM/
- * @copyright Copyright 2009-2019 FluentDOM Contributors
+ * @copyright Copyright 2009-2023 FluentDOM Contributors
  * @license http://www.opensource.org/licenses/mit-license.php The MIT License
  *
  */
@@ -24,7 +24,6 @@ class Text
     implements Node\NonDocumentTypeChildNode {
 
     use Node\ChildNode\Implementation;
-    use Node\NonDocumentTypeChildNode\Properties;
     use Node\StringCast;
     use Node\WholeText;
     use Node\Xpath;