fix(html): Align tag enums and defaults provider with latest ui-awesome/html-core and ui-awesome/html-interop changes.

CHANGELOG.md

@@ -44,6 +44,7 @@
 - Enh #56: Add `Button` class for HTML `<button>` element with attributes and rendering capabilities (@terabytesoftw)
 - Bug #57: Add tests for invalid argument exceptions in HTML attributes (@terabytesoftw)
 - Enh #59: Add `Form` class for HTML `<form>` element with attributes and rendering capabilities (@terabytesoftw)
+- Bug #61: Align tag enums and defaults provider with latest `ui-awesome/html-core` and `ui-awesome/html-interop` changes (@terabytesoftw)
 
 ## 0.3.0 March 31, 2024
 

composer.json

@@ -15,8 +15,8 @@
         "ui-awesome/html-attribute": "^0.6@dev",
         "ui-awesome/html-core": "^0.6@dev",
         "ui-awesome/html-helper": "^0.7",
-        "ui-awesome/html-interop": "^0.3",
-        "ui-awesome/html-mixin": "^0.4"
+        "ui-awesome/html-interop": "^0.4@dev",
+        "ui-awesome/html-mixin": "dev-main as 0.4"
     },
     "require-dev": {
         "infection/infection": "^0.27|^0.32",
@@ -26,7 +26,8 @@
         "phpstan/extension-installer": "^1.4",
         "phpstan/phpstan": "^2.1",
         "phpstan/phpstan-strict-rules": "^2.0.3",
-        "phpunit/phpunit": "^10.5"
+        "phpunit/phpunit": "^10.5",
+        "ui-awesome/html-contracts": "^0.1@dev"
     },
     "autoload": {
         "psr-4": {

src/Embedded/Img.php

@@ -18,7 +18,7 @@
 use UIAwesome\Html\Attribute\{HasCrossorigin, HasFetchpriority, HasSizes};
 use UIAwesome\Html\Core\Element\BaseVoid;
 use UIAwesome\Html\Embedded\Attribute\{HasElementtiming, HasIsmap};
-use UIAwesome\Html\Interop\{VoidInterface, Voids};
+use UIAwesome\Html\Interop\Voids;
 
 /**
  * Renders the HTML `<img>` element for embedding images.
@@ -60,11 +60,11 @@ final class Img extends BaseVoid
     /**
      * Returns the tag enumeration for the `<img>` element.
      *
-     * @return VoidInterface Tag enumeration instance for `<img>`.
+     * @return Voids Tag enumeration instance for `<img>`.
      *
      * {@see Voids} for valid void-level tags.
      */
-    protected function getTag(): VoidInterface
+    protected function getTag(): Voids
     {
         return Voids::IMG;
     }

src/Flow/Div.php

@@ -5,7 +5,7 @@
 namespace UIAwesome\Html\Flow;
 
 use UIAwesome\Html\Core\Element\BaseBlock;
-use UIAwesome\Html\Interop\{Block, BlockInterface};
+use UIAwesome\Html\Interop\Block;
 
 /**
  * Renders the HTML `<div>` element for grouping flow content.
@@ -29,11 +29,11 @@ final class Div extends BaseBlock
     /**
      * Returns the tag enumeration for the `<div>` element.
      *
-     * @return BlockInterface Tag enumeration instance for `<div>`.
+     * @return Block Tag enumeration instance for `<div>`.
      *
      * {@see Block} for valid block-level tags.
      */
-    protected function getTag(): BlockInterface
+    protected function getTag(): Block
     {
         return Block::DIV;
     }

src/Flow/Hr.php

@@ -5,7 +5,7 @@
 namespace UIAwesome\Html\Flow;
 
 use UIAwesome\Html\Core\Element\BaseVoid;
-use UIAwesome\Html\Interop\{VoidInterface, Voids};
+use UIAwesome\Html\Interop\Voids;
 
 /**
  * Renders the HTML `<hr>` element for thematic breaks.
@@ -28,11 +28,11 @@ final class Hr extends BaseVoid
     /**
      * Returns the tag enumeration for the `<hr>` element.
      *
-     * @return VoidInterface Tag enumeration instance for `<hr>`.
+     * @return Voids Tag enumeration instance for `<hr>`.
      *
      * {@see Voids} for valid void-level tags.
      */
-    protected function getTag(): VoidInterface
+    protected function getTag(): Voids
     {
         return Voids::HR;
     }

src/Flow/Main.php

@@ -5,7 +5,7 @@
 namespace UIAwesome\Html\Flow;
 
 use UIAwesome\Html\Core\Element\BaseBlock;
-use UIAwesome\Html\Interop\{Block, BlockInterface};
+use UIAwesome\Html\Interop\Block;
 
 /**
  * Renders the HTML `<main>` element for dominant document content.
@@ -29,11 +29,11 @@ final class Main extends BaseBlock
     /**
      * Returns the tag enumeration for the `<main>` element.
      *
-     * @return BlockInterface Tag enumeration instance for `<main>`.
+     * @return Block Tag enumeration instance for `<main>`.
      *
      * {@see Block} for valid block-level tags.
      */
-    protected function getTag(): BlockInterface
+    protected function getTag(): Block
     {
         return Block::MAIN;
     }

src/Flow/P.php

@@ -5,7 +5,7 @@
 namespace UIAwesome\Html\Flow;
 
 use UIAwesome\Html\Core\Element\BaseBlock;
-use UIAwesome\Html\Interop\{Block, BlockInterface};
+use UIAwesome\Html\Interop\Block;
 
 /**
  * Renders the HTML `<p>` element for paragraphs.
@@ -29,11 +29,11 @@ final class P extends BaseBlock
     /**
      * Returns the tag enumeration for the `<p>` element.
      *
-     * @return BlockInterface Tag enumeration instance for `<p>`.
+     * @return Block Tag enumeration instance for `<p>`.
      *
      * {@see Block} for valid block-level tags.
      */
-    protected function getTag(): BlockInterface
+    protected function getTag(): Block
     {
         return Block::P;
     }

src/Form/Button.php

@@ -21,7 +21,7 @@
 };
 use UIAwesome\Html\Form\Values\ButtonType;
 use UIAwesome\Html\Helper\Validator;
-use UIAwesome\Html\Interop\{Inline, InlineInterface};
+use UIAwesome\Html\Interop\Inline;
 use UnitEnum;
 
 /**
@@ -91,11 +91,11 @@ public function type(string|UnitEnum|null $value): static
     /**
      * Returns the tag enumeration for the `<button>` element.
      *
-     * @return InlineInterface Tag enumeration instance for `<button>`.
+     * @return Inline Tag enumeration instance for `<button>`.
      *
      * {@see Inline} for valid inline-level tags.
      */
-    protected function getTag(): InlineInterface
+    protected function getTag(): Inline
     {
         return Inline::BUTTON;
     }

src/Form/Form.php

@@ -9,7 +9,7 @@
 use UIAwesome\Html\Attribute\{HasName, HasRel, HasTarget};
 use UIAwesome\Html\Core\Element\BaseBlock;
 use UIAwesome\Html\Form\Attribute\{CanBeNovalidate, HasAcceptCharset, HasAction, HasEnctype, HasMethod};
-use UIAwesome\Html\Interop\{Block, BlockInterface};
+use UIAwesome\Html\Interop\Block;
 
 /**
  * Renders the HTML `<form>` element for submitting user data.
@@ -45,11 +45,11 @@ final class Form extends BaseBlock
     /**
      * Returns the tag enumeration for the `<form>` element.
      *
-     * @return BlockInterface Tag enumeration instance for `<form>`.
+     * @return Block Tag enumeration instance for `<form>`.
      *
      * {@see Block} for valid block-level tags.
      */
-    protected function getTag(): BlockInterface
+    protected function getTag(): Block
     {
         return Block::FORM;
     }

src/Form/InputCheckbox.php

@@ -10,7 +10,7 @@
 use UIAwesome\Html\Attribute\Values\Type;
 use UIAwesome\Html\Core\Element\BaseInput;
 use UIAwesome\Html\Form\Mixin\HasCheckedState;
-use UIAwesome\Html\Interop\{VoidInterface, Voids};
+use UIAwesome\Html\Interop\Voids;
 
 /**
  * Represents the HTML `<input type="checkbox">` element.
@@ -55,9 +55,9 @@ public function getAttributes(): array
     /**
      * Returns the tag enumeration for the `<input>` element.
      *
-     * @return VoidInterface Tag enumeration instance for `<input>`.
+     * @return Voids Tag enumeration instance for `<input>`.
      */
-    protected function getTag(): VoidInterface
+    protected function getTag(): Voids
     {
         return Voids::INPUT;
     }

src/Form/InputColor.php

@@ -10,7 +10,7 @@
 use UIAwesome\Html\Attribute\Values\Type;
 use UIAwesome\Html\Core\Element\BaseInput;
 use UIAwesome\Html\Form\Attribute\{HasAlpha, HasColorspace};
-use UIAwesome\Html\Interop\{VoidInterface, Voids};
+use UIAwesome\Html\Interop\Voids;
 
 /**
  * Renders the HTML `<input type="color">` element.
@@ -53,9 +53,9 @@ final class InputColor extends BaseInput
     /**
      * Returns the tag enumeration for the `<input>` element.
      *
-     * @return VoidInterface Tag enumeration instance for `<input>`.
+     * @return Voids Tag enumeration instance for `<input>`.
      */
-    protected function getTag(): VoidInterface
+    protected function getTag(): Voids
     {
         return Voids::INPUT;
     }

src/Form/InputDate.php

@@ -18,7 +18,7 @@
 use UIAwesome\Html\Attribute\HasValue;
 use UIAwesome\Html\Attribute\Values\Type;
 use UIAwesome\Html\Core\Element\BaseInput;
-use UIAwesome\Html\Interop\{VoidInterface, Voids};
+use UIAwesome\Html\Interop\Voids;
 
 /**
  * Renders the HTML `<input type="date">` element.
@@ -65,9 +65,9 @@ final class InputDate extends BaseInput
     /**
      * Returns the tag enumeration for the `<input>` element.
      *
-     * @return VoidInterface Tag enumeration instance for `<input>`.
+     * @return Voids Tag enumeration instance for `<input>`.
      */
-    protected function getTag(): VoidInterface
+    protected function getTag(): Voids
     {
         return Voids::INPUT;
     }

src/Form/InputDateTimeLocal.php

@@ -18,7 +18,7 @@
 use UIAwesome\Html\Attribute\HasValue;
 use UIAwesome\Html\Attribute\Values\Type;
 use UIAwesome\Html\Core\Element\BaseInput;
-use UIAwesome\Html\Interop\{VoidInterface, Voids};
+use UIAwesome\Html\Interop\Voids;
 
 /**
  * Renders the HTML `<input type="datetime-local">` element.
@@ -65,9 +65,9 @@ final class InputDateTimeLocal extends BaseInput
     /**
      * Returns the tag enumeration for the `<input>` element.
      *
-     * @return VoidInterface Tag enumeration instance for `<input>`.
+     * @return Voids Tag enumeration instance for `<input>`.
      */
-    protected function getTag(): VoidInterface
+    protected function getTag(): Voids
     {
         return Voids::INPUT;
     }

src/Form/InputEmail.php

@@ -21,7 +21,7 @@
 use UIAwesome\Html\Attribute\HasValue;
 use UIAwesome\Html\Attribute\Values\Type;
 use UIAwesome\Html\Core\Element\BaseInput;
-use UIAwesome\Html\Interop\{VoidInterface, Voids};
+use UIAwesome\Html\Interop\Voids;
 
 /**
  * Renders the HTML `<input type="email">` element.
@@ -65,9 +65,9 @@ final class InputEmail extends BaseInput
     /**
      * Returns the tag enumeration for the `<input>` element.
      *
-     * @return VoidInterface Tag enumeration instance for `<input>`.
+     * @return Voids Tag enumeration instance for `<input>`.
      */
-    protected function getTag(): VoidInterface
+    protected function getTag(): Voids
     {
         return Voids::INPUT;
     }

src/Form/InputFile.php

@@ -10,7 +10,7 @@
 use UIAwesome\Html\Core\Element\BaseInput;
 use UIAwesome\Html\Form\Attribute\HasCapture;
 use UIAwesome\Html\Helper\Naming;
-use UIAwesome\Html\Interop\{VoidInterface, Voids};
+use UIAwesome\Html\Interop\Voids;
 
 /**
  * Renders the HTML `<input type="file">` element.
@@ -71,9 +71,9 @@ public function getAttributes(): array
     /**
      * Returns the tag enumeration for the `<input>` element.
      *
-     * @return VoidInterface Tag enumeration instance for `<input>`.
+     * @return Voids Tag enumeration instance for `<input>`.
      */
-    protected function getTag(): VoidInterface
+    protected function getTag(): Voids
     {
         return Voids::INPUT;
     }

src/Form/InputHidden.php

@@ -8,7 +8,7 @@
 use UIAwesome\Html\Attribute\HasValue;
 use UIAwesome\Html\Attribute\Values\Type;
 use UIAwesome\Html\Core\Element\BaseInput;
-use UIAwesome\Html\Interop\{VoidInterface, Voids};
+use UIAwesome\Html\Interop\Voids;
 
 /**
  * Renders the HTML `<input type="hidden">` element.
@@ -37,9 +37,9 @@ final class InputHidden extends BaseInput
     /**
      * Returns the tag enumeration for the `<input>` element.
      *
-     * @return VoidInterface Tag enumeration instance for `<input>`.
+     * @return Voids Tag enumeration instance for `<input>`.
      */
-    protected function getTag(): VoidInterface
+    protected function getTag(): Voids
     {
         return Voids::INPUT;
     }

src/Form/InputImage.php

@@ -15,7 +15,7 @@
     HasFormnovalidate,
     HasFormtarget
 };
-use UIAwesome\Html\Interop\{VoidInterface, Voids};
+use UIAwesome\Html\Interop\Voids;
 
 /**
  * Renders the HTML `<input type="image">` element.
@@ -55,9 +55,9 @@ final class InputImage extends BaseInput
     /**
      * Returns the tag enumeration for the `<input>` element.
      *
-     * @return VoidInterface Tag enumeration instance for `<input>`.
+     * @return Voids Tag enumeration instance for `<input>`.
      */
-    protected function getTag(): VoidInterface
+    protected function getTag(): Voids
     {
         return Voids::INPUT;
     }

src/Form/InputMonth.php

@@ -18,7 +18,7 @@
 use UIAwesome\Html\Attribute\HasValue;
 use UIAwesome\Html\Attribute\Values\Type;
 use UIAwesome\Html\Core\Element\BaseInput;
-use UIAwesome\Html\Interop\{VoidInterface, Voids};
+use UIAwesome\Html\Interop\Voids;
 
 /**
  * Renders the HTML `<input type="month">` element.
@@ -66,9 +66,9 @@ final class InputMonth extends BaseInput
     /**
      * Returns the tag enumeration for the `<input>` element.
      *
-     * @return VoidInterface Tag enumeration instance for `<input>`.
+     * @return Voids Tag enumeration instance for `<input>`.
      */
-    protected function getTag(): VoidInterface
+    protected function getTag(): Voids
     {
         return Voids::INPUT;
     }

src/Form/InputNumber.php

@@ -19,7 +19,7 @@
 use UIAwesome\Html\Attribute\HasValue;
 use UIAwesome\Html\Attribute\Values\Type;
 use UIAwesome\Html\Core\Element\BaseInput;
-use UIAwesome\Html\Interop\{VoidInterface, Voids};
+use UIAwesome\Html\Interop\Voids;
 
 /**
  * Renders the HTML `<input type="number">` element.
@@ -59,9 +59,9 @@ final class InputNumber extends BaseInput
     /**
      * Returns the tag enumeration for the `<input>` element.
      *
-     * @return VoidInterface Tag enumeration instance for `<input>`.
+     * @return Voids Tag enumeration instance for `<input>`.
      */
-    protected function getTag(): VoidInterface
+    protected function getTag(): Voids
     {
         return Voids::INPUT;
     }