Updating the package

composer.json

@@ -35,7 +35,6 @@
     "scripts": {
         "test": "phpunit --colors=always",
         "test:dox": "phpunit --testdox --colors=always",
-        "test:cov": "phpunit --coverage-html",
         "test:ci": "phpunit --coverage-text",
         "cs:fix": "pint -v",
         "cs:test": "pint --test -v"

src/Contracts/Selectable.php

@@ -19,7 +19,7 @@ interface Selectable
     /**
      * Add the selected attribute.
      */
-    public function selected(bool $selected = true): static;
+    public function selected(): static;
 
     /**
      * Add the selected if it fulfill the condition.

src/Elements/Button.php

@@ -4,6 +4,7 @@
 
 namespace Arcanedev\Html\Elements;
 
+use Arcanedev\Html\Elements\Concerns\HasDisabledAttribute;
 use Arcanedev\Html\Elements\Concerns\HasNameAttribute;
 use Arcanedev\Html\Elements\Concerns\HasTypeAttribute;
 use Arcanedev\Html\Elements\Concerns\HasValueAttribute;
@@ -20,10 +21,9 @@ class Button extends HtmlElement
      | -----------------------------------------------------------------
      */
 
+    use HasDisabledAttribute;
     use HasNameAttribute;
-
     use HasTypeAttribute;
-
     use HasValueAttribute;
 
     /* -----------------------------------------------------------------

src/Elements/Concerns/HasChildElements.php

@@ -70,7 +70,7 @@ public function initChildren(): static
      *
      * @return $this
      */
-    public function children(mixed $children, ?Closure $mapper = null): static
+    public function children(mixed $children, Closure|array|null $mapper = null): static
     {
         return $this->addChild($children, $mapper);
     }
@@ -80,7 +80,7 @@ public function children(mixed $children, ?Closure $mapper = null): static
      *
      * @return $this
      */
-    public function addChild(mixed $child, ?Closure $mapper = null): static
+    public function addChild(mixed $child, Closure|array|null $mapper = null): static
     {
         if ($child === null) {
             return $this;
@@ -98,7 +98,7 @@ public function addChild(mixed $child, ?Closure $mapper = null): static
      *
      * @return $this
      */
-    public function setNewChildren(mixed $children, ?Closure $mapper = null): static
+    public function setNewChildren(mixed $children, Closure|array|null $mapper = null): static
     {
         return tap(clone $this)
             ->initChildren()
@@ -110,7 +110,7 @@ public function setNewChildren(mixed $children, ?Closure $mapper = null): static
      *
      * @return $this
      */
-    public function prependChild(mixed $children, ?Closure $mapper = null): static
+    public function prependChild(mixed $children, Closure|array|null $mapper = null): static
     {
         return $this->prependChildren($children, $mapper);
     }
@@ -120,7 +120,7 @@ public function prependChild(mixed $children, ?Closure $mapper = null): static
      *
      * @return $this
      */
-    public function prependChildren(mixed $children, ?Closure $mapper = null): static
+    public function prependChildren(mixed $children, Closure|array|null $mapper = null): static
     {
         return tap(clone $this, function (HtmlElement $elt) use ($children, $mapper): void {
             $elt->getChildren()

src/Elements/Fieldset.php

@@ -4,13 +4,22 @@
 
 namespace Arcanedev\Html\Elements;
 
+use Arcanedev\Html\Elements\Concerns\HasDisabledAttribute;
+
 /**
  * Class     Fieldset
  *
  * @author   ARCANEDEV <[email protected]>
  */
 class Fieldset extends HtmlElement
 {
+    /* -----------------------------------------------------------------
+     |  Properties
+     | -----------------------------------------------------------------
+     */
+
+    use HasDisabledAttribute;
+
     /* -----------------------------------------------------------------
      |  Properties
      | -----------------------------------------------------------------

src/Elements/File.php

@@ -21,10 +21,9 @@ class File extends HtmlElement
      */
 
     use HasAutofocusAttribute;
-
     use HasNameAttribute;
-
     use HasRequiredAttribute;
+
     /* -----------------------------------------------------------------
      |  Constants
      | -----------------------------------------------------------------

src/Elements/HtmlElement.php

@@ -5,13 +5,11 @@
 namespace Arcanedev\Html\Elements;
 
 use Arcanedev\Html\Contracts\Elements\HtmlElement as HtmlElementContract;
+use Arcanedev\Html\Elements\Concerns\{HasAttributes, HasChildElements, HasConditionalMethods};
 use Arcanedev\Html\Entities\Attributes\ClassAttribute;
 use Arcanedev\Html\Exceptions\InvalidHtmlException;
 use Arcanedev\Html\Exceptions\MissingTagException;
-use Illuminate\Support\Collection;
-use Illuminate\Support\HtmlString;
-use Illuminate\Support\Str;
-use Illuminate\Support\Traits\Macroable;
+use Illuminate\Support\{Collection, HtmlString, Str, Traits\Macroable};
 
 /**
  * Class     HtmlElement
@@ -29,12 +27,12 @@ class HtmlElement implements HtmlElementContract
      | -----------------------------------------------------------------
      */
 
-    use Concerns\HasAttributes,
-        Concerns\HasChildElements,
-        Concerns\HasConditionalMethods,
-        Macroable {
-            __call as __callMacro;
-        }
+    use HasAttributes;
+    use HasChildElements;
+    use HasConditionalMethods;
+    use Macroable {
+        __call as __callMacro;
+    }
 
     /* -----------------------------------------------------------------
      |  Properties
@@ -200,11 +198,9 @@ public function text(mixed $text, bool $doubleEncode = true): static
     }
 
     /**
-     * Add an html child/children.
+     * Add a html child/children.
      *
      * @return $this
-     *
-     * @throws InvalidHtmlException
      */
     public function html(mixed $html): static
     {
@@ -295,11 +291,21 @@ protected function setTag(string $tag): static
      * @throws MissingTagException
      */
     protected function getTag(): string
+    {
+        $this->ensureHasTag();
+
+        return $this->tag;
+    }
+
+    /**
+     * Ensure the tag property is defined.
+     *
+     * @throws MissingTagException
+     */
+    protected function ensureHasTag(): void
     {
         if (empty($this->tag)) {
             throw MissingTagException::onClass(static::class);
         }
-
-        return $this->tag;
     }
 }

src/Elements/I.php

@@ -16,5 +16,8 @@ class I extends HtmlElement
      | -----------------------------------------------------------------
      */
 
+    /**
+     * The tag type.
+     */
     protected string $tag = 'i';
 }

src/Elements/ListElement.php

@@ -11,15 +11,16 @@
  */
 abstract class ListElement extends HtmlElement
 {
-    /**
-     * Make an item.
-     */
-    abstract protected function makeItem(mixed $value, array $attributes): HtmlElement;
     /* -----------------------------------------------------------------
      |  Main Methods
      | -----------------------------------------------------------------
      */
 
+    /**
+     * Make an item.
+     */
+    abstract protected function makeItem(mixed $value, array $attributes): HtmlElement;
+
     /**
      * Add an item.
      *

src/Elements/Optgroup.php

@@ -4,13 +4,22 @@
 
 namespace Arcanedev\Html\Elements;
 
+use Arcanedev\Html\Elements\Concerns\HasDisabledAttribute;
+
 /**
  * Class     Optgroup
  *
  * @author   ARCANEDEV <[email protected]>
  */
 class Optgroup extends HtmlElement
 {
+    /* -----------------------------------------------------------------
+     |  Traits
+     | -----------------------------------------------------------------
+     */
+
+    use HasDisabledAttribute;
+
     /* -----------------------------------------------------------------
      |  Properties
      | -----------------------------------------------------------------

src/Elements/Option.php

@@ -22,7 +22,6 @@ class Option extends HtmlElement implements Selectable
      */
 
     use HasDisabledAttribute;
-
     use HasValueAttribute;
 
     /* -----------------------------------------------------------------
@@ -44,24 +43,24 @@ class Option extends HtmlElement implements Selectable
      */
     public function selectedIf(bool $condition): static
     {
-        return $condition ? $this->selected() : $this->unselected();
+        return $condition
+            ? $this->attribute('selected')
+            : $this->forgetAttribute('selected');
     }
 
     /**
      * Add the selected attribute.
      */
-    public function selected(bool $selected = true): static
+    public function selected(): static
     {
-        return $selected
-            ? $this->attribute('selected')
-            : $this->forgetAttribute('selected');
+        return $this->selectedIf(true);
     }
 
     /**
      * Remove the selected attribute.
      */
     public function unselected(): static
     {
-        return $this->selected(false);
+        return $this->selectedIf(false);
     }
 }

src/Elements/P.php

@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Arcanedev\Html\Elements;
+
+class P extends HtmlElement
+{
+    /* -----------------------------------------------------------------
+     |  Properties
+     | -----------------------------------------------------------------
+     */
+
+    /**
+     * The tag type.
+     */
+    protected string $tag = 'p';
+}

src/Elements/Select.php

@@ -25,13 +25,9 @@ class Select extends HtmlElement
      */
 
     use HasAutofocusAttribute;
-
     use HasDisabledAttribute;
-
     use HasNameAttribute;
-
     use HasReadonlyAttribute;
-
     use HasRequiredAttribute;
 
     /* -----------------------------------------------------------------
@@ -76,7 +72,7 @@ public function options(iterable $options, array $attributes = [], array $groupA
     {
         return $this->children(
             $options,
-            fn($text, $value) => is_array($text)
+            fn($text, $value) => is_array($text) || $text instanceof Collection
             ? $this->makeOptionsGroup($value, $text, $attributes, $groupAttributes[$value] ?? [])
             : $this->makeOption($value, $text, $attributes[$value] ?? [])
         );

src/Elements/Textarea.php

@@ -25,17 +25,11 @@ class Textarea extends HtmlElement
      */
 
     use HasAutofocusAttribute;
-
     use HasDisabledAttribute;
-
     use HasMinMaxLengthAttributes;
-
     use HasNameAttribute;
-
     use HasPlaceholderAttribute;
-
     use HasReadonlyAttribute;
-
     use HasRequiredAttribute;
 
     /* -----------------------------------------------------------------

src/Entities/ChildrenCollection.php

@@ -30,7 +30,7 @@ class ChildrenCollection extends Collection implements Renderable
      *
      * @throws InvalidChildException
      */
-    public static function parse(mixed $children, ?Closure $mapper = null): static
+    public static function parse(mixed $children, Closure|array|null $mapper = null): static
     {
         return static::make($children)
             ->unless($mapper === null, fn(ChildrenCollection $items) => $items->map($mapper))

src/Html.php

@@ -20,6 +20,7 @@
 use Arcanedev\Html\Elements\Legend;
 use Arcanedev\Html\Elements\Ol;
 use Arcanedev\Html\Elements\Option;
+use Arcanedev\Html\Elements\P;
 use Arcanedev\Html\Elements\Select;
 use Arcanedev\Html\Elements\Span;
 use Arcanedev\Html\Elements\Textarea;
@@ -277,6 +278,14 @@ public function option(?string $text = null, mixed $value = null, bool $selected
             ->selectedIf($selected);
     }
 
+    /**
+     * Make a paragraph tag.
+     */
+    public function p(HtmlElement|string|null $content = null): P
+    {
+        return P::make()->html($content);
+    }
+
     /**
      * Make a password input.
      */

tests/Elements/ATest.php

@@ -24,7 +24,7 @@ public function it_can_create(): void
     {
         static::assertHtmlStringEqualsHtmlString(
             '<a></a>',
-            A::make()->toHtml()
+            A::make()
         );
     }