Merge pull request #69 from systopia/fix-namespaces

Fix namespaces
systopia · Aug 2, 2024 · 69a3797 · 69a3797
2 parents 9512d12 + 5b869ec
commit 69a3797
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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 {