Add input interface to AbstractSelect and AbstractInput. (#219)

php-forge · Jan 11, 2024 · 4d1ded6 · 4d1ded6
1 parent 6863022
commit 4d1ded6
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 18 deletions.
diff --git a/src/Base/AbstractSelect.php b/src/Base/AbstractSelect.php
@@ -6,6 +6,7 @@
 
 use InvalidArgumentException;
 use PHPForge\Html\Attribute;
+use PHPForge\Html\Input\Contract\InputInterface;
 use PHPForge\Html\Label;
 use PHPForge\Html\Tag;
 use PHPForge\Widget\Element;
@@ -23,7 +24,7 @@
 /**
  * Provides a foundation for creating HTML `select` elements with various attributes and content.
  */
-abstract class AbstractSelect extends Element
+abstract class AbstractSelect extends Element implements InputInterface
 {
     use Attribute\Aria\HasAriaLabel;
     use Attribute\CanBeAutofocus;

diff --git a/src/Input/Base/AbstractButton.php b/src/Input/Base/AbstractButton.php
@@ -4,8 +4,7 @@
 
 namespace PHPForge\Html\Input\Base;
 
-use PHPForge\Html\Attribute;
-use PHPForge\Html\Tag;
+use PHPForge\Html\{Attribute, Tag};
 use PHPForge\Widget\Element;
 
 abstract class AbstractButton extends Element

diff --git a/src/Input/Base/AbstractChoiceList.php b/src/Input/Base/AbstractChoiceList.php
@@ -4,12 +4,10 @@
 
 namespace PHPForge\Html\Input\Base;
 
-use PHPForge\Html\Attribute;
 use PHPForge\Html\Helper\Utils;
-use PHPForge\Html\Input\Checkbox;
 use PHPForge\Html\Input\Contract;
-use PHPForge\Html\Input\Radio;
-use PHPForge\Html\Tag;
+use PHPForge\Html\Input\{Checkbox, Radio};
+use PHPForge\Html\{Attribute, Tag};
 use PHPForge\Widget\Element;
 
 abstract class AbstractChoiceList extends Element implements

diff --git a/src/Input/Base/AbstractHidden.php b/src/Input/Base/AbstractHidden.php
@@ -4,8 +4,7 @@
 
 namespace PHPForge\Html\Input\Base;
 
-use PHPForge\Html\Attribute;
-use PHPForge\Html\Tag;
+use PHPForge\Html\{Attribute, Tag};
 use PHPForge\Widget\Element;
 
 abstract class AbstractHidden extends Element

diff --git a/src/Input/Base/AbstractInput.php b/src/Input/Base/AbstractInput.php
@@ -4,16 +4,14 @@
 
 namespace PHPForge\Html\Input\Base;
 
-use PHPForge\Html\Attribute;
-use PHPForge\Html\Input\Contract\AriaDescribedByInterface;
-use PHPForge\Html\Input\Contract\InputInterface;
-use PHPForge\Html\Tag;
+use PHPForge\Html\Input\Contract;
+use PHPForge\Html\{Attribute, Tag};
 use PHPForge\Widget\Element;
 
 /**
  * Provides a foundation for creating HTML `input` custom elements with various attributes and content.
  */
-abstract class AbstractInput extends Element implements AriaDescribedByInterface, InputInterface
+abstract class AbstractInput extends Element implements Contract\AriaDescribedByInterface, Contract\InputInterface
 {
     use Attribute\Aria\HasAriaDescribedBy;
     use Attribute\Aria\HasAriaLabel;

diff --git a/src/Input/Base/AbstractInputChoice.php b/src/Input/Base/AbstractInputChoice.php
@@ -4,10 +4,8 @@
 
 namespace PHPForge\Html\Input\Base;
 
-use PHPForge\Html\Attribute;
 use PHPForge\Html\Input\Contract;
-use PHPForge\Html\Label;
-use PHPForge\Html\Tag;
+use PHPForge\Html\{Attribute, Label, Tag};
 use PHPForge\Widget\Element;
 
 /**

diff --git a/tests/Input/CheckboxList/ImmutabilityTest.php b/tests/Input/CheckboxList/ImmutabilityTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace PHPForge\Html\Tests\Input\ChoiceList;
+namespace PHPForge\Html\Tests\Input\CheckboxList;
 
 use PHPForge\Html\Input\Checkbox;
 use PHPForge\Html\Input\CheckboxList;