diff --git a/src/Form/Layout/TableRowArrayFactory.php b/src/Form/Layout/TableRowArrayFactory.php index 7d887e7..4167bb3 100644 --- a/src/Form/Layout/TableRowArrayFactory.php +++ b/src/Form/Layout/TableRowArrayFactory.php @@ -24,9 +24,9 @@ use Drupal\Core\Form\FormStateInterface; use Drupal\json_forms\Form\FormArrayFactoryInterface; use Drupal\json_forms\JsonForms\Definition\Control\ControlDefinition; +use Drupal\json_forms\JsonForms\Definition\Custom\MarkupDefinition; use Drupal\json_forms\JsonForms\Definition\DefinitionInterface; use Drupal\json_forms\JsonForms\Definition\Layout\LayoutDefinition; -use Drupal\json_forms\JsonForms\Definition\Markup\MarkupDefinition; /** * Creates an array for a row in a table render element. diff --git a/src/Form/Markup/HtmlMarkupArrayFactory.php b/src/Form/Markup/HtmlMarkupArrayFactory.php index 81c0658..3bef0b1 100644 --- a/src/Form/Markup/HtmlMarkupArrayFactory.php +++ b/src/Form/Markup/HtmlMarkupArrayFactory.php @@ -26,8 +26,8 @@ use Drupal\json_forms\Form\AbstractConcreteFormArrayFactory; use Drupal\json_forms\Form\Control\Rule\StatesArrayFactoryInterface; use Drupal\json_forms\Form\FormArrayFactoryInterface; +use Drupal\json_forms\JsonForms\Definition\Custom\MarkupDefinition; use Drupal\json_forms\JsonForms\Definition\DefinitionInterface; -use Drupal\json_forms\JsonForms\Definition\Markup\MarkupDefinition; final class HtmlMarkupArrayFactory extends AbstractConcreteFormArrayFactory { @@ -46,7 +46,7 @@ public function createFormArray( FormArrayFactoryInterface $formArrayFactory ): array { Assertion::isInstanceOf($definition, MarkupDefinition::class); - /** @var \Drupal\json_forms\JsonForms\Definition\Markup\MarkupDefinition $definition */ + /** @var \Drupal\json_forms\JsonForms\Definition\Custom\MarkupDefinition $definition */ $element = [ '#type' => 'fieldset', diff --git a/src/JsonForms/Definition/Custom/MarkupDefinition.php b/src/JsonForms/Definition/Custom/MarkupDefinition.php index dfabca5..9263696 100644 --- a/src/JsonForms/Definition/Custom/MarkupDefinition.php +++ b/src/JsonForms/Definition/Custom/MarkupDefinition.php @@ -19,7 +19,7 @@ declare(strict_types=1); -namespace Drupal\json_forms\JsonForms\Definition\Markup; +namespace Drupal\json_forms\JsonForms\Definition\Custom; use Drupal\json_forms\JsonForms\Definition\DefinitionInterface; diff --git a/src/JsonForms/Definition/DefinitionFactory.php b/src/JsonForms/Definition/DefinitionFactory.php index 7c66002..18241f9 100644 --- a/src/JsonForms/Definition/DefinitionFactory.php +++ b/src/JsonForms/Definition/DefinitionFactory.php @@ -23,8 +23,8 @@ use Drupal\json_forms\JsonForms\Definition\Control\ControlDefinition; use Drupal\json_forms\JsonForms\Definition\Custom\CustomDefinition; +use Drupal\json_forms\JsonForms\Definition\Custom\MarkupDefinition; use Drupal\json_forms\JsonForms\Definition\Layout\LayoutDefinition; -use Drupal\json_forms\JsonForms\Definition\Markup\MarkupDefinition; final class DefinitionFactory { diff --git a/tests/src/Unit/Form/Markup/HtmlMarkupArrayFactoryTest.php b/tests/src/Unit/Form/Markup/HtmlMarkupArrayFactoryTest.php index 983a7d9..4694f6a 100644 --- a/tests/src/Unit/Form/Markup/HtmlMarkupArrayFactoryTest.php +++ b/tests/src/Unit/Form/Markup/HtmlMarkupArrayFactoryTest.php @@ -25,13 +25,13 @@ use Drupal\json_forms\Form\Control\Rule\StatesArrayFactoryInterface; use Drupal\json_forms\Form\FormArrayFactoryInterface; use Drupal\json_forms\Form\Markup\HtmlMarkupArrayFactory; -use Drupal\json_forms\JsonForms\Definition\Markup\MarkupDefinition; +use Drupal\json_forms\JsonForms\Definition\Custom\MarkupDefinition; use Drupal\Tests\UnitTestCase; use PHPUnit\Framework\MockObject\MockObject; /** * @covers \Drupal\json_forms\Form\Markup\HtmlMarkupArrayFactory - * @covers \Drupal\json_forms\JsonForms\Definition\Markup\MarkupDefinition + * @covers \Drupal\json_forms\JsonForms\Definition\Custom\MarkupDefinition * @group json_forms */ final class HtmlMarkupArrayFactoryTest extends UnitTestCase {