Rename everything

src/Csrf/CsrfFDH.php → src/Csrf/CsrfDataHandler.php

@@ -3,10 +3,10 @@
 
 use Packaged\Glimpse\Tags\Form\Input;
 use PackagedUi\Form\DataHandlerDecorator;
+use PackagedUi\Form\DataHandlers\AbstractDataHandler;
 use PackagedUi\Form\Decorators\InputDecorator;
-use PackagedUi\Form\FormDataHandlers\AbstractFDH;
 
-class CsrfFDH extends AbstractFDH
+class CsrfDataHandler extends AbstractDataHandler
 {
   protected $_sessionSecret;
   protected $_formSecret;

src/Csrf/CsrfForm.php

@@ -6,7 +6,7 @@
 class CsrfForm extends Form
 {
   /**
-   * @var CsrfFDH
+   * @var CsrfDataHandler
    */
   public $csrfToken;
 
@@ -25,6 +25,6 @@ protected function _getCsrfSecret()
 
   protected function _initDataHandlers()
   {
-    $this->csrfToken = new CsrfFDH($this->_getCsrfSecret(), $this->_sessionSecret);
+    $this->csrfToken = new CsrfDataHandler($this->_getCsrfSecret(), $this->_sessionSecret);
   }
 }

src/FormDataHandler.php → src/DataHandler.php

@@ -1,7 +1,7 @@
 <?php
 namespace PackagedUi\Form;
 
-interface FormDataHandler
+interface DataHandler
 {
   public function isValidValue($value): bool;
 

src/DataHandlerDecorator.php

@@ -5,5 +5,5 @@
 
 interface DataHandlerDecorator
 {
-  public function buildElement(FormDataHandler $handler, array $options = null): HtmlTag;
+  public function buildElement(DataHandler $handler, array $options = null): HtmlTag;
 }

src/FormDataHandlers/AbstractFDH.php → src/DataHandlers/AbstractDataHandler.php

@@ -1,12 +1,12 @@
 <?php
-namespace PackagedUi\Form\FormDataHandlers;
+namespace PackagedUi\Form\DataHandlers;
 
 use Packaged\Glimpse\Core\HtmlTag;
+use PackagedUi\Form\DataHandler;
 use PackagedUi\Form\DataHandlerDecorator;
 use PackagedUi\Form\Decorators\InputDecorator;
-use PackagedUi\Form\FormDataHandler;
 
-abstract class AbstractFDH implements FormDataHandler
+abstract class AbstractDataHandler implements DataHandler
 {
   protected $_value;
   /** @var DataHandlerDecorator */
@@ -23,7 +23,7 @@ public function getValue()
   /**
    * @param mixed $value
    *
-   * @return FormDataHandler
+   * @return DataHandler
    */
   public function setValue($value)
   {
@@ -34,7 +34,7 @@ public function setValue($value)
   /**
    * @param mixed $value
    *
-   * @return FormDataHandler
+   * @return DataHandler
    * @throws \Exception
    */
   public function setValueFormatted($value)

src/FormDataHandlers/EnumFDH.php → src/DataHandlers/EnumDataHandler.php

@@ -1,10 +1,10 @@
 <?php
-namespace PackagedUi\Form\FormDataHandlers;
+namespace PackagedUi\Form\DataHandlers;
 
 use PackagedUi\Form\DataHandlerDecorator;
 use PackagedUi\Form\Decorators\SelectDecorator;
 
-class EnumFDH extends AbstractFDH
+class EnumDataHandler extends AbstractDataHandler
 {
   protected $_options = [];
 

src/FormDataHandlers/TextFDH.php → src/DataHandlers/TextDataHandler.php

@@ -1,13 +1,13 @@
 <?php
-namespace PackagedUi\Form\FormDataHandlers;
+namespace PackagedUi\Form\DataHandlers;
 
 use Packaged\Glimpse\Tags\Form\Input;
 use Packaged\Helpers\Strings;
 use Packaged\Helpers\ValueAs;
 use PackagedUi\Form\DataHandlerDecorator;
 use PackagedUi\Form\Decorators\InputDecorator;
 
-class TextFDH extends AbstractFDH
+class TextDataHandler extends AbstractDataHandler
 {
   public function formatValue($value)
   {

src/Decorators/InputDecorator.php

@@ -4,7 +4,7 @@
 use Packaged\Glimpse\Core\HtmlTag;
 use Packaged\Glimpse\Tags\Form\Input;
 use PackagedUi\Form\DataHandlerDecorator;
-use PackagedUi\Form\FormDataHandler;
+use PackagedUi\Form\DataHandler;
 
 class InputDecorator implements DataHandlerDecorator
 {
@@ -29,7 +29,7 @@ public function setType($type)
     return $this;
   }
 
-  public function buildElement(FormDataHandler $handler, array $options = null): HtmlTag
+  public function buildElement(DataHandler $handler, array $options = null): HtmlTag
   {
     $element = new Input();
     $element->setType($this->getType());

src/Decorators/SelectDecorator.php

@@ -5,15 +5,15 @@
 use Packaged\Glimpse\Tags\Form\Option;
 use Packaged\Glimpse\Tags\Form\Select;
 use PackagedUi\Form\DataHandlerDecorator;
-use PackagedUi\Form\FormDataHandlers\EnumFDH;
-use PackagedUi\Form\FormDataHandler;
+use PackagedUi\Form\DataHandlers\EnumDataHandler;
+use PackagedUi\Form\DataHandler;
 
 class SelectDecorator implements DataHandlerDecorator
 {
-  public function buildElement(FormDataHandler $handler, array $options = null): HtmlTag
+  public function buildElement(DataHandler $handler, array $options = null): HtmlTag
   {
     $element = new Select();
-    if($handler instanceof EnumFDH)
+    if($handler instanceof EnumDataHandler)
     {
       foreach($handler->getOptions() as $value => $key)
       {

src/Form.php

@@ -10,7 +10,7 @@ abstract class Form extends HtmlTag
 {
   protected $_tag = 'form';
   /**
-   * @var FormDataHandler[]
+   * @var DataHandler[]
    */
   protected $_dataHandlers = [];
 
@@ -111,7 +111,7 @@ public function hydrate(array $data)
     foreach($data as $name => $value)
     {
       $ele = $this->__get($name);
-      if($ele instanceof FormDataHandler)
+      if($ele instanceof DataHandler)
       {
         try
         {

tests/FDH/AbstractFDHTest.php → tests/DataHandlers/AbstractDataHandlerTest.php

@@ -1,17 +1,17 @@
 <?php
-namespace PackagedUi\Tests\Form\FDH;
+namespace PackagedUi\Tests\Form\DataHandlers;
 
 use Packaged\Glimpse\Tags\Form\Input;
 use PackagedUi\Form\Decorators\InputDecorator;
-use PackagedUi\Tests\Form\Supporting\FDH\TestAbstractFDH;
-use PackagedUi\Tests\Form\Supporting\FDH\TestIntegerFDH;
+use PackagedUi\Tests\Form\Supporting\DataHandlers\TestAbstractDataHandler;
+use PackagedUi\Tests\Form\Supporting\DataHandlers\TestIntegerDataHandler;
 use PHPUnit\Framework\TestCase;
 
-class AbstractFDHTest extends TestCase
+class AbstractDataHandlerTest extends TestCase
 {
   public function testAbstract()
   {
-    $fdh = new TestAbstractFDH();
+    $fdh = new TestAbstractDataHandler();
     $this->assertEmpty($fdh->getValue());
     $fdh->setValue('abc');
     $this->assertEquals('abc', $fdh->getValue());
@@ -23,7 +23,7 @@ public function testAbstract()
 
   public function testValidation()
   {
-    $fdh = new TestIntegerFDH();
+    $fdh = new TestIntegerDataHandler();
     $this->assertTrue($fdh->isValid());
     $fdh->setValue('1abc');
     $this->assertFalse($fdh->isValid());
@@ -33,7 +33,7 @@ public function testValidation()
 
   public function testDecorator()
   {
-    $fdh = new TestAbstractFDH();
+    $fdh = new TestAbstractDataHandler();
     $defaultDecorator = $fdh->getDecorator();
     $newDecorator = new InputDecorator();
     $newDecorator->setType(Input::TYPE_DATE);

tests/FDH/EnumFDHTest.php → tests/DataHandlers/EnumDataHandlerTest.php

@@ -1,15 +1,15 @@
 <?php
 
-namespace PackagedUi\Tests\Form\FDH;
+namespace PackagedUi\Tests\Form\DataHandlers;
 
-use PackagedUi\Form\FormDataHandlers\EnumFDH;
+use PackagedUi\Form\DataHandlers\EnumDataHandler;
 use PHPUnit\Framework\TestCase;
 
-class EnumFDHTest extends TestCase
+class EnumDataHandlerTest extends TestCase
 {
   public function testGetElement()
   {
-    $ele = new EnumFDH();
+    $ele = new EnumDataHandler();
     $this->assertEquals('<select></select>', $ele->getElement()->produceSafeHTML()->getContent());
 
     $ele->setOptions(['a' => 'one', 'b' => 'two']);

tests/FDH/TextFDHTest.php → tests/DataHandlers/TextDataHandlerTest.php

@@ -1,24 +1,24 @@
 <?php
 
-namespace PackagedUi\Tests\Form\FDH;
+namespace PackagedUi\Tests\Form\DataHandlers;
 
-use PackagedUi\Form\FormDataHandlers\TextFDH;
+use PackagedUi\Form\DataHandlers\TextDataHandler;
 use PHPUnit\Framework\TestCase;
 use stdClass;
 
-class TextFDHTest extends TestCase
+class TextDataHandlerTest extends TestCase
 {
 
   public function testInvalidFormatValue()
   {
-    $text = new TextFDH();
+    $text = new TextDataHandler();
     $this->expectException(\InvalidArgumentException::class);
     $text->formatValue(new stdClass());
   }
 
   public function testFormatValue()
   {
-    $text = new TextFDH();
+    $text = new TextDataHandler();
     $text->setValueFormatted(true);
     $this->assertEquals('true', $text->getValue());
     $text->setValueFormatted(false);

tests/FormTest.php

@@ -2,8 +2,8 @@
 
 namespace PackagedUi\Tests\Form;
 
-use PackagedUi\Form\FormDataHandlers\TextFDH;
-use PackagedUi\Tests\Form\Supporting\FDH\TestIntegerFDH;
+use PackagedUi\Form\DataHandlers\TextDataHandler;
+use PackagedUi\Tests\Form\Supporting\DataHandlers\TestIntegerDataHandler;
 use PackagedUi\Tests\Form\Supporting\TestForm;
 use PHPUnit\Framework\TestCase;
 
@@ -15,7 +15,7 @@ public function testProperties()
     $this->assertTrue(isset($form->text));
     $this->assertNotTrue(isset($form->random));
 
-    $this->assertInstanceOf(TextFDH::class, $form->text);
+    $this->assertInstanceOf(TextDataHandler::class, $form->text);
     $this->assertEquals('', $form->text->getValue());
     $form->text->setValue('abc');
     $this->assertEquals('abc', $form->text->getValue());
@@ -30,7 +30,7 @@ public function testProperties()
     $this->assertIsArray($form->getErrors());
     $this->assertArrayHasKey('number', $form->getErrors());
 
-    $this->expectExceptionMessage(TestIntegerFDH::ERR_INVALID_NUMBER);
+    $this->expectExceptionMessage(TestIntegerDataHandler::ERR_INVALID_NUMBER);
     $form->validate();
   }
 
@@ -45,7 +45,7 @@ public function testHydrate()
     $result = $form->hydrate(['text' => 'abc', 'number' => 'invalid']);
     $this->assertCount(1, $result);
     $this->assertArrayHasKey('number', $result);
-    $this->assertEquals(TestIntegerFDH::ERR_INVALID_NUMBER, $result['number']);
+    $this->assertEquals(TestIntegerDataHandler::ERR_INVALID_NUMBER, $result['number']);
 
     $this->assertEquals('abc', $form->text->getValue());
     $this->assertNull($form->number->getValue());

tests/Supporting/DataHandlers/TestAbstractDataHandler.php

@@ -0,0 +1,9 @@
+<?php
+namespace PackagedUi\Tests\Form\Supporting\DataHandlers;
+
+use PackagedUi\Form\DataHandlers\AbstractDataHandler;
+
+class TestAbstractDataHandler extends AbstractDataHandler
+{
+
+}

tests/Supporting/FDH/TestIntegerFDH.php → tests/Supporting/DataHandlers/TestIntegerDataHandler.php

@@ -1,12 +1,12 @@
 <?php
-namespace PackagedUi\Tests\Form\Supporting\FDH;
+namespace PackagedUi\Tests\Form\Supporting\DataHandlers;
 
 use Packaged\Glimpse\Tags\Form\Input;
 use PackagedUi\Form\DataHandlerDecorator;
+use PackagedUi\Form\DataHandlers\AbstractDataHandler;
 use PackagedUi\Form\Decorators\InputDecorator;
-use PackagedUi\Form\FormDataHandlers\AbstractFDH;
 
-class TestIntegerFDH extends AbstractFDH
+class TestIntegerDataHandler extends AbstractDataHandler
 {
   const ERR_INVALID_NUMBER = "Invalid numeric value";
 

tests/Supporting/TestForm.php

@@ -1,18 +1,18 @@
 <?php
 namespace PackagedUi\Tests\Form\Supporting;
 
-use PackagedUi\Form\FormDataHandlers\TextFDH;
+use PackagedUi\Form\DataHandlers\TextDataHandler;
 use PackagedUi\Form\Form;
-use PackagedUi\Tests\Form\Supporting\FDH\TestIntegerFDH;
+use PackagedUi\Tests\Form\Supporting\DataHandlers\TestIntegerDataHandler;
 
 class TestForm extends Form
 {
   /**
-   * @var TextFDH
+   * @var TextDataHandler
    */
   public $text;
   /**
-   * @var TestIntegerFDH
+   * @var TestIntegerDataHandler
    */
   public $number;
 
@@ -23,7 +23,7 @@ protected function _getAction()
 
   protected function _initDataHandlers()
   {
-    $this->text = new TextFDH();
-    $this->number = new TestIntegerFDH();
+    $this->text = new TextDataHandler();
+    $this->number = new TestIntegerDataHandler();
   }
 }