IBX-1334: Cleanup rebranded ibexa/rest code (#9)

* IBX-1334: Cleanup rebranded ibexa/rest code * fix: Coding Standards
ibexa · Dec 13, 2021 · 17dfdaa · 17dfdaa
1 parent 2939e33
commit 17dfdaa
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/src/lib/Input/ParserTools.php b/src/lib/Input/ParserTools.php
@@ -6,9 +6,9 @@
  */
 namespace Ibexa\Rest\Input;
 
+use Ibexa\Contracts\Core\Repository\Values;
 use Ibexa\Contracts\Rest\Exceptions;
 use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
-use Ibexa\Core\Repository\Values;
 use RuntimeException;
 
 /**
@@ -250,7 +250,7 @@ protected function getLimitationByIdentifier($identifier)
                 return new \Ibexa\Contracts\Core\Repository\Values\User\Limitation\SectionLimitation();
 
             case Values\User\Limitation::SITEACCESS:
-                return new \Ibexa\Core\Repository\Values\User\Limitation\SiteaccessLimitation();
+                return new \Ibexa\Contracts\Core\Repository\Values\User\Limitation\SiteaccessLimitation();
 
             case Values\User\Limitation::STATE:
                 return new \Ibexa\Contracts\Core\Repository\Values\User\Limitation\ObjectStateLimitation();

diff --git a/src/lib/Server/Controller/User.php b/src/lib/Server/Controller/User.php
@@ -8,6 +8,7 @@
 
 use Ibexa\Contracts\Core\Repository\ContentService;
 use Ibexa\Contracts\Core\Repository\ContentTypeService;
+use Ibexa\Contracts\Core\Repository\Exceptions as ApiExceptions;
 use Ibexa\Contracts\Core\Repository\LocationService;
 use Ibexa\Contracts\Core\Repository\PermissionResolver;
 use Ibexa\Contracts\Core\Repository\Repository;
@@ -20,7 +21,6 @@
 use Ibexa\Contracts\Core\Repository\Values\User\UserRoleAssignment;
 use Ibexa\Contracts\Rest\Exceptions\NotFoundException;
 use Ibexa\Core\Base\Exceptions\UnauthorizedException;
-use Ibexa\Core\Repository\Exceptions as ApiExceptions;
 use Ibexa\Rest\Message;
 use Ibexa\Rest\Server\Controller as RestController;
 use Ibexa\Rest\Server\Exceptions;

diff --git a/src/lib/Server/Input/Parser/Criterion/LogicalAnd.php b/src/lib/Server/Input/Parser/Criterion/LogicalAnd.php
@@ -6,9 +6,9 @@
  */
 namespace Ibexa\Rest\Server\Input\Parser\Criterion;
 
+use Ibexa\Contracts\Core\Repository\Values;
 use Ibexa\Contracts\Rest\Exceptions;
 use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
-use Ibexa\Core\Repository\Values;
 
 /**
  * Parser for LogicalAnd Criterion.

diff --git a/src/lib/Server/Input/Parser/Criterion/LogicalOr.php b/src/lib/Server/Input/Parser/Criterion/LogicalOr.php
@@ -6,9 +6,9 @@
  */
 namespace Ibexa\Rest\Server\Input\Parser\Criterion;
 
+use Ibexa\Contracts\Core\Repository\Values;
 use Ibexa\Contracts\Rest\Exceptions;
 use Ibexa\Contracts\Rest\Input\ParsingDispatcher;
-use Ibexa\Core\Repository\Values;
 
 /**
  * Parser for LogicalOr Criterion.

diff --git a/src/lib/Server/Output/ValueObjectVisitor/RestExecutedView.php b/src/lib/Server/Output/ValueObjectVisitor/RestExecutedView.php
@@ -10,11 +10,11 @@
 use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException;
 use Ibexa\Contracts\Core\Repository\Exceptions\UnauthorizedException;
 use Ibexa\Contracts\Core\Repository\LocationService;
+use Ibexa\Contracts\Core\Repository\Values\Content as ApiValues;
 use Ibexa\Contracts\Rest\Exceptions;
 use Ibexa\Contracts\Rest\Output\Generator;
 use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
-use Ibexa\Core\Repository\Values\Content as ApiValues;
 use Ibexa\Rest\Server\Values\RestContent as RestContentValue;
 
 /**

diff --git a/src/lib/Server/Output/ValueObjectVisitor/URLAlias.php b/src/lib/Server/Output/ValueObjectVisitor/URLAlias.php
@@ -6,11 +6,11 @@
  */
 namespace Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
+use Ibexa\Contracts\Core\Repository\Values;
 use Ibexa\Contracts\Core\Repository\Values\Content\URLAlias as URLAliasValue;
 use Ibexa\Contracts\Rest\Output\Generator;
 use Ibexa\Contracts\Rest\Output\ValueObjectVisitor;
 use Ibexa\Contracts\Rest\Output\Visitor;
-use Ibexa\Core\Repository\Values;
 
 /**
  * URLAlias value object visitor.

diff --git a/tests/lib/Server/Output/ValueObjectVisitor/InvalidArgumentExceptionTest.php b/tests/lib/Server/Output/ValueObjectVisitor/InvalidArgumentExceptionTest.php
@@ -6,7 +6,7 @@
  */
 namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor;
 
-use Ibexa\Rest\Exceptions;
+use Ibexa\Contracts\Rest\Exceptions;
 use Ibexa\Rest\Server\Output\ValueObjectVisitor;
 
 class InvalidArgumentExceptionTest extends ExceptionTest