Export: import validation refactoring

chlulei · Oct 25, 2024 · 9679d43 · 9679d43
1 parent 9447ed8
commit 9679d43
Show file tree

Hide file tree

Showing 15 changed files with 12 additions and 151 deletions.
diff --git a/components/ILIAS/Export/tests/ImportHandler/File/XML/Node/Info/ilDOMNodeHandlerTest.php b/components/ILIAS/Export/tests/ImportHandler/File/XML/Node/Info/ilDOMNodeHandlerTest.php
diff --git a/.../Node/Info/Attribute/ilCollectionTest.php → ...r/NodeInfo/Attribute/ilCollectionTest.php b/.../Node/Info/Attribute/ilCollectionTest.php → ...r/NodeInfo/Attribute/ilCollectionTest.php
@@ -18,7 +18,7 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Export\Test\ImportHandler\File\XML\Node\Info\Attribute;
+namespace ILIAS\Export\Test\ImportHandler\Parser\NodeInfo\Attribute;
 
 use ILIAS\Export\ImportHandler\Parser\NodeInfo\Attribute\Collection as ilXMLFileNodeInfoAttributeCollection;
 use ILIAS\Export\ImportHandler\Parser\NodeInfo\Attribute\Handler as ilXMLFileNodeInfoAttributePair;

diff --git a/...le/XML/Node/Info/Attribute/ilPairTest.php → .../Parser/NodeInfo/Attribute/ilPairTest.php b/...le/XML/Node/Info/Attribute/ilPairTest.php → .../Parser/NodeInfo/Attribute/ilPairTest.php
@@ -18,7 +18,7 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Export\Test\ImportHandler\File\XML\Node\Info\Attribute;
+namespace ILIAS\Export\Test\ImportHandler\Parser\NodeInfo\Attribute;
 
 use ILIAS\Export\ImportHandler\Parser\NodeInfo\Attribute\Handler as ilXMLFileNodeInfoAttributePair;
 use PHPUnit\Framework\TestCase;

diff --git a/...r/File/XML/Node/Info/ilCollectionTest.php → ...dler/Parser/NodeInfo/ilCollectionTest.php b/...r/File/XML/Node/Info/ilCollectionTest.php → ...dler/Parser/NodeInfo/ilCollectionTest.php
@@ -18,7 +18,7 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Export\Test\ImportHandler\File\XML\Node\Info;
+namespace ILIAS\Export\Test\ImportHandler\Parser\NodeInfo;
 
 use ILIAS\Export\ImportHandler\Parser\NodeInfo\DOM\Handler;
 use ILIAS\Export\ImportHandler\Parser\NodeInfo\Collection;

diff --git a/...er/File/Path/Comparison/ilHandlerTest.php → ...Handler/Path/Comparison/ilHandlerTest.php b/...er/File/Path/Comparison/ilHandlerTest.php → ...Handler/Path/Comparison/ilHandlerTest.php
@@ -18,7 +18,7 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Export\Test\ImportHandler\File\Path\Comparison;
+namespace ILIAS\Export\Test\ImportHandler\Path\Comparison;
 
 use ILIAS\Export\ImportHandler\Path\Comparison\Handler as ilFilePathComparison;
 use ILIAS\Export\ImportHandler\Path\Comparison\Operator as ilFilePathComparisonOperator;

diff --git a/...ndler/File/Path/Node/ilAnyElementTest.php → ...ortHandler/Path/Node/ilAnyElementTest.php b/...ndler/File/Path/Node/ilAnyElementTest.php → ...ortHandler/Path/Node/ilAnyElementTest.php
@@ -18,7 +18,7 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Export\Test\ImportHandler\File\Path\Node;
+namespace ILIAS\Export\Test\ImportHandler\Path\Node;
 
 use ILIAS\Export\ImportHandler\Path\Node\AnyElement as ilAnyElementFilePathNode;
 use PHPUnit\Framework\TestCase;

diff --git a/...tHandler/File/Path/Node/ilAnyNodeTest.php → ...ImportHandler/Path/Node/ilAnyNodeTest.php b/...tHandler/File/Path/Node/ilAnyNodeTest.php → ...ImportHandler/Path/Node/ilAnyNodeTest.php
@@ -18,7 +18,7 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Export\Test\ImportHandler\File\Path\Node;
+namespace ILIAS\Export\Test\ImportHandler\Path\Node;
 
 use ILIAS\Export\ImportHandler\Path\Node\AnyNode as ilAnyNodeFilePathNode;
 use PHPUnit\Framework\TestCase;

diff --git a/...andler/File/Path/Node/ilAttributeTest.php → ...portHandler/Path/Node/ilAttributeTest.php b/...andler/File/Path/Node/ilAttributeTest.php → ...portHandler/Path/Node/ilAttributeTest.php
@@ -18,7 +18,7 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Export\Test\ImportHandler\File\Path\Node;
+namespace ILIAS\Export\Test\ImportHandler\Path\Node;
 
 use ILIAS\Export\ImportHandler\Path\Comparison\Handler as ilFilePathComparisonHandler;
 use ILIAS\Export\ImportHandler\Path\Node\Attribute as ilAttributeFilePathNode;

diff --git a/...ile/Path/Node/ilCloseRoundBrackedTest.php → ...ler/Path/Node/ilCloseRoundBrackedTest.php b/...ile/Path/Node/ilCloseRoundBrackedTest.php → ...ler/Path/Node/ilCloseRoundBrackedTest.php
@@ -18,7 +18,7 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Export\Test\ImportHandler\File\Path\Node;
+namespace ILIAS\Export\Test\ImportHandler\Path\Node;
 
 use ILIAS\Export\ImportHandler\Path\Node\CloseRoundBracked as ilCloseRoundBrackedFilePathNode;
 use PHPUnit\Framework\TestCase;

diff --git a/...ortHandler/File/Path/Node/ilIndexTest.php → ...s/ImportHandler/Path/Node/ilIndexTest.php b/...ortHandler/File/Path/Node/ilIndexTest.php → ...s/ImportHandler/Path/Node/ilIndexTest.php
@@ -18,7 +18,7 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Export\Test\ImportHandler\File\Path\Node;
+namespace ILIAS\Export\Test\ImportHandler\Path\Node;
 
 use ILIAS\Export\ImportHandler\Path\Comparison\Handler as ilFilePathComparisonHandler;
 use ILIAS\Export\ImportHandler\Path\Node\Index as ilIndexFilePathNode;

diff --git a/...File/Path/Node/ilOpenRoundBrackedTest.php → ...dler/Path/Node/ilOpenRoundBrackedTest.php b/...File/Path/Node/ilOpenRoundBrackedTest.php → ...dler/Path/Node/ilOpenRoundBrackedTest.php
@@ -18,7 +18,7 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Export\Test\ImportHandler\File\Path\Node;
+namespace ILIAS\Export\Test\ImportHandler\Path\Node;
 
 use ILIAS\Export\ImportHandler\Path\Node\OpenRoundBracked as ilOpenRoundBrackedFilePathNode;
 use PHPUnit\Framework\TestCase;

diff --git a/...rtHandler/File/Path/Node/ilSimpleTest.php → .../ImportHandler/Path/Node/ilSimpleTest.php b/...rtHandler/File/Path/Node/ilSimpleTest.php → .../ImportHandler/Path/Node/ilSimpleTest.php
@@ -18,7 +18,7 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Export\Test\ImportHandler\File\Path\Node;
+namespace ILIAS\Export\Test\ImportHandler\Path\Node;
 
 use ILIAS\Export\ImportHandler\Path\Node\Simple as ilSimpleFilePathNode;
 use PHPUnit\Framework\TestCase;

diff --git a/...ImportHandler/File/Path/ilHandlerTest.php → ...ests/ImportHandler/Path/ilHandlerTest.php b/...ImportHandler/File/Path/ilHandlerTest.php → ...ests/ImportHandler/Path/ilHandlerTest.php
@@ -18,7 +18,7 @@
 
 declare(strict_types=1);
 
-namespace ILIAS\Export\Test\ImportHandler\File\Path;
+namespace ILIAS\Export\Test\ImportHandler\Path;
 
 use ILIAS\Export\ImportHandler\Path\Handler as ilFilePathHandler;
 use ILIAS\Export\ImportHandler\Path\Node\Simple as ilSimpleFilePathNode;

diff --git a/.../File/Validation/Set/ilCollectionTest.php → ...ndler/Validation/Set/ilCollectionTest.php b/.../File/Validation/Set/ilCollectionTest.php → ...ndler/Validation/Set/ilCollectionTest.php
diff --git a/...ler/File/Validation/Set/ilHandlerTest.php → ...tHandler/Validation/Set/ilHandlerTest.php b/...ler/File/Validation/Set/ilHandlerTest.php → ...tHandler/Validation/Set/ilHandlerTest.php