REST: Move JsonPatchValidator to validation namespace

The validator interface belongs in the validation namespace. Change-Id: I832ec7d4894acc5bb55934e77b8a9f081253f3bb
wikimedia · Dec 9, 2022 · 95036aa · 95036aa
1 parent 8544a47
commit 95036aa
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 9 deletions.
diff --git a/repo/rest-api/src/Infrastructure/JsonDiffJsonPatchValidator.php b/repo/rest-api/src/Infrastructure/JsonDiffJsonPatchValidator.php
@@ -7,7 +7,7 @@
 use Swaggest\JsonDiff\JsonPatch;
 use Swaggest\JsonDiff\MissingFieldException;
 use Swaggest\JsonDiff\UnknownOperationException;
-use Wikibase\Repo\RestApi\Domain\Services\JsonPatchValidator;
+use Wikibase\Repo\RestApi\Validation\JsonPatchValidator;
 use Wikibase\Repo\RestApi\Validation\ValidationError;
 
 /**

diff --git a/repo/rest-api/src/UseCases/PatchItemStatement/PatchItemStatementErrorResponse.php b/repo/rest-api/src/UseCases/PatchItemStatement/PatchItemStatementErrorResponse.php
@@ -3,10 +3,10 @@
 namespace Wikibase\Repo\RestApi\UseCases\PatchItemStatement;
 
 use LogicException;
-use Wikibase\Repo\RestApi\Domain\Services\JsonPatchValidator;
 use Wikibase\Repo\RestApi\UseCases\ErrorResponse;
 use Wikibase\Repo\RestApi\Validation\EditMetadataValidator;
 use Wikibase\Repo\RestApi\Validation\ItemIdValidator;
+use Wikibase\Repo\RestApi\Validation\JsonPatchValidator;
 use Wikibase\Repo\RestApi\Validation\StatementIdValidator;
 use Wikibase\Repo\RestApi\Validation\ValidationError;
 

diff --git a/repo/rest-api/src/UseCases/PatchItemStatement/PatchItemStatementValidator.php b/repo/rest-api/src/UseCases/PatchItemStatement/PatchItemStatementValidator.php
@@ -2,9 +2,9 @@
 
 namespace Wikibase\Repo\RestApi\UseCases\PatchItemStatement;
 
-use Wikibase\Repo\RestApi\Domain\Services\JsonPatchValidator;
 use Wikibase\Repo\RestApi\Validation\EditMetadataValidator;
 use Wikibase\Repo\RestApi\Validation\ItemIdValidator;
+use Wikibase\Repo\RestApi\Validation\JsonPatchValidator;
 use Wikibase\Repo\RestApi\Validation\StatementIdValidator;
 use Wikibase\Repo\RestApi\Validation\ValidationError;
 

diff --git a/...rc/Domain/Services/JsonPatchValidator.php → ...api/src/Validation/JsonPatchValidator.php b/...rc/Domain/Services/JsonPatchValidator.php → ...api/src/Validation/JsonPatchValidator.php
@@ -1,8 +1,6 @@
 <?php declare( strict_types=1 );
 
-namespace Wikibase\Repo\RestApi\Domain\Services;
-
-use Wikibase\Repo\RestApi\Validation\ValidationError;
+namespace Wikibase\Repo\RestApi\Validation;
 
 /**
  * @license GPL-2.0-or-later

diff --git a/repo/rest-api/tests/phpunit/Infrastructure/JsonDiffJsonPatchValidatorTest.php b/repo/rest-api/tests/phpunit/Infrastructure/JsonDiffJsonPatchValidatorTest.php
@@ -5,8 +5,8 @@
 use Generator;
 use PHPUnit\Framework\TestCase;
 use Swaggest\JsonDiff\JsonDiff;
-use Wikibase\Repo\RestApi\Domain\Services\JsonPatchValidator;
 use Wikibase\Repo\RestApi\Infrastructure\JsonDiffJsonPatchValidator;
+use Wikibase\Repo\RestApi\Validation\JsonPatchValidator;
 
 /**
  * @covers \Wikibase\Repo\RestApi\Infrastructure\JsonDiffJsonPatchValidator

diff --git a/...est-api/tests/phpunit/UseCases/PatchItemStatement/PatchItemStatementErrorResponseTest.php b/...est-api/tests/phpunit/UseCases/PatchItemStatement/PatchItemStatementErrorResponseTest.php
@@ -3,11 +3,11 @@
 namespace Wikibase\Repo\Tests\RestApi\UseCases\PatchItemStatement;
 
 use PHPUnit\Framework\TestCase;
-use Wikibase\Repo\RestApi\Domain\Services\JsonPatchValidator;
 use Wikibase\Repo\RestApi\UseCases\ErrorResponse;
 use Wikibase\Repo\RestApi\UseCases\PatchItemStatement\PatchItemStatementErrorResponse;
 use Wikibase\Repo\RestApi\Validation\EditMetadataValidator;
 use Wikibase\Repo\RestApi\Validation\ItemIdValidator;
+use Wikibase\Repo\RestApi\Validation\JsonPatchValidator;
 use Wikibase\Repo\RestApi\Validation\StatementIdValidator;
 use Wikibase\Repo\RestApi\Validation\ValidationError;
 

diff --git a/repo/rest-api/tests/phpunit/UseCases/PatchItemStatement/PatchItemStatementValidatorTest.php b/repo/rest-api/tests/phpunit/UseCases/PatchItemStatement/PatchItemStatementValidatorTest.php
@@ -9,11 +9,11 @@
 use Wikibase\DataModel\Entity\ItemIdParser;
 use Wikibase\DataModel\Statement\StatementGuid;
 use Wikibase\Repo\RestApi\DataAccess\StatementDeserializerStatementValidator;
-use Wikibase\Repo\RestApi\Domain\Services\JsonPatchValidator;
 use Wikibase\Repo\RestApi\UseCases\PatchItemStatement\PatchItemStatementRequest;
 use Wikibase\Repo\RestApi\UseCases\PatchItemStatement\PatchItemStatementValidator;
 use Wikibase\Repo\RestApi\Validation\EditMetadataValidator;
 use Wikibase\Repo\RestApi\Validation\ItemIdValidator;
+use Wikibase\Repo\RestApi\Validation\JsonPatchValidator;
 use Wikibase\Repo\RestApi\Validation\StatementIdValidator;
 use Wikibase\Repo\RestApi\Validation\ValidationError;