From 3b7712d7c693e4b341d9b74cacbbce666673b559 Mon Sep 17 00:00:00 2001 From: Nattfarinn Date: Wed, 1 Dec 2021 16:15:05 +0100 Subject: [PATCH 1/7] IBX-1334: Rebranded ibexa/rest to use new namespaces --- composer.json | 8 +- src/bundle/ApiLoader/Factory.php | 16 +-- src/bundle/CorsOptions/RestProvider.php | 4 +- .../Compiler/FieldTypeProcessorPass.php | 2 +- .../DependencyInjection/Configuration.php | 2 +- .../IbexaRestExtension.php | 4 +- src/bundle/EventListener/CsrfListener.php | 10 +- src/bundle/EventListener/ResponseListener.php | 2 +- src/bundle/RequestParser/Router.php | 4 +- src/bundle/Resources/config/input_parsers.yml | 26 ++-- src/bundle/Resources/config/security.yml | 2 +- src/bundle/Resources/config/services.yml | 8 +- .../config/value_object_visitors.yml | 54 ++++---- src/bundle/Routing/OptionsLoader.php | 2 +- src/bundle/Routing/OptionsLoader/Mapper.php | 8 +- .../OptionsLoader/RouteCollectionMapper.php | 4 +- .../Exceptions/InvalidArgumentException.php | 2 +- .../Exceptions/NotFoundException.php | 4 +- src/contracts/FieldTypeProcessor.php | 12 +- src/contracts/Input/Parser.php | 4 +- src/contracts/Input/ParsingDispatcher.php | 6 +- src/contracts/Output/ValueObjectVisitor.php | 22 ++-- .../Output/ValueObjectVisitorDispatcher.php | 10 +- src/contracts/Output/Visitor.php | 14 +- .../FieldTypeProcessor/AuthorProcessor.php | 2 +- .../BaseRelationProcessor.php | 8 +- .../DateAndTimeProcessor.php | 2 +- src/lib/FieldTypeProcessor/DateProcessor.php | 2 +- .../ImageAssetFieldTypeProcessor.php | 6 +- src/lib/FieldTypeProcessor/ImageProcessor.php | 2 +- src/lib/FieldTypeProcessor/MediaProcessor.php | 2 +- src/lib/FieldTypeProcessor/TimeProcessor.php | 2 +- src/lib/FieldTypeProcessorRegistry.php | 8 +- src/lib/Input/BaseParser.php | 2 +- src/lib/Input/Dispatcher.php | 12 +- src/lib/Input/FieldTypeParser.php | 22 ++-- src/lib/Input/Parser/ContentObjectStates.php | 6 +- src/lib/Input/ParserTools.php | 38 +++--- src/lib/Output/FieldTypeSerializer.php | 36 ++--- src/lib/Output/Generator/Json.php | 4 +- src/lib/Output/Generator/Json/ArrayObject.php | 4 +- .../Generator/Json/FieldTypeHashGenerator.php | 16 +-- src/lib/Output/Generator/Json/JsonObject.php | 4 +- src/lib/Output/Generator/Xml.php | 4 +- .../ContentObjectStates.php | 6 +- src/lib/Server/Controller.php | 8 +- src/lib/Server/Controller/BinaryContent.php | 20 +-- src/lib/Server/Controller/Bookmark.php | 36 ++--- src/lib/Server/Controller/Content.php | 98 +++++++------- src/lib/Server/Controller/ContentType.php | 124 +++++++++--------- src/lib/Server/Controller/JWT.php | 8 +- src/lib/Server/Controller/Location.php | 54 ++++---- src/lib/Server/Controller/ObjectState.php | 52 ++++---- src/lib/Server/Controller/Role.php | 106 +++++++-------- src/lib/Server/Controller/Root.php | 6 +- src/lib/Server/Controller/Section.php | 32 ++--- .../Server/Controller/SessionController.php | 28 ++-- src/lib/Server/Controller/Trash.php | 28 ++-- src/lib/Server/Controller/URLAlias.php | 26 ++-- src/lib/Server/Controller/URLWildcard.php | 18 +-- src/lib/Server/Controller/User.php | 110 ++++++++-------- src/lib/Server/Controller/Views.php | 18 +-- .../ContentFieldValidationException.php | 8 +- .../AbstractRangeAggregationParser.php | 4 +- .../AbstractStatsAggregationParser.php | 2 +- .../AbstractTermAggregationParser.php | 2 +- .../ContentTypeGroupTermAggregationParser.php | 4 +- .../ContentTypeTermAggregationParser.php | 4 +- .../DateMetadataRangeAggregationParser.php | 4 +- .../Field/AuthorTermAggregationParser.php | 4 +- .../Field/CheckboxTermAggregationParser.php | 4 +- .../Field/CountryTermAggregationParser.php | 4 +- .../Field/DateRangeAggregationParser.php | 4 +- .../Field/DateTimeRangeAggregationParser.php | 4 +- .../Field/FloatRangeAggregationParser.php | 4 +- .../Field/FloatStatsAggregationParser.php | 4 +- .../Field/IntegerRangeAggregationParser.php | 4 +- .../Field/IntegerStatsAggregationParser.php | 4 +- .../Field/KeywordTermAggregationParser.php | 4 +- .../Field/SelectionTermAggregationParser.php | 4 +- .../Field/TimeRangeAggregationParser.php | 4 +- .../LanguageTermAggregationParser.php | 4 +- .../LocationChildrenTermAggregationParser.php | 4 +- .../Location/SubtreeTermAggregationParser.php | 4 +- .../ObjectStateTermAggregationParser.php | 4 +- .../Aggregation/Range/AbstractRangeParser.php | 2 +- .../Aggregation/RawRangeAggregationParser.php | 4 +- .../Aggregation/RawStatsAggregationParser.php | 4 +- .../Aggregation/RawTermAggregationParser.php | 4 +- .../SectionTermAggregationParser.php | 4 +- .../UserMetadataTermAggregationParser.php | 4 +- .../VisibilityTermAggregationParser.php | 4 +- src/lib/Server/Input/Parser/ContentCreate.php | 28 ++-- src/lib/Server/Input/Parser/ContentQuery.php | 2 +- .../Server/Input/Parser/ContentTypeCreate.php | 18 +-- .../Input/Parser/ContentTypeGroupInput.php | 14 +- .../Server/Input/Parser/ContentTypeUpdate.php | 14 +- src/lib/Server/Input/Parser/ContentUpdate.php | 6 +- src/lib/Server/Input/Parser/Criterion.php | 22 ++-- .../Input/Parser/Criterion/Ancestor.php | 8 +- .../Input/Parser/Criterion/ContentId.php | 8 +- .../Parser/Criterion/ContentRemoteId.php | 8 +- .../Parser/Criterion/ContentTypeGroupId.php | 8 +- .../Input/Parser/Criterion/ContentTypeId.php | 8 +- .../Criterion/ContentTypeIdentifier.php | 12 +- .../Input/Parser/Criterion/DateMetadata.php | 8 +- .../Server/Input/Parser/Criterion/Field.php | 12 +- .../Input/Parser/Criterion/FullText.php | 8 +- .../Input/Parser/Criterion/IsUserBased.php | 4 +- .../Input/Parser/Criterion/IsUserEnabled.php | 4 +- .../Input/Parser/Criterion/LanguageCode.php | 8 +- .../Input/Parser/Criterion/LocationId.php | 8 +- .../Parser/Criterion/LocationRemoteId.php | 8 +- .../Input/Parser/Criterion/LogicalAnd.php | 8 +- .../Input/Parser/Criterion/LogicalNot.php | 8 +- .../Parser/Criterion/LogicalOperator.php | 6 +- .../Input/Parser/Criterion/LogicalOr.php | 8 +- .../Input/Parser/Criterion/MoreLikeThis.php | 6 +- .../Input/Parser/Criterion/ObjectStateId.php | 8 +- .../Criterion/ObjectStateIdentifier.php | 2 +- .../Input/Parser/Criterion/Operator.php | 6 +- .../Parser/Criterion/ParentLocationId.php | 8 +- .../Criterion/ParentLocationRemoteId.php | 12 +- .../Input/Parser/Criterion/SectionId.php | 8 +- .../Parser/Criterion/SectionIdentifier.php | 2 +- .../Server/Input/Parser/Criterion/Sibling.php | 6 +- .../Server/Input/Parser/Criterion/Subtree.php | 8 +- .../Input/Parser/Criterion/UserEmail.php | 4 +- .../Server/Input/Parser/Criterion/UserId.php | 2 +- .../Input/Parser/Criterion/UserLogin.php | 4 +- .../Input/Parser/Criterion/UserMetadata.php | 8 +- .../Input/Parser/Criterion/Visibility.php | 8 +- .../Parser/FacetBuilder/ContentTypeParser.php | 8 +- .../Parser/FacetBuilder/CriterionParser.php | 8 +- .../Parser/FacetBuilder/DateRangeParser.php | 8 +- .../Input/Parser/FacetBuilder/FieldParser.php | 8 +- .../Parser/FacetBuilder/FieldRangeParser.php | 6 +- .../Parser/FacetBuilder/LocationParser.php | 8 +- .../Parser/FacetBuilder/SectionParser.php | 8 +- .../Input/Parser/FacetBuilder/TermParser.php | 8 +- .../Input/Parser/FacetBuilder/UserParser.php | 8 +- .../Input/Parser/FieldDefinitionCreate.php | 20 +-- .../Input/Parser/FieldDefinitionUpdate.php | 22 ++-- .../PathStringRouteBasedLimitationParser.php | 4 +- .../Limitation/RouteBasedLimitationParser.php | 8 +- .../Server/Input/Parser/LocationCreate.php | 14 +- src/lib/Server/Input/Parser/LocationQuery.php | 2 +- .../Server/Input/Parser/LocationUpdate.php | 14 +- .../Server/Input/Parser/ObjectStateCreate.php | 14 +- .../Input/Parser/ObjectStateGroupCreate.php | 14 +- .../Input/Parser/ObjectStateGroupUpdate.php | 14 +- .../Server/Input/Parser/ObjectStateUpdate.php | 14 +- src/lib/Server/Input/Parser/PolicyCreate.php | 14 +- src/lib/Server/Input/Parser/PolicyUpdate.php | 14 +- src/lib/Server/Input/Parser/Query.php | 16 +-- .../Server/Input/Parser/RelationCreate.php | 2 +- .../Server/Input/Parser/RoleAssignInput.php | 8 +- src/lib/Server/Input/Parser/RoleInput.php | 14 +- src/lib/Server/Input/Parser/SectionInput.php | 10 +- src/lib/Server/Input/Parser/SessionInput.php | 4 +- .../SortClause/DataKeyValueObjectClass.php | 6 +- .../Server/Input/Parser/SortClause/Field.php | 8 +- .../Server/Input/Parser/URLAliasCreate.php | 6 +- .../Server/Input/Parser/URLWildcardCreate.php | 6 +- src/lib/Server/Input/Parser/UserCreate.php | 24 ++-- .../Server/Input/Parser/UserGroupCreate.php | 20 +-- .../Server/Input/Parser/UserGroupUpdate.php | 26 ++-- src/lib/Server/Input/Parser/UserUpdate.php | 24 ++-- src/lib/Server/Input/Parser/VersionUpdate.php | 14 +- src/lib/Server/Input/Parser/ViewInput.php | 6 +- .../Input/Parser/ViewInputOneDotOne.php | 6 +- .../Output/ValueObjectVisitor/Author.php | 2 +- .../Output/ValueObjectVisitor/CachedValue.php | 12 +- .../ContentFieldValidationException.php | 10 +- .../Output/ValueObjectVisitor/ContentList.php | 6 +- .../Output/ValueObjectVisitor/ContentType.php | 2 +- .../ValueObjectVisitor/ContentTypeGroup.php | 8 +- .../ContentTypeGroupList.php | 6 +- .../ContentTypeGroupRefList.php | 6 +- .../ContentTypeInfoList.php | 6 +- .../ValueObjectVisitor/ContentTypeList.php | 6 +- .../Output/ValueObjectVisitor/CountryList.php | 6 +- .../ValueObjectVisitor/CreatedContent.php | 6 +- .../ValueObjectVisitor/CreatedContentType.php | 6 +- .../CreatedContentTypeGroup.php | 6 +- .../CreatedFieldDefinition.php | 6 +- .../ValueObjectVisitor/CreatedLocation.php | 6 +- .../ValueObjectVisitor/CreatedObjectState.php | 6 +- .../CreatedObjectStateGroup.php | 6 +- .../ValueObjectVisitor/CreatedPolicy.php | 6 +- .../ValueObjectVisitor/CreatedRelation.php | 6 +- .../Output/ValueObjectVisitor/CreatedRole.php | 6 +- .../ValueObjectVisitor/CreatedSection.php | 6 +- .../ValueObjectVisitor/CreatedURLAlias.php | 6 +- .../ValueObjectVisitor/CreatedURLWildcard.php | 6 +- .../Output/ValueObjectVisitor/CreatedUser.php | 6 +- .../ValueObjectVisitor/CreatedUserGroup.php | 6 +- .../ValueObjectVisitor/CreatedVersion.php | 6 +- .../ValueObjectVisitor/DeletedUserSession.php | 6 +- .../Output/ValueObjectVisitor/Exception.php | 6 +- .../FieldDefinitionList.php | 6 +- .../ValueObjectVisitor/ImageVariation.php | 4 +- .../Output/ValueObjectVisitor/Language.php | 4 +- .../Output/ValueObjectVisitor/Location.php | 12 +- .../ValueObjectVisitor/LocationList.php | 6 +- .../Output/ValueObjectVisitor/NoContent.php | 6 +- .../Output/ValueObjectVisitor/ObjectState.php | 2 +- .../ValueObjectVisitor/ObjectStateGroup.php | 8 +- .../ObjectStateGroupList.php | 6 +- .../ValueObjectVisitor/ObjectStateList.php | 6 +- .../ValueObjectVisitor/PermanentRedirect.php | 6 +- .../Output/ValueObjectVisitor/Policy.php | 10 +- .../Output/ValueObjectVisitor/PolicyList.php | 6 +- .../ValueObjectVisitor/PublishedRole.php | 6 +- .../Output/ValueObjectVisitor/Range.php | 2 +- .../RangeAggregationResult.php | 6 +- .../ValueObjectVisitor/RelationList.php | 6 +- .../ValueObjectVisitor/ResourceCreated.php | 6 +- .../Output/ValueObjectVisitor/RestContent.php | 16 +-- .../ValueObjectVisitor/RestContentType.php | 8 +- .../RestContentTypeBase.php | 2 +- .../ValueObjectVisitor/RestExecutedView.php | 26 ++-- .../RestFieldDefinition.php | 12 +- .../ValueObjectVisitor/RestLocation.php | 6 +- .../ValueObjectVisitor/RestObjectState.php | 6 +- .../ValueObjectVisitor/RestRelation.php | 8 +- .../ValueObjectVisitor/RestTrashItem.php | 6 +- .../Output/ValueObjectVisitor/RestUser.php | 6 +- .../ValueObjectVisitor/RestUserGroup.php | 6 +- .../RestUserGroupRoleAssignment.php | 8 +- .../RestUserRoleAssignment.php | 8 +- .../Server/Output/ValueObjectVisitor/Role.php | 8 +- .../ValueObjectVisitor/RoleAssignmentList.php | 6 +- .../Output/ValueObjectVisitor/RoleList.php | 6 +- .../Server/Output/ValueObjectVisitor/Root.php | 6 +- .../Output/ValueObjectVisitor/Section.php | 8 +- .../Output/ValueObjectVisitor/SectionList.php | 6 +- .../StatsAggregationResult.php | 2 +- .../ValueObjectVisitor/TemporaryRedirect.php | 6 +- .../TermAggregationResult.php | 4 +- .../Output/ValueObjectVisitor/Trash.php | 6 +- .../Output/ValueObjectVisitor/URLAlias.php | 10 +- .../ValueObjectVisitor/URLAliasList.php | 6 +- .../ValueObjectVisitor/URLAliasRefList.php | 6 +- .../Output/ValueObjectVisitor/URLWildcard.php | 8 +- .../ValueObjectVisitor/URLWildcardList.php | 6 +- .../Server/Output/ValueObjectVisitor/User.php | 6 +- .../Output/ValueObjectVisitor/UserGroup.php | 6 +- .../ValueObjectVisitor/UserGroupList.php | 6 +- .../ValueObjectVisitor/UserGroupRefList.php | 6 +- .../Output/ValueObjectVisitor/UserList.php | 6 +- .../Output/ValueObjectVisitor/UserRefList.php | 6 +- .../Output/ValueObjectVisitor/UserSession.php | 6 +- .../Output/ValueObjectVisitor/Version.php | 24 ++-- .../Output/ValueObjectVisitor/VersionInfo.php | 10 +- .../Output/ValueObjectVisitor/VersionList.php | 6 +- .../VersionTranslationInfo.php | 6 +- src/lib/Server/Security/CsrfTokenManager.php | 2 +- .../EventListener/SecurityListener.php | 6 +- src/lib/Server/Security/RestAuthenticator.php | 12 +- src/lib/Server/Security/RestLogoutHandler.php | 6 +- .../ExpressionRouterRootResourceBuilder.php | 6 +- .../Service/RootResourceBuilderInterface.php | 2 +- src/lib/Server/Values/BookmarkList.php | 4 +- src/lib/Server/Values/CachedValue.php | 2 +- src/lib/Server/Values/ContentList.php | 4 +- .../Server/Values/ContentTypeGroupList.php | 4 +- .../Server/Values/ContentTypeGroupRefList.php | 10 +- src/lib/Server/Values/ContentTypeInfoList.php | 4 +- src/lib/Server/Values/ContentTypeList.php | 4 +- src/lib/Server/Values/CountryList.php | 2 +- src/lib/Server/Values/CreatedContent.php | 4 +- src/lib/Server/Values/CreatedContentType.php | 4 +- .../Server/Values/CreatedContentTypeGroup.php | 4 +- .../Server/Values/CreatedFieldDefinition.php | 4 +- src/lib/Server/Values/CreatedLocation.php | 4 +- src/lib/Server/Values/CreatedObjectState.php | 4 +- .../Server/Values/CreatedObjectStateGroup.php | 4 +- src/lib/Server/Values/CreatedPolicy.php | 4 +- src/lib/Server/Values/CreatedRelation.php | 4 +- src/lib/Server/Values/CreatedRole.php | 4 +- src/lib/Server/Values/CreatedSection.php | 4 +- src/lib/Server/Values/CreatedURLAlias.php | 4 +- src/lib/Server/Values/CreatedURLWildcard.php | 4 +- src/lib/Server/Values/CreatedUser.php | 4 +- src/lib/Server/Values/CreatedUserGroup.php | 4 +- src/lib/Server/Values/CreatedVersion.php | 4 +- src/lib/Server/Values/DeletedUserSession.php | 2 +- src/lib/Server/Values/FieldDefinitionList.php | 10 +- src/lib/Server/Values/LocationList.php | 4 +- .../Server/Values/ObjectStateGroupList.php | 4 +- src/lib/Server/Values/ObjectStateList.php | 4 +- src/lib/Server/Values/Options.php | 2 +- src/lib/Server/Values/PolicyList.php | 4 +- src/lib/Server/Values/PublishedRole.php | 4 +- src/lib/Server/Values/RelationList.php | 4 +- src/lib/Server/Values/RestContent.php | 28 ++-- .../Server/Values/RestContentCreateStruct.php | 14 +- src/lib/Server/Values/RestContentType.php | 10 +- src/lib/Server/Values/RestExecutedView.php | 4 +- src/lib/Server/Values/RestFieldDefinition.php | 12 +- src/lib/Server/Values/RestLocation.php | 6 +- .../Values/RestLocationUpdateStruct.php | 6 +- src/lib/Server/Values/RestRelation.php | 6 +- src/lib/Server/Values/RestRole.php | 6 +- src/lib/Server/Values/RestTrashItem.php | 6 +- src/lib/Server/Values/RestUser.php | 26 ++-- src/lib/Server/Values/RestUserGroup.php | 28 ++-- .../Values/RestUserGroupRoleAssignment.php | 6 +- .../Values/RestUserGroupUpdateStruct.php | 6 +- .../Server/Values/RestUserRoleAssignment.php | 6 +- .../Server/Values/RestUserUpdateStruct.php | 6 +- src/lib/Server/Values/RestViewInput.php | 2 +- src/lib/Server/Values/RoleAssignment.php | 6 +- src/lib/Server/Values/RoleAssignmentList.php | 4 +- src/lib/Server/Values/RoleList.php | 4 +- src/lib/Server/Values/SectionList.php | 4 +- src/lib/Server/Values/SessionInput.php | 2 +- src/lib/Server/Values/Trash.php | 4 +- src/lib/Server/Values/URLAliasList.php | 4 +- src/lib/Server/Values/URLAliasRefList.php | 4 +- src/lib/Server/Values/URLWildcardList.php | 4 +- src/lib/Server/Values/UserGroupList.php | 4 +- src/lib/Server/Values/UserGroupRefList.php | 4 +- src/lib/Server/Values/UserList.php | 4 +- src/lib/Server/Values/UserRefList.php | 4 +- src/lib/Server/Values/UserSession.php | 6 +- src/lib/Server/Values/Version.php | 16 +-- src/lib/Server/Values/VersionList.php | 4 +- .../Server/Values/VersionTranslationInfo.php | 8 +- .../View/AcceptHeaderVisitorDispatcher.php | 8 +- .../RestContentMetadataUpdateStruct.php | 2 +- src/lib/Values/RestObjectState.php | 6 +- tests/bundle/CorsOptions/RestProviderTest.php | 4 +- .../bundle/EventListener/CsrfListenerTest.php | 16 +-- .../EventListener/EventListenerTest.php | 18 +-- .../EventListener/RequestListenerTest.php | 6 +- .../EventListener/ResponseListenerTest.php | 20 +-- .../Functional/SearchView/SearchViewTest.php | 4 +- tests/bundle/RequestParser/RouterTest.php | 2 +- .../Routing/OptionsLoader/MapperTest.php | 2 +- .../RouteCollectionMapperTest.php | 4 +- tests/bundle/Routing/OptionsLoaderTest.php | 4 +- .../AuthorProcessorTest.php | 2 +- .../BinaryInputProcessorTest.php | 2 +- .../BinaryProcessorTest.php | 2 +- .../DateAndTimeProcessorTest.php | 2 +- .../FieldTypeProcessor/DateProcessorTest.php | 2 +- .../FieldTypeProcessor/ImageProcessorTest.php | 4 +- .../FieldTypeProcessor/MediaProcessorTest.php | 2 +- .../RelationListProcessorTest.php | 6 +- .../RelationProcessorTest.php | 6 +- .../FieldTypeProcessor/TimeProcessorTest.php | 2 +- tests/lib/FieldTypeProcessorRegistryTest.php | 2 +- tests/lib/Input/FieldTypeParserTest.php | 14 +- tests/lib/Input/ParsingDispatcherTest.php | 4 +- tests/lib/Output/FieldTypeSerializerTest.php | 10 +- .../FieldTypeHashGeneratorBaseTest.php | 2 +- .../Json/FieldTypeHashGeneratorTest.php | 4 +- .../Xml/FieldTypeHashGeneratorTest.php | 4 +- tests/lib/Output/GeneratorTest.php | 4 +- .../lib/Output/ValueObjectVisitorBaseTest.php | 14 +- .../ValueObjectVisitorDispatcherTest.php | 2 +- tests/lib/Output/VisitorTest.php | 2 +- tests/lib/Server/Input/Parser/BaseTest.php | 14 +- .../Server/Input/Parser/ContentCreateTest.php | 28 ++-- .../Input/Parser/ContentObjectStatesTest.php | 2 +- .../Input/Parser/ContentTypeCreateTest.php | 14 +- .../Parser/ContentTypeGroupInputTest.php | 8 +- .../Input/Parser/ContentTypeUpdateTest.php | 10 +- .../Server/Input/Parser/ContentUpdateTest.php | 8 +- .../Parser/Criterion/DateMetadataTest.php | 4 +- .../Input/Parser/Criterion/LogicalAndTest.php | 4 +- .../Input/Parser/Criterion/LogicalOrTest.php | 4 +- .../Input/Parser/Criterion/SiblingTest.php | 8 +- .../Parser/Criterion/UserMetadataTest.php | 6 +- .../FacetBuilder/FacetBuilderBaseTest.php | 4 +- .../FacetBuilder/FacetBuilderParserTest.php | 18 +-- .../Parser/FieldDefinitionCreateTest.php | 10 +- .../Parser/FieldDefinitionUpdateTest.php | 18 +-- ...thStringRouteBasedLimitationParserTest.php | 2 +- .../RouteBasedLimitationParserTest.php | 2 +- .../Input/Parser/LocationCreateTest.php | 10 +- .../Input/Parser/LocationUpdateTest.php | 10 +- .../Input/Parser/ObjectStateCreateTest.php | 8 +- .../Parser/ObjectStateGroupCreateTest.php | 8 +- .../Parser/ObjectStateGroupUpdateTest.php | 8 +- .../Input/Parser/ObjectStateUpdateTest.php | 8 +- .../Server/Input/Parser/PolicyCreateTest.php | 10 +- .../Server/Input/Parser/PolicyUpdateTest.php | 10 +- .../Server/Input/Parser/QueryParserTest.php | 2 +- .../Input/Parser/RelationCreateTest.php | 2 +- .../Input/Parser/RoleAssignInputTest.php | 6 +- .../lib/Server/Input/Parser/RoleInputTest.php | 8 +- .../Server/Input/Parser/SectionInputTest.php | 8 +- .../Server/Input/Parser/SessionInputTest.php | 2 +- .../DataKeyValueObjectClassTest.php | 6 +- .../Input/Parser/SortClause/FieldTest.php | 6 +- .../Input/Parser/URLWildcardCreateTest.php | 2 +- .../Server/Input/Parser/UserCreateTest.php | 26 ++-- .../Input/Parser/UserGroupCreateTest.php | 28 ++-- .../Input/Parser/UserGroupUpdateTest.php | 30 ++--- .../Server/Input/Parser/UserUpdateTest.php | 22 ++-- .../Server/Input/Parser/VersionUpdateTest.php | 14 +- .../Input/Parser/ViewInputOneDotOneTest.php | 6 +- .../lib/Server/Input/Parser/ViewInputTest.php | 4 +- .../BadRequestExceptionTest.php | 2 +- .../BadStateExceptionTest.php | 4 +- .../ValueObjectVisitor/BookmarkListTest.php | 4 +- .../ValueObjectVisitor/CachedValueTest.php | 8 +- .../ValueObjectVisitor/ConflictTest.php | 2 +- .../ContentFieldValidationExceptionTest.php | 6 +- .../ValueObjectVisitor/ContentListTest.php | 4 +- .../ContentObjectStatesTest.php | 2 +- .../ContentTypeGroupListTest.php | 6 +- .../ContentTypeGroupRefListTest.php | 6 +- .../ContentTypeGroupTest.php | 4 +- .../ContentTypeInfoListTest.php | 4 +- .../ContentTypeListTest.php | 4 +- .../ValueObjectVisitor/CountryListTest.php | 2 +- .../ValueObjectVisitor/ExceptionTest.php | 4 +- .../FieldDefinitionListTest.php | 4 +- .../ForbiddenExceptionTest.php | 2 +- .../ValueObjectVisitor/ImageVariationTest.php | 4 +- .../InvalidArgumentExceptionTest.php | 2 +- .../ValueObjectVisitor/LocationListTest.php | 2 +- .../ValueObjectVisitor/NoContentTest.php | 2 +- .../NotFoundExceptionTest.php | 4 +- .../NotImplementedExceptionTest.php | 4 +- .../ObjectStateGroupListTest.php | 6 +- .../ObjectStateGroupTest.php | 4 +- .../ObjectStateListTest.php | 4 +- .../Output/ValueObjectVisitor/OptionsTest.php | 2 +- .../PermanentRedirectTest.php | 2 +- .../ValueObjectVisitor/PolicyListTest.php | 6 +- .../Output/ValueObjectVisitor/PolicyTest.php | 6 +- .../ValueObjectVisitor/RelationListTest.php | 4 +- .../ResourceCreatedTest.php | 2 +- .../ValueObjectVisitor/RestContentTest.php | 12 +- .../RestContentTypeTest.php | 4 +- .../RestExecutedViewTest.php | 30 ++--- .../RestFieldDefinitionTest.php | 4 +- .../RestLocationRootNodeTest.php | 6 +- .../ValueObjectVisitor/RestLocationTest.php | 6 +- .../RestObjectStateTest.php | 4 +- .../ValueObjectVisitor/RestRelationTest.php | 6 +- .../ValueObjectVisitor/RestTrashItemTest.php | 6 +- .../RestUserGroupRoleAssignmentTest.php | 4 +- .../ValueObjectVisitor/RestUserGroupTest.php | 8 +- .../RestUserRoleAssignmentTest.php | 4 +- .../ValueObjectVisitor/RestUserTest.php | 8 +- .../RoleAssignmentListTest.php | 4 +- .../ValueObjectVisitor/RoleListTest.php | 6 +- .../Output/ValueObjectVisitor/RoleTest.php | 4 +- .../Output/ValueObjectVisitor/RootTest.php | 4 +- .../ValueObjectVisitor/SectionListTest.php | 4 +- .../Output/ValueObjectVisitor/SectionTest.php | 4 +- .../TemporaryRedirectTest.php | 2 +- .../Output/ValueObjectVisitor/TrashTest.php | 4 +- .../ValueObjectVisitor/URLAliasListTest.php | 4 +- .../URLAliasRefListTest.php | 4 +- .../ValueObjectVisitor/URLAliasTest.php | 4 +- .../URLWildcardListTest.php | 4 +- .../ValueObjectVisitor/URLWildcardTest.php | 4 +- .../UnauthorizedExceptionTest.php | 4 +- .../ValueObjectVisitor/UserGroupListTest.php | 10 +- .../UserGroupRefListTest.php | 10 +- .../ValueObjectVisitor/UserListTest.php | 10 +- .../ValueObjectVisitor/UserRefListTest.php | 10 +- .../ValueObjectVisitor/UserSessionTest.php | 4 +- .../ValueObjectVisitor/VersionInfoTest.php | 6 +- .../ValueObjectVisitor/VersionListTest.php | 8 +- .../Output/ValueObjectVisitor/VersionTest.php | 10 +- .../Server/Security/RestLogoutHandlerTest.php | 2 +- .../RestSessionBasedAuthenticatorTest.php | 10 +- .../Server/Security/SecurityListenerTest.php | 8 +- tests/lib/UrlHandler/PatternTest.php | 4 +- 477 files changed, 2036 insertions(+), 2036 deletions(-) diff --git a/composer.json b/composer.json index 0925c191..c765e001 100644 --- a/composer.json +++ b/composer.json @@ -24,13 +24,13 @@ } }, "require": { - "php": "^7.3", + "php": "^7.4", "ext-dom": "*", "ext-json": "*", "ext-libxml": "*", "ext-simplexml": "*", "ext-xmlwriter": "*", - "ezsystems/ezplatform-kernel": "^4.0@dev", + "ibexa/core": "^4.0@dev", "symfony/http-kernel": "^5.3", "symfony/dependency-injection": "^5.3", "symfony/routing": "^5.3", @@ -47,8 +47,8 @@ }, "require-dev": { "ibexa/ci-scripts": "^0.2@dev", - "ezsystems/doctrine-dbal-schema": "^4.0@dev", - "ezsystems/ezplatform-code-style": "^0.1.0", + "ibexa/doctrine-dbal-schema": "^4.0@dev", + "ibexa/code-style": "^1.0", "friendsofphp/php-cs-fixer": "^2.16.0", "phpunit/phpunit": "^8.5", "matthiasnoback/symfony-dependency-injection-test": "^4.1", diff --git a/src/bundle/ApiLoader/Factory.php b/src/bundle/ApiLoader/Factory.php index 01605a5f..10f437d0 100644 --- a/src/bundle/ApiLoader/Factory.php +++ b/src/bundle/ApiLoader/Factory.php @@ -6,9 +6,9 @@ */ namespace Ibexa\Bundle\Rest\ApiLoader; -use eZ\Publish\Core\MVC\ConfigResolverInterface; -use eZ\Publish\Core\MVC\Symfony\RequestStackAware; -use eZ\Publish\API\Repository\Repository; +use Ibexa\Core\MVC\ConfigResolverInterface; +use Ibexa\Core\MVC\Symfony\RequestStackAware; +use Ibexa\Contracts\Core\Repository\Repository; use Ibexa\Rest\FieldTypeProcessor\BinaryProcessor; use Ibexa\Rest\FieldTypeProcessor\ImageAssetFieldTypeProcessor; use Ibexa\Rest\FieldTypeProcessor\ImageProcessor; @@ -20,18 +20,18 @@ class Factory use RequestStackAware; /** - * @var \eZ\Publish\Core\MVC\ConfigResolverInterface + * @var \Ibexa\Core\MVC\ConfigResolverInterface */ protected $configResolver; /** - * @var \eZ\Publish\API\Repository\Repository + * @var \Ibexa\Contracts\Core\Repository\Repository */ protected $repository; /** - * @param \eZ\Publish\Core\MVC\ConfigResolverInterface $configResolver - * @param \eZ\Publish\API\Repository\Repository $repository + * @param \Ibexa\Core\MVC\ConfigResolverInterface $configResolver + * @param \Ibexa\Contracts\Core\Repository\Repository $repository */ public function __construct(ConfigResolverInterface $configResolver, Repository $repository) { @@ -57,7 +57,7 @@ public function getMediaFieldTypeProcessor() * * @param \Symfony\Component\Routing\RouterInterface $router * - * @return \EzSystems\EzPlatformRest\FieldTypeProcessor\ImageProcessor + * @return \Ibexa\Rest\FieldTypeProcessor\ImageProcessor */ public function getImageFieldTypeProcessor(RouterInterface $router) { diff --git a/src/bundle/CorsOptions/RestProvider.php b/src/bundle/CorsOptions/RestProvider.php index b484b39a..401e3957 100644 --- a/src/bundle/CorsOptions/RestProvider.php +++ b/src/bundle/CorsOptions/RestProvider.php @@ -19,11 +19,11 @@ */ class RestProvider implements ProviderInterface { - /** @var RequestMatcherInterface */ + /** @var \Symfony\Component\Routing\Matcher\RequestMatcherInterface */ protected $requestMatcher; /** - * @param RequestMatcherInterface $requestMatcher + * @param \Symfony\Component\Routing\Matcher\RequestMatcherInterface $requestMatcher */ public function __construct(RequestMatcherInterface $requestMatcher) { diff --git a/src/bundle/DependencyInjection/Compiler/FieldTypeProcessorPass.php b/src/bundle/DependencyInjection/Compiler/FieldTypeProcessorPass.php index db2a1a40..62867b35 100644 --- a/src/bundle/DependencyInjection/Compiler/FieldTypeProcessorPass.php +++ b/src/bundle/DependencyInjection/Compiler/FieldTypeProcessorPass.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Bundle\Rest\DependencyInjection\Compiler; -use eZ\Publish\Core\Base\Container\Compiler\TaggedServiceIdsIterator\BackwardCompatibleIterator; +use Ibexa\Core\Base\Container\Compiler\TaggedServiceIdsIterator\BackwardCompatibleIterator; use LogicException; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; use Symfony\Component\DependencyInjection\ContainerBuilder; diff --git a/src/bundle/DependencyInjection/Configuration.php b/src/bundle/DependencyInjection/Configuration.php index c787f9a1..17060909 100644 --- a/src/bundle/DependencyInjection/Configuration.php +++ b/src/bundle/DependencyInjection/Configuration.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Bundle\Rest\DependencyInjection; -use eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Configuration\SiteAccessAware\Configuration as SiteAccessConfiguration; +use Ibexa\Bundle\Core\DependencyInjection\Configuration\SiteAccessAware\Configuration as SiteAccessConfiguration; use Symfony\Component\Config\Definition\Builder\TreeBuilder; class Configuration extends SiteAccessConfiguration diff --git a/src/bundle/DependencyInjection/IbexaRestExtension.php b/src/bundle/DependencyInjection/IbexaRestExtension.php index 426e9c8f..a776d83d 100644 --- a/src/bundle/DependencyInjection/IbexaRestExtension.php +++ b/src/bundle/DependencyInjection/IbexaRestExtension.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Bundle\Rest\DependencyInjection; -use eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Configuration\SiteAccessAware\ConfigurationProcessor; +use Ibexa\Bundle\Core\DependencyInjection\Configuration\SiteAccessAware\ConfigurationProcessor; use Symfony\Component\Config\FileLocator; use Symfony\Component\Config\Resource\FileResource; use Symfony\Component\DependencyInjection\ContainerBuilder; @@ -63,7 +63,7 @@ public function prepend(ContainerBuilder $container) private function prependRouterConfiguration(ContainerBuilder $container) { $config = ['router' => ['default_router' => ['non_siteaccess_aware_routes' => ['ezpublish_rest_']]]]; - $container->prependExtensionConfig('ezpublish', $config); + $container->prependExtensionConfig('ibexa', $config); } } diff --git a/src/bundle/EventListener/CsrfListener.php b/src/bundle/EventListener/CsrfListener.php index b29faa56..0efbc620 100644 --- a/src/bundle/EventListener/CsrfListener.php +++ b/src/bundle/EventListener/CsrfListener.php @@ -11,7 +11,7 @@ use Symfony\Component\HttpKernel\KernelEvents; use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\HttpKernel\Event\RequestEvent; -use eZ\Publish\Core\Base\Exceptions\UnauthorizedException; +use Ibexa\Core\Base\Exceptions\UnauthorizedException; use Ibexa\Bundle\Rest\RestEvents; use Symfony\Component\Security\Csrf\CsrfToken; use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface; @@ -24,7 +24,7 @@ class CsrfListener implements EventSubscriberInterface const CSRF_TOKEN_HEADER = 'X-CSRF-Token'; /** - * @var CsrfTokenManagerInterface|null + * @var \Symfony\Component\Security\Csrf\CsrfTokenManagerInterface|null */ private $csrfTokenManager; @@ -50,7 +50,7 @@ class CsrfListener implements EventSubscriberInterface * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $eventDispatcher * @param bool $csrfEnabled * @param string $csrfTokenIntention - * @param CsrfTokenManagerInterface|null $csrfTokenManager + * @param \Symfony\Component\Security\Csrf\CsrfTokenManagerInterface|null $csrfTokenManager */ public function __construct( EventDispatcherInterface $eventDispatcher, @@ -79,7 +79,7 @@ public static function getSubscribedEvents() * * @param \Symfony\Component\HttpKernel\Event\RequestEvent $event * - * @throws \eZ\Publish\Core\Base\Exceptions\UnauthorizedException + * @throws \Ibexa\Core\Base\Exceptions\UnauthorizedException */ public function onKernelRequest(RequestEvent $event) { @@ -161,7 +161,7 @@ protected function isSessionRoute($route) /** * Checks the validity of the request's csrf token header. * - * @param Request $request + * @param \Symfony\Component\HttpFoundation\Request $request * * @return bool true/false if the token is valid/invalid, false if none was found in the request's headers */ diff --git a/src/bundle/EventListener/ResponseListener.php b/src/bundle/EventListener/ResponseListener.php index e5e210f7..99652e71 100644 --- a/src/bundle/EventListener/ResponseListener.php +++ b/src/bundle/EventListener/ResponseListener.php @@ -20,7 +20,7 @@ class ResponseListener implements EventSubscriberInterface { /** - * @var AcceptHeaderVisitorDispatcher + * @var \Ibexa\Rest\Server\View\AcceptHeaderVisitorDispatcher */ private $viewDispatcher; diff --git a/src/bundle/RequestParser/Router.php b/src/bundle/RequestParser/Router.php index da2efd76..b80169f3 100644 --- a/src/bundle/RequestParser/Router.php +++ b/src/bundle/RequestParser/Router.php @@ -63,7 +63,7 @@ public function generate($type, array $values = []) } /** - * @throws \eZ\Publish\Core\Base\Exceptions\InvalidArgumentException If $attribute wasn't found in the match + * @throws \Ibexa\Core\Base\Exceptions\InvalidArgumentException If $attribute wasn't found in the match */ public function parseHref($href, $attribute) { @@ -81,7 +81,7 @@ public function parseHref($href, $attribute) * * @param array $match Match array returned by Router::match() / Router::matchRequest() * - * @throws \EzSystems\EzPlatformRest\Exceptions\InvalidArgumentException if the \$match isn't valid + * @throws \Ibexa\Contracts\Rest\Exceptions\InvalidArgumentException if the \$match isn't valid * * @return bool */ diff --git a/src/bundle/Resources/config/input_parsers.yml b/src/bundle/Resources/config/input_parsers.yml index a031c02b..44426023 100644 --- a/src/bundle/Resources/config/input_parsers.yml +++ b/src/bundle/Resources/config/input_parsers.yml @@ -575,7 +575,7 @@ services: class: '%ezpublish_rest.input.parser.internal.sortclause.data_key_value_object.class%' arguments: - 'ContentId' - - 'eZ\Publish\API\Repository\Values\Content\Query\SortClause\ContentId' + - 'Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause\ContentId' tags: - { name: ezpublish_rest.input.parser, mediaType: application/vnd.ez.api.internal.sortclause.ContentId } @@ -584,7 +584,7 @@ services: class: '%ezpublish_rest.input.parser.internal.sortclause.data_key_value_object.class%' arguments: - 'ContentName' - - 'eZ\Publish\API\Repository\Values\Content\Query\SortClause\ContentName' + - 'Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause\ContentName' tags: - { name: ezpublish_rest.input.parser, mediaType: application/vnd.ez.api.internal.sortclause.ContentName } @@ -593,7 +593,7 @@ services: class: '%ezpublish_rest.input.parser.internal.sortclause.data_key_value_object.class%' arguments: - 'DateModified' - - 'eZ\Publish\API\Repository\Values\Content\Query\SortClause\DateModified' + - 'Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause\DateModified' tags: - { name: ezpublish_rest.input.parser, mediaType: application/vnd.ez.api.internal.sortclause.DateModified } @@ -602,7 +602,7 @@ services: class: '%ezpublish_rest.input.parser.internal.sortclause.data_key_value_object.class%' arguments: - 'DatePublished' - - 'eZ\Publish\API\Repository\Values\Content\Query\SortClause\DatePublished' + - 'Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause\DatePublished' tags: - { name: ezpublish_rest.input.parser, mediaType: application/vnd.ez.api.internal.sortclause.DatePublished } @@ -611,7 +611,7 @@ services: class: '%ezpublish_rest.input.parser.internal.sortclause.data_key_value_object.class%' arguments: - 'LocationDepth' - - 'eZ\Publish\API\Repository\Values\Content\Query\SortClause\Location\Depth' + - 'Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause\Location\Depth' tags: - { name: ezpublish_rest.input.parser, mediaType: application/vnd.ez.api.internal.sortclause.LocationDepth } @@ -620,7 +620,7 @@ services: class: '%ezpublish_rest.input.parser.internal.sortclause.data_key_value_object.class%' arguments: - 'LocationPath' - - 'eZ\Publish\API\Repository\Values\Content\Query\SortClause\Location\Path' + - 'Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause\Location\Path' tags: - { name: ezpublish_rest.input.parser, mediaType: application/vnd.ez.api.internal.sortclause.LocationPath } @@ -629,7 +629,7 @@ services: class: '%ezpublish_rest.input.parser.internal.sortclause.data_key_value_object.class%' arguments: - 'LocationPriority' - - 'eZ\Publish\API\Repository\Values\Content\Query\SortClause\Location\Priority' + - 'Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause\Location\Priority' tags: - { name: ezpublish_rest.input.parser, mediaType: application/vnd.ez.api.internal.sortclause.LocationPriority } @@ -638,7 +638,7 @@ services: class: '%ezpublish_rest.input.parser.internal.sortclause.data_key_value_object.class%' arguments: - 'LocationId' - - 'eZ\Publish\API\Repository\Values\Content\Query\SortClause\Location\Id' + - 'Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause\Location\Id' tags: - { name: ezpublish_rest.input.parser, mediaType: application/vnd.ez.api.internal.sortclause.LocationId } @@ -647,7 +647,7 @@ services: class: '%ezpublish_rest.input.parser.internal.sortclause.data_key_value_object.class%' arguments: - 'SectionIdentifier' - - 'eZ\Publish\API\Repository\Values\Content\Query\SortClause\SectionIdentifier' + - 'Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause\SectionIdentifier' tags: - { name: ezpublish_rest.input.parser, mediaType: application/vnd.ez.api.internal.sortclause.SectionIdentifier } @@ -656,7 +656,7 @@ services: class: '%ezpublish_rest.input.parser.internal.sortclause.data_key_value_object.class%' arguments: - 'SectionName' - - 'eZ\Publish\API\Repository\Values\Content\Query\SortClause\SectionName' + - 'Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause\SectionName' tags: - { name: ezpublish_rest.input.parser, mediaType: application/vnd.ez.api.internal.sortclause.SectionName } @@ -665,7 +665,7 @@ services: class: 'Ibexa\Rest\Server\Input\Parser\SortClause\DataKeyValueObjectClass' arguments: - 'Score' - - 'eZ\Publish\API\Repository\Values\Content\Query\SortClause\Score' + - 'Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause\Score' tags: - { name: ezpublish_rest.input.parser, mediaType: application/vnd.ez.api.internal.sortclause.Score } @@ -880,7 +880,7 @@ services: - { name: ezpublish_rest.input.parser, mediaType: application/vnd.ez.api.internal.limitation.Subtree } arguments: - 'locationPath' - - 'eZ\Publish\API\Repository\Values\User\Limitation\SubtreeLimitation' + - 'Ibexa\Contracts\Core\Repository\Values\User\Limitation\SubtreeLimitation' ezpublish_rest.input.parser.internal.limitation.Section: parent: ezpublish_rest.input.parser @@ -889,4 +889,4 @@ services: - { name: ezpublish_rest.input.parser, mediaType: application/vnd.ez.api.internal.limitation.Section } arguments: - 'sectionId' - - 'eZ\Publish\API\Repository\Values\User\Limitation\SectionLimitation' + - 'Ibexa\Contracts\Core\Repository\Values\User\Limitation\SectionLimitation' diff --git a/src/bundle/Resources/config/security.yml b/src/bundle/Resources/config/security.yml index 6b541422..133509dc 100644 --- a/src/bundle/Resources/config/security.yml +++ b/src/bundle/Resources/config/security.yml @@ -32,6 +32,6 @@ services: Ibexa\Rest\Server\Security\EventListener\SecurityListener: arguments: - - '@eZ\Publish\API\Repository\PermissionResolver' + - '@Ibexa\Contracts\Core\Repository\PermissionResolver' tags: - { name: kernel.event_subscriber } diff --git a/src/bundle/Resources/config/services.yml b/src/bundle/Resources/config/services.yml index 0e485d45..5e07ba25 100644 --- a/src/bundle/Resources/config/services.yml +++ b/src/bundle/Resources/config/services.yml @@ -214,7 +214,7 @@ services: - "@ezpublish.api.service.location" - "@ezpublish.api.service.section" - "@ezpublish.api.repository" - - '@eZ\Publish\API\Repository\PermissionResolver' + - '@Ibexa\Contracts\Core\Repository\PermissionResolver' tags: [controller.service_arguments] ezpublish_rest.controller.url_wildcard: @@ -244,7 +244,7 @@ services: parent: ezpublish_rest.controller.base arguments: - "%ezpublish_rest.csrf_token_intention%" - - '@eZ\Publish\API\Repository\PermissionResolver' + - '@Ibexa\Contracts\Core\Repository\PermissionResolver' - '@ezpublish.api.service.user' - "@?ezpublish_rest.session_authenticator" - "@?ezpublish_rest.security.csrf.token_manager" @@ -428,7 +428,7 @@ services: ezpublish_rest.output.value_object_visitor.Exception.InvalidArgumentException: class: "%ezpublish_rest.output.value_object_visitor.Exception.InvalidArgumentException.class%" tags: - - { name: ezpublish_rest.output.value_object_visitor, type: \eZ\Publish\API\Repository\Exceptions\InvalidArgumentException } + - { name: ezpublish_rest.output.value_object_visitor, type: \Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException } ezpublish_rest.input.dispatcher: class: "%ezpublish_rest.input.dispatcher.class%" @@ -450,7 +450,7 @@ services: - { name: ezpublish_rest.input.handler, format: xml } ezpublish_rest.templated_router: - class: eZ\Bundle\EzPublishCoreBundle\Routing\DefaultRouter + class: Ibexa\Bundle\Core\Routing\DefaultRouter parent: hautelook.router.template calls: - [ setOption, [ strict_requirements, ~ ] ] diff --git a/src/bundle/Resources/config/value_object_visitors.yml b/src/bundle/Resources/config/value_object_visitors.yml index e48e0037..32f226c1 100644 --- a/src/bundle/Resources/config/value_object_visitors.yml +++ b/src/bundle/Resources/config/value_object_visitors.yml @@ -140,28 +140,28 @@ services: class: "%ezpublish_rest.output.value_object_visitor.InvalidArgumentException.class%" arguments: [ "%kernel.debug%", "@translator" ] tags: - - { name: ezpublish_rest.output.value_object_visitor, type: eZ\Publish\API\Repository\Exceptions\InvalidArgumentException } + - { name: ezpublish_rest.output.value_object_visitor, type: Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException } ezpublish_rest.output.value_object_visitor.NotFoundException: parent: ezpublish_rest.output.value_object_visitor.base class: "%ezpublish_rest.output.value_object_visitor.NotFoundException.class%" arguments: [ "%kernel.debug%", "@translator" ] tags: - - { name: ezpublish_rest.output.value_object_visitor, type: eZ\Publish\API\Repository\Exceptions\NotFoundException } + - { name: ezpublish_rest.output.value_object_visitor, type: Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException } ezpublish_rest.output.value_object_visitor.UnauthorizedException: parent: ezpublish_rest.output.value_object_visitor.base class: "%ezpublish_rest.output.value_object_visitor.UnauthorizedException.class%" arguments: [ "%kernel.debug%", "@translator" ] tags: - - { name: ezpublish_rest.output.value_object_visitor, type: eZ\Publish\API\Repository\Exceptions\UnauthorizedException } + - { name: ezpublish_rest.output.value_object_visitor, type: Ibexa\Contracts\Core\Repository\Exceptions\UnauthorizedException } ezpublish_rest.output.value_object_visitor.BadStateException: parent: ezpublish_rest.output.value_object_visitor.base class: "%ezpublish_rest.output.value_object_visitor.BadStateException.class%" arguments: [ "%kernel.debug%", "@translator" ] tags: - - { name: ezpublish_rest.output.value_object_visitor, type: eZ\Publish\API\Repository\Exceptions\BadStateException } + - { name: ezpublish_rest.output.value_object_visitor, type: Ibexa\Contracts\Core\Repository\Exceptions\BadStateException } ezpublish_rest.output.value_object_visitor.BadRequestException: parent: ezpublish_rest.output.value_object_visitor.base @@ -190,7 +190,7 @@ services: class: "%ezpublish_rest.output.value_object_visitor.NotImplementedException.class%" arguments: [ "%kernel.debug%", "@translator" ] tags: - - { name: ezpublish_rest.output.value_object_visitor, type: eZ\Publish\API\Repository\Exceptions\NotImplementedException } + - { name: ezpublish_rest.output.value_object_visitor, type: Ibexa\Contracts\Core\Repository\Exceptions\NotImplementedException } ezpublish_rest.output.value_object_visitor.Exception: parent: ezpublish_rest.output.value_object_visitor.base @@ -210,7 +210,7 @@ services: parent: ezpublish_rest.output.value_object_visitor.base class: Ibexa\Rest\Server\Output\ValueObjectVisitor\Language tags: - - { name: ezpublish_rest.output.value_object_visitor, type: eZ\Publish\API\Repository\Values\Content\Language } + - { name: ezpublish_rest.output.value_object_visitor, type: Ibexa\Contracts\Core\Repository\Values\Content\Language } # Section ezpublish_rest.output.value_object_visitor.SectionList: @@ -229,7 +229,7 @@ services: parent: ezpublish_rest.output.value_object_visitor.base class: "%ezpublish_rest.output.value_object_visitor.Section.class%" tags: - - { name: ezpublish_rest.output.value_object_visitor, type: eZ\Publish\API\Repository\Values\Content\Section } + - { name: ezpublish_rest.output.value_object_visitor, type: Ibexa\Contracts\Core\Repository\Values\Content\Section } # URLWildcard ezpublish_rest.output.value_object_visitor.URLWildcardList: @@ -242,7 +242,7 @@ services: parent: ezpublish_rest.output.value_object_visitor.base class: "%ezpublish_rest.output.value_object_visitor.URLWildcard.class%" tags: - - { name: ezpublish_rest.output.value_object_visitor, type: eZ\Publish\API\Repository\Values\Content\URLWildcard } + - { name: ezpublish_rest.output.value_object_visitor, type: Ibexa\Contracts\Core\Repository\Values\Content\URLWildcard } ezpublish_rest.output.value_object_visitor.CreatedURLWildcard: parent: ezpublish_rest.output.value_object_visitor.base @@ -267,7 +267,7 @@ services: parent: ezpublish_rest.output.value_object_visitor.base class: "%ezpublish_rest.output.value_object_visitor.URLAlias.class%" tags: - - { name: ezpublish_rest.output.value_object_visitor, type: eZ\Publish\API\Repository\Values\Content\URLAlias } + - { name: ezpublish_rest.output.value_object_visitor, type: Ibexa\Contracts\Core\Repository\Values\Content\URLAlias } ezpublish_rest.output.value_object_visitor.CreatedURLAlias: parent: ezpublish_rest.output.value_object_visitor.base @@ -280,7 +280,7 @@ services: parent: ezpublish_rest.output.value_object_visitor.base class: Ibexa\Rest\Server\Output\ValueObjectVisitor\Author tags: - - { name: ezpublish_rest.output.value_object_visitor, type: eZ\Publish\Core\FieldType\Author\Author } + - { name: ezpublish_rest.output.value_object_visitor, type: Ibexa\Core\FieldType\Author\Author } ezpublish_rest.output.value_object_visitor.ContentList: parent: ezpublish_rest.output.value_object_visitor.base @@ -319,13 +319,13 @@ services: parent: ezpublish_rest.output.value_object_visitor.base class: "%ezpublish_rest.output.value_object_visitor.VersionInfo.class%" tags: - - { name: ezpublish_rest.output.value_object_visitor, type: eZ\Publish\API\Repository\Values\Content\VersionInfo } + - { name: ezpublish_rest.output.value_object_visitor, type: Ibexa\Contracts\Core\Repository\Values\Content\VersionInfo } ezpublish_rest.output.value_object_visitor.ImageVariation: parent: ezpublish_rest.output.value_object_visitor.base class: "%ezpublish_rest.output.value_object_visitor.ImageVariation.class%" tags: - - { name: ezpublish_rest.output.value_object_visitor, type: eZ\Publish\SPI\Variation\Values\ImageVariation } + - { name: ezpublish_rest.output.value_object_visitor, type: Ibexa\Contracts\Core\Variation\Values\ImageVariation } ezpublish_rest.output.value_object_visitor.Version: parent: ezpublish_rest.output.value_object_visitor.base @@ -347,7 +347,7 @@ services: arguments: $contentService: '@ezpublish.api.service.content' tags: - - { name: ezpublish_rest.output.value_object_visitor, type: eZ\Publish\API\Repository\Values\User\UserGroup } + - { name: ezpublish_rest.output.value_object_visitor, type: Ibexa\Contracts\Core\Repository\Values\User\UserGroup } ezpublish_rest.output.value_object_visitor.RestUserGroup: parent: ezpublish_rest.output.value_object_visitor.base @@ -398,7 +398,7 @@ services: arguments: $contentService: '@ezpublish.api.service.content' tags: - - { name: ezpublish_rest.output.value_object_visitor, type: eZ\Publish\API\Repository\Values\User\User } + - { name: ezpublish_rest.output.value_object_visitor, type: Ibexa\Contracts\Core\Repository\Values\User\User } ezpublish_rest.output.value_object_visitor.RestUser: parent: ezpublish_rest.output.value_object_visitor.base @@ -428,7 +428,7 @@ services: parent: ezpublish_rest.output.value_object_visitor.base class: Ibexa\Rest\Server\Output\ValueObjectVisitor\ContentType tags: - - { name: ezpublish_rest.output.value_object_visitor, type: eZ\Publish\API\Repository\Values\ContentType\ContentType } + - { name: ezpublish_rest.output.value_object_visitor, type: Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType } ezpublish_rest.output.value_object_visitor.RestContentType: parent: ezpublish_rest.output.value_object_visitor.base @@ -458,7 +458,7 @@ services: parent: ezpublish_rest.output.value_object_visitor.base class: "%ezpublish_rest.output.value_object_visitor.ContentTypeGroup.class%" tags: - - { name: ezpublish_rest.output.value_object_visitor, type: eZ\Publish\API\Repository\Values\ContentType\ContentTypeGroup } + - { name: ezpublish_rest.output.value_object_visitor, type: Ibexa\Contracts\Core\Repository\Values\ContentType\ContentTypeGroup } ezpublish_rest.output.value_object_visitor.CreatedContentTypeGroup: parent: ezpublish_rest.output.value_object_visitor.base @@ -540,15 +540,15 @@ services: parent: ezpublish_rest.output.value_object_visitor.base class: "%ezpublish_rest.output.value_object_visitor.Role.class%" tags: - - { name: ezpublish_rest.output.value_object_visitor, type: eZ\Publish\API\Repository\Values\User\Role } - - { name: ezpublish_rest.output.value_object_visitor, type: eZ\Publish\API\Repository\Values\User\RoleDraft } + - { name: ezpublish_rest.output.value_object_visitor, type: Ibexa\Contracts\Core\Repository\Values\User\Role } + - { name: ezpublish_rest.output.value_object_visitor, type: Ibexa\Contracts\Core\Repository\Values\User\RoleDraft } ezpublish_rest.output.value_object_visitor.Policy: parent: ezpublish_rest.output.value_object_visitor.base class: "%ezpublish_rest.output.value_object_visitor.Policy.class%" tags: - - { name: ezpublish_rest.output.value_object_visitor, type: eZ\Publish\API\Repository\Values\User\Policy } - - { name: ezpublish_rest.output.value_object_visitor, type: eZ\Publish\API\Repository\Values\User\PolicyDraft } + - { name: ezpublish_rest.output.value_object_visitor, type: Ibexa\Contracts\Core\Repository\Values\User\Policy } + - { name: ezpublish_rest.output.value_object_visitor, type: Ibexa\Contracts\Core\Repository\Values\User\PolicyDraft } ezpublish_rest.output.value_object_visitor.CreatedPolicy: parent: ezpublish_rest.output.value_object_visitor.base @@ -597,7 +597,7 @@ services: parent: ezpublish_rest.output.value_object_visitor.base class: "%ezpublish_rest.output.value_object_visitor.Location.class%" tags: - - { name: ezpublish_rest.output.value_object_visitor, type: eZ\Publish\API\Repository\Values\Content\Location } + - { name: ezpublish_rest.output.value_object_visitor, type: Ibexa\Contracts\Core\Repository\Values\Content\Location } arguments: ["@ezpublish.api.service.location"] ezpublish_rest.output.value_object_visitor.LocationList: @@ -633,38 +633,38 @@ services: parent: ezpublish_rest.output.value_object_visitor.base class: Ibexa\Rest\Server\Output\ValueObjectVisitor\Range tags: - - { name: ezpublish_rest.output.value_object_visitor, type: eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Range } + - { name: ezpublish_rest.output.value_object_visitor, type: Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Range } ezpublish_rest.output.value_object_visitor.RangeAggregationResult: parent: ezpublish_rest.output.value_object_visitor.base class: Ibexa\Rest\Server\Output\ValueObjectVisitor\RangeAggregationResult tags: - - { name: ezpublish_rest.output.value_object_visitor, type: eZ\Publish\API\Repository\Values\Content\Search\AggregationResult\RangeAggregationResult } + - { name: ezpublish_rest.output.value_object_visitor, type: Ibexa\Contracts\Core\Repository\Values\Content\Search\AggregationResult\RangeAggregationResult } ezpublish_rest.output.value_object_visitor.StatsAggregationResult: parent: ezpublish_rest.output.value_object_visitor.base class: Ibexa\Rest\Server\Output\ValueObjectVisitor\StatsAggregationResult tags: - - { name: ezpublish_rest.output.value_object_visitor, type: eZ\Publish\API\Repository\Values\Content\Search\AggregationResult\StatsAggregationResult } + - { name: ezpublish_rest.output.value_object_visitor, type: Ibexa\Contracts\Core\Repository\Values\Content\Search\AggregationResult\StatsAggregationResult } ezpublish_rest.output.value_object_visitor.TermAggregationResult: parent: ezpublish_rest.output.value_object_visitor.base class: Ibexa\Rest\Server\Output\ValueObjectVisitor\TermAggregationResult tags: - - { name: ezpublish_rest.output.value_object_visitor, type: eZ\Publish\API\Repository\Values\Content\Search\AggregationResult\TermAggregationResult } + - { name: ezpublish_rest.output.value_object_visitor, type: Ibexa\Contracts\Core\Repository\Values\Content\Search\AggregationResult\TermAggregationResult } # Object state ezpublish_rest.output.value_object_visitor.ObjectState: parent: ezpublish_rest.output.value_object_visitor.base class: Ibexa\Rest\Server\Output\ValueObjectVisitor\ObjectState tags: - - { name: ezpublish_rest.output.value_object_visitor, type: eZ\Publish\API\Repository\Values\ObjectState\ObjectState } + - { name: ezpublish_rest.output.value_object_visitor, type: Ibexa\Contracts\Core\Repository\Values\ObjectState\ObjectState } ezpublish_rest.output.value_object_visitor.ObjectStateGroup: parent: ezpublish_rest.output.value_object_visitor.base class: "%ezpublish_rest.output.value_object_visitor.ObjectStateGroup.class%" tags: - - { name: ezpublish_rest.output.value_object_visitor, type: eZ\Publish\API\Repository\Values\ObjectState\ObjectStateGroup } + - { name: ezpublish_rest.output.value_object_visitor, type: Ibexa\Contracts\Core\Repository\Values\ObjectState\ObjectStateGroup } ezpublish_rest.output.value_object_visitor.CreatedObjectStateGroup: parent: ezpublish_rest.output.value_object_visitor.base diff --git a/src/bundle/Routing/OptionsLoader.php b/src/bundle/Routing/OptionsLoader.php index 376c1d10..52cdf260 100644 --- a/src/bundle/Routing/OptionsLoader.php +++ b/src/bundle/Routing/OptionsLoader.php @@ -28,7 +28,7 @@ public function __construct(RouteCollectionMapper $mapper) * @param mixed $resource * @param string $type * - * @return RouteCollection + * @return \Symfony\Component\Routing\RouteCollection */ public function load($resource, $type = null) { diff --git a/src/bundle/Routing/OptionsLoader/Mapper.php b/src/bundle/Routing/OptionsLoader/Mapper.php index 2d7da6ec..5289a2a4 100644 --- a/src/bundle/Routing/OptionsLoader/Mapper.php +++ b/src/bundle/Routing/OptionsLoader/Mapper.php @@ -16,7 +16,7 @@ class Mapper /** * @param $route Route REST route * - * @return Route + * @return \Symfony\Component\Routing\Route */ public function mapRoute(Route $route) { @@ -38,10 +38,10 @@ public function mapRoute(Route $route) /** * Merges the methods from $restRoute into the _method default of $optionsRoute. * - * @param Route $restRoute - * @param Route $optionsRoute + * @param \Symfony\Component\Routing\Route $restRoute + * @param \Symfony\Component\Routing\Route $optionsRoute * - * @return Route $optionsRoute with the methods from $restRoute in the _methods default + * @return \Symfony\Component\Routing\Route $optionsRoute with the methods from $restRoute in the _methods default */ public function mergeMethodsDefault(Route $optionsRoute, Route $restRoute) { diff --git a/src/bundle/Routing/OptionsLoader/RouteCollectionMapper.php b/src/bundle/Routing/OptionsLoader/RouteCollectionMapper.php index f20c5458..7f418403 100644 --- a/src/bundle/Routing/OptionsLoader/RouteCollectionMapper.php +++ b/src/bundle/Routing/OptionsLoader/RouteCollectionMapper.php @@ -28,9 +28,9 @@ public function __construct(Mapper $mapper) /** * Iterates over $restRouteCollection, and returns the corresponding RouteCollection of OPTIONS REST routes. * - * @param RouteCollection $restRouteCollection + * @param \Symfony\Component\Routing\RouteCollection $restRouteCollection * - * @return RouteCollection + * @return \Symfony\Component\Routing\RouteCollection */ public function mapCollection(RouteCollection $restRouteCollection) { diff --git a/src/contracts/Exceptions/InvalidArgumentException.php b/src/contracts/Exceptions/InvalidArgumentException.php index dc7a403a..1e6cb272 100644 --- a/src/contracts/Exceptions/InvalidArgumentException.php +++ b/src/contracts/Exceptions/InvalidArgumentException.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Contracts\Rest\Exceptions; -use eZ\Publish\API\Repository\Exceptions\InvalidArgumentException as APIInvalidArgumentException; +use Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException as APIInvalidArgumentException; /** * This exception is thrown if a service method is called with an illegal or non appropriate value. diff --git a/src/contracts/Exceptions/NotFoundException.php b/src/contracts/Exceptions/NotFoundException.php index 87d48da9..21ccc2b3 100644 --- a/src/contracts/Exceptions/NotFoundException.php +++ b/src/contracts/Exceptions/NotFoundException.php @@ -6,13 +6,13 @@ */ namespace Ibexa\Contracts\Rest\Exceptions; -use eZ\Publish\API\Repository\Exceptions\NotFoundException as APINotFoundException; +use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException as APINotFoundException; /** * Implementation of the {@link \eZ\Publish\API\Repository\Exceptions\NotFoundException} * interface. * - * @see \eZ\Publish\API\Repository\Exceptions\NotFoundException + * @see \Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException */ class NotFoundException extends APINotFoundException { diff --git a/src/contracts/FieldTypeProcessor.php b/src/contracts/FieldTypeProcessor.php index 9cb28e9a..80b59ab7 100644 --- a/src/contracts/FieldTypeProcessor.php +++ b/src/contracts/FieldTypeProcessor.php @@ -21,7 +21,7 @@ abstract class FieldTypeProcessor * apply to hashes accepted by fromHash(). The return value of this method * replaces the $incomingValueHash. * - * @see \EzSystems\EzPlatformRest\Input\FieldTypeParser + * @see \Ibexa\Rest\Input\FieldTypeParser * * @param mixed $incomingValueHash * @@ -42,7 +42,7 @@ public function preProcessValueHash($incomingValueHash) * $outgoingValueHash and must obey to the same rules as the original * $outgoingValueHash. * - * @see \EzSystems\EzPlatformRest\Output\FieldTypeSerializer + * @see \Ibexa\Rest\Output\FieldTypeSerializer * * @param mixed $outgoingValueHash * @@ -63,7 +63,7 @@ public function postProcessValueHash($outgoingValueHash) * need to apply to hashes accepted by fieldSettingsFromHash(). The return * value of this method replaces the $incomingSettingsHash. * - * @see \EzSystems\EzPlatformRest\Input\FieldTypeParser + * @see \Ibexa\Rest\Input\FieldTypeParser * * @param mixed $incomingSettingsHash * @@ -84,7 +84,7 @@ public function preProcessFieldSettingsHash($incomingSettingsHash) * $outgoingSettingsHash and must obey to the same rules as the original * $outgoingSettingsHash. * - * @see \EzSystems\EzPlatformRest\Output\FieldTypeSerializer + * @see \Ibexa\Rest\Output\FieldTypeSerializer * * @param mixed $outgoingSettingsHash * @@ -105,7 +105,7 @@ public function postProcessFieldSettingsHash($outgoingSettingsHash) * rules that need to apply to hashes accepted by validatorConfigurationFromHash(). * The return value of this method replaces the $incomingValidatorConfigurationHash. * - * @see \EzSystems\EzPlatformRest\Input\FieldTypeParser + * @see \Ibexa\Rest\Input\FieldTypeParser * * @param mixed $incomingValidatorConfigurationHash * @@ -126,7 +126,7 @@ public function preProcessValidatorConfigurationHash($incomingValidatorConfigura * $outgoingValidatorConfigurationHash and must obey to the same rules as the original * $outgoingValidatorConfigurationHash. * - * @see \EzSystems\EzPlatformRest\Output\FieldTypeSerializer + * @see \Ibexa\Rest\Output\FieldTypeSerializer * * @param mixed $outgoingValidatorConfigurationHash * diff --git a/src/contracts/Input/Parser.php b/src/contracts/Input/Parser.php index 022c6ebc..45f97d68 100644 --- a/src/contracts/Input/Parser.php +++ b/src/contracts/Input/Parser.php @@ -15,9 +15,9 @@ abstract class Parser * Parse input structure. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @return \eZ\Publish\API\Repository\Values\ValueObject + * @return \Ibexa\Contracts\Core\Repository\Values\ValueObject */ abstract public function parse(array $data, ParsingDispatcher $parsingDispatcher); } diff --git a/src/contracts/Input/ParsingDispatcher.php b/src/contracts/Input/ParsingDispatcher.php index f377aad2..a1351de8 100644 --- a/src/contracts/Input/ParsingDispatcher.php +++ b/src/contracts/Input/ParsingDispatcher.php @@ -27,7 +27,7 @@ class ParsingDispatcher * ) * * - * @var \EzSystems\EzPlatformRest\Input\Parser[] + * @var \Ibexa\Contracts\Rest\Input\Parser[] */ protected $parsers = []; @@ -47,7 +47,7 @@ public function __construct(array $parsers = []) * Adds another parser for the given Content Type. * * @param string $mediaType - * @param \EzSystems\EzPlatformRest\Input\Parser $parser + * @param \Ibexa\Contracts\Rest\Input\Parser $parser */ public function addParser($mediaType, Parser $parser) { @@ -61,7 +61,7 @@ public function addParser($mediaType, Parser $parser) * @param array $data * @param string $mediaType * - * @return \eZ\Publish\API\Repository\Values\ValueObject + * @return \Ibexa\Contracts\Core\Repository\Values\ValueObject */ public function parse(array $data, $mediaType) { diff --git a/src/contracts/Output/ValueObjectVisitor.php b/src/contracts/Output/ValueObjectVisitor.php index 8481ccad..377a5280 100644 --- a/src/contracts/Output/ValueObjectVisitor.php +++ b/src/contracts/Output/ValueObjectVisitor.php @@ -7,8 +7,8 @@ namespace Ibexa\Contracts\Rest\Output; use Ibexa\Rest\RequestParser; -use eZ\Publish\API\Repository\Values\User\Limitation; -use eZ\Publish\API\Repository\Values\Content\Location; +use Ibexa\Contracts\Core\Repository\Values\User\Limitation; +use Ibexa\Contracts\Core\Repository\Values\Content\Location; use Symfony\Component\Routing\RouterInterface; /** @@ -19,7 +19,7 @@ abstract class ValueObjectVisitor /** * URL handler for URL generation. * - * @var \EzSystems\EzPlatformRest\RequestParser + * @var \Ibexa\Rest\RequestParser */ protected $requestParser; @@ -36,8 +36,8 @@ abstract class ValueObjectVisitor /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator * @param mixed $data */ abstract public function visit(Visitor $visitor, Generator $generator, $data); @@ -63,7 +63,7 @@ public function setRequestParser(RequestParser $requestParser) /** * Returns a string representation for the given $boolValue. * - * @param \EzSystems\EzPlatformRest\Output\Generator $generator + * @param \Ibexa\Contracts\Rest\Output\Generator $generator * @param bool $boolValue * * @return mixed @@ -76,7 +76,7 @@ protected function serializeBool(Generator $generator, $boolValue) /** * Visits the given list of $names. * - * @param \EzSystems\EzPlatformRest\Output\Generator $generator + * @param \Ibexa\Contracts\Rest\Output\Generator $generator * @param array $names */ protected function visitNamesList(Generator $generator, array $names) @@ -87,7 +87,7 @@ protected function visitNamesList(Generator $generator, array $names) /** * Visits the given list of $descriptions. * - * @param \EzSystems\EzPlatformRest\Output\Generator $generator + * @param \Ibexa\Contracts\Rest\Output\Generator $generator * @param array $descriptions */ protected function visitDescriptionsList(Generator $generator, array $descriptions) @@ -98,7 +98,7 @@ protected function visitDescriptionsList(Generator $generator, array $descriptio /** * Visits a list of translated elements. * - * @param \EzSystems\EzPlatformRest\Output\Generator $generator + * @param \Ibexa\Contracts\Rest\Output\Generator $generator * @param array $translatedElements * @param mixed $listName */ @@ -117,8 +117,8 @@ protected function visitTranslatedList(Generator $generator, array $translatedEl /** * Visits a limitation. * - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \eZ\Publish\API\Repository\Values\User\Limitation $limitation + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Contracts\Core\Repository\Values\User\Limitation $limitation */ protected function visitLimitation(Generator $generator, Limitation $limitation) { diff --git a/src/contracts/Output/ValueObjectVisitorDispatcher.php b/src/contracts/Output/ValueObjectVisitorDispatcher.php index 35c9368b..acb003b9 100644 --- a/src/contracts/Output/ValueObjectVisitorDispatcher.php +++ b/src/contracts/Output/ValueObjectVisitorDispatcher.php @@ -19,12 +19,12 @@ class ValueObjectVisitorDispatcher private $visitors; /** - * @var \EzSystems\EzPlatformRest\Output\Visitor + * @var \Ibexa\Contracts\Rest\Output\Visitor */ private $outputVisitor; /** - * @var \EzSystems\EzPlatformRest\Output\Generator + * @var \Ibexa\Contracts\Rest\Output\Generator */ private $outputGenerator; @@ -40,7 +40,7 @@ public function setOutputGenerator(Generator $outputGenerator) /** * @param string $visitedClassName The FQN of the visited class - * @param \EzSystems\EzPlatformRest\Output\ValueObjectVisitor $visitor The visitor object + * @param \Ibexa\Contracts\Rest\Output\ValueObjectVisitor $visitor The visitor object */ public function addVisitor($visitedClassName, ValueObjectVisitor $visitor) { @@ -50,8 +50,8 @@ public function addVisitor($visitedClassName, ValueObjectVisitor $visitor) /** * @param object $data The visited object * - * @throws \EzSystems\EzPlatformRest\Output\Exceptions\NoVisitorFoundException - * @throws \EzSystems\EzPlatformRest\Output\Exceptions\InvalidTypeException + * @throws \Ibexa\Contracts\Rest\Output\Exceptions\NoVisitorFoundException + * @throws \Ibexa\Contracts\Rest\Output\Exceptions\InvalidTypeException * * @return mixed */ diff --git a/src/contracts/Output/Visitor.php b/src/contracts/Output/Visitor.php index 0bfa26ef..a47b3a4f 100644 --- a/src/contracts/Output/Visitor.php +++ b/src/contracts/Output/Visitor.php @@ -14,21 +14,21 @@ class Visitor { /** - * @var \EzSystems\EzPlatformRest\Output\ValueObjectVisitorDispatcher + * @var \Ibexa\Contracts\Rest\Output\ValueObjectVisitorDispatcher */ protected $valueObjectVisitorDispatcher = []; /** * Generator. * - * @var \EzSystems\EzPlatformRest\Output\Generator + * @var \Ibexa\Contracts\Rest\Output\Generator */ protected $generator; /** * HTTP Response Object. * - * @var Response + * @var \Symfony\Component\HttpFoundation\Response */ protected $response; @@ -42,8 +42,8 @@ class Visitor /** * Construct from Generator and an array of concrete view model visitors. * - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Output\ValueObjectVisitorDispatcher $valueObjectVisitorDispatcher + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Contracts\Rest\Output\ValueObjectVisitorDispatcher $valueObjectVisitorDispatcher * * @internal param array $visitors */ @@ -143,7 +143,7 @@ public function visitValueObject($data) * * @param string $type * - * @see \EzSystems\EzPlatformRest\Generator::getMediaType() + * @see \Ibexa\Rest\Generator::getMediaType() * * @return string */ @@ -153,7 +153,7 @@ public function getMediaType($type) } /** - * @return Response + * @return \Symfony\Component\HttpFoundation\Response */ public function getResponse() { diff --git a/src/lib/FieldTypeProcessor/AuthorProcessor.php b/src/lib/FieldTypeProcessor/AuthorProcessor.php index 409c0cfc..5e685431 100644 --- a/src/lib/FieldTypeProcessor/AuthorProcessor.php +++ b/src/lib/FieldTypeProcessor/AuthorProcessor.php @@ -7,7 +7,7 @@ namespace Ibexa\Rest\FieldTypeProcessor; use Ibexa\Contracts\Rest\FieldTypeProcessor; -use eZ\Publish\Core\FieldType\Author\Type; +use Ibexa\Core\FieldType\Author\Type; class AuthorProcessor extends FieldTypeProcessor { diff --git a/src/lib/FieldTypeProcessor/BaseRelationProcessor.php b/src/lib/FieldTypeProcessor/BaseRelationProcessor.php index 95594465..31dd5de3 100644 --- a/src/lib/FieldTypeProcessor/BaseRelationProcessor.php +++ b/src/lib/FieldTypeProcessor/BaseRelationProcessor.php @@ -6,8 +6,8 @@ */ namespace Ibexa\Rest\FieldTypeProcessor; -use eZ\Publish\API\Repository\LocationService; -use eZ\Publish\Core\FieldType\Relation\Type; +use Ibexa\Contracts\Core\Repository\LocationService; +use Ibexa\Core\FieldType\Relation\Type; use Ibexa\Contracts\Rest\FieldTypeProcessor; use Symfony\Component\Routing\RouterInterface; @@ -19,7 +19,7 @@ abstract class BaseRelationProcessor extends FieldTypeProcessor private $router; /** - * @var \eZ\Publish\API\Repository\LocationService + * @var \Ibexa\Contracts\Core\Repository\LocationService */ private $locationService; @@ -32,7 +32,7 @@ public function setRouter(RouterInterface $router) } /** - * @param \eZ\Publish\API\Repository\LocationService $locationService + * @param \Ibexa\Contracts\Core\Repository\LocationService $locationService */ public function setLocationService(LocationService $locationService) { diff --git a/src/lib/FieldTypeProcessor/DateAndTimeProcessor.php b/src/lib/FieldTypeProcessor/DateAndTimeProcessor.php index 9c06bf32..6b9dc417 100644 --- a/src/lib/FieldTypeProcessor/DateAndTimeProcessor.php +++ b/src/lib/FieldTypeProcessor/DateAndTimeProcessor.php @@ -7,7 +7,7 @@ namespace Ibexa\Rest\FieldTypeProcessor; use Ibexa\Contracts\Rest\FieldTypeProcessor; -use eZ\Publish\Core\FieldType\DateAndTime\Type; +use Ibexa\Core\FieldType\DateAndTime\Type; class DateAndTimeProcessor extends FieldTypeProcessor { diff --git a/src/lib/FieldTypeProcessor/DateProcessor.php b/src/lib/FieldTypeProcessor/DateProcessor.php index 723b43e9..cf03e287 100644 --- a/src/lib/FieldTypeProcessor/DateProcessor.php +++ b/src/lib/FieldTypeProcessor/DateProcessor.php @@ -7,7 +7,7 @@ namespace Ibexa\Rest\FieldTypeProcessor; use Ibexa\Contracts\Rest\FieldTypeProcessor; -use eZ\Publish\Core\FieldType\Date\Type; +use Ibexa\Core\FieldType\Date\Type; class DateProcessor extends FieldTypeProcessor { diff --git a/src/lib/FieldTypeProcessor/ImageAssetFieldTypeProcessor.php b/src/lib/FieldTypeProcessor/ImageAssetFieldTypeProcessor.php index 091cbf39..6e7165dd 100644 --- a/src/lib/FieldTypeProcessor/ImageAssetFieldTypeProcessor.php +++ b/src/lib/FieldTypeProcessor/ImageAssetFieldTypeProcessor.php @@ -8,8 +8,8 @@ namespace Ibexa\Rest\FieldTypeProcessor; -use eZ\Publish\API\Repository\ContentService; -use eZ\Publish\API\Repository\Exceptions\NotFoundException; +use Ibexa\Contracts\Core\Repository\ContentService; +use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException; use Ibexa\Contracts\Rest\FieldTypeProcessor; use Symfony\Component\Routing\RouterInterface; @@ -18,7 +18,7 @@ class ImageAssetFieldTypeProcessor extends FieldTypeProcessor /** @var \Symfony\Component\Routing\RouterInterface */ private $router; - /** @var \eZ\Publish\API\Repository\ContentService */ + /** @var \Ibexa\Contracts\Core\Repository\ContentService */ private $contentService; /** @var string[] */ diff --git a/src/lib/FieldTypeProcessor/ImageProcessor.php b/src/lib/FieldTypeProcessor/ImageProcessor.php index e04daed3..47637188 100644 --- a/src/lib/FieldTypeProcessor/ImageProcessor.php +++ b/src/lib/FieldTypeProcessor/ImageProcessor.php @@ -29,7 +29,7 @@ class ImageProcessor extends BinaryInputProcessor protected $variations; /** - * @var RouterInterface + * @var \Symfony\Component\Routing\RouterInterface */ protected $router; diff --git a/src/lib/FieldTypeProcessor/MediaProcessor.php b/src/lib/FieldTypeProcessor/MediaProcessor.php index 65807780..3314751e 100644 --- a/src/lib/FieldTypeProcessor/MediaProcessor.php +++ b/src/lib/FieldTypeProcessor/MediaProcessor.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Rest\FieldTypeProcessor; -use eZ\Publish\Core\FieldType\Media\Type; +use Ibexa\Core\FieldType\Media\Type; class MediaProcessor extends BinaryInputProcessor { diff --git a/src/lib/FieldTypeProcessor/TimeProcessor.php b/src/lib/FieldTypeProcessor/TimeProcessor.php index f0d85769..24e08ba6 100644 --- a/src/lib/FieldTypeProcessor/TimeProcessor.php +++ b/src/lib/FieldTypeProcessor/TimeProcessor.php @@ -7,7 +7,7 @@ namespace Ibexa\Rest\FieldTypeProcessor; use Ibexa\Contracts\Rest\FieldTypeProcessor; -use eZ\Publish\Core\FieldType\Time\Type; +use Ibexa\Core\FieldType\Time\Type; class TimeProcessor extends FieldTypeProcessor { diff --git a/src/lib/FieldTypeProcessorRegistry.php b/src/lib/FieldTypeProcessorRegistry.php index 5fa8bf6a..5acc87d1 100644 --- a/src/lib/FieldTypeProcessorRegistry.php +++ b/src/lib/FieldTypeProcessorRegistry.php @@ -16,12 +16,12 @@ class FieldTypeProcessorRegistry /** * Registered processors. * - * @var \EzSystems\EzPlatformRest\FieldTypeProcessor[] + * @var \Ibexa\Contracts\Rest\FieldTypeProcessor[] */ private $processors = []; /** - * @param \EzSystems\EzPlatformRest\FieldTypeProcessor[] $processors + * @param \Ibexa\Contracts\Rest\FieldTypeProcessor[] $processors */ public function __construct(array $processors = []) { @@ -34,7 +34,7 @@ public function __construct(array $processors = []) * Registers $processor for $fieldTypeIdentifier. * * @param string $fieldTypeIdentifier - * @param \EzSystems\EzPlatformRest\FieldTypeProcessor $processor + * @param \Ibexa\Contracts\Rest\FieldTypeProcessor $processor */ public function registerProcessor($fieldTypeIdentifier, FieldTypeProcessor $processor) { @@ -60,7 +60,7 @@ public function hasProcessor($fieldTypeIdentifier) * * @throws \RuntimeException if not processor is registered for $fieldTypeIdentifier * - * @return \EzSystems\EzPlatformRest\FieldTypeProcessor + * @return \Ibexa\Contracts\Rest\FieldTypeProcessor */ public function getProcessor($fieldTypeIdentifier) { diff --git a/src/lib/Input/BaseParser.php b/src/lib/Input/BaseParser.php index 26c54098..90aac064 100644 --- a/src/lib/Input/BaseParser.php +++ b/src/lib/Input/BaseParser.php @@ -14,7 +14,7 @@ abstract class BaseParser extends Parser /** * URL handler. * - * @var \EzSystems\EzPlatformRest\RequestParser + * @var \Ibexa\Rest\RequestParser */ protected $requestParser; diff --git a/src/lib/Input/Dispatcher.php b/src/lib/Input/Dispatcher.php index d4711891..1c8529d9 100644 --- a/src/lib/Input/Dispatcher.php +++ b/src/lib/Input/Dispatcher.php @@ -28,20 +28,20 @@ class Dispatcher * ) * * - * @var \EzSystems\EzPlatformRest\Input\Handler[] + * @var \Ibexa\Contracts\Rest\Input\Handler[] */ protected $handlers = []; /** - * @var \EzSystems\EzPlatformRest\Input\ParsingDispatcher + * @var \Ibexa\Contracts\Rest\Input\ParsingDispatcher */ protected $parsingDispatcher; /** * Construct from optional parsers array. * - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher - * @param \EzSystems\EzPlatformRest\Input\Handler[] $handlers + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\Handler[] $handlers */ public function __construct(ParsingDispatcher $parsingDispatcher, array $handlers = []) { @@ -55,7 +55,7 @@ public function __construct(ParsingDispatcher $parsingDispatcher, array $handler * Adds another handler for the given Content Type. * * @param string $type - * @param \EzSystems\EzPlatformRest\Input\Handler $handler + * @param \Ibexa\Contracts\Rest\Input\Handler $handler */ public function addHandler($type, Handler $handler) { @@ -65,7 +65,7 @@ public function addHandler($type, Handler $handler) /** * Parse provided request. * - * @param \EzSystems\EzPlatformRest\Message $message + * @param \Ibexa\Rest\Message $message * * @return mixed */ diff --git a/src/lib/Input/FieldTypeParser.php b/src/lib/Input/FieldTypeParser.php index abeb7bc2..85727625 100644 --- a/src/lib/Input/FieldTypeParser.php +++ b/src/lib/Input/FieldTypeParser.php @@ -7,37 +7,37 @@ namespace Ibexa\Rest\Input; use Ibexa\Rest\FieldTypeProcessorRegistry; -use eZ\Publish\API\Repository\ContentService; -use eZ\Publish\API\Repository\ContentTypeService; -use eZ\Publish\API\Repository\FieldTypeService; +use Ibexa\Contracts\Core\Repository\ContentService; +use Ibexa\Contracts\Core\Repository\ContentTypeService; +use Ibexa\Contracts\Core\Repository\FieldTypeService; class FieldTypeParser { /** - * @var \eZ\Publish\API\Repository\ContentService + * @var \Ibexa\Contracts\Core\Repository\ContentService */ protected $contentService; /** - * @var \eZ\Publish\API\Repository\ContentTypeService + * @var \Ibexa\Contracts\Core\Repository\ContentTypeService */ protected $contentTypeService; /** - * @var \eZ\Publish\API\Repository\FieldTypeService + * @var \Ibexa\Contracts\Core\Repository\FieldTypeService */ protected $fieldTypeService; /** - * @var \EzSystems\EzPlatformRest\FieldTypeProcessorRegistry + * @var \Ibexa\Rest\FieldTypeProcessorRegistry */ protected $fieldTypeProcessorRegistry; /** - * @param \eZ\Publish\API\Repository\ContentService $contentService - * @param \eZ\Publish\API\Repository\ContentTypeService $contentTypeService - * @param \eZ\Publish\API\Repository\FieldTypeService $fieldTypeService - * @param \EzSystems\EzPlatformRest\FieldTypeProcessorRegistry $fieldTypeProcessorRegistry + * @param \Ibexa\Contracts\Core\Repository\ContentService $contentService + * @param \Ibexa\Contracts\Core\Repository\ContentTypeService $contentTypeService + * @param \Ibexa\Contracts\Core\Repository\FieldTypeService $fieldTypeService + * @param \Ibexa\Rest\FieldTypeProcessorRegistry $fieldTypeProcessorRegistry */ public function __construct( ContentService $contentService, diff --git a/src/lib/Input/Parser/ContentObjectStates.php b/src/lib/Input/Parser/ContentObjectStates.php index 0dde56b2..d22d8cdd 100644 --- a/src/lib/Input/Parser/ContentObjectStates.php +++ b/src/lib/Input/Parser/ContentObjectStates.php @@ -10,7 +10,7 @@ use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Contracts\Rest\Exceptions; use Ibexa\Rest\Values\RestObjectState; -use eZ\Publish\Core\Repository\Values\ObjectState\ObjectState; +use Ibexa\Core\Repository\Values\ObjectState\ObjectState; /** * Parser for ContentObjectStates. @@ -21,9 +21,9 @@ class ContentObjectStates extends BaseParser * Parse input structure. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @return \EzSystems\EzPlatformRest\Values\RestObjectState[] + * @return \Ibexa\Rest\Values\RestObjectState[] */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { diff --git a/src/lib/Input/ParserTools.php b/src/lib/Input/ParserTools.php index 39dd60c2..acff372e 100644 --- a/src/lib/Input/ParserTools.php +++ b/src/lib/Input/ParserTools.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Rest\Input; -use eZ\Publish\API\Repository\Values; +use Ibexa\Core\Repository\Values; use Ibexa\Contracts\Rest\Exceptions; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use RuntimeException; @@ -20,7 +20,7 @@ class ParserTools * Parses the given $objectElement, if it contains embedded data. * * @param array $objectElement - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * * @return mixed */ @@ -183,7 +183,7 @@ public function parseDefaultSortOrder($defaultSortOrderString) * * @param array $limitation * - * @return \eZ\Publish\API\Repository\Values\User\Limitation + * @return \Ibexa\Contracts\Core\Repository\Values\User\Limitation */ public function parseLimitation(array $limitation) { @@ -216,9 +216,9 @@ public function parseLimitation(array $limitation) * * @param string $identifier * - * @throws \eZ\Publish\API\Repository\Exceptions\NotFoundException + * @throws \Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException * - * @return \eZ\Publish\API\Repository\Values\User\Limitation + * @return \Ibexa\Contracts\Core\Repository\Values\User\Limitation * * @todo Use dependency injection system */ @@ -226,46 +226,46 @@ protected function getLimitationByIdentifier($identifier) { switch ($identifier) { case Values\User\Limitation::CONTENTTYPE: - return new \eZ\Publish\API\Repository\Values\User\Limitation\ContentTypeLimitation(); + return new \Ibexa\Contracts\Core\Repository\Values\User\Limitation\ContentTypeLimitation(); case Values\User\Limitation::LANGUAGE: - return new \eZ\Publish\API\Repository\Values\User\Limitation\LanguageLimitation(); + return new \Ibexa\Contracts\Core\Repository\Values\User\Limitation\LanguageLimitation(); case Values\User\Limitation::LOCATION: - return new \eZ\Publish\API\Repository\Values\User\Limitation\LocationLimitation(); + return new \Ibexa\Contracts\Core\Repository\Values\User\Limitation\LocationLimitation(); case Values\User\Limitation::OWNER: - return new \eZ\Publish\API\Repository\Values\User\Limitation\OwnerLimitation(); + return new \Ibexa\Contracts\Core\Repository\Values\User\Limitation\OwnerLimitation(); case Values\User\Limitation::PARENTOWNER: - return new \eZ\Publish\API\Repository\Values\User\Limitation\ParentOwnerLimitation(); + return new \Ibexa\Contracts\Core\Repository\Values\User\Limitation\ParentOwnerLimitation(); case Values\User\Limitation::PARENTCONTENTTYPE: - return new \eZ\Publish\API\Repository\Values\User\Limitation\ParentContentTypeLimitation(); + return new \Ibexa\Contracts\Core\Repository\Values\User\Limitation\ParentContentTypeLimitation(); case Values\User\Limitation::PARENTDEPTH: - return new \eZ\Publish\API\Repository\Values\User\Limitation\ParentDepthLimitation(); + return new \Ibexa\Contracts\Core\Repository\Values\User\Limitation\ParentDepthLimitation(); case Values\User\Limitation::SECTION: - return new \eZ\Publish\API\Repository\Values\User\Limitation\SectionLimitation(); + return new \Ibexa\Contracts\Core\Repository\Values\User\Limitation\SectionLimitation(); case Values\User\Limitation::SITEACCESS: - return new \eZ\Publish\API\Repository\Values\User\Limitation\SiteaccessLimitation(); + return new \Ibexa\Core\Repository\Values\User\Limitation\SiteaccessLimitation(); case Values\User\Limitation::STATE: - return new \eZ\Publish\API\Repository\Values\User\Limitation\ObjectStateLimitation(); + return new \Ibexa\Contracts\Core\Repository\Values\User\Limitation\ObjectStateLimitation(); case Values\User\Limitation::SUBTREE: - return new \eZ\Publish\API\Repository\Values\User\Limitation\SubtreeLimitation(); + return new \Ibexa\Contracts\Core\Repository\Values\User\Limitation\SubtreeLimitation(); case Values\User\Limitation::USERGROUP: - return new \eZ\Publish\API\Repository\Values\User\Limitation\UserGroupLimitation(); + return new \Ibexa\Contracts\Core\Repository\Values\User\Limitation\UserGroupLimitation(); case Values\User\Limitation::PARENTUSERGROUP: - return new \eZ\Publish\API\Repository\Values\User\Limitation\ParentUserGroupLimitation(); + return new \Ibexa\Contracts\Core\Repository\Values\User\Limitation\ParentUserGroupLimitation(); default: - throw new \eZ\Publish\Core\Base\Exceptions\NotFoundException('Limitation', $identifier); + throw new \Ibexa\Core\Base\Exceptions\NotFoundException('Limitation', $identifier); } } } diff --git a/src/lib/Output/FieldTypeSerializer.php b/src/lib/Output/FieldTypeSerializer.php index ca75e468..fc0701ba 100644 --- a/src/lib/Output/FieldTypeSerializer.php +++ b/src/lib/Output/FieldTypeSerializer.php @@ -8,10 +8,10 @@ use Ibexa\Contracts\Rest\Output\Generator; use Ibexa\Rest\FieldTypeProcessorRegistry; -use eZ\Publish\API\Repository\FieldTypeService; -use eZ\Publish\API\Repository\FieldType; -use eZ\Publish\API\Repository\Values\ContentType\ContentType; -use eZ\Publish\API\Repository\Values\Content\Field; +use Ibexa\Contracts\Core\Repository\FieldTypeService; +use Ibexa\Contracts\Core\Repository\FieldType; +use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType; +use Ibexa\Contracts\Core\Repository\Values\Content\Field; /** * Serializes FieldType related data for REST output. @@ -21,18 +21,18 @@ class FieldTypeSerializer /** * FieldTypeService. * - * @var \eZ\Publish\API\Repository\FieldTypeService + * @var \Ibexa\Contracts\Core\Repository\FieldTypeService */ protected $fieldTypeService; /** - * @var \EzSystems\EzPlatformRest\FieldTypeProcessorRegistry + * @var \Ibexa\Rest\FieldTypeProcessorRegistry */ protected $fieldTypeProcessorRegistry; /** - * @param \eZ\Publish\API\Repository\FieldTypeService $fieldTypeService - * @param \EzSystems\EzPlatformRest\FieldTypeProcessorRegistry $fieldTypeProcessorRegistry + * @param \Ibexa\Contracts\Core\Repository\FieldTypeService $fieldTypeService + * @param \Ibexa\Rest\FieldTypeProcessorRegistry $fieldTypeProcessorRegistry */ public function __construct(FieldTypeService $fieldTypeService, FieldTypeProcessorRegistry $fieldTypeProcessorRegistry) { @@ -43,9 +43,9 @@ public function __construct(FieldTypeService $fieldTypeService, FieldTypeProcess /** * Serializes the field value of $field through $generator. * - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \eZ\Publish\API\Repository\Values\ContentType\ContentType $contentType - * @param \eZ\Publish\API\Repository\Values\Content\Field $field + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType $contentType + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Field $field */ public function serializeFieldValue(Generator $generator, ContentType $contentType, Field $field) { @@ -62,7 +62,7 @@ public function serializeFieldValue(Generator $generator, ContentType $contentTy /** * Serializes the $defaultValue for $fieldDefIdentifier through $generator. * - * @param \EzSystems\EzPlatformRest\Output\Generator $generator + * @param \Ibexa\Contracts\Rest\Output\Generator $generator * @param string $fieldTypeIdentifier * @param mixed $defaultValue */ @@ -80,7 +80,7 @@ public function serializeFieldDefaultValue(Generator $generator, $fieldTypeIdent * Serializes $settings as fieldSettings for $fieldDefinition using * $generator. * - * @param \EzSystems\EzPlatformRest\Output\Generator $generator + * @param \Ibexa\Contracts\Rest\Output\Generator $generator * @param string $fieldTypeIdentifier * @param mixed $settings */ @@ -100,7 +100,7 @@ public function serializeFieldSettings(Generator $generator, $fieldTypeIdentifie /** * Serializes $validatorConfiguration for $fieldDefinition using $generator. * - * @param \EzSystems\EzPlatformRest\Output\Generator $generator + * @param \Ibexa\Contracts\Rest\Output\Generator $generator * @param string $fieldTypeIdentifier * @param mixed $validatorConfiguration */ @@ -122,7 +122,7 @@ public function serializeValidatorConfiguration(Generator $generator, $fieldType * * @param string $fieldTypeIdentifier * - * @return \eZ\Publish\API\Repository\FieldType + * @return \Ibexa\Contracts\Core\Repository\FieldType */ protected function getFieldType($fieldTypeIdentifier) { @@ -136,8 +136,8 @@ protected function getFieldType($fieldTypeIdentifier) * $elementName. * * @param string $elementName - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \eZ\Publish\API\Repository\FieldType $fieldType + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Contracts\Core\Repository\FieldType $fieldType * @param mixed $value */ protected function serializeValue($elementName, Generator $generator, FieldType $fieldType, $value) @@ -157,7 +157,7 @@ protected function serializeValue($elementName, Generator $generator, FieldType * Serializes the given $hash with $generator into $elementName. * * @param string $elementName - * @param \EzSystems\EzPlatformRest\Output\Generator $generator + * @param \Ibexa\Contracts\Rest\Output\Generator $generator * @param mixed $hash */ protected function serializeHash($elementName, Generator $generator, $hash) diff --git a/src/lib/Output/Generator/Json.php b/src/lib/Output/Generator/Json.php index aca906ef..e6b8f8be 100644 --- a/src/lib/Output/Generator/Json.php +++ b/src/lib/Output/Generator/Json.php @@ -23,7 +23,7 @@ class Json extends Generator /** * Generator for field type hash values. * - * @var \EzSystems\EzPlatformRest\Output\Generator\Json\FieldTypeHashGenerator + * @var \Ibexa\Rest\Output\Generator\Json\FieldTypeHashGenerator */ protected $fieldTypeHashGenerator; @@ -42,7 +42,7 @@ class Json extends Generator protected $vendor; /** - * @param \EzSystems\EzPlatformRest\Output\Generator\Json\FieldTypeHashGenerator $fieldTypeHashGenerator + * @param \Ibexa\Rest\Output\Generator\Json\FieldTypeHashGenerator $fieldTypeHashGenerator * @param string $vendor */ public function __construct(Json\FieldTypeHashGenerator $fieldTypeHashGenerator, $vendor = 'vnd.ez.api') diff --git a/src/lib/Output/Generator/Json/ArrayObject.php b/src/lib/Output/Generator/Json/ArrayObject.php index 55dd627f..f85f4902 100644 --- a/src/lib/Output/Generator/Json/ArrayObject.php +++ b/src/lib/Output/Generator/Json/ArrayObject.php @@ -19,7 +19,7 @@ class ArrayObject extends NativeArrayObject /** * Reference to the parent node. * - * @var \EzSystems\EzPlatformRest\Output\Generator\Json\JsonObject + * @var \Ibexa\Rest\Output\Generator\Json\JsonObject */ protected $_ref_parent; @@ -36,7 +36,7 @@ public function __construct($_ref_parent) /** * Get Parent of current node. * - * @return \EzSystems\EzPlatformRest\Output\Generator\Json\JsonObject + * @return \Ibexa\Rest\Output\Generator\Json\JsonObject */ public function getParent() { diff --git a/src/lib/Output/Generator/Json/FieldTypeHashGenerator.php b/src/lib/Output/Generator/Json/FieldTypeHashGenerator.php index b3982c74..54e2462b 100644 --- a/src/lib/Output/Generator/Json/FieldTypeHashGenerator.php +++ b/src/lib/Output/Generator/Json/FieldTypeHashGenerator.php @@ -12,7 +12,7 @@ class FieldTypeHashGenerator * Generates the field type value $hashValue as a child of the given Object * using $hashElementName as the property name. * - * @param \EzSystems\EzPlatformRest\Output\Generator\Json\ArrayObject|\EzSystems\EzPlatformRest\Output\Generator\Json\JsonObject $parent + * @param \Ibexa\Rest\Output\Generator\Json\ArrayObject|\Ibexa\Rest\Output\Generator\Json\JsonObject $parent * @param string $hashElementName * @param mixed $hashValue */ @@ -25,7 +25,7 @@ public function generateHashValue($parent, $hashElementName, $hashValue) * Generates and returns a value based on $hashValue type, with $parent ( * if the type of $hashValue supports it). * - * @param \EzSystems\EzPlatformRest\Output\Generator\Json\ArrayObject|\EzSystems\EzPlatformRest\Output\Generator\Json\JsonObject $parent + * @param \Ibexa\Rest\Output\Generator\Json\ArrayObject|\Ibexa\Rest\Output\Generator\Json\JsonObject $parent * @param mixed $value * * @return mixed @@ -59,10 +59,10 @@ protected function generateValue($parent, $value) * If $type only contains numeric keys, the resulting structure will be an * JSON array, otherwise a JSON object * - * @param \EzSystems\EzPlatformRest\Output\Generator\Json\ArrayObject|\EzSystems\EzPlatformRest\Output\Generator\Json\JsonObject $parent + * @param \Ibexa\Rest\Output\Generator\Json\ArrayObject|\Ibexa\Rest\Output\Generator\Json\JsonObject $parent * @param array $value * - * @return \EzSystems\EzPlatformRest\Output\Generator\Json\ArrayObject|\EzSystems\EzPlatformRest\Output\Generator\Json\JsonObject + * @return \Ibexa\Rest\Output\Generator\Json\ArrayObject|\Ibexa\Rest\Output\Generator\Json\JsonObject */ protected function generateArrayValue($parent, array $value) { @@ -76,10 +76,10 @@ protected function generateArrayValue($parent, array $value) /** * Generates a JSON array from the given $hashArray with $parent. * - * @param \EzSystems\EzPlatformRest\Output\Generator\Json\ArrayObject|\EzSystems\EzPlatformRest\Output\Generator\Json\JsonObject $parent + * @param \Ibexa\Rest\Output\Generator\Json\ArrayObject|\Ibexa\Rest\Output\Generator\Json\JsonObject $parent * @param array $listArray * - * @return \EzSystems\EzPlatformRest\Output\Generator\Json\ArrayObject + * @return \Ibexa\Rest\Output\Generator\Json\ArrayObject */ protected function generateListArray($parent, array $listArray) { @@ -94,10 +94,10 @@ protected function generateListArray($parent, array $listArray) /** * Generates a JSON object from the given $hashArray with $parent. * - * @param \EzSystems\EzPlatformRest\Output\Generator\Json\ArrayObject|\EzSystems\EzPlatformRest\Output\Generator\Json\JsonObject $parent + * @param \Ibexa\Rest\Output\Generator\Json\ArrayObject|\Ibexa\Rest\Output\Generator\Json\JsonObject $parent * @param array $hashArray * - * @return \EzSystems\EzPlatformRest\Output\Generator\Json\JsonObject + * @return \Ibexa\Rest\Output\Generator\Json\JsonObject */ protected function generateHashArray($parent, array $hashArray) { diff --git a/src/lib/Output/Generator/Json/JsonObject.php b/src/lib/Output/Generator/Json/JsonObject.php index 6b2503a3..933a3bdd 100644 --- a/src/lib/Output/Generator/Json/JsonObject.php +++ b/src/lib/Output/Generator/Json/JsonObject.php @@ -17,7 +17,7 @@ class JsonObject /** * Reference to the parent node. * - * @var \EzSystems\EzPlatformRest\Output\Generator\Json\JsonObject + * @var \Ibexa\Rest\Output\Generator\Json\JsonObject */ protected $_ref_parent; @@ -34,7 +34,7 @@ public function __construct($_ref_parent = null) /** * Get Parent of current node. * - * @return \EzSystems\EzPlatformRest\Output\Generator\Json\JsonObject + * @return \Ibexa\Rest\Output\Generator\Json\JsonObject */ public function getParent() { diff --git a/src/lib/Output/Generator/Xml.php b/src/lib/Output/Generator/Xml.php index 6db818b4..2a47321e 100644 --- a/src/lib/Output/Generator/Xml.php +++ b/src/lib/Output/Generator/Xml.php @@ -23,7 +23,7 @@ class Xml extends Generator /** * Generator for field type hash values. * - * @var \EzSystems\EzPlatformRest\Output\Generator\Xml\FieldTypeHashGenerator + * @var \Ibexa\Rest\Output\Generator\Xml\FieldTypeHashGenerator */ protected $hashGenerator; @@ -42,7 +42,7 @@ class Xml extends Generator protected $vendor; /** - * @param \EzSystems\EzPlatformRest\Output\Generator\Xml\FieldTypeHashGenerator $hashGenerator + * @param \Ibexa\Rest\Output\Generator\Xml\FieldTypeHashGenerator $hashGenerator * @param string $vendor */ public function __construct(Xml\FieldTypeHashGenerator $hashGenerator, $vendor = 'vnd.ez.api') diff --git a/src/lib/Output/ValueObjectVisitor/ContentObjectStates.php b/src/lib/Output/ValueObjectVisitor/ContentObjectStates.php index 2f2dc602..d1cd39fa 100644 --- a/src/lib/Output/ValueObjectVisitor/ContentObjectStates.php +++ b/src/lib/Output/ValueObjectVisitor/ContentObjectStates.php @@ -18,9 +18,9 @@ class ContentObjectStates extends ValueObjectVisitor /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Values\ContentObjectStates $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Values\ContentObjectStates $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Controller.php b/src/lib/Server/Controller.php index 4e6971b0..ed44a799 100644 --- a/src/lib/Server/Controller.php +++ b/src/lib/Server/Controller.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Rest\Server; -use eZ\Publish\API\Repository\Repository; +use Ibexa\Contracts\Core\Repository\Repository; use Symfony\Component\DependencyInjection\ContainerAwareInterface; use Symfony\Component\DependencyInjection\ContainerAwareTrait; use Symfony\Component\Routing\RouterInterface; @@ -19,7 +19,7 @@ abstract class Controller implements ContainerAwareInterface use ContainerAwareTrait; /** - * @var \EzSystems\EzPlatformRest\Input\Dispatcher + * @var \Ibexa\Rest\Input\Dispatcher */ protected $inputDispatcher; @@ -29,14 +29,14 @@ abstract class Controller implements ContainerAwareInterface protected $router; /** - * @var \EzSystems\EzPlatformRest\RequestParser + * @var \Ibexa\Rest\RequestParser */ protected $requestParser; /** * Repository. * - * @var \eZ\Publish\API\Repository\Repository + * @var \Ibexa\Contracts\Core\Repository\Repository */ protected $repository; diff --git a/src/lib/Server/Controller/BinaryContent.php b/src/lib/Server/Controller/BinaryContent.php index 11a81fc6..7da32491 100644 --- a/src/lib/Server/Controller/BinaryContent.php +++ b/src/lib/Server/Controller/BinaryContent.php @@ -6,11 +6,11 @@ */ namespace Ibexa\Rest\Server\Controller; -use eZ\Publish\API\Repository\Exceptions\InvalidVariationException; -use eZ\Publish\Core\FieldType\Image\Value as ImageValue; -use eZ\Publish\Core\FieldType\ImageAsset\Value as ImageAssetValue; -use eZ\Publish\Core\MVC\ConfigResolverInterface; -use eZ\Publish\SPI\Variation\VariationHandler; +use Ibexa\Contracts\Core\Repository\Exceptions\InvalidVariationException; +use Ibexa\Core\FieldType\Image\Value as ImageValue; +use Ibexa\Core\FieldType\ImageAsset\Value as ImageAssetValue; +use Ibexa\Core\MVC\ConfigResolverInterface; +use Ibexa\Contracts\Core\Variation\VariationHandler; use Ibexa\Contracts\Rest\Exceptions; use Ibexa\Rest\Server\Controller as RestController; use Ibexa\Rest\Server\Values\CachedValue; @@ -20,10 +20,10 @@ */ class BinaryContent extends RestController { - /** @var \eZ\Publish\SPI\Variation\VariationHandler */ + /** @var \Ibexa\Contracts\Core\Variation\VariationHandler */ protected $imageVariationHandler; - /** @var \eZ\Publish\Core\MVC\ConfigResolverInterface */ + /** @var \Ibexa\Core\MVC\ConfigResolverInterface */ private $configResolver; public function __construct( @@ -44,9 +44,9 @@ public function __construct( * If the version number isn't specified, the default one is used. * @param string $variationIdentifier * - * @throws \EzSystems\EzPlatformRest\Exceptions\NotFoundException + * @throws \Ibexa\Contracts\Rest\Exceptions\NotFoundException * - * @return \eZ\Publish\SPI\Variation\Values\Variation + * @return \Ibexa\Contracts\Core\Variation\Values\Variation */ public function getImageVariation($imageId, $variationIdentifier) { @@ -104,7 +104,7 @@ public function getImageVariation($imageId, $variationIdentifier) * @return array An array with 3 keys: contentId, fieldId and versionNumber. * If the versionNumber wasn't set, it is returned as null. * - * @throws \EzSystems\EzPlatformRest\Exceptions\NotFoundException If the imageId format is invalid + * @throws \Ibexa\Contracts\Rest\Exceptions\NotFoundException If the imageId format is invalid */ private function parseImageId($imageId) { diff --git a/src/lib/Server/Controller/Bookmark.php b/src/lib/Server/Controller/Bookmark.php index 5c6e7e08..74a0c6af 100644 --- a/src/lib/Server/Controller/Bookmark.php +++ b/src/lib/Server/Controller/Bookmark.php @@ -8,9 +8,9 @@ namespace Ibexa\Rest\Server\Controller; -use eZ\Publish\API\Repository\BookmarkService; -use eZ\Publish\API\Repository\Exceptions\InvalidArgumentException; -use eZ\Publish\API\Repository\LocationService; +use Ibexa\Contracts\Core\Repository\BookmarkService; +use Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException; +use Ibexa\Contracts\Core\Repository\LocationService; use Ibexa\Contracts\Rest\Exceptions; use Ibexa\Rest\Value as RestValue; use Ibexa\Rest\Server\Values; @@ -20,20 +20,20 @@ class Bookmark extends RestController { /** - * @var \eZ\Publish\API\Repository\BookmarkService + * @var \Ibexa\Contracts\Core\Repository\BookmarkService */ protected $bookmarkService; /** - * @var \eZ\Publish\API\Repository\LocationService + * @var \Ibexa\Contracts\Core\Repository\LocationService */ protected $locationService; /** * Bookmark constructor. * - * @param \eZ\Publish\API\Repository\BookmarkService $bookmarkService - * @param \eZ\Publish\API\Repository\LocationService $locationService + * @param \Ibexa\Contracts\Core\Repository\BookmarkService $bookmarkService + * @param \Ibexa\Contracts\Core\Repository\LocationService $locationService */ public function __construct(BookmarkService $bookmarkService, LocationService $locationService) { @@ -47,10 +47,10 @@ public function __construct(BookmarkService $bookmarkService, LocationService $l * @param \Symfony\Component\HttpFoundation\Request $request * @param int $locationId * - * @throws \eZ\Publish\API\Repository\Exceptions\NotFoundException - * @throws \eZ\Publish\API\Repository\Exceptions\UnauthorizedException + * @throws \Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException + * @throws \Ibexa\Contracts\Core\Repository\Exceptions\UnauthorizedException * - * @return \EzSystems\EzPlatformRest\Value + * @return \Ibexa\Rest\Value */ public function createBookmark(Request $request, int $locationId): RestValue { @@ -78,10 +78,10 @@ public function createBookmark(Request $request, int $locationId): RestValue * @param \Symfony\Component\HttpFoundation\Request $request * @param int $locationId * - * @throws \eZ\Publish\API\Repository\Exceptions\NotFoundException - * @throws \eZ\Publish\API\Repository\Exceptions\UnauthorizedException + * @throws \Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException + * @throws \Ibexa\Contracts\Core\Repository\Exceptions\UnauthorizedException * - * @return \EzSystems\EzPlatformRest\Value + * @return \Ibexa\Rest\Value */ public function deleteBookmark(Request $request, int $locationId): RestValue { @@ -102,10 +102,10 @@ public function deleteBookmark(Request $request, int $locationId): RestValue * @param \Symfony\Component\HttpFoundation\Request $request * @param int $locationId * - * @throws \eZ\Publish\API\Repository\Exceptions\NotFoundException - * @throws \eZ\Publish\API\Repository\Exceptions\UnauthorizedException + * @throws \Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException + * @throws \Ibexa\Contracts\Core\Repository\Exceptions\UnauthorizedException * - * @return \EzSystems\EzPlatformRest\Server\Values\OK + * @return \Ibexa\Rest\Server\Values\OK */ public function isBookmarked(Request $request, int $locationId): Values\OK { @@ -123,9 +123,9 @@ public function isBookmarked(Request $request, int $locationId): Values\OK * * @param \Symfony\Component\HttpFoundation\Request $request * - * @throws \eZ\Publish\API\Repository\Exceptions\InvalidArgumentException + * @throws \Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException * - * @return \EzSystems\EzPlatformRest\Value + * @return \Ibexa\Rest\Value */ public function loadBookmarks(Request $request): RestValue { diff --git a/src/lib/Server/Controller/Content.php b/src/lib/Server/Controller/Content.php index 1eef8dd1..f5bc5a5a 100644 --- a/src/lib/Server/Controller/Content.php +++ b/src/lib/Server/Controller/Content.php @@ -6,16 +6,16 @@ */ namespace Ibexa\Rest\Server\Controller; -use eZ\Publish\API\Repository\Values\Content\Language; +use Ibexa\Contracts\Core\Repository\Values\Content\Language; use Ibexa\Rest\Message; use Ibexa\Contracts\Rest\Exceptions; use Ibexa\Rest\Server\Values; use Ibexa\Rest\Server\Controller as RestController; -use eZ\Publish\API\Repository\Values\Content\Relation; -use eZ\Publish\API\Repository\Values\Content\VersionInfo; -use eZ\Publish\API\Repository\Exceptions\NotFoundException; -use eZ\Publish\API\Repository\Exceptions\ContentFieldValidationException; -use eZ\Publish\API\Repository\Exceptions\ContentValidationException; +use Ibexa\Contracts\Core\Repository\Values\Content\Relation; +use Ibexa\Contracts\Core\Repository\Values\Content\VersionInfo; +use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException; +use Ibexa\Contracts\Core\Repository\Exceptions\ContentFieldValidationException; +use Ibexa\Contracts\Core\Repository\Exceptions\ContentValidationException; use Ibexa\Rest\Server\Exceptions\ForbiddenException; use Ibexa\Rest\Server\Exceptions\BadRequestException; use Ibexa\Rest\Server\Exceptions\ContentFieldValidationException as RESTContentFieldValidationException; @@ -31,9 +31,9 @@ class Content extends RestController /** * Loads a content info by remote ID. * - * @throws \EzSystems\EzPlatformRest\Server\Exceptions\BadRequestException + * @throws \Ibexa\Rest\Server\Exceptions\BadRequestException * - * @return \EzSystems\EzPlatformRest\Server\Values\TemporaryRedirect + * @return \Ibexa\Rest\Server\Values\TemporaryRedirect */ public function redirectContent(Request $request) { @@ -61,7 +61,7 @@ public function redirectContent(Request $request) * @param mixed $contentId * @param \Symfony\Component\HttpFoundation\Request $request * - * @return \EzSystems\EzPlatformRest\Server\Values\RestContent + * @return \Ibexa\Rest\Server\Values\RestContent */ public function loadContent($contentId, Request $request) { @@ -110,7 +110,7 @@ public function loadContent($contentId, Request $request) * * @param mixed $contentId * - * @return \EzSystems\EzPlatformRest\Server\Values\RestContent + * @return \Ibexa\Rest\Server\Values\RestContent */ public function updateContentMetadata($contentId, Request $request) { @@ -160,7 +160,7 @@ public function updateContentMetadata($contentId, Request $request) * * @param mixed $contentId * - * @return \EzSystems\EzPlatformRest\Server\Values\TemporaryRedirect + * @return \Ibexa\Rest\Server\Values\TemporaryRedirect */ public function redirectCurrentVersion($contentId) { @@ -183,7 +183,7 @@ public function redirectCurrentVersion($contentId) * @param mixed $contentId * @param int $versionNumber * - * @return \EzSystems\EzPlatformRest\Server\Values\Version + * @return \Ibexa\Rest\Server\Values\Version */ public function loadContentInVersion($contentId, $versionNumber, Request $request) { @@ -229,7 +229,7 @@ public function loadContentInVersion($contentId, $versionNumber, Request $reques * * @param \Symfony\Component\HttpFoundation\Request $request * - * @return \EzSystems\EzPlatformRest\Server\Values\CreatedContent + * @return \Ibexa\Rest\Server\Values\CreatedContent */ public function createContent(Request $request) { @@ -244,7 +244,7 @@ public function createContent(Request $request) * * @param mixed $contentId * - * @return \EzSystems\EzPlatformRest\Server\Values\NoContent + * @return \Ibexa\Rest\Server\Values\NoContent */ public function deleteContent($contentId) { @@ -260,7 +260,7 @@ public function deleteContent($contentId) * * @param mixed $contentId * - * @return \EzSystems\EzPlatformRest\Server\Values\ResourceCreated + * @return \Ibexa\Rest\Server\Values\ResourceCreated */ public function copyContent($contentId, Request $request) { @@ -288,7 +288,7 @@ public function copyContent($contentId, Request $request) * @param int $contentId * @param string $languageCode * - * @return \EzSystems\EzPlatformRest\Server\Values\NoContent + * @return \Ibexa\Rest\Server\Values\NoContent * * @throws \Exception */ @@ -319,7 +319,7 @@ public function deleteContentTranslation($contentId, $languageCode) * * @param mixed $contentId * - * @return \EzSystems\EzPlatformRest\Server\Values\VersionList + * @return \Ibexa\Rest\Server\Values\VersionList */ public function loadContentVersions($contentId, Request $request) { @@ -337,9 +337,9 @@ public function loadContentVersions($contentId, Request $request) * @param mixed $contentId * @param mixed $versionNumber * - * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException + * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException * - * @return \EzSystems\EzPlatformRest\Server\Values\NoContent + * @return \Ibexa\Rest\Server\Values\NoContent */ public function deleteContentVersion($contentId, $versionNumber) { @@ -366,9 +366,9 @@ public function deleteContentVersion($contentId, $versionNumber) * @param int $versionNumber * @param string $languageCode * - * @return \EzSystems\EzPlatformRest\Server\Values\NoContent + * @return \Ibexa\Rest\Server\Values\NoContent * - * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException + * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException */ public function deleteTranslationFromDraft($contentId, $versionNumber, $languageCode) { @@ -390,7 +390,7 @@ public function deleteTranslationFromDraft($contentId, $versionNumber, $language * @param mixed $contentId * @param mixed $versionNumber * - * @return \EzSystems\EzPlatformRest\Server\Values\CreatedVersion + * @return \Ibexa\Rest\Server\Values\CreatedVersion */ public function createDraftFromVersion($contentId, $versionNumber) { @@ -417,9 +417,9 @@ public function createDraftFromVersion($contentId, $versionNumber) * * @param mixed $contentId * - * @throws ForbiddenException if the current version is already a draft + * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException if the current version is already a draft * - * @return \EzSystems\EzPlatformRest\Server\Values\CreatedVersion + * @return \Ibexa\Rest\Server\Values\CreatedVersion */ public function createDraftFromCurrentVersion($contentId) { @@ -452,10 +452,10 @@ public function createDraftFromCurrentVersion($contentId) * @param mixed $contentId * @param mixed $versionNumber * - * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException - * @throws \EzSystems\EzPlatformRest\Server\Exceptions\BadRequestException + * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException + * @throws \Ibexa\Rest\Server\Exceptions\BadRequestException * - * @return \EzSystems\EzPlatformRest\Server\Values\Version + * @return \Ibexa\Rest\Server\Values\Version */ public function updateVersion($contentId, $versionNumber, Request $request) { @@ -521,9 +521,9 @@ public function updateVersion($contentId, $versionNumber, Request $request) * @param mixed $contentId * @param mixed $versionNumber * - * @throws ForbiddenException if version $versionNumber isn't a draft + * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException if version $versionNumber isn't a draft * - * @return \EzSystems\EzPlatformRest\Server\Values\NoContent + * @return \Ibexa\Rest\Server\Values\NoContent */ public function publishVersion($contentId, $versionNumber) { @@ -548,7 +548,7 @@ public function publishVersion($contentId, $versionNumber) * * @param mixed $contentId * - * @return \EzSystems\EzPlatformRest\Server\Values\TemporaryRedirect + * @return \Ibexa\Rest\Server\Values\TemporaryRedirect */ public function redirectCurrentVersionRelations($contentId) { @@ -571,7 +571,7 @@ public function redirectCurrentVersionRelations($contentId) * @param mixed $contentId * @param mixed $versionNumber * - * @return \EzSystems\EzPlatformRest\Server\Values\RelationList + * @return \Ibexa\Rest\Server\Values\RelationList */ public function loadVersionRelations($contentId, $versionNumber, Request $request) { @@ -613,9 +613,9 @@ public function loadVersionRelations($contentId, $versionNumber, Request $reques * @param int $versionNumber * @param mixed $relationId * - * @throws \EzSystems\EzPlatformRest\Exceptions\NotFoundException + * @throws \Ibexa\Contracts\Rest\Exceptions\NotFoundException * - * @return \EzSystems\EzPlatformRest\Server\Values\RestRelation + * @return \Ibexa\Rest\Server\Values\RestRelation */ public function loadVersionRelation($contentId, $versionNumber, $relationId, Request $request) { @@ -649,10 +649,10 @@ public function loadVersionRelation($contentId, $versionNumber, $relationId, Req * @param int $versionNumber * @param mixed $relationId * - * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException - * @throws \EzSystems\EzPlatformRest\Exceptions\NotFoundException + * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException + * @throws \Ibexa\Contracts\Rest\Exceptions\NotFoundException * - * @return \EzSystems\EzPlatformRest\Server\Values\NoContent + * @return \Ibexa\Rest\Server\Values\NoContent */ public function removeRelation($contentId, $versionNumber, $relationId, Request $request) { @@ -687,10 +687,10 @@ public function removeRelation($contentId, $versionNumber, $relationId, Request * @param mixed $contentId * @param int $versionNumber * - * @throws ForbiddenException if version $versionNumber isn't a draft - * @throws ForbiddenException if a relation to the same content already exists + * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException if version $versionNumber isn't a draft + * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException if a relation to the same content already exists * - * @return \EzSystems\EzPlatformRest\Server\Values\CreatedRelation + * @return \Ibexa\Rest\Server\Values\CreatedRelation */ public function createRelation($contentId, $versionNumber, Request $request) { @@ -730,8 +730,8 @@ public function createRelation($contentId, $versionNumber, Request $request) } /** - * @throws \eZ\Publish\API\Repository\Exceptions\NotFoundException - * @throws \eZ\Publish\API\Repository\Exceptions\UnauthorizedException + * @throws \Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException + * @throws \Ibexa\Contracts\Core\Repository\Exceptions\UnauthorizedException */ public function hideContent(int $contentId): Values\NoContent { @@ -743,8 +743,8 @@ public function hideContent(int $contentId): Values\NoContent } /** - * @throws \eZ\Publish\API\Repository\Exceptions\NotFoundException - * @throws \eZ\Publish\API\Repository\Exceptions\UnauthorizedException + * @throws \Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException + * @throws \Ibexa\Contracts\Core\Repository\Exceptions\UnauthorizedException */ public function revealContent(int $contentId): Values\NoContent { @@ -760,7 +760,7 @@ public function revealContent(int $contentId): Values\NoContent * * @deprecated Since platform 1.0. Forwards the request to the new /views location, but returns a 301. * - * @return \EzSystems\EzPlatformRest\Server\Values\RestExecutedView + * @return \Ibexa\Rest\Server\Values\RestExecutedView */ public function createView() { @@ -803,13 +803,13 @@ protected function parseContentRequest(Request $request) /** * @param \Symfony\Component\HttpFoundation\Request $request - * @param \EzSystems\EzPlatformRest\Server\Values\RestContentCreateStruct $contentCreate + * @param \Ibexa\Rest\Server\Values\RestContentCreateStruct $contentCreate * - * @throws \eZ\Publish\API\Repository\Exceptions\NotFoundException - * @throws \eZ\Publish\API\Repository\Exceptions\InvalidArgumentException - * @throws \eZ\Publish\API\Repository\Exceptions\UnauthorizedException + * @throws \Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException + * @throws \Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException + * @throws \Ibexa\Contracts\Core\Repository\Exceptions\UnauthorizedException * - * @return \EzSystems\EzPlatformRest\Server\Values\CreatedContent + * @return \Ibexa\Rest\Server\Values\CreatedContent */ protected function doCreateContent(Request $request, RestContentCreateStruct $contentCreate) { diff --git a/src/lib/Server/Controller/ContentType.php b/src/lib/Server/Controller/ContentType.php index 9ca3667a..d40f1652 100644 --- a/src/lib/Server/Controller/ContentType.php +++ b/src/lib/Server/Controller/ContentType.php @@ -6,21 +6,21 @@ */ namespace Ibexa\Rest\Server\Controller; -use eZ\Publish\API\Repository\Values\Content\Language; +use Ibexa\Contracts\Core\Repository\Values\Content\Language; use Ibexa\Rest\Server\Exceptions\BadRequestException; -use eZ\Publish\API\Repository\Exceptions\BadStateException; +use Ibexa\Contracts\Core\Repository\Exceptions\BadStateException; use Ibexa\Rest\Message; use Ibexa\Contracts\Rest\Exceptions; use Ibexa\Rest\Server\Exceptions\ForbiddenException; -use eZ\Publish\API\Repository\Exceptions\InvalidArgumentException; -use eZ\Publish\API\Repository\Exceptions\ContentTypeValidationException; -use eZ\Publish\API\Repository\Exceptions\ContentTypeFieldDefinitionValidationException; +use Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException; +use Ibexa\Contracts\Core\Repository\Exceptions\ContentTypeValidationException; +use Ibexa\Contracts\Core\Repository\Exceptions\ContentTypeFieldDefinitionValidationException; use Ibexa\Rest\Server\Controller as RestController; use Ibexa\Rest\Server\Values; -use eZ\Publish\API\Repository\ContentTypeService; -use eZ\Publish\API\Repository\Values\ContentType\ContentType as APIContentType; -use eZ\Publish\API\Repository\Values\ContentType\ContentTypeGroupCreateStruct; -use eZ\Publish\API\Repository\Values\ContentType\ContentTypeGroupUpdateStruct; +use Ibexa\Contracts\Core\Repository\ContentTypeService; +use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType as APIContentType; +use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentTypeGroupCreateStruct; +use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentTypeGroupUpdateStruct; use Symfony\Component\HttpFoundation\Request; /** @@ -31,14 +31,14 @@ class ContentType extends RestController /** * Content type service. * - * @var \eZ\Publish\API\Repository\ContentTypeService + * @var \Ibexa\Contracts\Core\Repository\ContentTypeService */ protected $contentTypeService; /** * Construct controller. * - * @param \eZ\Publish\API\Repository\ContentTypeService $contentTypeService + * @param \Ibexa\Contracts\Core\Repository\ContentTypeService $contentTypeService */ public function __construct(ContentTypeService $contentTypeService) { @@ -48,9 +48,9 @@ public function __construct(ContentTypeService $contentTypeService) /** * Creates a new content type group. * - * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException + * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException * - * @return \EzSystems\EzPlatformRest\Server\Values\CreatedContentTypeGroup + * @return \Ibexa\Rest\Server\Values\CreatedContentTypeGroup */ public function createContentTypeGroup(Request $request) { @@ -77,9 +77,9 @@ public function createContentTypeGroup(Request $request) * * @param $contentTypeGroupId * - * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException + * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException * - * @return \eZ\Publish\API\Repository\Values\ContentType\ContentTypeGroup + * @return \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentTypeGroup */ public function updateContentTypeGroup($contentTypeGroupId, Request $request) { @@ -107,7 +107,7 @@ public function updateContentTypeGroup($contentTypeGroupId, Request $request) * * @param string $contentTypeGroupId * - * @return \EzSystems\EzPlatformRest\Server\Values\ContentTypeList|\EzSystems\EzPlatformRest\Server\Values\ContentTypeInfoList + * @return \Ibexa\Rest\Server\Values\ContentTypeList|\Ibexa\Rest\Server\Values\ContentTypeInfoList */ public function listContentTypesForGroup($contentTypeGroupId, Request $request) { @@ -128,9 +128,9 @@ public function listContentTypesForGroup($contentTypeGroupId, Request $request) * * @param mixed $contentTypeGroupId * - * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException + * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException * - * @return \EzSystems\EzPlatformRest\Server\Values\NoContent + * @return \Ibexa\Rest\Server\Values\NoContent */ public function deleteContentTypeGroup($contentTypeGroupId) { @@ -149,7 +149,7 @@ public function deleteContentTypeGroup($contentTypeGroupId) /** * Returns a list of all content type groups. * - * @return \EzSystems\EzPlatformRest\Server\Values\ContentTypeGroupList + * @return \Ibexa\Rest\Server\Values\ContentTypeGroupList */ public function loadContentTypeGroupList(Request $request) { @@ -178,7 +178,7 @@ public function loadContentTypeGroupList(Request $request) * * @param $contentTypeGroupId * - * @return \eZ\Publish\API\Repository\Values\ContentType\ContentTypeGroup + * @return \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentTypeGroup */ public function loadContentTypeGroup($contentTypeGroupId) { @@ -190,7 +190,7 @@ public function loadContentTypeGroup($contentTypeGroupId) * * @param $contentTypeId * - * @return \EzSystems\EzPlatformRest\Server\Values\RestContentType + * @return \Ibexa\Rest\Server\Values\RestContentType */ public function loadContentType($contentTypeId) { @@ -205,7 +205,7 @@ public function loadContentType($contentTypeId) /** * Returns a list of content types. * - * @return \EzSystems\EzPlatformRest\Server\Values\ContentTypeList|\EzSystems\EzPlatformRest\Server\Values\ContentTypeInfoList + * @return \Ibexa\Rest\Server\Values\ContentTypeList|\Ibexa\Rest\Server\Values\ContentTypeInfoList */ public function listContentTypes(Request $request) { @@ -251,7 +251,7 @@ public function listContentTypes(Request $request) /** * Loads a content type by its identifier. * - * @return \eZ\Publish\API\Repository\Values\ContentType\ContentType + * @return \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType */ public function loadContentTypeByIdentifier(Request $request) { @@ -264,7 +264,7 @@ public function loadContentTypeByIdentifier(Request $request) /** * Loads a content type by its remote ID. * - * @return \eZ\Publish\API\Repository\Values\ContentType\ContentType + * @return \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType */ public function loadContentTypeByRemoteId(Request $request) { @@ -279,10 +279,10 @@ public function loadContentTypeByRemoteId(Request $request) * * @param $contentTypeGroupId * - * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException - * @throws \EzSystems\EzPlatformRest\Server\Exceptions\BadRequestException + * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException + * @throws \Ibexa\Rest\Server\Exceptions\BadRequestException * - * @return \EzSystems\EzPlatformRest\Server\Values\CreatedContentType + * @return \Ibexa\Rest\Server\Values\CreatedContentType */ public function createContentType($contentTypeGroupId, Request $request) { @@ -344,7 +344,7 @@ public function createContentType($contentTypeGroupId, Request $request) * * @param $contentTypeId * - * @return \EzSystems\EzPlatformRest\Server\Values\ResourceCreated + * @return \Ibexa\Rest\Server\Values\ResourceCreated */ public function copyContentType($contentTypeId) { @@ -365,9 +365,9 @@ public function copyContentType($contentTypeId) * * @param $contentTypeId * - * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException + * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException * - * @return \EzSystems\EzPlatformRest\Server\Values\CreatedContentType + * @return \Ibexa\Rest\Server\Values\CreatedContentType */ public function createContentTypeDraft($contentTypeId, Request $request) { @@ -416,7 +416,7 @@ public function createContentTypeDraft($contentTypeId, Request $request) * * @param $contentTypeId * - * @return \EzSystems\EzPlatformRest\Server\Values\RestContentType + * @return \Ibexa\Rest\Server\Values\RestContentType */ public function loadContentTypeDraft($contentTypeId) { @@ -433,9 +433,9 @@ public function loadContentTypeDraft($contentTypeId) * * @param $contentTypeId * - * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException + * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException * - * @return \EzSystems\EzPlatformRest\Server\Values\RestContentType + * @return \Ibexa\Rest\Server\Values\RestContentType */ public function updateContentTypeDraft($contentTypeId, Request $request) { @@ -471,10 +471,10 @@ public function updateContentTypeDraft($contentTypeId, Request $request) * * @param $contentTypeId * - * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException - * @throws \EzSystems\EzPlatformRest\Exceptions\NotFoundException + * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException + * @throws \Ibexa\Contracts\Rest\Exceptions\NotFoundException * - * @return \EzSystems\EzPlatformRest\Server\Values\CreatedFieldDefinition + * @return \Ibexa\Rest\Server\Values\CreatedFieldDefinition */ public function addContentTypeDraftFieldDefinition($contentTypeId, Request $request) { @@ -520,7 +520,7 @@ public function addContentTypeDraftFieldDefinition($contentTypeId, Request $requ * * @param $contentTypeId * - * @return \EzSystems\EzPlatformRest\Server\Values\FieldDefinitionList + * @return \Ibexa\Rest\Server\Values\FieldDefinitionList * * @todo Check why this isn't in the specs */ @@ -540,9 +540,9 @@ public function loadContentTypeFieldDefinitionList($contentTypeId) * @param $contentTypeId * @param $fieldDefinitionId * - * @throws \EzSystems\EzPlatformRest\Exceptions\NotFoundException + * @throws \Ibexa\Contracts\Rest\Exceptions\NotFoundException * - * @return \EzSystems\EzPlatformRest\Server\Values\RestFieldDefinition + * @return \Ibexa\Rest\Server\Values\RestFieldDefinition */ public function loadContentTypeFieldDefinition($contentTypeId, $fieldDefinitionId, Request $request) { @@ -565,7 +565,7 @@ public function loadContentTypeFieldDefinition($contentTypeId, $fieldDefinitionI * * @param $contentTypeId * - * @return \EzSystems\EzPlatformRest\Server\Values\FieldDefinitionList + * @return \Ibexa\Rest\Server\Values\FieldDefinitionList */ public function loadContentTypeDraftFieldDefinitionList($contentTypeId) { @@ -583,9 +583,9 @@ public function loadContentTypeDraftFieldDefinitionList($contentTypeId) * @param $contentTypeId * @param $fieldDefinitionId * - * @throws \EzSystems\EzPlatformRest\Exceptions\NotFoundException + * @throws \Ibexa\Contracts\Rest\Exceptions\NotFoundException * - * @return \EzSystems\EzPlatformRest\Server\Values\RestFieldDefinition + * @return \Ibexa\Rest\Server\Values\RestFieldDefinition */ public function loadContentTypeDraftFieldDefinition($contentTypeId, $fieldDefinitionId, Request $request) { @@ -609,10 +609,10 @@ public function loadContentTypeDraftFieldDefinition($contentTypeId, $fieldDefini * @param $contentTypeId * @param $fieldDefinitionId * - * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException - * @throws \EzSystems\EzPlatformRest\Exceptions\NotFoundException + * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException + * @throws \Ibexa\Contracts\Rest\Exceptions\NotFoundException * - * @return \EzSystems\EzPlatformRest\Server\Values\FieldDefinitionList + * @return \Ibexa\Rest\Server\Values\FieldDefinitionList */ public function updateContentTypeDraftFieldDefinition($contentTypeId, $fieldDefinitionId, Request $request) { @@ -665,9 +665,9 @@ public function updateContentTypeDraftFieldDefinition($contentTypeId, $fieldDefi * @param $contentTypeId * @param $fieldDefinitionId * - * @throws \EzSystems\EzPlatformRest\Exceptions\NotFoundException + * @throws \Ibexa\Contracts\Rest\Exceptions\NotFoundException * - * @return \EzSystems\EzPlatformRest\Server\Values\NoContent + * @return \Ibexa\Rest\Server\Values\NoContent */ public function removeContentTypeDraftFieldDefinition($contentTypeId, $fieldDefinitionId, Request $request) { @@ -697,9 +697,9 @@ public function removeContentTypeDraftFieldDefinition($contentTypeId, $fieldDefi * * @param $contentTypeId * - * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException + * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException * - * @return \EzSystems\EzPlatformRest\Server\Values\RestContentType + * @return \Ibexa\Rest\Server\Values\RestContentType */ public function publishContentTypeDraft($contentTypeId) { @@ -725,9 +725,9 @@ public function publishContentTypeDraft($contentTypeId) * * @param $contentTypeId * - * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException + * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException * - * @return \EzSystems\EzPlatformRest\Server\Values\NoContent + * @return \Ibexa\Rest\Server\Values\NoContent */ public function deleteContentType($contentTypeId) { @@ -747,7 +747,7 @@ public function deleteContentType($contentTypeId) * * @param $contentTypeId * - * @return \EzSystems\EzPlatformRest\Server\Values\NoContent + * @return \Ibexa\Rest\Server\Values\NoContent */ public function deleteContentTypeDraft($contentTypeId) { @@ -762,7 +762,7 @@ public function deleteContentTypeDraft($contentTypeId) * * @param $contentTypeId * - * @return \EzSystems\EzPlatformRest\Server\Values\ContentTypeGroupRefList + * @return \Ibexa\Rest\Server\Values\ContentTypeGroupRefList */ public function loadGroupsOfContentType($contentTypeId) { @@ -779,10 +779,10 @@ public function loadGroupsOfContentType($contentTypeId) * * @param mixed $contentTypeId * - * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException - * @throws \EzSystems\EzPlatformRest\Server\Exceptions\BadRequestException + * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException + * @throws \Ibexa\Rest\Server\Exceptions\BadRequestException * - * @return \EzSystems\EzPlatformRest\Server\Values\ContentTypeGroupRefList + * @return \Ibexa\Rest\Server\Values\ContentTypeGroupRefList */ public function linkContentTypeToGroup($contentTypeId, Request $request) { @@ -832,10 +832,10 @@ public function linkContentTypeToGroup($contentTypeId, Request $request) * @param $contentTypeId * @param $contentTypeGroupId * - * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException - * @throws \EzSystems\EzPlatformRest\Exceptions\NotFoundException + * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException + * @throws \Ibexa\Contracts\Rest\Exceptions\NotFoundException * - * @return \EzSystems\EzPlatformRest\Server\Values\ContentTypeGroupRefList + * @return \Ibexa\Rest\Server\Values\ContentTypeGroupRefList */ public function unlinkContentTypeFromGroup($contentTypeId, $contentTypeGroupId) { @@ -875,9 +875,9 @@ public function unlinkContentTypeFromGroup($contentTypeId, $contentTypeGroupId) /** * Converts the provided ContentTypeGroupCreateStruct to ContentTypeGroupUpdateStruct. * - * @param \eZ\Publish\API\Repository\Values\ContentType\ContentTypeGroupCreateStruct $createStruct + * @param \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentTypeGroupCreateStruct $createStruct * - * @return \eZ\Publish\API\Repository\Values\ContentType\ContentTypeGroupUpdateStruct + * @return \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentTypeGroupUpdateStruct */ private function mapToGroupUpdateStruct(ContentTypeGroupCreateStruct $createStruct) { @@ -896,7 +896,7 @@ private function mapToGroupUpdateStruct(ContentTypeGroupCreateStruct $createStru * * @return mixed * - * @throws \EzSystems\EzPlatformRest\Server\Exceptions\BadRequestException + * @throws \Ibexa\Rest\Server\Exceptions\BadRequestException */ protected function sortContentTypeList(array &$contentTypes, $orderby, $sort = 'asc') { diff --git a/src/lib/Server/Controller/JWT.php b/src/lib/Server/Controller/JWT.php index 8cd0a265..3f236a32 100644 --- a/src/lib/Server/Controller/JWT.php +++ b/src/lib/Server/Controller/JWT.php @@ -8,8 +8,8 @@ namespace Ibexa\Rest\Server\Controller; -use eZ\Publish\Core\Base\Exceptions\UnauthorizedException; -use eZ\Publish\Core\MVC\Symfony\Security\Authentication\AuthenticatorInterface; +use Ibexa\Core\Base\Exceptions\UnauthorizedException; +use Ibexa\Core\MVC\Symfony\Security\Authentication\AuthenticatorInterface; use Ibexa\Rest\Message; use Ibexa\Rest\Server\Controller as RestController; use Ibexa\Rest\Server\Values; @@ -26,7 +26,7 @@ final class JWT extends RestController /** @var \Lexik\Bundle\JWTAuthenticationBundle\Services\JWTTokenManagerInterface */ private $tokenManager; - /** @var \eZ\Publish\Core\MVC\Symfony\Security\Authentication\AuthenticatorInterface|null */ + /** @var \Ibexa\Core\MVC\Symfony\Security\Authentication\AuthenticatorInterface|null */ private $authenticator; public function __construct( @@ -39,7 +39,7 @@ public function __construct( public function createToken(Request $request): Values\JWT { - /** @var \EzSystems\EzPlatformRest\Server\Values\JWTInput $jwtTokenInput */ + /** @var \Ibexa\Rest\Server\Values\JWTInput $jwtTokenInput */ $jwtTokenInput = $this->inputDispatcher->parse( new Message( ['Content-Type' => $request->headers->get('Content-Type')], diff --git a/src/lib/Server/Controller/Location.php b/src/lib/Server/Controller/Location.php index 0d27dd7d..6fc931e9 100644 --- a/src/lib/Server/Controller/Location.php +++ b/src/lib/Server/Controller/Location.php @@ -6,15 +6,15 @@ */ namespace Ibexa\Rest\Server\Controller; -use eZ\Publish\API\Repository\URLAliasService; +use Ibexa\Contracts\Core\Repository\URLAliasService; use Ibexa\Rest\Message; use Ibexa\Contracts\Rest\Exceptions; use Ibexa\Rest\Server\Values; use Ibexa\Rest\Server\Controller as RestController; -use eZ\Publish\API\Repository\LocationService; -use eZ\Publish\API\Repository\ContentService; -use eZ\Publish\API\Repository\TrashService; -use eZ\Publish\API\Repository\Exceptions\InvalidArgumentException; +use Ibexa\Contracts\Core\Repository\LocationService; +use Ibexa\Contracts\Core\Repository\ContentService; +use Ibexa\Contracts\Core\Repository\TrashService; +use Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException; use Ibexa\Rest\Server\Exceptions\BadRequestException; use Ibexa\Rest\Server\Exceptions\ForbiddenException; use Symfony\Component\HttpFoundation\Request; @@ -27,38 +27,38 @@ class Location extends RestController /** * Location service. * - * @var \eZ\Publish\API\Repository\LocationService + * @var \Ibexa\Contracts\Core\Repository\LocationService */ protected $locationService; /** * Content service. * - * @var \eZ\Publish\API\Repository\ContentService + * @var \Ibexa\Contracts\Core\Repository\ContentService */ protected $contentService; /** * Trash service. * - * @var \eZ\Publish\API\Repository\TrashService + * @var \Ibexa\Contracts\Core\Repository\TrashService */ protected $trashService; /** * URLAlias Service. * - * @var \eZ\Publish\API\Repository\URLAliasService + * @var \Ibexa\Contracts\Core\Repository\URLAliasService */ protected $urlAliasService; /** * Construct controller. * - * @param \eZ\Publish\API\Repository\LocationService $locationService - * @param \eZ\Publish\API\Repository\ContentService $contentService - * @param \eZ\Publish\API\Repository\TrashService $trashService - * @param \eZ\Publish\API\Repository\URLAliasService $urlAliasService + * @param \Ibexa\Contracts\Core\Repository\LocationService $locationService + * @param \Ibexa\Contracts\Core\Repository\ContentService $contentService + * @param \Ibexa\Contracts\Core\Repository\TrashService $trashService + * @param \Ibexa\Contracts\Core\Repository\URLAliasService $urlAliasService */ public function __construct( LocationService $locationService, @@ -75,9 +75,9 @@ public function __construct( /** * Loads the location for a given ID (x)or remote ID. * - * @throws \EzSystems\EzPlatformRest\Server\Exceptions\BadRequestException + * @throws \Ibexa\Rest\Server\Exceptions\BadRequestException * - * @return \EzSystems\EzPlatformRest\Server\Values\TemporaryRedirect + * @return \Ibexa\Rest\Server\Values\TemporaryRedirect */ public function redirectLocation(Request $request) { @@ -107,9 +107,9 @@ public function redirectLocation(Request $request) * * @param mixed $contentId * - * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException + * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException * - * @return \EzSystems\EzPlatformRest\Server\Values\CreatedLocation + * @return \Ibexa\Rest\Server\Values\CreatedLocation */ public function createLocation($contentId, Request $request) { @@ -136,7 +136,7 @@ public function createLocation($contentId, Request $request) * * @param string $locationPath * - * @return \EzSystems\EzPlatformRest\Server\Values\RestLocation + * @return \Ibexa\Rest\Server\Values\RestLocation */ public function loadLocation($locationPath) { @@ -164,7 +164,7 @@ public function loadLocation($locationPath) * * @param string $locationPath * - * @return \EzSystems\EzPlatformRest\Server\Values\NoContent + * @return \Ibexa\Rest\Server\Values\NoContent */ public function deleteSubtree($locationPath) { @@ -181,7 +181,7 @@ public function deleteSubtree($locationPath) * * @param string $locationPath * - * @return \EzSystems\EzPlatformRest\Server\Values\ResourceCreated + * @return \Ibexa\Rest\Server\Values\ResourceCreated */ public function copySubtree($locationPath, Request $request) { @@ -215,9 +215,9 @@ public function copySubtree($locationPath, Request $request) * * @param string $locationPath * - * @throws \EzSystems\EzPlatformRest\Server\Exceptions\BadRequestException if the Destination header cannot be parsed as location or trash + * @throws \Ibexa\Rest\Server\Exceptions\BadRequestException if the Destination header cannot be parsed as location or trash * - * @return \EzSystems\EzPlatformRest\Server\Values\ResourceCreated|\EzSystems\EzPlatformRest\Server\Values\NoContent + * @return \Ibexa\Rest\Server\Values\ResourceCreated|\Ibexa\Rest\Server\Values\NoContent */ public function moveSubtree($locationPath, Request $request) { @@ -282,7 +282,7 @@ public function moveSubtree($locationPath, Request $request) * * @param string $locationPath * - * @return \EzSystems\EzPlatformRest\Server\Values\NoContent + * @return \Ibexa\Rest\Server\Values\NoContent */ public function swapLocation($locationPath, Request $request) { @@ -308,7 +308,7 @@ public function swapLocation($locationPath, Request $request) * * @todo remove, or use in loadLocation with filter * - * @return \EzSystems\EzPlatformRest\Server\Values\LocationList + * @return \Ibexa\Rest\Server\Values\LocationList */ public function loadLocationByRemoteId(Request $request) { @@ -330,7 +330,7 @@ public function loadLocationByRemoteId(Request $request) * * @param mixed $contentId * - * @return \EzSystems\EzPlatformRest\Server\Values\LocationList + * @return \Ibexa\Rest\Server\Values\LocationList */ public function loadLocationsForContent($contentId, Request $request) { @@ -355,7 +355,7 @@ public function loadLocationsForContent($contentId, Request $request) * * @param string $locationPath * - * @return \EzSystems\EzPlatformRest\Server\Values\LocationList + * @return \Ibexa\Rest\Server\Values\LocationList */ public function loadLocationChildren($locationPath, Request $request) { @@ -401,7 +401,7 @@ private function extractLocationIdFromPath($path) * * @param string $locationPath * - * @return \EzSystems\EzPlatformRest\Server\Values\RestLocation + * @return \Ibexa\Rest\Server\Values\RestLocation */ public function updateLocation($locationPath, Request $request) { diff --git a/src/lib/Server/Controller/ObjectState.php b/src/lib/Server/Controller/ObjectState.php index 7b18ece7..99c6bf3a 100644 --- a/src/lib/Server/Controller/ObjectState.php +++ b/src/lib/Server/Controller/ObjectState.php @@ -6,16 +6,16 @@ */ namespace Ibexa\Rest\Server\Controller; -use eZ\Publish\API\Repository\Values\Content\Language; +use Ibexa\Contracts\Core\Repository\Values\Content\Language; use Ibexa\Rest\Message; use Ibexa\Rest\Server\Values; use Ibexa\Rest\Values\RestObjectState; use Ibexa\Rest\Server\Controller as RestController; -use eZ\Publish\API\Repository\ObjectStateService; -use eZ\Publish\API\Repository\ContentService; +use Ibexa\Contracts\Core\Repository\ObjectStateService; +use Ibexa\Contracts\Core\Repository\ContentService; use Ibexa\Rest\Values\ContentObjectStates; -use eZ\Publish\API\Repository\Exceptions\NotFoundException; -use eZ\Publish\API\Repository\Exceptions\InvalidArgumentException; +use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException; +use Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException; use Ibexa\Rest\Server\Exceptions\ForbiddenException; use Symfony\Component\HttpFoundation\Request; @@ -27,22 +27,22 @@ class ObjectState extends RestController /** * ObjectState service. * - * @var \eZ\Publish\API\Repository\ObjectStateService + * @var \Ibexa\Contracts\Core\Repository\ObjectStateService */ protected $objectStateService; /** * Content service. * - * @var \eZ\Publish\API\Repository\ContentService + * @var \Ibexa\Contracts\Core\Repository\ContentService */ protected $contentService; /** * Construct controller. * - * @param \eZ\Publish\API\Repository\ObjectStateService $objectStateService - * @param \eZ\Publish\API\Repository\ContentService $contentService + * @param \Ibexa\Contracts\Core\Repository\ObjectStateService $objectStateService + * @param \Ibexa\Contracts\Core\Repository\ContentService $contentService */ public function __construct(ObjectStateService $objectStateService, ContentService $contentService) { @@ -53,9 +53,9 @@ public function __construct(ObjectStateService $objectStateService, ContentServi /** * Creates a new object state group. * - * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException + * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException * - * @return \EzSystems\EzPlatformRest\Server\Values\CreatedObjectStateGroup + * @return \Ibexa\Rest\Server\Values\CreatedObjectStateGroup */ public function createObjectStateGroup(Request $request) { @@ -84,9 +84,9 @@ public function createObjectStateGroup(Request $request) * * @param $objectStateGroupId * - * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException + * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException * - * @return \EzSystems\EzPlatformRest\Server\Values\CreatedObjectState + * @return \Ibexa\Rest\Server\Values\CreatedObjectState */ public function createObjectState($objectStateGroupId, Request $request) { @@ -121,7 +121,7 @@ public function createObjectState($objectStateGroupId, Request $request) * * @param $objectStateGroupId * - * @return \eZ\Publish\API\Repository\Values\ObjectState\ObjectStateGroup + * @return \Ibexa\Contracts\Core\Repository\Values\ObjectState\ObjectStateGroup */ public function loadObjectStateGroup($objectStateGroupId) { @@ -134,7 +134,7 @@ public function loadObjectStateGroup($objectStateGroupId) * @param $objectStateGroupId * @param $objectStateId * - * @return \EzSystems\EzPlatformRest\Values\RestObjectState + * @return \Ibexa\Rest\Values\RestObjectState */ public function loadObjectState($objectStateGroupId, $objectStateId) { @@ -147,7 +147,7 @@ public function loadObjectState($objectStateGroupId, $objectStateId) /** * Returns a list of all object state groups. * - * @return \EzSystems\EzPlatformRest\Server\Values\ObjectStateGroupList + * @return \Ibexa\Rest\Server\Values\ObjectStateGroupList */ public function loadObjectStateGroups() { @@ -161,7 +161,7 @@ public function loadObjectStateGroups() * * @param $objectStateGroupId * - * @return \EzSystems\EzPlatformRest\Server\Values\ObjectStateList + * @return \Ibexa\Rest\Server\Values\ObjectStateList */ public function loadObjectStates($objectStateGroupId) { @@ -178,7 +178,7 @@ public function loadObjectStates($objectStateGroupId) * * @param $objectStateGroupId * - * @return \EzSystems\EzPlatformRest\Server\Values\NoContent + * @return \Ibexa\Rest\Server\Values\NoContent */ public function deleteObjectStateGroup($objectStateGroupId) { @@ -194,7 +194,7 @@ public function deleteObjectStateGroup($objectStateGroupId) * * @param $objectStateId * - * @return \EzSystems\EzPlatformRest\Server\Values\NoContent + * @return \Ibexa\Rest\Server\Values\NoContent */ public function deleteObjectState($objectStateId) { @@ -210,9 +210,9 @@ public function deleteObjectState($objectStateId) * * @param $objectStateGroupId * - * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException + * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException * - * @return \eZ\Publish\API\Repository\Values\ObjectState\ObjectStateGroup + * @return \Ibexa\Contracts\Core\Repository\Values\ObjectState\ObjectStateGroup */ public function updateObjectStateGroup($objectStateGroupId, Request $request) { @@ -240,9 +240,9 @@ public function updateObjectStateGroup($objectStateGroupId, Request $request) * @param $objectStateGroupId * @param $objectStateId * - * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException + * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException * - * @return \EzSystems\EzPlatformRest\Values\RestObjectState + * @return \Ibexa\Rest\Values\RestObjectState */ public function updateObjectState($objectStateGroupId, $objectStateId, Request $request) { @@ -269,7 +269,7 @@ public function updateObjectState($objectStateGroupId, $objectStateId, Request $ * * @param $contentId * - * @return \EzSystems\EzPlatformRest\Values\ContentObjectStates + * @return \Ibexa\Rest\Values\ContentObjectStates */ public function getObjectStatesForContent($contentId) { @@ -296,9 +296,9 @@ public function getObjectStatesForContent($contentId) * * @param $contentId * - * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException + * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException * - * @return \EzSystems\EzPlatformRest\Values\ContentObjectStates + * @return \Ibexa\Rest\Values\ContentObjectStates */ public function setObjectStatesForContent($contentId, Request $request) { diff --git a/src/lib/Server/Controller/Role.php b/src/lib/Server/Controller/Role.php index 777cec12..cadb1bb5 100644 --- a/src/lib/Server/Controller/Role.php +++ b/src/lib/Server/Controller/Role.php @@ -6,22 +6,22 @@ */ namespace Ibexa\Rest\Server\Controller; -use eZ\Publish\API\Repository\Exceptions\LimitationValidationException; -use eZ\Publish\API\Repository\Exceptions\NotFoundException; -use eZ\Publish\Core\Base\Exceptions\ForbiddenException; -use eZ\Publish\Core\Base\Exceptions\InvalidArgumentException; -use eZ\Publish\Core\Base\Exceptions\UnauthorizedException; +use Ibexa\Contracts\Core\Repository\Exceptions\LimitationValidationException; +use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException; +use Ibexa\Core\Base\Exceptions\ForbiddenException; +use Ibexa\Core\Base\Exceptions\InvalidArgumentException; +use Ibexa\Core\Base\Exceptions\UnauthorizedException; use Ibexa\Rest\Message; use Ibexa\Contracts\Rest\Exceptions; use Ibexa\Rest\Server\Exceptions\BadRequestException; use Ibexa\Rest\Server\Values; use Ibexa\Rest\Server\Controller as RestController; -use eZ\Publish\API\Repository\RoleService; -use eZ\Publish\API\Repository\UserService; -use eZ\Publish\API\Repository\LocationService; -use eZ\Publish\API\Repository\Values\User\RoleCreateStruct; -use eZ\Publish\API\Repository\Values\User\RoleUpdateStruct; -use eZ\Publish\API\Repository\Exceptions\NotFoundException as APINotFoundException; +use Ibexa\Contracts\Core\Repository\RoleService; +use Ibexa\Contracts\Core\Repository\UserService; +use Ibexa\Contracts\Core\Repository\LocationService; +use Ibexa\Contracts\Core\Repository\Values\User\RoleCreateStruct; +use Ibexa\Contracts\Core\Repository\Values\User\RoleUpdateStruct; +use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException as APINotFoundException; use Symfony\Component\HttpFoundation\Request; /** @@ -32,30 +32,30 @@ class Role extends RestController /** * Role service. * - * @var \eZ\Publish\API\Repository\RoleService + * @var \Ibexa\Contracts\Core\Repository\RoleService */ protected $roleService; /** * User service. * - * @var \eZ\Publish\API\Repository\UserService + * @var \Ibexa\Contracts\Core\Repository\UserService */ protected $userService; /** * Location service. * - * @var \eZ\Publish\API\Repository\LocationService + * @var \Ibexa\Contracts\Core\Repository\LocationService */ protected $locationService; /** * Construct controller. * - * @param \eZ\Publish\API\Repository\RoleService $roleService - * @param \eZ\Publish\API\Repository\UserService $userService - * @param \eZ\Publish\API\Repository\LocationService $locationService + * @param \Ibexa\Contracts\Core\Repository\RoleService $roleService + * @param \Ibexa\Contracts\Core\Repository\UserService $userService + * @param \Ibexa\Contracts\Core\Repository\LocationService $locationService */ public function __construct( RoleService $roleService, @@ -72,7 +72,7 @@ public function __construct( * * Defaults to publishing the role, but you can create a draft instead by setting the POST parameter publish=false * - * @return \EzSystems\EzPlatformRest\Server\Values\CreatedRole + * @return \Ibexa\Rest\Server\Values\CreatedRole */ public function createRole(Request $request) { @@ -126,11 +126,11 @@ public function createRole(Request $request) * * @since 6.2 * - * @throws \eZ\Publish\API\Repository\Exceptions\ForbiddenException if the Role already has a Role Draft that will need to be removed first, + * @throws \Ibexa\Contracts\Core\Repository\Exceptions\ForbiddenException if the Role already has a Role Draft that will need to be removed first, * or if the authenticated user is not allowed to create a role - * @throws \EzSystems\EzPlatformRest\Server\Exceptions\BadRequestException if a policy limitation in the $roleCreateStruct is not valid + * @throws \Ibexa\Rest\Server\Exceptions\BadRequestException if a policy limitation in the $roleCreateStruct is not valid * - * @return \EzSystems\EzPlatformRest\Server\Values\CreatedRole + * @return \Ibexa\Rest\Server\Values\CreatedRole */ public function createRoleDraft($roleId, Request $request) { @@ -154,7 +154,7 @@ public function createRoleDraft($roleId, Request $request) /** * Loads list of roles. * - * @return \EzSystems\EzPlatformRest\Server\Values\RoleList + * @return \Ibexa\Rest\Server\Values\RoleList */ public function listRoles(Request $request) { @@ -185,7 +185,7 @@ public function listRoles(Request $request) * * @param $roleId * - * @return \eZ\Publish\API\Repository\Values\User\Role + * @return \Ibexa\Contracts\Core\Repository\Values\User\Role */ public function loadRole($roleId) { @@ -197,7 +197,7 @@ public function loadRole($roleId) * * @param mixed $roleId Original role ID, or ID of the role draft itself * - * @return \eZ\Publish\API\Repository\Values\User\RoleDraft + * @return \Ibexa\Contracts\Core\Repository\Values\User\RoleDraft */ public function loadRoleDraft($roleId) { @@ -216,7 +216,7 @@ public function loadRoleDraft($roleId) * * @param $roleId * - * @return \eZ\Publish\API\Repository\Values\User\Role + * @return \Ibexa\Contracts\Core\Repository\Values\User\Role */ public function updateRole($roleId, Request $request) { @@ -244,7 +244,7 @@ public function updateRole($roleId, Request $request) * * @param mixed $roleId Original role ID, or ID of the role draft itself * - * @return \eZ\Publish\API\Repository\Values\User\RoleDraft + * @return \Ibexa\Contracts\Core\Repository\Values\User\RoleDraft */ public function updateRoleDraft($roleId, Request $request) { @@ -272,7 +272,7 @@ public function updateRoleDraft($roleId, Request $request) * * @param mixed $roleId Original role ID, or ID of the role draft itself * - * @return \EzSystems\EzPlatformRest\Server\Values\PublishedRole + * @return \Ibexa\Rest\Server\Values\PublishedRole */ public function publishRoleDraft($roleId) { @@ -297,7 +297,7 @@ public function publishRoleDraft($roleId) * * @param $roleId * - * @return \EzSystems\EzPlatformRest\Server\Values\NoContent + * @return \Ibexa\Rest\Server\Values\NoContent */ public function deleteRole($roleId) { @@ -315,7 +315,7 @@ public function deleteRole($roleId) * * @param $roleId * - * @return \EzSystems\EzPlatformRest\Server\Values\NoContent + * @return \Ibexa\Rest\Server\Values\NoContent */ public function deleteRoleDraft($roleId) { @@ -331,7 +331,7 @@ public function deleteRoleDraft($roleId) * * @param $roleId * - * @return \EzSystems\EzPlatformRest\Server\Values\PolicyList + * @return \Ibexa\Rest\Server\Values\PolicyList */ public function loadPolicies($roleId, Request $request) { @@ -345,13 +345,13 @@ public function loadPolicies($roleId, Request $request) * * @param $roleId * - * @return \EzSystems\EzPlatformRest\Server\Values\NoContent + * @return \Ibexa\Rest\Server\Values\NoContent */ public function deletePolicies($roleId) { $loadedRole = $this->roleService->loadRole($roleId); $roleDraft = $this->roleService->createRoleDraft($loadedRole); - /** @var \eZ\Publish\API\Repository\Values\User\PolicyDraft $policyDraft */ + /** @var \Ibexa\Contracts\Core\Repository\Values\User\PolicyDraft $policyDraft */ foreach ($roleDraft->getPolicies() as $policyDraft) { $this->roleService->removePolicyByRoleDraft($roleDraft, $policyDraft); } @@ -366,9 +366,9 @@ public function deletePolicies($roleId) * @param $roleId * @param $policyId * - * @throws \EzSystems\EzPlatformRest\Exceptions\NotFoundException + * @throws \Ibexa\Contracts\Rest\Exceptions\NotFoundException * - * @return \eZ\Publish\API\Repository\Values\User\Policy + * @return \Ibexa\Contracts\Core\Repository\Values\User\Policy */ public function loadPolicy($roleId, $policyId, Request $request) { @@ -387,7 +387,7 @@ public function loadPolicy($roleId, $policyId, Request $request) * * @param int $roleId ID of a role draft * - * @return \EzSystems\EzPlatformRest\Server\Values\CreatedPolicy + * @return \Ibexa\Rest\Server\Values\CreatedPolicy */ public function addPolicy($roleId, Request $request) { @@ -434,7 +434,7 @@ public function addPolicy($roleId, Request $request) * * @param $role \eZ\Publish\API\Repository\Values\User\Role * - * @return \eZ\Publish\API\Repository\Values\User\Policy + * @return \Ibexa\Contracts\Core\Repository\Values\User\Policy */ private function getLastAddedPolicy($role) { @@ -456,9 +456,9 @@ private function getLastAddedPolicy($role) * @param int $roleId ID of a role draft * @param int $policyId ID of a policy * - * @throws \EzSystems\EzPlatformRest\Exceptions\NotFoundException + * @throws \Ibexa\Contracts\Rest\Exceptions\NotFoundException * - * @return \eZ\Publish\API\Repository\Values\User\Policy + * @return \Ibexa\Contracts\Core\Repository\Values\User\Policy */ public function updatePolicy($roleId, $policyId, Request $request) { @@ -521,9 +521,9 @@ public function updatePolicy($roleId, $policyId, Request $request) * @param int $roleId ID of a role draft * @param int $policyId ID of a policy * - * @throws \EzSystems\EzPlatformRest\Exceptions\NotFoundException + * @throws \Ibexa\Contracts\Rest\Exceptions\NotFoundException * - * @return \EzSystems\EzPlatformRest\Server\Values\NoContent + * @return \Ibexa\Rest\Server\Values\NoContent */ public function deletePolicy($roleId, $policyId, Request $request) { @@ -569,7 +569,7 @@ public function deletePolicy($roleId, $policyId, Request $request) * * @param $userId * - * @return \EzSystems\EzPlatformRest\Server\Values\RoleAssignmentList + * @return \Ibexa\Rest\Server\Values\RoleAssignmentList */ public function assignRoleToUser($userId, Request $request) { @@ -599,7 +599,7 @@ public function assignRoleToUser($userId, Request $request) * * @param $groupPath * - * @return \EzSystems\EzPlatformRest\Server\Values\RoleAssignmentList + * @return \Ibexa\Rest\Server\Values\RoleAssignmentList */ public function assignRoleToUserGroup($groupPath, Request $request) { @@ -633,7 +633,7 @@ public function assignRoleToUserGroup($groupPath, Request $request) * @param $userId * @param $roleId * - * @return \EzSystems\EzPlatformRest\Server\Values\RoleAssignmentList + * @return \Ibexa\Rest\Server\Values\RoleAssignmentList */ public function unassignRoleFromUser($userId, $roleId) { @@ -656,7 +656,7 @@ public function unassignRoleFromUser($userId, $roleId) * @param $groupPath * @param $roleId * - * @return \EzSystems\EzPlatformRest\Server\Values\RoleAssignmentList + * @return \Ibexa\Rest\Server\Values\RoleAssignmentList */ public function unassignRoleFromUserGroup($groupPath, $roleId) { @@ -680,7 +680,7 @@ public function unassignRoleFromUserGroup($groupPath, $roleId) * * @param $userId * - * @return \EzSystems\EzPlatformRest\Server\Values\RoleAssignmentList + * @return \Ibexa\Rest\Server\Values\RoleAssignmentList */ public function loadRoleAssignmentsForUser($userId) { @@ -696,7 +696,7 @@ public function loadRoleAssignmentsForUser($userId) * * @param $groupPath * - * @return \EzSystems\EzPlatformRest\Server\Values\RoleAssignmentList + * @return \Ibexa\Rest\Server\Values\RoleAssignmentList */ public function loadRoleAssignmentsForUserGroup($groupPath) { @@ -715,9 +715,9 @@ public function loadRoleAssignmentsForUserGroup($groupPath) * @param $userId * @param $roleId * - * @throws \EzSystems\EzPlatformRest\Exceptions\NotFoundException + * @throws \Ibexa\Contracts\Rest\Exceptions\NotFoundException * - * @return \EzSystems\EzPlatformRest\Server\Values\RestUserRoleAssignment + * @return \Ibexa\Rest\Server\Values\RestUserRoleAssignment */ public function loadRoleAssignmentForUser($userId, $roleId, Request $request) { @@ -739,9 +739,9 @@ public function loadRoleAssignmentForUser($userId, $roleId, Request $request) * @param $groupPath * @param $roleId * - * @throws \EzSystems\EzPlatformRest\Exceptions\NotFoundException + * @throws \Ibexa\Contracts\Rest\Exceptions\NotFoundException * - * @return \EzSystems\EzPlatformRest\Server\Values\RestUserGroupRoleAssignment + * @return \Ibexa\Rest\Server\Values\RestUserGroupRoleAssignment */ public function loadRoleAssignmentForUserGroup($groupPath, $roleId, Request $request) { @@ -762,7 +762,7 @@ public function loadRoleAssignmentForUserGroup($groupPath, $roleId, Request $req /** * Search all policies which are applied to a given user. * - * @return \EzSystems\EzPlatformRest\Server\Values\PolicyList + * @return \Ibexa\Rest\Server\Values\PolicyList */ public function listPoliciesForUser(Request $request) { @@ -785,9 +785,9 @@ public function listPoliciesForUser(Request $request) * * Needed since both structs are encoded into the same media type on input. * - * @param \eZ\Publish\API\Repository\Values\User\RoleCreateStruct $createStruct + * @param \Ibexa\Contracts\Core\Repository\Values\User\RoleCreateStruct $createStruct * - * @return \eZ\Publish\API\Repository\Values\User\RoleUpdateStruct + * @return \Ibexa\Contracts\Core\Repository\Values\User\RoleUpdateStruct */ protected function mapToUpdateStruct(RoleCreateStruct $createStruct) { diff --git a/src/lib/Server/Controller/Root.php b/src/lib/Server/Controller/Root.php index f2512d35..09eef83b 100644 --- a/src/lib/Server/Controller/Root.php +++ b/src/lib/Server/Controller/Root.php @@ -16,7 +16,7 @@ class Root extends RestController { /** - * @var RootResourceBuilderInterface + * @var \Ibexa\Rest\Server\Service\RootResourceBuilderInterface */ private $rootResourceBuilder; @@ -28,7 +28,7 @@ public function __construct($rootResourceBuilder) /** * List the root resources of the eZ Publish installation. * - * @return \EzSystems\EzPlatformRest\Values\Root + * @return \Ibexa\Rest\Values\Root */ public function loadRootResource() { @@ -38,7 +38,7 @@ public function loadRootResource() /** * Catch-all for REST requests. * - * @throws \EzSystems\EzPlatformRest\Exceptions\NotFoundException + * @throws \Ibexa\Contracts\Rest\Exceptions\NotFoundException */ public function catchAll() { diff --git a/src/lib/Server/Controller/Section.php b/src/lib/Server/Controller/Section.php index 32a31696..15dc93ec 100644 --- a/src/lib/Server/Controller/Section.php +++ b/src/lib/Server/Controller/Section.php @@ -9,11 +9,11 @@ use Ibexa\Rest\Message; use Ibexa\Rest\Server\Values; use Ibexa\Rest\Server\Controller as RestController; -use eZ\Publish\API\Repository\SectionService; -use eZ\Publish\API\Repository\Values\Content\SectionCreateStruct; -use eZ\Publish\API\Repository\Values\Content\SectionUpdateStruct; +use Ibexa\Contracts\Core\Repository\SectionService; +use Ibexa\Contracts\Core\Repository\Values\Content\SectionCreateStruct; +use Ibexa\Contracts\Core\Repository\Values\Content\SectionUpdateStruct; use Ibexa\Rest\Server\Values\NoContent; -use eZ\Publish\API\Repository\Exceptions\InvalidArgumentException; +use Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException; use Ibexa\Rest\Server\Exceptions\ForbiddenException; use Symfony\Component\HttpFoundation\Request; @@ -25,14 +25,14 @@ class Section extends RestController /** * Section service. * - * @var \eZ\Publish\API\Repository\SectionService + * @var \Ibexa\Contracts\Core\Repository\SectionService */ protected $sectionService; /** * Construct controller. * - * @param \eZ\Publish\API\Repository\SectionService $sectionService + * @param \Ibexa\Contracts\Core\Repository\SectionService $sectionService */ public function __construct(SectionService $sectionService) { @@ -42,7 +42,7 @@ public function __construct(SectionService $sectionService) /** * List sections. * - * @return \EzSystems\EzPlatformRest\Server\Values\SectionList + * @return \Ibexa\Rest\Server\Values\SectionList */ public function listSections(Request $request) { @@ -60,7 +60,7 @@ public function listSections(Request $request) /** * Loads section by identifier. * - * @return \eZ\Publish\API\Repository\Values\Content\Section + * @return \Ibexa\Contracts\Core\Repository\Values\Content\Section */ public function loadSectionByIdentifier(Request $request) { @@ -73,9 +73,9 @@ public function loadSectionByIdentifier(Request $request) /** * Create new section. * - * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException + * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException * - * @return \EzSystems\EzPlatformRest\Server\Values\CreatedSection + * @return \Ibexa\Rest\Server\Values\CreatedSection */ public function createSection(Request $request) { @@ -104,7 +104,7 @@ public function createSection(Request $request) * * @param $sectionId * - * @return \eZ\Publish\API\Repository\Values\Content\Section + * @return \Ibexa\Contracts\Core\Repository\Values\Content\Section */ public function loadSection($sectionId) { @@ -116,9 +116,9 @@ public function loadSection($sectionId) * * @param $sectionId * - * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException + * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException * - * @return \eZ\Publish\API\Repository\Values\Content\Section + * @return \Ibexa\Contracts\Core\Repository\Values\Content\Section */ public function updateSection($sectionId, Request $request) { @@ -144,7 +144,7 @@ public function updateSection($sectionId, Request $request) * * @param $sectionId * - * @return \EzSystems\EzPlatformRest\Server\Values\NoContent + * @return \Ibexa\Rest\Server\Values\NoContent */ public function deleteSection($sectionId) { @@ -160,9 +160,9 @@ public function deleteSection($sectionId) * * Needed since both structs are encoded into the same media type on input. * - * @param \eZ\Publish\API\Repository\Values\Content\SectionCreateStruct $createStruct + * @param \Ibexa\Contracts\Core\Repository\Values\Content\SectionCreateStruct $createStruct * - * @return \eZ\Publish\API\Repository\Values\Content\SectionUpdateStruct + * @return \Ibexa\Contracts\Core\Repository\Values\Content\SectionUpdateStruct */ protected function mapToUpdateStruct(SectionCreateStruct $createStruct) { diff --git a/src/lib/Server/Controller/SessionController.php b/src/lib/Server/Controller/SessionController.php index 77a88faf..602a8c7e 100644 --- a/src/lib/Server/Controller/SessionController.php +++ b/src/lib/Server/Controller/SessionController.php @@ -6,10 +6,10 @@ */ namespace Ibexa\Rest\Server\Controller; -use eZ\Publish\API\Repository\PermissionResolver; -use eZ\Publish\API\Repository\UserService; -use eZ\Publish\Core\Base\Exceptions\UnauthorizedException; -use eZ\Publish\Core\MVC\Symfony\Security\Authentication\AuthenticatorInterface; +use Ibexa\Contracts\Core\Repository\PermissionResolver; +use Ibexa\Contracts\Core\Repository\UserService; +use Ibexa\Core\Base\Exceptions\UnauthorizedException; +use Ibexa\Core\MVC\Symfony\Security\Authentication\AuthenticatorInterface; use Ibexa\Contracts\Rest\Exceptions\NotFoundException; use Ibexa\Rest\Message; use Ibexa\Rest\Server\Controller; @@ -24,19 +24,19 @@ class SessionController extends Controller { - /** @var \eZ\Publish\Core\MVC\Symfony\Security\Authentication\AuthenticatorInterface|null */ + /** @var \Ibexa\Core\MVC\Symfony\Security\Authentication\AuthenticatorInterface|null */ private $authenticator; - /** @var \EzSystems\EzPlatformRest\Server\Security\CsrfTokenManager */ + /** @var \Ibexa\Rest\Server\Security\CsrfTokenManager */ private $csrfTokenManager; /** @var string */ private $csrfTokenIntention; - /** @var \eZ\Publish\API\Repository\PermissionResolver */ + /** @var \Ibexa\Contracts\Core\Repository\PermissionResolver */ private $permissionResolver; - /** @var \eZ\Publish\API\Repository\UserService */ + /** @var \Ibexa\Contracts\Core\Repository\UserService */ private $userService; /** @var \Symfony\Component\Security\Csrf\TokenStorage\TokenStorageInterface */ @@ -61,7 +61,7 @@ public function __construct( /** * Creates a new session based on the credentials provided as POST parameters. * - * @throws \eZ\Publish\Core\Base\Exceptions\UnauthorizedException If the login or password are incorrect or invalid CSRF + * @throws \Ibexa\Core\Base\Exceptions\UnauthorizedException If the login or password are incorrect or invalid CSRF * * @return Values\UserSession|Values\Conflict */ @@ -110,9 +110,9 @@ public function createSessionAction(Request $request) * * @param string $sessionId * - * @throws \EzSystems\EzPlatformRest\Exceptions\NotFoundException + * @throws \Ibexa\Contracts\Rest\Exceptions\NotFoundException * - * @return \EzSystems\EzPlatformRest\Server\Values\UserSession + * @return \Ibexa\Rest\Server\Values\UserSession */ public function refreshSessionAction($sessionId, Request $request) { @@ -146,7 +146,7 @@ public function refreshSessionAction($sessionId, Request $request) * * @return Values\DeletedUserSession * - * @throws NotFoundException + * @throws \Ibexa\Contracts\Rest\Exceptions\NotFoundException */ public function deleteSessionAction($sessionId, Request $request) { @@ -181,9 +181,9 @@ private function hasStoredCsrfToken() /** * Checks the presence / validity of the CSRF token. * - * @param Request $request + * @param \Symfony\Component\HttpFoundation\Request $request * - * @throws UnauthorizedException if the token is missing or invalid + * @throws \Ibexa\Core\Base\Exceptions\UnauthorizedException if the token is missing or invalid */ private function checkCsrfToken(Request $request) { diff --git a/src/lib/Server/Controller/Trash.php b/src/lib/Server/Controller/Trash.php index bb0410e5..9ba902d7 100644 --- a/src/lib/Server/Controller/Trash.php +++ b/src/lib/Server/Controller/Trash.php @@ -8,10 +8,10 @@ use Ibexa\Rest\Server\Values; use Ibexa\Rest\Server\Controller as RestController; -use eZ\Publish\API\Repository\TrashService; -use eZ\Publish\API\Repository\LocationService; -use eZ\Publish\API\Repository\Values\Content\Query; -use eZ\Publish\API\Repository\Exceptions\NotFoundException; +use Ibexa\Contracts\Core\Repository\TrashService; +use Ibexa\Contracts\Core\Repository\LocationService; +use Ibexa\Contracts\Core\Repository\Values\Content\Query; +use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException; use Ibexa\Rest\Server\Exceptions\ForbiddenException; use InvalidArgumentException; use Symfony\Component\HttpFoundation\Request; @@ -24,22 +24,22 @@ class Trash extends RestController /** * Trash service. * - * @var \eZ\Publish\API\Repository\TrashService + * @var \Ibexa\Contracts\Core\Repository\TrashService */ protected $trashService; /** * Location service. * - * @var \eZ\Publish\API\Repository\LocationService + * @var \Ibexa\Contracts\Core\Repository\LocationService */ protected $locationService; /** * Construct controller. * - * @param \eZ\Publish\API\Repository\TrashService $trashService - * @param \eZ\Publish\API\Repository\LocationService $locationService + * @param \Ibexa\Contracts\Core\Repository\TrashService $trashService + * @param \Ibexa\Contracts\Core\Repository\LocationService $locationService */ public function __construct(TrashService $trashService, LocationService $locationService) { @@ -50,7 +50,7 @@ public function __construct(TrashService $trashService, LocationService $locatio /** * Returns a list of all trash items. * - * @return \EzSystems\EzPlatformRest\Server\Values\Trash + * @return \Ibexa\Rest\Server\Values\Trash */ public function loadTrashItems(Request $request) { @@ -81,7 +81,7 @@ public function loadTrashItems(Request $request) * * @param $trashItemId * - * @return \EzSystems\EzPlatformRest\Server\Values\RestTrashItem + * @return \Ibexa\Rest\Server\Values\RestTrashItem */ public function loadTrashItem($trashItemId) { @@ -94,7 +94,7 @@ public function loadTrashItem($trashItemId) /** * Empties the trash. * - * @return \EzSystems\EzPlatformRest\Server\Values\NoContent + * @return \Ibexa\Rest\Server\Values\NoContent */ public function emptyTrash() { @@ -108,7 +108,7 @@ public function emptyTrash() * * @param $trashItemId * - * @return \EzSystems\EzPlatformRest\Server\Values\NoContent + * @return \Ibexa\Rest\Server\Values\NoContent */ public function deleteTrashItem($trashItemId) { @@ -124,9 +124,9 @@ public function deleteTrashItem($trashItemId) * * @param $trashItemId * - * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException + * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException * - * @return \EzSystems\EzPlatformRest\Server\Values\ResourceCreated + * @return \Ibexa\Rest\Server\Values\ResourceCreated */ public function restoreTrashItem($trashItemId, Request $request) { diff --git a/src/lib/Server/Controller/URLAlias.php b/src/lib/Server/Controller/URLAlias.php index 6598cadc..be4e7c8d 100644 --- a/src/lib/Server/Controller/URLAlias.php +++ b/src/lib/Server/Controller/URLAlias.php @@ -7,12 +7,12 @@ namespace Ibexa\Rest\Server\Controller; use Ibexa\Rest\Server\Exceptions\ForbiddenException; -use eZ\Publish\API\Repository\Exceptions\InvalidArgumentException; +use Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException; use Ibexa\Rest\Message; use Ibexa\Rest\Server\Values; use Ibexa\Rest\Server\Controller as RestController; -use eZ\Publish\API\Repository\URLAliasService; -use eZ\Publish\API\Repository\LocationService; +use Ibexa\Contracts\Core\Repository\URLAliasService; +use Ibexa\Contracts\Core\Repository\LocationService; use Symfony\Component\HttpFoundation\Request; /** @@ -23,22 +23,22 @@ class URLAlias extends RestController /** * URLAlias service. * - * @var \eZ\Publish\API\Repository\URLAliasService + * @var \Ibexa\Contracts\Core\Repository\URLAliasService */ protected $urlAliasService; /** * Location service. * - * @var \eZ\Publish\API\Repository\LocationService + * @var \Ibexa\Contracts\Core\Repository\LocationService */ protected $locationService; /** * Construct controller. * - * @param \eZ\Publish\API\Repository\URLAliasService $urlAliasService - * @param \eZ\Publish\API\Repository\LocationService $locationService + * @param \Ibexa\Contracts\Core\Repository\URLAliasService $urlAliasService + * @param \Ibexa\Contracts\Core\Repository\LocationService $locationService */ public function __construct(URLAliasService $urlAliasService, LocationService $locationService) { @@ -51,7 +51,7 @@ public function __construct(URLAliasService $urlAliasService, LocationService $l * * @param $urlAliasId * - * @return \eZ\Publish\API\Repository\Values\Content\URLAlias + * @return \Ibexa\Contracts\Core\Repository\Values\Content\URLAlias */ public function loadURLAlias($urlAliasId) { @@ -61,7 +61,7 @@ public function loadURLAlias($urlAliasId) /** * Returns the list of global URL aliases. * - * @return \EzSystems\EzPlatformRest\Server\Values\URLAliasRefList + * @return \Ibexa\Rest\Server\Values\URLAliasRefList */ public function listGlobalURLAliases() { @@ -76,7 +76,7 @@ public function listGlobalURLAliases() * * @param $locationPath * - * @return \EzSystems\EzPlatformRest\Server\Values\URLAliasRefList + * @return \Ibexa\Rest\Server\Values\URLAliasRefList */ public function listLocationURLAliases($locationPath, Request $request) { @@ -100,9 +100,9 @@ public function listLocationURLAliases($locationPath, Request $request) /** * Creates a new URL alias. * - * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException + * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException * - * @return \EzSystems\EzPlatformRest\Server\Values\CreatedURLAlias + * @return \Ibexa\Rest\Server\Values\CreatedURLAlias */ public function createURLAlias(Request $request) { @@ -160,7 +160,7 @@ public function createURLAlias(Request $request) * * @param $urlAliasId * - * @return \EzSystems\EzPlatformRest\Server\Values\NoContent + * @return \Ibexa\Rest\Server\Values\NoContent */ public function deleteURLAlias($urlAliasId) { diff --git a/src/lib/Server/Controller/URLWildcard.php b/src/lib/Server/Controller/URLWildcard.php index a7ad152c..4c2e562a 100644 --- a/src/lib/Server/Controller/URLWildcard.php +++ b/src/lib/Server/Controller/URLWildcard.php @@ -7,11 +7,11 @@ namespace Ibexa\Rest\Server\Controller; use Ibexa\Rest\Server\Exceptions\ForbiddenException; -use eZ\Publish\API\Repository\Exceptions\InvalidArgumentException; +use Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException; use Ibexa\Rest\Message; use Ibexa\Rest\Server\Values; use Ibexa\Rest\Server\Controller as RestController; -use eZ\Publish\API\Repository\URLWildcardService; +use Ibexa\Contracts\Core\Repository\URLWildcardService; use Symfony\Component\HttpFoundation\Request; /** @@ -22,14 +22,14 @@ class URLWildcard extends RestController /** * URLWildcard service. * - * @var \eZ\Publish\API\Repository\URLWildcardService + * @var \Ibexa\Contracts\Core\Repository\URLWildcardService */ protected $urlWildcardService; /** * Construct controller. * - * @param \eZ\Publish\API\Repository\URLWildcardService $urlWildcardService + * @param \Ibexa\Contracts\Core\Repository\URLWildcardService $urlWildcardService */ public function __construct(URLWildcardService $urlWildcardService) { @@ -41,7 +41,7 @@ public function __construct(URLWildcardService $urlWildcardService) * * @param $urlWildcardId * - * @return \eZ\Publish\API\Repository\Values\Content\URLWildcard + * @return \Ibexa\Contracts\Core\Repository\Values\Content\URLWildcard */ public function loadURLWildcard($urlWildcardId) { @@ -51,7 +51,7 @@ public function loadURLWildcard($urlWildcardId) /** * Returns the list of URL wildcards. * - * @return \EzSystems\EzPlatformRest\Server\Values\URLWildcardList + * @return \Ibexa\Rest\Server\Values\URLWildcardList */ public function listURLWildcards() { @@ -63,9 +63,9 @@ public function listURLWildcards() /** * Creates a new URL wildcard. * - * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException + * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException * - * @return \EzSystems\EzPlatformRest\Server\Values\CreatedURLWildcard + * @return \Ibexa\Rest\Server\Values\CreatedURLWildcard */ public function createURLWildcard(Request $request) { @@ -98,7 +98,7 @@ public function createURLWildcard(Request $request) * * @param $urlWildcardId * - * @return \EzSystems\EzPlatformRest\Server\Values\NoContent + * @return \Ibexa\Rest\Server\Values\NoContent */ public function deleteURLWildcard($urlWildcardId) { diff --git a/src/lib/Server/Controller/User.php b/src/lib/Server/Controller/User.php index 14fab13f..7344ddca 100644 --- a/src/lib/Server/Controller/User.php +++ b/src/lib/Server/Controller/User.php @@ -6,26 +6,26 @@ */ namespace Ibexa\Rest\Server\Controller; -use eZ\Publish\API\Repository\PermissionResolver; -use eZ\Publish\API\Repository\Values\Content\Language; +use Ibexa\Contracts\Core\Repository\PermissionResolver; +use Ibexa\Contracts\Core\Repository\Values\Content\Language; use Ibexa\Rest\Message; use Ibexa\Rest\Server\Values; use Ibexa\Rest\Server\Exceptions; use Ibexa\Rest\Server\Controller as RestController; -use eZ\Publish\API\Repository\UserService; -use eZ\Publish\API\Repository\ContentService; -use eZ\Publish\API\Repository\ContentTypeService; -use eZ\Publish\API\Repository\RoleService; -use eZ\Publish\API\Repository\LocationService; -use eZ\Publish\API\Repository\SectionService; -use eZ\Publish\API\Repository\Repository; -use eZ\Publish\API\Repository\Values\User\UserRoleAssignment; -use eZ\Publish\API\Repository\Values\User\UserGroupRoleAssignment; -use eZ\Publish\API\Repository\Values\User\User as RepositoryUser; -use eZ\Publish\API\Repository\Exceptions as ApiExceptions; +use Ibexa\Contracts\Core\Repository\UserService; +use Ibexa\Contracts\Core\Repository\ContentService; +use Ibexa\Contracts\Core\Repository\ContentTypeService; +use Ibexa\Contracts\Core\Repository\RoleService; +use Ibexa\Contracts\Core\Repository\LocationService; +use Ibexa\Contracts\Core\Repository\SectionService; +use Ibexa\Contracts\Core\Repository\Repository; +use Ibexa\Contracts\Core\Repository\Values\User\UserRoleAssignment; +use Ibexa\Contracts\Core\Repository\Values\User\UserGroupRoleAssignment; +use Ibexa\Contracts\Core\Repository\Values\User\User as RepositoryUser; +use Ibexa\Core\Repository\Exceptions as ApiExceptions; use Ibexa\Rest\Server\Exceptions\ForbiddenException; use Ibexa\Contracts\Rest\Exceptions\NotFoundException; -use eZ\Publish\Core\Base\Exceptions\UnauthorizedException; +use Ibexa\Core\Base\Exceptions\UnauthorizedException; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\Security\Csrf\TokenStorage\TokenStorageInterface; @@ -37,49 +37,49 @@ class User extends RestController /** * User service. * - * @var \eZ\Publish\API\Repository\UserService + * @var \Ibexa\Contracts\Core\Repository\UserService */ protected $userService; /** * Role service. * - * @var \eZ\Publish\API\Repository\RoleService + * @var \Ibexa\Contracts\Core\Repository\RoleService */ protected $roleService; /** * Content service. * - * @var \eZ\Publish\API\Repository\ContentService + * @var \Ibexa\Contracts\Core\Repository\ContentService */ protected $contentService; /** * Content service. * - * @var \eZ\Publish\API\Repository\ContentTypeService + * @var \Ibexa\Contracts\Core\Repository\ContentTypeService */ protected $contentTypeService; /** * Location service. * - * @var \eZ\Publish\API\Repository\LocationService + * @var \Ibexa\Contracts\Core\Repository\LocationService */ protected $locationService; /** * Section service. * - * @var \eZ\Publish\API\Repository\SectionService + * @var \Ibexa\Contracts\Core\Repository\SectionService */ protected $sectionService; /** * Repository. * - * @var \eZ\Publish\API\Repository\Repository + * @var \Ibexa\Contracts\Core\Repository\Repository */ protected $repository; @@ -91,13 +91,13 @@ class User extends RestController private $csrfTokenStorage; /** - * @var \EzSystems\EzPlatformRest\Server\Controller\SessionController + * @var \Ibexa\Rest\Server\Controller\SessionController * * @deprecated This property is added for backward compatibility. It is deprecated, and will be removed in 7.0. */ private $sessionController; - /** @var \eZ\Publish\API\Repository\PermissionResolver */ + /** @var \Ibexa\Contracts\Core\Repository\PermissionResolver */ private $permissionResolver; public function __construct( @@ -123,7 +123,7 @@ public function __construct( /** * Redirects to the root user group. * - * @return \EzSystems\EzPlatformRest\Server\Values\PermanentRedirect + * @return \Ibexa\Rest\Server\Values\PermanentRedirect */ public function loadRootUserGroup() { @@ -138,7 +138,7 @@ public function loadRootUserGroup() * * @param $groupPath * - * @return \EzSystems\EzPlatformRest\Server\Values\RestUserGroup + * @return \Ibexa\Rest\Server\Values\RestUserGroup */ public function loadUserGroup($groupPath) { @@ -176,7 +176,7 @@ public function loadUserGroup($groupPath) * * @param $userId * - * @return \EzSystems\EzPlatformRest\Server\Values\RestUser + * @return \Ibexa\Rest\Server\Values\RestUser */ public function loadUser($userId) { @@ -221,9 +221,9 @@ function () use ($userContentInfo) { * * @param $groupPath * - * @throws \EzSystems\EzPlatformRest\Server\Exceptions\BadRequestException + * @throws \Ibexa\Rest\Server\Exceptions\BadRequestException * - * @return \EzSystems\EzPlatformRest\Server\Values\CreatedUserGroup + * @return \Ibexa\Rest\Server\Values\CreatedUserGroup */ public function createUserGroup($groupPath, Request $request) { @@ -265,9 +265,9 @@ public function createUserGroup($groupPath, Request $request) * * @param $groupPath * - * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException + * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException * - * @return \EzSystems\EzPlatformRest\Server\Values\CreatedUser + * @return \Ibexa\Rest\Server\Values\CreatedUser */ public function createUser($groupPath, Request $request) { @@ -311,7 +311,7 @@ public function createUser($groupPath, Request $request) * * @param $groupPath * - * @return \EzSystems\EzPlatformRest\Server\Values\RestUserGroup + * @return \Ibexa\Rest\Server\Values\RestUserGroup */ public function updateUserGroup($groupPath, Request $request) { @@ -361,7 +361,7 @@ public function updateUserGroup($groupPath, Request $request) * * @param $userId * - * @return \EzSystems\EzPlatformRest\Server\Values\RestUser + * @return \Ibexa\Rest\Server\Values\RestUser */ public function updateUser($userId, Request $request) { @@ -405,9 +405,9 @@ public function updateUser($userId, Request $request) * * @param $groupPath * - * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException + * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException * - * @return \EzSystems\EzPlatformRest\Server\Values\NoContent + * @return \Ibexa\Rest\Server\Values\NoContent */ public function deleteUserGroup($groupPath) { @@ -435,9 +435,9 @@ public function deleteUserGroup($groupPath) * * @param $userId * - * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException + * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException * - * @return \EzSystems\EzPlatformRest\Server\Values\NoContent + * @return \Ibexa\Rest\Server\Values\NoContent */ public function deleteUser($userId) { @@ -455,7 +455,7 @@ public function deleteUser($userId) /** * Loads users. * - * @return \EzSystems\EzPlatformRest\Server\Values\UserList|\EzSystems\EzPlatformRest\Server\Values\UserRefList + * @return \Ibexa\Rest\Server\Values\UserList|\Ibexa\Rest\Server\Values\UserRefList */ public function loadUsers(Request $request) { @@ -514,7 +514,7 @@ public function verifyUsers(Request $request) * * @param mixed $roleId * - * @return \EzSystems\EzPlatformRest\Server\Values\RestUser[] + * @return \Ibexa\Rest\Server\Values\RestUser[] */ public function loadUsersAssignedToRole($roleId) { @@ -549,7 +549,7 @@ private function buildRestUserObject(RepositoryUser $user) /** * Loads user groups. * - * @return \EzSystems\EzPlatformRest\Server\Values\UserGroupList|\EzSystems\EzPlatformRest\Server\Values\UserGroupRefList + * @return \Ibexa\Rest\Server\Values\UserGroupList|\Ibexa\Rest\Server\Values\UserGroupRefList */ public function loadUserGroups(Request $request) { @@ -587,7 +587,7 @@ public function loadUserGroups(Request $request) /** * Loads a user group by its remote ID. * - * @return \EzSystems\EzPlatformRest\Server\Values\RestUserGroup + * @return \Ibexa\Rest\Server\Values\RestUserGroup */ public function loadUserGroupByRemoteId(Request $request) { @@ -610,7 +610,7 @@ public function loadUserGroupByRemoteId(Request $request) * * @param mixed $roleId * - * @return \EzSystems\EzPlatformRest\Server\Values\RestUserGroup[] + * @return \Ibexa\Rest\Server\Values\RestUserGroup[] */ public function loadUserGroupsAssignedToRole($roleId) { @@ -644,7 +644,7 @@ public function loadUserGroupsAssignedToRole($roleId) * * @param $userId * - * @return \EzSystems\EzPlatformRest\Server\Values\VersionList + * @return \Ibexa\Rest\Server\Values\VersionList */ public function loadUserDrafts($userId, Request $request) { @@ -660,9 +660,9 @@ public function loadUserDrafts($userId, Request $request) * * @param $groupPath * - * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException + * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException * - * @return \EzSystems\EzPlatformRest\Server\Values\ResourceCreated + * @return \Ibexa\Rest\Server\Values\ResourceCreated */ public function moveUserGroup($groupPath, Request $request) { @@ -710,7 +710,7 @@ public function moveUserGroup($groupPath, Request $request) * * @param $groupPath * - * @return \EzSystems\EzPlatformRest\Server\Values\UserGroupList|\EzSystems\EzPlatformRest\Server\Values\UserGroupRefList + * @return \Ibexa\Rest\Server\Values\UserGroupList|\Ibexa\Rest\Server\Values\UserGroupRefList */ public function loadSubUserGroups($groupPath, Request $request) { @@ -767,7 +767,7 @@ public function loadSubUserGroups($groupPath, Request $request) * * @param $userId * - * @return \EzSystems\EzPlatformRest\Server\Values\UserGroupRefList + * @return \Ibexa\Rest\Server\Values\UserGroupRefList */ public function loadUserGroupsOfUser($userId, Request $request) { @@ -808,7 +808,7 @@ public function loadUserGroupsOfUser($userId, Request $request) * * @param $groupPath * - * @return \EzSystems\EzPlatformRest\Server\Values\UserList|\EzSystems\EzPlatformRest\Server\Values\UserRefList + * @return \Ibexa\Rest\Server\Values\UserList|\Ibexa\Rest\Server\Values\UserRefList */ public function loadUsersFromGroup($groupPath, Request $request) { @@ -864,9 +864,9 @@ public function loadUsersFromGroup($groupPath, Request $request) * @param $userId * @param $groupPath * - * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException + * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException * - * @return \EzSystems\EzPlatformRest\Server\Values\UserGroupRefList + * @return \Ibexa\Rest\Server\Values\UserGroupRefList */ public function unassignUserFromUserGroup($userId, $groupPath) { @@ -915,9 +915,9 @@ public function unassignUserFromUserGroup($userId, $groupPath) * * @param $userId * - * @throws \EzSystems\EzPlatformRest\Server\Exceptions\ForbiddenException + * @throws \Ibexa\Rest\Server\Exceptions\ForbiddenException * - * @return \EzSystems\EzPlatformRest\Server\Values\UserGroupRefList + * @return \Ibexa\Rest\Server\Values\UserGroupRefList */ public function assignUserToUserGroup($userId, Request $request) { @@ -974,7 +974,7 @@ public function assignUserToUserGroup($userId, Request $request) /** * Creates a new session based on the credentials provided as POST parameters. * - * @throws \eZ\Publish\Core\Base\Exceptions\UnauthorizedException If the login or password are incorrect or invalid CSRF + * @throws \Ibexa\Core\Base\Exceptions\UnauthorizedException If the login or password are incorrect or invalid CSRF * * @return Values\UserSession|Values\Conflict * @@ -995,9 +995,9 @@ public function createSession(Request $request) * * @param string $sessionId * - * @throws \eZ\Publish\Core\Base\Exceptions\UnauthorizedException if the CSRF token is missing or invalid + * @throws \Ibexa\Core\Base\Exceptions\UnauthorizedException if the CSRF token is missing or invalid * - * @return \EzSystems\EzPlatformRest\Server\Values\UserSession + * @return \Ibexa\Rest\Server\Values\UserSession * * @deprecated Deprecated since 6.5. Use SessionController::refreshSessionAction(). */ @@ -1018,7 +1018,7 @@ public function refreshSession($sessionId, Request $request) * * @return Values\DeletedUserSession|\Symfony\Component\HttpFoundation\Response * - * @throws \eZ\Publish\Core\Base\Exceptions\UnauthorizedException if the CSRF token is missing or invalid + * @throws \Ibexa\Core\Base\Exceptions\UnauthorizedException if the CSRF token is missing or invalid * @throws RestNotFoundException * * @deprecated Deprecated since 6.5. Use SessionController::refreshSessionAction(). diff --git a/src/lib/Server/Controller/Views.php b/src/lib/Server/Controller/Views.php index 59141550..3afb66a7 100644 --- a/src/lib/Server/Controller/Views.php +++ b/src/lib/Server/Controller/Views.php @@ -6,10 +6,10 @@ */ namespace Ibexa\Rest\Server\Controller; -use eZ\Publish\API\Repository\Exceptions\NotImplementedException; -use eZ\Publish\API\Repository\SearchService; -use eZ\Publish\API\Repository\Values\Content\Language; -use eZ\Publish\API\Repository\Values\Content\LocationQuery; +use Ibexa\Contracts\Core\Repository\Exceptions\NotImplementedException; +use Ibexa\Contracts\Core\Repository\SearchService; +use Ibexa\Contracts\Core\Repository\Values\Content\Language; +use Ibexa\Contracts\Core\Repository\Values\Content\LocationQuery; use Ibexa\Rest\Server\Controller; use Symfony\Component\HttpFoundation\Request; use Ibexa\Rest\Message; @@ -21,7 +21,7 @@ class Views extends Controller { /** - * @var \eZ\Publish\API\Repository\SearchService + * @var \Ibexa\Contracts\Core\Repository\SearchService */ private $searchService; @@ -33,7 +33,7 @@ public function __construct(SearchService $searchService) /** * Creates and executes a content view. * - * @return \EzSystems\EzPlatformRest\Server\Values\RestExecutedView + * @return \Ibexa\Rest\Server\Values\RestExecutedView */ public function createView(Request $request) { @@ -73,7 +73,7 @@ public function createView(Request $request) /** * List content views. * - * @return NotImplementedException; + * @return \Ibexa\Contracts\Core\Repository\Exceptions\NotImplementedException; */ public function listView() { @@ -83,7 +83,7 @@ public function listView() /** * Get a content view. * - * @return NotImplementedException; + * @return \Ibexa\Contracts\Core\Repository\Exceptions\NotImplementedException; */ public function getView() { @@ -93,7 +93,7 @@ public function getView() /** * Get a content view results. * - * @return NotImplementedException; + * @return \Ibexa\Contracts\Core\Repository\Exceptions\NotImplementedException; */ public function loadViewResults() { diff --git a/src/lib/Server/Exceptions/ContentFieldValidationException.php b/src/lib/Server/Exceptions/ContentFieldValidationException.php index f36911e3..20983740 100644 --- a/src/lib/Server/Exceptions/ContentFieldValidationException.php +++ b/src/lib/Server/Exceptions/ContentFieldValidationException.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Rest\Server\Exceptions; -use eZ\Publish\API\Repository\Exceptions\ContentFieldValidationException as APIContentFieldValidationException; +use Ibexa\Contracts\Core\Repository\Exceptions\ContentFieldValidationException as APIContentFieldValidationException; /** * Exception thrown if one or more content fields did not validate. @@ -16,9 +16,9 @@ class ContentFieldValidationException extends BadRequestException /** * Contains an array of field ValidationError objects indexed with FieldDefinition id and language code. * - * @see eZ\Publish\Core\Base\Exceptions\ContentFieldValidationException + * @see \Ibexa\Core\Base\Exceptions\ContentFieldValidationException * - * @var \eZ\Publish\Core\FieldType\ValidationError[] + * @var \Ibexa\Core\FieldType\ValidationError[] */ protected $errors; @@ -32,7 +32,7 @@ public function __construct(APIContentFieldValidationException $e) /** * Returns an array of field validation error messages. * - * @return \eZ\Publish\Core\FieldType\ValidationError[] + * @return \Ibexa\Core\FieldType\ValidationError[] */ public function getFieldErrors() { diff --git a/src/lib/Server/Input/Parser/Aggregation/AbstractRangeAggregationParser.php b/src/lib/Server/Input/Parser/Aggregation/AbstractRangeAggregationParser.php index 43c53648..ce28e22c 100644 --- a/src/lib/Server/Input/Parser/Aggregation/AbstractRangeAggregationParser.php +++ b/src/lib/Server/Input/Parser/Aggregation/AbstractRangeAggregationParser.php @@ -8,7 +8,7 @@ namespace Ibexa\Rest\Server\Input\Parser\Aggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractRangeAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractRangeAggregation; use Ibexa\Contracts\Rest\Exceptions; use Ibexa\Rest\Input\BaseParser; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; @@ -43,7 +43,7 @@ abstract protected function parseAggregation( ): AbstractRangeAggregation; /** - * @return \eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Range[] + * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Range[] */ protected function dispatchRanges(ParsingDispatcher $dispatcher, array $data, string $mediaType): array { diff --git a/src/lib/Server/Input/Parser/Aggregation/AbstractStatsAggregationParser.php b/src/lib/Server/Input/Parser/Aggregation/AbstractStatsAggregationParser.php index 44148755..46e50676 100644 --- a/src/lib/Server/Input/Parser/Aggregation/AbstractStatsAggregationParser.php +++ b/src/lib/Server/Input/Parser/Aggregation/AbstractStatsAggregationParser.php @@ -8,7 +8,7 @@ namespace Ibexa\Rest\Server\Input\Parser\Aggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractStatsAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractStatsAggregation; use Ibexa\Contracts\Rest\Exceptions; use Ibexa\Rest\Input\BaseParser; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; diff --git a/src/lib/Server/Input/Parser/Aggregation/AbstractTermAggregationParser.php b/src/lib/Server/Input/Parser/Aggregation/AbstractTermAggregationParser.php index 84bf3a69..d221de1e 100644 --- a/src/lib/Server/Input/Parser/Aggregation/AbstractTermAggregationParser.php +++ b/src/lib/Server/Input/Parser/Aggregation/AbstractTermAggregationParser.php @@ -8,7 +8,7 @@ namespace Ibexa\Rest\Server\Input\Parser\Aggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation; use Ibexa\Contracts\Rest\Exceptions; use Ibexa\Rest\Input\BaseParser; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; diff --git a/src/lib/Server/Input/Parser/Aggregation/ContentTypeGroupTermAggregationParser.php b/src/lib/Server/Input/Parser/Aggregation/ContentTypeGroupTermAggregationParser.php index 36829dc6..0a8dad09 100644 --- a/src/lib/Server/Input/Parser/Aggregation/ContentTypeGroupTermAggregationParser.php +++ b/src/lib/Server/Input/Parser/Aggregation/ContentTypeGroupTermAggregationParser.php @@ -8,8 +8,8 @@ namespace Ibexa\Rest\Server\Input\Parser\Aggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\ContentTypeGroupTermAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\ContentTypeGroupTermAggregation; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; final class ContentTypeGroupTermAggregationParser extends AbstractTermAggregationParser diff --git a/src/lib/Server/Input/Parser/Aggregation/ContentTypeTermAggregationParser.php b/src/lib/Server/Input/Parser/Aggregation/ContentTypeTermAggregationParser.php index 488c0f7a..c2dfdf33 100644 --- a/src/lib/Server/Input/Parser/Aggregation/ContentTypeTermAggregationParser.php +++ b/src/lib/Server/Input/Parser/Aggregation/ContentTypeTermAggregationParser.php @@ -8,8 +8,8 @@ namespace Ibexa\Rest\Server\Input\Parser\Aggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\ContentTypeTermAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\ContentTypeTermAggregation; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; final class ContentTypeTermAggregationParser extends AbstractTermAggregationParser diff --git a/src/lib/Server/Input/Parser/Aggregation/DateMetadataRangeAggregationParser.php b/src/lib/Server/Input/Parser/Aggregation/DateMetadataRangeAggregationParser.php index 323717fe..58a9caeb 100644 --- a/src/lib/Server/Input/Parser/Aggregation/DateMetadataRangeAggregationParser.php +++ b/src/lib/Server/Input/Parser/Aggregation/DateMetadataRangeAggregationParser.php @@ -8,8 +8,8 @@ namespace Ibexa\Rest\Server\Input\Parser\Aggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractRangeAggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\DateMetadataRangeAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractRangeAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\DateMetadataRangeAggregation; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Contracts\Rest\Exceptions; diff --git a/src/lib/Server/Input/Parser/Aggregation/Field/AuthorTermAggregationParser.php b/src/lib/Server/Input/Parser/Aggregation/Field/AuthorTermAggregationParser.php index 7cd2c25d..7d24c2e7 100644 --- a/src/lib/Server/Input/Parser/Aggregation/Field/AuthorTermAggregationParser.php +++ b/src/lib/Server/Input/Parser/Aggregation/Field/AuthorTermAggregationParser.php @@ -8,8 +8,8 @@ namespace Ibexa\Rest\Server\Input\Parser\Aggregation\Field; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Field\AuthorTermAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Field\AuthorTermAggregation; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Rest\Server\Input\Parser\Aggregation\AbstractTermAggregationParser; use Ibexa\Contracts\Rest\Exceptions; diff --git a/src/lib/Server/Input/Parser/Aggregation/Field/CheckboxTermAggregationParser.php b/src/lib/Server/Input/Parser/Aggregation/Field/CheckboxTermAggregationParser.php index 4a0cf753..63af067b 100644 --- a/src/lib/Server/Input/Parser/Aggregation/Field/CheckboxTermAggregationParser.php +++ b/src/lib/Server/Input/Parser/Aggregation/Field/CheckboxTermAggregationParser.php @@ -8,8 +8,8 @@ namespace Ibexa\Rest\Server\Input\Parser\Aggregation\Field; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Field\CheckboxTermAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Field\CheckboxTermAggregation; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Rest\Server\Input\Parser\Aggregation\AbstractTermAggregationParser; use Ibexa\Contracts\Rest\Exceptions; diff --git a/src/lib/Server/Input/Parser/Aggregation/Field/CountryTermAggregationParser.php b/src/lib/Server/Input/Parser/Aggregation/Field/CountryTermAggregationParser.php index f30bd54d..e6cd68de 100644 --- a/src/lib/Server/Input/Parser/Aggregation/Field/CountryTermAggregationParser.php +++ b/src/lib/Server/Input/Parser/Aggregation/Field/CountryTermAggregationParser.php @@ -8,8 +8,8 @@ namespace Ibexa\Rest\Server\Input\Parser\Aggregation\Field; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Field\CountryTermAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Field\CountryTermAggregation; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Rest\Server\Input\Parser\Aggregation\AbstractTermAggregationParser; use Ibexa\Contracts\Rest\Exceptions; diff --git a/src/lib/Server/Input/Parser/Aggregation/Field/DateRangeAggregationParser.php b/src/lib/Server/Input/Parser/Aggregation/Field/DateRangeAggregationParser.php index 70909cc7..76b6c0f4 100644 --- a/src/lib/Server/Input/Parser/Aggregation/Field/DateRangeAggregationParser.php +++ b/src/lib/Server/Input/Parser/Aggregation/Field/DateRangeAggregationParser.php @@ -8,8 +8,8 @@ namespace Ibexa\Rest\Server\Input\Parser\Aggregation\Field; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractRangeAggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Field\DateRangeAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractRangeAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Field\DateRangeAggregation; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Rest\Server\Input\Parser\Aggregation\AbstractRangeAggregationParser; use Ibexa\Contracts\Rest\Exceptions; diff --git a/src/lib/Server/Input/Parser/Aggregation/Field/DateTimeRangeAggregationParser.php b/src/lib/Server/Input/Parser/Aggregation/Field/DateTimeRangeAggregationParser.php index 291f1abd..b1329fff 100644 --- a/src/lib/Server/Input/Parser/Aggregation/Field/DateTimeRangeAggregationParser.php +++ b/src/lib/Server/Input/Parser/Aggregation/Field/DateTimeRangeAggregationParser.php @@ -8,8 +8,8 @@ namespace Ibexa\Rest\Server\Input\Parser\Aggregation\Field; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractRangeAggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Field\DateTimeRangeAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractRangeAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Field\DateTimeRangeAggregation; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Rest\Server\Input\Parser\Aggregation\AbstractRangeAggregationParser; use Ibexa\Contracts\Rest\Exceptions; diff --git a/src/lib/Server/Input/Parser/Aggregation/Field/FloatRangeAggregationParser.php b/src/lib/Server/Input/Parser/Aggregation/Field/FloatRangeAggregationParser.php index d58894f5..43c6690d 100644 --- a/src/lib/Server/Input/Parser/Aggregation/Field/FloatRangeAggregationParser.php +++ b/src/lib/Server/Input/Parser/Aggregation/Field/FloatRangeAggregationParser.php @@ -8,8 +8,8 @@ namespace Ibexa\Rest\Server\Input\Parser\Aggregation\Field; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractRangeAggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Field\FloatRangeAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractRangeAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Field\FloatRangeAggregation; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Rest\Server\Input\Parser\Aggregation\AbstractRangeAggregationParser; use Ibexa\Contracts\Rest\Exceptions; diff --git a/src/lib/Server/Input/Parser/Aggregation/Field/FloatStatsAggregationParser.php b/src/lib/Server/Input/Parser/Aggregation/Field/FloatStatsAggregationParser.php index a2a4ae03..4bf336c0 100644 --- a/src/lib/Server/Input/Parser/Aggregation/Field/FloatStatsAggregationParser.php +++ b/src/lib/Server/Input/Parser/Aggregation/Field/FloatStatsAggregationParser.php @@ -8,8 +8,8 @@ namespace Ibexa\Rest\Server\Input\Parser\Aggregation\Field; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractStatsAggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Field\FloatStatsAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractStatsAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Field\FloatStatsAggregation; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Rest\Server\Input\Parser\Aggregation\AbstractStatsAggregationParser; use Ibexa\Contracts\Rest\Exceptions; diff --git a/src/lib/Server/Input/Parser/Aggregation/Field/IntegerRangeAggregationParser.php b/src/lib/Server/Input/Parser/Aggregation/Field/IntegerRangeAggregationParser.php index 832c4afe..26e0ffda 100644 --- a/src/lib/Server/Input/Parser/Aggregation/Field/IntegerRangeAggregationParser.php +++ b/src/lib/Server/Input/Parser/Aggregation/Field/IntegerRangeAggregationParser.php @@ -8,8 +8,8 @@ namespace Ibexa\Rest\Server\Input\Parser\Aggregation\Field; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractRangeAggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Field\IntegerRangeAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractRangeAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Field\IntegerRangeAggregation; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Rest\Server\Input\Parser\Aggregation\AbstractRangeAggregationParser; use Ibexa\Contracts\Rest\Exceptions; diff --git a/src/lib/Server/Input/Parser/Aggregation/Field/IntegerStatsAggregationParser.php b/src/lib/Server/Input/Parser/Aggregation/Field/IntegerStatsAggregationParser.php index 0fb86f94..009286bc 100644 --- a/src/lib/Server/Input/Parser/Aggregation/Field/IntegerStatsAggregationParser.php +++ b/src/lib/Server/Input/Parser/Aggregation/Field/IntegerStatsAggregationParser.php @@ -8,8 +8,8 @@ namespace Ibexa\Rest\Server\Input\Parser\Aggregation\Field; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractStatsAggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Field\IntegerStatsAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractStatsAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Field\IntegerStatsAggregation; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Rest\Server\Input\Parser\Aggregation\AbstractStatsAggregationParser; use Ibexa\Contracts\Rest\Exceptions; diff --git a/src/lib/Server/Input/Parser/Aggregation/Field/KeywordTermAggregationParser.php b/src/lib/Server/Input/Parser/Aggregation/Field/KeywordTermAggregationParser.php index d1d01e3d..c668320a 100644 --- a/src/lib/Server/Input/Parser/Aggregation/Field/KeywordTermAggregationParser.php +++ b/src/lib/Server/Input/Parser/Aggregation/Field/KeywordTermAggregationParser.php @@ -8,8 +8,8 @@ namespace Ibexa\Rest\Server\Input\Parser\Aggregation\Field; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Field\KeywordTermAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Field\KeywordTermAggregation; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Rest\Server\Input\Parser\Aggregation\AbstractTermAggregationParser; use Ibexa\Contracts\Rest\Exceptions; diff --git a/src/lib/Server/Input/Parser/Aggregation/Field/SelectionTermAggregationParser.php b/src/lib/Server/Input/Parser/Aggregation/Field/SelectionTermAggregationParser.php index 9700beb7..372ad3bd 100644 --- a/src/lib/Server/Input/Parser/Aggregation/Field/SelectionTermAggregationParser.php +++ b/src/lib/Server/Input/Parser/Aggregation/Field/SelectionTermAggregationParser.php @@ -8,8 +8,8 @@ namespace Ibexa\Rest\Server\Input\Parser\Aggregation\Field; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Field\SelectionTermAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Field\SelectionTermAggregation; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Rest\Server\Input\Parser\Aggregation\AbstractTermAggregationParser; use Ibexa\Contracts\Rest\Exceptions; diff --git a/src/lib/Server/Input/Parser/Aggregation/Field/TimeRangeAggregationParser.php b/src/lib/Server/Input/Parser/Aggregation/Field/TimeRangeAggregationParser.php index 19e97531..ed6fcd91 100644 --- a/src/lib/Server/Input/Parser/Aggregation/Field/TimeRangeAggregationParser.php +++ b/src/lib/Server/Input/Parser/Aggregation/Field/TimeRangeAggregationParser.php @@ -8,8 +8,8 @@ namespace Ibexa\Rest\Server\Input\Parser\Aggregation\Field; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractRangeAggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Field\TimeRangeAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractRangeAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Field\TimeRangeAggregation; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Rest\Server\Input\Parser\Aggregation\AbstractRangeAggregationParser; use Ibexa\Contracts\Rest\Exceptions; diff --git a/src/lib/Server/Input/Parser/Aggregation/LanguageTermAggregationParser.php b/src/lib/Server/Input/Parser/Aggregation/LanguageTermAggregationParser.php index 66840335..70f52b7f 100644 --- a/src/lib/Server/Input/Parser/Aggregation/LanguageTermAggregationParser.php +++ b/src/lib/Server/Input/Parser/Aggregation/LanguageTermAggregationParser.php @@ -8,8 +8,8 @@ namespace Ibexa\Rest\Server\Input\Parser\Aggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\LanguageTermAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\LanguageTermAggregation; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; final class LanguageTermAggregationParser extends AbstractTermAggregationParser diff --git a/src/lib/Server/Input/Parser/Aggregation/Location/LocationChildrenTermAggregationParser.php b/src/lib/Server/Input/Parser/Aggregation/Location/LocationChildrenTermAggregationParser.php index 27af2048..53e66117 100644 --- a/src/lib/Server/Input/Parser/Aggregation/Location/LocationChildrenTermAggregationParser.php +++ b/src/lib/Server/Input/Parser/Aggregation/Location/LocationChildrenTermAggregationParser.php @@ -8,8 +8,8 @@ namespace Ibexa\Rest\Server\Input\Parser\Aggregation\Location; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Location\LocationChildrenTermAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Location\LocationChildrenTermAggregation; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Rest\Server\Input\Parser\Aggregation\AbstractTermAggregationParser; diff --git a/src/lib/Server/Input/Parser/Aggregation/Location/SubtreeTermAggregationParser.php b/src/lib/Server/Input/Parser/Aggregation/Location/SubtreeTermAggregationParser.php index 0103266d..bf8c58dc 100644 --- a/src/lib/Server/Input/Parser/Aggregation/Location/SubtreeTermAggregationParser.php +++ b/src/lib/Server/Input/Parser/Aggregation/Location/SubtreeTermAggregationParser.php @@ -8,8 +8,8 @@ namespace Ibexa\Rest\Server\Input\Parser\Aggregation\Location; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Location\SubtreeTermAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Location\SubtreeTermAggregation; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Rest\Server\Input\Parser\Aggregation\AbstractTermAggregationParser; use Ibexa\Contracts\Rest\Exceptions; diff --git a/src/lib/Server/Input/Parser/Aggregation/ObjectStateTermAggregationParser.php b/src/lib/Server/Input/Parser/Aggregation/ObjectStateTermAggregationParser.php index 98dc6d9b..87bff1c2 100644 --- a/src/lib/Server/Input/Parser/Aggregation/ObjectStateTermAggregationParser.php +++ b/src/lib/Server/Input/Parser/Aggregation/ObjectStateTermAggregationParser.php @@ -8,8 +8,8 @@ namespace Ibexa\Rest\Server\Input\Parser\Aggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\ObjectStateTermAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\ObjectStateTermAggregation; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Contracts\Rest\Exceptions; diff --git a/src/lib/Server/Input/Parser/Aggregation/Range/AbstractRangeParser.php b/src/lib/Server/Input/Parser/Aggregation/Range/AbstractRangeParser.php index c754fcbb..963f755e 100644 --- a/src/lib/Server/Input/Parser/Aggregation/Range/AbstractRangeParser.php +++ b/src/lib/Server/Input/Parser/Aggregation/Range/AbstractRangeParser.php @@ -8,7 +8,7 @@ namespace Ibexa\Rest\Server\Input\Parser\Aggregation\Range; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Range; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Range; use Ibexa\Rest\Input\BaseParser; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Contracts\Rest\Exceptions; diff --git a/src/lib/Server/Input/Parser/Aggregation/RawRangeAggregationParser.php b/src/lib/Server/Input/Parser/Aggregation/RawRangeAggregationParser.php index 832f041e..055c9c5d 100644 --- a/src/lib/Server/Input/Parser/Aggregation/RawRangeAggregationParser.php +++ b/src/lib/Server/Input/Parser/Aggregation/RawRangeAggregationParser.php @@ -8,8 +8,8 @@ namespace Ibexa\Rest\Server\Input\Parser\Aggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractRangeAggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\RawRangeAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractRangeAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\RawRangeAggregation; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; final class RawRangeAggregationParser extends AbstractRangeAggregationParser diff --git a/src/lib/Server/Input/Parser/Aggregation/RawStatsAggregationParser.php b/src/lib/Server/Input/Parser/Aggregation/RawStatsAggregationParser.php index 6b1956f2..c7cb700b 100644 --- a/src/lib/Server/Input/Parser/Aggregation/RawStatsAggregationParser.php +++ b/src/lib/Server/Input/Parser/Aggregation/RawStatsAggregationParser.php @@ -8,8 +8,8 @@ namespace Ibexa\Rest\Server\Input\Parser\Aggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractStatsAggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\RawStatsAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractStatsAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\RawStatsAggregation; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; final class RawStatsAggregationParser extends AbstractStatsAggregationParser diff --git a/src/lib/Server/Input/Parser/Aggregation/RawTermAggregationParser.php b/src/lib/Server/Input/Parser/Aggregation/RawTermAggregationParser.php index 08d91cf7..73959498 100644 --- a/src/lib/Server/Input/Parser/Aggregation/RawTermAggregationParser.php +++ b/src/lib/Server/Input/Parser/Aggregation/RawTermAggregationParser.php @@ -8,8 +8,8 @@ namespace Ibexa\Rest\Server\Input\Parser\Aggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\RawTermAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\RawTermAggregation; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; final class RawTermAggregationParser extends AbstractTermAggregationParser diff --git a/src/lib/Server/Input/Parser/Aggregation/SectionTermAggregationParser.php b/src/lib/Server/Input/Parser/Aggregation/SectionTermAggregationParser.php index 8819c1ee..d2381172 100644 --- a/src/lib/Server/Input/Parser/Aggregation/SectionTermAggregationParser.php +++ b/src/lib/Server/Input/Parser/Aggregation/SectionTermAggregationParser.php @@ -8,8 +8,8 @@ namespace Ibexa\Rest\Server\Input\Parser\Aggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\SectionTermAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\SectionTermAggregation; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; final class SectionTermAggregationParser extends AbstractTermAggregationParser diff --git a/src/lib/Server/Input/Parser/Aggregation/UserMetadataTermAggregationParser.php b/src/lib/Server/Input/Parser/Aggregation/UserMetadataTermAggregationParser.php index 3e00438f..6729aa67 100644 --- a/src/lib/Server/Input/Parser/Aggregation/UserMetadataTermAggregationParser.php +++ b/src/lib/Server/Input/Parser/Aggregation/UserMetadataTermAggregationParser.php @@ -8,8 +8,8 @@ namespace Ibexa\Rest\Server\Input\Parser\Aggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\UserMetadataTermAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\UserMetadataTermAggregation; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Contracts\Rest\Exceptions; diff --git a/src/lib/Server/Input/Parser/Aggregation/VisibilityTermAggregationParser.php b/src/lib/Server/Input/Parser/Aggregation/VisibilityTermAggregationParser.php index a1be7e29..3884473e 100644 --- a/src/lib/Server/Input/Parser/Aggregation/VisibilityTermAggregationParser.php +++ b/src/lib/Server/Input/Parser/Aggregation/VisibilityTermAggregationParser.php @@ -8,8 +8,8 @@ namespace Ibexa\Rest\Server\Input\Parser\Aggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation\VisibilityTermAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\AbstractTermAggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\VisibilityTermAggregation; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; final class VisibilityTermAggregationParser extends AbstractTermAggregationParser diff --git a/src/lib/Server/Input/Parser/ContentCreate.php b/src/lib/Server/Input/Parser/ContentCreate.php index 030ce75d..45394b2c 100644 --- a/src/lib/Server/Input/Parser/ContentCreate.php +++ b/src/lib/Server/Input/Parser/ContentCreate.php @@ -11,8 +11,8 @@ use Ibexa\Rest\Input\ParserTools; use Ibexa\Rest\Input\FieldTypeParser; use Ibexa\Contracts\Rest\Exceptions; -use eZ\Publish\API\Repository\ContentService; -use eZ\Publish\API\Repository\ContentTypeService; +use Ibexa\Contracts\Core\Repository\ContentService; +use Ibexa\Contracts\Core\Repository\ContentTypeService; use Ibexa\Rest\Server\Values\RestContentCreateStruct; use DateTime; @@ -24,46 +24,46 @@ class ContentCreate extends BaseParser /** * Content service. * - * @var \eZ\Publish\API\Repository\ContentService + * @var \Ibexa\Contracts\Core\Repository\ContentService */ protected $contentService; /** * ContentType service. * - * @var \eZ\Publish\API\Repository\ContentTypeService + * @var \Ibexa\Contracts\Core\Repository\ContentTypeService */ protected $contentTypeService; /** * FieldType parser. * - * @var \EzSystems\EzPlatformRest\Input\FieldTypeParser + * @var \Ibexa\Rest\Input\FieldTypeParser */ protected $fieldTypeParser; /** * LocationCreate parser. * - * @var \EzSystems\EzPlatformRest\Server\Input\Parser\LocationCreate + * @var \Ibexa\Rest\Server\Input\Parser\LocationCreate */ protected $locationCreateParser; /** * Parser tools. * - * @var \EzSystems\EzPlatformRest\Input\ParserTools + * @var \Ibexa\Rest\Input\ParserTools */ protected $parserTools; /** * Construct. * - * @param \eZ\Publish\API\Repository\ContentService $contentService - * @param \eZ\Publish\API\Repository\ContentTypeService $contentTypeService - * @param \EzSystems\EzPlatformRest\Input\FieldTypeParser $fieldTypeParser - * @param \EzSystems\EzPlatformRest\Server\Input\Parser\LocationCreate $locationCreateParser - * @param \EzSystems\EzPlatformRest\Input\ParserTools $parserTools + * @param \Ibexa\Contracts\Core\Repository\ContentService $contentService + * @param \Ibexa\Contracts\Core\Repository\ContentTypeService $contentTypeService + * @param \Ibexa\Rest\Input\FieldTypeParser $fieldTypeParser + * @param \Ibexa\Rest\Server\Input\Parser\LocationCreate $locationCreateParser + * @param \Ibexa\Rest\Input\ParserTools $parserTools */ public function __construct( ContentService $contentService, @@ -83,9 +83,9 @@ public function __construct( * Parse input structure. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @return \EzSystems\EzPlatformRest\Server\Values\RestContentCreateStruct + * @return \Ibexa\Rest\Server\Values\RestContentCreateStruct */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { diff --git a/src/lib/Server/Input/Parser/ContentQuery.php b/src/lib/Server/Input/Parser/ContentQuery.php index d14118d0..e31a593e 100644 --- a/src/lib/Server/Input/Parser/ContentQuery.php +++ b/src/lib/Server/Input/Parser/ContentQuery.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Rest\Server\Input\Parser; -use eZ\Publish\API\Repository\Values\Content\Query; +use Ibexa\Contracts\Core\Repository\Values\Content\Query; use Ibexa\Rest\Server\Input\Parser\Query as QueryParser; /** diff --git a/src/lib/Server/Input/Parser/ContentTypeCreate.php b/src/lib/Server/Input/Parser/ContentTypeCreate.php index fdd3594b..13f19646 100644 --- a/src/lib/Server/Input/Parser/ContentTypeCreate.php +++ b/src/lib/Server/Input/Parser/ContentTypeCreate.php @@ -10,7 +10,7 @@ use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Rest\Input\ParserTools; use Ibexa\Contracts\Rest\Exceptions; -use eZ\Publish\API\Repository\ContentTypeService; +use Ibexa\Contracts\Core\Repository\ContentTypeService; use DateTime; /** @@ -21,30 +21,30 @@ class ContentTypeCreate extends BaseParser /** * ContentType service. * - * @var \eZ\Publish\API\Repository\ContentTypeService + * @var \Ibexa\Contracts\Core\Repository\ContentTypeService */ protected $contentTypeService; /** * FieldDefinitionCreate parser. * - * @var \EzSystems\EzPlatformRest\Server\Input\Parser\FieldDefinitionCreate + * @var \Ibexa\Rest\Server\Input\Parser\FieldDefinitionCreate */ protected $fieldDefinitionCreateParser; /** * Parser tools. * - * @var \EzSystems\EzPlatformRest\Input\ParserTools + * @var \Ibexa\Rest\Input\ParserTools */ protected $parserTools; /** * Construct. * - * @param \eZ\Publish\API\Repository\ContentTypeService $contentTypeService - * @param \EzSystems\EzPlatformRest\Server\Input\Parser\FieldDefinitionCreate $fieldDefinitionCreateParser - * @param \EzSystems\EzPlatformRest\Input\ParserTools $parserTools + * @param \Ibexa\Contracts\Core\Repository\ContentTypeService $contentTypeService + * @param \Ibexa\Rest\Server\Input\Parser\FieldDefinitionCreate $fieldDefinitionCreateParser + * @param \Ibexa\Rest\Input\ParserTools $parserTools */ public function __construct( ContentTypeService $contentTypeService, @@ -60,9 +60,9 @@ public function __construct( * Parse input structure. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @return \eZ\Publish\API\Repository\Values\ContentType\ContentTypeCreateStruct + * @return \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentTypeCreateStruct */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { diff --git a/src/lib/Server/Input/Parser/ContentTypeGroupInput.php b/src/lib/Server/Input/Parser/ContentTypeGroupInput.php index 7a456d13..17c20396 100644 --- a/src/lib/Server/Input/Parser/ContentTypeGroupInput.php +++ b/src/lib/Server/Input/Parser/ContentTypeGroupInput.php @@ -10,7 +10,7 @@ use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Rest\Input\ParserTools; use Ibexa\Contracts\Rest\Exceptions; -use eZ\Publish\API\Repository\ContentTypeService; +use Ibexa\Contracts\Core\Repository\ContentTypeService; use DateTime; /** @@ -21,20 +21,20 @@ class ContentTypeGroupInput extends BaseParser /** * ContentType service. * - * @var \eZ\Publish\API\Repository\ContentTypeService + * @var \Ibexa\Contracts\Core\Repository\ContentTypeService */ protected $contentTypeService; /** - * @var \EzSystems\EzPlatformRest\Input\ParserTools + * @var \Ibexa\Rest\Input\ParserTools */ protected $parserTools; /** * Construct. * - * @param \eZ\Publish\API\Repository\ContentTypeService $contentTypeService - * @param \EzSystems\EzPlatformRest\Input\ParserTools $parserTools + * @param \Ibexa\Contracts\Core\Repository\ContentTypeService $contentTypeService + * @param \Ibexa\Rest\Input\ParserTools $parserTools */ public function __construct(ContentTypeService $contentTypeService, ParserTools $parserTools) { @@ -46,9 +46,9 @@ public function __construct(ContentTypeService $contentTypeService, ParserTools * Parse input structure. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @return \eZ\Publish\API\Repository\Values\ContentType\ContentTypeGroupCreateStruct + * @return \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentTypeGroupCreateStruct */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { diff --git a/src/lib/Server/Input/Parser/ContentTypeUpdate.php b/src/lib/Server/Input/Parser/ContentTypeUpdate.php index 934437dc..7f906a0f 100644 --- a/src/lib/Server/Input/Parser/ContentTypeUpdate.php +++ b/src/lib/Server/Input/Parser/ContentTypeUpdate.php @@ -10,7 +10,7 @@ use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Rest\Input\ParserTools; use Ibexa\Contracts\Rest\Exceptions; -use eZ\Publish\API\Repository\ContentTypeService; +use Ibexa\Contracts\Core\Repository\ContentTypeService; use DateTime; /** @@ -21,22 +21,22 @@ class ContentTypeUpdate extends BaseParser /** * ContentType service. * - * @var \eZ\Publish\API\Repository\ContentTypeService + * @var \Ibexa\Contracts\Core\Repository\ContentTypeService */ protected $contentTypeService; /** * Parser tools. * - * @var \EzSystems\EzPlatformRest\Input\ParserTools + * @var \Ibexa\Rest\Input\ParserTools */ protected $parserTools; /** * Construct. * - * @param \eZ\Publish\API\Repository\ContentTypeService $contentTypeService - * @param \EzSystems\EzPlatformRest\Input\ParserTools $parserTools + * @param \Ibexa\Contracts\Core\Repository\ContentTypeService $contentTypeService + * @param \Ibexa\Rest\Input\ParserTools $parserTools */ public function __construct(ContentTypeService $contentTypeService, ParserTools $parserTools) { @@ -48,9 +48,9 @@ public function __construct(ContentTypeService $contentTypeService, ParserTools * Parse input structure. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @return \eZ\Publish\API\Repository\Values\ContentType\ContentTypeUpdateStruct + * @return \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentTypeUpdateStruct */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { diff --git a/src/lib/Server/Input/Parser/ContentUpdate.php b/src/lib/Server/Input/Parser/ContentUpdate.php index 09e37af9..dcce4450 100644 --- a/src/lib/Server/Input/Parser/ContentUpdate.php +++ b/src/lib/Server/Input/Parser/ContentUpdate.php @@ -24,11 +24,11 @@ class ContentUpdate extends BaseParser * @todo use url handler instead of hardcoded URL matching * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @return \EzSystems\EzPlatformRest\Values\RestContentMetadataUpdateStruct + * @return \Ibexa\Rest\Values\RestContentMetadataUpdateStruct * - * @throws \EzSystems\EzPlatformRest\Exceptions\Parser if $data is invalid + * @throws \Ibexa\Contracts\Rest\Exceptions\Parser if $data is invalid */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { diff --git a/src/lib/Server/Input/Parser/Criterion.php b/src/lib/Server/Input/Parser/Criterion.php index d328297b..14989fca 100644 --- a/src/lib/Server/Input/Parser/Criterion.php +++ b/src/lib/Server/Input/Parser/Criterion.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Rest\Server\Input\Parser; -use eZ\Publish\API\Repository\Values\Content\Query\Aggregation; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation; use Ibexa\Rest\Input\BaseParser; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Contracts\Rest\Exceptions; @@ -30,11 +30,11 @@ abstract class Criterion extends BaseParser * * @param string $criterionName * @param mixed $criterionData - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @throws \EzSystems\EzPlatformRest\Exceptions\Parser + * @throws \Ibexa\Contracts\Rest\Exceptions\Parser * - * @return \eZ\Publish\API\Repository\Values\Content\Query\Criterion + * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion */ public function dispatchCriterion($criterionName, $criterionData, ParsingDispatcher $parsingDispatcher) { @@ -51,11 +51,11 @@ public function dispatchCriterion($criterionName, $criterionData, ParsingDispatc * * @param string $facetBuilderName * @param mixed $facetBuilderData - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @throws \EzSystems\EzPlatformRest\Exceptions\Parser + * @throws \Ibexa\Contracts\Rest\Exceptions\Parser * - * @return \eZ\Publish\API\Repository\Values\ValueObject + * @return \Ibexa\Contracts\Core\Repository\Values\ValueObject */ public function dispatchFacetBuilder($facetBuilderName, $facetBuilderData, ParsingDispatcher $parsingDispatcher) { @@ -71,7 +71,7 @@ public function dispatchFacetBuilder($facetBuilderName, $facetBuilderData, Parsi /** * Dispatches parsing of a aggregation name + data to its own parser. * - * @return \eZ\Publish\API\Repository\Values\Content\Query\Aggregation + * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation */ public function dispatchAggregation( string $aggregationName, @@ -91,11 +91,11 @@ public function dispatchAggregation( * * @param string $sortClauseName * @param string $direction - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @throws \EzSystems\EzPlatformRest\Exceptions\Parser + * @throws \Ibexa\Contracts\Rest\Exceptions\Parser * - * @return \eZ\Publish\API\Repository\Values\Content\Query\Criterion + * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion */ public function dispatchSortClause($sortClauseName, $direction, ParsingDispatcher $parsingDispatcher) { diff --git a/src/lib/Server/Input/Parser/Criterion/Ancestor.php b/src/lib/Server/Input/Parser/Criterion/Ancestor.php index 52adbbb8..494ea964 100644 --- a/src/lib/Server/Input/Parser/Criterion/Ancestor.php +++ b/src/lib/Server/Input/Parser/Criterion/Ancestor.php @@ -9,7 +9,7 @@ use Ibexa\Rest\Input\BaseParser; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Contracts\Rest\Exceptions; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Ancestor as AncestorCriterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Ancestor as AncestorCriterion; /** * Parser for Ancestor Criterion. @@ -20,11 +20,11 @@ class Ancestor extends BaseParser * Parses input structure to a Criterion object. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @throws \EzSystems\EzPlatformRest\Exceptions\Parser + * @throws \Ibexa\Contracts\Rest\Exceptions\Parser * - * @return \eZ\Publish\API\Repository\Values\Content\Query\Criterion\Ancestor + * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Ancestor */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { diff --git a/src/lib/Server/Input/Parser/Criterion/ContentId.php b/src/lib/Server/Input/Parser/Criterion/ContentId.php index 87182997..ac2c5249 100644 --- a/src/lib/Server/Input/Parser/Criterion/ContentId.php +++ b/src/lib/Server/Input/Parser/Criterion/ContentId.php @@ -9,7 +9,7 @@ use Ibexa\Rest\Input\BaseParser; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Contracts\Rest\Exceptions; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\ContentId as ContentIdCriterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\ContentId as ContentIdCriterion; /** * Parser for ViewInput. @@ -20,11 +20,11 @@ class ContentId extends BaseParser * Parses input structure to a Criterion object. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @throws \EzSystems\EzPlatformRest\Exceptions\Parser + * @throws \Ibexa\Contracts\Rest\Exceptions\Parser * - * @return \eZ\Publish\API\Repository\Values\Content\Query\Criterion\ContentId + * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\ContentId */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { diff --git a/src/lib/Server/Input/Parser/Criterion/ContentRemoteId.php b/src/lib/Server/Input/Parser/Criterion/ContentRemoteId.php index 17ad8dd3..5cdc4168 100644 --- a/src/lib/Server/Input/Parser/Criterion/ContentRemoteId.php +++ b/src/lib/Server/Input/Parser/Criterion/ContentRemoteId.php @@ -9,7 +9,7 @@ use Ibexa\Rest\Input\BaseParser; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Contracts\Rest\Exceptions; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\RemoteId as ContentRemoteIdCriterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\RemoteId as ContentRemoteIdCriterion; /** * Parser for RemoteId Criterion. @@ -20,11 +20,11 @@ class ContentRemoteId extends BaseParser * Parses input structure to a Criterion object. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @throws \EzSystems\EzPlatformRest\Exceptions\Parser + * @throws \Ibexa\Contracts\Rest\Exceptions\Parser * - * @return \eZ\Publish\API\Repository\Values\Content\Query\Criterion\RemoteId + * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\RemoteId */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { diff --git a/src/lib/Server/Input/Parser/Criterion/ContentTypeGroupId.php b/src/lib/Server/Input/Parser/Criterion/ContentTypeGroupId.php index 02722128..7becba6c 100644 --- a/src/lib/Server/Input/Parser/Criterion/ContentTypeGroupId.php +++ b/src/lib/Server/Input/Parser/Criterion/ContentTypeGroupId.php @@ -9,7 +9,7 @@ use Ibexa\Rest\Input\BaseParser; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Contracts\Rest\Exceptions; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\ContentTypeGroupId as ContentTypeGroupIdCriterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\ContentTypeGroupId as ContentTypeGroupIdCriterion; /** * Parser for ContentTypeGroupId Criterion. @@ -20,11 +20,11 @@ class ContentTypeGroupId extends BaseParser * Parses input structure to a Criterion object. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @throws \EzSystems\EzPlatformRest\Exceptions\Parser + * @throws \Ibexa\Contracts\Rest\Exceptions\Parser * - * @return \eZ\Publish\API\Repository\Values\Content\Query\Criterion\ContentTypeGroupId + * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\ContentTypeGroupId */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { diff --git a/src/lib/Server/Input/Parser/Criterion/ContentTypeId.php b/src/lib/Server/Input/Parser/Criterion/ContentTypeId.php index 4f383270..0ee1e152 100644 --- a/src/lib/Server/Input/Parser/Criterion/ContentTypeId.php +++ b/src/lib/Server/Input/Parser/Criterion/ContentTypeId.php @@ -9,7 +9,7 @@ use Ibexa\Rest\Input\BaseParser; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Contracts\Rest\Exceptions; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\ContentTypeId as ContentTypeIdCriterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\ContentTypeId as ContentTypeIdCriterion; /** * Parser for ViewInput. @@ -20,11 +20,11 @@ class ContentTypeId extends BaseParser * Parses input structure to a Criterion object. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @throws \EzSystems\EzPlatformRest\Exceptions\Parser + * @throws \Ibexa\Contracts\Rest\Exceptions\Parser * - * @return \eZ\Publish\API\Repository\Values\Content\Query\Criterion\ContentTypeId + * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\ContentTypeId */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { diff --git a/src/lib/Server/Input/Parser/Criterion/ContentTypeIdentifier.php b/src/lib/Server/Input/Parser/Criterion/ContentTypeIdentifier.php index b860100b..4ac57972 100644 --- a/src/lib/Server/Input/Parser/Criterion/ContentTypeIdentifier.php +++ b/src/lib/Server/Input/Parser/Criterion/ContentTypeIdentifier.php @@ -9,8 +9,8 @@ use Ibexa\Rest\Input\BaseParser; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Contracts\Rest\Exceptions; -use eZ\Publish\API\Repository\ContentTypeService; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\ContentTypeId as ContentTypeIdCriterion; +use Ibexa\Contracts\Core\Repository\ContentTypeService; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\ContentTypeId as ContentTypeIdCriterion; /** * Parser for ViewInput. @@ -20,7 +20,7 @@ class ContentTypeIdentifier extends BaseParser /** * Content type service. * - * @var \eZ\Publish\API\Repository\ContentTypeService + * @var \Ibexa\Contracts\Core\Repository\ContentTypeService */ protected $contentTypeService; @@ -33,11 +33,11 @@ public function __construct(ContentTypeService $contentTypeService) * Parses input structure to a Criterion object. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @throws \EzSystems\EzPlatformRest\Exceptions\Parser + * @throws \Ibexa\Contracts\Rest\Exceptions\Parser * - * @return \eZ\Publish\API\Repository\Values\Content\Query\Criterion\ContentTypeId + * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\ContentTypeId */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { diff --git a/src/lib/Server/Input/Parser/Criterion/DateMetadata.php b/src/lib/Server/Input/Parser/Criterion/DateMetadata.php index 0a67a4db..2951ae43 100644 --- a/src/lib/Server/Input/Parser/Criterion/DateMetadata.php +++ b/src/lib/Server/Input/Parser/Criterion/DateMetadata.php @@ -8,8 +8,8 @@ use Ibexa\Rest\Input\BaseParser; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\DateMetadata as DateMetadataCriterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\DateMetadata as DateMetadataCriterion; use Ibexa\Contracts\Rest\Exceptions; /** @@ -32,7 +32,7 @@ class DateMetadata extends BaseParser * * @param string[] $data * - * @throws \EzSystems\EzPlatformRest\Exceptions\Parser + * @throws \Ibexa\Contracts\Rest\Exceptions\Parser */ public function parse(array $data, ParsingDispatcher $parsingDispatcher): DateMetadataCriterion { @@ -76,7 +76,7 @@ public function parse(array $data, ParsingDispatcher $parsingDispatcher): DateMe * * For the full list of supported operators: * - * @see \eZ\Publish\API\Repository\Values\Content\Query\Criterion\DateMetadata::OPERATORS + * @see \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\DateMetadata::OPERATORS */ private function getOperator(string $operatorName): string { diff --git a/src/lib/Server/Input/Parser/Criterion/Field.php b/src/lib/Server/Input/Parser/Criterion/Field.php index 6264857c..7f1b498e 100644 --- a/src/lib/Server/Input/Parser/Criterion/Field.php +++ b/src/lib/Server/Input/Parser/Criterion/Field.php @@ -6,8 +6,8 @@ */ namespace Ibexa\Rest\Server\Input\Parser\Criterion; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Field as FieldCriterion; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Field as FieldCriterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator; use Ibexa\Rest\Input\BaseParser; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Contracts\Rest\Exceptions; @@ -33,11 +33,11 @@ class Field extends BaseParser * Parses input structure to a Criterion object. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @throws \EzSystems\EzPlatformRest\Exceptions\Parser + * @throws \Ibexa\Contracts\Rest\Exceptions\Parser * - * @return \eZ\Publish\API\Repository\Values\Content\Query\Criterion\Field + * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Field */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { @@ -64,7 +64,7 @@ public function parse(array $data, ParsingDispatcher $parsingDispatcher) * * For the full list of supported operators: * - * @see \EzSystems\EzPlatformRest\Server\Input\Parser\Criterion\Field::OPERATORS + * @see \Ibexa\Rest\Server\Input\Parser\Criterion\Field::OPERATORS * * @param string $operatorName operator literal operator name * diff --git a/src/lib/Server/Input/Parser/Criterion/FullText.php b/src/lib/Server/Input/Parser/Criterion/FullText.php index 608fdf6f..576a7cf3 100644 --- a/src/lib/Server/Input/Parser/Criterion/FullText.php +++ b/src/lib/Server/Input/Parser/Criterion/FullText.php @@ -9,7 +9,7 @@ use Ibexa\Rest\Input\BaseParser; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Contracts\Rest\Exceptions; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\FullText as FullTextCriterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\FullText as FullTextCriterion; /** * Parser for FullText Criterion. @@ -20,11 +20,11 @@ class FullText extends BaseParser * Parses input structure to a FullText criterion. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @throws \EzSystems\EzPlatformRest\Exceptions\Parser + * @throws \Ibexa\Contracts\Rest\Exceptions\Parser * - * @return \eZ\Publish\API\Repository\Values\Content\Query\Criterion\FullText + * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\FullText */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { diff --git a/src/lib/Server/Input/Parser/Criterion/IsUserBased.php b/src/lib/Server/Input/Parser/Criterion/IsUserBased.php index 4223cc20..0a3b3700 100644 --- a/src/lib/Server/Input/Parser/Criterion/IsUserBased.php +++ b/src/lib/Server/Input/Parser/Criterion/IsUserBased.php @@ -12,11 +12,11 @@ use Ibexa\Rest\Input\ParserTools; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Contracts\Rest\Exceptions; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\IsUserBased as IsUserBasedCriterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\IsUserBased as IsUserBasedCriterion; class IsUserBased extends BaseParser { - /** @var \EzSystems\EzPlatformRest\Input\ParserTools */ + /** @var \Ibexa\Rest\Input\ParserTools */ protected $parserTools; public function __construct(ParserTools $parserTools) diff --git a/src/lib/Server/Input/Parser/Criterion/IsUserEnabled.php b/src/lib/Server/Input/Parser/Criterion/IsUserEnabled.php index b31ca1ea..ca8541b1 100644 --- a/src/lib/Server/Input/Parser/Criterion/IsUserEnabled.php +++ b/src/lib/Server/Input/Parser/Criterion/IsUserEnabled.php @@ -12,11 +12,11 @@ use Ibexa\Rest\Input\ParserTools; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Contracts\Rest\Exceptions; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\IsUserEnabled as IsUserEnabledCriterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\IsUserEnabled as IsUserEnabledCriterion; class IsUserEnabled extends BaseParser { - /** @var \EzSystems\EzPlatformRest\Input\ParserTools */ + /** @var \Ibexa\Rest\Input\ParserTools */ protected $parserTools; public function __construct(ParserTools $parserTools) diff --git a/src/lib/Server/Input/Parser/Criterion/LanguageCode.php b/src/lib/Server/Input/Parser/Criterion/LanguageCode.php index c636752e..bca23994 100644 --- a/src/lib/Server/Input/Parser/Criterion/LanguageCode.php +++ b/src/lib/Server/Input/Parser/Criterion/LanguageCode.php @@ -9,7 +9,7 @@ use Ibexa\Rest\Input\BaseParser; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Contracts\Rest\Exceptions; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\LanguageCode as LanguageCodeCriterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\LanguageCode as LanguageCodeCriterion; /** * Parser for LanguageCode Criterion. @@ -20,11 +20,11 @@ class LanguageCode extends BaseParser * Parses input structure to a LanguageCode Criterion object. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @throws \EzSystems\EzPlatformRest\Exceptions\Parser + * @throws \Ibexa\Contracts\Rest\Exceptions\Parser * - * @return \eZ\Publish\API\Repository\Values\Content\Query\Criterion\LanguageCode + * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\LanguageCode */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { diff --git a/src/lib/Server/Input/Parser/Criterion/LocationId.php b/src/lib/Server/Input/Parser/Criterion/LocationId.php index bee1c9be..619946ae 100644 --- a/src/lib/Server/Input/Parser/Criterion/LocationId.php +++ b/src/lib/Server/Input/Parser/Criterion/LocationId.php @@ -9,7 +9,7 @@ use Ibexa\Rest\Input\BaseParser; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Contracts\Rest\Exceptions; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\LocationId as LocationIdCriterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\LocationId as LocationIdCriterion; /** * Parser for LocationId Criterion. @@ -20,11 +20,11 @@ class LocationId extends BaseParser * Parses input structure to a Criterion object. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @throws \EzSystems\EzPlatformRest\Exceptions\Parser + * @throws \Ibexa\Contracts\Rest\Exceptions\Parser * - * @return \eZ\Publish\API\Repository\Values\Content\Query\Criterion\LocationId + * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\LocationId */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { diff --git a/src/lib/Server/Input/Parser/Criterion/LocationRemoteId.php b/src/lib/Server/Input/Parser/Criterion/LocationRemoteId.php index 198ff70e..879e908b 100644 --- a/src/lib/Server/Input/Parser/Criterion/LocationRemoteId.php +++ b/src/lib/Server/Input/Parser/Criterion/LocationRemoteId.php @@ -9,7 +9,7 @@ use Ibexa\Rest\Input\BaseParser; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Contracts\Rest\Exceptions; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\LocationRemoteId as LocationRemoteIdCriterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\LocationRemoteId as LocationRemoteIdCriterion; /** * Parser for LocationRemoteId Criterion. @@ -20,11 +20,11 @@ class LocationRemoteId extends BaseParser * Parses input structure to a Criterion object. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @throws \EzSystems\EzPlatformRest\Exceptions\Parser + * @throws \Ibexa\Contracts\Rest\Exceptions\Parser * - * @return \eZ\Publish\API\Repository\Values\Content\Query\Criterion\LocationRemoteId + * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\LocationRemoteId */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { diff --git a/src/lib/Server/Input/Parser/Criterion/LogicalAnd.php b/src/lib/Server/Input/Parser/Criterion/LogicalAnd.php index 4d823031..5e35c946 100644 --- a/src/lib/Server/Input/Parser/Criterion/LogicalAnd.php +++ b/src/lib/Server/Input/Parser/Criterion/LogicalAnd.php @@ -8,7 +8,7 @@ use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Contracts\Rest\Exceptions; -use eZ\Publish\API\Repository\Values; +use Ibexa\Core\Repository\Values; /** * Parser for LogicalAnd Criterion. @@ -24,11 +24,11 @@ class LogicalAnd extends LogicalOperator * Parses input structure to a LogicalAnd Criterion object. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @throws \EzSystems\EzPlatformRest\Exceptions\Parser + * @throws \Ibexa\Contracts\Rest\Exceptions\Parser * - * @return \eZ\Publish\API\Repository\Values\Content\Query\Criterion\LogicalAnd + * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\LogicalAnd */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { diff --git a/src/lib/Server/Input/Parser/Criterion/LogicalNot.php b/src/lib/Server/Input/Parser/Criterion/LogicalNot.php index bdc92610..7d62234c 100644 --- a/src/lib/Server/Input/Parser/Criterion/LogicalNot.php +++ b/src/lib/Server/Input/Parser/Criterion/LogicalNot.php @@ -9,7 +9,7 @@ use Ibexa\Rest\Server\Input\Parser\Criterion as CriterionParser; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Contracts\Rest\Exceptions; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\LogicalNot as LogicalNotCriterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\LogicalNot as LogicalNotCriterion; /** * Parser for LogicalNot Criterion. @@ -20,11 +20,11 @@ class LogicalNot extends CriterionParser * Parses input structure to a Criterion object. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @throws \EzSystems\EzPlatformRest\Exceptions\Parser + * @throws \Ibexa\Contracts\Rest\Exceptions\Parser * - * @return \eZ\Publish\API\Repository\Values\Content\Query\Criterion\LogicalNot + * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\LogicalNot */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { diff --git a/src/lib/Server/Input/Parser/Criterion/LogicalOperator.php b/src/lib/Server/Input/Parser/Criterion/LogicalOperator.php index 246fe6e5..1f8d90d4 100644 --- a/src/lib/Server/Input/Parser/Criterion/LogicalOperator.php +++ b/src/lib/Server/Input/Parser/Criterion/LogicalOperator.php @@ -18,11 +18,11 @@ class LogicalOperator extends Criterion * Parses input structure to a Criterion object. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @throws \EzSystems\EzPlatformRest\Exceptions\Parser + * @throws \Ibexa\Contracts\Rest\Exceptions\Parser * - * @return \eZ\Publish\API\Repository\Values\Content\Query\Criterion\LogicalOperator + * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\LogicalOperator */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { diff --git a/src/lib/Server/Input/Parser/Criterion/LogicalOr.php b/src/lib/Server/Input/Parser/Criterion/LogicalOr.php index e1c72dd1..e0b4b022 100644 --- a/src/lib/Server/Input/Parser/Criterion/LogicalOr.php +++ b/src/lib/Server/Input/Parser/Criterion/LogicalOr.php @@ -8,7 +8,7 @@ use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Contracts\Rest\Exceptions; -use eZ\Publish\API\Repository\Values; +use Ibexa\Core\Repository\Values; /** * Parser for LogicalOr Criterion. @@ -24,11 +24,11 @@ class LogicalOr extends LogicalOperator * Parses input structure to a LogicalOr Criterion object. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @throws \EzSystems\EzPlatformRest\Exceptions\Parser + * @throws \Ibexa\Contracts\Rest\Exceptions\Parser * - * @return \eZ\Publish\API\Repository\Values\Content\Query\Criterion\LogicalOr + * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\LogicalOr */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { diff --git a/src/lib/Server/Input/Parser/Criterion/MoreLikeThis.php b/src/lib/Server/Input/Parser/Criterion/MoreLikeThis.php index 35ccf0a6..847165d5 100644 --- a/src/lib/Server/Input/Parser/Criterion/MoreLikeThis.php +++ b/src/lib/Server/Input/Parser/Criterion/MoreLikeThis.php @@ -18,11 +18,11 @@ class MoreLikeThis extends BaseParser * Parses input structure to a Criterion object. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @throws \EzSystems\EzPlatformRest\Exceptions\Parser + * @throws \Ibexa\Contracts\Rest\Exceptions\Parser * - * @return \eZ\Publish\API\Repository\Values\Content\Query\Criterion\MoreLikeThis + * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\MoreLikeThis */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { diff --git a/src/lib/Server/Input/Parser/Criterion/ObjectStateId.php b/src/lib/Server/Input/Parser/Criterion/ObjectStateId.php index 37af4c9c..b3c7f6c1 100644 --- a/src/lib/Server/Input/Parser/Criterion/ObjectStateId.php +++ b/src/lib/Server/Input/Parser/Criterion/ObjectStateId.php @@ -9,7 +9,7 @@ use Ibexa\Rest\Input\BaseParser; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Contracts\Rest\Exceptions; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\ObjectStateId as ObjectStateIdCriterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\ObjectStateId as ObjectStateIdCriterion; /** * Parser for ObjectStateId Criterion. @@ -20,11 +20,11 @@ class ObjectStateId extends BaseParser * Parses input structure to a ObjectStateId Criterion object. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @throws \EzSystems\EzPlatformRest\Exceptions\Parser + * @throws \Ibexa\Contracts\Rest\Exceptions\Parser * - * @return \eZ\Publish\API\Repository\Values\Content\Query\Criterion\ObjectStateId + * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\ObjectStateId */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { diff --git a/src/lib/Server/Input/Parser/Criterion/ObjectStateIdentifier.php b/src/lib/Server/Input/Parser/Criterion/ObjectStateIdentifier.php index e6c71ad5..96d281c3 100644 --- a/src/lib/Server/Input/Parser/Criterion/ObjectStateIdentifier.php +++ b/src/lib/Server/Input/Parser/Criterion/ObjectStateIdentifier.php @@ -11,7 +11,7 @@ use Ibexa\Rest\Input\BaseParser; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Contracts\Rest\Exceptions; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\ObjectStateIdentifier as ObjectStateIdentifierCriterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\ObjectStateIdentifier as ObjectStateIdentifierCriterion; class ObjectStateIdentifier extends BaseParser { diff --git a/src/lib/Server/Input/Parser/Criterion/Operator.php b/src/lib/Server/Input/Parser/Criterion/Operator.php index 61d3cdb9..c68befdf 100644 --- a/src/lib/Server/Input/Parser/Criterion/Operator.php +++ b/src/lib/Server/Input/Parser/Criterion/Operator.php @@ -18,11 +18,11 @@ class Operator extends BaseParser * Parses input structure to a Criterion object. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @throws \EzSystems\EzPlatformRest\Exceptions\Parser + * @throws \Ibexa\Contracts\Rest\Exceptions\Parser * - * @return \eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator + * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { diff --git a/src/lib/Server/Input/Parser/Criterion/ParentLocationId.php b/src/lib/Server/Input/Parser/Criterion/ParentLocationId.php index 56b72aea..7b54b221 100644 --- a/src/lib/Server/Input/Parser/Criterion/ParentLocationId.php +++ b/src/lib/Server/Input/Parser/Criterion/ParentLocationId.php @@ -9,7 +9,7 @@ use Ibexa\Rest\Input\BaseParser; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Contracts\Rest\Exceptions; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\ParentLocationId as ParentLocationIdCriterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\ParentLocationId as ParentLocationIdCriterion; /** * Parser for LocationId Criterion. @@ -20,11 +20,11 @@ class ParentLocationId extends BaseParser * Parses input structure to a ParentLocationId Criterion object. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @throws \EzSystems\EzPlatformRest\Exceptions\Parser + * @throws \Ibexa\Contracts\Rest\Exceptions\Parser * - * @return \eZ\Publish\API\Repository\Values\Content\Query\Criterion\ParentLocationId + * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\ParentLocationId */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { diff --git a/src/lib/Server/Input/Parser/Criterion/ParentLocationRemoteId.php b/src/lib/Server/Input/Parser/Criterion/ParentLocationRemoteId.php index d261c8f7..f708ca3c 100644 --- a/src/lib/Server/Input/Parser/Criterion/ParentLocationRemoteId.php +++ b/src/lib/Server/Input/Parser/Criterion/ParentLocationRemoteId.php @@ -9,8 +9,8 @@ use Ibexa\Rest\Input\BaseParser; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Contracts\Rest\Exceptions; -use eZ\Publish\API\Repository\LocationService; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\ParentLocationId as ParentLocationIdCriterion; +use Ibexa\Contracts\Core\Repository\LocationService; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\ParentLocationId as ParentLocationIdCriterion; /** * Parser for ParentLocationId Criterion. @@ -20,7 +20,7 @@ class ParentLocationRemoteId extends BaseParser /** * Location service. * - * @var \eZ\Publish\API\Repository\LocationService + * @var \Ibexa\Contracts\Core\Repository\LocationService */ protected $locationService; @@ -33,11 +33,11 @@ public function __construct(LocationService $locationService) * Parses input structure to a Criterion object. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @throws \EzSystems\EzPlatformRest\Exceptions\Parser + * @throws \Ibexa\Contracts\Rest\Exceptions\Parser * - * @return \eZ\Publish\API\Repository\Values\Content\Query\Criterion\ParentLocationId + * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\ParentLocationId */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { diff --git a/src/lib/Server/Input/Parser/Criterion/SectionId.php b/src/lib/Server/Input/Parser/Criterion/SectionId.php index 71505fbc..dafdb251 100644 --- a/src/lib/Server/Input/Parser/Criterion/SectionId.php +++ b/src/lib/Server/Input/Parser/Criterion/SectionId.php @@ -9,7 +9,7 @@ use Ibexa\Rest\Input\BaseParser; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Contracts\Rest\Exceptions; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\SectionId as SectionIdCriterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\SectionId as SectionIdCriterion; /** * Parser for SectionId Criterion. @@ -20,11 +20,11 @@ class SectionId extends BaseParser * Parses input structure to a SectionId Criterion object. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @throws \EzSystems\EzPlatformRest\Exceptions\Parser + * @throws \Ibexa\Contracts\Rest\Exceptions\Parser * - * @return \eZ\Publish\API\Repository\Values\Content\Query\Criterion\SectionId + * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\SectionId */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { diff --git a/src/lib/Server/Input/Parser/Criterion/SectionIdentifier.php b/src/lib/Server/Input/Parser/Criterion/SectionIdentifier.php index 434c84e6..73a179f0 100644 --- a/src/lib/Server/Input/Parser/Criterion/SectionIdentifier.php +++ b/src/lib/Server/Input/Parser/Criterion/SectionIdentifier.php @@ -11,7 +11,7 @@ use Ibexa\Rest\Input\BaseParser; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Contracts\Rest\Exceptions; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\SectionIdentifier as SectionIdentifierCriterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\SectionIdentifier as SectionIdentifierCriterion; class SectionIdentifier extends BaseParser { diff --git a/src/lib/Server/Input/Parser/Criterion/Sibling.php b/src/lib/Server/Input/Parser/Criterion/Sibling.php index 3f647ee1..8fba5a38 100644 --- a/src/lib/Server/Input/Parser/Criterion/Sibling.php +++ b/src/lib/Server/Input/Parser/Criterion/Sibling.php @@ -8,15 +8,15 @@ namespace Ibexa\Rest\Server\Input\Parser\Criterion; -use eZ\Publish\API\Repository\LocationService; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Sibling as SiblingCriterion; +use Ibexa\Contracts\Core\Repository\LocationService; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Sibling as SiblingCriterion; use Ibexa\Rest\Input\BaseParser; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Contracts\Rest\Exceptions; class Sibling extends BaseParser { - /** @var \eZ\Publish\API\Repository\LocationService */ + /** @var \Ibexa\Contracts\Core\Repository\LocationService */ private $locationService; public function __construct(LocationService $locationService) diff --git a/src/lib/Server/Input/Parser/Criterion/Subtree.php b/src/lib/Server/Input/Parser/Criterion/Subtree.php index 8553d1dd..88173160 100644 --- a/src/lib/Server/Input/Parser/Criterion/Subtree.php +++ b/src/lib/Server/Input/Parser/Criterion/Subtree.php @@ -9,7 +9,7 @@ use Ibexa\Rest\Input\BaseParser; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Contracts\Rest\Exceptions; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Subtree as SubtreeCriterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Subtree as SubtreeCriterion; /** * Parser for Subtree Criterion. @@ -20,11 +20,11 @@ class Subtree extends BaseParser * Parses input structure to a Criterion object. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @throws \EzSystems\EzPlatformRest\Exceptions\Parser + * @throws \Ibexa\Contracts\Rest\Exceptions\Parser * - * @return \eZ\Publish\API\Repository\Values\Content\Query\Criterion\Subtree + * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Subtree */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { diff --git a/src/lib/Server/Input/Parser/Criterion/UserEmail.php b/src/lib/Server/Input/Parser/Criterion/UserEmail.php index e6fd205e..59d023ca 100644 --- a/src/lib/Server/Input/Parser/Criterion/UserEmail.php +++ b/src/lib/Server/Input/Parser/Criterion/UserEmail.php @@ -8,11 +8,11 @@ namespace Ibexa\Rest\Server\Input\Parser\Criterion; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator as QueryOperator; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator as QueryOperator; use Ibexa\Rest\Input\BaseParser; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Contracts\Rest\Exceptions; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\UserEmail as UserEmailCriterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\UserEmail as UserEmailCriterion; class UserEmail extends BaseParser { diff --git a/src/lib/Server/Input/Parser/Criterion/UserId.php b/src/lib/Server/Input/Parser/Criterion/UserId.php index d416a500..97265e32 100644 --- a/src/lib/Server/Input/Parser/Criterion/UserId.php +++ b/src/lib/Server/Input/Parser/Criterion/UserId.php @@ -11,7 +11,7 @@ use Ibexa\Rest\Input\BaseParser; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Contracts\Rest\Exceptions; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\UserId as UserIdCriterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\UserId as UserIdCriterion; class UserId extends BaseParser { diff --git a/src/lib/Server/Input/Parser/Criterion/UserLogin.php b/src/lib/Server/Input/Parser/Criterion/UserLogin.php index e2f1b875..1ecac3eb 100644 --- a/src/lib/Server/Input/Parser/Criterion/UserLogin.php +++ b/src/lib/Server/Input/Parser/Criterion/UserLogin.php @@ -8,11 +8,11 @@ namespace Ibexa\Rest\Server\Input\Parser\Criterion; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator as QueryOperator; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator as QueryOperator; use Ibexa\Rest\Input\BaseParser; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Contracts\Rest\Exceptions; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\UserLogin as UserLoginCriterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\UserLogin as UserLoginCriterion; class UserLogin extends BaseParser { diff --git a/src/lib/Server/Input/Parser/Criterion/UserMetadata.php b/src/lib/Server/Input/Parser/Criterion/UserMetadata.php index 68986c58..c952f95e 100644 --- a/src/lib/Server/Input/Parser/Criterion/UserMetadata.php +++ b/src/lib/Server/Input/Parser/Criterion/UserMetadata.php @@ -9,7 +9,7 @@ use Ibexa\Rest\Input\BaseParser; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Contracts\Rest\Exceptions; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\UserMetadata as UserMetadataCriterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\UserMetadata as UserMetadataCriterion; /** * Parser for ViewInput. @@ -20,11 +20,11 @@ class UserMetadata extends BaseParser * Parses input structure to a Criterion object. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @throws \EzSystems\EzPlatformRest\Exceptions\Parser + * @throws \Ibexa\Contracts\Rest\Exceptions\Parser * - * @return \eZ\Publish\API\Repository\Values\Content\Query\Criterion\UserMetadata + * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\UserMetadata */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { diff --git a/src/lib/Server/Input/Parser/Criterion/Visibility.php b/src/lib/Server/Input/Parser/Criterion/Visibility.php index 26880c54..906c7aa5 100644 --- a/src/lib/Server/Input/Parser/Criterion/Visibility.php +++ b/src/lib/Server/Input/Parser/Criterion/Visibility.php @@ -9,7 +9,7 @@ use Ibexa\Rest\Input\BaseParser; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Contracts\Rest\Exceptions; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Visibility as VisibilityCriterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Visibility as VisibilityCriterion; /** * Parser for Visibility Criterion. @@ -20,11 +20,11 @@ class Visibility extends BaseParser * Parses input structure to a Visibility Criterion object. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @throws \EzSystems\EzPlatformRest\Exceptions\Parser + * @throws \Ibexa\Contracts\Rest\Exceptions\Parser * - * @return \eZ\Publish\API\Repository\Values\Content\Query\Criterion\Visibility + * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Visibility */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { diff --git a/src/lib/Server/Input/Parser/FacetBuilder/ContentTypeParser.php b/src/lib/Server/Input/Parser/FacetBuilder/ContentTypeParser.php index 115d4b84..c7c82f55 100644 --- a/src/lib/Server/Input/Parser/FacetBuilder/ContentTypeParser.php +++ b/src/lib/Server/Input/Parser/FacetBuilder/ContentTypeParser.php @@ -9,7 +9,7 @@ use Ibexa\Rest\Input\BaseParser; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Contracts\Rest\Exceptions; -use eZ\Publish\API\Repository\Values\Content\Query\FacetBuilder\ContentTypeFacetBuilder; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\FacetBuilder\ContentTypeFacetBuilder; /** * Parser for ContentType facet builder. @@ -20,11 +20,11 @@ class ContentTypeParser extends BaseParser * Parses input structure to a FacetBuilder object. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @throws \EzSystems\EzPlatformRest\Exceptions\Parser + * @throws \Ibexa\Contracts\Rest\Exceptions\Parser * - * @return \eZ\Publish\API\Repository\Values\Content\Query\FacetBuilder\ContentTypeFacetBuilder + * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\FacetBuilder\ContentTypeFacetBuilder */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { diff --git a/src/lib/Server/Input/Parser/FacetBuilder/CriterionParser.php b/src/lib/Server/Input/Parser/FacetBuilder/CriterionParser.php index c21f777b..29649474 100644 --- a/src/lib/Server/Input/Parser/FacetBuilder/CriterionParser.php +++ b/src/lib/Server/Input/Parser/FacetBuilder/CriterionParser.php @@ -9,7 +9,7 @@ use Ibexa\Rest\Input\BaseParser; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Contracts\Rest\Exceptions; -use eZ\Publish\API\Repository\Values\Content\Query\FacetBuilder\CriterionFacetBuilder; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\FacetBuilder\CriterionFacetBuilder; /** * Parser for Criterion facet builder. @@ -20,11 +20,11 @@ class CriterionParser extends BaseParser * Parses input structure to a FacetBuilder object. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @throws \EzSystems\EzPlatformRest\Exceptions\Parser + * @throws \Ibexa\Contracts\Rest\Exceptions\Parser * - * @return \eZ\Publish\API\Repository\Values\Content\Query\FacetBuilder\CriterionFacetBuilder + * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\FacetBuilder\CriterionFacetBuilder */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { diff --git a/src/lib/Server/Input/Parser/FacetBuilder/DateRangeParser.php b/src/lib/Server/Input/Parser/FacetBuilder/DateRangeParser.php index f216723a..82e62a9f 100644 --- a/src/lib/Server/Input/Parser/FacetBuilder/DateRangeParser.php +++ b/src/lib/Server/Input/Parser/FacetBuilder/DateRangeParser.php @@ -9,7 +9,7 @@ use Ibexa\Rest\Input\BaseParser; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Contracts\Rest\Exceptions; -use eZ\Publish\API\Repository\Values\Content\Query\FacetBuilder\DateRangeFacetBuilder; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\FacetBuilder\DateRangeFacetBuilder; /** * Parser for DateRange facet builder. @@ -20,11 +20,11 @@ class DateRangeParser extends BaseParser * Parses input structure to a FacetBuilder object. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @throws \EzSystems\EzPlatformRest\Exceptions\Parser + * @throws \Ibexa\Contracts\Rest\Exceptions\Parser * - * @return \eZ\Publish\API\Repository\Values\Content\Query\FacetBuilder\DateRangeFacetBuilder + * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\FacetBuilder\DateRangeFacetBuilder */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { diff --git a/src/lib/Server/Input/Parser/FacetBuilder/FieldParser.php b/src/lib/Server/Input/Parser/FacetBuilder/FieldParser.php index 577f87fe..d5a11047 100644 --- a/src/lib/Server/Input/Parser/FacetBuilder/FieldParser.php +++ b/src/lib/Server/Input/Parser/FacetBuilder/FieldParser.php @@ -9,7 +9,7 @@ use Ibexa\Rest\Input\BaseParser; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Contracts\Rest\Exceptions; -use eZ\Publish\API\Repository\Values\Content\Query\FacetBuilder\FieldFacetBuilder; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\FacetBuilder\FieldFacetBuilder; /** * Parser for Field facet builder. @@ -20,11 +20,11 @@ class FieldParser extends BaseParser * Parses input structure to a FacetBuilder object. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @throws \EzSystems\EzPlatformRest\Exceptions\Parser + * @throws \Ibexa\Contracts\Rest\Exceptions\Parser * - * @return \eZ\Publish\API\Repository\Values\Content\Query\FacetBuilder\FieldFacetBuilder + * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\FacetBuilder\FieldFacetBuilder */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { diff --git a/src/lib/Server/Input/Parser/FacetBuilder/FieldRangeParser.php b/src/lib/Server/Input/Parser/FacetBuilder/FieldRangeParser.php index c74666ef..8aa5027a 100644 --- a/src/lib/Server/Input/Parser/FacetBuilder/FieldRangeParser.php +++ b/src/lib/Server/Input/Parser/FacetBuilder/FieldRangeParser.php @@ -19,11 +19,11 @@ class FieldRangeParser extends BaseParser * Parses input structure to a FacetBuilder object. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @throws \EzSystems\EzPlatformRest\Exceptions\Parser + * @throws \Ibexa\Contracts\Rest\Exceptions\Parser * - * @return \eZ\Publish\API\Repository\Values\Content\Query\FacetBuilder\FieldRangeFacetBuilder + * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\FacetBuilder\FieldRangeFacetBuilder */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { diff --git a/src/lib/Server/Input/Parser/FacetBuilder/LocationParser.php b/src/lib/Server/Input/Parser/FacetBuilder/LocationParser.php index 437798b1..241ed775 100644 --- a/src/lib/Server/Input/Parser/FacetBuilder/LocationParser.php +++ b/src/lib/Server/Input/Parser/FacetBuilder/LocationParser.php @@ -9,7 +9,7 @@ use Ibexa\Rest\Input\BaseParser; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Contracts\Rest\Exceptions; -use eZ\Publish\API\Repository\Values\Content\Query\FacetBuilder\LocationFacetBuilder; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\FacetBuilder\LocationFacetBuilder; /** * Parser for Location facet builder. @@ -20,11 +20,11 @@ class LocationParser extends BaseParser * Parses input structure to a FacetBuilder object. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @throws \EzSystems\EzPlatformRest\Exceptions\Parser + * @throws \Ibexa\Contracts\Rest\Exceptions\Parser * - * @return \eZ\Publish\API\Repository\Values\Content\Query\FacetBuilder\LocationFacetBuilder + * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\FacetBuilder\LocationFacetBuilder */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { diff --git a/src/lib/Server/Input/Parser/FacetBuilder/SectionParser.php b/src/lib/Server/Input/Parser/FacetBuilder/SectionParser.php index 3474814a..3b59929c 100644 --- a/src/lib/Server/Input/Parser/FacetBuilder/SectionParser.php +++ b/src/lib/Server/Input/Parser/FacetBuilder/SectionParser.php @@ -9,7 +9,7 @@ use Ibexa\Rest\Input\BaseParser; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Contracts\Rest\Exceptions; -use eZ\Publish\API\Repository\Values\Content\Query\FacetBuilder\SectionFacetBuilder; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\FacetBuilder\SectionFacetBuilder; /** * Parser for Section facet builder. @@ -20,11 +20,11 @@ class SectionParser extends BaseParser * Parses input structure to a FacetBuilder object. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @throws \EzSystems\EzPlatformRest\Exceptions\Parser + * @throws \Ibexa\Contracts\Rest\Exceptions\Parser * - * @return \eZ\Publish\API\Repository\Values\Content\Query\FacetBuilder\SectionFacetBuilder + * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\FacetBuilder\SectionFacetBuilder */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { diff --git a/src/lib/Server/Input/Parser/FacetBuilder/TermParser.php b/src/lib/Server/Input/Parser/FacetBuilder/TermParser.php index e6660224..c782db13 100644 --- a/src/lib/Server/Input/Parser/FacetBuilder/TermParser.php +++ b/src/lib/Server/Input/Parser/FacetBuilder/TermParser.php @@ -9,7 +9,7 @@ use Ibexa\Rest\Input\BaseParser; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Contracts\Rest\Exceptions; -use eZ\Publish\API\Repository\Values\Content\Query\FacetBuilder\TermFacetBuilder; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\FacetBuilder\TermFacetBuilder; /** * Parser for Term facet builder. @@ -20,11 +20,11 @@ class TermParser extends BaseParser * Parses input structure to a FacetBuilder object. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @throws \EzSystems\EzPlatformRest\Exceptions\Parser + * @throws \Ibexa\Contracts\Rest\Exceptions\Parser * - * @return \eZ\Publish\API\Repository\Values\Content\Query\FacetBuilder\TermFacetBuilder + * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\FacetBuilder\TermFacetBuilder */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { diff --git a/src/lib/Server/Input/Parser/FacetBuilder/UserParser.php b/src/lib/Server/Input/Parser/FacetBuilder/UserParser.php index 0436bd23..c042e4af 100644 --- a/src/lib/Server/Input/Parser/FacetBuilder/UserParser.php +++ b/src/lib/Server/Input/Parser/FacetBuilder/UserParser.php @@ -9,7 +9,7 @@ use Ibexa\Rest\Input\BaseParser; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Contracts\Rest\Exceptions; -use eZ\Publish\API\Repository\Values\Content\Query\FacetBuilder\UserFacetBuilder; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\FacetBuilder\UserFacetBuilder; /** * Parser for User facet builder. @@ -20,11 +20,11 @@ class UserParser extends BaseParser * Parses input structure to a FacetBuilder object. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @throws \EzSystems\EzPlatformRest\Exceptions\Parser + * @throws \Ibexa\Contracts\Rest\Exceptions\Parser * - * @return \eZ\Publish\API\Repository\Values\Content\Query\FacetBuilder\UserFacetBuilder + * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\FacetBuilder\UserFacetBuilder */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { diff --git a/src/lib/Server/Input/Parser/FieldDefinitionCreate.php b/src/lib/Server/Input/Parser/FieldDefinitionCreate.php index 92ae18df..97cf97b5 100644 --- a/src/lib/Server/Input/Parser/FieldDefinitionCreate.php +++ b/src/lib/Server/Input/Parser/FieldDefinitionCreate.php @@ -10,7 +10,7 @@ use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Rest\Input\FieldTypeParser; use Ibexa\Rest\Input\ParserTools; -use eZ\Publish\API\Repository\ContentTypeService; +use Ibexa\Contracts\Core\Repository\ContentTypeService; use Ibexa\Contracts\Rest\Exceptions; use Exception; @@ -22,30 +22,30 @@ class FieldDefinitionCreate extends BaseParser /** * ContentType service. * - * @var \eZ\Publish\API\Repository\ContentTypeService + * @var \Ibexa\Contracts\Core\Repository\ContentTypeService */ protected $contentTypeService; /** * FieldType parser. * - * @var \EzSystems\EzPlatformRest\Input\FieldTypeParser + * @var \Ibexa\Rest\Input\FieldTypeParser */ protected $fieldTypeParser; /** * Parser tools. * - * @var \EzSystems\EzPlatformRest\Input\ParserTools + * @var \Ibexa\Rest\Input\ParserTools */ protected $parserTools; /** * Construct. * - * @param \eZ\Publish\API\Repository\ContentTypeService $contentTypeService - * @param \EzSystems\EzPlatformRest\Input\FieldTypeParser $fieldTypeParser - * @param \EzSystems\EzPlatformRest\Input\ParserTools $parserTools + * @param \Ibexa\Contracts\Core\Repository\ContentTypeService $contentTypeService + * @param \Ibexa\Rest\Input\FieldTypeParser $fieldTypeParser + * @param \Ibexa\Rest\Input\ParserTools $parserTools */ public function __construct(ContentTypeService $contentTypeService, FieldTypeParser $fieldTypeParser, ParserTools $parserTools) { @@ -58,11 +58,11 @@ public function __construct(ContentTypeService $contentTypeService, FieldTypePar * Parse input structure. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @throws \EzSystems\EzPlatformRest\Exceptions\Parser If an error is found while parsing + * @throws \Ibexa\Contracts\Rest\Exceptions\Parser If an error is found while parsing * - * @return \eZ\Publish\API\Repository\Values\ContentType\FieldDefinitionCreateStruct + * @return \Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinitionCreateStruct */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { diff --git a/src/lib/Server/Input/Parser/FieldDefinitionUpdate.php b/src/lib/Server/Input/Parser/FieldDefinitionUpdate.php index 716f2712..03dfc582 100644 --- a/src/lib/Server/Input/Parser/FieldDefinitionUpdate.php +++ b/src/lib/Server/Input/Parser/FieldDefinitionUpdate.php @@ -10,7 +10,7 @@ use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Rest\Input\FieldTypeParser; use Ibexa\Rest\Input\ParserTools; -use eZ\Publish\API\Repository\ContentTypeService; +use Ibexa\Contracts\Core\Repository\ContentTypeService; use Ibexa\Contracts\Rest\Exceptions; /** @@ -21,29 +21,29 @@ class FieldDefinitionUpdate extends BaseParser /** * ContentType service. * - * @var \eZ\Publish\API\Repository\ContentTypeService + * @var \Ibexa\Contracts\Core\Repository\ContentTypeService */ protected $contentTypeService; /** * FieldType parser. * - * @var \EzSystems\EzPlatformRest\Input\FieldTypeParser + * @var \Ibexa\Rest\Input\FieldTypeParser */ protected $fieldTypeParser; /** * Parser tools. * - * @var \EzSystems\EzPlatformRest\Input\ParserTools + * @var \Ibexa\Rest\Input\ParserTools */ protected $parserTools; /** * Construct. * - * @param \eZ\Publish\API\Repository\ContentTypeService $contentTypeService - * @param \EzSystems\EzPlatformRest\Input\ParserTools $parserTools + * @param \Ibexa\Contracts\Core\Repository\ContentTypeService $contentTypeService + * @param \Ibexa\Rest\Input\ParserTools $parserTools */ public function __construct(ContentTypeService $contentTypeService, FieldTypeParser $fieldTypeParser, ParserTools $parserTools) { @@ -56,9 +56,9 @@ public function __construct(ContentTypeService $contentTypeService, FieldTypePar * Parse input structure. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @return \eZ\Publish\API\Repository\Values\ContentType\FieldDefinitionUpdateStruct + * @return \Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinitionUpdateStruct */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { @@ -150,13 +150,13 @@ public function parse(array $data, ParsingDispatcher $parsingDispatcher) * * @todo depends on temporary solution to give parser access to the URL * - * @see \EzSystems\EzPlatformRest\Server\Controller\ContentType::updateFieldDefinition + * @see \Ibexa\Rest\Server\Controller\ContentType::updateFieldDefinition * - * @throws \eZ\Publish\API\Repository\Exceptions\NotFoundException + * @throws \Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException * * @param array $data * - * @return \eZ\Publish\API\Repository\Values\ContentType\FieldDefinition + * @return \Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinition */ protected function getFieldDefinition(array $data) { diff --git a/src/lib/Server/Input/Parser/Limitation/PathStringRouteBasedLimitationParser.php b/src/lib/Server/Input/Parser/Limitation/PathStringRouteBasedLimitationParser.php index d1a9b9e5..d35fceed 100644 --- a/src/lib/Server/Input/Parser/Limitation/PathStringRouteBasedLimitationParser.php +++ b/src/lib/Server/Input/Parser/Limitation/PathStringRouteBasedLimitationParser.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Rest\Server\Input\Parser\Limitation; -use eZ\Publish\API\Repository\Values; +use Ibexa\Core\Repository\Values; use Ibexa\Contracts\Rest\Exceptions; /** @@ -22,7 +22,7 @@ class PathStringRouteBasedLimitationParser extends RouteBasedLimitationParser /** * Prefixes the value parsed by the parent with a '/'. * - * @throws \EzSystems\EzPlatformRest\Exceptions\Parser if the '_href' attribute doesn't end with a slash, since 6.4 + * @throws \Ibexa\Contracts\Rest\Exceptions\Parser if the '_href' attribute doesn't end with a slash, since 6.4 * * @param $limitationValue * diff --git a/src/lib/Server/Input/Parser/Limitation/RouteBasedLimitationParser.php b/src/lib/Server/Input/Parser/Limitation/RouteBasedLimitationParser.php index 14b03698..00c003eb 100644 --- a/src/lib/Server/Input/Parser/Limitation/RouteBasedLimitationParser.php +++ b/src/lib/Server/Input/Parser/Limitation/RouteBasedLimitationParser.php @@ -9,7 +9,7 @@ use Ibexa\Rest\Input\BaseParser; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Contracts\Rest\Exceptions; -use eZ\Publish\API\Repository\Values; +use Ibexa\Core\Repository\Values; /** * Generic limitation value parser. @@ -53,9 +53,9 @@ public function __construct($limitationRouteParameterName, $limitationClass) * Parse input structure. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @return \eZ\Publish\API\Repository\Values\ValueObject + * @return \Ibexa\Contracts\Core\Repository\Values\ValueObject */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { @@ -81,7 +81,7 @@ public function parse(array $data, ParsingDispatcher $parsingDispatcher) } /** - * @return \eZ\Publish\API\Repository\Values\User\Limitation + * @return \Ibexa\Contracts\Core\Repository\Values\User\Limitation */ protected function buildLimitation() { diff --git a/src/lib/Server/Input/Parser/LocationCreate.php b/src/lib/Server/Input/Parser/LocationCreate.php index e2221250..2300716e 100644 --- a/src/lib/Server/Input/Parser/LocationCreate.php +++ b/src/lib/Server/Input/Parser/LocationCreate.php @@ -10,7 +10,7 @@ use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Rest\Input\ParserTools; use Ibexa\Contracts\Rest\Exceptions; -use eZ\Publish\API\Repository\LocationService; +use Ibexa\Contracts\Core\Repository\LocationService; /** * Parser for LocationCreate. @@ -20,22 +20,22 @@ class LocationCreate extends BaseParser /** * Location service. * - * @var \eZ\Publish\API\Repository\LocationService + * @var \Ibexa\Contracts\Core\Repository\LocationService */ protected $locationService; /** * Parser tools. * - * @var \EzSystems\EzPlatformRest\Input\ParserTools + * @var \Ibexa\Rest\Input\ParserTools */ protected $parserTools; /** * Construct. * - * @param \eZ\Publish\API\Repository\LocationService $locationService - * @param \EzSystems\EzPlatformRest\Input\ParserTools $parserTools + * @param \Ibexa\Contracts\Core\Repository\LocationService $locationService + * @param \Ibexa\Rest\Input\ParserTools $parserTools */ public function __construct(LocationService $locationService, ParserTools $parserTools) { @@ -47,9 +47,9 @@ public function __construct(LocationService $locationService, ParserTools $parse * Parse input structure. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @return \eZ\Publish\API\Repository\Values\Content\LocationCreateStruct + * @return \Ibexa\Contracts\Core\Repository\Values\Content\LocationCreateStruct */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { diff --git a/src/lib/Server/Input/Parser/LocationQuery.php b/src/lib/Server/Input/Parser/LocationQuery.php index dc6240ce..59f0168a 100644 --- a/src/lib/Server/Input/Parser/LocationQuery.php +++ b/src/lib/Server/Input/Parser/LocationQuery.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Rest\Server\Input\Parser; -use eZ\Publish\API\Repository\Values\Content\LocationQuery as LocationQueryValueObject; +use Ibexa\Contracts\Core\Repository\Values\Content\LocationQuery as LocationQueryValueObject; use Ibexa\Rest\Server\Input\Parser\Query as QueryParser; /** diff --git a/src/lib/Server/Input/Parser/LocationUpdate.php b/src/lib/Server/Input/Parser/LocationUpdate.php index 0367d3b7..f538a1d2 100644 --- a/src/lib/Server/Input/Parser/LocationUpdate.php +++ b/src/lib/Server/Input/Parser/LocationUpdate.php @@ -9,7 +9,7 @@ use Ibexa\Rest\Input\BaseParser; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Rest\Input\ParserTools; -use eZ\Publish\API\Repository\LocationService; +use Ibexa\Contracts\Core\Repository\LocationService; use Ibexa\Rest\Server\Values\RestLocationUpdateStruct; /** @@ -20,22 +20,22 @@ class LocationUpdate extends BaseParser /** * Location service. * - * @var \eZ\Publish\API\Repository\LocationService + * @var \Ibexa\Contracts\Core\Repository\LocationService */ protected $locationService; /** * Parser tools. * - * @var \EzSystems\EzPlatformRest\Input\ParserTools + * @var \Ibexa\Rest\Input\ParserTools */ protected $parserTools; /** * Construct. * - * @param \eZ\Publish\API\Repository\LocationService $locationService - * @param \EzSystems\EzPlatformRest\Input\ParserTools $parserTools + * @param \Ibexa\Contracts\Core\Repository\LocationService $locationService + * @param \Ibexa\Rest\Input\ParserTools $parserTools */ public function __construct(LocationService $locationService, ParserTools $parserTools) { @@ -47,9 +47,9 @@ public function __construct(LocationService $locationService, ParserTools $parse * Parse input structure. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @return \EzSystems\EzPlatformRest\Server\Values\RestLocationUpdateStruct + * @return \Ibexa\Rest\Server\Values\RestLocationUpdateStruct */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { diff --git a/src/lib/Server/Input/Parser/ObjectStateCreate.php b/src/lib/Server/Input/Parser/ObjectStateCreate.php index 2225f994..7c8e9e90 100644 --- a/src/lib/Server/Input/Parser/ObjectStateCreate.php +++ b/src/lib/Server/Input/Parser/ObjectStateCreate.php @@ -10,7 +10,7 @@ use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Rest\Input\ParserTools; use Ibexa\Contracts\Rest\Exceptions; -use eZ\Publish\API\Repository\ObjectStateService; +use Ibexa\Contracts\Core\Repository\ObjectStateService; /** * Parser for ObjectStateCreate. @@ -20,20 +20,20 @@ class ObjectStateCreate extends BaseParser /** * Object state service. * - * @var \eZ\Publish\API\Repository\ObjectStateService + * @var \Ibexa\Contracts\Core\Repository\ObjectStateService */ protected $objectStateService; /** - * @var \EzSystems\EzPlatformRest\Input\ParserTools + * @var \Ibexa\Rest\Input\ParserTools */ protected $parserTools; /** * Construct. * - * @param \eZ\Publish\API\Repository\ObjectStateService $objectStateService - * @param \EzSystems\EzPlatformRest\Input\ParserTools $parserTools + * @param \Ibexa\Contracts\Core\Repository\ObjectStateService $objectStateService + * @param \Ibexa\Rest\Input\ParserTools $parserTools */ public function __construct(ObjectStateService $objectStateService, ParserTools $parserTools) { @@ -45,9 +45,9 @@ public function __construct(ObjectStateService $objectStateService, ParserTools * Parse input structure. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @return \eZ\Publish\API\Repository\Values\ObjectState\ObjectStateCreateStruct + * @return \Ibexa\Contracts\Core\Repository\Values\ObjectState\ObjectStateCreateStruct */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { diff --git a/src/lib/Server/Input/Parser/ObjectStateGroupCreate.php b/src/lib/Server/Input/Parser/ObjectStateGroupCreate.php index 89f8ff34..d2e19daf 100644 --- a/src/lib/Server/Input/Parser/ObjectStateGroupCreate.php +++ b/src/lib/Server/Input/Parser/ObjectStateGroupCreate.php @@ -10,7 +10,7 @@ use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Rest\Input\ParserTools; use Ibexa\Contracts\Rest\Exceptions; -use eZ\Publish\API\Repository\ObjectStateService; +use Ibexa\Contracts\Core\Repository\ObjectStateService; /** * Parser for ObjectStateGroupCreate. @@ -20,20 +20,20 @@ class ObjectStateGroupCreate extends BaseParser /** * Object state service. * - * @var \eZ\Publish\API\Repository\ObjectStateService + * @var \Ibexa\Contracts\Core\Repository\ObjectStateService */ protected $objectStateService; /** - * @var \EzSystems\EzPlatformRest\Input\ParserTools + * @var \Ibexa\Rest\Input\ParserTools */ protected $parserTools; /** * Construct. * - * @param \eZ\Publish\API\Repository\ObjectStateService $objectStateService - * @param \EzSystems\EzPlatformRest\Input\ParserTools $parserTools + * @param \Ibexa\Contracts\Core\Repository\ObjectStateService $objectStateService + * @param \Ibexa\Rest\Input\ParserTools $parserTools */ public function __construct(ObjectStateService $objectStateService, ParserTools $parserTools) { @@ -45,9 +45,9 @@ public function __construct(ObjectStateService $objectStateService, ParserTools * Parse input structure. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @return \eZ\Publish\API\Repository\Values\ObjectState\ObjectStateGroupCreateStruct + * @return \Ibexa\Contracts\Core\Repository\Values\ObjectState\ObjectStateGroupCreateStruct */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { diff --git a/src/lib/Server/Input/Parser/ObjectStateGroupUpdate.php b/src/lib/Server/Input/Parser/ObjectStateGroupUpdate.php index 04610d36..79f70fe4 100644 --- a/src/lib/Server/Input/Parser/ObjectStateGroupUpdate.php +++ b/src/lib/Server/Input/Parser/ObjectStateGroupUpdate.php @@ -10,7 +10,7 @@ use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Rest\Input\ParserTools; use Ibexa\Contracts\Rest\Exceptions; -use eZ\Publish\API\Repository\ObjectStateService; +use Ibexa\Contracts\Core\Repository\ObjectStateService; /** * Parser for ObjectStateGroupUpdate. @@ -20,20 +20,20 @@ class ObjectStateGroupUpdate extends BaseParser /** * Object state service. * - * @var \eZ\Publish\API\Repository\ObjectStateService + * @var \Ibexa\Contracts\Core\Repository\ObjectStateService */ protected $objectStateService; /** - * @var \EzSystems\EzPlatformRest\Input\ParserTools + * @var \Ibexa\Rest\Input\ParserTools */ protected $parserTools; /** * Construct. * - * @param \eZ\Publish\API\Repository\ObjectStateService $objectStateService - * @param \EzSystems\EzPlatformRest\Input\ParserTools $parserTools + * @param \Ibexa\Contracts\Core\Repository\ObjectStateService $objectStateService + * @param \Ibexa\Rest\Input\ParserTools $parserTools */ public function __construct(ObjectStateService $objectStateService, ParserTools $parserTools) { @@ -45,9 +45,9 @@ public function __construct(ObjectStateService $objectStateService, ParserTools * Parse input structure. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @return \eZ\Publish\API\Repository\Values\ObjectState\ObjectStateGroupUpdateStruct + * @return \Ibexa\Contracts\Core\Repository\Values\ObjectState\ObjectStateGroupUpdateStruct */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { diff --git a/src/lib/Server/Input/Parser/ObjectStateUpdate.php b/src/lib/Server/Input/Parser/ObjectStateUpdate.php index 4f94adaa..e5260aa1 100644 --- a/src/lib/Server/Input/Parser/ObjectStateUpdate.php +++ b/src/lib/Server/Input/Parser/ObjectStateUpdate.php @@ -10,7 +10,7 @@ use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Rest\Input\ParserTools; use Ibexa\Contracts\Rest\Exceptions; -use eZ\Publish\API\Repository\ObjectStateService; +use Ibexa\Contracts\Core\Repository\ObjectStateService; /** * Parser for ObjectStateUpdate. @@ -20,20 +20,20 @@ class ObjectStateUpdate extends BaseParser /** * Object state service. * - * @var \eZ\Publish\API\Repository\ObjectStateService + * @var \Ibexa\Contracts\Core\Repository\ObjectStateService */ protected $objectStateService; /** - * @var \EzSystems\EzPlatformRest\Input\ParserTools + * @var \Ibexa\Rest\Input\ParserTools */ protected $parserTools; /** * Construct. * - * @param \eZ\Publish\API\Repository\ObjectStateService $objectStateService - * @param \EzSystems\EzPlatformRest\Input\ParserTools $parserTools + * @param \Ibexa\Contracts\Core\Repository\ObjectStateService $objectStateService + * @param \Ibexa\Rest\Input\ParserTools $parserTools */ public function __construct(ObjectStateService $objectStateService, ParserTools $parserTools) { @@ -45,9 +45,9 @@ public function __construct(ObjectStateService $objectStateService, ParserTools * Parse input structure. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @return \eZ\Publish\API\Repository\Values\ObjectState\ObjectStateUpdateStruct + * @return \Ibexa\Contracts\Core\Repository\Values\ObjectState\ObjectStateUpdateStruct */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { diff --git a/src/lib/Server/Input/Parser/PolicyCreate.php b/src/lib/Server/Input/Parser/PolicyCreate.php index da7394af..fbaf9171 100644 --- a/src/lib/Server/Input/Parser/PolicyCreate.php +++ b/src/lib/Server/Input/Parser/PolicyCreate.php @@ -10,7 +10,7 @@ use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Rest\Input\ParserTools; use Ibexa\Contracts\Rest\Exceptions; -use eZ\Publish\API\Repository\RoleService; +use Ibexa\Contracts\Core\Repository\RoleService; /** * Parser for PolicyCreate. @@ -20,22 +20,22 @@ class PolicyCreate extends BaseParser /** * Role service. * - * @var \eZ\Publish\API\Repository\RoleService + * @var \Ibexa\Contracts\Core\Repository\RoleService */ protected $roleService; /** * Parser tools. * - * @var \EzSystems\EzPlatformRest\Input\ParserTools + * @var \Ibexa\Rest\Input\ParserTools */ protected $parserTools; /** * Construct. * - * @param \eZ\Publish\API\Repository\RoleService $roleService - * @param \EzSystems\EzPlatformRest\Input\ParserTools $parserTools + * @param \Ibexa\Contracts\Core\Repository\RoleService $roleService + * @param \Ibexa\Rest\Input\ParserTools $parserTools */ public function __construct(RoleService $roleService, ParserTools $parserTools) { @@ -47,9 +47,9 @@ public function __construct(RoleService $roleService, ParserTools $parserTools) * Parse input structure. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @return \eZ\Publish\API\Repository\Values\User\PolicyCreateStruct + * @return \Ibexa\Contracts\Core\Repository\Values\User\PolicyCreateStruct */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { diff --git a/src/lib/Server/Input/Parser/PolicyUpdate.php b/src/lib/Server/Input/Parser/PolicyUpdate.php index 2fc79f14..0d532a57 100644 --- a/src/lib/Server/Input/Parser/PolicyUpdate.php +++ b/src/lib/Server/Input/Parser/PolicyUpdate.php @@ -10,7 +10,7 @@ use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Rest\Input\ParserTools; use Ibexa\Contracts\Rest\Exceptions; -use eZ\Publish\API\Repository\RoleService; +use Ibexa\Contracts\Core\Repository\RoleService; /** * Parser for PolicyUpdate. @@ -20,22 +20,22 @@ class PolicyUpdate extends BaseParser /** * Role service. * - * @var \eZ\Publish\API\Repository\RoleService + * @var \Ibexa\Contracts\Core\Repository\RoleService */ protected $roleService; /** * Parser tools. * - * @var \EzSystems\EzPlatformRest\Input\ParserTools + * @var \Ibexa\Rest\Input\ParserTools */ protected $parserTools; /** * Construct. * - * @param \eZ\Publish\API\Repository\RoleService $roleService - * @param \EzSystems\EzPlatformRest\Input\ParserTools $parserTools + * @param \Ibexa\Contracts\Core\Repository\RoleService $roleService + * @param \Ibexa\Rest\Input\ParserTools $parserTools */ public function __construct(RoleService $roleService, ParserTools $parserTools) { @@ -47,9 +47,9 @@ public function __construct(RoleService $roleService, ParserTools $parserTools) * Parse input structure. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @return \eZ\Publish\API\Repository\Values\User\PolicyUpdateStruct + * @return \Ibexa\Contracts\Core\Repository\Values\User\PolicyUpdateStruct */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { diff --git a/src/lib/Server/Input/Parser/Query.php b/src/lib/Server/Input/Parser/Query.php index 6fd49a0e..ca7c2a7f 100644 --- a/src/lib/Server/Input/Parser/Query.php +++ b/src/lib/Server/Input/Parser/Query.php @@ -8,7 +8,7 @@ use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Rest\Server\Input\Parser\Criterion as CriterionParser; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion as CriterionValue; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion as CriterionValue; /** * Content/Location Query Parser. @@ -19,11 +19,11 @@ abstract class Query extends CriterionParser * Parses input structure to a Query. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @throws \EzSystems\EzPlatformRest\Exceptions\Parser + * @throws \Ibexa\Contracts\Rest\Exceptions\Parser * - * @return \eZ\Publish\API\Repository\Values\Content\Query + * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { @@ -82,15 +82,15 @@ public function parse(array $data, ParsingDispatcher $parsingDispatcher) /** * Builds and returns the Query (Location or Content object). * - * @return \eZ\Publish\API\Repository\Values\Content\Query + * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query */ abstract protected function buildQuery(); /** * @param array $criteriaArray - * @param ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @return CriterionValue|null A criterion, or a LogicalAnd with a set of Criterion, or null if an empty array was given + * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion|null A criterion, or a LogicalAnd with a set of Criterion, or null if an empty array was given */ private function processCriteriaArray(array $criteriaArray, ParsingDispatcher $parsingDispatcher) { @@ -110,7 +110,7 @@ private function processCriteriaArray(array $criteriaArray, ParsingDispatcher $p * Handles SortClause data. * * @param array $sortClausesArray - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * * @return array */ diff --git a/src/lib/Server/Input/Parser/RelationCreate.php b/src/lib/Server/Input/Parser/RelationCreate.php index 7f265083..06a91e38 100644 --- a/src/lib/Server/Input/Parser/RelationCreate.php +++ b/src/lib/Server/Input/Parser/RelationCreate.php @@ -19,7 +19,7 @@ class RelationCreate extends BaseParser * Parse input structure. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * * @return mixed */ diff --git a/src/lib/Server/Input/Parser/RoleAssignInput.php b/src/lib/Server/Input/Parser/RoleAssignInput.php index 53108435..e79c8eed 100644 --- a/src/lib/Server/Input/Parser/RoleAssignInput.php +++ b/src/lib/Server/Input/Parser/RoleAssignInput.php @@ -20,14 +20,14 @@ class RoleAssignInput extends BaseParser /** * Parser tools. * - * @var \EzSystems\EzPlatformRest\Input\ParserTools + * @var \Ibexa\Rest\Input\ParserTools */ protected $parserTools; /** * Construct. * - * @param \EzSystems\EzPlatformRest\Input\ParserTools $parserTools + * @param \Ibexa\Rest\Input\ParserTools $parserTools */ public function __construct(ParserTools $parserTools) { @@ -38,9 +38,9 @@ public function __construct(ParserTools $parserTools) * Parse input structure. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @return \EzSystems\EzPlatformRest\Server\Values\RoleAssignment + * @return \Ibexa\Rest\Server\Values\RoleAssignment */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { diff --git a/src/lib/Server/Input/Parser/RoleInput.php b/src/lib/Server/Input/Parser/RoleInput.php index c2aa9052..11386266 100644 --- a/src/lib/Server/Input/Parser/RoleInput.php +++ b/src/lib/Server/Input/Parser/RoleInput.php @@ -9,7 +9,7 @@ use Ibexa\Rest\Input\BaseParser; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Rest\Input\ParserTools; -use eZ\Publish\API\Repository\RoleService; +use Ibexa\Contracts\Core\Repository\RoleService; /** * Parser for RoleInput. @@ -19,20 +19,20 @@ class RoleInput extends BaseParser /** * Role service. * - * @var \eZ\Publish\API\Repository\RoleService + * @var \Ibexa\Contracts\Core\Repository\RoleService */ protected $roleService; /** - * @var \EzSystems\EzPlatformRest\Input\ParserTools + * @var \Ibexa\Rest\Input\ParserTools */ protected $parserTools; /** * Construct. * - * @param \eZ\Publish\API\Repository\RoleService $roleService - * @param \EzSystems\EzPlatformRest\Input\ParserTools $parserTools + * @param \Ibexa\Contracts\Core\Repository\RoleService $roleService + * @param \Ibexa\Rest\Input\ParserTools $parserTools */ public function __construct(RoleService $roleService, ParserTools $parserTools) { @@ -44,9 +44,9 @@ public function __construct(RoleService $roleService, ParserTools $parserTools) * Parse input structure. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @return \eZ\Publish\API\Repository\Values\User\RoleCreateStruct + * @return \Ibexa\Contracts\Core\Repository\Values\User\RoleCreateStruct */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { diff --git a/src/lib/Server/Input/Parser/SectionInput.php b/src/lib/Server/Input/Parser/SectionInput.php index 3dd4282c..00d5411d 100644 --- a/src/lib/Server/Input/Parser/SectionInput.php +++ b/src/lib/Server/Input/Parser/SectionInput.php @@ -8,7 +8,7 @@ use Ibexa\Rest\Input\BaseParser; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; -use eZ\Publish\API\Repository\SectionService; +use Ibexa\Contracts\Core\Repository\SectionService; use Ibexa\Contracts\Rest\Exceptions; /** @@ -19,14 +19,14 @@ class SectionInput extends BaseParser /** * Section service. * - * @var \eZ\Publish\API\Repository\SectionService + * @var \Ibexa\Contracts\Core\Repository\SectionService */ protected $sectionService; /** * Construct. * - * @param \eZ\Publish\API\Repository\SectionService $sectionService + * @param \Ibexa\Contracts\Core\Repository\SectionService $sectionService */ public function __construct(SectionService $sectionService) { @@ -37,9 +37,9 @@ public function __construct(SectionService $sectionService) * Parse input structure. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @return \eZ\Publish\API\Repository\Values\Content\SectionCreateStruct + * @return \Ibexa\Contracts\Core\Repository\Values\Content\SectionCreateStruct */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { diff --git a/src/lib/Server/Input/Parser/SessionInput.php b/src/lib/Server/Input/Parser/SessionInput.php index 63150757..e471b178 100644 --- a/src/lib/Server/Input/Parser/SessionInput.php +++ b/src/lib/Server/Input/Parser/SessionInput.php @@ -20,9 +20,9 @@ class SessionInput extends BaseParser * Parse input structure. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @return \EzSystems\EzPlatformRest\Server\Values\SessionInput + * @return \Ibexa\Rest\Server\Values\SessionInput */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { diff --git a/src/lib/Server/Input/Parser/SortClause/DataKeyValueObjectClass.php b/src/lib/Server/Input/Parser/SortClause/DataKeyValueObjectClass.php index aa7f512e..98b7e194 100644 --- a/src/lib/Server/Input/Parser/SortClause/DataKeyValueObjectClass.php +++ b/src/lib/Server/Input/Parser/SortClause/DataKeyValueObjectClass.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Rest\Server\Input\Parser\SortClause; -use eZ\Publish\API\Repository\Values\Content\Query; +use Ibexa\Contracts\Core\Repository\Values\Content\Query; use Ibexa\Rest\Input\BaseParser; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Contracts\Rest\Exceptions; @@ -45,9 +45,9 @@ public function __construct($dataKey, $valueObjectClass) * Parse input structure. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @return \eZ\Publish\API\Repository\Values\ValueObject + * @return \Ibexa\Contracts\Core\Repository\Values\ValueObject */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { diff --git a/src/lib/Server/Input/Parser/SortClause/Field.php b/src/lib/Server/Input/Parser/SortClause/Field.php index 6d741c9e..f462bc50 100644 --- a/src/lib/Server/Input/Parser/SortClause/Field.php +++ b/src/lib/Server/Input/Parser/SortClause/Field.php @@ -6,11 +6,11 @@ */ namespace Ibexa\Rest\Server\Input\Parser\SortClause; -use eZ\Publish\API\Repository\Values\Content\Query; +use Ibexa\Contracts\Core\Repository\Values\Content\Query; use Ibexa\Rest\Input\BaseParser; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Contracts\Rest\Exceptions; -use eZ\Publish\API\Repository\Values\Content\Query\SortClause\Field as FieldSortClause; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause\Field as FieldSortClause; class Field extends BaseParser { @@ -18,9 +18,9 @@ class Field extends BaseParser * Parse input structure for Field sort clause. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @return \eZ\Publish\API\Repository\Values\Content\Query\SortClause\Field + * @return \Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause\Field */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { diff --git a/src/lib/Server/Input/Parser/URLAliasCreate.php b/src/lib/Server/Input/Parser/URLAliasCreate.php index 518ac338..a6b89859 100644 --- a/src/lib/Server/Input/Parser/URLAliasCreate.php +++ b/src/lib/Server/Input/Parser/URLAliasCreate.php @@ -19,14 +19,14 @@ class URLAliasCreate extends BaseParser /** * Parser tools. * - * @var \EzSystems\EzPlatformRest\Input\ParserTools + * @var \Ibexa\Rest\Input\ParserTools */ protected $parserTools; /** * Construct. * - * @param \EzSystems\EzPlatformRest\Input\ParserTools $parserTools + * @param \Ibexa\Rest\Input\ParserTools $parserTools */ public function __construct(ParserTools $parserTools) { @@ -37,7 +37,7 @@ public function __construct(ParserTools $parserTools) * Parse input structure. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * * @return array */ diff --git a/src/lib/Server/Input/Parser/URLWildcardCreate.php b/src/lib/Server/Input/Parser/URLWildcardCreate.php index e98cb9e5..fead56a6 100644 --- a/src/lib/Server/Input/Parser/URLWildcardCreate.php +++ b/src/lib/Server/Input/Parser/URLWildcardCreate.php @@ -19,14 +19,14 @@ class URLWildcardCreate extends BaseParser /** * Parser tools. * - * @var \EzSystems\EzPlatformRest\Input\ParserTools + * @var \Ibexa\Rest\Input\ParserTools */ protected $parserTools; /** * Construct. * - * @param \EzSystems\EzPlatformRest\Input\ParserTools $parserTools + * @param \Ibexa\Rest\Input\ParserTools $parserTools */ public function __construct(ParserTools $parserTools) { @@ -37,7 +37,7 @@ public function __construct(ParserTools $parserTools) * Parse input structure. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * * @return array */ diff --git a/src/lib/Server/Input/Parser/UserCreate.php b/src/lib/Server/Input/Parser/UserCreate.php index 48a0b606..e197cb3e 100644 --- a/src/lib/Server/Input/Parser/UserCreate.php +++ b/src/lib/Server/Input/Parser/UserCreate.php @@ -11,8 +11,8 @@ use Ibexa\Rest\Input\FieldTypeParser; use Ibexa\Rest\Input\ParserTools; use Ibexa\Contracts\Rest\Exceptions; -use eZ\Publish\API\Repository\UserService; -use eZ\Publish\API\Repository\ContentTypeService; +use Ibexa\Contracts\Core\Repository\UserService; +use Ibexa\Contracts\Core\Repository\ContentTypeService; /** * Parser for UserCreate. @@ -22,38 +22,38 @@ class UserCreate extends BaseParser /** * User service. * - * @var \eZ\Publish\API\Repository\UserService + * @var \Ibexa\Contracts\Core\Repository\UserService */ protected $userService; /** * ContentType service. * - * @var \eZ\Publish\API\Repository\ContentTypeService + * @var \Ibexa\Contracts\Core\Repository\ContentTypeService */ protected $contentTypeService; /** * FieldType parser. * - * @var \EzSystems\EzPlatformRest\Input\FieldTypeParser + * @var \Ibexa\Rest\Input\FieldTypeParser */ protected $fieldTypeParser; /** * Parser tools. * - * @var \EzSystems\EzPlatformRest\Input\ParserTools + * @var \Ibexa\Rest\Input\ParserTools */ protected $parserTools; /** * Construct. * - * @param \eZ\Publish\API\Repository\UserService $userService - * @param \eZ\Publish\API\Repository\ContentTypeService $contentTypeService - * @param \EzSystems\EzPlatformRest\Input\FieldTypeParser $fieldTypeParser - * @param \EzSystems\EzPlatformRest\Input\ParserTools $parserTools + * @param \Ibexa\Contracts\Core\Repository\UserService $userService + * @param \Ibexa\Contracts\Core\Repository\ContentTypeService $contentTypeService + * @param \Ibexa\Rest\Input\FieldTypeParser $fieldTypeParser + * @param \Ibexa\Rest\Input\ParserTools $parserTools */ public function __construct(UserService $userService, ContentTypeService $contentTypeService, FieldTypeParser $fieldTypeParser, ParserTools $parserTools) { @@ -67,9 +67,9 @@ public function __construct(UserService $userService, ContentTypeService $conten * Parse input structure. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @return \eZ\Publish\API\Repository\Values\User\UserCreateStruct + * @return \Ibexa\Contracts\Core\Repository\Values\User\UserCreateStruct */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { diff --git a/src/lib/Server/Input/Parser/UserGroupCreate.php b/src/lib/Server/Input/Parser/UserGroupCreate.php index ef5ed728..5a7696b4 100644 --- a/src/lib/Server/Input/Parser/UserGroupCreate.php +++ b/src/lib/Server/Input/Parser/UserGroupCreate.php @@ -10,8 +10,8 @@ use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Rest\Input\FieldTypeParser; use Ibexa\Contracts\Rest\Exceptions; -use eZ\Publish\API\Repository\UserService; -use eZ\Publish\API\Repository\ContentTypeService; +use Ibexa\Contracts\Core\Repository\UserService; +use Ibexa\Contracts\Core\Repository\ContentTypeService; /** * Parser for UserGroupCreate. @@ -21,30 +21,30 @@ class UserGroupCreate extends BaseParser /** * User service. * - * @var \eZ\Publish\API\Repository\UserService + * @var \Ibexa\Contracts\Core\Repository\UserService */ protected $userService; /** * ContentType service. * - * @var \eZ\Publish\API\Repository\ContentTypeService + * @var \Ibexa\Contracts\Core\Repository\ContentTypeService */ protected $contentTypeService; /** * FieldType parser. * - * @var \EzSystems\EzPlatformRest\Input\FieldTypeParser + * @var \Ibexa\Rest\Input\FieldTypeParser */ protected $fieldTypeParser; /** * Construct. * - * @param \eZ\Publish\API\Repository\UserService $userService - * @param \eZ\Publish\API\Repository\ContentTypeService $contentTypeService - * @param \EzSystems\EzPlatformRest\Input\FieldTypeParser $fieldTypeParser + * @param \Ibexa\Contracts\Core\Repository\UserService $userService + * @param \Ibexa\Contracts\Core\Repository\ContentTypeService $contentTypeService + * @param \Ibexa\Rest\Input\FieldTypeParser $fieldTypeParser */ public function __construct(UserService $userService, ContentTypeService $contentTypeService, FieldTypeParser $fieldTypeParser) { @@ -57,9 +57,9 @@ public function __construct(UserService $userService, ContentTypeService $conten * Parse input structure. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @return \eZ\Publish\API\Repository\Values\User\UserGroupCreateStruct + * @return \Ibexa\Contracts\Core\Repository\Values\User\UserGroupCreateStruct */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { diff --git a/src/lib/Server/Input/Parser/UserGroupUpdate.php b/src/lib/Server/Input/Parser/UserGroupUpdate.php index 191b575b..57e5f36e 100644 --- a/src/lib/Server/Input/Parser/UserGroupUpdate.php +++ b/src/lib/Server/Input/Parser/UserGroupUpdate.php @@ -11,9 +11,9 @@ use Ibexa\Rest\Input\FieldTypeParser; use Ibexa\Contracts\Rest\Exceptions; use Ibexa\Rest\Server\Values\RestUserGroupUpdateStruct; -use eZ\Publish\API\Repository\UserService; -use eZ\Publish\API\Repository\ContentService; -use eZ\Publish\API\Repository\LocationService; +use Ibexa\Contracts\Core\Repository\UserService; +use Ibexa\Contracts\Core\Repository\ContentService; +use Ibexa\Contracts\Core\Repository\LocationService; /** * Parser for UserGroupUpdate. @@ -23,38 +23,38 @@ class UserGroupUpdate extends BaseParser /** * User service. * - * @var \eZ\Publish\API\Repository\UserService + * @var \Ibexa\Contracts\Core\Repository\UserService */ protected $userService; /** * Content service. * - * @var \eZ\Publish\API\Repository\ContentService + * @var \Ibexa\Contracts\Core\Repository\ContentService */ protected $contentService; /** * Location service. * - * @var \eZ\Publish\API\Repository\LocationService + * @var \Ibexa\Contracts\Core\Repository\LocationService */ protected $locationService; /** * FieldType parser. * - * @var \EzSystems\EzPlatformRest\Input\FieldTypeParser + * @var \Ibexa\Rest\Input\FieldTypeParser */ protected $fieldTypeParser; /** * Construct. * - * @param \eZ\Publish\API\Repository\UserService $userService - * @param \eZ\Publish\API\Repository\ContentService $contentService - * @param \eZ\Publish\API\Repository\LocationService $locationService - * @param \EzSystems\EzPlatformRest\Input\FieldTypeParser $fieldTypeParser + * @param \Ibexa\Contracts\Core\Repository\UserService $userService + * @param \Ibexa\Contracts\Core\Repository\ContentService $contentService + * @param \Ibexa\Contracts\Core\Repository\LocationService $locationService + * @param \Ibexa\Rest\Input\FieldTypeParser $fieldTypeParser */ public function __construct(UserService $userService, ContentService $contentService, LocationService $locationService, FieldTypeParser $fieldTypeParser) { @@ -68,9 +68,9 @@ public function __construct(UserService $userService, ContentService $contentSer * Parse input structure. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @return \EzSystems\EzPlatformRest\Server\Values\RestUserGroupUpdateStruct + * @return \Ibexa\Rest\Server\Values\RestUserGroupUpdateStruct */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { diff --git a/src/lib/Server/Input/Parser/UserUpdate.php b/src/lib/Server/Input/Parser/UserUpdate.php index 9cb312b9..0b0c7930 100644 --- a/src/lib/Server/Input/Parser/UserUpdate.php +++ b/src/lib/Server/Input/Parser/UserUpdate.php @@ -12,8 +12,8 @@ use Ibexa\Rest\Input\ParserTools; use Ibexa\Contracts\Rest\Exceptions; use Ibexa\Rest\Server\Values\RestUserUpdateStruct; -use eZ\Publish\API\Repository\UserService; -use eZ\Publish\API\Repository\ContentService; +use Ibexa\Contracts\Core\Repository\UserService; +use Ibexa\Contracts\Core\Repository\ContentService; /** * Parser for UserUpdate. @@ -23,38 +23,38 @@ class UserUpdate extends BaseParser /** * User service. * - * @var \eZ\Publish\API\Repository\UserService + * @var \Ibexa\Contracts\Core\Repository\UserService */ protected $userService; /** * Content service. * - * @var \eZ\Publish\API\Repository\ContentService + * @var \Ibexa\Contracts\Core\Repository\ContentService */ protected $contentService; /** * FieldType parser. * - * @var \EzSystems\EzPlatformRest\Input\FieldTypeParser + * @var \Ibexa\Rest\Input\FieldTypeParser */ protected $fieldTypeParser; /** * Parser tools. * - * @var \EzSystems\EzPlatformRest\Input\ParserTools + * @var \Ibexa\Rest\Input\ParserTools */ protected $parserTools; /** * Construct. * - * @param \eZ\Publish\API\Repository\UserService $userService - * @param \eZ\Publish\API\Repository\ContentService $contentService - * @param \EzSystems\EzPlatformRest\Input\FieldTypeParser $fieldTypeParser - * @param \EzSystems\EzPlatformRest\Input\ParserTools $parserTools + * @param \Ibexa\Contracts\Core\Repository\UserService $userService + * @param \Ibexa\Contracts\Core\Repository\ContentService $contentService + * @param \Ibexa\Rest\Input\FieldTypeParser $fieldTypeParser + * @param \Ibexa\Rest\Input\ParserTools $parserTools */ public function __construct(UserService $userService, ContentService $contentService, FieldTypeParser $fieldTypeParser, ParserTools $parserTools) { @@ -68,9 +68,9 @@ public function __construct(UserService $userService, ContentService $contentSer * Parse input structure. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @return \EzSystems\EzPlatformRest\Server\Values\RestUserUpdateStruct + * @return \Ibexa\Rest\Server\Values\RestUserUpdateStruct */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { diff --git a/src/lib/Server/Input/Parser/VersionUpdate.php b/src/lib/Server/Input/Parser/VersionUpdate.php index 86fcd350..41940868 100644 --- a/src/lib/Server/Input/Parser/VersionUpdate.php +++ b/src/lib/Server/Input/Parser/VersionUpdate.php @@ -9,7 +9,7 @@ use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Rest\Input\FieldTypeParser; use Ibexa\Contracts\Rest\Exceptions; -use eZ\Publish\API\Repository\ContentService; +use Ibexa\Contracts\Core\Repository\ContentService; use Ibexa\Rest\Input\BaseParser; /** @@ -20,22 +20,22 @@ class VersionUpdate extends BaseParser /** * Content service. * - * @var \eZ\Publish\API\Repository\ContentService + * @var \Ibexa\Contracts\Core\Repository\ContentService */ protected $contentService; /** * FieldType parser. * - * @var \EzSystems\EzPlatformRest\Input\FieldTypeParser + * @var \Ibexa\Rest\Input\FieldTypeParser */ protected $fieldTypeParser; /** * Construct from content service. * - * @param \eZ\Publish\API\Repository\ContentService $contentService - * @param \EzSystems\EzPlatformRest\Input\FieldTypeParser $fieldTypeParser + * @param \Ibexa\Contracts\Core\Repository\ContentService $contentService + * @param \Ibexa\Rest\Input\FieldTypeParser $fieldTypeParser */ public function __construct(ContentService $contentService, FieldTypeParser $fieldTypeParser) { @@ -47,9 +47,9 @@ public function __construct(ContentService $contentService, FieldTypeParser $fie * Parse input structure. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @return \eZ\Publish\API\Repository\Values\Content\ContentUpdateStruct + * @return \Ibexa\Contracts\Core\Repository\Values\Content\ContentUpdateStruct */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { diff --git a/src/lib/Server/Input/Parser/ViewInput.php b/src/lib/Server/Input/Parser/ViewInput.php index 705131d1..290e73e0 100644 --- a/src/lib/Server/Input/Parser/ViewInput.php +++ b/src/lib/Server/Input/Parser/ViewInput.php @@ -20,11 +20,11 @@ class ViewInput extends BaseParser * Parses input structure to a RestViewInput struct. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @throws \EzSystems\EzPlatformRest\Exceptions\Parser + * @throws \Ibexa\Contracts\Rest\Exceptions\Parser * - * @return \EzSystems\EzPlatformRest\Server\Values\RestViewInput + * @return \Ibexa\Rest\Server\Values\RestViewInput */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { diff --git a/src/lib/Server/Input/Parser/ViewInputOneDotOne.php b/src/lib/Server/Input/Parser/ViewInputOneDotOne.php index dc641ce2..0083c53d 100644 --- a/src/lib/Server/Input/Parser/ViewInputOneDotOne.php +++ b/src/lib/Server/Input/Parser/ViewInputOneDotOne.php @@ -20,11 +20,11 @@ class ViewInputOneDotOne extends CriterionParser * Parses input structure to a RestViewInput struct. * * @param array $data - * @param \EzSystems\EzPlatformRest\Input\ParsingDispatcher $parsingDispatcher + * @param \Ibexa\Contracts\Rest\Input\ParsingDispatcher $parsingDispatcher * - * @throws \EzSystems\EzPlatformRest\Exceptions\Parser + * @throws \Ibexa\Contracts\Rest\Exceptions\Parser * - * @return \EzSystems\EzPlatformRest\Server\Values\RestViewInput + * @return \Ibexa\Rest\Server\Values\RestViewInput */ public function parse(array $data, ParsingDispatcher $parsingDispatcher) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/Author.php b/src/lib/Server/Output/ValueObjectVisitor/Author.php index 9fec0b05..ff5496d8 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/Author.php +++ b/src/lib/Server/Output/ValueObjectVisitor/Author.php @@ -15,7 +15,7 @@ final class Author extends ValueObjectVisitor { /** - * @var \eZ\Publish\Core\FieldType\Author\Author + * @var \Ibexa\Core\FieldType\Author\Author */ public function visit(Visitor $visitor, Generator $generator, $data): void { diff --git a/src/lib/Server/Output/ValueObjectVisitor/CachedValue.php b/src/lib/Server/Output/ValueObjectVisitor/CachedValue.php index feb28ec7..508e9313 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/CachedValue.php +++ b/src/lib/Server/Output/ValueObjectVisitor/CachedValue.php @@ -6,8 +6,8 @@ */ namespace Ibexa\Rest\Server\Output\ValueObjectVisitor; -use eZ\Publish\Core\MVC\ConfigResolverInterface; -use eZ\Publish\Core\MVC\Symfony\RequestStackAware; +use Ibexa\Core\MVC\ConfigResolverInterface; +use Ibexa\Core\MVC\Symfony\RequestStackAware; use Ibexa\Contracts\Rest\Output\ValueObjectVisitor; use Ibexa\Contracts\Rest\Output\Generator; use Ibexa\Contracts\Rest\Output\Visitor; @@ -19,7 +19,7 @@ class CachedValue extends ValueObjectVisitor { use RequestStackAware; - /** @var ConfigResolverInterface */ + /** @var \Ibexa\Core\MVC\ConfigResolverInterface */ protected $configResolver; public function __construct(ConfigResolverInterface $configResolver) @@ -28,9 +28,9 @@ public function __construct(ConfigResolverInterface $configResolver) } /** - * @param Visitor $visitor - * @param Generator $generator - * @param \EzSystems\EzPlatformRest\Server\Values\CachedValue $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Server\Values\CachedValue $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/ContentFieldValidationException.php b/src/lib/Server/Output/ValueObjectVisitor/ContentFieldValidationException.php index 8b715671..9fca9c03 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/ContentFieldValidationException.php +++ b/src/lib/Server/Output/ValueObjectVisitor/ContentFieldValidationException.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Rest\Server\Output\ValueObjectVisitor; -use eZ\Publish\API\Repository\Values\Translation; +use Ibexa\Contracts\Core\Repository\Values\Translation; use Ibexa\Contracts\Rest\Output\Generator; use Ibexa\Contracts\Rest\Output\Visitor; @@ -18,9 +18,9 @@ class ContentFieldValidationException extends BadRequestException /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Server\Exceptions\ContentFieldValidationException $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Server\Exceptions\ContentFieldValidationException $data */ public function visit(Visitor $visitor, Generator $generator, $data) { @@ -87,7 +87,7 @@ public function visit(Visitor $visitor, Generator $generator, $data) /** * Convert a Translation object to a string, detecting singular/plural as needed. * - * @param Translation $translation The Translation object + * @param \Ibexa\Contracts\Core\Repository\Values\Translation $translation The Translation object * * @return string */ diff --git a/src/lib/Server/Output/ValueObjectVisitor/ContentList.php b/src/lib/Server/Output/ValueObjectVisitor/ContentList.php index c0b16dcb..2283dbae 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/ContentList.php +++ b/src/lib/Server/Output/ValueObjectVisitor/ContentList.php @@ -18,9 +18,9 @@ class ContentList extends ValueObjectVisitor /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Server\Values\ContentList $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Server\Values\ContentList $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/ContentType.php b/src/lib/Server/Output/ValueObjectVisitor/ContentType.php index 6ee3d7d6..57e72b67 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/ContentType.php +++ b/src/lib/Server/Output/ValueObjectVisitor/ContentType.php @@ -17,7 +17,7 @@ final class ContentType extends ValueObjectVisitor implements DelegateValueObjectVisitor { /** - * @param \eZ\Publish\API\Repository\Values\ContentType\ContentType $data + * @param \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType $data */ public function visit(Visitor $visitor, Generator $generator, $data): void { diff --git a/src/lib/Server/Output/ValueObjectVisitor/ContentTypeGroup.php b/src/lib/Server/Output/ValueObjectVisitor/ContentTypeGroup.php index 8de3987e..3e7728ca 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/ContentTypeGroup.php +++ b/src/lib/Server/Output/ValueObjectVisitor/ContentTypeGroup.php @@ -9,7 +9,7 @@ use Ibexa\Contracts\Rest\Output\ValueObjectVisitor; use Ibexa\Contracts\Rest\Output\Generator; use Ibexa\Contracts\Rest\Output\Visitor; -use eZ\Publish\API\Repository\Values\ContentType\ContentTypeGroup as ContentTypeGroupValue; +use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentTypeGroup as ContentTypeGroupValue; /** * ContentTypeGroup value object visitor. @@ -19,9 +19,9 @@ class ContentTypeGroup extends ValueObjectVisitor /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \eZ\Publish\API\Repository\Values\ContentType\ContentTypeGroup $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentTypeGroup $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/ContentTypeGroupList.php b/src/lib/Server/Output/ValueObjectVisitor/ContentTypeGroupList.php index b9abcf35..04f2b237 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/ContentTypeGroupList.php +++ b/src/lib/Server/Output/ValueObjectVisitor/ContentTypeGroupList.php @@ -18,9 +18,9 @@ class ContentTypeGroupList extends ValueObjectVisitor /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Server\Values\ContentTypeGroupList $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Server\Values\ContentTypeGroupList $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/ContentTypeGroupRefList.php b/src/lib/Server/Output/ValueObjectVisitor/ContentTypeGroupRefList.php index f91db54a..f6f09faa 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/ContentTypeGroupRefList.php +++ b/src/lib/Server/Output/ValueObjectVisitor/ContentTypeGroupRefList.php @@ -18,9 +18,9 @@ class ContentTypeGroupRefList extends ValueObjectVisitor /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Server\Values\ContentTypeGroupRefList $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Server\Values\ContentTypeGroupRefList $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/ContentTypeInfoList.php b/src/lib/Server/Output/ValueObjectVisitor/ContentTypeInfoList.php index 81ec831d..e710a0ca 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/ContentTypeInfoList.php +++ b/src/lib/Server/Output/ValueObjectVisitor/ContentTypeInfoList.php @@ -19,9 +19,9 @@ class ContentTypeInfoList extends ValueObjectVisitor /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Server\Values\ContentTypeInfoList $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Server\Values\ContentTypeInfoList $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/ContentTypeList.php b/src/lib/Server/Output/ValueObjectVisitor/ContentTypeList.php index 9ed2ae25..13aef02b 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/ContentTypeList.php +++ b/src/lib/Server/Output/ValueObjectVisitor/ContentTypeList.php @@ -19,9 +19,9 @@ class ContentTypeList extends ValueObjectVisitor /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Server\Values\ContentTypeList $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Server\Values\ContentTypeList $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/CountryList.php b/src/lib/Server/Output/ValueObjectVisitor/CountryList.php index 51bfebeb..5d076b1b 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/CountryList.php +++ b/src/lib/Server/Output/ValueObjectVisitor/CountryList.php @@ -18,9 +18,9 @@ class CountryList extends ValueObjectVisitor /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Server\Values\CountryList $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Server\Values\CountryList $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/CreatedContent.php b/src/lib/Server/Output/ValueObjectVisitor/CreatedContent.php index 44372984..82df89b0 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/CreatedContent.php +++ b/src/lib/Server/Output/ValueObjectVisitor/CreatedContent.php @@ -17,9 +17,9 @@ class CreatedContent extends RestContent /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Server\Values\CreatedContent $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Server\Values\CreatedContent $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/CreatedContentType.php b/src/lib/Server/Output/ValueObjectVisitor/CreatedContentType.php index 7e47b881..64061047 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/CreatedContentType.php +++ b/src/lib/Server/Output/ValueObjectVisitor/CreatedContentType.php @@ -19,9 +19,9 @@ class CreatedContentType extends RestContentType /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Server\Values\CreatedContentType $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Server\Values\CreatedContentType $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/CreatedContentTypeGroup.php b/src/lib/Server/Output/ValueObjectVisitor/CreatedContentTypeGroup.php index 05334c00..a897ce72 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/CreatedContentTypeGroup.php +++ b/src/lib/Server/Output/ValueObjectVisitor/CreatedContentTypeGroup.php @@ -19,9 +19,9 @@ class CreatedContentTypeGroup extends ContentTypeGroup /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Server\Values\CreatedContentTypeGroup $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Server\Values\CreatedContentTypeGroup $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/CreatedFieldDefinition.php b/src/lib/Server/Output/ValueObjectVisitor/CreatedFieldDefinition.php index 4b865e58..0bef1f30 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/CreatedFieldDefinition.php +++ b/src/lib/Server/Output/ValueObjectVisitor/CreatedFieldDefinition.php @@ -19,9 +19,9 @@ class CreatedFieldDefinition extends RestFieldDefinition /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Server\Values\CreatedFieldDefinition $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Server\Values\CreatedFieldDefinition $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/CreatedLocation.php b/src/lib/Server/Output/ValueObjectVisitor/CreatedLocation.php index ee15c351..25cc8880 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/CreatedLocation.php +++ b/src/lib/Server/Output/ValueObjectVisitor/CreatedLocation.php @@ -19,9 +19,9 @@ class CreatedLocation extends RestLocation /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Server\Values\CreatedLocation $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Server\Values\CreatedLocation $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/CreatedObjectState.php b/src/lib/Server/Output/ValueObjectVisitor/CreatedObjectState.php index 959daa72..cb612743 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/CreatedObjectState.php +++ b/src/lib/Server/Output/ValueObjectVisitor/CreatedObjectState.php @@ -19,9 +19,9 @@ class CreatedObjectState extends RestObjectState /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Server\Values\CreatedObjectState $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Server\Values\CreatedObjectState $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/CreatedObjectStateGroup.php b/src/lib/Server/Output/ValueObjectVisitor/CreatedObjectStateGroup.php index fc973ceb..cccbd136 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/CreatedObjectStateGroup.php +++ b/src/lib/Server/Output/ValueObjectVisitor/CreatedObjectStateGroup.php @@ -19,9 +19,9 @@ class CreatedObjectStateGroup extends ObjectStateGroup /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Server\Values\CreatedObjectStateGroup $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Server\Values\CreatedObjectStateGroup $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/CreatedPolicy.php b/src/lib/Server/Output/ValueObjectVisitor/CreatedPolicy.php index 58dc6bb3..079f8134 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/CreatedPolicy.php +++ b/src/lib/Server/Output/ValueObjectVisitor/CreatedPolicy.php @@ -19,9 +19,9 @@ class CreatedPolicy extends Policy /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Server\Values\CreatedPolicy $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Server\Values\CreatedPolicy $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/CreatedRelation.php b/src/lib/Server/Output/ValueObjectVisitor/CreatedRelation.php index b3dd51c8..dc531639 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/CreatedRelation.php +++ b/src/lib/Server/Output/ValueObjectVisitor/CreatedRelation.php @@ -19,9 +19,9 @@ class CreatedRelation extends RestRelation /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Server\Values\CreatedRelation $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Server\Values\CreatedRelation $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/CreatedRole.php b/src/lib/Server/Output/ValueObjectVisitor/CreatedRole.php index 6cc126d6..03ea236c 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/CreatedRole.php +++ b/src/lib/Server/Output/ValueObjectVisitor/CreatedRole.php @@ -19,9 +19,9 @@ class CreatedRole extends Role /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Server\Values\CreatedRole $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Server\Values\CreatedRole $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/CreatedSection.php b/src/lib/Server/Output/ValueObjectVisitor/CreatedSection.php index d856e0d2..9060f67a 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/CreatedSection.php +++ b/src/lib/Server/Output/ValueObjectVisitor/CreatedSection.php @@ -19,9 +19,9 @@ class CreatedSection extends Section /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Server\Values\CreatedSection $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Server\Values\CreatedSection $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/CreatedURLAlias.php b/src/lib/Server/Output/ValueObjectVisitor/CreatedURLAlias.php index c4af1801..a85e31cc 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/CreatedURLAlias.php +++ b/src/lib/Server/Output/ValueObjectVisitor/CreatedURLAlias.php @@ -19,9 +19,9 @@ class CreatedURLAlias extends URLAlias /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Server\Values\CreatedURLAlias $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Server\Values\CreatedURLAlias $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/CreatedURLWildcard.php b/src/lib/Server/Output/ValueObjectVisitor/CreatedURLWildcard.php index 106b2dcd..bfedc6c1 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/CreatedURLWildcard.php +++ b/src/lib/Server/Output/ValueObjectVisitor/CreatedURLWildcard.php @@ -19,9 +19,9 @@ class CreatedURLWildcard extends URLWildcard /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Server\Values\CreatedURLWildcard $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Server\Values\CreatedURLWildcard $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/CreatedUser.php b/src/lib/Server/Output/ValueObjectVisitor/CreatedUser.php index a252ee8b..3102a712 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/CreatedUser.php +++ b/src/lib/Server/Output/ValueObjectVisitor/CreatedUser.php @@ -19,9 +19,9 @@ class CreatedUser extends RestUser /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Server\Values\CreatedUser $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Server\Values\CreatedUser $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/CreatedUserGroup.php b/src/lib/Server/Output/ValueObjectVisitor/CreatedUserGroup.php index 702fb0a5..8c430dea 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/CreatedUserGroup.php +++ b/src/lib/Server/Output/ValueObjectVisitor/CreatedUserGroup.php @@ -19,9 +19,9 @@ class CreatedUserGroup extends RestUserGroup /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Server\Values\CreatedUserGroup $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Server\Values\CreatedUserGroup $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/CreatedVersion.php b/src/lib/Server/Output/ValueObjectVisitor/CreatedVersion.php index aea66640..a608e725 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/CreatedVersion.php +++ b/src/lib/Server/Output/ValueObjectVisitor/CreatedVersion.php @@ -19,9 +19,9 @@ class CreatedVersion extends Version /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Server\Values\CreatedVersion $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Server\Values\CreatedVersion $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/DeletedUserSession.php b/src/lib/Server/Output/ValueObjectVisitor/DeletedUserSession.php index f437f26f..0a6eb038 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/DeletedUserSession.php +++ b/src/lib/Server/Output/ValueObjectVisitor/DeletedUserSession.php @@ -14,9 +14,9 @@ class DeletedUserSession extends NoContent /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Server\Values\DeletedUserSession $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Server\Values\DeletedUserSession $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/Exception.php b/src/lib/Server/Output/ValueObjectVisitor/Exception.php index 97bbb254..7c96c1c6 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/Exception.php +++ b/src/lib/Server/Output/ValueObjectVisitor/Exception.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Rest\Server\Output\ValueObjectVisitor; -use eZ\Publish\Core\Base\Translatable; +use Ibexa\Core\Base\Translatable; use Ibexa\Contracts\Rest\Output\Generator; use Ibexa\Contracts\Rest\Output\ValueObjectVisitor; use Ibexa\Contracts\Rest\Output\Visitor; @@ -95,8 +95,8 @@ protected function getStatus() /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator * @param \Exception $data */ public function visit(Visitor $visitor, Generator $generator, $data) diff --git a/src/lib/Server/Output/ValueObjectVisitor/FieldDefinitionList.php b/src/lib/Server/Output/ValueObjectVisitor/FieldDefinitionList.php index 4d14b960..a67c6556 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/FieldDefinitionList.php +++ b/src/lib/Server/Output/ValueObjectVisitor/FieldDefinitionList.php @@ -18,9 +18,9 @@ class FieldDefinitionList extends RestContentTypeBase /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Server\Values\FieldDefinitionList $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Server\Values\FieldDefinitionList $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/ImageVariation.php b/src/lib/Server/Output/ValueObjectVisitor/ImageVariation.php index 77722904..72dca8db 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/ImageVariation.php +++ b/src/lib/Server/Output/ValueObjectVisitor/ImageVariation.php @@ -9,12 +9,12 @@ use Ibexa\Contracts\Rest\Output\ValueObjectVisitor; use Ibexa\Contracts\Rest\Output\Generator; use Ibexa\Contracts\Rest\Output\Visitor; -use eZ\Publish\SPI\Variation\Values\ImageVariation as ImageVariationValue; +use Ibexa\Contracts\Core\Variation\Values\ImageVariation as ImageVariationValue; class ImageVariation extends ValueObjectVisitor { /** - * @param \eZ\Publish\SPI\Variation\Values\ImageVariation $data + * @param \Ibexa\Contracts\Core\Variation\Values\ImageVariation $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/Language.php b/src/lib/Server/Output/ValueObjectVisitor/Language.php index 78ed1480..56a7b12d 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/Language.php +++ b/src/lib/Server/Output/ValueObjectVisitor/Language.php @@ -8,7 +8,7 @@ namespace Ibexa\Rest\Server\Output\ValueObjectVisitor; -use eZ\Publish\API\Repository\Values\Content\Language as LanguageValue; +use Ibexa\Contracts\Core\Repository\Values\Content\Language as LanguageValue; use Ibexa\Contracts\Rest\Output\Generator; use Ibexa\Contracts\Rest\Output\ValueObjectVisitor; use Ibexa\Contracts\Rest\Output\Visitor; @@ -16,7 +16,7 @@ final class Language extends ValueObjectVisitor { /** - * @param \eZ\Publish\API\Repository\Values\Content\Language $data + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Language $data */ public function visit(Visitor $visitor, Generator $generator, $data): void { diff --git a/src/lib/Server/Output/ValueObjectVisitor/Location.php b/src/lib/Server/Output/ValueObjectVisitor/Location.php index 4448f595..1f4574fa 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/Location.php +++ b/src/lib/Server/Output/ValueObjectVisitor/Location.php @@ -6,12 +6,12 @@ */ namespace Ibexa\Rest\Server\Output\ValueObjectVisitor; -use eZ\Publish\API\Repository\LocationService; +use Ibexa\Contracts\Core\Repository\LocationService; use Ibexa\Contracts\Rest\Output\ValueObjectVisitor; use Ibexa\Contracts\Rest\Output\Generator; use Ibexa\Contracts\Rest\Output\Visitor; use Ibexa\Rest\Server\Values\RestContent as RestContentValue; -use eZ\Publish\API\Repository\Values\Content\Location as LocationValue; +use Ibexa\Contracts\Core\Repository\Values\Content\Location as LocationValue; /** * Location value object visitor. @@ -19,7 +19,7 @@ class Location extends ValueObjectVisitor { /** - * @var \eZ\Publish\API\Repository\LocationService + * @var \Ibexa\Contracts\Core\Repository\LocationService */ private $locationService; @@ -31,9 +31,9 @@ public function __construct(LocationService $locationService) /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \eZ\Publish\API\Repository\Values\Content\Location $location + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Location $location */ public function visit(Visitor $visitor, Generator $generator, $location) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/LocationList.php b/src/lib/Server/Output/ValueObjectVisitor/LocationList.php index cdba82f1..9a1b115d 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/LocationList.php +++ b/src/lib/Server/Output/ValueObjectVisitor/LocationList.php @@ -18,9 +18,9 @@ class LocationList extends ValueObjectVisitor /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Server\Values\LocationList $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Server\Values\LocationList $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/NoContent.php b/src/lib/Server/Output/ValueObjectVisitor/NoContent.php index 106f7b85..14774b38 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/NoContent.php +++ b/src/lib/Server/Output/ValueObjectVisitor/NoContent.php @@ -18,9 +18,9 @@ class NoContent extends ValueObjectVisitor /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Server\Values\NoContent $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Server\Values\NoContent $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/ObjectState.php b/src/lib/Server/Output/ValueObjectVisitor/ObjectState.php index 6cd876e1..18ce8592 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/ObjectState.php +++ b/src/lib/Server/Output/ValueObjectVisitor/ObjectState.php @@ -17,7 +17,7 @@ final class ObjectState extends ValueObjectVisitor implements DelegateValueObjectVisitor { /** - * @param \eZ\Publish\API\Repository\Values\ObjectState\ObjectState $data + * @param \Ibexa\Contracts\Core\Repository\Values\ObjectState\ObjectState $data */ public function visit(Visitor $visitor, Generator $generator, $data): void { diff --git a/src/lib/Server/Output/ValueObjectVisitor/ObjectStateGroup.php b/src/lib/Server/Output/ValueObjectVisitor/ObjectStateGroup.php index d8b194db..02164bf7 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/ObjectStateGroup.php +++ b/src/lib/Server/Output/ValueObjectVisitor/ObjectStateGroup.php @@ -9,7 +9,7 @@ use Ibexa\Contracts\Rest\Output\ValueObjectVisitor; use Ibexa\Contracts\Rest\Output\Generator; use Ibexa\Contracts\Rest\Output\Visitor; -use eZ\Publish\API\Repository\Values\ObjectState\ObjectStateGroup as ObjectStateGroupValue; +use Ibexa\Contracts\Core\Repository\Values\ObjectState\ObjectStateGroup as ObjectStateGroupValue; /** * ObjectStateGroup value object visitor. @@ -19,9 +19,9 @@ class ObjectStateGroup extends ValueObjectVisitor /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \eZ\Publish\API\Repository\Values\ObjectState\ObjectStateGroup $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Contracts\Core\Repository\Values\ObjectState\ObjectStateGroup $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/ObjectStateGroupList.php b/src/lib/Server/Output/ValueObjectVisitor/ObjectStateGroupList.php index e9441da7..3b8cc911 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/ObjectStateGroupList.php +++ b/src/lib/Server/Output/ValueObjectVisitor/ObjectStateGroupList.php @@ -18,9 +18,9 @@ class ObjectStateGroupList extends ValueObjectVisitor /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Server\Values\ObjectStateGroupList $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Server\Values\ObjectStateGroupList $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/ObjectStateList.php b/src/lib/Server/Output/ValueObjectVisitor/ObjectStateList.php index 2c949c8c..7405b4a8 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/ObjectStateList.php +++ b/src/lib/Server/Output/ValueObjectVisitor/ObjectStateList.php @@ -19,9 +19,9 @@ class ObjectStateList extends ValueObjectVisitor /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Server\Values\ObjectStateList $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Server\Values\ObjectStateList $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/PermanentRedirect.php b/src/lib/Server/Output/ValueObjectVisitor/PermanentRedirect.php index 04f54783..08aa5a62 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/PermanentRedirect.php +++ b/src/lib/Server/Output/ValueObjectVisitor/PermanentRedirect.php @@ -18,9 +18,9 @@ class PermanentRedirect extends ValueObjectVisitor /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Server\Values\PermanentRedirect $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Server\Values\PermanentRedirect $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/Policy.php b/src/lib/Server/Output/ValueObjectVisitor/Policy.php index 7b66469a..6bbba1eb 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/Policy.php +++ b/src/lib/Server/Output/ValueObjectVisitor/Policy.php @@ -6,11 +6,11 @@ */ namespace Ibexa\Rest\Server\Output\ValueObjectVisitor; -use eZ\Publish\API\Repository\Values\User\PolicyDraft; +use Ibexa\Contracts\Core\Repository\Values\User\PolicyDraft; use Ibexa\Contracts\Rest\Output\ValueObjectVisitor; use Ibexa\Contracts\Rest\Output\Generator; use Ibexa\Contracts\Rest\Output\Visitor; -use eZ\Publish\API\Repository\Values\User\Policy as PolicyValue; +use Ibexa\Contracts\Core\Repository\Values\User\Policy as PolicyValue; /** * Policy value object visitor. @@ -20,9 +20,9 @@ class Policy extends ValueObjectVisitor /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param Policy|PolicyDraft $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param Policy|\Ibexa\Contracts\Core\Repository\Values\User\PolicyDraft $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/PolicyList.php b/src/lib/Server/Output/ValueObjectVisitor/PolicyList.php index bd873432..e8e7c7ab 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/PolicyList.php +++ b/src/lib/Server/Output/ValueObjectVisitor/PolicyList.php @@ -18,9 +18,9 @@ class PolicyList extends ValueObjectVisitor /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Server\Values\PolicyList $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Server\Values\PolicyList $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/PublishedRole.php b/src/lib/Server/Output/ValueObjectVisitor/PublishedRole.php index 150f80ef..d9776fc4 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/PublishedRole.php +++ b/src/lib/Server/Output/ValueObjectVisitor/PublishedRole.php @@ -19,9 +19,9 @@ class PublishedRole extends Role /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Server\Values\PublishedRole $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Server\Values\PublishedRole $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/Range.php b/src/lib/Server/Output/ValueObjectVisitor/Range.php index 2a9c0a84..ee179cb2 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/Range.php +++ b/src/lib/Server/Output/ValueObjectVisitor/Range.php @@ -15,7 +15,7 @@ final class Range extends ValueObjectVisitor { /** - * @param \eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Range $data + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Range $data */ public function visit(Visitor $visitor, Generator $generator, $data): void { diff --git a/src/lib/Server/Output/ValueObjectVisitor/RangeAggregationResult.php b/src/lib/Server/Output/ValueObjectVisitor/RangeAggregationResult.php index 8a48b31c..0ae78001 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/RangeAggregationResult.php +++ b/src/lib/Server/Output/ValueObjectVisitor/RangeAggregationResult.php @@ -8,7 +8,7 @@ namespace Ibexa\Rest\Server\Output\ValueObjectVisitor; -use eZ\Publish\API\Repository\Values\Content\Search\AggregationResult\RangeAggregationResultEntry; +use Ibexa\Contracts\Core\Repository\Values\Content\Search\AggregationResult\RangeAggregationResultEntry; use Ibexa\Contracts\Rest\Output\Generator; use Ibexa\Contracts\Rest\Output\ValueObjectVisitor; use Ibexa\Contracts\Rest\Output\Visitor; @@ -16,7 +16,7 @@ final class RangeAggregationResult extends ValueObjectVisitor { /** - * @param \eZ\Publish\API\Repository\Values\Content\Search\AggregationResult\RangeAggregationResult $data + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Search\AggregationResult\RangeAggregationResult $data */ public function visit(Visitor $visitor, Generator $generator, $data): void { @@ -44,7 +44,7 @@ private function visitEntry(Visitor $visitor, Generator $generator, RangeAggrega } /** - * @param \eZ\Publish\API\Repository\Values\Content\Query\Aggregation\Range $key + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Query\Aggregation\Range $key */ private function visitKey(Visitor $visitor, Generator $generator, $key): void { diff --git a/src/lib/Server/Output/ValueObjectVisitor/RelationList.php b/src/lib/Server/Output/ValueObjectVisitor/RelationList.php index 0688c673..2577e4d1 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/RelationList.php +++ b/src/lib/Server/Output/ValueObjectVisitor/RelationList.php @@ -19,9 +19,9 @@ class RelationList extends ValueObjectVisitor /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Server\Values\RelationList $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Server\Values\RelationList $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/ResourceCreated.php b/src/lib/Server/Output/ValueObjectVisitor/ResourceCreated.php index 56a201ca..ae8c545d 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/ResourceCreated.php +++ b/src/lib/Server/Output/ValueObjectVisitor/ResourceCreated.php @@ -18,9 +18,9 @@ class ResourceCreated extends ValueObjectVisitor /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Server\Values\ResourceCreated $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Server\Values\ResourceCreated $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/RestContent.php b/src/lib/Server/Output/ValueObjectVisitor/RestContent.php index 774ad5cc..3ff7eb01 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/RestContent.php +++ b/src/lib/Server/Output/ValueObjectVisitor/RestContent.php @@ -6,9 +6,9 @@ */ namespace Ibexa\Rest\Server\Output\ValueObjectVisitor; -use eZ\Publish\API\Repository\Values\Content\ContentInfo; -use eZ\Publish\Core\Base\Exceptions\BadStateException as CoreBadStateException; -use eZ\Publish\Core\Helper\TranslationHelper; +use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo; +use Ibexa\Core\Base\Exceptions\BadStateException as CoreBadStateException; +use Ibexa\Core\Helper\TranslationHelper; use Ibexa\Contracts\Rest\Output\ValueObjectVisitor; use Ibexa\Contracts\Rest\Output\Generator; use Ibexa\Contracts\Rest\Output\Visitor; @@ -19,7 +19,7 @@ */ class RestContent extends ValueObjectVisitor { - /** @var \eZ\Publish\Core\Helper\TranslationHelper */ + /** @var \Ibexa\Core\Helper\TranslationHelper */ private $translationHelper; public function __construct(TranslationHelper $translationHelper) @@ -30,9 +30,9 @@ public function __construct(TranslationHelper $translationHelper) /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Server\Values\RestContent $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Server\Values\RestContent $data */ public function visit(Visitor $visitor, Generator $generator, $data) { @@ -221,7 +221,7 @@ public function visit(Visitor $visitor, Generator $generator, $data) * * @param int $status * - * @throws \eZ\Publish\Core\Base\Exceptions\BadStateException + * @throws \Ibexa\Core\Base\Exceptions\BadStateException * * @return string */ diff --git a/src/lib/Server/Output/ValueObjectVisitor/RestContentType.php b/src/lib/Server/Output/ValueObjectVisitor/RestContentType.php index bad3a043..dcb20f55 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/RestContentType.php +++ b/src/lib/Server/Output/ValueObjectVisitor/RestContentType.php @@ -8,7 +8,7 @@ use Ibexa\Contracts\Rest\Output\Generator; use Ibexa\Contracts\Rest\Output\Visitor; -use eZ\Publish\API\Repository\Values\ContentType\ContentType as APIContentType; +use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType as APIContentType; use Ibexa\Rest\Server\Values; /** @@ -19,9 +19,9 @@ class RestContentType extends RestContentTypeBase /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Server\Values\RestContentType $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Server\Values\RestContentType $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/RestContentTypeBase.php b/src/lib/Server/Output/ValueObjectVisitor/RestContentTypeBase.php index af2a43d9..63e9d74e 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/RestContentTypeBase.php +++ b/src/lib/Server/Output/ValueObjectVisitor/RestContentTypeBase.php @@ -7,7 +7,7 @@ namespace Ibexa\Rest\Server\Output\ValueObjectVisitor; use Ibexa\Contracts\Rest\Output\ValueObjectVisitor; -use eZ\Publish\API\Repository\Values; +use Ibexa\Core\Repository\Values; /** * Base for RestContentType related value object visitors. diff --git a/src/lib/Server/Output/ValueObjectVisitor/RestExecutedView.php b/src/lib/Server/Output/ValueObjectVisitor/RestExecutedView.php index 2b7bfef1..9c5b044a 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/RestExecutedView.php +++ b/src/lib/Server/Output/ValueObjectVisitor/RestExecutedView.php @@ -6,15 +6,15 @@ */ namespace Ibexa\Rest\Server\Output\ValueObjectVisitor; -use eZ\Publish\API\Repository\Exceptions\NotFoundException; -use eZ\Publish\API\Repository\Exceptions\UnauthorizedException; -use eZ\Publish\API\Repository\Values\Content as ApiValues; +use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException; +use Ibexa\Contracts\Core\Repository\Exceptions\UnauthorizedException; +use Ibexa\Core\Repository\Values\Content as ApiValues; use Ibexa\Contracts\Rest\Exceptions; use Ibexa\Contracts\Rest\Output\ValueObjectVisitor; use Ibexa\Contracts\Rest\Output\Generator; use Ibexa\Contracts\Rest\Output\Visitor; -use eZ\Publish\API\Repository\ContentService; -use eZ\Publish\API\Repository\LocationService; +use Ibexa\Contracts\Core\Repository\ContentService; +use Ibexa\Contracts\Core\Repository\LocationService; use Ibexa\Rest\Server\Values\RestContent as RestContentValue; /** @@ -25,20 +25,20 @@ class RestExecutedView extends ValueObjectVisitor /** * Location service. * - * @var \eZ\Publish\API\Repository\LocationService + * @var \Ibexa\Contracts\Core\Repository\LocationService */ protected $locationService; /** * Content service. * - * @var \eZ\Publish\API\Repository\ContentService + * @var \Ibexa\Contracts\Core\Repository\ContentService */ protected $contentService; /** - * @param \eZ\Publish\API\Repository\LocationService $locationService - * @param \eZ\Publish\API\Repository\ContentService $contentService + * @param \Ibexa\Contracts\Core\Repository\LocationService $locationService + * @param \Ibexa\Contracts\Core\Repository\ContentService $contentService */ public function __construct( LocationService $locationService, @@ -51,9 +51,9 @@ public function __construct( /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Server\Values\RestExecutedView $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Server\Values\RestExecutedView $data */ public function visit(Visitor $visitor, Generator $generator, $data) { @@ -113,7 +113,7 @@ public function visit(Visitor $visitor, Generator $generator, $data) // @todo Refactor if ($searchHit->valueObject instanceof ApiValues\Content) { - /** @var \eZ\Publish\API\Repository\Values\Content\Content $searchHit->valueObject */ + /** @var \Ibexa\Contracts\Core\Repository\Values\Content\Content $searchHit->valueObject */ $contentInfo = $searchHit->valueObject->contentInfo; try { diff --git a/src/lib/Server/Output/ValueObjectVisitor/RestFieldDefinition.php b/src/lib/Server/Output/ValueObjectVisitor/RestFieldDefinition.php index bc8e0065..51cf4a1b 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/RestFieldDefinition.php +++ b/src/lib/Server/Output/ValueObjectVisitor/RestFieldDefinition.php @@ -9,7 +9,7 @@ use Ibexa\Contracts\Rest\Output\Generator; use Ibexa\Contracts\Rest\Output\Visitor; use Ibexa\Rest\Output\FieldTypeSerializer; -use eZ\Publish\API\Repository\Values\ContentType\ContentType as APIContentType; +use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType as APIContentType; /** * RestFieldDefinition value object visitor. @@ -19,12 +19,12 @@ class RestFieldDefinition extends RestContentTypeBase { /** - * @var \EzSystems\EzPlatformRest\Output\FieldTypeSerializer + * @var \Ibexa\Rest\Output\FieldTypeSerializer */ protected $fieldTypeSerializer; /** - * @param \EzSystems\EzPlatformRest\Output\FieldTypeSerializer $fieldTypeSerializer + * @param \Ibexa\Rest\Output\FieldTypeSerializer $fieldTypeSerializer */ public function __construct(FieldTypeSerializer $fieldTypeSerializer) { @@ -34,9 +34,9 @@ public function __construct(FieldTypeSerializer $fieldTypeSerializer) /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Server\Values\RestFieldDefinition $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Server\Values\RestFieldDefinition $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/RestLocation.php b/src/lib/Server/Output/ValueObjectVisitor/RestLocation.php index 5b00a764..9755ba5a 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/RestLocation.php +++ b/src/lib/Server/Output/ValueObjectVisitor/RestLocation.php @@ -19,9 +19,9 @@ class RestLocation extends ValueObjectVisitor /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Server\Values\RestLocation $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Server\Values\RestLocation $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/RestObjectState.php b/src/lib/Server/Output/ValueObjectVisitor/RestObjectState.php index c4b23ed9..d8fe8461 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/RestObjectState.php +++ b/src/lib/Server/Output/ValueObjectVisitor/RestObjectState.php @@ -18,9 +18,9 @@ class RestObjectState extends ValueObjectVisitor /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Values\RestObjectState $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Values\RestObjectState $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/RestRelation.php b/src/lib/Server/Output/ValueObjectVisitor/RestRelation.php index 06de4fe5..0220c739 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/RestRelation.php +++ b/src/lib/Server/Output/ValueObjectVisitor/RestRelation.php @@ -9,7 +9,7 @@ use Ibexa\Contracts\Rest\Output\ValueObjectVisitor; use Ibexa\Contracts\Rest\Output\Generator; use Ibexa\Contracts\Rest\Output\Visitor; -use eZ\Publish\API\Repository\Values\Content\Relation as RelationValue; +use Ibexa\Contracts\Core\Repository\Values\Content\Relation as RelationValue; /** * RestRelation value object visitor. @@ -19,9 +19,9 @@ class RestRelation extends ValueObjectVisitor /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Server\Values\RestRelation $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Server\Values\RestRelation $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/RestTrashItem.php b/src/lib/Server/Output/ValueObjectVisitor/RestTrashItem.php index 0d4b06ce..72c99353 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/RestTrashItem.php +++ b/src/lib/Server/Output/ValueObjectVisitor/RestTrashItem.php @@ -19,9 +19,9 @@ class RestTrashItem extends ValueObjectVisitor /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Server\Values\RestTrashItem $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Server\Values\RestTrashItem $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/RestUser.php b/src/lib/Server/Output/ValueObjectVisitor/RestUser.php index ea0708f8..e9aefe2a 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/RestUser.php +++ b/src/lib/Server/Output/ValueObjectVisitor/RestUser.php @@ -19,9 +19,9 @@ class RestUser extends ValueObjectVisitor /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Server\Values\RestUser $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Server\Values\RestUser $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/RestUserGroup.php b/src/lib/Server/Output/ValueObjectVisitor/RestUserGroup.php index 104b8517..bada1957 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/RestUserGroup.php +++ b/src/lib/Server/Output/ValueObjectVisitor/RestUserGroup.php @@ -19,9 +19,9 @@ class RestUserGroup extends ValueObjectVisitor /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Server\Values\RestUserGroup $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Server\Values\RestUserGroup $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/RestUserGroupRoleAssignment.php b/src/lib/Server/Output/ValueObjectVisitor/RestUserGroupRoleAssignment.php index f9042dc0..a6906a04 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/RestUserGroupRoleAssignment.php +++ b/src/lib/Server/Output/ValueObjectVisitor/RestUserGroupRoleAssignment.php @@ -9,7 +9,7 @@ use Ibexa\Contracts\Rest\Output\ValueObjectVisitor; use Ibexa\Contracts\Rest\Output\Generator; use Ibexa\Contracts\Rest\Output\Visitor; -use eZ\Publish\API\Repository\Values\User\Limitation\RoleLimitation; +use Ibexa\Contracts\Core\Repository\Values\User\Limitation\RoleLimitation; /** * RestUserGroupRoleAssignment value object visitor. @@ -19,9 +19,9 @@ class RestUserGroupRoleAssignment extends ValueObjectVisitor /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Server\Values\RestUserGroupRoleAssignment $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Server\Values\RestUserGroupRoleAssignment $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/RestUserRoleAssignment.php b/src/lib/Server/Output/ValueObjectVisitor/RestUserRoleAssignment.php index 23139e8b..3f640a93 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/RestUserRoleAssignment.php +++ b/src/lib/Server/Output/ValueObjectVisitor/RestUserRoleAssignment.php @@ -9,7 +9,7 @@ use Ibexa\Contracts\Rest\Output\ValueObjectVisitor; use Ibexa\Contracts\Rest\Output\Generator; use Ibexa\Contracts\Rest\Output\Visitor; -use eZ\Publish\API\Repository\Values\User\Limitation\RoleLimitation; +use Ibexa\Contracts\Core\Repository\Values\User\Limitation\RoleLimitation; /** * RestUserRoleAssignment value object visitor. @@ -19,9 +19,9 @@ class RestUserRoleAssignment extends ValueObjectVisitor /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Server\Values\RestUserRoleAssignment $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Server\Values\RestUserRoleAssignment $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/Role.php b/src/lib/Server/Output/ValueObjectVisitor/Role.php index 2b6b2b4c..fe7a3655 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/Role.php +++ b/src/lib/Server/Output/ValueObjectVisitor/Role.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Rest\Server\Output\ValueObjectVisitor; -use eZ\Publish\API\Repository\Values\User\RoleDraft; +use Ibexa\Contracts\Core\Repository\Values\User\RoleDraft; use Ibexa\Contracts\Rest\Output\ValueObjectVisitor; use Ibexa\Contracts\Rest\Output\Generator; use Ibexa\Contracts\Rest\Output\Visitor; @@ -19,9 +19,9 @@ class Role extends ValueObjectVisitor /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param Role|RoleDraft $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param Role|\Ibexa\Contracts\Core\Repository\Values\User\RoleDraft $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/RoleAssignmentList.php b/src/lib/Server/Output/ValueObjectVisitor/RoleAssignmentList.php index 3e833bd4..6cc47612 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/RoleAssignmentList.php +++ b/src/lib/Server/Output/ValueObjectVisitor/RoleAssignmentList.php @@ -19,9 +19,9 @@ class RoleAssignmentList extends ValueObjectVisitor /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Server\Values\RoleAssignmentList $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Server\Values\RoleAssignmentList $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/RoleList.php b/src/lib/Server/Output/ValueObjectVisitor/RoleList.php index 2c9f7d61..8d6c2180 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/RoleList.php +++ b/src/lib/Server/Output/ValueObjectVisitor/RoleList.php @@ -18,9 +18,9 @@ class RoleList extends ValueObjectVisitor /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Server\Values\RoleList $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Server\Values\RoleList $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/Root.php b/src/lib/Server/Output/ValueObjectVisitor/Root.php index 7eb67ee7..66bf286a 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/Root.php +++ b/src/lib/Server/Output/ValueObjectVisitor/Root.php @@ -18,9 +18,9 @@ class Root extends ValueObjectVisitor /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Values\Root $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Values\Root $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/Section.php b/src/lib/Server/Output/ValueObjectVisitor/Section.php index 69919fee..e8854856 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/Section.php +++ b/src/lib/Server/Output/ValueObjectVisitor/Section.php @@ -9,7 +9,7 @@ use Ibexa\Contracts\Rest\Output\ValueObjectVisitor; use Ibexa\Contracts\Rest\Output\Generator; use Ibexa\Contracts\Rest\Output\Visitor; -use eZ\Publish\API\Repository\Values\Content\Section as SectionValue; +use Ibexa\Contracts\Core\Repository\Values\Content\Section as SectionValue; /** * Section value object visitor. @@ -19,9 +19,9 @@ class Section extends ValueObjectVisitor /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \eZ\Publish\API\Repository\Values\Content\Section $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Section $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/SectionList.php b/src/lib/Server/Output/ValueObjectVisitor/SectionList.php index 080924c6..0ecce30e 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/SectionList.php +++ b/src/lib/Server/Output/ValueObjectVisitor/SectionList.php @@ -18,9 +18,9 @@ class SectionList extends ValueObjectVisitor /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Server\Values\SectionList $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Server\Values\SectionList $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/StatsAggregationResult.php b/src/lib/Server/Output/ValueObjectVisitor/StatsAggregationResult.php index a2f31886..0a752d76 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/StatsAggregationResult.php +++ b/src/lib/Server/Output/ValueObjectVisitor/StatsAggregationResult.php @@ -15,7 +15,7 @@ final class StatsAggregationResult extends ValueObjectVisitor { /** - * @param \eZ\Publish\API\Repository\Values\Content\Search\AggregationResult\StatsAggregationResult $data + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Search\AggregationResult\StatsAggregationResult $data */ public function visit(Visitor $visitor, Generator $generator, $data): void { diff --git a/src/lib/Server/Output/ValueObjectVisitor/TemporaryRedirect.php b/src/lib/Server/Output/ValueObjectVisitor/TemporaryRedirect.php index c66c67bd..9988c96a 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/TemporaryRedirect.php +++ b/src/lib/Server/Output/ValueObjectVisitor/TemporaryRedirect.php @@ -18,9 +18,9 @@ class TemporaryRedirect extends ValueObjectVisitor /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Server\Values\TemporaryRedirect $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Server\Values\TemporaryRedirect $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/TermAggregationResult.php b/src/lib/Server/Output/ValueObjectVisitor/TermAggregationResult.php index 52bcec88..40339eb0 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/TermAggregationResult.php +++ b/src/lib/Server/Output/ValueObjectVisitor/TermAggregationResult.php @@ -8,7 +8,7 @@ namespace Ibexa\Rest\Server\Output\ValueObjectVisitor; -use eZ\Publish\API\Repository\Values\Content\Search\AggregationResult\TermAggregationResultEntry; +use Ibexa\Contracts\Core\Repository\Values\Content\Search\AggregationResult\TermAggregationResultEntry; use Ibexa\Contracts\Rest\Output\Generator; use Ibexa\Contracts\Rest\Output\ValueObjectVisitor; use Ibexa\Contracts\Rest\Output\Visitor; @@ -16,7 +16,7 @@ final class TermAggregationResult extends ValueObjectVisitor { /** - * @param \eZ\Publish\API\Repository\Values\Content\Search\AggregationResult\TermAggregationResult $data + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Search\AggregationResult\TermAggregationResult $data */ public function visit(Visitor $visitor, Generator $generator, $data): void { diff --git a/src/lib/Server/Output/ValueObjectVisitor/Trash.php b/src/lib/Server/Output/ValueObjectVisitor/Trash.php index add2efea..c71ab0b2 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/Trash.php +++ b/src/lib/Server/Output/ValueObjectVisitor/Trash.php @@ -18,9 +18,9 @@ class Trash extends ValueObjectVisitor /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Server\Values\Trash $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Server\Values\Trash $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/URLAlias.php b/src/lib/Server/Output/ValueObjectVisitor/URLAlias.php index 966f80bc..ad0254c6 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/URLAlias.php +++ b/src/lib/Server/Output/ValueObjectVisitor/URLAlias.php @@ -9,8 +9,8 @@ use Ibexa\Contracts\Rest\Output\ValueObjectVisitor; use Ibexa\Contracts\Rest\Output\Generator; use Ibexa\Contracts\Rest\Output\Visitor; -use eZ\Publish\API\Repository\Values; -use eZ\Publish\API\Repository\Values\Content\URLAlias as URLAliasValue; +use Ibexa\Core\Repository\Values; +use Ibexa\Contracts\Core\Repository\Values\Content\URLAlias as URLAliasValue; /** * URLAlias value object visitor. @@ -20,9 +20,9 @@ class URLAlias extends ValueObjectVisitor /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \eZ\Publish\API\Repository\Values\Content\URLAlias $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Contracts\Core\Repository\Values\Content\URLAlias $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/URLAliasList.php b/src/lib/Server/Output/ValueObjectVisitor/URLAliasList.php index 471a9fbe..71df3206 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/URLAliasList.php +++ b/src/lib/Server/Output/ValueObjectVisitor/URLAliasList.php @@ -18,9 +18,9 @@ class URLAliasList extends ValueObjectVisitor /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Server\Values\URLAliasList $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Server\Values\URLAliasList $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/URLAliasRefList.php b/src/lib/Server/Output/ValueObjectVisitor/URLAliasRefList.php index 72fbe8bc..17462def 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/URLAliasRefList.php +++ b/src/lib/Server/Output/ValueObjectVisitor/URLAliasRefList.php @@ -18,9 +18,9 @@ class URLAliasRefList extends ValueObjectVisitor /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Server\Values\URLAliasRefList $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Server\Values\URLAliasRefList $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/URLWildcard.php b/src/lib/Server/Output/ValueObjectVisitor/URLWildcard.php index b16e1a5f..d4092f59 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/URLWildcard.php +++ b/src/lib/Server/Output/ValueObjectVisitor/URLWildcard.php @@ -9,7 +9,7 @@ use Ibexa\Contracts\Rest\Output\ValueObjectVisitor; use Ibexa\Contracts\Rest\Output\Generator; use Ibexa\Contracts\Rest\Output\Visitor; -use eZ\Publish\API\Repository\Values\Content\URLWildcard as URLWildcardValue; +use Ibexa\Contracts\Core\Repository\Values\Content\URLWildcard as URLWildcardValue; /** * URLWildcard value object visitor. @@ -19,9 +19,9 @@ class URLWildcard extends ValueObjectVisitor /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \eZ\Publish\API\Repository\Values\Content\URLWildcard $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Contracts\Core\Repository\Values\Content\URLWildcard $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/URLWildcardList.php b/src/lib/Server/Output/ValueObjectVisitor/URLWildcardList.php index 39950314..a80e74af 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/URLWildcardList.php +++ b/src/lib/Server/Output/ValueObjectVisitor/URLWildcardList.php @@ -18,9 +18,9 @@ class URLWildcardList extends ValueObjectVisitor /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Server\Values\URLWildcardList $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Server\Values\URLWildcardList $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/User.php b/src/lib/Server/Output/ValueObjectVisitor/User.php index 33ab4abd..3f801b90 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/User.php +++ b/src/lib/Server/Output/ValueObjectVisitor/User.php @@ -8,7 +8,7 @@ namespace Ibexa\Rest\Server\Output\ValueObjectVisitor; -use eZ\Publish\API\Repository\ContentService; +use Ibexa\Contracts\Core\Repository\ContentService; use Ibexa\Rest\Output\DelegateValueObjectVisitor; use Ibexa\Contracts\Rest\Output\Generator; use Ibexa\Contracts\Rest\Output\ValueObjectVisitor; @@ -17,7 +17,7 @@ final class User extends ValueObjectVisitor implements DelegateValueObjectVisitor { - /** @var \eZ\Publish\API\Repository\ContentService */ + /** @var \Ibexa\Contracts\Core\Repository\ContentService */ private $contentService; public function __construct(ContentService $contentService) @@ -26,7 +26,7 @@ public function __construct(ContentService $contentService) } /** - * @param \eZ\Publish\API\Repository\Values\User\User $data + * @param \Ibexa\Contracts\Core\Repository\Values\User\User $data */ public function visit(Visitor $visitor, Generator $generator, $data): void { diff --git a/src/lib/Server/Output/ValueObjectVisitor/UserGroup.php b/src/lib/Server/Output/ValueObjectVisitor/UserGroup.php index f2028953..900893b2 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/UserGroup.php +++ b/src/lib/Server/Output/ValueObjectVisitor/UserGroup.php @@ -8,7 +8,7 @@ namespace Ibexa\Rest\Server\Output\ValueObjectVisitor; -use eZ\Publish\API\Repository\ContentService; +use Ibexa\Contracts\Core\Repository\ContentService; use Ibexa\Rest\Output\DelegateValueObjectVisitor; use Ibexa\Contracts\Rest\Output\Generator; use Ibexa\Contracts\Rest\Output\ValueObjectVisitor; @@ -17,7 +17,7 @@ final class UserGroup extends ValueObjectVisitor implements DelegateValueObjectVisitor { - /** @var \eZ\Publish\API\Repository\ContentService */ + /** @var \Ibexa\Contracts\Core\Repository\ContentService */ private $contentService; public function __construct(ContentService $contentService) @@ -26,7 +26,7 @@ public function __construct(ContentService $contentService) } /** - * @param \eZ\Publish\API\Repository\Values\User\UserGroup $data + * @param \Ibexa\Contracts\Core\Repository\Values\User\UserGroup $data */ public function visit(Visitor $visitor, Generator $generator, $data): void { diff --git a/src/lib/Server/Output/ValueObjectVisitor/UserGroupList.php b/src/lib/Server/Output/ValueObjectVisitor/UserGroupList.php index 7c9ac609..5068b0f5 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/UserGroupList.php +++ b/src/lib/Server/Output/ValueObjectVisitor/UserGroupList.php @@ -18,9 +18,9 @@ class UserGroupList extends ValueObjectVisitor /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Server\Values\UserGroupList $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Server\Values\UserGroupList $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/UserGroupRefList.php b/src/lib/Server/Output/ValueObjectVisitor/UserGroupRefList.php index 5d3076dc..380b9967 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/UserGroupRefList.php +++ b/src/lib/Server/Output/ValueObjectVisitor/UserGroupRefList.php @@ -18,9 +18,9 @@ class UserGroupRefList extends ValueObjectVisitor /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Server\Values\UserGroupRefList $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Server\Values\UserGroupRefList $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/UserList.php b/src/lib/Server/Output/ValueObjectVisitor/UserList.php index a558a1d8..ed44360c 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/UserList.php +++ b/src/lib/Server/Output/ValueObjectVisitor/UserList.php @@ -18,9 +18,9 @@ class UserList extends ValueObjectVisitor /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Server\Values\UserList $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Server\Values\UserList $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/UserRefList.php b/src/lib/Server/Output/ValueObjectVisitor/UserRefList.php index 787ffb7a..a41da90d 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/UserRefList.php +++ b/src/lib/Server/Output/ValueObjectVisitor/UserRefList.php @@ -18,9 +18,9 @@ class UserRefList extends ValueObjectVisitor /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Server\Values\UserRefList $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Server\Values\UserRefList $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/UserSession.php b/src/lib/Server/Output/ValueObjectVisitor/UserSession.php index a0ad7093..f10b936b 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/UserSession.php +++ b/src/lib/Server/Output/ValueObjectVisitor/UserSession.php @@ -19,9 +19,9 @@ class UserSession extends ValueObjectVisitor /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Server\Values\UserSession $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Server\Values\UserSession $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/Version.php b/src/lib/Server/Output/ValueObjectVisitor/Version.php index ddfece18..230f3853 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/Version.php +++ b/src/lib/Server/Output/ValueObjectVisitor/Version.php @@ -6,15 +6,15 @@ */ namespace Ibexa\Rest\Server\Output\ValueObjectVisitor; -use eZ\Publish\API\Repository\Values\Content\Thumbnail; +use Ibexa\Contracts\Core\Repository\Values\Content\Thumbnail; use Ibexa\Contracts\Rest\Output\ValueObjectVisitor; use Ibexa\Contracts\Rest\Output\Generator; use Ibexa\Contracts\Rest\Output\Visitor; use Ibexa\Rest\Output\FieldTypeSerializer; use Ibexa\Rest\Server\Values\RelationList as RelationListValue; use Ibexa\Rest\Server\Values\Version as VersionValue; -use eZ\Publish\API\Repository\Values\ContentType\ContentType; -use eZ\Publish\API\Repository\Values\Content\Field; +use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType; +use Ibexa\Contracts\Core\Repository\Values\Content\Field; /** * Version value object visitor. @@ -22,12 +22,12 @@ class Version extends ValueObjectVisitor { /** - * @var \EzSystems\EzPlatformRest\Output\FieldTypeSerializer + * @var \Ibexa\Rest\Output\FieldTypeSerializer */ protected $fieldTypeSerializer; /** - * @param \EzSystems\EzPlatformRest\Output\FieldTypeSerializer $fieldTypeSerializer + * @param \Ibexa\Rest\Output\FieldTypeSerializer $fieldTypeSerializer */ public function __construct(FieldTypeSerializer $fieldTypeSerializer) { @@ -37,13 +37,13 @@ public function __construct(FieldTypeSerializer $fieldTypeSerializer) /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Server\Values\Version $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Server\Values\Version $data */ public function visit(Visitor $visitor, Generator $generator, $data) { - /** @var \eZ\Publish\API\Repository\Values\Content\Content $content */ + /** @var \Ibexa\Contracts\Core\Repository\Values\Content\Content $content */ $content = $data->content; $generator->startObjectElement('Version'); @@ -60,9 +60,9 @@ public function visit(Visitor $visitor, Generator $generator, $data) /** * Visits a single content field and generates its content. * - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \eZ\Publish\API\Repository\Values\ContentType\ContentType $contentType - * @param \eZ\Publish\API\Repository\Values\Content\Field $field + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType $contentType + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Field $field */ public function visitField(Generator $generator, ContentType $contentType, Field $field) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/VersionInfo.php b/src/lib/Server/Output/ValueObjectVisitor/VersionInfo.php index ef59ca0e..a0b01332 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/VersionInfo.php +++ b/src/lib/Server/Output/ValueObjectVisitor/VersionInfo.php @@ -10,8 +10,8 @@ use Ibexa\Contracts\Rest\Output\Generator; use Ibexa\Contracts\Rest\Output\Visitor; use Ibexa\Rest\Server\Values\VersionTranslationInfo as VersionTranslationInfoValue; -use eZ\Publish\API\Repository\Values; -use eZ\Publish\API\Repository\Values\Content\VersionInfo as VersionInfoValue; +use Ibexa\Core\Repository\Values; +use Ibexa\Contracts\Core\Repository\Values\Content\VersionInfo as VersionInfoValue; use RuntimeException; /** @@ -22,9 +22,9 @@ class VersionInfo extends ValueObjectVisitor /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \eZ\Publish\API\Repository\Values\Content\VersionInfo $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Contracts\Core\Repository\Values\Content\VersionInfo $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/VersionList.php b/src/lib/Server/Output/ValueObjectVisitor/VersionList.php index 2889748c..2623fcc0 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/VersionList.php +++ b/src/lib/Server/Output/ValueObjectVisitor/VersionList.php @@ -18,9 +18,9 @@ class VersionList extends ValueObjectVisitor /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Server\Values\VersionList $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Server\Values\VersionList $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Output/ValueObjectVisitor/VersionTranslationInfo.php b/src/lib/Server/Output/ValueObjectVisitor/VersionTranslationInfo.php index 8bed3e4d..f3271d02 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/VersionTranslationInfo.php +++ b/src/lib/Server/Output/ValueObjectVisitor/VersionTranslationInfo.php @@ -19,9 +19,9 @@ class VersionTranslationInfo extends ValueObjectVisitor /** * Visit struct returned by controllers. * - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor - * @param \EzSystems\EzPlatformRest\Output\Generator $generator - * @param \EzSystems\EzPlatformRest\Server\Values\VersionTranslationInfo $data + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Generator $generator + * @param \Ibexa\Rest\Server\Values\VersionTranslationInfo $data */ public function visit(Visitor $visitor, Generator $generator, $data) { diff --git a/src/lib/Server/Security/CsrfTokenManager.php b/src/lib/Server/Security/CsrfTokenManager.php index 5bcc0d25..a1b07dc9 100644 --- a/src/lib/Server/Security/CsrfTokenManager.php +++ b/src/lib/Server/Security/CsrfTokenManager.php @@ -50,7 +50,7 @@ public function hasToken($tokenId) /** * Resolves token namespace. * - * @param RequestStack $requestStack + * @param \Symfony\Component\HttpFoundation\RequestStack $requestStack * * @return string */ diff --git a/src/lib/Server/Security/EventListener/SecurityListener.php b/src/lib/Server/Security/EventListener/SecurityListener.php index 49b83479..d51359d3 100644 --- a/src/lib/Server/Security/EventListener/SecurityListener.php +++ b/src/lib/Server/Security/EventListener/SecurityListener.php @@ -8,8 +8,8 @@ namespace Ibexa\Rest\Server\Security\EventListener; -use eZ\Publish\API\Repository\PermissionResolver; -use eZ\Publish\Core\MVC\Symfony\Security\UserInterface as EzPlatformUser; +use Ibexa\Contracts\Core\Repository\PermissionResolver; +use Ibexa\Core\MVC\Symfony\Security\UserInterface as EzPlatformUser; use Lexik\Bundle\JWTAuthenticationBundle\Security\Authentication\Token\JWTUserToken; use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\Security\Http\Event\InteractiveLoginEvent as BaseInteractiveLoginEvent; @@ -21,7 +21,7 @@ */ final class SecurityListener implements EventSubscriberInterface { - /** @var \eZ\Publish\API\Repository\PermissionResolver */ + /** @var \Ibexa\Contracts\Core\Repository\PermissionResolver */ private $permissionResolver; public function __construct( diff --git a/src/lib/Server/Security/RestAuthenticator.php b/src/lib/Server/Security/RestAuthenticator.php index 8d49f699..0025888d 100644 --- a/src/lib/Server/Security/RestAuthenticator.php +++ b/src/lib/Server/Security/RestAuthenticator.php @@ -6,9 +6,9 @@ */ namespace Ibexa\Rest\Server\Security; -use eZ\Publish\Core\MVC\ConfigResolverInterface; -use eZ\Publish\Core\MVC\Symfony\Security\Authentication\AuthenticatorInterface; -use eZ\Publish\Core\MVC\Symfony\Security\UserInterface as EzUser; +use Ibexa\Core\MVC\ConfigResolverInterface; +use Ibexa\Core\MVC\Symfony\Security\Authentication\AuthenticatorInterface; +use Ibexa\Core\MVC\Symfony\Security\UserInterface as EzUser; use Ibexa\Rest\Server\Exceptions\InvalidUserTypeException; use Ibexa\Rest\Server\Exceptions\UserConflictException; use Psr\Log\LoggerInterface; @@ -63,7 +63,7 @@ class RestAuthenticator implements AuthenticatorInterface private $dispatcher; /** - * @var \eZ\Publish\Core\MVC\ConfigResolverInterface + * @var \Ibexa\Core\MVC\ConfigResolverInterface */ private $configResolver; @@ -183,8 +183,8 @@ private function attemptAuthentication(Request $request) /** * Checks if newly matched user is conflicting with previously non-anonymous logged in user, if any. * - * @param EzUser $user - * @param TokenInterface $previousToken + * @param \Ibexa\Core\MVC\Symfony\Security\UserInterface $user + * @param \Symfony\Component\Security\Core\Authentication\Token\TokenInterface $previousToken * * @return bool */ diff --git a/src/lib/Server/Security/RestLogoutHandler.php b/src/lib/Server/Security/RestLogoutHandler.php index 7fe4582b..4746a33a 100644 --- a/src/lib/Server/Security/RestLogoutHandler.php +++ b/src/lib/Server/Security/RestLogoutHandler.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Rest\Server\Security; -use eZ\Publish\Core\MVC\ConfigResolverInterface; +use Ibexa\Core\MVC\ConfigResolverInterface; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; @@ -19,12 +19,12 @@ class RestLogoutHandler implements LogoutHandlerInterface { /** - * @var \eZ\Publish\Core\MVC\ConfigResolverInterface + * @var \Ibexa\Core\MVC\ConfigResolverInterface */ private $configResolver; /** - * @param \eZ\Publish\Core\MVC\ConfigResolverInterface $configResolver + * @param \Ibexa\Core\MVC\ConfigResolverInterface $configResolver */ public function __construct(ConfigResolverInterface $configResolver) { diff --git a/src/lib/Server/Service/ExpressionRouterRootResourceBuilder.php b/src/lib/Server/Service/ExpressionRouterRootResourceBuilder.php index 5820863b..765becf2 100644 --- a/src/lib/Server/Service/ExpressionRouterRootResourceBuilder.php +++ b/src/lib/Server/Service/ExpressionRouterRootResourceBuilder.php @@ -8,7 +8,7 @@ namespace Ibexa\Rest\Server\Service; -use eZ\Publish\Core\MVC\ConfigResolverInterface; +use Ibexa\Core\MVC\ConfigResolverInterface; use Ibexa\Rest\Values; use Ibexa\Rest\Values\Root; use Symfony\Component\ExpressionLanguage\ExpressionLanguage; @@ -41,7 +41,7 @@ class ExpressionRouterRootResourceBuilder implements RootResourceBuilderInterfac /** @var \Symfony\Component\Routing\RouterInterface */ protected $templateRouter; - /** @var \eZ\Publish\Core\MVC\ConfigResolverInterface */ + /** @var \Ibexa\Core\MVC\ConfigResolverInterface */ protected $configResolver; public function __construct(RouterInterface $router, RouterInterface $templateRouter, ConfigResolverInterface $configResolver) @@ -54,7 +54,7 @@ public function __construct(RouterInterface $router, RouterInterface $templateRo /** * Build root resource. * - * @return array|\EzSystems\EzPlatformRest\Values\Root + * @return array|\Ibexa\Rest\Values\Root */ public function buildRootResource(): Root { diff --git a/src/lib/Server/Service/RootResourceBuilderInterface.php b/src/lib/Server/Service/RootResourceBuilderInterface.php index fba95b40..573c47c7 100644 --- a/src/lib/Server/Service/RootResourceBuilderInterface.php +++ b/src/lib/Server/Service/RootResourceBuilderInterface.php @@ -11,7 +11,7 @@ interface RootResourceBuilderInterface /** * Build root resource. * - * @return array|\EzSystems\EzPlatformRest\Values\Root + * @return array|\Ibexa\Rest\Values\Root */ public function buildRootResource(); } diff --git a/src/lib/Server/Values/BookmarkList.php b/src/lib/Server/Values/BookmarkList.php index 87b87277..c6db8d36 100644 --- a/src/lib/Server/Values/BookmarkList.php +++ b/src/lib/Server/Values/BookmarkList.php @@ -18,7 +18,7 @@ class BookmarkList extends RestValue public $totalCount = 0; /** - * @var \EzSystems\EzPlatformRest\Server\Values\RestLocation[] + * @var \Ibexa\Rest\Server\Values\RestLocation[] */ public $items = []; @@ -26,7 +26,7 @@ class BookmarkList extends RestValue * BookmarkList constructor. * * @param int $totalCount - * @param \EzSystems\EzPlatformRest\Server\Values\RestLocation[] $items + * @param \Ibexa\Rest\Server\Values\RestLocation[] $items */ public function __construct(int $totalCount, array $items) { diff --git a/src/lib/Server/Values/CachedValue.php b/src/lib/Server/Values/CachedValue.php index ec54f744..5c074f11 100644 --- a/src/lib/Server/Values/CachedValue.php +++ b/src/lib/Server/Values/CachedValue.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Rest\Server\Values; -use eZ\Publish\Core\Base\Exceptions\InvalidArgumentException; +use Ibexa\Core\Base\Exceptions\InvalidArgumentException; use Ibexa\Rest\Value as RestValue; class CachedValue extends RestValue diff --git a/src/lib/Server/Values/ContentList.php b/src/lib/Server/Values/ContentList.php index 433aa77c..d0470e3e 100644 --- a/src/lib/Server/Values/ContentList.php +++ b/src/lib/Server/Values/ContentList.php @@ -16,7 +16,7 @@ class ContentList extends RestValue /** * Contents. * - * @var \EzSystems\EzPlatformRest\Server\Values\RestContent[] + * @var \Ibexa\Rest\Server\Values\RestContent[] */ public $contents; @@ -30,7 +30,7 @@ class ContentList extends RestValue /** * Construct. * - * @param \EzSystems\EzPlatformRest\Server\Values\RestContent[] $contents + * @param \Ibexa\Rest\Server\Values\RestContent[] $contents * @param int $totalCount */ public function __construct(array $contents, int $totalCount) diff --git a/src/lib/Server/Values/ContentTypeGroupList.php b/src/lib/Server/Values/ContentTypeGroupList.php index f5b4ca86..ccc07eea 100644 --- a/src/lib/Server/Values/ContentTypeGroupList.php +++ b/src/lib/Server/Values/ContentTypeGroupList.php @@ -16,14 +16,14 @@ class ContentTypeGroupList extends RestValue /** * Content type groups. * - * @var \eZ\Publish\API\Repository\Values\ContentType\ContentTypeGroup[] + * @var \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentTypeGroup[] */ public $contentTypeGroups; /** * Construct. * - * @param \eZ\Publish\API\Repository\Values\ContentType\ContentTypeGroup[] $contentTypeGroups + * @param \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentTypeGroup[] $contentTypeGroups */ public function __construct(array $contentTypeGroups) { diff --git a/src/lib/Server/Values/ContentTypeGroupRefList.php b/src/lib/Server/Values/ContentTypeGroupRefList.php index 31b78d50..1e398be0 100644 --- a/src/lib/Server/Values/ContentTypeGroupRefList.php +++ b/src/lib/Server/Values/ContentTypeGroupRefList.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Rest\Server\Values; -use eZ\Publish\API\Repository\Values\ContentType\ContentType; +use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType; use Ibexa\Rest\Value as RestValue; /** @@ -17,22 +17,22 @@ class ContentTypeGroupRefList extends RestValue /** * Content type. * - * @var \eZ\Publish\API\Repository\Values\ContentType\ContentType + * @var \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType */ public $contentType; /** * Content type groups of the content type. * - * @var \eZ\Publish\API\Repository\Values\ContentType\ContentTypeGroup[] + * @var \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentTypeGroup[] */ public $contentTypeGroups; /** * Construct. * - * @param \eZ\Publish\API\Repository\Values\ContentType\ContentType $contentType - * @param \eZ\Publish\API\Repository\Values\ContentType\ContentTypeGroup[] $contentTypeGroups + * @param \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType $contentType + * @param \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentTypeGroup[] $contentTypeGroups */ public function __construct(ContentType $contentType, array $contentTypeGroups) { diff --git a/src/lib/Server/Values/ContentTypeInfoList.php b/src/lib/Server/Values/ContentTypeInfoList.php index e4fa2ca0..25f8f21d 100644 --- a/src/lib/Server/Values/ContentTypeInfoList.php +++ b/src/lib/Server/Values/ContentTypeInfoList.php @@ -16,7 +16,7 @@ class ContentTypeInfoList extends RestValue /** * Content types. * - * @var \eZ\Publish\API\Repository\Values\ContentType\ContentType[] + * @var \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType[] */ public $contentTypes; @@ -30,7 +30,7 @@ class ContentTypeInfoList extends RestValue /** * Construct. * - * @param \eZ\Publish\API\Repository\Values\ContentType\ContentType[] $contentTypes + * @param \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType[] $contentTypes * @param string $path */ public function __construct(array $contentTypes, $path) diff --git a/src/lib/Server/Values/ContentTypeList.php b/src/lib/Server/Values/ContentTypeList.php index d99f83e8..571ad721 100644 --- a/src/lib/Server/Values/ContentTypeList.php +++ b/src/lib/Server/Values/ContentTypeList.php @@ -16,7 +16,7 @@ class ContentTypeList extends RestValue /** * Content types. * - * @var \eZ\Publish\API\Repository\Values\ContentType\ContentType[] + * @var \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType[] */ public $contentTypes; @@ -30,7 +30,7 @@ class ContentTypeList extends RestValue /** * Construct. * - * @param \eZ\Publish\API\Repository\Values\ContentType\ContentType[] $contentTypes + * @param \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType[] $contentTypes * @param string $path */ public function __construct(array $contentTypes, $path) diff --git a/src/lib/Server/Values/CountryList.php b/src/lib/Server/Values/CountryList.php index 8e0f5cee..49b0b8a2 100644 --- a/src/lib/Server/Values/CountryList.php +++ b/src/lib/Server/Values/CountryList.php @@ -14,7 +14,7 @@ class CountryList extends RestValue { /** - * @var \eZ\Publish\API\Repository\Values\ContentType\Countries[] + * @var \Ibexa\Core\Repository\Values\ContentType\Countries[] */ public $countries; diff --git a/src/lib/Server/Values/CreatedContent.php b/src/lib/Server/Values/CreatedContent.php index 8cd2e1ca..5191be31 100644 --- a/src/lib/Server/Values/CreatedContent.php +++ b/src/lib/Server/Values/CreatedContent.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Rest\Server\Values; -use eZ\Publish\API\Repository\Values\ValueObject; +use Ibexa\Contracts\Core\Repository\Values\ValueObject; /** * Struct representing a freshly created Content. @@ -16,7 +16,7 @@ class CreatedContent extends ValueObject /** * The created content. * - * @var \EzSystems\EzPlatformRest\Server\Values\RestContent + * @var \Ibexa\Rest\Server\Values\RestContent */ public $content; } diff --git a/src/lib/Server/Values/CreatedContentType.php b/src/lib/Server/Values/CreatedContentType.php index e66d9fde..31805084 100644 --- a/src/lib/Server/Values/CreatedContentType.php +++ b/src/lib/Server/Values/CreatedContentType.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Rest\Server\Values; -use eZ\Publish\API\Repository\Values\ValueObject; +use Ibexa\Contracts\Core\Repository\Values\ValueObject; /** * Struct representing a freshly created ContentType. @@ -16,7 +16,7 @@ class CreatedContentType extends ValueObject /** * The created content type. * - * @var \EzSystems\EzPlatformRest\Server\Values\RestContentType + * @var \Ibexa\Rest\Server\Values\RestContentType */ public $contentType; } diff --git a/src/lib/Server/Values/CreatedContentTypeGroup.php b/src/lib/Server/Values/CreatedContentTypeGroup.php index eca34337..16dd1b5e 100644 --- a/src/lib/Server/Values/CreatedContentTypeGroup.php +++ b/src/lib/Server/Values/CreatedContentTypeGroup.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Rest\Server\Values; -use eZ\Publish\API\Repository\Values\ValueObject; +use Ibexa\Contracts\Core\Repository\Values\ValueObject; /** * Struct representing a freshly created ContentTypeGroup. @@ -16,7 +16,7 @@ class CreatedContentTypeGroup extends ValueObject /** * The created content type group. * - * @var \eZ\Publish\API\Repository\Values\ContentType\ContentTypeGroup + * @var \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentTypeGroup */ public $contentTypeGroup; } diff --git a/src/lib/Server/Values/CreatedFieldDefinition.php b/src/lib/Server/Values/CreatedFieldDefinition.php index 74b4bf59..dd99f604 100644 --- a/src/lib/Server/Values/CreatedFieldDefinition.php +++ b/src/lib/Server/Values/CreatedFieldDefinition.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Rest\Server\Values; -use eZ\Publish\API\Repository\Values\ValueObject; +use Ibexa\Contracts\Core\Repository\Values\ValueObject; /** * Struct representing a freshly created field definition. @@ -16,7 +16,7 @@ class CreatedFieldDefinition extends ValueObject /** * The created field definition. * - * @var \EzSystems\EzPlatformRest\Server\Values\RestFieldDefinition + * @var \Ibexa\Rest\Server\Values\RestFieldDefinition */ public $fieldDefinition; } diff --git a/src/lib/Server/Values/CreatedLocation.php b/src/lib/Server/Values/CreatedLocation.php index 126cacc1..6a656fe8 100644 --- a/src/lib/Server/Values/CreatedLocation.php +++ b/src/lib/Server/Values/CreatedLocation.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Rest\Server\Values; -use eZ\Publish\API\Repository\Values\ValueObject; +use Ibexa\Contracts\Core\Repository\Values\ValueObject; /** * Struct representing a freshly created location. @@ -16,7 +16,7 @@ class CreatedLocation extends ValueObject /** * The created location. * - * @var \EzSystems\EzPlatformRest\Server\Values\RestLocation + * @var \Ibexa\Rest\Server\Values\RestLocation */ public $restLocation; } diff --git a/src/lib/Server/Values/CreatedObjectState.php b/src/lib/Server/Values/CreatedObjectState.php index ad400831..4f51ed39 100644 --- a/src/lib/Server/Values/CreatedObjectState.php +++ b/src/lib/Server/Values/CreatedObjectState.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Rest\Server\Values; -use eZ\Publish\API\Repository\Values\ValueObject; +use Ibexa\Contracts\Core\Repository\Values\ValueObject; /** * Struct representing a freshly created object state. @@ -16,7 +16,7 @@ class CreatedObjectState extends ValueObject /** * The created object state. * - * @var \EzSystems\EzPlatformRest\Values\RestObjectState + * @var \Ibexa\Rest\Values\RestObjectState */ public $objectState; } diff --git a/src/lib/Server/Values/CreatedObjectStateGroup.php b/src/lib/Server/Values/CreatedObjectStateGroup.php index 77434242..472779e2 100644 --- a/src/lib/Server/Values/CreatedObjectStateGroup.php +++ b/src/lib/Server/Values/CreatedObjectStateGroup.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Rest\Server\Values; -use eZ\Publish\API\Repository\Values\ValueObject; +use Ibexa\Contracts\Core\Repository\Values\ValueObject; /** * Struct representing a freshly created object state group. @@ -16,7 +16,7 @@ class CreatedObjectStateGroup extends ValueObject /** * The created object state group. * - * @var \eZ\Publish\API\Repository\Values\ObjectState\ObjectStateGroup + * @var \Ibexa\Contracts\Core\Repository\Values\ObjectState\ObjectStateGroup */ public $objectStateGroup; } diff --git a/src/lib/Server/Values/CreatedPolicy.php b/src/lib/Server/Values/CreatedPolicy.php index 4ce15efa..7cb4c2e4 100644 --- a/src/lib/Server/Values/CreatedPolicy.php +++ b/src/lib/Server/Values/CreatedPolicy.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Rest\Server\Values; -use eZ\Publish\API\Repository\Values\ValueObject; +use Ibexa\Contracts\Core\Repository\Values\ValueObject; /** * Struct representing a freshly created policy. @@ -16,7 +16,7 @@ class CreatedPolicy extends ValueObject /** * The created policy. * - * @var \eZ\Publish\API\Repository\Values\User\Policy + * @var \Ibexa\Contracts\Core\Repository\Values\User\Policy */ public $policy; } diff --git a/src/lib/Server/Values/CreatedRelation.php b/src/lib/Server/Values/CreatedRelation.php index 4449a846..2bc8335f 100644 --- a/src/lib/Server/Values/CreatedRelation.php +++ b/src/lib/Server/Values/CreatedRelation.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Rest\Server\Values; -use eZ\Publish\API\Repository\Values\ValueObject; +use Ibexa\Contracts\Core\Repository\Values\ValueObject; /** * Struct representing a freshly created relation. @@ -16,7 +16,7 @@ class CreatedRelation extends ValueObject /** * The created relation. * - * @var \EzSystems\EzPlatformRest\Server\Values\RestRelation + * @var \Ibexa\Rest\Server\Values\RestRelation */ public $relation; } diff --git a/src/lib/Server/Values/CreatedRole.php b/src/lib/Server/Values/CreatedRole.php index 9e4573aa..6ff84bfc 100644 --- a/src/lib/Server/Values/CreatedRole.php +++ b/src/lib/Server/Values/CreatedRole.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Rest\Server\Values; -use eZ\Publish\API\Repository\Values\ValueObject; +use Ibexa\Contracts\Core\Repository\Values\ValueObject; /** * Struct representing a freshly created Role. @@ -16,7 +16,7 @@ class CreatedRole extends ValueObject /** * The created role. * - * @var \EzSystems\EzPlatformRest\Server\Values\RestRole + * @var \Ibexa\Rest\Server\Values\RestRole */ public $role; } diff --git a/src/lib/Server/Values/CreatedSection.php b/src/lib/Server/Values/CreatedSection.php index 722f1afe..f8e0c968 100644 --- a/src/lib/Server/Values/CreatedSection.php +++ b/src/lib/Server/Values/CreatedSection.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Rest\Server\Values; -use eZ\Publish\API\Repository\Values\ValueObject; +use Ibexa\Contracts\Core\Repository\Values\ValueObject; /** * Struct representing a freshly created section. @@ -16,7 +16,7 @@ class CreatedSection extends ValueObject /** * The created section. * - * @var \eZ\Publish\API\Repository\Values\Content\Section + * @var \Ibexa\Contracts\Core\Repository\Values\Content\Section */ public $section; } diff --git a/src/lib/Server/Values/CreatedURLAlias.php b/src/lib/Server/Values/CreatedURLAlias.php index 7ca398ee..1d986b9e 100644 --- a/src/lib/Server/Values/CreatedURLAlias.php +++ b/src/lib/Server/Values/CreatedURLAlias.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Rest\Server\Values; -use eZ\Publish\API\Repository\Values\ValueObject; +use Ibexa\Contracts\Core\Repository\Values\ValueObject; /** * Struct representing a freshly created URLAlias. @@ -16,7 +16,7 @@ class CreatedURLAlias extends ValueObject /** * The created URL alias. * - * @var \eZ\Publish\API\Repository\Values\Content\URLAlias + * @var \Ibexa\Contracts\Core\Repository\Values\Content\URLAlias */ public $urlAlias; } diff --git a/src/lib/Server/Values/CreatedURLWildcard.php b/src/lib/Server/Values/CreatedURLWildcard.php index cff3206e..4dbff580 100644 --- a/src/lib/Server/Values/CreatedURLWildcard.php +++ b/src/lib/Server/Values/CreatedURLWildcard.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Rest\Server\Values; -use eZ\Publish\API\Repository\Values\ValueObject; +use Ibexa\Contracts\Core\Repository\Values\ValueObject; /** * Struct representing a freshly created URLWildcard. @@ -16,7 +16,7 @@ class CreatedURLWildcard extends ValueObject /** * The created URL wildcard. * - * @var \eZ\Publish\API\Repository\Values\Content\URLWildcard + * @var \Ibexa\Contracts\Core\Repository\Values\Content\URLWildcard */ public $urlWildcard; } diff --git a/src/lib/Server/Values/CreatedUser.php b/src/lib/Server/Values/CreatedUser.php index 0532be67..e2af6873 100644 --- a/src/lib/Server/Values/CreatedUser.php +++ b/src/lib/Server/Values/CreatedUser.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Rest\Server\Values; -use eZ\Publish\API\Repository\Values\ValueObject; +use Ibexa\Contracts\Core\Repository\Values\ValueObject; /** * Struct representing a freshly created User. @@ -16,7 +16,7 @@ class CreatedUser extends ValueObject /** * The created user. * - * @var \EzSystems\EzPlatformRest\Server\Values\RestUser + * @var \Ibexa\Rest\Server\Values\RestUser */ public $user; } diff --git a/src/lib/Server/Values/CreatedUserGroup.php b/src/lib/Server/Values/CreatedUserGroup.php index 1e4111ee..15919350 100644 --- a/src/lib/Server/Values/CreatedUserGroup.php +++ b/src/lib/Server/Values/CreatedUserGroup.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Rest\Server\Values; -use eZ\Publish\API\Repository\Values\ValueObject; +use Ibexa\Contracts\Core\Repository\Values\ValueObject; /** * Struct representing a freshly created UserGroup. @@ -16,7 +16,7 @@ class CreatedUserGroup extends ValueObject /** * The created user group. * - * @var \EzSystems\EzPlatformRest\Server\Values\RestUserGroup + * @var \Ibexa\Rest\Server\Values\RestUserGroup */ public $userGroup; } diff --git a/src/lib/Server/Values/CreatedVersion.php b/src/lib/Server/Values/CreatedVersion.php index 89a335fe..253a1ead 100644 --- a/src/lib/Server/Values/CreatedVersion.php +++ b/src/lib/Server/Values/CreatedVersion.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Rest\Server\Values; -use eZ\Publish\API\Repository\Values\ValueObject; +use Ibexa\Contracts\Core\Repository\Values\ValueObject; /** * Struct representing a freshly created version. @@ -16,7 +16,7 @@ class CreatedVersion extends ValueObject /** * The created version. * - * @var \EzSystems\EzPlatformRest\Server\Values\Version + * @var \Ibexa\Rest\Server\Values\Version */ public $version; } diff --git a/src/lib/Server/Values/DeletedUserSession.php b/src/lib/Server/Values/DeletedUserSession.php index 3aa67cb0..3b69205f 100644 --- a/src/lib/Server/Values/DeletedUserSession.php +++ b/src/lib/Server/Values/DeletedUserSession.php @@ -14,7 +14,7 @@ class DeletedUserSession extends RestValue /** * Response generated by RestAuthenticator. * - * @see eZ\Publish\Core\MVC\Symfony\Security\Authentication\AuthenticatorInterface::logout() + * @see \Ibexa\Core\MVC\Symfony\Security\Authentication\AuthenticatorInterface::logout() * * @var \Symfony\Component\HttpFoundation\Response */ diff --git a/src/lib/Server/Values/FieldDefinitionList.php b/src/lib/Server/Values/FieldDefinitionList.php index e86b98ca..244db9e7 100644 --- a/src/lib/Server/Values/FieldDefinitionList.php +++ b/src/lib/Server/Values/FieldDefinitionList.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Rest\Server\Values; -use eZ\Publish\API\Repository\Values\ContentType\ContentType; +use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType; use Ibexa\Rest\Value as RestValue; /** @@ -17,22 +17,22 @@ class FieldDefinitionList extends RestValue /** * ContentType the field definitions belong to. * - * @var \eZ\Publish\API\Repository\Values\ContentType\ContentType + * @var \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType */ public $contentType; /** * Field definitions. * - * @var \eZ\Publish\API\Repository\Values\ContentType\FieldDefinition[] + * @var \Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinition[] */ public $fieldDefinitions; /** * Construct. * - * @param \eZ\Publish\API\Repository\Values\ContentType\ContentType $contentType - * @param \eZ\Publish\API\Repository\Values\ContentType\FieldDefinition[] $fieldDefinitions + * @param \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType $contentType + * @param \Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinition[] $fieldDefinitions */ public function __construct(ContentType $contentType, array $fieldDefinitions) { diff --git a/src/lib/Server/Values/LocationList.php b/src/lib/Server/Values/LocationList.php index 768471c1..4ce6553b 100644 --- a/src/lib/Server/Values/LocationList.php +++ b/src/lib/Server/Values/LocationList.php @@ -16,7 +16,7 @@ class LocationList extends RestValue /** * Locations. * - * @var \EzSystems\EzPlatformRest\Server\Values\RestLocation[] + * @var \Ibexa\Rest\Server\Values\RestLocation[] */ public $locations; @@ -30,7 +30,7 @@ class LocationList extends RestValue /** * Construct. * - * @param \EzSystems\EzPlatformRest\Server\Values\RestLocation[] $locations + * @param \Ibexa\Rest\Server\Values\RestLocation[] $locations * @param string $path */ public function __construct(array $locations, $path) diff --git a/src/lib/Server/Values/ObjectStateGroupList.php b/src/lib/Server/Values/ObjectStateGroupList.php index 605a480f..a162ab82 100644 --- a/src/lib/Server/Values/ObjectStateGroupList.php +++ b/src/lib/Server/Values/ObjectStateGroupList.php @@ -16,14 +16,14 @@ class ObjectStateGroupList extends RestValue /** * Object state groups. * - * @var \eZ\Publish\API\Repository\Values\ObjectState\ObjectStateGroup[] + * @var \Ibexa\Contracts\Core\Repository\Values\ObjectState\ObjectStateGroup[] */ public $groups; /** * Construct. * - * @param \eZ\Publish\API\Repository\Values\ObjectState\ObjectStateGroup[] $groups + * @param \Ibexa\Contracts\Core\Repository\Values\ObjectState\ObjectStateGroup[] $groups */ public function __construct(array $groups) { diff --git a/src/lib/Server/Values/ObjectStateList.php b/src/lib/Server/Values/ObjectStateList.php index 4e3672cc..51f14fb2 100644 --- a/src/lib/Server/Values/ObjectStateList.php +++ b/src/lib/Server/Values/ObjectStateList.php @@ -16,7 +16,7 @@ class ObjectStateList extends RestValue /** * Object states. * - * @var \eZ\Publish\API\Repository\Values\ObjectState\ObjectState[] + * @var \Ibexa\Contracts\Core\Repository\Values\ObjectState\ObjectState[] */ public $states; @@ -30,7 +30,7 @@ class ObjectStateList extends RestValue /** * Construct. * - * @param \eZ\Publish\API\Repository\Values\ObjectState\ObjectState[] $states + * @param \Ibexa\Contracts\Core\Repository\Values\ObjectState\ObjectState[] $states * @param mixed $groupId */ public function __construct(array $states, $groupId) diff --git a/src/lib/Server/Values/Options.php b/src/lib/Server/Values/Options.php index 2983af5c..79a60714 100644 --- a/src/lib/Server/Values/Options.php +++ b/src/lib/Server/Values/Options.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Rest\Server\Values; -use eZ\Publish\API\Repository\Values\ValueObject; +use Ibexa\Contracts\Core\Repository\Values\ValueObject; /** * Struct representing a resource OPTIONS response. diff --git a/src/lib/Server/Values/PolicyList.php b/src/lib/Server/Values/PolicyList.php index 7cecc43c..954d3472 100644 --- a/src/lib/Server/Values/PolicyList.php +++ b/src/lib/Server/Values/PolicyList.php @@ -16,7 +16,7 @@ class PolicyList extends RestValue /** * Policies. * - * @var \eZ\Publish\API\Repository\Values\User\Policy[] + * @var \Ibexa\Contracts\Core\Repository\Values\User\Policy[] */ public $policies; @@ -30,7 +30,7 @@ class PolicyList extends RestValue /** * Construct. * - * @param \eZ\Publish\API\Repository\Values\User\Policy[] $policies + * @param \Ibexa\Contracts\Core\Repository\Values\User\Policy[] $policies * @param string $path */ public function __construct(array $policies, $path) diff --git a/src/lib/Server/Values/PublishedRole.php b/src/lib/Server/Values/PublishedRole.php index d928f481..9d22c810 100644 --- a/src/lib/Server/Values/PublishedRole.php +++ b/src/lib/Server/Values/PublishedRole.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Rest\Server\Values; -use eZ\Publish\API\Repository\Values\ValueObject; +use Ibexa\Contracts\Core\Repository\Values\ValueObject; /** * Struct representing a published Role. @@ -16,7 +16,7 @@ class PublishedRole extends ValueObject /** * The published role. * - * @var \EzSystems\EzPlatformRest\Server\Values\RestRole + * @var \Ibexa\Rest\Server\Values\RestRole */ public $role; } diff --git a/src/lib/Server/Values/RelationList.php b/src/lib/Server/Values/RelationList.php index 14cbfbcb..3a792ca0 100644 --- a/src/lib/Server/Values/RelationList.php +++ b/src/lib/Server/Values/RelationList.php @@ -16,7 +16,7 @@ class RelationList extends RestValue /** * Relations. * - * @var \eZ\Publish\API\Repository\Values\Content\Relation[] + * @var \Ibexa\Contracts\Core\Repository\Values\Content\Relation[] */ public $relations; @@ -44,7 +44,7 @@ class RelationList extends RestValue /** * Construct. * - * @param \eZ\Publish\API\Repository\Values\Content\Relation[] $relations + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Relation[] $relations * @param mixed $contentId * @param mixed $versionNo * @param string $path diff --git a/src/lib/Server/Values/RestContent.php b/src/lib/Server/Values/RestContent.php index d416f8a5..8cbd5001 100644 --- a/src/lib/Server/Values/RestContent.php +++ b/src/lib/Server/Values/RestContent.php @@ -6,10 +6,10 @@ */ namespace Ibexa\Rest\Server\Values; -use eZ\Publish\API\Repository\Values\Content\ContentInfo; -use eZ\Publish\API\Repository\Values\Content\Content; -use eZ\Publish\API\Repository\Values\ContentType\ContentType; -use eZ\Publish\API\Repository\Values\Content\Location; +use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo; +use Ibexa\Contracts\Core\Repository\Values\Content\Content; +use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType; +use Ibexa\Contracts\Core\Repository\Values\Content\Location; use Ibexa\Rest\Value as RestValue; /** @@ -20,27 +20,27 @@ class RestContent extends RestValue { /** - * @var \eZ\Publish\API\Repository\Values\Content\ContentInfo + * @var \Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo */ public $contentInfo; /** - * @var \eZ\Publish\API\Repository\Values\Content\Location + * @var \Ibexa\Contracts\Core\Repository\Values\Content\Location */ public $mainLocation; /** - * @var \eZ\Publish\API\Repository\Values\Content\Content + * @var \Ibexa\Contracts\Core\Repository\Values\Content\Content */ public $currentVersion; /** - * @var \eZ\Publish\API\Repository\Values\ContentType\ContentType + * @var \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType */ public $contentType; /** - * @var \eZ\Publish\API\Repository\Values\Content\Relation[] + * @var \Ibexa\Contracts\Core\Repository\Values\Content\Relation[] */ public $relations; @@ -54,11 +54,11 @@ class RestContent extends RestValue /** * Construct. * - * @param \eZ\Publish\API\Repository\Values\Content\ContentInfo $contentInfo - * @param \eZ\Publish\API\Repository\Values\Content\Location|null $mainLocation - * @param \eZ\Publish\API\Repository\Values\Content\Content|null $currentVersion - * @param \eZ\Publish\API\Repository\Values\ContentType\ContentType|null $contentType Can only be null if $currentVersion is - * @param \eZ\Publish\API\Repository\Values\Content\Relation[]|null $relations Can only be null if $currentVersion is + * @param \Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo $contentInfo + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Location|null $mainLocation + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Content|null $currentVersion + * @param \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType|null $contentType Can only be null if $currentVersion is + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Relation[]|null $relations Can only be null if $currentVersion is * @param string $path */ public function __construct( diff --git a/src/lib/Server/Values/RestContentCreateStruct.php b/src/lib/Server/Values/RestContentCreateStruct.php index a1699aac..d4ab1c59 100644 --- a/src/lib/Server/Values/RestContentCreateStruct.php +++ b/src/lib/Server/Values/RestContentCreateStruct.php @@ -6,9 +6,9 @@ */ namespace Ibexa\Rest\Server\Values; -use eZ\Publish\API\Repository\Values\Content\ContentCreateStruct; -use eZ\Publish\API\Repository\Values\Content\LocationCreateStruct; -use eZ\Publish\API\Repository\Values\ValueObject; +use Ibexa\Contracts\Core\Repository\Values\Content\ContentCreateStruct; +use Ibexa\Contracts\Core\Repository\Values\Content\LocationCreateStruct; +use Ibexa\Contracts\Core\Repository\Values\ValueObject; /** * RestContentCreateStruct view model. @@ -16,20 +16,20 @@ class RestContentCreateStruct extends ValueObject { /** - * @var \eZ\Publish\API\Repository\Values\Content\ContentCreateStruct + * @var \Ibexa\Contracts\Core\Repository\Values\Content\ContentCreateStruct */ public $contentCreateStruct; /** - * @var \eZ\Publish\API\Repository\Values\Content\LocationCreateStruct + * @var \Ibexa\Contracts\Core\Repository\Values\Content\LocationCreateStruct */ public $locationCreateStruct; /** * Construct. * - * @param \eZ\Publish\API\Repository\Values\Content\ContentCreateStruct $contentCreateStruct - * @param \eZ\Publish\API\Repository\Values\Content\LocationCreateStruct $locationCreateStruct + * @param \Ibexa\Contracts\Core\Repository\Values\Content\ContentCreateStruct $contentCreateStruct + * @param \Ibexa\Contracts\Core\Repository\Values\Content\LocationCreateStruct $locationCreateStruct */ public function __construct(ContentCreateStruct $contentCreateStruct, LocationCreateStruct $locationCreateStruct) { diff --git a/src/lib/Server/Values/RestContentType.php b/src/lib/Server/Values/RestContentType.php index 667721e6..37a7d0dc 100644 --- a/src/lib/Server/Values/RestContentType.php +++ b/src/lib/Server/Values/RestContentType.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Rest\Server\Values; -use eZ\Publish\API\Repository\Values\ContentType\ContentType; +use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType; use Ibexa\Rest\Value as RestValue; /** @@ -17,20 +17,20 @@ class RestContentType extends RestValue { /** - * @var \eZ\Publish\API\Repository\Values\ContentType\ContentType + * @var \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType */ public $contentType; /** - * @var \eZ\Publish\API\Repository\Values\ContentType\FieldDefinition[] + * @var \Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinition[] */ public $fieldDefinitions; /** * Construct. * - * @param \eZ\Publish\API\Repository\Values\ContentType\ContentType $contentType - * @param \eZ\Publish\API\Repository\Values\ContentType\FieldDefinition[] $fieldDefinitions + * @param \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType $contentType + * @param \Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinition[] $fieldDefinitions */ public function __construct(ContentType $contentType, array $fieldDefinitions = null) { diff --git a/src/lib/Server/Values/RestExecutedView.php b/src/lib/Server/Values/RestExecutedView.php index 941067bb..2f01a50a 100644 --- a/src/lib/Server/Values/RestExecutedView.php +++ b/src/lib/Server/Values/RestExecutedView.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Rest\Server\Values; -use eZ\Publish\API\Repository\Values\ValueObject; +use Ibexa\Contracts\Core\Repository\Values\ValueObject; /** * RestContentCreateStruct view model. @@ -16,7 +16,7 @@ class RestExecutedView extends ValueObject /** * The search results. * - * @var \eZ\Publish\API\Repository\Values\Content\Search\SearchResult + * @var \Ibexa\Contracts\Core\Repository\Values\Content\Search\SearchResult */ public $searchResults; diff --git a/src/lib/Server/Values/RestFieldDefinition.php b/src/lib/Server/Values/RestFieldDefinition.php index e2a67b97..fff421b5 100644 --- a/src/lib/Server/Values/RestFieldDefinition.php +++ b/src/lib/Server/Values/RestFieldDefinition.php @@ -6,8 +6,8 @@ */ namespace Ibexa\Rest\Server\Values; -use eZ\Publish\API\Repository\Values\ContentType\ContentType; -use eZ\Publish\API\Repository\Values\ContentType\FieldDefinition; +use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType; +use Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinition; use Ibexa\Rest\Value as RestValue; /** @@ -18,22 +18,22 @@ class RestFieldDefinition extends RestValue /** * ContentType the field definitions belong to. * - * @var \eZ\Publish\API\Repository\Values\ContentType\ContentType + * @var \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType */ public $contentType; /** * Field definition. * - * @var \eZ\Publish\API\Repository\Values\ContentType\FieldDefinition + * @var \Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinition */ public $fieldDefinition; /** * Construct. * - * @param \eZ\Publish\API\Repository\Values\ContentType\ContentType $contentType - * @param \eZ\Publish\API\Repository\Values\ContentType\FieldDefinition $fieldDefinition + * @param \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType $contentType + * @param \Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinition $fieldDefinition */ public function __construct(ContentType $contentType, FieldDefinition $fieldDefinition) { diff --git a/src/lib/Server/Values/RestLocation.php b/src/lib/Server/Values/RestLocation.php index 0dee7182..9480784f 100644 --- a/src/lib/Server/Values/RestLocation.php +++ b/src/lib/Server/Values/RestLocation.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Rest\Server\Values; -use eZ\Publish\API\Repository\Values\Content\Location; +use Ibexa\Contracts\Core\Repository\Values\Content\Location; use Ibexa\Rest\Value as RestValue; /** @@ -17,7 +17,7 @@ class RestLocation extends RestValue /** * A location. * - * @var \eZ\Publish\API\Repository\Values\Content\Location + * @var \Ibexa\Contracts\Core\Repository\Values\Content\Location */ public $location; @@ -29,7 +29,7 @@ class RestLocation extends RestValue public $childCount; /** - * @param \eZ\Publish\API\Repository\Values\Content\Location $location + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Location $location * @param int $childCount */ public function __construct(Location $location, $childCount) diff --git a/src/lib/Server/Values/RestLocationUpdateStruct.php b/src/lib/Server/Values/RestLocationUpdateStruct.php index de469620..cabd1029 100644 --- a/src/lib/Server/Values/RestLocationUpdateStruct.php +++ b/src/lib/Server/Values/RestLocationUpdateStruct.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Rest\Server\Values; -use eZ\Publish\API\Repository\Values\Content\LocationUpdateStruct; +use Ibexa\Contracts\Core\Repository\Values\Content\LocationUpdateStruct; use Ibexa\Rest\Value as RestValue; /** @@ -17,7 +17,7 @@ class RestLocationUpdateStruct extends RestValue /** * Location update struct. * - * @var \eZ\Publish\API\Repository\Values\Content\LocationUpdateStruct + * @var \Ibexa\Contracts\Core\Repository\Values\Content\LocationUpdateStruct */ public $locationUpdateStruct; @@ -31,7 +31,7 @@ class RestLocationUpdateStruct extends RestValue /** * Construct. * - * @param \eZ\Publish\API\Repository\Values\Content\LocationUpdateStruct $locationUpdateStruct + * @param \Ibexa\Contracts\Core\Repository\Values\Content\LocationUpdateStruct $locationUpdateStruct * @param bool $hidden */ public function __construct(LocationUpdateStruct $locationUpdateStruct, $hidden = null) diff --git a/src/lib/Server/Values/RestRelation.php b/src/lib/Server/Values/RestRelation.php index a28a1e4f..af5fa8f5 100644 --- a/src/lib/Server/Values/RestRelation.php +++ b/src/lib/Server/Values/RestRelation.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Rest\Server\Values; -use eZ\Publish\API\Repository\Values\Content\Relation; +use Ibexa\Contracts\Core\Repository\Values\Content\Relation; use Ibexa\Rest\Value as RestValue; /** @@ -17,7 +17,7 @@ class RestRelation extends RestValue /** * A relation. * - * @var \eZ\Publish\API\Repository\Values\Content\Relation + * @var \Ibexa\Contracts\Core\Repository\Values\Content\Relation */ public $relation; @@ -36,7 +36,7 @@ class RestRelation extends RestValue public $versionNo; /** - * @param \eZ\Publish\API\Repository\Values\Content\Relation $relation + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Relation $relation * @param mixed $contentId * @param mixed $versionNo */ diff --git a/src/lib/Server/Values/RestRole.php b/src/lib/Server/Values/RestRole.php index 469ee52e..f439b765 100644 --- a/src/lib/Server/Values/RestRole.php +++ b/src/lib/Server/Values/RestRole.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Rest\Server\Values; -use eZ\Publish\API\Repository\Values\User\Role; +use Ibexa\Contracts\Core\Repository\Values\User\Role; use Ibexa\Rest\Value as RestValue; /** @@ -17,14 +17,14 @@ class RestRole extends RestValue /** * Holds internal role object. * - * @var \eZ\Publish\API\Repository\Values\User\Role + * @var \Ibexa\Contracts\Core\Repository\Values\User\Role */ protected $innerRole; /** * Construct. * - * @param \eZ\Publish\API\Repository\Values\User\Role $role + * @param \Ibexa\Contracts\Core\Repository\Values\User\Role $role */ public function __construct(Role $role) { diff --git a/src/lib/Server/Values/RestTrashItem.php b/src/lib/Server/Values/RestTrashItem.php index c83ec679..6955d82c 100644 --- a/src/lib/Server/Values/RestTrashItem.php +++ b/src/lib/Server/Values/RestTrashItem.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Rest\Server\Values; -use eZ\Publish\API\Repository\Values\Content\TrashItem; +use Ibexa\Contracts\Core\Repository\Values\Content\TrashItem; use Ibexa\Rest\Value as RestValue; /** @@ -17,7 +17,7 @@ class RestTrashItem extends RestValue /** * A trash item. * - * @var \eZ\Publish\API\Repository\Values\Content\TrashItem + * @var \Ibexa\Contracts\Core\Repository\Values\Content\TrashItem */ public $trashItem; @@ -29,7 +29,7 @@ class RestTrashItem extends RestValue public $childCount; /** - * @param \eZ\Publish\API\Repository\Values\Content\TrashItem $trashItem + * @param \Ibexa\Contracts\Core\Repository\Values\Content\TrashItem $trashItem * @param int $childCount */ public function __construct(TrashItem $trashItem, $childCount) diff --git a/src/lib/Server/Values/RestUser.php b/src/lib/Server/Values/RestUser.php index d54dd079..444f5cf4 100644 --- a/src/lib/Server/Values/RestUser.php +++ b/src/lib/Server/Values/RestUser.php @@ -6,10 +6,10 @@ */ namespace Ibexa\Rest\Server\Values; -use eZ\Publish\API\Repository\Values\Content\Content; -use eZ\Publish\API\Repository\Values\ContentType\ContentType; -use eZ\Publish\API\Repository\Values\Content\ContentInfo; -use eZ\Publish\API\Repository\Values\Content\Location; +use Ibexa\Contracts\Core\Repository\Values\Content\Content; +use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType; +use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo; +use Ibexa\Contracts\Core\Repository\Values\Content\Location; use Ibexa\Rest\Value as RestValue; /** @@ -18,37 +18,37 @@ class RestUser extends RestValue { /** - * @var \eZ\Publish\API\Repository\Values\Content\Content + * @var \Ibexa\Contracts\Core\Repository\Values\Content\Content */ public $content; /** - * @var \eZ\Publish\API\Repository\Values\ContentType\ContentType + * @var \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType */ public $contentType; /** - * @var \eZ\Publish\API\Repository\Values\Content\ContentInfo + * @var \Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo */ public $contentInfo; /** - * @var \eZ\Publish\API\Repository\Values\Content\Relation[] + * @var \Ibexa\Contracts\Core\Repository\Values\Content\Relation[] */ public $relations; /** - * @var \eZ\Publish\API\Repository\Values\Content\Location + * @var \Ibexa\Contracts\Core\Repository\Values\Content\Location */ public $mainLocation; /** * Construct. * - * @param \eZ\Publish\API\Repository\Values\Content\Content $content - * @param \eZ\Publish\API\Repository\Values\Content\ContentInfo $contentInfo - * @param \eZ\Publish\API\Repository\Values\Content\Location $mainLocation - * @param \eZ\Publish\API\Repository\Values\Content\Relation[] $relations + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Content $content + * @param \Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo $contentInfo + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Location $mainLocation + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Relation[] $relations */ public function __construct(Content $content, ContentType $contentType, ContentInfo $contentInfo, Location $mainLocation, array $relations) { diff --git a/src/lib/Server/Values/RestUserGroup.php b/src/lib/Server/Values/RestUserGroup.php index 2a3b88e3..28c2619f 100644 --- a/src/lib/Server/Values/RestUserGroup.php +++ b/src/lib/Server/Values/RestUserGroup.php @@ -6,10 +6,10 @@ */ namespace Ibexa\Rest\Server\Values; -use eZ\Publish\API\Repository\Values\Content\Content; -use eZ\Publish\API\Repository\Values\ContentType\ContentType; -use eZ\Publish\API\Repository\Values\Content\ContentInfo; -use eZ\Publish\API\Repository\Values\Content\Location; +use Ibexa\Contracts\Core\Repository\Values\Content\Content; +use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType; +use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo; +use Ibexa\Contracts\Core\Repository\Values\Content\Location; use Ibexa\Rest\Value as RestValue; /** @@ -18,38 +18,38 @@ class RestUserGroup extends RestValue { /** - * @var \eZ\Publish\API\Repository\Values\Content\Content + * @var \Ibexa\Contracts\Core\Repository\Values\Content\Content */ public $content; /** - * @var \eZ\Publish\API\Repository\Values\ContentType\ContentType + * @var \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType */ public $contentType; /** - * @var \eZ\Publish\API\Repository\Values\Content\ContentInfo + * @var \Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo */ public $contentInfo; /** - * @var \eZ\Publish\API\Repository\Values\Content\Relation[] + * @var \Ibexa\Contracts\Core\Repository\Values\Content\Relation[] */ public $relations; /** - * @var \eZ\Publish\API\Repository\Values\Content\Location + * @var \Ibexa\Contracts\Core\Repository\Values\Content\Location */ public $mainLocation; /** * Construct. * - * @param \eZ\Publish\API\Repository\Values\Content\Content $content - * @param \eZ\Publish\API\Repository\Values\ContentType\ContentType $contentType - * @param \eZ\Publish\API\Repository\Values\Content\ContentInfo $contentInfo - * @param \eZ\Publish\API\Repository\Values\Content\Location $mainLocation - * @param \eZ\Publish\API\Repository\Values\Content\Relation[] $relations + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Content $content + * @param \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType $contentType + * @param \Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo $contentInfo + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Location $mainLocation + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Relation[] $relations */ public function __construct( Content $content, diff --git a/src/lib/Server/Values/RestUserGroupRoleAssignment.php b/src/lib/Server/Values/RestUserGroupRoleAssignment.php index dfd0b435..35509cb5 100644 --- a/src/lib/Server/Values/RestUserGroupRoleAssignment.php +++ b/src/lib/Server/Values/RestUserGroupRoleAssignment.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Rest\Server\Values; -use eZ\Publish\API\Repository\Values\User\UserGroupRoleAssignment; +use Ibexa\Contracts\Core\Repository\Values\User\UserGroupRoleAssignment; use Ibexa\Rest\Value as RestValue; /** @@ -17,7 +17,7 @@ class RestUserGroupRoleAssignment extends RestValue /** * Role assignment. * - * @var \eZ\Publish\API\Repository\Values\User\UserGroupRoleAssignment + * @var \Ibexa\Contracts\Core\Repository\Values\User\UserGroupRoleAssignment */ public $roleAssignment; @@ -31,7 +31,7 @@ class RestUserGroupRoleAssignment extends RestValue /** * Construct. * - * @param \eZ\Publish\API\Repository\Values\User\UserGroupRoleAssignment $roleAssignment + * @param \Ibexa\Contracts\Core\Repository\Values\User\UserGroupRoleAssignment $roleAssignment * @param mixed $id */ public function __construct(UserGroupRoleAssignment $roleAssignment, $id) diff --git a/src/lib/Server/Values/RestUserGroupUpdateStruct.php b/src/lib/Server/Values/RestUserGroupUpdateStruct.php index 3e3ddae0..a412a649 100644 --- a/src/lib/Server/Values/RestUserGroupUpdateStruct.php +++ b/src/lib/Server/Values/RestUserGroupUpdateStruct.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Rest\Server\Values; -use eZ\Publish\API\Repository\Values\User\UserGroupUpdateStruct; +use Ibexa\Contracts\Core\Repository\Values\User\UserGroupUpdateStruct; use Ibexa\Rest\Value as RestValue; /** @@ -17,7 +17,7 @@ class RestUserGroupUpdateStruct extends RestValue /** * UserGroup update struct. * - * @var \eZ\Publish\API\Repository\Values\User\UserGroupUpdateStruct + * @var \Ibexa\Contracts\Core\Repository\Values\User\UserGroupUpdateStruct */ public $userGroupUpdateStruct; @@ -31,7 +31,7 @@ class RestUserGroupUpdateStruct extends RestValue /** * Construct. * - * @param \eZ\Publish\API\Repository\Values\User\UserGroupUpdateStruct $userGroupUpdateStruct + * @param \Ibexa\Contracts\Core\Repository\Values\User\UserGroupUpdateStruct $userGroupUpdateStruct * @param mixed $sectionId */ public function __construct(UserGroupUpdateStruct $userGroupUpdateStruct, $sectionId = null) diff --git a/src/lib/Server/Values/RestUserRoleAssignment.php b/src/lib/Server/Values/RestUserRoleAssignment.php index 7e0210d6..817a8a9e 100644 --- a/src/lib/Server/Values/RestUserRoleAssignment.php +++ b/src/lib/Server/Values/RestUserRoleAssignment.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Rest\Server\Values; -use eZ\Publish\API\Repository\Values\User\UserRoleAssignment; +use Ibexa\Contracts\Core\Repository\Values\User\UserRoleAssignment; use Ibexa\Rest\Value as RestValue; /** @@ -17,7 +17,7 @@ class RestUserRoleAssignment extends RestValue /** * Role assignment. * - * @var \eZ\Publish\API\Repository\Values\User\UserRoleAssignment + * @var \Ibexa\Contracts\Core\Repository\Values\User\UserRoleAssignment */ public $roleAssignment; @@ -31,7 +31,7 @@ class RestUserRoleAssignment extends RestValue /** * Construct. * - * @param \eZ\Publish\API\Repository\Values\User\UserRoleAssignment $roleAssignment + * @param \Ibexa\Contracts\Core\Repository\Values\User\UserRoleAssignment $roleAssignment * @param mixed $id */ public function __construct(UserRoleAssignment $roleAssignment, $id) diff --git a/src/lib/Server/Values/RestUserUpdateStruct.php b/src/lib/Server/Values/RestUserUpdateStruct.php index 384edaf3..a62b5d88 100644 --- a/src/lib/Server/Values/RestUserUpdateStruct.php +++ b/src/lib/Server/Values/RestUserUpdateStruct.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Rest\Server\Values; -use eZ\Publish\API\Repository\Values\User\UserUpdateStruct; +use Ibexa\Contracts\Core\Repository\Values\User\UserUpdateStruct; use Ibexa\Rest\Value as RestValue; /** @@ -17,7 +17,7 @@ class RestUserUpdateStruct extends RestValue /** * User update struct. * - * @var \eZ\Publish\API\Repository\Values\User\UserUpdateStruct + * @var \Ibexa\Contracts\Core\Repository\Values\User\UserUpdateStruct */ public $userUpdateStruct; @@ -31,7 +31,7 @@ class RestUserUpdateStruct extends RestValue /** * Construct. * - * @param \eZ\Publish\API\Repository\Values\User\UserUpdateStruct $userUpdateStruct + * @param \Ibexa\Contracts\Core\Repository\Values\User\UserUpdateStruct $userUpdateStruct * @param mixed $sectionId */ public function __construct(UserUpdateStruct $userUpdateStruct, $sectionId = null) diff --git a/src/lib/Server/Values/RestViewInput.php b/src/lib/Server/Values/RestViewInput.php index 4963868d..1d831e76 100644 --- a/src/lib/Server/Values/RestViewInput.php +++ b/src/lib/Server/Values/RestViewInput.php @@ -16,7 +16,7 @@ class RestViewInput extends RestValue /** * The search query. * - * @var \eZ\Publish\API\Repository\Values\Content\Query + * @var \Ibexa\Contracts\Core\Repository\Values\Content\Query */ public $query; diff --git a/src/lib/Server/Values/RoleAssignment.php b/src/lib/Server/Values/RoleAssignment.php index 52bdf08a..d11bcfb9 100644 --- a/src/lib/Server/Values/RoleAssignment.php +++ b/src/lib/Server/Values/RoleAssignment.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Rest\Server\Values; -use eZ\Publish\API\Repository\Values\User\Limitation\RoleLimitation; +use Ibexa\Contracts\Core\Repository\Values\User\Limitation\RoleLimitation; use Ibexa\Rest\Value as RestValue; /** @@ -24,7 +24,7 @@ class RoleAssignment extends RestValue /** * Role limitation. * - * @var \eZ\Publish\API\Repository\Values\User\Limitation\RoleLimitation + * @var \Ibexa\Contracts\Core\Repository\Values\User\Limitation\RoleLimitation */ public $limitation; @@ -32,7 +32,7 @@ class RoleAssignment extends RestValue * Construct. * * @param mixed $roleId - * @param \eZ\Publish\API\Repository\Values\User\Limitation\RoleLimitation $limitation + * @param \Ibexa\Contracts\Core\Repository\Values\User\Limitation\RoleLimitation $limitation */ public function __construct($roleId, RoleLimitation $limitation = null) { diff --git a/src/lib/Server/Values/RoleAssignmentList.php b/src/lib/Server/Values/RoleAssignmentList.php index b837bda1..be3cfb6d 100644 --- a/src/lib/Server/Values/RoleAssignmentList.php +++ b/src/lib/Server/Values/RoleAssignmentList.php @@ -16,7 +16,7 @@ class RoleAssignmentList extends RestValue /** * Role assignments. * - * @var \eZ\Publish\API\Repository\Values\User\RoleAssignment[] + * @var \Ibexa\Contracts\Core\Repository\Values\User\RoleAssignment[] */ public $roleAssignments; @@ -37,7 +37,7 @@ class RoleAssignmentList extends RestValue /** * Construct. * - * @param \eZ\Publish\API\Repository\Values\User\RoleAssignment[] $roleAssignments + * @param \Ibexa\Contracts\Core\Repository\Values\User\RoleAssignment[] $roleAssignments * @param mixed $id * @param bool $isGroupAssignment */ diff --git a/src/lib/Server/Values/RoleList.php b/src/lib/Server/Values/RoleList.php index e0629f93..38327ccf 100644 --- a/src/lib/Server/Values/RoleList.php +++ b/src/lib/Server/Values/RoleList.php @@ -16,7 +16,7 @@ class RoleList extends RestValue /** * Roles. * - * @var \eZ\Publish\API\Repository\Values\User\Role[] + * @var \Ibexa\Contracts\Core\Repository\Values\User\Role[] */ public $roles; @@ -30,7 +30,7 @@ class RoleList extends RestValue /** * Construct. * - * @param \eZ\Publish\API\Repository\Values\User\Role[] $roles + * @param \Ibexa\Contracts\Core\Repository\Values\User\Role[] $roles * @param string $path */ public function __construct(array $roles, $path) diff --git a/src/lib/Server/Values/SectionList.php b/src/lib/Server/Values/SectionList.php index dff8698d..044daf99 100644 --- a/src/lib/Server/Values/SectionList.php +++ b/src/lib/Server/Values/SectionList.php @@ -16,7 +16,7 @@ class SectionList extends RestValue /** * Sections. * - * @var \eZ\Publish\API\Repository\Values\Content\Section[] + * @var \Ibexa\Contracts\Core\Repository\Values\Content\Section[] */ public $sections; @@ -30,7 +30,7 @@ class SectionList extends RestValue /** * Construct. * - * @param \eZ\Publish\API\Repository\Values\Content\Section[] $sections + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Section[] $sections * @param string $path */ public function __construct(array $sections, $path) diff --git a/src/lib/Server/Values/SessionInput.php b/src/lib/Server/Values/SessionInput.php index e6f4846c..aa06cf1d 100644 --- a/src/lib/Server/Values/SessionInput.php +++ b/src/lib/Server/Values/SessionInput.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Rest\Server\Values; -use eZ\Publish\API\Repository\Values\ValueObject; +use Ibexa\Contracts\Core\Repository\Values\ValueObject; /** * SessionInput view model. diff --git a/src/lib/Server/Values/Trash.php b/src/lib/Server/Values/Trash.php index 42d7116b..db659394 100644 --- a/src/lib/Server/Values/Trash.php +++ b/src/lib/Server/Values/Trash.php @@ -16,7 +16,7 @@ class Trash extends RestValue /** * Trash items. * - * @var \EzSystems\EzPlatformRest\Server\Values\RestTrashItem[] + * @var \Ibexa\Rest\Server\Values\RestTrashItem[] */ public $trashItems; @@ -30,7 +30,7 @@ class Trash extends RestValue /** * Construct. * - * @param \EzSystems\EzPlatformRest\Server\Values\RestTrashItem[] $trashItems + * @param \Ibexa\Rest\Server\Values\RestTrashItem[] $trashItems * @param string $path */ public function __construct(array $trashItems, $path) diff --git a/src/lib/Server/Values/URLAliasList.php b/src/lib/Server/Values/URLAliasList.php index 3e6e3c5c..fd136249 100644 --- a/src/lib/Server/Values/URLAliasList.php +++ b/src/lib/Server/Values/URLAliasList.php @@ -16,7 +16,7 @@ class URLAliasList extends RestValue /** * URL aliases. * - * @var \eZ\Publish\API\Repository\Values\Content\URLAlias[] + * @var \Ibexa\Contracts\Core\Repository\Values\Content\URLAlias[] */ public $urlAliases; @@ -30,7 +30,7 @@ class URLAliasList extends RestValue /** * Construct. * - * @param \eZ\Publish\API\Repository\Values\Content\URLAlias[] $urlAliases + * @param \Ibexa\Contracts\Core\Repository\Values\Content\URLAlias[] $urlAliases * @param string $path */ public function __construct(array $urlAliases, $path) diff --git a/src/lib/Server/Values/URLAliasRefList.php b/src/lib/Server/Values/URLAliasRefList.php index ca1b81f4..c6f0009d 100644 --- a/src/lib/Server/Values/URLAliasRefList.php +++ b/src/lib/Server/Values/URLAliasRefList.php @@ -16,7 +16,7 @@ class URLAliasRefList extends RestValue /** * URL aliases. * - * @var \eZ\Publish\API\Repository\Values\Content\URLAlias[] + * @var \Ibexa\Contracts\Core\Repository\Values\Content\URLAlias[] */ public $urlAliases; @@ -30,7 +30,7 @@ class URLAliasRefList extends RestValue /** * Construct. * - * @param \eZ\Publish\API\Repository\Values\Content\URLAlias[] $urlAliases + * @param \Ibexa\Contracts\Core\Repository\Values\Content\URLAlias[] $urlAliases * @param string $path */ public function __construct(array $urlAliases, $path) diff --git a/src/lib/Server/Values/URLWildcardList.php b/src/lib/Server/Values/URLWildcardList.php index 39c1ef63..13f0775c 100644 --- a/src/lib/Server/Values/URLWildcardList.php +++ b/src/lib/Server/Values/URLWildcardList.php @@ -16,14 +16,14 @@ class URLWildcardList extends RestValue /** * URL wildcards. * - * @var \eZ\Publish\API\Repository\Values\Content\URLWildcard[] + * @var \Ibexa\Contracts\Core\Repository\Values\Content\URLWildcard[] */ public $urlWildcards; /** * Construct. * - * @param \eZ\Publish\API\Repository\Values\Content\URLWildcard[] $urlWildcards + * @param \Ibexa\Contracts\Core\Repository\Values\Content\URLWildcard[] $urlWildcards */ public function __construct(array $urlWildcards) { diff --git a/src/lib/Server/Values/UserGroupList.php b/src/lib/Server/Values/UserGroupList.php index 272c3243..10a17eb0 100644 --- a/src/lib/Server/Values/UserGroupList.php +++ b/src/lib/Server/Values/UserGroupList.php @@ -16,7 +16,7 @@ class UserGroupList extends RestValue /** * User groups. * - * @var \EzSystems\EzPlatformRest\Server\Values\RestUserGroup[] + * @var \Ibexa\Rest\Server\Values\RestUserGroup[] */ public $userGroups; @@ -30,7 +30,7 @@ class UserGroupList extends RestValue /** * Construct. * - * @param \EzSystems\EzPlatformRest\Server\Values\RestUserGroup[] $userGroups + * @param \Ibexa\Rest\Server\Values\RestUserGroup[] $userGroups * @param string $path */ public function __construct(array $userGroups, $path) diff --git a/src/lib/Server/Values/UserGroupRefList.php b/src/lib/Server/Values/UserGroupRefList.php index 434f5838..7cab7d33 100644 --- a/src/lib/Server/Values/UserGroupRefList.php +++ b/src/lib/Server/Values/UserGroupRefList.php @@ -16,7 +16,7 @@ class UserGroupRefList extends RestValue /** * User groups. * - * @var \EzSystems\EzPlatformRest\Server\Values\RestUserGroup[] + * @var \Ibexa\Rest\Server\Values\RestUserGroup[] */ public $userGroups; @@ -37,7 +37,7 @@ class UserGroupRefList extends RestValue /** * Construct. * - * @param \EzSystems\EzPlatformRest\Server\Values\RestUserGroup[] $userGroups + * @param \Ibexa\Rest\Server\Values\RestUserGroup[] $userGroups * @param string $path * @param mixed $userId */ diff --git a/src/lib/Server/Values/UserList.php b/src/lib/Server/Values/UserList.php index 758aac98..d94d3c7a 100644 --- a/src/lib/Server/Values/UserList.php +++ b/src/lib/Server/Values/UserList.php @@ -16,7 +16,7 @@ class UserList extends RestValue /** * Users. * - * @var \EzSystems\EzPlatformRest\Server\Values\RestUser[] + * @var \Ibexa\Rest\Server\Values\RestUser[] */ public $users; @@ -30,7 +30,7 @@ class UserList extends RestValue /** * Construct. * - * @param \EzSystems\EzPlatformRest\Server\Values\RestUser[] $users + * @param \Ibexa\Rest\Server\Values\RestUser[] $users * @param string $path */ public function __construct(array $users, $path) diff --git a/src/lib/Server/Values/UserRefList.php b/src/lib/Server/Values/UserRefList.php index a8bb3555..4057cd1c 100644 --- a/src/lib/Server/Values/UserRefList.php +++ b/src/lib/Server/Values/UserRefList.php @@ -16,7 +16,7 @@ class UserRefList extends RestValue /** * Users. * - * @var \EzSystems\EzPlatformRest\Server\Values\RestUser[] + * @var \Ibexa\Rest\Server\Values\RestUser[] */ public $users; @@ -30,7 +30,7 @@ class UserRefList extends RestValue /** * Construct. * - * @param \EzSystems\EzPlatformRest\Server\Values\RestUser[] $users + * @param \Ibexa\Rest\Server\Values\RestUser[] $users * @param string $path */ public function __construct(array $users, $path) diff --git a/src/lib/Server/Values/UserSession.php b/src/lib/Server/Values/UserSession.php index 6d747747..53117ea6 100644 --- a/src/lib/Server/Values/UserSession.php +++ b/src/lib/Server/Values/UserSession.php @@ -7,7 +7,7 @@ namespace Ibexa\Rest\Server\Values; use Ibexa\Rest\Value as RestValue; -use eZ\Publish\API\Repository\Values\User\User; +use Ibexa\Contracts\Core\Repository\Values\User\User; /** * User list view model. @@ -17,7 +17,7 @@ class UserSession extends RestValue /** * User. * - * @var \eZ\Publish\API\Repository\Values\User\User + * @var \Ibexa\Contracts\Core\Repository\Values\User\User */ public $user; @@ -50,7 +50,7 @@ class UserSession extends RestValue public $exists; /** - * @param \eZ\Publish\API\Repository\Values\User\User $user + * @param \Ibexa\Contracts\Core\Repository\Values\User\User $user * @param string $sessionName * @param string $sessionId * @param string $csrfToken diff --git a/src/lib/Server/Values/Version.php b/src/lib/Server/Values/Version.php index 0daa3a36..793acede 100644 --- a/src/lib/Server/Values/Version.php +++ b/src/lib/Server/Values/Version.php @@ -6,8 +6,8 @@ */ namespace Ibexa\Rest\Server\Values; -use eZ\Publish\API\Repository\Values\Content\Content; -use eZ\Publish\API\Repository\Values\ContentType\ContentType; +use Ibexa\Contracts\Core\Repository\Values\Content\Content; +use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType; use Ibexa\Rest\Value as RestValue; /** @@ -16,17 +16,17 @@ class Version extends RestValue { /** - * @var \eZ\Publish\API\Repository\Values\Content\Content + * @var \Ibexa\Contracts\Core\Repository\Values\Content\Content */ public $content; /** - * @var \eZ\Publish\API\Repository\Values\ContentType\ContentType + * @var \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType */ public $contentType; /** - * @var \eZ\Publish\API\Repository\Values\Content\Relation[] + * @var \Ibexa\Contracts\Core\Repository\Values\Content\Relation[] */ public $relations; @@ -40,9 +40,9 @@ class Version extends RestValue /** * Construct. * - * @param \eZ\Publish\API\Repository\Values\Content\Content $content - * @param \eZ\Publish\API\Repository\Values\ContentType\ContentType $contentType - * @param \eZ\Publish\API\Repository\Values\Content\Relation[] $relations + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Content $content + * @param \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType $contentType + * @param \Ibexa\Contracts\Core\Repository\Values\Content\Relation[] $relations * @param string $path */ public function __construct(Content $content, ContentType $contentType, array $relations, $path = null) diff --git a/src/lib/Server/Values/VersionList.php b/src/lib/Server/Values/VersionList.php index e9d00b1d..451ed3ad 100644 --- a/src/lib/Server/Values/VersionList.php +++ b/src/lib/Server/Values/VersionList.php @@ -16,7 +16,7 @@ class VersionList extends RestValue /** * Versions. * - * @var \eZ\Publish\API\Repository\Values\Content\VersionInfo[] + * @var \Ibexa\Contracts\Core\Repository\Values\Content\VersionInfo[] */ public $versions; @@ -30,7 +30,7 @@ class VersionList extends RestValue /** * Construct. * - * @param \eZ\Publish\API\Repository\Values\Content\VersionInfo[] $versions + * @param \Ibexa\Contracts\Core\Repository\Values\Content\VersionInfo[] $versions * @param string $path */ public function __construct(array $versions, $path) diff --git a/src/lib/Server/Values/VersionTranslationInfo.php b/src/lib/Server/Values/VersionTranslationInfo.php index 7659b5c8..320473b7 100644 --- a/src/lib/Server/Values/VersionTranslationInfo.php +++ b/src/lib/Server/Values/VersionTranslationInfo.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Rest\Server\Values; -use eZ\Publish\API\Repository\Values\Content\VersionInfo; +use Ibexa\Contracts\Core\Repository\Values\Content\VersionInfo; use Ibexa\Rest\Value as RestValue; /** @@ -15,12 +15,12 @@ class VersionTranslationInfo extends RestValue { /** - * @var \eZ\Publish\API\Repository\Values\Content\VersionInfo + * @var \Ibexa\Contracts\Core\Repository\Values\Content\VersionInfo */ private $versionInfo; /** - * @param \eZ\Publish\API\Repository\Values\Content\VersionInfo $versionInfo + * @param \Ibexa\Contracts\Core\Repository\Values\Content\VersionInfo $versionInfo */ public function __construct(VersionInfo $versionInfo) { @@ -28,7 +28,7 @@ public function __construct(VersionInfo $versionInfo) } /** - * @return \eZ\Publish\API\Repository\Values\Content\VersionInfo + * @return \Ibexa\Contracts\Core\Repository\Values\Content\VersionInfo */ public function getVersionInfo() { diff --git a/src/lib/Server/View/AcceptHeaderVisitorDispatcher.php b/src/lib/Server/View/AcceptHeaderVisitorDispatcher.php index 94d5202e..ea6dda3f 100644 --- a/src/lib/Server/View/AcceptHeaderVisitorDispatcher.php +++ b/src/lib/Server/View/AcceptHeaderVisitorDispatcher.php @@ -28,7 +28,7 @@ class AcceptHeaderVisitorDispatcher * Adds view handler. * * @param string $regexp - * @param \EzSystems\EzPlatformRest\Output\Visitor $visitor + * @param \Ibexa\Contracts\Rest\Output\Visitor $visitor */ public function addVisitor($regexp, OutputVisitor $visitor) { @@ -41,14 +41,14 @@ public function addVisitor($regexp, OutputVisitor $visitor) * @param \Symfony\Component\HttpFoundation\Request $request * @param mixed $result * - * @throws RuntimeException + * @throws \RuntimeException * - * @return Response + * @return \Symfony\Component\HttpFoundation\Response */ public function dispatch(Request $request, $result) { foreach ($request->getAcceptableContentTypes() as $mimeType) { - /** @var \EzSystems\EzPlatformRest\Output\Visitor $visitor */ + /** @var \Ibexa\Contracts\Rest\Output\Visitor $visitor */ foreach ($this->mapping as $regexp => $visitor) { if (preg_match($regexp, $mimeType)) { return $visitor->visit($result); diff --git a/src/lib/Values/RestContentMetadataUpdateStruct.php b/src/lib/Values/RestContentMetadataUpdateStruct.php index c18ceacc..19654af6 100644 --- a/src/lib/Values/RestContentMetadataUpdateStruct.php +++ b/src/lib/Values/RestContentMetadataUpdateStruct.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Rest\Values; -use eZ\Publish\API\Repository\Values\Content\ContentMetadataUpdateStruct; +use Ibexa\Contracts\Core\Repository\Values\Content\ContentMetadataUpdateStruct; /** * Extended ContentMetadataUpdateStruct that includes section information. diff --git a/src/lib/Values/RestObjectState.php b/src/lib/Values/RestObjectState.php index 6a4578c3..87a40400 100644 --- a/src/lib/Values/RestObjectState.php +++ b/src/lib/Values/RestObjectState.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Rest\Values; -use eZ\Publish\API\Repository\Values\ObjectState\ObjectState; +use Ibexa\Contracts\Core\Repository\Values\ObjectState\ObjectState; use Ibexa\Rest\Value as RestValue; /** @@ -17,7 +17,7 @@ class RestObjectState extends RestValue /** * Wrapped object state. * - * @var \eZ\Publish\API\Repository\Values\ObjectState\ObjectState + * @var \Ibexa\Contracts\Core\Repository\Values\ObjectState\ObjectState */ public $objectState; @@ -31,7 +31,7 @@ class RestObjectState extends RestValue /** * Constructor. * - * @param \eZ\Publish\API\Repository\Values\ObjectState\ObjectState $objectState + * @param \Ibexa\Contracts\Core\Repository\Values\ObjectState\ObjectState $objectState * @param mixed $groupId */ public function __construct(ObjectState $objectState, $groupId) diff --git a/tests/bundle/CorsOptions/RestProviderTest.php b/tests/bundle/CorsOptions/RestProviderTest.php index 0aa49adc..374c09f6 100644 --- a/tests/bundle/CorsOptions/RestProviderTest.php +++ b/tests/bundle/CorsOptions/RestProviderTest.php @@ -88,7 +88,7 @@ public function testGetOptionsNotRestRequest() /** * @param bool $isRestRequest wether or not to set the is_rest_request attribute * - * @return Request + * @return \Symfony\Component\HttpFoundation\Request */ protected function createRequest($isRestRequest = true) { @@ -108,7 +108,7 @@ protected function getProvider() } /** - * @return MockObject|RequestMatcherInterface + * @return \PHPUnit\Framework\MockObject\MockObject|\Symfony\Component\Routing\Matcher\RequestMatcherInterface */ protected function getRequestMatcherMock() { diff --git a/tests/bundle/EventListener/CsrfListenerTest.php b/tests/bundle/EventListener/CsrfListenerTest.php index 85f6ef89..b4155e51 100644 --- a/tests/bundle/EventListener/CsrfListenerTest.php +++ b/tests/bundle/EventListener/CsrfListenerTest.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Tests\Bundle\Rest\EventListener; -use eZ\Publish\Core\Base\Exceptions\UnauthorizedException; +use Ibexa\Core\Base\Exceptions\UnauthorizedException; use PHPUnit\Framework\MockObject\MockObject; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\HttpFoundation\ParameterBag; @@ -25,7 +25,7 @@ class CsrfListenerTest extends EventListenerTest const INVALID_TOKEN = 'invalid'; const INTENTION = 'rest'; - /** @var EventDispatcherInterface */ + /** @var \Symfony\Component\EventDispatcher\EventDispatcherInterface */ protected $eventDispatcherMock; /** @@ -174,7 +174,7 @@ public function testValidToken() } /** - * @return CsrfProviderInterface|MockObject + * @return \Symfony\Component\Form\Extension\Csrf\CsrfProvider\CsrfProviderInterface|\PHPUnit\Framework\MockObject\MockObject */ protected function getCsrfProviderMock() { @@ -195,7 +195,7 @@ function (CsrfToken $token) { } /** - * @return MockObject|RequestEvent + * @return \PHPUnit\Framework\MockObject\MockObject|\Symfony\Component\HttpKernel\Event\RequestEvent */ protected function getEvent($class = null) { @@ -228,7 +228,7 @@ protected function getSessionMock() } /** - * @return ParameterBag|MockObject + * @return \Symfony\Component\HttpFoundation\ParameterBag|\PHPUnit\Framework\MockObject\MockObject */ protected function getRequestHeadersMock() { @@ -262,7 +262,7 @@ protected function getRequestHeadersMock() } /** - * @return MockObject|Request + * @return \PHPUnit\Framework\MockObject\MockObject|\Symfony\Component\HttpFoundation\Request */ protected function getRequestMock() { @@ -297,7 +297,7 @@ protected function getRequestMock() } /** - * @return MockObject|EventDispatcherInterface + * @return \PHPUnit\Framework\MockObject\MockObject|\Symfony\Component\EventDispatcher\EventDispatcherInterface */ protected function getEventDispatcherMock() { @@ -311,7 +311,7 @@ protected function getEventDispatcherMock() /** * @param bool $csrfEnabled * - * @return CsrfListener + * @return \Ibexa\Bundle\Rest\EventListener\CsrfListener */ protected function getEventListener($csrfEnabled = true) { diff --git a/tests/bundle/EventListener/EventListenerTest.php b/tests/bundle/EventListener/EventListenerTest.php index 4b86fa3f..2ac762d9 100644 --- a/tests/bundle/EventListener/EventListenerTest.php +++ b/tests/bundle/EventListener/EventListenerTest.php @@ -16,16 +16,16 @@ abstract class EventListenerTest extends TestCase { - /** @var EventDispatcherInterface */ + /** @var \Symfony\Component\EventDispatcher\EventDispatcherInterface */ protected $event; - /** @var Request|MockObject */ + /** @var \Symfony\Component\HttpFoundation\Request|\PHPUnit\Framework\MockObject\MockObject */ protected $requestMock; - /** @var ParameterBag|MockObject */ + /** @var \Symfony\Component\HttpFoundation\ParameterBag|\PHPUnit\Framework\MockObject\MockObject */ protected $requestAttributesMock; - /** @var ParameterBag|MockObject */ + /** @var \Symfony\Component\HttpFoundation\ParameterBag|\PHPUnit\Framework\MockObject\MockObject */ protected $requestHeadersMock; protected $isRestRequest = true; @@ -59,7 +59,7 @@ public function testGetSubscribedEvents($expectedEventTypes) } /** - * @return MockObject|$class + * @return \PHPUnit\Framework\MockObject\MockObject|$class */ protected function getEvent($class) { @@ -78,7 +78,7 @@ protected function getEvent($class) } /** - * @return ParameterBag|MockObject + * @return \Symfony\Component\HttpFoundation\ParameterBag|\PHPUnit\Framework\MockObject\MockObject */ protected function getRequestAttributesMock() { @@ -100,7 +100,7 @@ protected function getRequestAttributesMock() } /** - * @return MockObject|Request + * @return \PHPUnit\Framework\MockObject\MockObject|\Symfony\Component\HttpFoundation\Request */ protected function getRequestMock() { @@ -125,7 +125,7 @@ protected function getRequestMock() } /** - * @return ParameterBag|MockObject + * @return \Symfony\Component\HttpFoundation\ParameterBag|\PHPUnit\Framework\MockObject\MockObject */ protected function getRequestHeadersMock() { @@ -139,7 +139,7 @@ protected function getRequestHeadersMock() /** * @param bool $csrfEnabled * - * @return CsrfListener + * @return \Ibexa\Bundle\Rest\EventListener\CsrfListener */ abstract protected function getEventListener(); diff --git a/tests/bundle/EventListener/RequestListenerTest.php b/tests/bundle/EventListener/RequestListenerTest.php index 1153c3c7..367a2602 100644 --- a/tests/bundle/EventListener/RequestListenerTest.php +++ b/tests/bundle/EventListener/RequestListenerTest.php @@ -98,7 +98,7 @@ public function testNonRestRequestVariations($uri) } /** - * @return RequestListener + * @return \Ibexa\Bundle\Rest\EventListener\RequestListener */ protected function getEventListener() { @@ -108,7 +108,7 @@ protected function getEventListener() } /** - * @return AcceptHeaderVisitorDispatcher|MockObject + * @return \Ibexa\Rest\Server\View\AcceptHeaderVisitorDispatcher|\PHPUnit\Framework\MockObject\MockObject */ public function getVisitorDispatcherMock() { @@ -116,7 +116,7 @@ public function getVisitorDispatcherMock() } /** - * @return Request + * @return \Symfony\Component\HttpFoundation\Request */ protected function performFakeRequest($uri, $type = HttpKernelInterface::MASTER_REQUEST) { diff --git a/tests/bundle/EventListener/ResponseListenerTest.php b/tests/bundle/EventListener/ResponseListenerTest.php index 5ace38ba..b399be0e 100644 --- a/tests/bundle/EventListener/ResponseListenerTest.php +++ b/tests/bundle/EventListener/ResponseListenerTest.php @@ -21,26 +21,26 @@ class ResponseListenerTest extends EventListenerTest { - /** @var AcceptHeaderVisitorDispatcher|MockObject */ + /** @var \Ibexa\Rest\Server\View\AcceptHeaderVisitorDispatcher|\PHPUnit\Framework\MockObject\MockObject */ protected $visitorDispatcherMock; /** @var \stdClass */ protected $eventValue; - /** @var Exception */ + /** @var \Exception */ protected $exceptionEventValue; protected $dispatcherMessage; protected $controllerResult; - /** @var Response */ + /** @var \Symfony\Component\HttpFoundation\Response */ protected $response; - /** @var Event */ + /** @var \Symfony\Contracts\EventDispatcher\Event */ protected $event; - /** @var KernelInterface|MockObject */ + /** @var \Symfony\Component\HttpKernel\KernelInterface|\PHPUnit\Framework\MockObject\MockObject */ protected $kernelMock; public function setUp(): void @@ -114,7 +114,7 @@ protected function onKernelView($method, $event, $value) } /** - * @return AcceptHeaderVisitorDispatcher|MockObject + * @return \Ibexa\Rest\Server\View\AcceptHeaderVisitorDispatcher|\PHPUnit\Framework\MockObject\MockObject */ public function getVisitorDispatcherMock() { @@ -126,7 +126,7 @@ public function getVisitorDispatcherMock() } /** - * @return ResponseListener + * @return \Ibexa\Bundle\Rest\EventListener\ResponseListener */ protected function getEventListener() { @@ -136,7 +136,7 @@ protected function getEventListener() } /** - * @return ViewEvent + * @return \Symfony\Component\HttpKernel\Event\ViewEvent */ protected function getControllerResultEvent(): ViewEvent { @@ -153,7 +153,7 @@ protected function getControllerResultEvent(): ViewEvent } /** - * @return MockObject|KernelInterface + * @return \PHPUnit\Framework\MockObject\MockObject|\Symfony\Component\HttpKernel\KernelInterface */ protected function getKernelMock(): KernelInterface { @@ -165,7 +165,7 @@ protected function getKernelMock(): KernelInterface } /** - * @return ExceptionEvent + * @return \Symfony\Component\HttpKernel\Event\ExceptionEvent */ protected function getExceptionEvent(): ExceptionEvent { diff --git a/tests/bundle/Functional/SearchView/SearchViewTest.php b/tests/bundle/Functional/SearchView/SearchViewTest.php index 9ccd6edf..70907dbb 100644 --- a/tests/bundle/Functional/SearchView/SearchViewTest.php +++ b/tests/bundle/Functional/SearchView/SearchViewTest.php @@ -10,7 +10,7 @@ use DOMDocument; use DOMElement; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator; class SearchViewTest extends SearchViewTestCase { @@ -328,7 +328,7 @@ public function jsonProvider(): array * @param string $operator * @param string|string[] $value * - * @return DOMElement + * @return \DOMElement */ private function buildFieldXml(string $name, string $operator, $value): DOMElement { diff --git a/tests/bundle/RequestParser/RouterTest.php b/tests/bundle/RequestParser/RouterTest.php index 89b3f204..d392bd99 100644 --- a/tests/bundle/RequestParser/RouterTest.php +++ b/tests/bundle/RequestParser/RouterTest.php @@ -129,7 +129,7 @@ public function testGenerate() } /** - * @return \EzSystems\EzPlatformRestBundle\RequestParser\Router + * @return \Ibexa\Bundle\Rest\RequestParser\Router */ private function getRequestParser() { diff --git a/tests/bundle/Routing/OptionsLoader/MapperTest.php b/tests/bundle/Routing/OptionsLoader/MapperTest.php index b9d51ab4..c956c4b9 100644 --- a/tests/bundle/Routing/OptionsLoader/MapperTest.php +++ b/tests/bundle/Routing/OptionsLoader/MapperTest.php @@ -12,7 +12,7 @@ class MapperTest extends TestCase { - /** @var Mapper */ + /** @var \Ibexa\Bundle\Rest\Routing\OptionsLoader\Mapper */ protected $mapper; public function setUp(): void diff --git a/tests/bundle/Routing/OptionsLoader/RouteCollectionMapperTest.php b/tests/bundle/Routing/OptionsLoader/RouteCollectionMapperTest.php index 073f83fc..73437e6f 100644 --- a/tests/bundle/Routing/OptionsLoader/RouteCollectionMapperTest.php +++ b/tests/bundle/Routing/OptionsLoader/RouteCollectionMapperTest.php @@ -17,7 +17,7 @@ */ class RouteCollectionMapperTest extends TestCase { - /** @var RouteCollectionMapper */ + /** @var \Ibexa\Bundle\Rest\Routing\OptionsLoader\RouteCollectionMapper */ protected $collectionMapper; public function setUp(): void @@ -66,7 +66,7 @@ public function testAddRestRoutesCollection() * @param string $path * @param array $methods * - * @return Route + * @return \Symfony\Component\Routing\Route */ private function createRoute($path, array $methods) { diff --git a/tests/bundle/Routing/OptionsLoaderTest.php b/tests/bundle/Routing/OptionsLoaderTest.php index 4d9d216c..0d0fcaf4 100644 --- a/tests/bundle/Routing/OptionsLoaderTest.php +++ b/tests/bundle/Routing/OptionsLoaderTest.php @@ -55,7 +55,7 @@ public function testLoad() /** * Returns a partially mocked OptionsLoader, with the import method mocked. * - * @return OptionsLoader|MockObject + * @return \Ibexa\Bundle\Rest\Routing\OptionsLoader|\PHPUnit\Framework\MockObject\MockObject */ protected function getOptionsLoader() { @@ -73,7 +73,7 @@ protected function getOptionsLoader() } /** - * @return MockObject + * @return \PHPUnit\Framework\MockObject\MockObject */ protected function getRouteCollectionMapperMock() { diff --git a/tests/lib/FieldTypeProcessor/AuthorProcessorTest.php b/tests/lib/FieldTypeProcessor/AuthorProcessorTest.php index 4ba79a60..e7ae77e4 100644 --- a/tests/lib/FieldTypeProcessor/AuthorProcessorTest.php +++ b/tests/lib/FieldTypeProcessor/AuthorProcessorTest.php @@ -58,7 +58,7 @@ public function testPostProcessFieldSettingsHash($outputSettings, $inputSettings } /** - * @return \EzSystems\EzPlatformRest\FieldTypeProcessor\AuthorProcessor + * @return \Ibexa\Rest\FieldTypeProcessor\AuthorProcessor */ protected function getProcessor() { diff --git a/tests/lib/FieldTypeProcessor/BinaryInputProcessorTest.php b/tests/lib/FieldTypeProcessor/BinaryInputProcessorTest.php index 1b09aba2..64efbdfd 100644 --- a/tests/lib/FieldTypeProcessor/BinaryInputProcessorTest.php +++ b/tests/lib/FieldTypeProcessor/BinaryInputProcessorTest.php @@ -86,7 +86,7 @@ public function testPreProcessValueHash() /** * Returns the processor under test. * - * @return \EzSystems\EzPlatformRest\FieldTypeProcessor\BinaryInputProcessor + * @return \Ibexa\Rest\FieldTypeProcessor\BinaryInputProcessor */ abstract protected function getProcessor(); } diff --git a/tests/lib/FieldTypeProcessor/BinaryProcessorTest.php b/tests/lib/FieldTypeProcessor/BinaryProcessorTest.php index f481d17e..c956c4db 100644 --- a/tests/lib/FieldTypeProcessor/BinaryProcessorTest.php +++ b/tests/lib/FieldTypeProcessor/BinaryProcessorTest.php @@ -39,7 +39,7 @@ public function testPostProcessValueHash() /** * Returns the processor under test. * - * @return \EzSystems\EzPlatformRest\FieldTypeProcessor\BinaryProcessor + * @return \Ibexa\Rest\FieldTypeProcessor\BinaryProcessor */ protected function getProcessor() { diff --git a/tests/lib/FieldTypeProcessor/DateAndTimeProcessorTest.php b/tests/lib/FieldTypeProcessor/DateAndTimeProcessorTest.php index 7cd4f076..5040e6b9 100644 --- a/tests/lib/FieldTypeProcessor/DateAndTimeProcessorTest.php +++ b/tests/lib/FieldTypeProcessor/DateAndTimeProcessorTest.php @@ -59,7 +59,7 @@ public function testPostProcessFieldSettingsHash($outputSettings, $inputSettings } /** - * @return \EzSystems\EzPlatformRest\FieldTypeProcessor\DateAndTimeProcessor + * @return \Ibexa\Rest\FieldTypeProcessor\DateAndTimeProcessor */ protected function getProcessor() { diff --git a/tests/lib/FieldTypeProcessor/DateProcessorTest.php b/tests/lib/FieldTypeProcessor/DateProcessorTest.php index eb918d84..0187ad01 100644 --- a/tests/lib/FieldTypeProcessor/DateProcessorTest.php +++ b/tests/lib/FieldTypeProcessor/DateProcessorTest.php @@ -58,7 +58,7 @@ public function testPostProcessFieldSettingsHash($outputSettings, $inputSettings } /** - * @return \EzSystems\EzPlatformRest\FieldTypeProcessor\DateProcessor + * @return \Ibexa\Rest\FieldTypeProcessor\DateProcessor */ protected function getProcessor() { diff --git a/tests/lib/FieldTypeProcessor/ImageProcessorTest.php b/tests/lib/FieldTypeProcessor/ImageProcessorTest.php index 57f72a10..8cc6844c 100644 --- a/tests/lib/FieldTypeProcessor/ImageProcessorTest.php +++ b/tests/lib/FieldTypeProcessor/ImageProcessorTest.php @@ -12,7 +12,7 @@ class ImageProcessorTest extends BinaryInputProcessorTest { - /** @var RequestParser */ + /** @var \Ibexa\Rest\RequestParser */ protected $requestParser; /** @@ -57,7 +57,7 @@ public function testPostProcessValueHash() /** * Returns the processor under test. * - * @return \EzSystems\EzPlatformRest\FieldTypeProcessor\ImageProcessor + * @return \Ibexa\Rest\FieldTypeProcessor\ImageProcessor */ protected function getProcessor() { diff --git a/tests/lib/FieldTypeProcessor/MediaProcessorTest.php b/tests/lib/FieldTypeProcessor/MediaProcessorTest.php index dc0841e3..6c09d95e 100644 --- a/tests/lib/FieldTypeProcessor/MediaProcessorTest.php +++ b/tests/lib/FieldTypeProcessor/MediaProcessorTest.php @@ -62,7 +62,7 @@ public function testPostProcessFieldSettingsHash($outputSettings, $inputSettings } /** - * @return \EzSystems\EzPlatformRest\FieldTypeProcessor\MediaProcessor + * @return \Ibexa\Rest\FieldTypeProcessor\MediaProcessor */ protected function getProcessor() { diff --git a/tests/lib/FieldTypeProcessor/RelationListProcessorTest.php b/tests/lib/FieldTypeProcessor/RelationListProcessorTest.php index 1f21fdc9..dad65308 100644 --- a/tests/lib/FieldTypeProcessor/RelationListProcessorTest.php +++ b/tests/lib/FieldTypeProcessor/RelationListProcessorTest.php @@ -6,8 +6,8 @@ */ namespace Ibexa\Tests\Rest\FieldTypeProcessor; -use eZ\Publish\API\Repository\LocationService; -use eZ\Publish\Core\Repository\Values\Content\Location; +use Ibexa\Contracts\Core\Repository\LocationService; +use Ibexa\Core\Repository\Values\Content\Location; use Ibexa\Rest\FieldTypeProcessor\RelationListProcessor; use PHPUnit\Framework\TestCase; use Symfony\Component\Routing\RouterInterface; @@ -119,7 +119,7 @@ public function testPostProcessValueHash() } /** - * @return \EzSystems\EzPlatformRest\FieldTypeProcessor\RelationListProcessor + * @return \Ibexa\Rest\FieldTypeProcessor\RelationListProcessor */ protected function getProcessor() { diff --git a/tests/lib/FieldTypeProcessor/RelationProcessorTest.php b/tests/lib/FieldTypeProcessor/RelationProcessorTest.php index f1d28c01..17a924cc 100644 --- a/tests/lib/FieldTypeProcessor/RelationProcessorTest.php +++ b/tests/lib/FieldTypeProcessor/RelationProcessorTest.php @@ -6,8 +6,8 @@ */ namespace Ibexa\Tests\Rest\FieldTypeProcessor; -use eZ\Publish\API\Repository\LocationService; -use eZ\Publish\Core\Repository\Values\Content\Location; +use Ibexa\Contracts\Core\Repository\LocationService; +use Ibexa\Core\Repository\Values\Content\Location; use Ibexa\Rest\FieldTypeProcessor\RelationProcessor; use PHPUnit\Framework\TestCase; use Symfony\Component\Routing\RouterInterface; @@ -128,7 +128,7 @@ public function testPostProcessFieldValueHashNullValue() } /** - * @return \EzSystems\EzPlatformRest\FieldTypeProcessor\RelationProcessor + * @return \Ibexa\Rest\FieldTypeProcessor\RelationProcessor */ protected function getProcessor() { diff --git a/tests/lib/FieldTypeProcessor/TimeProcessorTest.php b/tests/lib/FieldTypeProcessor/TimeProcessorTest.php index 914704df..1d5685e6 100644 --- a/tests/lib/FieldTypeProcessor/TimeProcessorTest.php +++ b/tests/lib/FieldTypeProcessor/TimeProcessorTest.php @@ -58,7 +58,7 @@ public function testPostProcessFieldSettingsHash($outputSettings, $inputSettings } /** - * @return \EzSystems\EzPlatformRest\FieldTypeProcessor\TimeProcessor + * @return \Ibexa\Rest\FieldTypeProcessor\TimeProcessor */ protected function getProcessor() { diff --git a/tests/lib/FieldTypeProcessorRegistryTest.php b/tests/lib/FieldTypeProcessorRegistryTest.php index 31fb273f..fa188a7b 100644 --- a/tests/lib/FieldTypeProcessorRegistryTest.php +++ b/tests/lib/FieldTypeProcessorRegistryTest.php @@ -87,7 +87,7 @@ public function testRegisterProcessorsOverwrite() /** * Get FieldTypeProcessor mock object. * - * @return \EzSystems\EzPlatformRest\FieldTypeProcessor + * @return \Ibexa\Contracts\Rest\FieldTypeProcessor */ protected function getAProcessorMock() { diff --git a/tests/lib/Input/FieldTypeParserTest.php b/tests/lib/Input/FieldTypeParserTest.php index 3ae0ad9d..0a4f308a 100644 --- a/tests/lib/Input/FieldTypeParserTest.php +++ b/tests/lib/Input/FieldTypeParserTest.php @@ -7,13 +7,13 @@ namespace Ibexa\Tests\Rest\Input; use Ibexa\Rest\Input\FieldTypeParser; -use eZ\Publish\API\Repository\Values\Content\ContentInfo; -use eZ\Publish\API\Repository\ContentService; -use eZ\Publish\API\Repository\ContentTypeService; -use eZ\Publish\API\Repository\FieldType; -use eZ\Publish\API\Repository\FieldTypeService; -use eZ\Publish\Core\Repository\Values\ContentType\ContentType; -use eZ\Publish\Core\Repository\Values\ContentType\FieldDefinition; +use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo; +use Ibexa\Contracts\Core\Repository\ContentService; +use Ibexa\Contracts\Core\Repository\ContentTypeService; +use Ibexa\Contracts\Core\Repository\FieldType; +use Ibexa\Contracts\Core\Repository\FieldTypeService; +use Ibexa\Core\Repository\Values\ContentType\ContentType; +use Ibexa\Core\Repository\Values\ContentType\FieldDefinition; use Ibexa\Rest\FieldTypeProcessorRegistry; use Ibexa\Contracts\Rest\FieldTypeProcessor; use PHPUnit\Framework\TestCase; diff --git a/tests/lib/Input/ParsingDispatcherTest.php b/tests/lib/Input/ParsingDispatcherTest.php index 224994a9..e7030ef5 100644 --- a/tests/lib/Input/ParsingDispatcherTest.php +++ b/tests/lib/Input/ParsingDispatcherTest.php @@ -17,7 +17,7 @@ class ParsingDispatcherTest extends TestCase { public function testParseMissingContentType() { - $this->expectException(\EzSystems\EzPlatformRest\Exceptions\Parser::class); + $this->expectException(\Ibexa\Contracts\Rest\Exceptions\Parser::class); $dispatcher = new ParsingDispatcher(); @@ -96,7 +96,7 @@ public function testParseStripFormat() } /** - * @return \EzSystems\EzPlatformRest\Input\Parser|\PHPUnit\Framework\MockObject\MockObject + * @return \Ibexa\Contracts\Rest\Input\Parser|\PHPUnit\Framework\MockObject\MockObject */ private function createParserMock() { diff --git a/tests/lib/Output/FieldTypeSerializerTest.php b/tests/lib/Output/FieldTypeSerializerTest.php index b0002cac..f572ff7b 100644 --- a/tests/lib/Output/FieldTypeSerializerTest.php +++ b/tests/lib/Output/FieldTypeSerializerTest.php @@ -6,12 +6,12 @@ */ namespace Ibexa\Tests\Rest\Output; -use eZ\Publish\API\Repository\FieldTypeService; -use eZ\Publish\API\Repository\Values\Content\Field; +use Ibexa\Contracts\Core\Repository\FieldTypeService; +use Ibexa\Contracts\Core\Repository\Values\Content\Field; use Ibexa\Contracts\Rest\Output\Generator; -use eZ\Publish\API\Repository\FieldType as APIFieldType; -use eZ\Publish\API\Repository\Values\ContentType\ContentType as APIContentType; -use eZ\Publish\Core\Repository\Values\ContentType\FieldDefinition; +use Ibexa\Contracts\Core\Repository\FieldType as APIFieldType; +use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType as APIContentType; +use Ibexa\Core\Repository\Values\ContentType\FieldDefinition; use Ibexa\Rest\FieldTypeProcessorRegistry; use Ibexa\Contracts\Rest\FieldTypeProcessor; use Ibexa\Rest\Output\FieldTypeSerializer; diff --git a/tests/lib/Output/Generator/FieldTypeHashGeneratorBaseTest.php b/tests/lib/Output/Generator/FieldTypeHashGeneratorBaseTest.php index 11a9cdc6..8594b6e7 100644 --- a/tests/lib/Output/Generator/FieldTypeHashGeneratorBaseTest.php +++ b/tests/lib/Output/Generator/FieldTypeHashGeneratorBaseTest.php @@ -38,7 +38,7 @@ abstract protected function initializeFieldTypeHashGenerator(); /** * Initializes the generator. * - * @return \EzSystems\EzPlatformRest\Output\Generator + * @return \Ibexa\Contracts\Rest\Output\Generator */ abstract protected function initializeGenerator(); diff --git a/tests/lib/Output/Generator/Json/FieldTypeHashGeneratorTest.php b/tests/lib/Output/Generator/Json/FieldTypeHashGeneratorTest.php index 2cc8823e..caafeb7f 100644 --- a/tests/lib/Output/Generator/Json/FieldTypeHashGeneratorTest.php +++ b/tests/lib/Output/Generator/Json/FieldTypeHashGeneratorTest.php @@ -15,7 +15,7 @@ class FieldTypeHashGeneratorTest extends FieldTypeHashGeneratorBaseTest /** * Initializes the field type hash generator. * - * @return \EzSystems\EzPlatformRest\Output\Generator\Json\FieldTypeHashGenerator + * @return \Ibexa\Rest\Output\Generator\Json\FieldTypeHashGenerator */ protected function initializeFieldTypeHashGenerator() { @@ -25,7 +25,7 @@ protected function initializeFieldTypeHashGenerator() /** * Initializes the generator. * - * @return \EzSystems\EzPlatformRest\Output\Generator + * @return \Ibexa\Contracts\Rest\Output\Generator */ protected function initializeGenerator() { diff --git a/tests/lib/Output/Generator/Xml/FieldTypeHashGeneratorTest.php b/tests/lib/Output/Generator/Xml/FieldTypeHashGeneratorTest.php index 590943db..86fdce16 100644 --- a/tests/lib/Output/Generator/Xml/FieldTypeHashGeneratorTest.php +++ b/tests/lib/Output/Generator/Xml/FieldTypeHashGeneratorTest.php @@ -15,7 +15,7 @@ class FieldTypeHashGeneratorTest extends FieldTypeHashGeneratorBaseTest /** * Initializes the field type hash generator. * - * @return \EzSystems\EzPlatformRest\Output\Generator\Xml\FieldTypeHashGenerator + * @return \Ibexa\Rest\Output\Generator\Xml\FieldTypeHashGenerator */ protected function initializeFieldTypeHashGenerator() { @@ -25,7 +25,7 @@ protected function initializeFieldTypeHashGenerator() /** * Initializes the generator. * - * @return \EzSystems\EzPlatformRest\Output\Generator + * @return \Ibexa\Contracts\Rest\Output\Generator */ protected function initializeGenerator() { diff --git a/tests/lib/Output/GeneratorTest.php b/tests/lib/Output/GeneratorTest.php index e3ca5d33..5f2b7d42 100644 --- a/tests/lib/Output/GeneratorTest.php +++ b/tests/lib/Output/GeneratorTest.php @@ -15,12 +15,12 @@ abstract class GeneratorTest extends TestCase { /** - * @var \EzSystems\EzPlatformRest\Output\Generator + * @var \Ibexa\Contracts\Rest\Output\Generator */ protected $generator; /** - * @return \EzSystems\EzPlatformRest\Output\Generator + * @return \Ibexa\Contracts\Rest\Output\Generator */ abstract protected function getGenerator(); diff --git a/tests/lib/Output/ValueObjectVisitorBaseTest.php b/tests/lib/Output/ValueObjectVisitorBaseTest.php index 0cd92c65..97ff1438 100644 --- a/tests/lib/Output/ValueObjectVisitorBaseTest.php +++ b/tests/lib/Output/ValueObjectVisitorBaseTest.php @@ -21,19 +21,19 @@ abstract class ValueObjectVisitorBaseTest extends Server\BaseTest /** * Visitor mock. * - * @var \EzSystems\EzPlatformRest\Output\Visitor + * @var \Ibexa\Contracts\Rest\Output\Visitor */ protected $visitorMock; /** * Output generator. * - * @var \EzSystems\EzPlatformRest\Output\Generator\Xml + * @var \Ibexa\Rest\Output\Generator\Xml */ protected $generator; /** - * @var \EzSystems\EzPlatformRest\RequestParser + * @var \Ibexa\Rest\RequestParser */ protected $requestParser; @@ -56,7 +56,7 @@ abstract class ValueObjectVisitorBaseTest extends Server\BaseTest /** * Gets the visitor mock. * - * @return \EzSystems\EzPlatformRest\Output\Visitor|\PHPUnit\Framework\MockObject\MockObject + * @return \Ibexa\Contracts\Rest\Output\Visitor|\PHPUnit\Framework\MockObject\MockObject */ protected function getVisitorMock() { @@ -88,7 +88,7 @@ protected function getResponseMock() /** * Gets the output generator. * - * @return \EzSystems\EzPlatformRest\Output\Generator\Xml + * @return \Ibexa\Rest\Output\Generator\Xml */ protected function getGenerator() { @@ -137,7 +137,7 @@ protected function getVisitor() } /** - * @return \EzSystems\EzPlatformRest\RequestParser|\PHPUnit\Framework\MockObject\MockObject + * @return \Ibexa\Rest\RequestParser|\PHPUnit\Framework\MockObject\MockObject */ protected function getRequestParser() { @@ -222,7 +222,7 @@ protected function addTemplatedRouteExpectation($routeName, $arguments, $returnV /** * Must return an instance of the tested visitor object. * - * @return \EzSystems\EzPlatformRest\Output\ValueObjectVisitor + * @return \Ibexa\Contracts\Rest\Output\ValueObjectVisitor */ abstract protected function internalGetVisitor(); } diff --git a/tests/lib/Output/ValueObjectVisitorDispatcherTest.php b/tests/lib/Output/ValueObjectVisitorDispatcherTest.php index 2370e63a..44392f84 100644 --- a/tests/lib/Output/ValueObjectVisitorDispatcherTest.php +++ b/tests/lib/Output/ValueObjectVisitorDispatcherTest.php @@ -123,7 +123,7 @@ private function getValueObjectDispatcher() } /** - * @return \PHPUnit\Framework\MockObject\MockObject|\EzSystems\EzPlatformRest\Output\ValueObjectVisitor + * @return \PHPUnit\Framework\MockObject\MockObject|\Ibexa\Contracts\Rest\Output\ValueObjectVisitor */ private function getValueObjectVisitorMock() { diff --git a/tests/lib/Output/VisitorTest.php b/tests/lib/Output/VisitorTest.php index 85f0f8d4..4f7b8a4c 100644 --- a/tests/lib/Output/VisitorTest.php +++ b/tests/lib/Output/VisitorTest.php @@ -119,7 +119,7 @@ public function testSetHeaders() /** * @todo This is a test for a feature that needs refactoring. * - * @see \EzSystems\EzPlatformRest\Output\Visitor::visit + * @see \Ibexa\Contracts\Rest\Output\Visitor::visit */ public function testSetFilteredHeaders() { diff --git a/tests/lib/Server/Input/Parser/BaseTest.php b/tests/lib/Server/Input/Parser/BaseTest.php index 2ad87009..8704ee17 100644 --- a/tests/lib/Server/Input/Parser/BaseTest.php +++ b/tests/lib/Server/Input/Parser/BaseTest.php @@ -17,24 +17,24 @@ abstract class BaseTest extends ParentBaseTest { /** - * @var \EzSystems\EzPlatformRest\Input\ParsingDispatcher|\PHPUnit\Framework\MockObject\MockObject + * @var \Ibexa\Contracts\Rest\Input\ParsingDispatcher|\PHPUnit\Framework\MockObject\MockObject */ protected $parsingDispatcherMock; /** - * @var \EzSystems\EzPlatformRest\RequestParser|\PHPUnit\Framework\MockObject\MockObject + * @var \Ibexa\Rest\RequestParser|\PHPUnit\Framework\MockObject\MockObject */ protected $requestParserMock; /** - * @var \EzSystems\EzPlatformRest\Input\ParserTools + * @var \Ibexa\Rest\Input\ParserTools */ protected $parserTools; /** * Get the parsing dispatcher. * - * @return \EzSystems\EzPlatformRest\Input\ParsingDispatcher + * @return \Ibexa\Contracts\Rest\Input\ParsingDispatcher */ protected function getParsingDispatcherMock() { @@ -61,7 +61,7 @@ public function getParseHrefExpectationsMap() /** * Get the Request parser. * - * @return \EzSystems\EzPlatformRest\RequestParser|\PHPUnit\Framework\MockObject\MockObject + * @return \Ibexa\Rest\RequestParser|\PHPUnit\Framework\MockObject\MockObject */ protected function getRequestParserMock() { @@ -96,7 +96,7 @@ protected function getRequestParserMock() /** * Get the parser tools. * - * @return \EzSystems\EzPlatformRest\Input\ParserTools + * @return \Ibexa\Rest\Input\ParserTools */ protected function getParserTools() { @@ -118,7 +118,7 @@ protected function getParser() /** * Must return the tested parser object. * - * @return \EzSystems\EzPlatformRest\Server\Input\Parser\Base + * @return \Ibexa\Rest\Server\Input\Parser\Base */ abstract protected function internalGetParser(); } diff --git a/tests/lib/Server/Input/Parser/ContentCreateTest.php b/tests/lib/Server/Input/Parser/ContentCreateTest.php index 1c412efa..dc8013b2 100644 --- a/tests/lib/Server/Input/Parser/ContentCreateTest.php +++ b/tests/lib/Server/Input/Parser/ContentCreateTest.php @@ -6,17 +6,17 @@ */ namespace Ibexa\Tests\Rest\Server\Input\Parser; -use eZ\Publish\API\Repository\Values\Content\LocationCreateStruct; -use eZ\Publish\Core\Repository\ContentService; -use eZ\Publish\Core\Repository\ContentTypeService; -use eZ\Publish\Core\Repository\Values\ContentType\FieldDefinition; -use eZ\Publish\Core\Repository\Values\Content\ContentCreateStruct; -use eZ\Publish\Core\Repository\Values\ContentType\ContentType; -use eZ\Publish\Core\Repository\Values\ContentType\FieldDefinitionCollection; +use Ibexa\Contracts\Core\Repository\Values\Content\LocationCreateStruct; +use Ibexa\Core\Repository\ContentService; +use Ibexa\Core\Repository\ContentTypeService; +use Ibexa\Core\Repository\Values\ContentType\FieldDefinition; +use Ibexa\Core\Repository\Values\Content\ContentCreateStruct; +use Ibexa\Core\Repository\Values\ContentType\ContentType; +use Ibexa\Core\Repository\Values\ContentType\FieldDefinitionCollection; use Ibexa\Rest\Server\Input\Parser\ContentCreate; use Ibexa\Rest\Server\Input\Parser\LocationCreate; use Ibexa\Rest\Input\FieldTypeParser; -use eZ\Publish\API\Repository\FieldTypeService; +use Ibexa\Contracts\Core\Repository\FieldTypeService; use Ibexa\Contracts\Rest\Exceptions\Parser; class ContentCreateTest extends BaseTest @@ -493,7 +493,7 @@ public function testParseExceptionOnMissingFieldValue() /** * Returns the ContentCreate parser. * - * @return \EzSystems\EzPlatformRest\Server\Input\Parser\ContentCreate + * @return \Ibexa\Rest\Server\Input\Parser\ContentCreate */ protected function internalGetParser() { @@ -509,7 +509,7 @@ protected function internalGetParser() /** * Get the field type parser mock object. * - * @return \EzSystems\EzPlatformRest\Input\FieldTypeParser ; + * @return \Ibexa\Rest\Input\FieldTypeParser ; */ private function getFieldTypeParserMock() { @@ -536,7 +536,7 @@ private function getFieldTypeParserMock() /** * Returns the LocationCreate parser mock object. * - * @return \EzSystems\EzPlatformRest\Server\Input\Parser\LocationCreate + * @return \Ibexa\Rest\Server\Input\Parser\LocationCreate */ private function getLocationCreateParserMock() { @@ -553,7 +553,7 @@ private function getLocationCreateParserMock() /** * Get the content service mock object. * - * @return \eZ\Publish\API\Repository\ContentService + * @return \Ibexa\Contracts\Core\Repository\ContentService */ protected function getContentServiceMock() { @@ -581,7 +581,7 @@ protected function getContentServiceMock() /** * Get the content type service mock object. * - * @return \eZ\Publish\API\Repository\ContentTypeService + * @return \Ibexa\Contracts\Core\Repository\ContentTypeService */ protected function getContentTypeServiceMock() { @@ -607,7 +607,7 @@ public function getParseHrefExpectationsMap() /** * Get the content type used in ContentCreate parser. * - * @return \eZ\Publish\API\Repository\Values\ContentType\ContentType + * @return \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType */ protected function getContentType() { diff --git a/tests/lib/Server/Input/Parser/ContentObjectStatesTest.php b/tests/lib/Server/Input/Parser/ContentObjectStatesTest.php index 7d7ddbaa..b072ffb4 100644 --- a/tests/lib/Server/Input/Parser/ContentObjectStatesTest.php +++ b/tests/lib/Server/Input/Parser/ContentObjectStatesTest.php @@ -89,7 +89,7 @@ public function getParseHrefExpectationsMap() /** * Gets the ContentObjectStates parser. * - * @return \EzSystems\EzPlatformRest\Input\Parser\ContentObjectStates ; + * @return \Ibexa\Rest\Input\Parser\ContentObjectStates ; */ protected function internalGetParser() { diff --git a/tests/lib/Server/Input/Parser/ContentTypeCreateTest.php b/tests/lib/Server/Input/Parser/ContentTypeCreateTest.php index 4c7c11b5..f4b486e9 100644 --- a/tests/lib/Server/Input/Parser/ContentTypeCreateTest.php +++ b/tests/lib/Server/Input/Parser/ContentTypeCreateTest.php @@ -6,10 +6,10 @@ */ namespace Ibexa\Tests\Rest\Server\Input\Parser; -use eZ\Publish\API\Repository\Values\Content\Location; -use eZ\Publish\API\Repository\Values\ContentType\FieldDefinitionCreateStruct; -use eZ\Publish\Core\Repository\ContentTypeService; -use eZ\Publish\Core\Repository\Values\ContentType\ContentTypeCreateStruct; +use Ibexa\Contracts\Core\Repository\Values\Content\Location; +use Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinitionCreateStruct; +use Ibexa\Core\Repository\ContentTypeService; +use Ibexa\Core\Repository\Values\ContentType\ContentTypeCreateStruct; use Ibexa\Rest\Server\Input\Parser\FieldDefinitionCreate; use Ibexa\Rest\Server\Input\Parser\ContentTypeCreate; use Ibexa\Contracts\Rest\Exceptions\Parser; @@ -234,7 +234,7 @@ public function testParseExceptionOnInvalidFieldDefinition() /** * Returns the ContentTypeCreate parser. * - * @return \EzSystems\EzPlatformRest\Server\Input\Parser\ContentTypeCreate + * @return \Ibexa\Rest\Server\Input\Parser\ContentTypeCreate */ protected function internalGetParser() { @@ -248,7 +248,7 @@ protected function internalGetParser() /** * Returns the FieldDefinitionCreate parser mock object. * - * @return \EzSystems\EzPlatformRest\Server\Input\Parser\FieldDefinitionCreate + * @return \Ibexa\Rest\Server\Input\Parser\FieldDefinitionCreate */ private function getFieldDefinitionCreateParserMock() { @@ -265,7 +265,7 @@ private function getFieldDefinitionCreateParserMock() /** * Get the content type service mock object. * - * @return \eZ\Publish\API\Repository\ContentTypeService + * @return \Ibexa\Contracts\Core\Repository\ContentTypeService */ protected function getContentTypeServiceMock() { diff --git a/tests/lib/Server/Input/Parser/ContentTypeGroupInputTest.php b/tests/lib/Server/Input/Parser/ContentTypeGroupInputTest.php index 661cb28a..6f0d88f9 100644 --- a/tests/lib/Server/Input/Parser/ContentTypeGroupInputTest.php +++ b/tests/lib/Server/Input/Parser/ContentTypeGroupInputTest.php @@ -6,9 +6,9 @@ */ namespace Ibexa\Tests\Rest\Server\Input\Parser; -use eZ\Publish\Core\Repository\ContentTypeService; +use Ibexa\Core\Repository\ContentTypeService; use Ibexa\Rest\Server\Input\Parser\ContentTypeGroupInput; -use eZ\Publish\API\Repository\Values\ContentType\ContentTypeGroupCreateStruct; +use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentTypeGroupCreateStruct; use Ibexa\Contracts\Rest\Exceptions\Parser; class ContentTypeGroupInputTest extends BaseTest @@ -74,7 +74,7 @@ public function testParseExceptionOnInvalidUser() /** * Returns the content type group input parser. * - * @return \EzSystems\EzPlatformRest\Server\Input\Parser\ContentTypeGroupInput + * @return \Ibexa\Rest\Server\Input\Parser\ContentTypeGroupInput */ protected function internalGetParser() { @@ -87,7 +87,7 @@ protected function internalGetParser() /** * Get the content type service mock object. * - * @return \eZ\Publish\API\Repository\ContentTypeService + * @return \Ibexa\Contracts\Core\Repository\ContentTypeService */ protected function getContentTypeServiceMock() { diff --git a/tests/lib/Server/Input/Parser/ContentTypeUpdateTest.php b/tests/lib/Server/Input/Parser/ContentTypeUpdateTest.php index 26ea357f..c0a8b8f0 100644 --- a/tests/lib/Server/Input/Parser/ContentTypeUpdateTest.php +++ b/tests/lib/Server/Input/Parser/ContentTypeUpdateTest.php @@ -6,9 +6,9 @@ */ namespace Ibexa\Tests\Rest\Server\Input\Parser; -use eZ\Publish\API\Repository\Values\Content\Location; -use eZ\Publish\API\Repository\Values\ContentType\ContentTypeUpdateStruct; -use eZ\Publish\Core\Repository\ContentTypeService; +use Ibexa\Contracts\Core\Repository\Values\Content\Location; +use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentTypeUpdateStruct; +use Ibexa\Core\Repository\ContentTypeService; use Ibexa\Rest\Server\Input\Parser\ContentTypeUpdate; use Ibexa\Contracts\Rest\Exceptions\Parser; @@ -152,7 +152,7 @@ public function testParseExceptionOnInvalidUser() /** * Returns the ContentTypeUpdate parser. * - * @return \EzSystems\EzPlatformRest\Server\Input\Parser\ContentTypeUpdate + * @return \Ibexa\Rest\Server\Input\Parser\ContentTypeUpdate */ protected function internalGetParser() { @@ -165,7 +165,7 @@ protected function internalGetParser() /** * Get the content type service mock object. * - * @return \eZ\Publish\API\Repository\ContentTypeService + * @return \Ibexa\Contracts\Core\Repository\ContentTypeService */ protected function getContentTypeServiceMock() { diff --git a/tests/lib/Server/Input/Parser/ContentUpdateTest.php b/tests/lib/Server/Input/Parser/ContentUpdateTest.php index 80acdbed..716ddcb5 100644 --- a/tests/lib/Server/Input/Parser/ContentUpdateTest.php +++ b/tests/lib/Server/Input/Parser/ContentUpdateTest.php @@ -17,7 +17,7 @@ class ContentUpdateTest extends BaseTest /** * Tests the ContentUpdate parser. * - * @return \EzSystems\EzPlatformRest\Values\RestContentMetadataUpdateStruct + * @return \Ibexa\Rest\Values\RestContentMetadataUpdateStruct */ public function testParseValid() { @@ -40,7 +40,7 @@ public function testParseValid() /** * Test for valid owner ID value in result. * - * @param \EzSystems\EzPlatformRest\Values\RestContentMetadataUpdateStruct $result + * @param \Ibexa\Rest\Values\RestContentMetadataUpdateStruct $result * * @depends testParseValid */ @@ -130,7 +130,7 @@ public function providerForTestParseFailureInvalidDate() /** * Returns the ContentUpdate parser. * - * @return \EzSystems\EzPlatformRest\Server\Input\Parser\ContentUpdate + * @return \Ibexa\Rest\Server\Input\Parser\ContentUpdate */ protected function internalGetParser() { @@ -140,7 +140,7 @@ protected function internalGetParser() /** * Returns a valid RestContentMetadataUpdateStruct that matches the structure from getValidInputData(). * - * @return \EzSystems\EzPlatformRest\Values\RestContentMetadataUpdateStruct + * @return \Ibexa\Rest\Values\RestContentMetadataUpdateStruct */ protected function getContentUpdateStruct() { diff --git a/tests/lib/Server/Input/Parser/Criterion/DateMetadataTest.php b/tests/lib/Server/Input/Parser/Criterion/DateMetadataTest.php index 642ec8bd..3abfbb04 100644 --- a/tests/lib/Server/Input/Parser/Criterion/DateMetadataTest.php +++ b/tests/lib/Server/Input/Parser/Criterion/DateMetadataTest.php @@ -7,8 +7,8 @@ namespace Ibexa\Tests\Rest\Server\Input\Parser\Criterion; use Ibexa\Tests\Rest\Server\Input\Parser\BaseTest; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\DateMetadata as DateMetadataCriterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\DateMetadata as DateMetadataCriterion; use Ibexa\Rest\Server\Input\Parser\Criterion\DateMetadata; use Ibexa\Contracts\Rest\Exceptions; diff --git a/tests/lib/Server/Input/Parser/Criterion/LogicalAndTest.php b/tests/lib/Server/Input/Parser/Criterion/LogicalAndTest.php index e19416f8..f45fdaf5 100644 --- a/tests/lib/Server/Input/Parser/Criterion/LogicalAndTest.php +++ b/tests/lib/Server/Input/Parser/Criterion/LogicalAndTest.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Tests\Rest\Server\Input\Parser\Criterion; -use eZ\Publish\API\Repository\Values\Content; +use Ibexa\Core\Repository\Values\Content; use Ibexa\Contracts\Rest\Exceptions\Parser as ParserException; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Rest\Server\Input\Parser; @@ -54,7 +54,7 @@ public function testParseLogicalAnd() $criterionMock = $this->createMock(Content\Query\Criterion::class, [], [], '', false); - $parserMock = $this->createMock(\EzSystems\EzPlatformRest\Input\Parser::class); + $parserMock = $this->createMock(\Ibexa\Contracts\Rest\Input\Parser::class); $parserMock->method('parse')->willReturn($criterionMock); $result = $this->internalGetParser()->parse($logicalAndParsedFromXml, new ParsingDispatcher([ diff --git a/tests/lib/Server/Input/Parser/Criterion/LogicalOrTest.php b/tests/lib/Server/Input/Parser/Criterion/LogicalOrTest.php index c61e90a5..92762c7d 100644 --- a/tests/lib/Server/Input/Parser/Criterion/LogicalOrTest.php +++ b/tests/lib/Server/Input/Parser/Criterion/LogicalOrTest.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Tests\Rest\Server\Input\Parser\Criterion; -use eZ\Publish\API\Repository\Values\Content; +use Ibexa\Core\Repository\Values\Content; use Ibexa\Contracts\Rest\Exceptions\Parser as ParserException; use Ibexa\Contracts\Rest\Input\ParsingDispatcher; use Ibexa\Rest\Server\Input\Parser; @@ -66,7 +66,7 @@ public function testParseLogicalOr() $criterionMock = $this->createMock(Content\Query\Criterion::class, [], [], '', false); - $parserMock = $this->createMock(\EzSystems\EzPlatformRest\Input\Parser::class); + $parserMock = $this->createMock(\Ibexa\Contracts\Rest\Input\Parser::class); $parserMock->method('parse')->willReturn($criterionMock); $result = $this->internalGetParser()->parse($logicalOrParsedFromXml, new ParsingDispatcher([ diff --git a/tests/lib/Server/Input/Parser/Criterion/SiblingTest.php b/tests/lib/Server/Input/Parser/Criterion/SiblingTest.php index 136acd06..a9e993e7 100644 --- a/tests/lib/Server/Input/Parser/Criterion/SiblingTest.php +++ b/tests/lib/Server/Input/Parser/Criterion/SiblingTest.php @@ -8,9 +8,9 @@ namespace Ibexa\Tests\Rest\Server\Input\Parser\Criterion; -use eZ\Publish\API\Repository\LocationService; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Sibling as SiblingCriterion; -use eZ\Publish\Core\Repository\Values\Content\Location; +use Ibexa\Contracts\Core\Repository\LocationService; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Sibling as SiblingCriterion; +use Ibexa\Core\Repository\Values\Content\Location; use Ibexa\Contracts\Rest\Exceptions\Parser as ParserExpcetion; use Ibexa\Rest\Server\Input\Parser\Criterion\Sibling as SiblingParser; use Ibexa\Tests\Rest\Server\Input\Parser\BaseTest; @@ -20,7 +20,7 @@ final class SiblingTest extends BaseTest private const EXAMPLE_LOCATION_ID = 54; private const EXAMPLE_PARENT_LOCATION_ID = 2; - /** @var \eZ\Publish\API\Repository\LocationService */ + /** @var \Ibexa\Contracts\Core\Repository\LocationService */ private $locationService; protected function setUp(): void diff --git a/tests/lib/Server/Input/Parser/Criterion/UserMetadataTest.php b/tests/lib/Server/Input/Parser/Criterion/UserMetadataTest.php index 672707b1..541c9c9e 100644 --- a/tests/lib/Server/Input/Parser/Criterion/UserMetadataTest.php +++ b/tests/lib/Server/Input/Parser/Criterion/UserMetadataTest.php @@ -6,8 +6,8 @@ */ namespace Ibexa\Tests\Rest\Server\Input\Parser\Criterion; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator; -use eZ\Publish\API\Repository\Values\Content\Query\Criterion\UserMetadata as UserMetadataCriterion; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\Operator; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\Criterion\UserMetadata as UserMetadataCriterion; use Ibexa\Rest\Server\Input\Parser\Criterion\UserMetadata; use Ibexa\Tests\Rest\Server\Input\Parser\BaseTest; use Ibexa\Contracts\Rest\Exceptions\Parser; @@ -121,7 +121,7 @@ public function testParseExceptionOnWrongValueType() /** * Returns the UserMetadata criterion parser. * - * @return \EzSystems\EzPlatformRest\Server\Input\Parser\Criterion\UserMetadata + * @return \Ibexa\Rest\Server\Input\Parser\Criterion\UserMetadata */ protected function internalGetParser() { diff --git a/tests/lib/Server/Input/Parser/FacetBuilder/FacetBuilderBaseTest.php b/tests/lib/Server/Input/Parser/FacetBuilder/FacetBuilderBaseTest.php index 6ad4fc63..c2ad89a0 100644 --- a/tests/lib/Server/Input/Parser/FacetBuilder/FacetBuilderBaseTest.php +++ b/tests/lib/Server/Input/Parser/FacetBuilder/FacetBuilderBaseTest.php @@ -22,7 +22,7 @@ abstract class FacetBuilderBaseTest extends BaseTest { /** - * @return \EzSystems\EzPlatformRest\Input\ParsingDispatcher + * @return \Ibexa\Contracts\Rest\Input\ParsingDispatcher */ protected function getParsingDispatcher() { @@ -79,7 +79,7 @@ protected function getParsingDispatcher() /** * Returns the query parser. * - * @return \EzSystems\EzPlatformRest\Server\Input\Parser\ContentQuery + * @return \Ibexa\Rest\Server\Input\Parser\ContentQuery */ protected function internalGetParser() { diff --git a/tests/lib/Server/Input/Parser/FacetBuilder/FacetBuilderParserTest.php b/tests/lib/Server/Input/Parser/FacetBuilder/FacetBuilderParserTest.php index 218f0c84..083ed1d0 100644 --- a/tests/lib/Server/Input/Parser/FacetBuilder/FacetBuilderParserTest.php +++ b/tests/lib/Server/Input/Parser/FacetBuilder/FacetBuilderParserTest.php @@ -6,15 +6,15 @@ */ namespace Ibexa\Tests\Rest\Server\Input\Parser\FacetBuilder; -use eZ\Publish\Core\Repository\Values\Content\Location; -use eZ\Publish\API\Repository\Values\Content\Query; -use eZ\Publish\API\Repository\Values\Content\Query\FacetBuilder\ContentTypeFacetBuilder; -use eZ\Publish\API\Repository\Values\Content\Query\FacetBuilder\CriterionFacetBuilder; -use eZ\Publish\API\Repository\Values\Content\Query\FacetBuilder\FieldFacetBuilder; -use eZ\Publish\API\Repository\Values\Content\Query\FacetBuilder\LocationFacetBuilder; -use eZ\Publish\API\Repository\Values\Content\Query\FacetBuilder\SectionFacetBuilder; -use eZ\Publish\API\Repository\Values\Content\Query\FacetBuilder\TermFacetBuilder; -use eZ\Publish\API\Repository\Values\Content\Query\FacetBuilder\UserFacetBuilder; +use Ibexa\Core\Repository\Values\Content\Location; +use Ibexa\Contracts\Core\Repository\Values\Content\Query; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\FacetBuilder\ContentTypeFacetBuilder; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\FacetBuilder\CriterionFacetBuilder; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\FacetBuilder\FieldFacetBuilder; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\FacetBuilder\LocationFacetBuilder; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\FacetBuilder\SectionFacetBuilder; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\FacetBuilder\TermFacetBuilder; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\FacetBuilder\UserFacetBuilder; use Ibexa\Rest\Server\Input\Parser\Criterion\LocationId; class FacetBuilderParserTest extends FacetBuilderBaseTest diff --git a/tests/lib/Server/Input/Parser/FieldDefinitionCreateTest.php b/tests/lib/Server/Input/Parser/FieldDefinitionCreateTest.php index 1f3bb822..54f7bde9 100644 --- a/tests/lib/Server/Input/Parser/FieldDefinitionCreateTest.php +++ b/tests/lib/Server/Input/Parser/FieldDefinitionCreateTest.php @@ -6,8 +6,8 @@ */ namespace Ibexa\Tests\Rest\Server\Input\Parser; -use eZ\Publish\API\Repository\Values\ContentType\FieldDefinitionCreateStruct; -use eZ\Publish\Core\Repository\ContentTypeService; +use Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinitionCreateStruct; +use Ibexa\Core\Repository\ContentTypeService; use Ibexa\Rest\Server\Input\Parser\FieldDefinitionCreate; use Ibexa\Rest\Input\FieldTypeParser; use Ibexa\Contracts\Rest\Exceptions\Parser; @@ -172,7 +172,7 @@ public function testParseExceptionOnInvalidDescriptions() /** * Returns the FieldDefinitionCreate parser. * - * @return \EzSystems\EzPlatformRest\Server\Input\Parser\FieldDefinitionCreate + * @return \Ibexa\Rest\Server\Input\Parser\FieldDefinitionCreate */ protected function internalGetParser() { @@ -186,7 +186,7 @@ protected function internalGetParser() /** * Get the FieldTypeParser mock object. * - * @return \EzSystems\EzPlatformRest\Input\FieldTypeParser + * @return \Ibexa\Rest\Input\FieldTypeParser */ protected function getFieldTypeParserMock() { @@ -217,7 +217,7 @@ protected function getFieldTypeParserMock() /** * Get the content type service mock object. * - * @return \eZ\Publish\API\Repository\ContentTypeService + * @return \Ibexa\Contracts\Core\Repository\ContentTypeService */ protected function getContentTypeServiceMock() { diff --git a/tests/lib/Server/Input/Parser/FieldDefinitionUpdateTest.php b/tests/lib/Server/Input/Parser/FieldDefinitionUpdateTest.php index 2ff7e0ce..a45f8345 100644 --- a/tests/lib/Server/Input/Parser/FieldDefinitionUpdateTest.php +++ b/tests/lib/Server/Input/Parser/FieldDefinitionUpdateTest.php @@ -6,13 +6,13 @@ */ namespace Ibexa\Tests\Rest\Server\Input\Parser; -use eZ\Publish\API\Repository\Values\ContentType\FieldDefinitionUpdateStruct; -use eZ\Publish\Core\Repository\ContentTypeService; -use eZ\Publish\Core\Repository\Values\ContentType\ContentTypeDraft; -use eZ\Publish\Core\Repository\Values\ContentType\FieldDefinitionCollection; +use Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinitionUpdateStruct; +use Ibexa\Core\Repository\ContentTypeService; +use Ibexa\Core\Repository\Values\ContentType\ContentTypeDraft; +use Ibexa\Core\Repository\Values\ContentType\FieldDefinitionCollection; use Ibexa\Rest\Server\Input\Parser\FieldDefinitionUpdate; -use eZ\Publish\Core\Repository\Values\ContentType\ContentType; -use eZ\Publish\Core\Repository\Values\ContentType\FieldDefinition; +use Ibexa\Core\Repository\Values\ContentType\ContentType; +use Ibexa\Core\Repository\Values\ContentType\FieldDefinition; use Ibexa\Rest\Input\FieldTypeParser; use Ibexa\Contracts\Rest\Exceptions\Parser; @@ -142,7 +142,7 @@ public function testParseExceptionOnInvalidDescriptions() /** * Returns the FieldDefinitionUpdate parser. * - * @return \EzSystems\EzPlatformRest\Server\Input\Parser\FieldDefinitionUpdate + * @return \Ibexa\Rest\Server\Input\Parser\FieldDefinitionUpdate */ protected function internalGetParser() { @@ -156,7 +156,7 @@ protected function internalGetParser() /** * Get the FieldTypeParser mock object. * - * @return \EzSystems\EzPlatformRest\Input\FieldTypeParser + * @return \Ibexa\Rest\Input\FieldTypeParser */ protected function getFieldTypeParserMock() { @@ -187,7 +187,7 @@ protected function getFieldTypeParserMock() /** * Get the content type service mock object. * - * @return \eZ\Publish\API\Repository\ContentTypeService + * @return \Ibexa\Contracts\Core\Repository\ContentTypeService */ protected function getContentTypeServiceMock() { diff --git a/tests/lib/Server/Input/Parser/Limitation/PathStringRouteBasedLimitationParserTest.php b/tests/lib/Server/Input/Parser/Limitation/PathStringRouteBasedLimitationParserTest.php index 014837e4..e1f09940 100644 --- a/tests/lib/Server/Input/Parser/Limitation/PathStringRouteBasedLimitationParserTest.php +++ b/tests/lib/Server/Input/Parser/Limitation/PathStringRouteBasedLimitationParserTest.php @@ -33,7 +33,7 @@ public function testParse() /** * Must return the tested parser object. * - * @return \EzSystems\EzPlatformRest\Server\Input\Parser\Limitation\RouteBasedLimitationParser + * @return \Ibexa\Rest\Server\Input\Parser\Limitation\RouteBasedLimitationParser */ protected function internalGetParser() { diff --git a/tests/lib/Server/Input/Parser/Limitation/RouteBasedLimitationParserTest.php b/tests/lib/Server/Input/Parser/Limitation/RouteBasedLimitationParserTest.php index 8c72c4a5..be38f62a 100644 --- a/tests/lib/Server/Input/Parser/Limitation/RouteBasedLimitationParserTest.php +++ b/tests/lib/Server/Input/Parser/Limitation/RouteBasedLimitationParserTest.php @@ -33,7 +33,7 @@ public function testParse() /** * Must return the tested parser object. * - * @return \EzSystems\EzPlatformRest\Server\Input\Parser\Limitation\RouteBasedLimitationParser + * @return \Ibexa\Rest\Server\Input\Parser\Limitation\RouteBasedLimitationParser */ protected function internalGetParser() { diff --git a/tests/lib/Server/Input/Parser/LocationCreateTest.php b/tests/lib/Server/Input/Parser/LocationCreateTest.php index 0ce5c18f..42b5987d 100644 --- a/tests/lib/Server/Input/Parser/LocationCreateTest.php +++ b/tests/lib/Server/Input/Parser/LocationCreateTest.php @@ -6,10 +6,10 @@ */ namespace Ibexa\Tests\Rest\Server\Input\Parser; -use eZ\Publish\Core\Repository\LocationService; +use Ibexa\Core\Repository\LocationService; use Ibexa\Rest\Server\Input\Parser\LocationCreate; -use eZ\Publish\API\Repository\Values\Content\LocationCreateStruct; -use eZ\Publish\API\Repository\Values\Content\Location; +use Ibexa\Contracts\Core\Repository\Values\Content\LocationCreateStruct; +use Ibexa\Contracts\Core\Repository\Values\Content\Location; use Ibexa\Contracts\Rest\Exceptions\Parser; class LocationCreateTest extends BaseTest @@ -159,7 +159,7 @@ public function testParseExceptionOnMissingSortOrder() /** * Returns the LocationCreateStruct parser. * - * @return \EzSystems\EzPlatformRest\Server\Input\Parser\LocationCreate + * @return \Ibexa\Rest\Server\Input\Parser\LocationCreate */ protected function internalGetParser() { @@ -172,7 +172,7 @@ protected function internalGetParser() /** * Get the location service mock object. * - * @return \eZ\Publish\API\Repository\LocationService + * @return \Ibexa\Contracts\Core\Repository\LocationService */ protected function getLocationServiceMock() { diff --git a/tests/lib/Server/Input/Parser/LocationUpdateTest.php b/tests/lib/Server/Input/Parser/LocationUpdateTest.php index 3d6cba2d..4fafee72 100644 --- a/tests/lib/Server/Input/Parser/LocationUpdateTest.php +++ b/tests/lib/Server/Input/Parser/LocationUpdateTest.php @@ -6,10 +6,10 @@ */ namespace Ibexa\Tests\Rest\Server\Input\Parser; -use eZ\Publish\Core\Repository\LocationService; +use Ibexa\Core\Repository\LocationService; use Ibexa\Rest\Server\Input\Parser\LocationUpdate; -use eZ\Publish\API\Repository\Values\Content\LocationUpdateStruct; -use eZ\Publish\API\Repository\Values\Content\Location; +use Ibexa\Contracts\Core\Repository\Values\Content\LocationUpdateStruct; +use Ibexa\Contracts\Core\Repository\Values\Content\Location; use Ibexa\Rest\Server\Values\RestLocationUpdateStruct; use Ibexa\Contracts\Rest\Exceptions\Parser; @@ -134,7 +134,7 @@ public function testParseWithMissingSortOrder() /** * Returns the LocationUpdateStruct parser. * - * @return \EzSystems\EzPlatformRest\Server\Input\Parser\LocationUpdate + * @return \Ibexa\Rest\Server\Input\Parser\LocationUpdate */ protected function internalGetParser() { @@ -147,7 +147,7 @@ protected function internalGetParser() /** * Get the location service mock object. * - * @return \eZ\Publish\API\Repository\LocationService + * @return \Ibexa\Contracts\Core\Repository\LocationService */ protected function getLocationServiceMock() { diff --git a/tests/lib/Server/Input/Parser/ObjectStateCreateTest.php b/tests/lib/Server/Input/Parser/ObjectStateCreateTest.php index 59b2fbad..bdcd5a3d 100644 --- a/tests/lib/Server/Input/Parser/ObjectStateCreateTest.php +++ b/tests/lib/Server/Input/Parser/ObjectStateCreateTest.php @@ -6,9 +6,9 @@ */ namespace Ibexa\Tests\Rest\Server\Input\Parser; -use eZ\Publish\Core\Repository\ObjectStateService; +use Ibexa\Core\Repository\ObjectStateService; use Ibexa\Rest\Server\Input\Parser\ObjectStateCreate; -use eZ\Publish\API\Repository\Values\ObjectState\ObjectStateCreateStruct; +use Ibexa\Contracts\Core\Repository\Values\ObjectState\ObjectStateCreateStruct; use Ibexa\Contracts\Rest\Exceptions\Parser; class ObjectStateCreateTest extends BaseTest @@ -230,7 +230,7 @@ public function testParseExceptionOnInvalidNames() /** * Returns the ObjectStateCreate parser. * - * @return \EzSystems\EzPlatformRest\Server\Input\Parser\ObjectStateCreate + * @return \Ibexa\Rest\Server\Input\Parser\ObjectStateCreate */ protected function internalGetParser() { @@ -243,7 +243,7 @@ protected function internalGetParser() /** * Get the object state service mock object. * - * @return \eZ\Publish\API\Repository\ObjectStateService + * @return \Ibexa\Contracts\Core\Repository\ObjectStateService */ protected function getObjectStateServiceMock() { diff --git a/tests/lib/Server/Input/Parser/ObjectStateGroupCreateTest.php b/tests/lib/Server/Input/Parser/ObjectStateGroupCreateTest.php index 5c00f9c7..7f28e51a 100644 --- a/tests/lib/Server/Input/Parser/ObjectStateGroupCreateTest.php +++ b/tests/lib/Server/Input/Parser/ObjectStateGroupCreateTest.php @@ -6,9 +6,9 @@ */ namespace Ibexa\Tests\Rest\Server\Input\Parser; -use eZ\Publish\Core\Repository\ObjectStateService; +use Ibexa\Core\Repository\ObjectStateService; use Ibexa\Rest\Server\Input\Parser\ObjectStateGroupCreate; -use eZ\Publish\API\Repository\Values\ObjectState\ObjectStateGroupCreateStruct; +use Ibexa\Contracts\Core\Repository\Values\ObjectState\ObjectStateGroupCreateStruct; use Ibexa\Contracts\Rest\Exceptions\Parser; class ObjectStateGroupCreateTest extends BaseTest @@ -187,7 +187,7 @@ public function testParseExceptionOnInvalidNames() /** * Returns the ObjectStateGroupCreate parser. * - * @return \EzSystems\EzPlatformRest\Server\Input\Parser\ObjectStateGroupCreate + * @return \Ibexa\Rest\Server\Input\Parser\ObjectStateGroupCreate */ protected function internalGetParser() { @@ -200,7 +200,7 @@ protected function internalGetParser() /** * Get the object state service mock object. * - * @return \eZ\Publish\API\Repository\ObjectStateService + * @return \Ibexa\Contracts\Core\Repository\ObjectStateService */ protected function getObjectStateServiceMock() { diff --git a/tests/lib/Server/Input/Parser/ObjectStateGroupUpdateTest.php b/tests/lib/Server/Input/Parser/ObjectStateGroupUpdateTest.php index 81040d65..aff41cde 100644 --- a/tests/lib/Server/Input/Parser/ObjectStateGroupUpdateTest.php +++ b/tests/lib/Server/Input/Parser/ObjectStateGroupUpdateTest.php @@ -6,9 +6,9 @@ */ namespace Ibexa\Tests\Rest\Server\Input\Parser; -use eZ\Publish\Core\Repository\ObjectStateService; +use Ibexa\Core\Repository\ObjectStateService; use Ibexa\Rest\Server\Input\Parser\ObjectStateGroupUpdate; -use eZ\Publish\API\Repository\Values\ObjectState\ObjectStateGroupUpdateStruct; +use Ibexa\Contracts\Core\Repository\Values\ObjectState\ObjectStateGroupUpdateStruct; use Ibexa\Contracts\Rest\Exceptions\Parser; class ObjectStateGroupUpdateTest extends BaseTest @@ -101,7 +101,7 @@ public function testParseExceptionOnInvalidNames() /** * Returns the ObjectStateGroupUpdate parser. * - * @return \EzSystems\EzPlatformRest\Server\Input\Parser\ObjectStateGroupUpdate + * @return \Ibexa\Rest\Server\Input\Parser\ObjectStateGroupUpdate */ protected function internalGetParser() { @@ -114,7 +114,7 @@ protected function internalGetParser() /** * Get the object state service mock object. * - * @return \eZ\Publish\API\Repository\ObjectStateService + * @return \Ibexa\Contracts\Core\Repository\ObjectStateService */ protected function getObjectStateServiceMock() { diff --git a/tests/lib/Server/Input/Parser/ObjectStateUpdateTest.php b/tests/lib/Server/Input/Parser/ObjectStateUpdateTest.php index 61293cc0..17b3673d 100644 --- a/tests/lib/Server/Input/Parser/ObjectStateUpdateTest.php +++ b/tests/lib/Server/Input/Parser/ObjectStateUpdateTest.php @@ -6,9 +6,9 @@ */ namespace Ibexa\Tests\Rest\Server\Input\Parser; -use eZ\Publish\Core\Repository\ObjectStateService; +use Ibexa\Core\Repository\ObjectStateService; use Ibexa\Rest\Server\Input\Parser\ObjectStateUpdate; -use eZ\Publish\API\Repository\Values\ObjectState\ObjectStateUpdateStruct; +use Ibexa\Contracts\Core\Repository\Values\ObjectState\ObjectStateUpdateStruct; use Ibexa\Contracts\Rest\Exceptions\Parser; class ObjectStateUpdateTest extends BaseTest @@ -101,7 +101,7 @@ public function testParseExceptionOnInvalidNames() /** * Returns the ObjectStateUpdate parser. * - * @return \EzSystems\EzPlatformRest\Server\Input\Parser\ObjectStateUpdate + * @return \Ibexa\Rest\Server\Input\Parser\ObjectStateUpdate */ protected function internalGetParser() { @@ -114,7 +114,7 @@ protected function internalGetParser() /** * Get the object state service mock object. * - * @return \eZ\Publish\API\Repository\ObjectStateService + * @return \Ibexa\Contracts\Core\Repository\ObjectStateService */ protected function getObjectStateServiceMock() { diff --git a/tests/lib/Server/Input/Parser/PolicyCreateTest.php b/tests/lib/Server/Input/Parser/PolicyCreateTest.php index aea433c9..7f0393e3 100644 --- a/tests/lib/Server/Input/Parser/PolicyCreateTest.php +++ b/tests/lib/Server/Input/Parser/PolicyCreateTest.php @@ -6,10 +6,10 @@ */ namespace Ibexa\Tests\Rest\Server\Input\Parser; -use eZ\Publish\API\Repository\Values\User\Limitation; -use eZ\Publish\Core\Repository\RoleService; +use Ibexa\Contracts\Core\Repository\Values\User\Limitation; +use Ibexa\Core\Repository\RoleService; use Ibexa\Rest\Server\Input\Parser\PolicyCreate; -use eZ\Publish\Core\Repository\Values\User\PolicyCreateStruct; +use Ibexa\Core\Repository\Values\User\PolicyCreateStruct; use Ibexa\Contracts\Rest\Exceptions\Parser; class PolicyCreateTest extends BaseTest @@ -225,7 +225,7 @@ public function testParseExceptionOnMissingLimitationValues() /** * Returns the PolicyCreateStruct parser. * - * @return \EzSystems\EzPlatformRest\Server\Input\Parser\PolicyCreate + * @return \Ibexa\Rest\Server\Input\Parser\PolicyCreate */ protected function internalGetParser() { @@ -238,7 +238,7 @@ protected function internalGetParser() /** * Get the role service mock object. * - * @return \eZ\Publish\API\Repository\RoleService + * @return \Ibexa\Contracts\Core\Repository\RoleService */ protected function getRoleServiceMock() { diff --git a/tests/lib/Server/Input/Parser/PolicyUpdateTest.php b/tests/lib/Server/Input/Parser/PolicyUpdateTest.php index 3a0793e3..bcca72ac 100644 --- a/tests/lib/Server/Input/Parser/PolicyUpdateTest.php +++ b/tests/lib/Server/Input/Parser/PolicyUpdateTest.php @@ -6,10 +6,10 @@ */ namespace Ibexa\Tests\Rest\Server\Input\Parser; -use eZ\Publish\API\Repository\Values\User\Limitation; -use eZ\Publish\Core\Repository\RoleService; +use Ibexa\Contracts\Core\Repository\Values\User\Limitation; +use Ibexa\Core\Repository\RoleService; use Ibexa\Rest\Server\Input\Parser\PolicyUpdate; -use eZ\Publish\Core\Repository\Values\User\PolicyUpdateStruct; +use Ibexa\Core\Repository\Values\User\PolicyUpdateStruct; use Ibexa\Contracts\Rest\Exceptions\Parser; class PolicyUpdateTest extends BaseTest @@ -137,7 +137,7 @@ public function testParseExceptionOnMissingLimitationValues() /** * Returns the PolicyUpdateStruct parser. * - * @return \EzSystems\EzPlatformRest\Server\Input\Parser\PolicyUpdate + * @return \Ibexa\Rest\Server\Input\Parser\PolicyUpdate */ protected function internalGetParser() { @@ -150,7 +150,7 @@ protected function internalGetParser() /** * Get the role service mock object. * - * @return \eZ\Publish\API\Repository\RoleService + * @return \Ibexa\Contracts\Core\Repository\RoleService */ protected function getRoleServiceMock() { diff --git a/tests/lib/Server/Input/Parser/QueryParserTest.php b/tests/lib/Server/Input/Parser/QueryParserTest.php index c36086f2..d4c25ff1 100644 --- a/tests/lib/Server/Input/Parser/QueryParserTest.php +++ b/tests/lib/Server/Input/Parser/QueryParserTest.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Tests\Rest\Server\Input\Parser; -use eZ\Publish\API\Repository\Values\Content\Query; +use Ibexa\Contracts\Core\Repository\Values\Content\Query; use Ibexa\Rest\Server\Input\Parser\ContentQuery as QueryParser; class QueryParserTest extends BaseTest diff --git a/tests/lib/Server/Input/Parser/RelationCreateTest.php b/tests/lib/Server/Input/Parser/RelationCreateTest.php index dad2b01b..9473f7bb 100644 --- a/tests/lib/Server/Input/Parser/RelationCreateTest.php +++ b/tests/lib/Server/Input/Parser/RelationCreateTest.php @@ -63,7 +63,7 @@ public function testParseExceptionOnMissingDestinationHref() /** * Returns the RelationCreate parser. * - * @return \EzSystems\EzPlatformRest\Server\Input\Parser\RelationCreate + * @return \Ibexa\Rest\Server\Input\Parser\RelationCreate */ protected function internalGetParser() { diff --git a/tests/lib/Server/Input/Parser/RoleAssignInputTest.php b/tests/lib/Server/Input/Parser/RoleAssignInputTest.php index 838f5a97..6b8f9e1f 100644 --- a/tests/lib/Server/Input/Parser/RoleAssignInputTest.php +++ b/tests/lib/Server/Input/Parser/RoleAssignInputTest.php @@ -6,8 +6,8 @@ */ namespace Ibexa\Tests\Rest\Server\Input\Parser; -use eZ\Publish\API\Repository\Values\User\Limitation\RoleLimitation; -use eZ\Publish\API\Repository\Values\User\Limitation\SectionLimitation; +use Ibexa\Contracts\Core\Repository\Values\User\Limitation\RoleLimitation; +use Ibexa\Contracts\Core\Repository\Values\User\Limitation\SectionLimitation; use Ibexa\Rest\Server\Input\Parser\RoleAssignInput; use Ibexa\Rest\Server\Values\RoleAssignment; use Ibexa\Contracts\Rest\Exceptions\Parser; @@ -155,7 +155,7 @@ public function testParseExceptionOnMissingLimitationIdentifier() /** * Returns the role assign input parser. * - * @return \EzSystems\EzPlatformRest\Server\Input\Parser\RoleAssignInput + * @return \Ibexa\Rest\Server\Input\Parser\RoleAssignInput */ protected function internalGetParser() { diff --git a/tests/lib/Server/Input/Parser/RoleInputTest.php b/tests/lib/Server/Input/Parser/RoleInputTest.php index ada5c954..e822517d 100644 --- a/tests/lib/Server/Input/Parser/RoleInputTest.php +++ b/tests/lib/Server/Input/Parser/RoleInputTest.php @@ -6,9 +6,9 @@ */ namespace Ibexa\Tests\Rest\Server\Input\Parser; -use eZ\Publish\Core\Repository\RoleService; +use Ibexa\Core\Repository\RoleService; use Ibexa\Rest\Server\Input\Parser\RoleInput; -use eZ\Publish\Core\Repository\Values\User\RoleCreateStruct; +use Ibexa\Core\Repository\Values\User\RoleCreateStruct; class RoleInputTest extends BaseTest { @@ -73,7 +73,7 @@ public function testParse() /** * Returns the role input parser. * - * @return \EzSystems\EzPlatformRest\Server\Input\Parser\RoleInput + * @return \Ibexa\Rest\Server\Input\Parser\RoleInput */ protected function internalGetParser() { @@ -86,7 +86,7 @@ protected function internalGetParser() /** * Get the role service mock object. * - * @return \eZ\Publish\API\Repository\RoleService + * @return \Ibexa\Contracts\Core\Repository\RoleService */ protected function getRoleServiceMock() { diff --git a/tests/lib/Server/Input/Parser/SectionInputTest.php b/tests/lib/Server/Input/Parser/SectionInputTest.php index b67ce6d7..12f6a511 100644 --- a/tests/lib/Server/Input/Parser/SectionInputTest.php +++ b/tests/lib/Server/Input/Parser/SectionInputTest.php @@ -6,9 +6,9 @@ */ namespace Ibexa\Tests\Rest\Server\Input\Parser; -use eZ\Publish\Core\Repository\SectionService; +use Ibexa\Core\Repository\SectionService; use Ibexa\Rest\Server\Input\Parser\SectionInput; -use eZ\Publish\API\Repository\Values\Content\SectionCreateStruct; +use Ibexa\Contracts\Core\Repository\Values\Content\SectionCreateStruct; use Ibexa\Contracts\Rest\Exceptions\Parser; class SectionInputTest extends BaseTest @@ -66,7 +66,7 @@ public function testParseExceptionOnMissingName() /** * Returns the section input parser. * - * @return \EzSystems\EzPlatformRest\Server\Input\Parser\SectionInput + * @return \Ibexa\Rest\Server\Input\Parser\SectionInput */ protected function internalGetParser() { @@ -78,7 +78,7 @@ protected function internalGetParser() /** * Get the section service mock object. * - * @return \eZ\Publish\API\Repository\SectionService + * @return \Ibexa\Contracts\Core\Repository\SectionService */ protected function getSectionServiceMock() { diff --git a/tests/lib/Server/Input/Parser/SessionInputTest.php b/tests/lib/Server/Input/Parser/SessionInputTest.php index 86b7566d..99107b2b 100644 --- a/tests/lib/Server/Input/Parser/SessionInputTest.php +++ b/tests/lib/Server/Input/Parser/SessionInputTest.php @@ -65,7 +65,7 @@ public function testParseExceptionOnMissingName() /** * Returns the session input parser. * - * @return \EzSystems\EzPlatformRest\Server\Input\Parser\SessionInput + * @return \Ibexa\Rest\Server\Input\Parser\SessionInput */ protected function internalGetParser() { diff --git a/tests/lib/Server/Input/Parser/SortClause/DataKeyValueObjectClassTest.php b/tests/lib/Server/Input/Parser/SortClause/DataKeyValueObjectClassTest.php index f91c6d54..15491314 100644 --- a/tests/lib/Server/Input/Parser/SortClause/DataKeyValueObjectClassTest.php +++ b/tests/lib/Server/Input/Parser/SortClause/DataKeyValueObjectClassTest.php @@ -6,8 +6,8 @@ */ namespace Ibexa\Tests\Rest\Server\Input\Parser\SortClause; -use eZ\Publish\API\Repository\Values\Content\Query; -use eZ\Publish\API\Repository\Values\Content\Query\SortClause\DatePublished; +use Ibexa\Contracts\Core\Repository\Values\Content\Query; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause\DatePublished; use Ibexa\Rest\Server\Input\Parser\SortClause\DataKeyValueObjectClass; use Ibexa\Tests\Rest\Server\Input\Parser\BaseTest; use Ibexa\Contracts\Rest\Exceptions\Parser; @@ -84,7 +84,7 @@ public function testParseExceptionOnNonexistingValueObjectClass() /** * Returns the DataKeyValueObjectClass parser. * - * @return \EzSystems\EzPlatformRest\Server\Input\Parser\SortClause\DataKeyValueObjectClass + * @return \Ibexa\Rest\Server\Input\Parser\SortClause\DataKeyValueObjectClass */ protected function internalGetParser() { diff --git a/tests/lib/Server/Input/Parser/SortClause/FieldTest.php b/tests/lib/Server/Input/Parser/SortClause/FieldTest.php index d518a009..7b1f6a91 100644 --- a/tests/lib/Server/Input/Parser/SortClause/FieldTest.php +++ b/tests/lib/Server/Input/Parser/SortClause/FieldTest.php @@ -6,8 +6,8 @@ */ namespace Ibexa\Tests\Rest\Server\Input\Parser\SortClause; -use eZ\Publish\API\Repository\Values\Content\Query; -use eZ\Publish\API\Repository\Values\Content\Query\SortClause\Field; +use Ibexa\Contracts\Core\Repository\Values\Content\Query; +use Ibexa\Contracts\Core\Repository\Values\Content\Query\SortClause\Field; use Ibexa\Rest\Server\Input\Parser\SortClause\Field as FieldParser; use Ibexa\Tests\Rest\Server\Input\Parser\BaseTest; use Ibexa\Contracts\Rest\Exceptions\Parser; @@ -72,7 +72,7 @@ public function testParseExceptionOnInvalidDirectionFormat() /** * Returns the Field parser. * - * @return \EzSystems\EzPlatformRest\Server\Input\Parser\SortClause\Field + * @return \Ibexa\Rest\Server\Input\Parser\SortClause\Field */ protected function internalGetParser() { diff --git a/tests/lib/Server/Input/Parser/URLWildcardCreateTest.php b/tests/lib/Server/Input/Parser/URLWildcardCreateTest.php index df67bd54..022265ae 100644 --- a/tests/lib/Server/Input/Parser/URLWildcardCreateTest.php +++ b/tests/lib/Server/Input/Parser/URLWildcardCreateTest.php @@ -87,7 +87,7 @@ public function testParseExceptionOnMissingForward() /** * Returns the URLWildcard input parser. * - * @return \EzSystems\EzPlatformRest\Server\Input\Parser\URLWildcardCreate + * @return \Ibexa\Rest\Server\Input\Parser\URLWildcardCreate */ protected function internalGetParser() { diff --git a/tests/lib/Server/Input/Parser/UserCreateTest.php b/tests/lib/Server/Input/Parser/UserCreateTest.php index 171646c8..2f852ef1 100644 --- a/tests/lib/Server/Input/Parser/UserCreateTest.php +++ b/tests/lib/Server/Input/Parser/UserCreateTest.php @@ -6,15 +6,15 @@ */ namespace Ibexa\Tests\Rest\Server\Input\Parser; -use eZ\Publish\Core\Repository\ContentTypeService; -use eZ\Publish\Core\Repository\UserService; -use eZ\Publish\API\Repository\ContentService; -use eZ\Publish\API\Repository\FieldTypeService; -use eZ\Publish\Core\Repository\Values\ContentType\FieldDefinitionCollection; +use Ibexa\Core\Repository\ContentTypeService; +use Ibexa\Core\Repository\UserService; +use Ibexa\Contracts\Core\Repository\ContentService; +use Ibexa\Contracts\Core\Repository\FieldTypeService; +use Ibexa\Core\Repository\Values\ContentType\FieldDefinitionCollection; use Ibexa\Rest\Server\Input\Parser\UserCreate; -use eZ\Publish\Core\Repository\Values\ContentType\FieldDefinition; -use eZ\Publish\Core\Repository\Values\ContentType\ContentType; -use eZ\Publish\Core\Repository\Values\User\UserCreateStruct; +use Ibexa\Core\Repository\Values\ContentType\FieldDefinition; +use Ibexa\Core\Repository\Values\ContentType\ContentType; +use Ibexa\Core\Repository\Values\User\UserCreateStruct; use Ibexa\Rest\Input\FieldTypeParser; use Ibexa\Contracts\Rest\Exceptions\Parser; @@ -425,7 +425,7 @@ public function testParseExceptionOnMissingFieldValue() /** * Returns the UserCreate parser. * - * @return \EzSystems\EzPlatformRest\Server\Input\Parser\UserCreate + * @return \Ibexa\Rest\Server\Input\Parser\UserCreate */ protected function internalGetParser() { @@ -440,7 +440,7 @@ protected function internalGetParser() /** * Get the field type parser mock object. * - * @return \EzSystems\EzPlatformRest\Input\FieldTypeParser ; + * @return \Ibexa\Rest\Input\FieldTypeParser ; */ private function getFieldTypeParserMock() { @@ -467,7 +467,7 @@ private function getFieldTypeParserMock() /** * Get the user service mock object. * - * @return \eZ\Publish\API\Repository\UserService + * @return \Ibexa\Contracts\Core\Repository\UserService */ protected function getUserServiceMock() { @@ -498,7 +498,7 @@ protected function getUserServiceMock() /** * Get the content type service mock object. * - * @return \eZ\Publish\API\Repository\ContentTypeService + * @return \Ibexa\Contracts\Core\Repository\ContentTypeService */ protected function getContentTypeServiceMock() { @@ -515,7 +515,7 @@ protected function getContentTypeServiceMock() /** * Get the content type used in UserCreate parser. * - * @return \eZ\Publish\API\Repository\Values\ContentType\ContentType + * @return \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType */ protected function getContentType() { diff --git a/tests/lib/Server/Input/Parser/UserGroupCreateTest.php b/tests/lib/Server/Input/Parser/UserGroupCreateTest.php index 4ac2ca42..641e4a3b 100644 --- a/tests/lib/Server/Input/Parser/UserGroupCreateTest.php +++ b/tests/lib/Server/Input/Parser/UserGroupCreateTest.php @@ -6,15 +6,15 @@ */ namespace Ibexa\Tests\Rest\Server\Input\Parser; -use eZ\Publish\Core\Repository\ContentTypeService; -use eZ\Publish\Core\Repository\UserService; -use eZ\Publish\API\Repository\ContentService; -use eZ\Publish\API\Repository\FieldTypeService; -use eZ\Publish\Core\Repository\Values\ContentType\FieldDefinitionCollection; +use Ibexa\Core\Repository\ContentTypeService; +use Ibexa\Core\Repository\UserService; +use Ibexa\Contracts\Core\Repository\ContentService; +use Ibexa\Contracts\Core\Repository\FieldTypeService; +use Ibexa\Core\Repository\Values\ContentType\FieldDefinitionCollection; use Ibexa\Rest\Server\Input\Parser\UserGroupCreate; -use eZ\Publish\Core\Repository\Values\User\UserGroupCreateStruct; -use eZ\Publish\Core\Repository\Values\ContentType\FieldDefinition; -use eZ\Publish\Core\Repository\Values\ContentType\ContentType; +use Ibexa\Core\Repository\Values\User\UserGroupCreateStruct; +use Ibexa\Core\Repository\Values\ContentType\FieldDefinition; +use Ibexa\Core\Repository\Values\ContentType\ContentType; use Ibexa\Rest\Input\FieldTypeParser; use Ibexa\Contracts\Rest\Exceptions\Parser; @@ -54,7 +54,7 @@ public function testParse() ); $this->assertInstanceOf( - \eZ\Publish\API\Repository\Values\ContentType\ContentType::class, + \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType::class, $result->contentType, 'contentType not created correctly.' ); @@ -294,7 +294,7 @@ public function testParseExceptionOnMissingFieldValue() /** * Returns the UserGroupCreate parser. * - * @return \EzSystems\EzPlatformRest\Server\Input\Parser\UserGroupCreate + * @return \Ibexa\Rest\Server\Input\Parser\UserGroupCreate */ protected function internalGetParser() { @@ -308,7 +308,7 @@ protected function internalGetParser() /** * Get the field type parser mock object. * - * @return \EzSystems\EzPlatformRest\Input\FieldTypeParser ; + * @return \Ibexa\Rest\Input\FieldTypeParser ; */ private function getFieldTypeParserMock() { @@ -335,7 +335,7 @@ private function getFieldTypeParserMock() /** * Get the user service mock object. * - * @return \eZ\Publish\API\Repository\UserService + * @return \Ibexa\Contracts\Core\Repository\UserService */ protected function getUserServiceMock() { @@ -363,7 +363,7 @@ protected function getUserServiceMock() /** * Get the content type service mock object. * - * @return \eZ\Publish\API\Repository\ContentTypeService + * @return \Ibexa\Contracts\Core\Repository\ContentTypeService */ protected function getContentTypeServiceMock() { @@ -380,7 +380,7 @@ protected function getContentTypeServiceMock() /** * Get the content type used in UserGroupCreate parser. * - * @return \eZ\Publish\API\Repository\Values\ContentType\ContentType + * @return \Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType */ protected function getContentType() { diff --git a/tests/lib/Server/Input/Parser/UserGroupUpdateTest.php b/tests/lib/Server/Input/Parser/UserGroupUpdateTest.php index 26a03841..9b103ed5 100644 --- a/tests/lib/Server/Input/Parser/UserGroupUpdateTest.php +++ b/tests/lib/Server/Input/Parser/UserGroupUpdateTest.php @@ -6,17 +6,17 @@ */ namespace Ibexa\Tests\Rest\Server\Input\Parser; -use eZ\Publish\Core\Repository\ContentService; -use eZ\Publish\Core\Repository\ContentTypeService; -use eZ\Publish\Core\Repository\FieldTypeService; -use eZ\Publish\Core\Repository\LocationService; -use eZ\Publish\Core\Repository\UserService; +use Ibexa\Core\Repository\ContentService; +use Ibexa\Core\Repository\ContentTypeService; +use Ibexa\Core\Repository\FieldTypeService; +use Ibexa\Core\Repository\LocationService; +use Ibexa\Core\Repository\UserService; use Ibexa\Rest\Server\Input\Parser\UserGroupUpdate; -use eZ\Publish\API\Repository\Values\Content\ContentInfo; -use eZ\Publish\Core\Repository\Values\Content\Location; -use eZ\Publish\API\Repository\Values\Content\ContentMetadataUpdateStruct; -use eZ\Publish\API\Repository\Values\User\UserGroupUpdateStruct; -use eZ\Publish\Core\Repository\Values\Content\ContentUpdateStruct; +use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo; +use Ibexa\Core\Repository\Values\Content\Location; +use Ibexa\Contracts\Core\Repository\Values\Content\ContentMetadataUpdateStruct; +use Ibexa\Contracts\Core\Repository\Values\User\UserGroupUpdateStruct; +use Ibexa\Core\Repository\Values\Content\ContentUpdateStruct; use Ibexa\Rest\Input\FieldTypeParser; use Ibexa\Rest\Server\Values\RestUserGroupUpdateStruct; use Ibexa\Contracts\Rest\Exceptions\Parser; @@ -197,7 +197,7 @@ public function testParseExceptionOnMissingFieldValue() /** * Returns the UserGroupUpdate parser. * - * @return \EzSystems\EzPlatformRest\Server\Input\Parser\UserGroupUpdate + * @return \Ibexa\Rest\Server\Input\Parser\UserGroupUpdate */ protected function internalGetParser() { @@ -212,7 +212,7 @@ protected function internalGetParser() /** * Get the field type parser mock object. * - * @return \EzSystems\EzPlatformRest\Input\FieldTypeParser ; + * @return \Ibexa\Rest\Input\FieldTypeParser ; */ private function getFieldTypeParserMock() { @@ -239,7 +239,7 @@ private function getFieldTypeParserMock() /** * Get the user service mock object. * - * @return \eZ\Publish\API\Repository\UserService + * @return \Ibexa\Contracts\Core\Repository\UserService */ protected function getUserServiceMock() { @@ -257,7 +257,7 @@ protected function getUserServiceMock() /** * Get the location service mock object. * - * @return \eZ\Publish\API\Repository\LocationService + * @return \Ibexa\Contracts\Core\Repository\LocationService */ protected function getLocationServiceMock() { @@ -284,7 +284,7 @@ protected function getLocationServiceMock() /** * Get the content service mock object. * - * @return \eZ\Publish\API\Repository\ContentService + * @return \Ibexa\Contracts\Core\Repository\ContentService */ protected function getContentServiceMock() { diff --git a/tests/lib/Server/Input/Parser/UserUpdateTest.php b/tests/lib/Server/Input/Parser/UserUpdateTest.php index 20a64ca4..8e1e423f 100644 --- a/tests/lib/Server/Input/Parser/UserUpdateTest.php +++ b/tests/lib/Server/Input/Parser/UserUpdateTest.php @@ -6,14 +6,14 @@ */ namespace Ibexa\Tests\Rest\Server\Input\Parser; -use eZ\Publish\Core\Repository\ContentService; -use eZ\Publish\Core\Repository\UserService; -use eZ\Publish\API\Repository\ContentTypeService; -use eZ\Publish\API\Repository\FieldTypeService; +use Ibexa\Core\Repository\ContentService; +use Ibexa\Core\Repository\UserService; +use Ibexa\Contracts\Core\Repository\ContentTypeService; +use Ibexa\Contracts\Core\Repository\FieldTypeService; use Ibexa\Rest\Server\Input\Parser\UserUpdate; -use eZ\Publish\API\Repository\Values\Content\ContentMetadataUpdateStruct; -use eZ\Publish\API\Repository\Values\User\UserUpdateStruct; -use eZ\Publish\Core\Repository\Values\Content\ContentUpdateStruct; +use Ibexa\Contracts\Core\Repository\Values\Content\ContentMetadataUpdateStruct; +use Ibexa\Contracts\Core\Repository\Values\User\UserUpdateStruct; +use Ibexa\Core\Repository\Values\Content\ContentUpdateStruct; use Ibexa\Rest\Input\FieldTypeParser; use Ibexa\Rest\Server\Values\RestUserUpdateStruct; use Ibexa\Contracts\Rest\Exceptions\Parser; @@ -226,7 +226,7 @@ public function testParseExceptionOnMissingFieldValue() /** * Returns the UserUpdate parser. * - * @return \EzSystems\EzPlatformRest\Server\Input\Parser\UserUpdate + * @return \Ibexa\Rest\Server\Input\Parser\UserUpdate */ protected function internalGetParser() { @@ -241,7 +241,7 @@ protected function internalGetParser() /** * Get the field type parser mock object. * - * @return \EzSystems\EzPlatformRest\Input\FieldTypeParser ; + * @return \Ibexa\Rest\Input\FieldTypeParser ; */ private function getFieldTypeParserMock() { @@ -268,7 +268,7 @@ private function getFieldTypeParserMock() /** * Get the user service mock object. * - * @return \eZ\Publish\API\Repository\UserService + * @return \Ibexa\Contracts\Core\Repository\UserService */ protected function getUserServiceMock() { @@ -286,7 +286,7 @@ protected function getUserServiceMock() /** * Get the Content service mock object. * - * @return \eZ\Publish\API\Repository\ContentService + * @return \Ibexa\Contracts\Core\Repository\ContentService */ protected function getContentServiceMock() { diff --git a/tests/lib/Server/Input/Parser/VersionUpdateTest.php b/tests/lib/Server/Input/Parser/VersionUpdateTest.php index 839625ba..71b38803 100644 --- a/tests/lib/Server/Input/Parser/VersionUpdateTest.php +++ b/tests/lib/Server/Input/Parser/VersionUpdateTest.php @@ -6,11 +6,11 @@ */ namespace Ibexa\Tests\Rest\Server\Input\Parser; -use eZ\Publish\Core\Repository\ContentService; -use eZ\Publish\API\Repository\ContentTypeService; -use eZ\Publish\API\Repository\FieldTypeService; +use Ibexa\Core\Repository\ContentService; +use Ibexa\Contracts\Core\Repository\ContentTypeService; +use Ibexa\Contracts\Core\Repository\FieldTypeService; use Ibexa\Rest\Server\Input\Parser\VersionUpdate; -use eZ\Publish\Core\Repository\Values\Content\ContentUpdateStruct; +use Ibexa\Core\Repository\Values\Content\ContentUpdateStruct; use Ibexa\Rest\Input\FieldTypeParser; use Ibexa\Contracts\Rest\Exceptions\Parser; @@ -124,7 +124,7 @@ public function testParseExceptionOnMissingFieldValue() /** * Returns the VersionUpdate parser. * - * @return \EzSystems\EzPlatformRest\Server\Input\Parser\VersionUpdate + * @return \Ibexa\Rest\Server\Input\Parser\VersionUpdate */ protected function internalGetParser() { @@ -137,7 +137,7 @@ protected function internalGetParser() /** * Get the field type parser mock object. * - * @return \EzSystems\EzPlatformRest\Input\FieldTypeParser ; + * @return \Ibexa\Rest\Input\FieldTypeParser ; */ private function getFieldTypeParserMock() { @@ -164,7 +164,7 @@ private function getFieldTypeParserMock() /** * Get the Content service mock object. * - * @return \eZ\Publish\API\Repository\ContentService + * @return \Ibexa\Contracts\Core\Repository\ContentService */ protected function getContentServiceMock() { diff --git a/tests/lib/Server/Input/Parser/ViewInputOneDotOneTest.php b/tests/lib/Server/Input/Parser/ViewInputOneDotOneTest.php index bb4ed9ad..a9de2a37 100644 --- a/tests/lib/Server/Input/Parser/ViewInputOneDotOneTest.php +++ b/tests/lib/Server/Input/Parser/ViewInputOneDotOneTest.php @@ -6,8 +6,8 @@ */ namespace Ibexa\Tests\Rest\Server\Input\Parser; -use eZ\Publish\API\Repository\Values\Content\LocationQuery; -use eZ\Publish\API\Repository\Values\Content\Query; +use Ibexa\Contracts\Core\Repository\Values\Content\LocationQuery; +use Ibexa\Contracts\Core\Repository\Values\Content\Query; use Ibexa\Rest\Server\Input\Parser\ViewInputOneDotOne; use Ibexa\Rest\Server\Values\RestViewInput; use Ibexa\Contracts\Rest\Exceptions\Parser; @@ -85,7 +85,7 @@ public function testThrowsExceptionOnMissingQuery() /** * Returns the session input parser. * - * @return \EzSystems\EzPlatformRest\Server\Input\Parser\ViewInput + * @return \Ibexa\Rest\Server\Input\Parser\ViewInput */ protected function internalGetParser() { diff --git a/tests/lib/Server/Input/Parser/ViewInputTest.php b/tests/lib/Server/Input/Parser/ViewInputTest.php index b50377e8..2a5d1af6 100644 --- a/tests/lib/Server/Input/Parser/ViewInputTest.php +++ b/tests/lib/Server/Input/Parser/ViewInputTest.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Tests\Rest\Server\Input\Parser; -use eZ\Publish\API\Repository\Values\Content\Query; +use Ibexa\Contracts\Core\Repository\Values\Content\Query; use Ibexa\Rest\Server\Input\Parser\ViewInput; use Ibexa\Rest\Server\Values\RestViewInput; @@ -56,7 +56,7 @@ public function testThrowsExceptionOnMissingQuery() /** * Returns the session input parser. * - * @return \EzSystems\EzPlatformRest\Server\Input\Parser\ViewInput + * @return \Ibexa\Rest\Server\Input\Parser\ViewInput */ protected function internalGetParser() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/BadRequestExceptionTest.php b/tests/lib/Server/Output/ValueObjectVisitor/BadRequestExceptionTest.php index c6ef120b..503c4b61 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/BadRequestExceptionTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/BadRequestExceptionTest.php @@ -44,7 +44,7 @@ protected function getException() /** * Gets the exception visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\BadRequestException + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\BadRequestException */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/BadStateExceptionTest.php b/tests/lib/Server/Output/ValueObjectVisitor/BadStateExceptionTest.php index c1b5058b..516dcca9 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/BadStateExceptionTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/BadStateExceptionTest.php @@ -7,7 +7,7 @@ namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor; use Ibexa\Rest\Server\Output\ValueObjectVisitor; -use eZ\Publish\API\Repository\Exceptions\BadStateException; +use Ibexa\Contracts\Core\Repository\Exceptions\BadStateException; class BadStateExceptionTest extends ExceptionTest { @@ -44,7 +44,7 @@ protected function getException() /** * Gets the exception visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\BadStateException + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\BadStateException */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/BookmarkListTest.php b/tests/lib/Server/Output/ValueObjectVisitor/BookmarkListTest.php index 7eb09669..6de07ccd 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/BookmarkListTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/BookmarkListTest.php @@ -10,7 +10,7 @@ use DOMDocument; use DOMXPath; -use eZ\Publish\API\Repository\Values\Content\Location; +use Ibexa\Contracts\Core\Repository\Values\Content\Location; use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest; use Ibexa\Rest\Server\Output\ValueObjectVisitor; use Ibexa\Rest\Server\Values\BookmarkList; @@ -19,7 +19,7 @@ class BookmarkListTest extends ValueObjectVisitorBaseTest { /** - * @var \EzSystems\EzPlatformRest\Server\Values\BookmarkList + * @var \Ibexa\Rest\Server\Values\BookmarkList */ private $data; diff --git a/tests/lib/Server/Output/ValueObjectVisitor/CachedValueTest.php b/tests/lib/Server/Output/ValueObjectVisitor/CachedValueTest.php index 8bc9565c..0c1545a3 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/CachedValueTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/CachedValueTest.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor; -use eZ\Publish\Core\MVC\ConfigResolverInterface; +use Ibexa\Core\MVC\ConfigResolverInterface; use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest; use Ibexa\Rest\Server\Output\ValueObjectVisitor; use Ibexa\Rest\Server\Values\CachedValue; @@ -26,7 +26,7 @@ class CachedValueTest extends ValueObjectVisitorBaseTest ]; /** - * @var Request + * @var \Symfony\Component\HttpFoundation\Request */ protected $request; @@ -139,7 +139,7 @@ protected function visit($value) /** * Must return an instance of the tested visitor object. * - * @return \EzSystems\EzPlatformRest\Output\ValueObjectVisitor + * @return \Ibexa\Contracts\Rest\Output\ValueObjectVisitor */ protected function internalGetVisitor() { @@ -156,7 +156,7 @@ protected function internalGetVisitor() } /** - * @return ConfigResolverInterface|MockObject + * @return \Ibexa\Core\MVC\ConfigResolverInterface|\PHPUnit\Framework\MockObject\MockObject */ protected function getConfigProviderMock() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/ConflictTest.php b/tests/lib/Server/Output/ValueObjectVisitor/ConflictTest.php index 969860a4..7f43615a 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/ConflictTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/ConflictTest.php @@ -42,7 +42,7 @@ public function testVisit() /** * Get the Conflict visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\Conflict + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\Conflict */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/ContentFieldValidationExceptionTest.php b/tests/lib/Server/Output/ValueObjectVisitor/ContentFieldValidationExceptionTest.php index 125da151..a5f5b0f9 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/ContentFieldValidationExceptionTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/ContentFieldValidationExceptionTest.php @@ -6,8 +6,8 @@ */ namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor; -use eZ\Publish\Core\Base\Exceptions\ContentFieldValidationException as CoreContentFieldValidationException; -use eZ\Publish\Core\FieldType\ValidationError; +use Ibexa\Core\Base\Exceptions\ContentFieldValidationException as CoreContentFieldValidationException; +use Ibexa\Core\FieldType\ValidationError; use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest; use Ibexa\Rest\Server\Output\ValueObjectVisitor; use Ibexa\Rest\Server\Exceptions; @@ -149,7 +149,7 @@ protected function getException() /** * Gets the exception visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\ContentFieldValidationException + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\ContentFieldValidationException */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/ContentListTest.php b/tests/lib/Server/Output/ValueObjectVisitor/ContentListTest.php index ea612aeb..cbfd6b45 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/ContentListTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/ContentListTest.php @@ -10,7 +10,7 @@ use Ibexa\Rest\Server\Output\ValueObjectVisitor; use Ibexa\Rest\Server\Values\ContentList; use Ibexa\Rest\Server\Values\RestContent; -use eZ\Publish\API\Repository\Values\Content\ContentInfo; +use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo; class ContentListTest extends ValueObjectVisitorBaseTest { @@ -145,7 +145,7 @@ public function testResultContainsTotalCountAttributes(string $result): void /** * Get the ContentList visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\ContentList + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\ContentList */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/ContentObjectStatesTest.php b/tests/lib/Server/Output/ValueObjectVisitor/ContentObjectStatesTest.php index 80c4584f..4e835195 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/ContentObjectStatesTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/ContentObjectStatesTest.php @@ -84,7 +84,7 @@ public function testResultContainsContentObjectStatesAttributes($result) /** * Get the ContentObjectStates visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\ContentObjectStates + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\ContentObjectStates */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/ContentTypeGroupListTest.php b/tests/lib/Server/Output/ValueObjectVisitor/ContentTypeGroupListTest.php index bd5d9229..89734149 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/ContentTypeGroupListTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/ContentTypeGroupListTest.php @@ -9,8 +9,8 @@ use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest; use Ibexa\Rest\Server\Output\ValueObjectVisitor; use Ibexa\Rest\Server\Values\ContentTypeGroupList; -use eZ\Publish\Core\Repository\Values\ContentType; -use eZ\Publish\API\Repository\Values\ContentType\ContentTypeGroup; +use Ibexa\Core\Repository\Values\ContentType; +use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentTypeGroup; class ContentTypeGroupListTest extends ValueObjectVisitorBaseTest { @@ -116,7 +116,7 @@ public function testContentTypeGroupListVisitsChildren() /** * Get the ContentTypeGroupList visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\ContentTypeGroupList + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\ContentTypeGroupList */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/ContentTypeGroupRefListTest.php b/tests/lib/Server/Output/ValueObjectVisitor/ContentTypeGroupRefListTest.php index 2cd156ca..e15ec7f9 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/ContentTypeGroupRefListTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/ContentTypeGroupRefListTest.php @@ -7,8 +7,8 @@ namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor; use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest; -use eZ\Publish\Core\Repository\Values\ContentType\ContentTypeGroup; -use eZ\Publish\Core\Repository\Values\ContentType\ContentType; +use Ibexa\Core\Repository\Values\ContentType\ContentTypeGroup; +use Ibexa\Core\Repository\Values\ContentType\ContentType; use Ibexa\Rest\Server\Output\ValueObjectVisitor; use Ibexa\Rest\Server\Values\ContentTypeGroupRefList; @@ -204,7 +204,7 @@ public function testSecondContentTypeGroupRefUnlinkMethodCorrect(\DOMDocument $d /** * Get the ContentTypeGroupRefList visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\ContentTypeGroupRefList + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\ContentTypeGroupRefList */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/ContentTypeGroupTest.php b/tests/lib/Server/Output/ValueObjectVisitor/ContentTypeGroupTest.php index 00ada357..94972eb2 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/ContentTypeGroupTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/ContentTypeGroupTest.php @@ -8,7 +8,7 @@ use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest; use Ibexa\Rest\Server\Output\ValueObjectVisitor; -use eZ\Publish\Core\Repository\Values\ContentType; +use Ibexa\Core\Repository\Values\ContentType; class ContentTypeGroupTest extends ValueObjectVisitorBaseTest { @@ -339,7 +339,7 @@ public function testResultContainsContentTypesAttributes($result) /** * Get the ContentTypeGroup visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\ContentTypeGroup + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\ContentTypeGroup */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/ContentTypeInfoListTest.php b/tests/lib/Server/Output/ValueObjectVisitor/ContentTypeInfoListTest.php index 12d22e9b..22353d0a 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/ContentTypeInfoListTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/ContentTypeInfoListTest.php @@ -9,7 +9,7 @@ use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest; use Ibexa\Rest\Server\Output\ValueObjectVisitor; use Ibexa\Rest\Server\Values\ContentTypeInfoList; -use eZ\Publish\Core\Repository\Values\ContentType; +use Ibexa\Core\Repository\Values\ContentType; use Ibexa\Rest\Server\Values\RestContentType; class ContentTypeInfoListTest extends ValueObjectVisitorBaseTest @@ -123,7 +123,7 @@ public function testContentTypeInfoListVisitsChildren() /** * Get the ContentTypeInfoList visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\ContentTypeInfoList + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\ContentTypeInfoList */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/ContentTypeListTest.php b/tests/lib/Server/Output/ValueObjectVisitor/ContentTypeListTest.php index f3a95cd9..190b4bfc 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/ContentTypeListTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/ContentTypeListTest.php @@ -9,7 +9,7 @@ use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest; use Ibexa\Rest\Server\Output\ValueObjectVisitor; use Ibexa\Rest\Server\Values\ContentTypeList; -use eZ\Publish\Core\Repository\Values\ContentType; +use Ibexa\Core\Repository\Values\ContentType; use Ibexa\Rest\Server\Values\RestContentType; class ContentTypeListTest extends ValueObjectVisitorBaseTest @@ -123,7 +123,7 @@ public function testContentTypeListVisitsChildren() /** * Get the ContentTypeList visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\ContentTypeList + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\ContentTypeList */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/CountryListTest.php b/tests/lib/Server/Output/ValueObjectVisitor/CountryListTest.php index cd010206..000034ab 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/CountryListTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/CountryListTest.php @@ -127,7 +127,7 @@ public function testCountryListIDC(\DOMDocument $dom) /** * Get the CountryList visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\CountryList + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\CountryList */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/ExceptionTest.php b/tests/lib/Server/Output/ValueObjectVisitor/ExceptionTest.php index 9bf94c90..7f258357 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/ExceptionTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/ExceptionTest.php @@ -208,7 +208,7 @@ protected function getException() /** * Gets the exception visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\Exception + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\Exception */ protected function internalGetVisitor() { @@ -218,7 +218,7 @@ protected function internalGetVisitor() /** * Gets the exception visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\Exception + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\Exception */ protected function internalGetNonDebugVisitor(): ExceptionValueObjectVisitor { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/FieldDefinitionListTest.php b/tests/lib/Server/Output/ValueObjectVisitor/FieldDefinitionListTest.php index d5b0592e..35e1f707 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/FieldDefinitionListTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/FieldDefinitionListTest.php @@ -9,7 +9,7 @@ use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest; use Ibexa\Rest\Server\Output\ValueObjectVisitor; use Ibexa\Rest\Server; -use eZ\Publish\Core\Repository\Values; +use Ibexa\Core\Repository\Values; /** * @todo coverage add unit test for a content type draft @@ -102,7 +102,7 @@ public function testGeneratedXml($xpath, \DOMDocument $dom) /** * Get the Content visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\FieldDefinitionList + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\FieldDefinitionList */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/ForbiddenExceptionTest.php b/tests/lib/Server/Output/ValueObjectVisitor/ForbiddenExceptionTest.php index 50816fb2..82683122 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/ForbiddenExceptionTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/ForbiddenExceptionTest.php @@ -44,7 +44,7 @@ protected function getException() /** * Gets the exception visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\ForbiddenException + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\ForbiddenException */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/ImageVariationTest.php b/tests/lib/Server/Output/ValueObjectVisitor/ImageVariationTest.php index 93580577..e6ae2689 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/ImageVariationTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/ImageVariationTest.php @@ -8,7 +8,7 @@ use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest; use Ibexa\Rest\Server\Output\ValueObjectVisitor; -use eZ\Publish\SPI\Variation\Values\ImageVariation; +use Ibexa\Contracts\Core\Variation\Values\ImageVariation; class ImageVariationTest extends ValueObjectVisitorBaseTest { @@ -180,7 +180,7 @@ public function testFileSizeTagValue(\DOMDocument $dom) } /** - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\ImageVariation + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\ImageVariation */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/InvalidArgumentExceptionTest.php b/tests/lib/Server/Output/ValueObjectVisitor/InvalidArgumentExceptionTest.php index 3f655954..79723657 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/InvalidArgumentExceptionTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/InvalidArgumentExceptionTest.php @@ -44,7 +44,7 @@ protected function getException() /** * Gets the exception visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\InvalidArgumentException + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\InvalidArgumentException */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/LocationListTest.php b/tests/lib/Server/Output/ValueObjectVisitor/LocationListTest.php index a7c61858..a3a0bef0 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/LocationListTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/LocationListTest.php @@ -85,7 +85,7 @@ public function testResultContainsLocationListAttributes($result) /** * Get the LocationList visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\LocationList + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\LocationList */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/NoContentTest.php b/tests/lib/Server/Output/ValueObjectVisitor/NoContentTest.php index 9da394f4..d407ae2f 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/NoContentTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/NoContentTest.php @@ -42,7 +42,7 @@ public function testVisit() /** * Get the NoContent visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\NoContent + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\NoContent */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/NotFoundExceptionTest.php b/tests/lib/Server/Output/ValueObjectVisitor/NotFoundExceptionTest.php index 4edaefc8..a7103fa6 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/NotFoundExceptionTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/NotFoundExceptionTest.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor; -use eZ\Publish\API\Repository\Exceptions\NotFoundException; +use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException; use Ibexa\Rest\Server\Output\ValueObjectVisitor; class NotFoundExceptionTest extends ExceptionTest @@ -44,7 +44,7 @@ protected function getException() /** * Get the exception visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\NotFoundException + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\NotFoundException */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/NotImplementedExceptionTest.php b/tests/lib/Server/Output/ValueObjectVisitor/NotImplementedExceptionTest.php index 33fbb06b..9ea4207d 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/NotImplementedExceptionTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/NotImplementedExceptionTest.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor; -use eZ\Publish\API\Repository\Exceptions\NotImplementedException; +use Ibexa\Contracts\Core\Repository\Exceptions\NotImplementedException; use Ibexa\Rest\Server\Output\ValueObjectVisitor; class NotImplementedExceptionTest extends ExceptionTest @@ -44,7 +44,7 @@ protected function getException() /** * Gets the exception visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\NotImplementedException + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\NotImplementedException */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/ObjectStateGroupListTest.php b/tests/lib/Server/Output/ValueObjectVisitor/ObjectStateGroupListTest.php index 16ce09af..110abd67 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/ObjectStateGroupListTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/ObjectStateGroupListTest.php @@ -9,7 +9,7 @@ use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest; use Ibexa\Rest\Server\Output\ValueObjectVisitor; use Ibexa\Rest\Server\Values\ObjectStateGroupList; -use eZ\Publish\Core\Repository\Values\ObjectState\ObjectStateGroup; +use Ibexa\Core\Repository\Values\ObjectState\ObjectStateGroup; class ObjectStateGroupListTest extends ValueObjectVisitorBaseTest { @@ -103,7 +103,7 @@ public function testObjectStateGroupListVisitsChildren() $this->getVisitorMock()->expects($this->exactly(2)) ->method('visitValueObject') - ->with($this->isInstanceOf(\eZ\Publish\API\Repository\Values\ObjectState\ObjectStateGroup::class)); + ->with($this->isInstanceOf(\Ibexa\Contracts\Core\Repository\Values\ObjectState\ObjectStateGroup::class)); $visitor->visit( $this->getVisitorMock(), @@ -115,7 +115,7 @@ public function testObjectStateGroupListVisitsChildren() /** * Get the ObjectStateGroupList visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\ObjectStateGroupList + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\ObjectStateGroupList */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/ObjectStateGroupTest.php b/tests/lib/Server/Output/ValueObjectVisitor/ObjectStateGroupTest.php index dd2eca73..bc1420c6 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/ObjectStateGroupTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/ObjectStateGroupTest.php @@ -8,7 +8,7 @@ use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest; use Ibexa\Rest\Server\Output\ValueObjectVisitor; -use eZ\Publish\Core\Repository\Values\ObjectState; +use Ibexa\Core\Repository\Values\ObjectState; class ObjectStateGroupTest extends ValueObjectVisitorBaseTest { @@ -238,7 +238,7 @@ public function testResultContainsDescriptionsElement($result) /** * Get the ObjectStateGroup visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\ObjectStateGroup + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\ObjectStateGroup */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/ObjectStateListTest.php b/tests/lib/Server/Output/ValueObjectVisitor/ObjectStateListTest.php index cd6c09a0..9ae41e08 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/ObjectStateListTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/ObjectStateListTest.php @@ -10,7 +10,7 @@ use Ibexa\Rest\Values\RestObjectState; use Ibexa\Rest\Server\Output\ValueObjectVisitor; use Ibexa\Rest\Server\Values\ObjectStateList; -use eZ\Publish\Core\Repository\Values\ObjectState\ObjectState; +use Ibexa\Core\Repository\Values\ObjectState\ObjectState; class ObjectStateListTest extends ValueObjectVisitorBaseTest { @@ -122,7 +122,7 @@ public function testObjectStateListVisitsChildren() /** * Get the ObjectStateList visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\ObjectStateList + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\ObjectStateList */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/OptionsTest.php b/tests/lib/Server/Output/ValueObjectVisitor/OptionsTest.php index dcf49efb..be0f56ad 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/OptionsTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/OptionsTest.php @@ -47,7 +47,7 @@ public function testVisit() /** * Get the NoContent visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\NoContent + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\NoContent */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/PermanentRedirectTest.php b/tests/lib/Server/Output/ValueObjectVisitor/PermanentRedirectTest.php index 5cea179c..88c809ce 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/PermanentRedirectTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/PermanentRedirectTest.php @@ -45,7 +45,7 @@ public function testVisit() /** * Get the PermanentRedirect visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\PermanentRedirect + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\PermanentRedirect */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/PolicyListTest.php b/tests/lib/Server/Output/ValueObjectVisitor/PolicyListTest.php index 8bc7ffef..35e4ffa2 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/PolicyListTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/PolicyListTest.php @@ -6,11 +6,11 @@ */ namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor; -use eZ\Publish\API\Repository\Values\User\Policy; +use Ibexa\Contracts\Core\Repository\Values\User\Policy; use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest; use Ibexa\Rest\Server\Output\ValueObjectVisitor; use Ibexa\Rest\Server\Values\PolicyList; -use eZ\Publish\Core\Repository\Values\User; +use Ibexa\Core\Repository\Values\User; class PolicyListTest extends ValueObjectVisitorBaseTest { @@ -115,7 +115,7 @@ public function testPolicyListVisitsChildren() /** * Get the PolicyList visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\PolicyList + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\PolicyList */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/PolicyTest.php b/tests/lib/Server/Output/ValueObjectVisitor/PolicyTest.php index 1a836a4c..86199fba 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/PolicyTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/PolicyTest.php @@ -8,7 +8,7 @@ use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest; use Ibexa\Rest\Server\Output\ValueObjectVisitor; -use eZ\Publish\Core\Repository\Values\User; +use Ibexa\Core\Repository\Values\User; class PolicyTest extends ValueObjectVisitorBaseTest { @@ -24,7 +24,7 @@ public function testVisit() $generator->startDocument(null); - $contentTypeLimitation = new \eZ\Publish\API\Repository\Values\User\Limitation\ContentTypeLimitation(); + $contentTypeLimitation = new \Ibexa\Contracts\Core\Repository\Values\User\Limitation\ContentTypeLimitation(); $contentTypeLimitation->limitationValues = [1, 2, 3]; $policy = new User\Policy( @@ -205,7 +205,7 @@ public function testResultContainsLimitationsAttributes($result) /** * Get the Policy visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\Policy + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\Policy */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/RelationListTest.php b/tests/lib/Server/Output/ValueObjectVisitor/RelationListTest.php index 1835b186..37b2a3cc 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/RelationListTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/RelationListTest.php @@ -9,7 +9,7 @@ use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest; use Ibexa\Rest\Server\Output\ValueObjectVisitor; use Ibexa\Rest\Server\Values\RelationList; -use eZ\Publish\Core\Repository\Values\Content; +use Ibexa\Core\Repository\Values\Content; use Ibexa\Rest\Server\Values\RestRelation; class RelationListTest extends ValueObjectVisitorBaseTest @@ -125,7 +125,7 @@ public function testRelationListVisitsChildren() /** * Get the RelationList visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\RelationList + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\RelationList */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/ResourceCreatedTest.php b/tests/lib/Server/Output/ValueObjectVisitor/ResourceCreatedTest.php index a37dc4c2..e2c2aa8b 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/ResourceCreatedTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/ResourceCreatedTest.php @@ -47,7 +47,7 @@ public function testVisit() /** * Get the ResourceCreated visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\ResourceCreated + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\ResourceCreated */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/RestContentTest.php b/tests/lib/Server/Output/ValueObjectVisitor/RestContentTest.php index 43b45da9..835af72c 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/RestContentTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/RestContentTest.php @@ -6,18 +6,18 @@ */ namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor; -use eZ\Publish\API\Repository\Values\ContentType\ContentType; +use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType; use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest; use Ibexa\Rest\Server\Values\RestContent; use Ibexa\Rest\Server\Output\ValueObjectVisitor; -use eZ\Publish\Core\Repository\Values; -use eZ\Publish\Core\Helper\TranslationHelper; -use eZ\Publish\API\Repository\Values\Content\ContentInfo; +use Ibexa\Core\Repository\Values; +use Ibexa\Core\Helper\TranslationHelper; +use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo; use Ibexa\Rest\Server\Values\Version; class RestContentTest extends ValueObjectVisitorBaseTest { - /** @var \eZ\Publish\Core\Helper\TranslationHelper|\PHPUnit\Framework\MockObject\MockObject */ + /** @var \Ibexa\Core\Helper\TranslationHelper|\PHPUnit\Framework\MockObject\MockObject */ private $translationHelper; protected function setUp(): void @@ -515,7 +515,7 @@ public function testEmbeddedCurrentVersionMediaTypeCorrect(\DOMDocument $dom) /** * Get the Content visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\RestContent + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\RestContent */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/RestContentTypeTest.php b/tests/lib/Server/Output/ValueObjectVisitor/RestContentTypeTest.php index c439d10f..61e22002 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/RestContentTypeTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/RestContentTypeTest.php @@ -8,7 +8,7 @@ use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest; use Ibexa\Rest\Server\Output\ValueObjectVisitor; -use eZ\Publish\Core\Repository\Values; +use Ibexa\Core\Repository\Values; use Ibexa\Rest\Server\Values\FieldDefinitionList; use Ibexa\Rest\Server\Values\RestContentType; @@ -381,7 +381,7 @@ public function testDefaultSortOrder(\DOMDocument $dom) /** * Get the RestContentType visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\RestContentType + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\RestContentType */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/RestExecutedViewTest.php b/tests/lib/Server/Output/ValueObjectVisitor/RestExecutedViewTest.php index 4ef59d61..3c8b7483 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/RestExecutedViewTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/RestExecutedViewTest.php @@ -6,18 +6,18 @@ */ namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor; -use eZ\Publish\API\Repository\ContentService; -use eZ\Publish\API\Repository\ContentTypeService; -use eZ\Publish\API\Repository\LocationService; -use eZ\Publish\API\Repository\Values\Content\ContentInfo; -use eZ\Publish\API\Repository\Values\Content\Search\SearchHit; -use eZ\Publish\API\Repository\Values\Content\Search\SearchResult; -use eZ\Publish\Core\Repository\Values\ContentType\ContentType; +use Ibexa\Contracts\Core\Repository\ContentService; +use Ibexa\Contracts\Core\Repository\ContentTypeService; +use Ibexa\Contracts\Core\Repository\LocationService; +use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo; +use Ibexa\Contracts\Core\Repository\Values\Content\Search\SearchHit; +use Ibexa\Contracts\Core\Repository\Values\Content\Search\SearchResult; +use Ibexa\Core\Repository\Values\ContentType\ContentType; use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest; use Ibexa\Rest\Server\Output\ValueObjectVisitor; -use eZ\Publish\Core\Repository\Values\Content; +use Ibexa\Core\Repository\Values\Content; use Ibexa\Rest\Server\Values\RestExecutedView; -use eZ\Publish\Core\Repository\Values\Content as ApiValues; +use Ibexa\Core\Repository\Values\Content as ApiValues; class RestExecutedViewTest extends ValueObjectVisitorBaseTest { @@ -107,7 +107,7 @@ public function testGeneratedXml($xpath, \DOMDocument $dom) /** * Get the Relation visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\RestExecutedView + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\RestExecutedView */ protected function internalGetVisitor() { @@ -118,7 +118,7 @@ protected function internalGetVisitor() } /** - * @return \eZ\Publish\API\Repository\LocationService|\PHPUnit\Framework\MockObject\MockObject + * @return \Ibexa\Contracts\Core\Repository\LocationService|\PHPUnit\Framework\MockObject\MockObject */ public function getLocationServiceMock() { @@ -126,7 +126,7 @@ public function getLocationServiceMock() } /** - * @return \eZ\Publish\API\Repository\ContentService|\PHPUnit\Framework\MockObject\MockObject + * @return \Ibexa\Contracts\Core\Repository\ContentService|\PHPUnit\Framework\MockObject\MockObject */ public function getContentServiceMock() { @@ -137,7 +137,7 @@ public function getContentServiceMock() } /** - * @return \eZ\Publish\API\Repository\ContentTypeService|\PHPUnit\Framework\MockObject\MockObject + * @return \Ibexa\Contracts\Core\Repository\ContentTypeService|\PHPUnit\Framework\MockObject\MockObject */ public function getContentTypeServiceMock() { @@ -145,7 +145,7 @@ public function getContentTypeServiceMock() } /** - * @return \eZ\Publish\API\Repository\Values\Content\Search\SearchHit + * @return \Ibexa\Contracts\Core\Repository\Values\Content\Search\SearchHit */ protected function buildContentSearchHit() { @@ -164,7 +164,7 @@ protected function buildContentSearchHit() } /** - * @return \eZ\Publish\API\Repository\Values\Content\Search\SearchHit + * @return \Ibexa\Contracts\Core\Repository\Values\Content\Search\SearchHit */ protected function buildLocationSearchHit() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/RestFieldDefinitionTest.php b/tests/lib/Server/Output/ValueObjectVisitor/RestFieldDefinitionTest.php index 1aa107f6..013ec17b 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/RestFieldDefinitionTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/RestFieldDefinitionTest.php @@ -10,7 +10,7 @@ use Ibexa\Rest\Server\Output\ValueObjectVisitor; use Ibexa\Rest\Output\FieldTypeSerializer; use Ibexa\Rest\Server; -use eZ\Publish\Core\Repository\Values; +use Ibexa\Core\Repository\Values; class RestFieldDefinitionTest extends ValueObjectVisitorBaseTest { @@ -141,7 +141,7 @@ public function testGeneratedXml($xpath, \DOMDocument $dom) /** * Get the Content visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\RestFieldDefinition + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\RestFieldDefinition */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/RestLocationRootNodeTest.php b/tests/lib/Server/Output/ValueObjectVisitor/RestLocationRootNodeTest.php index 9f1ca670..103a21e6 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/RestLocationRootNodeTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/RestLocationRootNodeTest.php @@ -9,8 +9,8 @@ use Ibexa\Rest\Server\Output\ValueObjectVisitor; use Ibexa\Rest\Server\Values\RestContent; use Ibexa\Rest\Server\Values\RestLocation; -use eZ\Publish\Core\Repository\Values\Content\Location; -use eZ\Publish\API\Repository\Values\Content\ContentInfo; +use Ibexa\Core\Repository\Values\Content\Location; +use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo; class RestLocationRootNodeTest extends RestLocationTest { @@ -248,7 +248,7 @@ public function testResultContainsUrlAliasesTagAttributes($result) /** * Get the Location visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\RestLocation + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\RestLocation */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/RestLocationTest.php b/tests/lib/Server/Output/ValueObjectVisitor/RestLocationTest.php index 1ec9f5d2..fc6cd1f9 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/RestLocationTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/RestLocationTest.php @@ -10,8 +10,8 @@ use Ibexa\Rest\Server\Output\ValueObjectVisitor; use Ibexa\Rest\Server\Values\RestContent; use Ibexa\Rest\Server\Values\RestLocation; -use eZ\Publish\Core\Repository\Values\Content\Location; -use eZ\Publish\API\Repository\Values\Content\ContentInfo; +use Ibexa\Core\Repository\Values\Content\Location; +use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo; class RestLocationTest extends ValueObjectVisitorBaseTest { @@ -578,7 +578,7 @@ public function testResultContainsUrlAliasesTagAttributes($result) /** * Get the Location visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\RestLocation + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\RestLocation */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/RestObjectStateTest.php b/tests/lib/Server/Output/ValueObjectVisitor/RestObjectStateTest.php index 0d2d43b6..3dd40f5e 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/RestObjectStateTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/RestObjectStateTest.php @@ -8,7 +8,7 @@ use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest; use Ibexa\Rest\Server\Output\ValueObjectVisitor; -use eZ\Publish\Core\Repository\Values\ObjectState\ObjectState; +use Ibexa\Core\Repository\Values\ObjectState\ObjectState; use Ibexa\Rest\Values; class RestObjectStateTest extends ValueObjectVisitorBaseTest @@ -304,7 +304,7 @@ public function testResultContainsDescriptionsElement($result) /** * Get the ObjectState visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\RestObjectState + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\RestObjectState */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/RestRelationTest.php b/tests/lib/Server/Output/ValueObjectVisitor/RestRelationTest.php index cd2153b9..f675242a 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/RestRelationTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/RestRelationTest.php @@ -8,9 +8,9 @@ use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest; use Ibexa\Rest\Server\Output\ValueObjectVisitor; -use eZ\Publish\Core\Repository\Values\Content; +use Ibexa\Core\Repository\Values\Content; use Ibexa\Rest\Server\Values\RestRelation; -use eZ\Publish\API\Repository\Values\Content\ContentInfo; +use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo; class RestRelationTest extends ValueObjectVisitorBaseTest { @@ -208,7 +208,7 @@ public function testResultContainsRelationTypeElement($result) /** * Get the Relation visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\RestRelation + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\RestRelation */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/RestTrashItemTest.php b/tests/lib/Server/Output/ValueObjectVisitor/RestTrashItemTest.php index 0a71da6e..5909aebe 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/RestTrashItemTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/RestTrashItemTest.php @@ -10,8 +10,8 @@ use Ibexa\Rest\Server\Output\ValueObjectVisitor; use Ibexa\Rest\Server\Values\RestContent; use Ibexa\Rest\Server\Values\RestTrashItem; -use eZ\Publish\Core\Repository\Values\Content\TrashItem; -use eZ\Publish\API\Repository\Values\Content\ContentInfo; +use Ibexa\Core\Repository\Values\Content\TrashItem; +use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo; class RestTrashItemTest extends ValueObjectVisitorBaseTest { @@ -468,7 +468,7 @@ public function testResultContainsSortOrderValueElement($result) /** * Get the TrashItem visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\RestTrashItem + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\RestTrashItem */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/RestUserGroupRoleAssignmentTest.php b/tests/lib/Server/Output/ValueObjectVisitor/RestUserGroupRoleAssignmentTest.php index bb9c8a32..69038f11 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/RestUserGroupRoleAssignmentTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/RestUserGroupRoleAssignmentTest.php @@ -8,7 +8,7 @@ use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest; use Ibexa\Rest\Server\Output\ValueObjectVisitor; -use eZ\Publish\Core\Repository\Values\User; +use Ibexa\Core\Repository\Values\User; use Ibexa\Rest\Server\Values; class RestUserGroupRoleAssignmentTest extends ValueObjectVisitorBaseTest @@ -156,7 +156,7 @@ public function testResultContainsRoleAttributes($result) /** * Get the RestUserGroupRoleAssignment visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\RestUserGroupRoleAssignment + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\RestUserGroupRoleAssignment */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/RestUserGroupTest.php b/tests/lib/Server/Output/ValueObjectVisitor/RestUserGroupTest.php index 48fb96b9..6bc64d27 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/RestUserGroupTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/RestUserGroupTest.php @@ -6,12 +6,12 @@ */ namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor; -use eZ\Publish\API\Repository\Values\ContentType\ContentType; +use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType; use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest; use Ibexa\Rest\Server\Values\RestUserGroup; use Ibexa\Rest\Server\Output\ValueObjectVisitor; -use eZ\Publish\Core\Repository\Values; -use eZ\Publish\API\Repository\Values\Content\ContentInfo; +use Ibexa\Core\Repository\Values; +use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo; class RestUserGroupTest extends ValueObjectVisitorBaseTest { @@ -418,7 +418,7 @@ public function testRolesMediaTypeCorrect(\DOMDocument $dom) /** * Get the UserGroup visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\RestUserGroup + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\RestUserGroup */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/RestUserRoleAssignmentTest.php b/tests/lib/Server/Output/ValueObjectVisitor/RestUserRoleAssignmentTest.php index 753482d8..6f149385 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/RestUserRoleAssignmentTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/RestUserRoleAssignmentTest.php @@ -8,7 +8,7 @@ use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest; use Ibexa\Rest\Server\Output\ValueObjectVisitor; -use eZ\Publish\Core\Repository\Values\User; +use Ibexa\Core\Repository\Values\User; use Ibexa\Rest\Server\Values; class RestUserRoleAssignmentTest extends ValueObjectVisitorBaseTest @@ -157,7 +157,7 @@ public function testResultContainsRoleAttributes($result) /** * Get the UserRoleAssignment visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\RestUserRoleAssignment + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\RestUserRoleAssignment */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/RestUserTest.php b/tests/lib/Server/Output/ValueObjectVisitor/RestUserTest.php index 27afd745..3e58b4e7 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/RestUserTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/RestUserTest.php @@ -6,12 +6,12 @@ */ namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor; -use eZ\Publish\API\Repository\Values\ContentType\ContentType; +use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType; use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest; use Ibexa\Rest\Server\Values\RestUser; use Ibexa\Rest\Server\Output\ValueObjectVisitor; -use eZ\Publish\Core\Repository\Values; -use eZ\Publish\API\Repository\Values\Content\ContentInfo; +use Ibexa\Core\Repository\Values; +use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo; class RestUserTest extends ValueObjectVisitorBaseTest { @@ -373,7 +373,7 @@ public function testRolesMediaTypeCorrect(\DOMDocument $dom) /** * Get the User visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\RestUser + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\RestUser */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/RoleAssignmentListTest.php b/tests/lib/Server/Output/ValueObjectVisitor/RoleAssignmentListTest.php index 451ab4e3..c067e38c 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/RoleAssignmentListTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/RoleAssignmentListTest.php @@ -10,7 +10,7 @@ use Ibexa\Rest\Server\Output\ValueObjectVisitor; use Ibexa\Rest\Server\Values\RestUserRoleAssignment; use Ibexa\Rest\Server\Values\RoleAssignmentList; -use eZ\Publish\Core\Repository\Values\User; +use Ibexa\Core\Repository\Values\User; class RoleAssignmentListTest extends ValueObjectVisitorBaseTest { @@ -179,7 +179,7 @@ public function testResultContainsGroupRoleAssignmentListAttributes($result) /** * Get the RoleAssignmentList visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\RoleAssignmentList + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\RoleAssignmentList */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/RoleListTest.php b/tests/lib/Server/Output/ValueObjectVisitor/RoleListTest.php index a8be17fa..b691c7df 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/RoleListTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/RoleListTest.php @@ -6,11 +6,11 @@ */ namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor; -use eZ\Publish\API\Repository\Values\User\Role; +use Ibexa\Contracts\Core\Repository\Values\User\Role; use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest; use Ibexa\Rest\Server\Output\ValueObjectVisitor; use Ibexa\Rest\Server\Values\RoleList; -use eZ\Publish\Core\Repository\Values\User; +use Ibexa\Core\Repository\Values\User; class RoleListTest extends ValueObjectVisitorBaseTest { @@ -115,7 +115,7 @@ public function testRoleListVisitsChildren() /** * Get the RoleList visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\RoleList + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\RoleList */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/RoleTest.php b/tests/lib/Server/Output/ValueObjectVisitor/RoleTest.php index d11a93ab..526dbacb 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/RoleTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/RoleTest.php @@ -8,7 +8,7 @@ use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest; use Ibexa\Rest\Server\Output\ValueObjectVisitor; -use eZ\Publish\Core\Repository\Values\User; +use Ibexa\Core\Repository\Values\User; class RoleTest extends ValueObjectVisitorBaseTest { @@ -235,7 +235,7 @@ public function testResultContainsPoliciesAttributes($result) /** * Get the Role visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\Role + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\Role */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/RootTest.php b/tests/lib/Server/Output/ValueObjectVisitor/RootTest.php index 31f8d23b..f981048d 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/RootTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/RootTest.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor; -use eZ\Publish\Core\MVC\ConfigResolverInterface; +use Ibexa\Core\MVC\ConfigResolverInterface; use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest; use Ibexa\Rest\Server\Output\ValueObjectVisitor; use Ibexa\Rest\Server\Service\ExpressionRouterRootResourceBuilder; @@ -182,7 +182,7 @@ public function testResultContainsTemplateRouterWithAttributes($result) /** * Get the Role visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\Root + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\Root */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/SectionListTest.php b/tests/lib/Server/Output/ValueObjectVisitor/SectionListTest.php index 1cb04530..f319ca44 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/SectionListTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/SectionListTest.php @@ -9,7 +9,7 @@ use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest; use Ibexa\Rest\Server\Output\ValueObjectVisitor; use Ibexa\Rest\Server\Values\SectionList; -use eZ\Publish\API\Repository\Values\Content; +use Ibexa\Core\Repository\Values\Content; class SectionListTest extends ValueObjectVisitorBaseTest { @@ -114,7 +114,7 @@ public function testSectionListVisitsChildren() /** * Get the SectionList visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\SectionList + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\SectionList */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/SectionTest.php b/tests/lib/Server/Output/ValueObjectVisitor/SectionTest.php index d0e72c3b..1463cfae 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/SectionTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/SectionTest.php @@ -8,7 +8,7 @@ use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest; use Ibexa\Rest\Server\Output\ValueObjectVisitor; -use eZ\Publish\API\Repository\Values\Content; +use Ibexa\Core\Repository\Values\Content; class SectionTest extends ValueObjectVisitorBaseTest { @@ -160,7 +160,7 @@ public function testResultContainsNameValueElement($result) /** * Get the Section visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\Section + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\Section */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/TemporaryRedirectTest.php b/tests/lib/Server/Output/ValueObjectVisitor/TemporaryRedirectTest.php index f1a0ecae..42611c06 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/TemporaryRedirectTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/TemporaryRedirectTest.php @@ -45,7 +45,7 @@ public function testVisit() /** * Get the TemporaryRedirect visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\TemporaryRedirect + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\TemporaryRedirect */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/TrashTest.php b/tests/lib/Server/Output/ValueObjectVisitor/TrashTest.php index 1ecb0d16..5ae60b60 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/TrashTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/TrashTest.php @@ -10,7 +10,7 @@ use Ibexa\Rest\Server\Output\ValueObjectVisitor; use Ibexa\Rest\Server\Values\Trash; use Ibexa\Rest\Server\Values\RestTrashItem; -use eZ\Publish\Core\Repository\Values\Content; +use Ibexa\Core\Repository\Values\Content; class TrashTest extends ValueObjectVisitorBaseTest { @@ -123,7 +123,7 @@ public function testTrashVisitsChildren() /** * Get the Trash visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\Trash + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\Trash */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/URLAliasListTest.php b/tests/lib/Server/Output/ValueObjectVisitor/URLAliasListTest.php index 8045a9ff..d77cbc57 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/URLAliasListTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/URLAliasListTest.php @@ -9,7 +9,7 @@ use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest; use Ibexa\Rest\Server\Output\ValueObjectVisitor; use Ibexa\Rest\Server\Values\URLAliasList; -use eZ\Publish\API\Repository\Values\Content; +use Ibexa\Core\Repository\Values\Content; class URLAliasListTest extends ValueObjectVisitorBaseTest { @@ -114,7 +114,7 @@ public function testURLAliasListVisitsChildren() /** * Get the URLAliasList visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\URLAliasList + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\URLAliasList */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/URLAliasRefListTest.php b/tests/lib/Server/Output/ValueObjectVisitor/URLAliasRefListTest.php index 5492e6ab..c5c3ec92 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/URLAliasRefListTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/URLAliasRefListTest.php @@ -9,7 +9,7 @@ use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest; use Ibexa\Rest\Server\Output\ValueObjectVisitor; use Ibexa\Rest\Server\Values\URLAliasRefList; -use eZ\Publish\API\Repository\Values\Content\URLAlias; +use Ibexa\Contracts\Core\Repository\Values\Content\URLAlias; class URLAliasRefListTest extends ValueObjectVisitorBaseTest { @@ -101,7 +101,7 @@ public function testUrlAliasMediaTypeCorrect(\DOMDocument $dom) /** * Get the URLAliasRefList visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\URLAliasRefList + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\URLAliasRefList */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/URLAliasTest.php b/tests/lib/Server/Output/ValueObjectVisitor/URLAliasTest.php index 87c041da..5bd1a37d 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/URLAliasTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/URLAliasTest.php @@ -8,7 +8,7 @@ use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest; use Ibexa\Rest\Server\Output\ValueObjectVisitor; -use eZ\Publish\API\Repository\Values\Content; +use Ibexa\Core\Repository\Values\Content; class URLAliasTest extends ValueObjectVisitorBaseTest { @@ -248,7 +248,7 @@ public function testResultContainsCustomValueElement($result) /** * Get the URLAlias visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\URLAlias + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\URLAlias */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/URLWildcardListTest.php b/tests/lib/Server/Output/ValueObjectVisitor/URLWildcardListTest.php index af6d31d7..2e0c472d 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/URLWildcardListTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/URLWildcardListTest.php @@ -9,7 +9,7 @@ use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest; use Ibexa\Rest\Server\Output\ValueObjectVisitor; use Ibexa\Rest\Server\Values\URLWildcardList; -use eZ\Publish\API\Repository\Values\Content; +use Ibexa\Core\Repository\Values\Content; class URLWildcardListTest extends ValueObjectVisitorBaseTest { @@ -119,7 +119,7 @@ public function testURLWildcardListVisitsChildren() /** * Get the URLWildcardList visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\URLWildcardList + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\URLWildcardList */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/URLWildcardTest.php b/tests/lib/Server/Output/ValueObjectVisitor/URLWildcardTest.php index 5c04a2e7..13d458a4 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/URLWildcardTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/URLWildcardTest.php @@ -8,7 +8,7 @@ use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest; use Ibexa\Rest\Server\Output\ValueObjectVisitor; -use eZ\Publish\API\Repository\Values\Content; +use Ibexa\Core\Repository\Values\Content; class URLWildcardTest extends ValueObjectVisitorBaseTest { @@ -162,7 +162,7 @@ public function testResultContainsForwardValueElement($result) /** * Get the URLWildcard visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\URLWildcard + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\URLWildcard */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/UnauthorizedExceptionTest.php b/tests/lib/Server/Output/ValueObjectVisitor/UnauthorizedExceptionTest.php index 315c638a..b48919a5 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/UnauthorizedExceptionTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/UnauthorizedExceptionTest.php @@ -7,7 +7,7 @@ namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor; use Ibexa\Rest\Server\Output\ValueObjectVisitor; -use eZ\Publish\API\Repository\Exceptions\UnauthorizedException; +use Ibexa\Contracts\Core\Repository\Exceptions\UnauthorizedException; class UnauthorizedExceptionTest extends ExceptionTest { @@ -44,7 +44,7 @@ protected function getException() /** * Gets the exception visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\UnauthorizedException + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\UnauthorizedException */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/UserGroupListTest.php b/tests/lib/Server/Output/ValueObjectVisitor/UserGroupListTest.php index f0f61483..17490cd1 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/UserGroupListTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/UserGroupListTest.php @@ -6,14 +6,14 @@ */ namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor; -use eZ\Publish\API\Repository\Values\ContentType\ContentType; +use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType; use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest; use Ibexa\Rest\Server\Output\ValueObjectVisitor; use Ibexa\Rest\Server\Values\UserGroupList; use Ibexa\Rest\Server\Values\RestUserGroup; -use eZ\Publish\API\Repository\Values\Content\ContentInfo; -use eZ\Publish\Core\Repository\Values\Content\Content; -use eZ\Publish\Core\Repository\Values\Content\Location; +use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo; +use Ibexa\Core\Repository\Values\Content\Content; +use Ibexa\Core\Repository\Values\Content\Location; class UserGroupListTest extends ValueObjectVisitorBaseTest { @@ -138,7 +138,7 @@ public function testUserGroupListVisitsChildren() /** * Get the UserGroupList visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\UserGroupList + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\UserGroupList */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/UserGroupRefListTest.php b/tests/lib/Server/Output/ValueObjectVisitor/UserGroupRefListTest.php index 7e660e9e..f9fc8896 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/UserGroupRefListTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/UserGroupRefListTest.php @@ -6,14 +6,14 @@ */ namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor; -use eZ\Publish\API\Repository\Values\ContentType\ContentType; +use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType; use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest; -use eZ\Publish\Core\Repository\Values\User\UserGroup; +use Ibexa\Core\Repository\Values\User\UserGroup; use Ibexa\Rest\Server\Output\ValueObjectVisitor; use Ibexa\Rest\Server\Values\UserGroupRefList; use Ibexa\Rest\Server\Values\RestUserGroup; -use eZ\Publish\API\Repository\Values\Content\ContentInfo; -use eZ\Publish\Core\Repository\Values\Content\Location; +use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo; +use Ibexa\Core\Repository\Values\Content\Location; class UserGroupRefListTest extends ValueObjectVisitorBaseTest { @@ -203,7 +203,7 @@ public function testSecondUserGroupUnassignMethodCorrect(\DOMDocument $dom) /** * Get the UserGroupRefList visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\UserGroupRefList + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\UserGroupRefList */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/UserListTest.php b/tests/lib/Server/Output/ValueObjectVisitor/UserListTest.php index 547a2013..88157beb 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/UserListTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/UserListTest.php @@ -6,14 +6,14 @@ */ namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor; -use eZ\Publish\API\Repository\Values\ContentType\ContentType; +use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType; use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest; use Ibexa\Rest\Server\Output\ValueObjectVisitor; use Ibexa\Rest\Server\Values\UserList; use Ibexa\Rest\Server\Values\RestUser; -use eZ\Publish\API\Repository\Values\Content\ContentInfo; -use eZ\Publish\Core\Repository\Values\Content\Content; -use eZ\Publish\Core\Repository\Values\Content\Location; +use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo; +use Ibexa\Core\Repository\Values\Content\Content; +use Ibexa\Core\Repository\Values\Content\Location; class UserListTest extends ValueObjectVisitorBaseTest { @@ -138,7 +138,7 @@ public function testUserListVisitsChildren() /** * Get the UserList visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\UserList + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\UserList */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/UserRefListTest.php b/tests/lib/Server/Output/ValueObjectVisitor/UserRefListTest.php index 08c5ccab..3cab9198 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/UserRefListTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/UserRefListTest.php @@ -6,14 +6,14 @@ */ namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor; -use eZ\Publish\API\Repository\Values\ContentType\ContentType; +use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType; use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest; -use eZ\Publish\Core\Repository\Values\User\User; +use Ibexa\Core\Repository\Values\User\User; use Ibexa\Rest\Server\Output\ValueObjectVisitor; use Ibexa\Rest\Server\Values\UserRefList; use Ibexa\Rest\Server\Values\RestUser; -use eZ\Publish\API\Repository\Values\Content\ContentInfo; -use eZ\Publish\Core\Repository\Values\Content\Location; +use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo; +use Ibexa\Core\Repository\Values\Content\Location; class UserRefListTest extends ValueObjectVisitorBaseTest { @@ -111,7 +111,7 @@ public function testUserMediaTypeCorrect(\DOMDocument $dom) /** * Get the UserRefList visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\UserRefList + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\UserRefList */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/UserSessionTest.php b/tests/lib/Server/Output/ValueObjectVisitor/UserSessionTest.php index f4d11ce0..94945959 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/UserSessionTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/UserSessionTest.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor; -use eZ\Publish\API\Repository\Values\User\User; +use Ibexa\Contracts\Core\Repository\Values\User\User; use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest; use Ibexa\Rest\Server\Output\ValueObjectVisitor; use Ibexa\Rest\Server\Values; @@ -229,7 +229,7 @@ public function testResultContainsUserAttributes($result) /** * Get the Session visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\UserSession + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\UserSession */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/VersionInfoTest.php b/tests/lib/Server/Output/ValueObjectVisitor/VersionInfoTest.php index 03429985..a85eb719 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/VersionInfoTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/VersionInfoTest.php @@ -8,8 +8,8 @@ use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest; use Ibexa\Rest\Server\Output\ValueObjectVisitor; -use eZ\Publish\Core\Repository\Values\Content; -use eZ\Publish\API\Repository\Values\Content\ContentInfo; +use Ibexa\Core\Repository\Values\Content; +use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo; class VersionInfoTest extends ValueObjectVisitorBaseTest { @@ -276,7 +276,7 @@ public function testVersionInfoContentElement($result) /** * Get the VersionInfo visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\VersionInfo + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\VersionInfo */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/VersionListTest.php b/tests/lib/Server/Output/ValueObjectVisitor/VersionListTest.php index 63b2d744..746dc936 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/VersionListTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/VersionListTest.php @@ -9,8 +9,8 @@ use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest; use Ibexa\Rest\Server\Output\ValueObjectVisitor; use Ibexa\Rest\Server\Values\VersionList; -use eZ\Publish\API\Repository\Values\Content\ContentInfo; -use eZ\Publish\Core\Repository\Values\Content\VersionInfo; +use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo; +use Ibexa\Core\Repository\Values\Content\VersionInfo; class VersionListTest extends ValueObjectVisitorBaseTest { @@ -136,7 +136,7 @@ public function testVersionListVisitsChildren() $this->getVisitorMock()->expects($this->exactly(2)) ->method('visitValueObject') - ->with($this->isInstanceOf(\eZ\Publish\API\Repository\Values\Content\VersionInfo::class)); + ->with($this->isInstanceOf(\Ibexa\Contracts\Core\Repository\Values\Content\VersionInfo::class)); $visitor->visit( $this->getVisitorMock(), @@ -148,7 +148,7 @@ public function testVersionListVisitsChildren() /** * Get the VersionList visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\VersionList + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\VersionList */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Output/ValueObjectVisitor/VersionTest.php b/tests/lib/Server/Output/ValueObjectVisitor/VersionTest.php index cb9e6107..58476cea 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/VersionTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/VersionTest.php @@ -6,14 +6,14 @@ */ namespace Ibexa\Tests\Rest\Server\Output\ValueObjectVisitor; -use eZ\Publish\API\Repository\Values\ContentType\ContentType; +use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType; use Ibexa\Contracts\Rest\Output\Generator; use Ibexa\Tests\Rest\Output\ValueObjectVisitorBaseTest; use Ibexa\Rest\Server\Output\ValueObjectVisitor; -use eZ\Publish\Core\Repository\Values; +use Ibexa\Core\Repository\Values; use Ibexa\Rest\Server\Values\Version; -use eZ\Publish\API\Repository\Values\Content\Field; -use eZ\Publish\API\Repository\Values\Content\ContentInfo; +use Ibexa\Contracts\Core\Repository\Values\Content\Field; +use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo; use Ibexa\Rest\Output\FieldTypeSerializer; class VersionTest extends ValueObjectVisitorBaseTest @@ -174,7 +174,7 @@ public function testResultContainsFieldsChildren($result) /** * Get the Version visitor. * - * @return \EzSystems\EzPlatformRest\Server\Output\ValueObjectVisitor\Version + * @return \Ibexa\Rest\Server\Output\ValueObjectVisitor\Version */ protected function internalGetVisitor() { diff --git a/tests/lib/Server/Security/RestLogoutHandlerTest.php b/tests/lib/Server/Security/RestLogoutHandlerTest.php index 197b8db2..caa98397 100644 --- a/tests/lib/Server/Security/RestLogoutHandlerTest.php +++ b/tests/lib/Server/Security/RestLogoutHandlerTest.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Tests\Rest\Server\Security; -use eZ\Publish\Core\MVC\ConfigResolverInterface; +use Ibexa\Core\MVC\ConfigResolverInterface; use Ibexa\Rest\Server\Security\RestLogoutHandler; use PHPUnit\Framework\TestCase; use Symfony\Component\HttpFoundation\Request; diff --git a/tests/lib/Server/Security/RestSessionBasedAuthenticatorTest.php b/tests/lib/Server/Security/RestSessionBasedAuthenticatorTest.php index 18101ad5..cfabd41e 100644 --- a/tests/lib/Server/Security/RestSessionBasedAuthenticatorTest.php +++ b/tests/lib/Server/Security/RestSessionBasedAuthenticatorTest.php @@ -6,10 +6,10 @@ */ namespace Ibexa\Tests\Rest\Server\Security; -use eZ\Publish\API\Repository\Values\User\User; -use eZ\Publish\Core\MVC\ConfigResolverInterface; +use Ibexa\Contracts\Core\Repository\Values\User\User; +use Ibexa\Core\MVC\ConfigResolverInterface; use Ibexa\Rest\Server\Security\RestAuthenticator; -use eZ\Publish\Core\MVC\Symfony\Security\User as EzUser; +use Ibexa\Core\MVC\Symfony\Security\User as EzUser; use PHPUnit\Framework\TestCase; use Psr\Log\LoggerInterface; use Symfony\Component\EventDispatcher\EventDispatcherInterface; @@ -60,7 +60,7 @@ class RestSessionBasedAuthenticatorTest extends TestCase private $logger; /** - * @var \EzSystems\EzPlatformRest\Server\Security\RestAuthenticator + * @var \Ibexa\Rest\Server\Security\RestAuthenticator */ private $authenticator; @@ -203,7 +203,7 @@ public function testAuthenticateInvalidUser() /** * @param $userId * - * @return EzUser + * @return \Ibexa\Core\MVC\Symfony\Security\User */ private function createUser($userId) { diff --git a/tests/lib/Server/Security/SecurityListenerTest.php b/tests/lib/Server/Security/SecurityListenerTest.php index 1e3ea2cf..c873ad0a 100644 --- a/tests/lib/Server/Security/SecurityListenerTest.php +++ b/tests/lib/Server/Security/SecurityListenerTest.php @@ -8,9 +8,9 @@ namespace Ibexa\Tests\Rest\Server\Security; -use eZ\Publish\API\Repository\PermissionResolver; -use eZ\Publish\API\Repository\Values\User\User; -use eZ\Publish\Core\MVC\Symfony\Security\UserInterface; +use Ibexa\Contracts\Core\Repository\PermissionResolver; +use Ibexa\Contracts\Core\Repository\Values\User\User; +use Ibexa\Core\MVC\Symfony\Security\UserInterface; use Lexik\Bundle\JWTAuthenticationBundle\Security\Authentication\Token\JWTUserToken; use Ibexa\Rest\Server\Security\EventListener\SecurityListener; use PHPUnit\Framework\TestCase; @@ -19,7 +19,7 @@ class SecurityListenerTest extends TestCase { - /** @var \eZ\Publish\API\Repository\PermissionResolver|\PHPUnit\Framework\MockObject\MockObject */ + /** @var \Ibexa\Contracts\Core\Repository\PermissionResolver|\PHPUnit\Framework\MockObject\MockObject */ private $permissionResolver; protected function setUp(): void diff --git a/tests/lib/UrlHandler/PatternTest.php b/tests/lib/UrlHandler/PatternTest.php index 71b61ea3..9884a862 100644 --- a/tests/lib/UrlHandler/PatternTest.php +++ b/tests/lib/UrlHandler/PatternTest.php @@ -6,7 +6,7 @@ */ namespace Ibexa\Tests\Rest\UrlHandler; -use eZ\Publish\API\Repository\Exceptions\InvalidArgumentException; +use Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException; use Ibexa\Rest\RequestParser\Pattern; use PHPUnit\Framework\TestCase; @@ -198,7 +198,7 @@ public function testGenerateUrl($type, $url, $values) /** * Returns the URL handler. * - * @return \EzSystems\EzPlatformRest\RequestParser\Pattern + * @return \Ibexa\Rest\RequestParser\Pattern */ protected function getWorkingUrlHandler() { From 072a232a9c68604bf5ec0ce498d0962a069bb908 Mon Sep 17 00:00:00 2001 From: Nattfarinn Date: Wed, 1 Dec 2021 16:29:45 +0100 Subject: [PATCH 2/7] fix: Rename ibexa/doctrine-dbal-schema dependency to new name --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index c765e001..ef79399a 100644 --- a/composer.json +++ b/composer.json @@ -47,7 +47,7 @@ }, "require-dev": { "ibexa/ci-scripts": "^0.2@dev", - "ibexa/doctrine-dbal-schema": "^4.0@dev", + "ibexa/doctrine-schema": "^4.0@dev", "ibexa/code-style": "^1.0", "friendsofphp/php-cs-fixer": "^2.16.0", "phpunit/phpunit": "^8.5", From 0c461a2f5329f4669496dc812d3eaf1adeb33e63 Mon Sep 17 00:00:00 2001 From: Nattfarinn Date: Wed, 1 Dec 2021 17:10:16 +0100 Subject: [PATCH 3/7] fix: Change friendsofphp/php-cs-fixer dependency version to ^3.0 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index ef79399a..4ad58d19 100644 --- a/composer.json +++ b/composer.json @@ -49,7 +49,7 @@ "ibexa/ci-scripts": "^0.2@dev", "ibexa/doctrine-schema": "^4.0@dev", "ibexa/code-style": "^1.0", - "friendsofphp/php-cs-fixer": "^2.16.0", + "friendsofphp/php-cs-fixer": "^3.0", "phpunit/phpunit": "^8.5", "matthiasnoback/symfony-dependency-injection-test": "^4.1", "nyholm/psr7": "^1.1", From 6b6f4c0495b6bafdf13fa42296b2828185fc6fd1 Mon Sep 17 00:00:00 2001 From: Nattfarinn Date: Wed, 1 Dec 2021 17:23:38 +0100 Subject: [PATCH 4/7] fix: Update local configuration of friendsofphp/php-cs-fixer package --- .php-cs-fixer.php | 25 +++++++++++++++++++++++++ .php_cs | 10 ---------- composer.json | 2 +- 3 files changed, 26 insertions(+), 11 deletions(-) create mode 100644 .php-cs-fixer.php delete mode 100644 .php_cs diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php new file mode 100644 index 00000000..4ba28536 --- /dev/null +++ b/.php-cs-fixer.php @@ -0,0 +1,25 @@ +withRules([ + 'declare_strict_types' => false, +]); + +return $configFactory + ->buildConfig() + ->setFinder( + PhpCsFixer\Finder::create() + ->in([ + __DIR__ . '/src', + __DIR__ . '/tests', + ]) + ->files()->name('*.php') + ); diff --git a/.php_cs b/.php_cs deleted file mode 100644 index 0c73f93b..00000000 --- a/.php_cs +++ /dev/null @@ -1,10 +0,0 @@ -setFinder( - PhpCsFixer\Finder::create() - ->in(__DIR__ . '/src') - ->in(__DIR__ . '/tests') - ->files()->name('*.php') - ) -; diff --git a/composer.json b/composer.json index 4ad58d19..9a479062 100644 --- a/composer.json +++ b/composer.json @@ -57,7 +57,7 @@ "symfony/browser-kit": "^5.3" }, "scripts": { - "fix-cs": "@php ./vendor/bin/php-cs-fixer fix -v --show-progress=estimating" + "fix-cs": "php-cs-fixer fix --config=.php-cs-fixer.php --show-progress=dots" }, "extra": { "branch-alias": { From 965957cd76143728245319a1426dc160d64d473b Mon Sep 17 00:00:00 2001 From: Nattfarinn Date: Wed, 1 Dec 2021 17:49:08 +0100 Subject: [PATCH 5/7] fix: Coding Standards --- src/bundle/ApiLoader/Factory.php | 4 +-- src/bundle/CorsOptions/RestProvider.php | 6 ++-- .../Compiler/FieldTypeProcessorPass.php | 2 +- .../Compiler/InputHandlerPass.php | 2 +- .../Compiler/InputParserPass.php | 2 +- .../Compiler/OutputVisitorPass.php | 7 ++-- .../Compiler/ValueObjectVisitorPass.php | 2 +- .../DependencyInjection/Configuration.php | 2 +- .../IbexaRestExtension.php | 2 +- .../Security/RestSessionBasedFactory.php | 2 +- src/bundle/EventListener/CsrfListener.php | 12 +++---- src/bundle/EventListener/RequestListener.php | 8 ++--- src/bundle/EventListener/ResponseListener.php | 6 ++-- src/bundle/IbexaRestBundle.php | 6 ++-- src/bundle/RequestParser/Router.php | 4 +-- src/bundle/RestEvents.php | 4 +-- src/bundle/Routing/OptionsLoader.php | 5 ++- src/bundle/Routing/OptionsLoader/Mapper.php | 2 +- .../OptionsLoader/RouteCollectionMapper.php | 2 +- .../Exceptions/ForbiddenException.php | 2 +- .../Exceptions/InvalidArgumentException.php | 2 +- .../Exceptions/NotFoundException.php | 2 +- src/contracts/Exceptions/Parser.php | 2 +- src/contracts/FieldTypeProcessor.php | 2 +- src/contracts/Input/Handler.php | 2 +- src/contracts/Input/Parser.php | 2 +- src/contracts/Input/ParsingDispatcher.php | 2 +- .../Exceptions/InvalidTypeException.php | 2 +- .../Exceptions/NoVisitorFoundException.php | 2 +- .../Exceptions/OutputGeneratorException.php | 2 +- src/contracts/Output/Generator.php | 2 +- src/contracts/Output/ValueObjectVisitor.php | 6 ++-- .../Output/ValueObjectVisitorDispatcher.php | 2 +- src/contracts/Output/Visitor.php | 2 +- .../FieldTypeProcessor/AuthorProcessor.php | 2 +- .../BaseRelationProcessor.php | 4 +-- .../BinaryInputProcessor.php | 2 +- .../FieldTypeProcessor/BinaryProcessor.php | 2 +- .../DateAndTimeProcessor.php | 2 +- src/lib/FieldTypeProcessor/DateProcessor.php | 2 +- src/lib/FieldTypeProcessor/FloatProcessor.php | 2 +- .../ImageAssetFieldTypeProcessor.php | 2 +- src/lib/FieldTypeProcessor/ImageProcessor.php | 2 +- src/lib/FieldTypeProcessor/MediaProcessor.php | 2 +- .../RelationListProcessor.php | 2 +- .../FieldTypeProcessor/RelationProcessor.php | 2 +- .../FieldTypeProcessor/StringProcessor.php | 2 +- src/lib/FieldTypeProcessor/TimeProcessor.php | 2 +- src/lib/FieldTypeProcessor/UserProcessor.php | 2 +- src/lib/FieldTypeProcessorRegistry.php | 2 +- src/lib/Input/BaseParser.php | 2 +- src/lib/Input/Dispatcher.php | 4 +-- src/lib/Input/FieldTypeParser.php | 4 +-- src/lib/Input/Handler/Json.php | 4 +-- src/lib/Input/Handler/Xml.php | 4 +-- src/lib/Input/Parser/ContentObjectStates.php | 8 ++--- src/lib/Input/ParserTools.php | 4 +-- src/lib/Message.php | 2 +- src/lib/Output/DelegateValueObjectVisitor.php | 2 +- src/lib/Output/FieldTypeSerializer.php | 10 +++--- src/lib/Output/Generator/Json.php | 2 +- src/lib/Output/Generator/Json/ArrayObject.php | 2 +- .../Generator/Json/FieldTypeHashGenerator.php | 2 +- src/lib/Output/Generator/Json/JsonObject.php | 2 +- src/lib/Output/Generator/Xml.php | 2 +- .../Generator/Xml/FieldTypeHashGenerator.php | 2 +- .../ContentObjectStates.php | 4 +-- src/lib/RequestParser.php | 2 +- src/lib/RequestParser/EzPublish.php | 2 +- src/lib/RequestParser/Pattern.php | 8 ++--- src/lib/Server/Controller.php | 8 ++--- src/lib/Server/Controller/BinaryContent.php | 6 ++-- src/lib/Server/Controller/Bookmark.php | 6 ++-- src/lib/Server/Controller/Content.php | 18 +++++------ src/lib/Server/Controller/ContentType.php | 30 ++++++++--------- src/lib/Server/Controller/JWT.php | 4 +-- src/lib/Server/Controller/Location.php | 14 ++++---- src/lib/Server/Controller/ObjectState.php | 16 +++++----- src/lib/Server/Controller/Options.php | 4 +-- src/lib/Server/Controller/Role.php | 18 +++++------ src/lib/Server/Controller/Root.php | 3 +- src/lib/Server/Controller/Section.php | 12 +++---- src/lib/Server/Controller/Services.php | 2 +- .../Server/Controller/SessionController.php | 9 +++--- src/lib/Server/Controller/Trash.php | 10 +++--- src/lib/Server/Controller/URLAlias.php | 10 +++--- src/lib/Server/Controller/URLWildcard.php | 8 ++--- src/lib/Server/Controller/User.php | 28 ++++++++-------- src/lib/Server/Controller/Views.php | 6 ++-- .../AuthenticationFailedException.php | 2 +- .../Server/Exceptions/BadRequestException.php | 2 +- .../ContentFieldValidationException.php | 2 +- .../Server/Exceptions/ForbiddenException.php | 2 +- .../Exceptions/InvalidUserTypeException.php | 2 +- .../Exceptions/UserConflictException.php | 2 +- .../AbstractRangeAggregationParser.php | 4 +-- .../AbstractStatsAggregationParser.php | 4 +-- .../AbstractTermAggregationParser.php | 4 +-- .../ContentTypeGroupTermAggregationParser.php | 2 +- .../ContentTypeTermAggregationParser.php | 2 +- .../DateMetadataRangeAggregationParser.php | 4 +-- .../Field/AuthorTermAggregationParser.php | 4 +-- .../Field/CheckboxTermAggregationParser.php | 4 +-- .../Field/CountryTermAggregationParser.php | 4 +-- .../Field/DateRangeAggregationParser.php | 4 +-- .../Field/DateTimeRangeAggregationParser.php | 4 +-- .../Field/FloatRangeAggregationParser.php | 4 +-- .../Field/FloatStatsAggregationParser.php | 4 +-- .../Field/IntegerRangeAggregationParser.php | 4 +-- .../Field/IntegerStatsAggregationParser.php | 4 +-- .../Field/KeywordTermAggregationParser.php | 4 +-- .../Field/SelectionTermAggregationParser.php | 4 +-- .../Field/TimeRangeAggregationParser.php | 4 +-- .../LanguageTermAggregationParser.php | 2 +- .../LocationChildrenTermAggregationParser.php | 2 +- .../Location/SubtreeTermAggregationParser.php | 4 +-- .../ObjectStateTermAggregationParser.php | 4 +-- .../Aggregation/Range/AbstractRangeParser.php | 6 ++-- .../Aggregation/Range/DateTimeRangeParser.php | 2 +- .../Aggregation/Range/FloatRangeParser.php | 2 +- .../Aggregation/Range/IntRangeParser.php | 2 +- .../Aggregation/RawRangeAggregationParser.php | 2 +- .../Aggregation/RawStatsAggregationParser.php | 2 +- .../Aggregation/RawTermAggregationParser.php | 2 +- .../SectionTermAggregationParser.php | 2 +- .../UserMetadataTermAggregationParser.php | 4 +-- .../VisibilityTermAggregationParser.php | 2 +- src/lib/Server/Input/Parser/ContentCreate.php | 20 ++++++------ src/lib/Server/Input/Parser/ContentQuery.php | 2 +- .../Server/Input/Parser/ContentTypeCreate.php | 10 +++--- .../Input/Parser/ContentTypeGroupInput.php | 10 +++--- .../Server/Input/Parser/ContentTypeUpdate.php | 10 +++--- src/lib/Server/Input/Parser/ContentUpdate.php | 10 +++--- src/lib/Server/Input/Parser/Criterion.php | 6 ++-- .../Input/Parser/Criterion/Ancestor.php | 8 ++--- .../Input/Parser/Criterion/ContentId.php | 8 ++--- .../Parser/Criterion/ContentRemoteId.php | 8 ++--- .../Parser/Criterion/ContentTypeGroupId.php | 8 ++--- .../Input/Parser/Criterion/ContentTypeId.php | 8 ++--- .../Criterion/ContentTypeIdentifier.php | 8 ++--- .../Input/Parser/Criterion/DateMetadata.php | 8 ++--- .../Server/Input/Parser/Criterion/Field.php | 8 ++--- .../Input/Parser/Criterion/FullText.php | 8 ++--- .../Input/Parser/Criterion/IsUserBased.php | 8 ++--- .../Input/Parser/Criterion/IsUserEnabled.php | 8 ++--- .../Input/Parser/Criterion/LanguageCode.php | 8 ++--- .../Input/Parser/Criterion/LocationId.php | 8 ++--- .../Parser/Criterion/LocationRemoteId.php | 8 ++--- .../Input/Parser/Criterion/LogicalAnd.php | 6 ++-- .../Input/Parser/Criterion/LogicalNot.php | 8 ++--- .../Parser/Criterion/LogicalOperator.php | 2 +- .../Input/Parser/Criterion/LogicalOr.php | 6 ++-- .../Input/Parser/Criterion/MoreLikeThis.php | 4 +-- .../Input/Parser/Criterion/ObjectStateId.php | 8 ++--- .../Criterion/ObjectStateIdentifier.php | 8 ++--- .../Input/Parser/Criterion/Operator.php | 4 +-- .../Parser/Criterion/ParentLocationId.php | 8 ++--- .../Criterion/ParentLocationRemoteId.php | 8 ++--- .../Input/Parser/Criterion/SectionId.php | 8 ++--- .../Parser/Criterion/SectionIdentifier.php | 8 ++--- .../Server/Input/Parser/Criterion/Sibling.php | 6 ++-- .../Server/Input/Parser/Criterion/Subtree.php | 8 ++--- .../Input/Parser/Criterion/UserEmail.php | 8 ++--- .../Server/Input/Parser/Criterion/UserId.php | 8 ++--- .../Input/Parser/Criterion/UserLogin.php | 8 ++--- .../Input/Parser/Criterion/UserMetadata.php | 8 ++--- .../Input/Parser/Criterion/Visibility.php | 8 ++--- .../Parser/FacetBuilder/ContentTypeParser.php | 8 ++--- .../Parser/FacetBuilder/CriterionParser.php | 8 ++--- .../Parser/FacetBuilder/DateRangeParser.php | 8 ++--- .../Input/Parser/FacetBuilder/FieldParser.php | 8 ++--- .../Parser/FacetBuilder/FieldRangeParser.php | 6 ++-- .../Parser/FacetBuilder/LocationParser.php | 8 ++--- .../Parser/FacetBuilder/SectionParser.php | 8 ++--- .../Input/Parser/FacetBuilder/TermParser.php | 8 ++--- .../Input/Parser/FacetBuilder/UserParser.php | 8 ++--- .../Input/Parser/FieldDefinitionCreate.php | 10 +++--- .../Input/Parser/FieldDefinitionUpdate.php | 8 ++--- src/lib/Server/Input/Parser/JWTInput.php | 6 ++-- .../PathStringRouteBasedLimitationParser.php | 4 +-- .../Limitation/RouteBasedLimitationParser.php | 6 ++-- .../Server/Input/Parser/LocationCreate.php | 8 ++--- src/lib/Server/Input/Parser/LocationQuery.php | 2 +- .../Server/Input/Parser/LocationUpdate.php | 6 ++-- .../Server/Input/Parser/ObjectStateCreate.php | 8 ++--- .../Input/Parser/ObjectStateGroupCreate.php | 8 ++--- .../Input/Parser/ObjectStateGroupUpdate.php | 8 ++--- .../Server/Input/Parser/ObjectStateUpdate.php | 8 ++--- src/lib/Server/Input/Parser/PolicyCreate.php | 8 ++--- src/lib/Server/Input/Parser/PolicyUpdate.php | 8 ++--- src/lib/Server/Input/Parser/Query.php | 4 +-- .../Server/Input/Parser/RelationCreate.php | 6 ++-- .../Server/Input/Parser/RoleAssignInput.php | 6 ++-- src/lib/Server/Input/Parser/RoleInput.php | 6 ++-- src/lib/Server/Input/Parser/SectionInput.php | 6 ++-- src/lib/Server/Input/Parser/SessionInput.php | 6 ++-- .../SortClause/DataKeyValueObjectClass.php | 6 ++-- .../Server/Input/Parser/SortClause/Field.php | 8 ++--- .../Server/Input/Parser/URLAliasCreate.php | 6 ++-- .../Server/Input/Parser/URLWildcardCreate.php | 6 ++-- src/lib/Server/Input/Parser/UserCreate.php | 10 +++--- .../Server/Input/Parser/UserGroupCreate.php | 10 +++--- .../Server/Input/Parser/UserGroupUpdate.php | 12 +++---- src/lib/Server/Input/Parser/UserUpdate.php | 10 +++--- src/lib/Server/Input/Parser/VersionUpdate.php | 8 ++--- src/lib/Server/Input/Parser/ViewInput.php | 6 ++-- .../Input/Parser/ViewInputOneDotOne.php | 6 ++-- .../Output/ValueObjectVisitor/Author.php | 2 +- .../BadRequestException.php | 2 +- .../ValueObjectVisitor/BadStateException.php | 2 +- .../ValueObjectVisitor/BookmarkList.php | 4 +-- .../Output/ValueObjectVisitor/CachedValue.php | 8 ++--- .../Output/ValueObjectVisitor/Conflict.php | 4 +-- .../ContentFieldValidationException.php | 2 +- .../Output/ValueObjectVisitor/ContentList.php | 4 +-- .../Output/ValueObjectVisitor/ContentType.php | 4 +-- .../ValueObjectVisitor/ContentTypeGroup.php | 6 ++-- .../ContentTypeGroupList.php | 4 +-- .../ContentTypeGroupRefList.php | 4 +-- .../ContentTypeInfoList.php | 4 +-- .../ValueObjectVisitor/ContentTypeList.php | 4 +-- .../Output/ValueObjectVisitor/CountryList.php | 4 +-- .../ValueObjectVisitor/CreatedContent.php | 2 +- .../ValueObjectVisitor/CreatedContentType.php | 2 +- .../CreatedContentTypeGroup.php | 2 +- .../CreatedFieldDefinition.php | 2 +- .../ValueObjectVisitor/CreatedLocation.php | 2 +- .../ValueObjectVisitor/CreatedObjectState.php | 2 +- .../CreatedObjectStateGroup.php | 2 +- .../ValueObjectVisitor/CreatedPolicy.php | 2 +- .../ValueObjectVisitor/CreatedRelation.php | 2 +- .../Output/ValueObjectVisitor/CreatedRole.php | 2 +- .../ValueObjectVisitor/CreatedSection.php | 2 +- .../ValueObjectVisitor/CreatedURLAlias.php | 2 +- .../ValueObjectVisitor/CreatedURLWildcard.php | 2 +- .../Output/ValueObjectVisitor/CreatedUser.php | 2 +- .../ValueObjectVisitor/CreatedUserGroup.php | 2 +- .../ValueObjectVisitor/CreatedVersion.php | 2 +- .../ValueObjectVisitor/DeletedUserSession.php | 2 +- .../Output/ValueObjectVisitor/Exception.php | 4 +-- .../FieldDefinitionList.php | 2 +- .../ValueObjectVisitor/ForbiddenException.php | 2 +- .../ValueObjectVisitor/HttpException.php | 2 +- .../ValueObjectVisitor/ImageVariation.php | 6 ++-- .../InvalidArgumentException.php | 2 +- .../Server/Output/ValueObjectVisitor/JWT.php | 2 +- .../Output/ValueObjectVisitor/Language.php | 2 +- .../Output/ValueObjectVisitor/Location.php | 6 ++-- .../ValueObjectVisitor/LocationList.php | 4 +-- .../Output/ValueObjectVisitor/NoContent.php | 4 +-- .../ValueObjectVisitor/NotFoundException.php | 2 +- .../NotImplementedException.php | 2 +- .../Server/Output/ValueObjectVisitor/OK.php | 2 +- .../Output/ValueObjectVisitor/ObjectState.php | 4 +-- .../ValueObjectVisitor/ObjectStateGroup.php | 6 ++-- .../ObjectStateGroupList.php | 4 +-- .../ValueObjectVisitor/ObjectStateList.php | 4 +-- .../Output/ValueObjectVisitor/Options.php | 2 +- .../ValueObjectVisitor/PermanentRedirect.php | 4 +-- .../Output/ValueObjectVisitor/Policy.php | 6 ++-- .../Output/ValueObjectVisitor/PolicyList.php | 4 +-- .../ValueObjectVisitor/PublishedRole.php | 2 +- .../Output/ValueObjectVisitor/Range.php | 2 +- .../RangeAggregationResult.php | 2 +- .../ValueObjectVisitor/RelationList.php | 4 +-- .../ValueObjectVisitor/ResourceCreated.php | 4 +-- .../Output/ValueObjectVisitor/RestContent.php | 8 ++--- .../ValueObjectVisitor/RestContentType.php | 4 +-- .../RestContentTypeBase.php | 2 +- .../ValueObjectVisitor/RestExecutedView.php | 10 +++--- .../RestFieldDefinition.php | 4 +-- .../ValueObjectVisitor/RestLocation.php | 4 +-- .../ValueObjectVisitor/RestObjectState.php | 4 +-- .../ValueObjectVisitor/RestRelation.php | 6 ++-- .../ValueObjectVisitor/RestTrashItem.php | 4 +-- .../Output/ValueObjectVisitor/RestUser.php | 4 +-- .../ValueObjectVisitor/RestUserGroup.php | 4 +-- .../RestUserGroupRoleAssignment.php | 6 ++-- .../RestUserRoleAssignment.php | 6 ++-- .../Server/Output/ValueObjectVisitor/Role.php | 4 +-- .../ValueObjectVisitor/RoleAssignmentList.php | 4 +-- .../Output/ValueObjectVisitor/RoleList.php | 4 +-- .../Server/Output/ValueObjectVisitor/Root.php | 4 +-- .../Output/ValueObjectVisitor/Section.php | 6 ++-- .../Output/ValueObjectVisitor/SectionList.php | 4 +-- .../Output/ValueObjectVisitor/SeeOther.php | 4 +-- .../StatsAggregationResult.php | 2 +- .../ValueObjectVisitor/TemporaryRedirect.php | 4 +-- .../TermAggregationResult.php | 2 +- .../Output/ValueObjectVisitor/Trash.php | 4 +-- .../Output/ValueObjectVisitor/URLAlias.php | 6 ++-- .../ValueObjectVisitor/URLAliasList.php | 4 +-- .../ValueObjectVisitor/URLAliasRefList.php | 4 +-- .../Output/ValueObjectVisitor/URLWildcard.php | 6 ++-- .../ValueObjectVisitor/URLWildcardList.php | 4 +-- .../UnauthorizedException.php | 2 +- .../Server/Output/ValueObjectVisitor/User.php | 4 +-- .../Output/ValueObjectVisitor/UserGroup.php | 4 +-- .../ValueObjectVisitor/UserGroupList.php | 4 +-- .../ValueObjectVisitor/UserGroupRefList.php | 4 +-- .../Output/ValueObjectVisitor/UserList.php | 4 +-- .../Output/ValueObjectVisitor/UserRefList.php | 4 +-- .../Output/ValueObjectVisitor/UserSession.php | 4 +-- .../Output/ValueObjectVisitor/Version.php | 8 ++--- .../Output/ValueObjectVisitor/VersionInfo.php | 14 ++++---- .../Output/ValueObjectVisitor/VersionList.php | 4 +-- .../VersionTranslationInfo.php | 4 +-- src/lib/Server/Security/CsrfTokenManager.php | 5 +-- .../EventListener/SecurityListener.php | 2 +- src/lib/Server/Security/JWTUser.php | 2 +- src/lib/Server/Security/RestAuthenticator.php | 5 +-- src/lib/Server/Security/RestLogoutHandler.php | 2 +- .../ExpressionRouterRootResourceBuilder.php | 2 +- .../Service/RootResourceBuilderInterface.php | 2 +- src/lib/Server/Values/BookmarkList.php | 2 +- src/lib/Server/Values/CachedValue.php | 2 +- src/lib/Server/Values/Conflict.php | 2 +- src/lib/Server/Values/ContentList.php | 2 +- .../Server/Values/ContentTypeGroupList.php | 2 +- .../Server/Values/ContentTypeGroupRefList.php | 2 +- src/lib/Server/Values/ContentTypeInfoList.php | 2 +- src/lib/Server/Values/ContentTypeList.php | 2 +- src/lib/Server/Values/CountryList.php | 2 +- src/lib/Server/Values/CreatedContent.php | 2 +- src/lib/Server/Values/CreatedContentType.php | 2 +- .../Server/Values/CreatedContentTypeGroup.php | 2 +- .../Server/Values/CreatedFieldDefinition.php | 2 +- src/lib/Server/Values/CreatedLocation.php | 2 +- src/lib/Server/Values/CreatedObjectState.php | 2 +- .../Server/Values/CreatedObjectStateGroup.php | 2 +- src/lib/Server/Values/CreatedPolicy.php | 2 +- src/lib/Server/Values/CreatedRelation.php | 2 +- src/lib/Server/Values/CreatedRole.php | 2 +- src/lib/Server/Values/CreatedSection.php | 2 +- src/lib/Server/Values/CreatedURLAlias.php | 2 +- src/lib/Server/Values/CreatedURLWildcard.php | 2 +- src/lib/Server/Values/CreatedUser.php | 2 +- src/lib/Server/Values/CreatedUserGroup.php | 2 +- src/lib/Server/Values/CreatedVersion.php | 2 +- src/lib/Server/Values/DeletedUserSession.php | 2 +- src/lib/Server/Values/FieldDefinitionList.php | 2 +- src/lib/Server/Values/JWT.php | 2 +- src/lib/Server/Values/JWTInput.php | 2 +- src/lib/Server/Values/LocationList.php | 2 +- src/lib/Server/Values/NoContent.php | 2 +- src/lib/Server/Values/OK.php | 2 +- .../Server/Values/ObjectStateGroupList.php | 2 +- src/lib/Server/Values/ObjectStateList.php | 2 +- src/lib/Server/Values/Options.php | 2 +- src/lib/Server/Values/PermanentRedirect.php | 2 +- src/lib/Server/Values/PolicyList.php | 2 +- src/lib/Server/Values/PublishedRole.php | 2 +- src/lib/Server/Values/RelationList.php | 2 +- src/lib/Server/Values/ResourceCreated.php | 2 +- src/lib/Server/Values/RestContent.php | 6 ++-- .../Server/Values/RestContentCreateStruct.php | 2 +- src/lib/Server/Values/RestContentType.php | 2 +- src/lib/Server/Values/RestExecutedView.php | 2 +- src/lib/Server/Values/RestFieldDefinition.php | 2 +- src/lib/Server/Values/RestLocation.php | 2 +- .../Values/RestLocationUpdateStruct.php | 2 +- src/lib/Server/Values/RestRelation.php | 2 +- src/lib/Server/Values/RestRole.php | 2 +- src/lib/Server/Values/RestTrashItem.php | 2 +- src/lib/Server/Values/RestUser.php | 4 +-- src/lib/Server/Values/RestUserGroup.php | 4 +-- .../Values/RestUserGroupRoleAssignment.php | 2 +- .../Values/RestUserGroupUpdateStruct.php | 2 +- .../Server/Values/RestUserRoleAssignment.php | 2 +- .../Server/Values/RestUserUpdateStruct.php | 2 +- src/lib/Server/Values/RestViewInput.php | 2 +- src/lib/Server/Values/RoleAssignment.php | 2 +- src/lib/Server/Values/RoleAssignmentList.php | 2 +- src/lib/Server/Values/RoleList.php | 2 +- src/lib/Server/Values/SectionList.php | 2 +- src/lib/Server/Values/SeeOther.php | 2 +- src/lib/Server/Values/SessionInput.php | 2 +- src/lib/Server/Values/TemporaryRedirect.php | 2 +- src/lib/Server/Values/Trash.php | 2 +- src/lib/Server/Values/URLAliasList.php | 2 +- src/lib/Server/Values/URLAliasRefList.php | 2 +- src/lib/Server/Values/URLWildcardList.php | 2 +- src/lib/Server/Values/UserGroupList.php | 2 +- src/lib/Server/Values/UserGroupRefList.php | 2 +- src/lib/Server/Values/UserList.php | 2 +- src/lib/Server/Values/UserRefList.php | 2 +- src/lib/Server/Values/UserSession.php | 4 +-- src/lib/Server/Values/Version.php | 2 +- src/lib/Server/Values/VersionList.php | 2 +- .../Server/Values/VersionTranslationInfo.php | 2 +- .../View/AcceptHeaderVisitorDispatcher.php | 5 ++- src/lib/Value.php | 2 +- src/lib/Values/ContentObjectStates.php | 2 +- src/lib/Values/Resource.php | 2 +- .../RestContentMetadataUpdateStruct.php | 2 +- src/lib/Values/RestObjectState.php | 2 +- src/lib/Values/Root.php | 2 +- tests/bundle/CorsOptions/RestProviderTest.php | 7 ++-- .../Compiler/FieldTypeProcessorPassTest.php | 4 +-- .../Compiler/InputHandlerPassTest.php | 4 +-- .../Compiler/InputParserPassTest.php | 4 +-- .../Compiler/OutputVisitorPassTest.php | 6 ++-- .../Compiler/ValueObjectVisitorPassTest.php | 4 +-- .../bundle/EventListener/CsrfListenerTest.php | 15 ++++----- .../EventListener/EventListenerTest.php | 7 ++-- .../EventListener/RequestListenerTest.php | 9 +++--- .../EventListener/ResponseListenerTest.php | 10 +++--- tests/bundle/Functional/BinaryContentTest.php | 2 +- tests/bundle/Functional/BookmarkTest.php | 20 ++++++++---- tests/bundle/Functional/ContentTest.php | 2 +- tests/bundle/Functional/ContentTypeTest.php | 2 +- tests/bundle/Functional/HttpOptionsTest.php | 2 +- tests/bundle/Functional/LocationTest.php | 2 +- tests/bundle/Functional/ObjectStateTest.php | 2 +- tests/bundle/Functional/RelationTest.php | 2 +- tests/bundle/Functional/RoleTest.php | 2 +- tests/bundle/Functional/RootTest.php | 2 +- .../SearchView/Criterion/IsUserBasedTest.php | 2 +- .../Criterion/IsUserEnabledTest.php | 2 +- .../Criterion/ObjectStateIdentifierTest.php | 2 +- .../Criterion/SectionIdentifierTest.php | 2 +- .../SearchView/Criterion/SiblingTest.php | 2 +- .../SearchView/Criterion/UserEmailTest.php | 2 +- .../SearchView/Criterion/UserIdTest.php | 2 +- .../SearchView/Criterion/UserLoginTest.php | 2 +- .../SearchView/SearchCriterionTestCase.php | 2 +- .../Functional/SearchView/SearchViewTest.php | 2 +- .../SearchView/SearchViewTestCase.php | 2 +- tests/bundle/Functional/SectionTest.php | 2 +- tests/bundle/Functional/SessionTest.php | 2 +- tests/bundle/Functional/SortClauseTest.php | 2 +- tests/bundle/Functional/TestCase.php | 8 ++--- tests/bundle/Functional/TrashTest.php | 2 +- tests/bundle/Functional/UrlAliasTest.php | 2 +- tests/bundle/Functional/UrlWildcardTest.php | 2 +- tests/bundle/Functional/UserTest.php | 2 +- tests/bundle/Functional/ViewTest.php | 2 +- tests/bundle/RequestParser/RouterTest.php | 4 +-- .../Routing/OptionsLoader/MapperTest.php | 2 +- .../RouteCollectionMapperTest.php | 2 +- tests/bundle/Routing/OptionsLoaderTest.php | 3 +- tests/lib/AssertXmlTagTrait.php | 2 +- .../AuthorProcessorTest.php | 4 +-- .../BinaryInputProcessorTest.php | 2 +- .../BinaryProcessorTest.php | 4 +-- .../DateAndTimeProcessorTest.php | 4 +-- .../FieldTypeProcessor/DateProcessorTest.php | 4 +-- .../FieldTypeProcessor/ImageProcessorTest.php | 3 +- .../FieldTypeProcessor/MediaProcessorTest.php | 4 +-- .../RelationListProcessorTest.php | 4 +-- .../RelationProcessorTest.php | 4 +-- .../FieldTypeProcessor/TimeProcessorTest.php | 4 +-- tests/lib/FieldTypeProcessorRegistryTest.php | 4 +-- tests/lib/Input/DispatcherTest.php | 6 ++-- tests/lib/Input/FieldTypeParserTest.php | 30 ++++++++--------- tests/lib/Input/Handler/JsonTest.php | 4 +-- tests/lib/Input/Handler/XmlTest.php | 4 +-- .../Input/Handler/_fixtures/forceList.xml.php | 2 +- .../Handler/_fixtures/forceListDouble.xml.php | 2 +- .../_fixtures/testGeneratorAttribute.xml.php | 2 +- .../_fixtures/testGeneratorElement.xml.php | 2 +- .../testGeneratorElementList.xml.php | 2 +- .../testGeneratorEmptyValueElement.xml.php | 2 +- ...GeneratorFieldTypeSettingsRelation.xml.php | 2 +- ...ValidatorConfigurationStringLength.xml.php | 2 +- ...stGeneratorFieldTypeValueBoolFalse.xml.php | 2 +- ...estGeneratorFieldTypeValueBoolTrue.xml.php | 2 +- ...neratorFieldTypeValueComplexAuthor.xml.php | 2 +- .../testGeneratorFieldTypeValueFloat.xml.php | 2 +- .../testGeneratorFieldTypeValueHash.xml.php | 2 +- ...testGeneratorFieldTypeValueInteger.xml.php | 2 +- .../testGeneratorFieldTypeValueList.xml.php | 2 +- .../testGeneratorFieldTypeValueNull.xml.php | 2 +- .../testGeneratorFieldTypeValueString.xml.php | 2 +- .../testGeneratorHashElement.xml.php | 2 +- .../testGeneratorMultipleAttributes.xml.php | 2 +- .../testGeneratorStackedElement.xml.php | 2 +- .../testGeneratorTripleElementList.xml.php | 2 +- .../testGeneratorValueElement.xml.php | 2 +- tests/lib/Input/ParserToolsTest.php | 4 +-- tests/lib/Input/ParsingDispatcherTest.php | 2 +- tests/lib/MessageTest.php | 2 +- tests/lib/Output/FieldTypeSerializerTest.php | 32 +++++++++---------- .../FieldTypeHashGeneratorBaseTest.php | 4 +-- .../Json/FieldTypeHashGeneratorTest.php | 2 +- tests/lib/Output/Generator/JsonTest.php | 4 +-- .../Xml/FieldTypeHashGeneratorTest.php | 2 +- tests/lib/Output/Generator/XmlTest.php | 6 ++-- tests/lib/Output/GeneratorTest.php | 2 +- tests/lib/Output/ValueObject.php | 2 +- .../lib/Output/ValueObjectVisitorBaseTest.php | 8 ++--- .../ValueObjectVisitorDispatcherTest.php | 16 +++++----- tests/lib/Output/VisitorTest.php | 8 ++--- tests/lib/Server/BaseTest.php | 2 +- tests/lib/Server/Input/Parser/BaseTest.php | 8 ++--- .../Server/Input/Parser/ContentCreateTest.php | 12 +++---- .../Input/Parser/ContentObjectStatesTest.php | 2 +- .../Input/Parser/ContentTypeCreateTest.php | 8 ++--- .../Parser/ContentTypeGroupInputTest.php | 6 ++-- .../Input/Parser/ContentTypeUpdateTest.php | 4 +-- .../Server/Input/Parser/ContentUpdateTest.php | 6 ++-- .../Parser/Criterion/DateMetadataTest.php | 8 ++--- .../Input/Parser/Criterion/LogicalAndTest.php | 4 +-- .../Input/Parser/Criterion/LogicalOrTest.php | 4 +-- .../Input/Parser/Criterion/SiblingTest.php | 4 +-- .../Parser/Criterion/UserMetadataTest.php | 4 +-- .../FacetBuilder/FacetBuilderBaseTest.php | 2 +- .../FacetBuilder/FacetBuilderParserTest.php | 4 +-- .../Parser/FieldDefinitionCreateTest.php | 8 ++--- .../Parser/FieldDefinitionUpdateTest.php | 14 ++++---- .../lib/Server/Input/Parser/JWTInputTest.php | 2 +- ...thStringRouteBasedLimitationParserTest.php | 2 +- .../RouteBasedLimitationParserTest.php | 2 +- .../Input/Parser/LocationCreateTest.php | 8 ++--- .../Input/Parser/LocationUpdateTest.php | 8 ++--- .../Input/Parser/ObjectStateCreateTest.php | 6 ++-- .../Parser/ObjectStateGroupCreateTest.php | 6 ++-- .../Parser/ObjectStateGroupUpdateTest.php | 6 ++-- .../Input/Parser/ObjectStateUpdateTest.php | 6 ++-- .../Server/Input/Parser/PolicyCreateTest.php | 6 ++-- .../Server/Input/Parser/PolicyUpdateTest.php | 6 ++-- .../Server/Input/Parser/QueryParserTest.php | 2 +- .../Input/Parser/RelationCreateTest.php | 4 +-- .../Input/Parser/RoleAssignInputTest.php | 4 +-- .../lib/Server/Input/Parser/RoleInputTest.php | 4 +-- .../Server/Input/Parser/SectionInputTest.php | 6 ++-- .../Server/Input/Parser/SessionInputTest.php | 4 +-- .../DataKeyValueObjectClassTest.php | 4 +-- .../Input/Parser/SortClause/FieldTest.php | 4 +-- .../Input/Parser/URLWildcardCreateTest.php | 4 +-- .../Server/Input/Parser/UserCreateTest.php | 16 +++++----- .../Input/Parser/UserGroupCreateTest.php | 16 +++++----- .../Input/Parser/UserGroupUpdateTest.php | 16 +++++----- .../Server/Input/Parser/UserUpdateTest.php | 10 +++--- .../Server/Input/Parser/VersionUpdateTest.php | 8 ++--- .../Input/Parser/ViewInputOneDotOneTest.php | 4 +-- .../lib/Server/Input/Parser/ViewInputTest.php | 2 +- .../BadRequestExceptionTest.php | 4 +-- .../BadStateExceptionTest.php | 4 +-- .../ValueObjectVisitor/BookmarkListTest.php | 4 +-- .../ValueObjectVisitor/CachedValueTest.php | 9 +++--- .../ValueObjectVisitor/ConflictTest.php | 4 +-- .../ContentFieldValidationExceptionTest.php | 6 ++-- .../ValueObjectVisitor/ContentListTest.php | 6 ++-- .../ContentObjectStatesTest.php | 4 +-- .../ContentTypeGroupListTest.php | 8 ++--- .../ContentTypeGroupRefListTest.php | 6 ++-- .../ContentTypeGroupTest.php | 6 ++-- .../ContentTypeInfoListTest.php | 6 ++-- .../ContentTypeListTest.php | 6 ++-- .../ValueObjectVisitor/CountryListTest.php | 4 +-- .../DeletedUserSessionTest.php | 4 +-- .../ValueObjectVisitor/ExceptionTest.php | 8 ++--- .../FieldDefinitionListTest.php | 8 ++--- .../ForbiddenExceptionTest.php | 4 +-- .../ValueObjectVisitor/ImageVariationTest.php | 6 ++-- .../InvalidArgumentExceptionTest.php | 4 +-- .../Output/ValueObjectVisitor/JWTTest.php | 2 +- .../ValueObjectVisitor/LocationListTest.php | 4 +-- .../ValueObjectVisitor/NoContentTest.php | 4 +-- .../NotFoundExceptionTest.php | 2 +- .../NotImplementedExceptionTest.php | 2 +- .../ObjectStateGroupListTest.php | 6 ++-- .../ObjectStateGroupTest.php | 6 ++-- .../ObjectStateListTest.php | 8 ++--- .../Output/ValueObjectVisitor/OptionsTest.php | 8 ++--- .../PermanentRedirectTest.php | 4 +-- .../ValueObjectVisitor/PolicyListTest.php | 6 ++-- .../Output/ValueObjectVisitor/PolicyTest.php | 6 ++-- .../ValueObjectVisitor/RelationListTest.php | 6 ++-- .../ResourceCreatedTest.php | 4 +-- .../ValueObjectVisitor/RestContentTest.php | 14 ++++---- .../RestContentTypeTest.php | 6 ++-- .../RestExecutedViewTest.php | 8 ++--- .../RestFieldDefinitionTest.php | 10 +++--- .../RestLocationRootNodeTest.php | 6 ++-- .../ValueObjectVisitor/RestLocationTest.php | 8 ++--- .../RestObjectStateTest.php | 6 ++-- .../ValueObjectVisitor/RestRelationTest.php | 8 ++--- .../ValueObjectVisitor/RestTrashItemTest.php | 8 ++--- .../RestUserGroupRoleAssignmentTest.php | 6 ++-- .../ValueObjectVisitor/RestUserGroupTest.php | 10 +++--- .../RestUserRoleAssignmentTest.php | 6 ++-- .../ValueObjectVisitor/RestUserTest.php | 10 +++--- .../RoleAssignmentListTest.php | 6 ++-- .../ValueObjectVisitor/RoleListTest.php | 6 ++-- .../Output/ValueObjectVisitor/RoleTest.php | 6 ++-- .../Output/ValueObjectVisitor/RootTest.php | 4 +-- .../ValueObjectVisitor/SectionListTest.php | 6 ++-- .../Output/ValueObjectVisitor/SectionTest.php | 6 ++-- .../TemporaryRedirectTest.php | 4 +-- .../Output/ValueObjectVisitor/TrashTest.php | 8 ++--- .../ValueObjectVisitor/URLAliasListTest.php | 6 ++-- .../URLAliasRefListTest.php | 6 ++-- .../ValueObjectVisitor/URLAliasTest.php | 6 ++-- .../URLWildcardListTest.php | 6 ++-- .../ValueObjectVisitor/URLWildcardTest.php | 6 ++-- .../UnauthorizedExceptionTest.php | 4 +-- .../ValueObjectVisitor/UserGroupListTest.php | 12 +++---- .../UserGroupRefListTest.php | 10 +++--- .../ValueObjectVisitor/UserListTest.php | 12 +++---- .../ValueObjectVisitor/UserRefListTest.php | 10 +++--- .../UserSessionCreatedTest.php | 2 +- .../ValueObjectVisitor/UserSessionTest.php | 4 +-- .../ValueObjectVisitor/VersionInfoTest.php | 8 ++--- .../ValueObjectVisitor/VersionListTest.php | 8 ++--- .../Output/ValueObjectVisitor/VersionTest.php | 12 +++---- .../Server/Security/CsrfTokenManagerTest.php | 5 +-- .../Server/Security/RestLogoutHandlerTest.php | 2 +- .../RestSessionBasedAuthenticatorTest.php | 16 +++++----- .../Server/Security/SecurityListenerTest.php | 4 +-- tests/lib/UrlHandler/PatternTest.php | 2 +- 612 files changed, 1425 insertions(+), 1428 deletions(-) diff --git a/src/bundle/ApiLoader/Factory.php b/src/bundle/ApiLoader/Factory.php index 10f437d0..c78323b0 100644 --- a/src/bundle/ApiLoader/Factory.php +++ b/src/bundle/ApiLoader/Factory.php @@ -1,14 +1,14 @@ addMethodCall( - 'addVisitor', [ + 'addVisitor', + [ $regexp, $visitor['reference'], ] diff --git a/src/bundle/DependencyInjection/Compiler/ValueObjectVisitorPass.php b/src/bundle/DependencyInjection/Compiler/ValueObjectVisitorPass.php index 0a7810ca..1ca2e181 100644 --- a/src/bundle/DependencyInjection/Compiler/ValueObjectVisitorPass.php +++ b/src/bundle/DependencyInjection/Compiler/ValueObjectVisitorPass.php @@ -1,7 +1,7 @@ identifier, $contentType2->identifier); } ); } elseif ($sort === 'desc') { usort( $contentTypes, - function (APIContentType $contentType1, APIContentType $contentType2) { + static function (APIContentType $contentType1, APIContentType $contentType2) { return strcasecmp($contentType1->identifier, $contentType2->identifier) * -1; } ); @@ -924,7 +924,7 @@ function (APIContentType $contentType1, APIContentType $contentType2) { if ($sort === 'asc' || $sort === null) { usort( $contentTypes, - function ($timeObj3, $timeObj4) { + static function ($timeObj3, $timeObj4) { $timeObj3 = strtotime($timeObj3->modificationDate->format('Y-m-d H:i:s')); $timeObj4 = strtotime($timeObj4->modificationDate->format('Y-m-d H:i:s')); @@ -934,7 +934,7 @@ function ($timeObj3, $timeObj4) { } elseif ($sort === 'desc') { usort( $contentTypes, - function ($timeObj3, $timeObj4) { + static function ($timeObj3, $timeObj4) { $timeObj3 = strtotime($timeObj3->modificationDate->format('Y-m-d H:i:s')); $timeObj4 = strtotime($timeObj4->modificationDate->format('Y-m-d H:i:s')); diff --git a/src/lib/Server/Controller/JWT.php b/src/lib/Server/Controller/JWT.php index 3f236a32..f6039cd5 100644 --- a/src/lib/Server/Controller/JWT.php +++ b/src/lib/Server/Controller/JWT.php @@ -1,7 +1,7 @@ fieldTypeParser->parseValue($fieldDefinition->fieldTypeIdentifier, - $fieldData['fieldValue']); + $fieldValue = $this->fieldTypeParser->parseValue( + $fieldDefinition->fieldTypeIdentifier, + $fieldData['fieldValue'] + ); $languageCode = null; if (array_key_exists('languageCode', $fieldData)) { diff --git a/src/lib/Server/Input/Parser/ContentQuery.php b/src/lib/Server/Input/Parser/ContentQuery.php index e31a593e..ced52438 100644 --- a/src/lib/Server/Input/Parser/ContentQuery.php +++ b/src/lib/Server/Input/Parser/ContentQuery.php @@ -1,7 +1,7 @@ Operator::IN, 'EQ' => Operator::EQ, 'GT' => Operator::GT, diff --git a/src/lib/Server/Input/Parser/Criterion/FullText.php b/src/lib/Server/Input/Parser/Criterion/FullText.php index 576a7cf3..afb6b570 100644 --- a/src/lib/Server/Input/Parser/Criterion/FullText.php +++ b/src/lib/Server/Input/Parser/Criterion/FullText.php @@ -1,15 +1,15 @@ startObjectElement('Creator', 'User'); $generator->startAttribute( 'href', - $this->router->generate('ezpublish_rest_loadUser', - ['userId' => $versionInfo->creatorId]) + $this->router->generate( + 'ezpublish_rest_loadUser', + ['userId' => $versionInfo->creatorId] + ) ); $generator->endAttribute('href'); $generator->endObjectElement('Creator'); diff --git a/src/lib/Server/Output/ValueObjectVisitor/VersionList.php b/src/lib/Server/Output/ValueObjectVisitor/VersionList.php index 2623fcc0..862d97b0 100644 --- a/src/lib/Server/Output/ValueObjectVisitor/VersionList.php +++ b/src/lib/Server/Output/ValueObjectVisitor/VersionList.php @@ -1,13 +1,13 @@ storage = $storage ?: new NativeSessionTokenStorage(); $this->namespace = $this->resolveNamespace($requestStack); diff --git a/src/lib/Server/Security/EventListener/SecurityListener.php b/src/lib/Server/Security/EventListener/SecurityListener.php index d51359d3..73766b3e 100644 --- a/src/lib/Server/Security/EventListener/SecurityListener.php +++ b/src/lib/Server/Security/EventListener/SecurityListener.php @@ -1,7 +1,7 @@ container->getDefinition('ezpublish_rest.output.visitor.dispatcher')->getMethodCalls(); - return array_map(function ($call) { + return array_map(static function ($call) { return (string) $call[1][1]; }, $calls); } diff --git a/tests/bundle/DependencyInjection/Compiler/ValueObjectVisitorPassTest.php b/tests/bundle/DependencyInjection/Compiler/ValueObjectVisitorPassTest.php index 7d897236..fd0df34b 100644 --- a/tests/bundle/DependencyInjection/Compiler/ValueObjectVisitorPassTest.php +++ b/tests/bundle/DependencyInjection/Compiler/ValueObjectVisitorPassTest.php @@ -1,15 +1,15 @@ expects($this->any()) ->method('isTokenValid') ->willReturnCallback( - function (CsrfToken $token) { + static function (CsrfToken $token) { if ($token == new CsrfToken(self::INTENTION, self::VALID_TOKEN)) { return true; } diff --git a/tests/bundle/EventListener/EventListenerTest.php b/tests/bundle/EventListener/EventListenerTest.php index 2ac762d9..c41cd34f 100644 --- a/tests/bundle/EventListener/EventListenerTest.php +++ b/tests/bundle/EventListener/EventListenerTest.php @@ -1,18 +1,15 @@ createHttpRequest( - 'POST', '/api/ezp/v2/bookmark/' . $locationId + 'POST', + '/api/ezp/v2/bookmark/' . $locationId ); $response = $this->sendHttpRequest($request); @@ -38,7 +39,8 @@ public function testCreateBookmark(): int public function testCreateBookmarkIfAlreadyExists(int $locationId): void { $request = $this->createHttpRequest( - 'POST', '/api/ezp/v2/bookmark/' . $locationId + 'POST', + '/api/ezp/v2/bookmark/' . $locationId ); $response = $this->sendHttpRequest($request); @@ -52,7 +54,8 @@ public function testCreateBookmarkIfAlreadyExists(int $locationId): void public function testIsBookmarked(int $locationId): void { $request = $this->createHttpRequest( - 'HEAD', '/api/ezp/v2/bookmark/' . $locationId + 'HEAD', + '/api/ezp/v2/bookmark/' . $locationId ); $response = $this->sendHttpRequest($request); @@ -65,7 +68,8 @@ public function testIsBookmarkedReturnsNotFound(): void $locationId = 43; $request = $this->createHttpRequest( - 'HEAD', '/api/ezp/v2/bookmark/' . $locationId + 'HEAD', + '/api/ezp/v2/bookmark/' . $locationId ); $response = $this->sendHttpRequest($request); @@ -79,7 +83,8 @@ public function testIsBookmarkedReturnsNotFound(): void public function testDeleteBookmark(int $locationId): void { $request = $this->createHttpRequest( - 'DELETE', '/api/ezp/v2/bookmark/' . $locationId + 'DELETE', + '/api/ezp/v2/bookmark/' . $locationId ); $response = $this->sendHttpRequest($request); @@ -106,7 +111,8 @@ public function testDeleteBookmarkReturnNotFound(): void $locationId = 43; $request = $this->createHttpRequest( - 'DELETE', '/api/ezp/v2/bookmark/' . $locationId + 'DELETE', + '/api/ezp/v2/bookmark/' . $locationId ); $response = $this->sendHttpRequest($request); diff --git a/tests/bundle/Functional/ContentTest.php b/tests/bundle/Functional/ContentTest.php index 5958c0f4..b1fd1d09 100644 --- a/tests/bundle/Functional/ContentTest.php +++ b/tests/bundle/Functional/ContentTest.php @@ -1,7 +1,7 @@ 'POST', 'MOVE' => 'POST', 'PATCH' => 'PATCH', @@ -265,7 +265,7 @@ protected function getMediaFromTypeString($typeString) protected function addCreatedElement($href) { $testCase = $this; - self::$createdContent[$href] = function () use ($href, $testCase) { + self::$createdContent[$href] = static function () use ($href, $testCase) { $testCase->sendHttpRequest( $testCase->createHttpRequest('DELETE', $href) ); diff --git a/tests/bundle/Functional/TrashTest.php b/tests/bundle/Functional/TrashTest.php index 4ef81159..ec402e4f 100644 --- a/tests/bundle/Functional/TrashTest.php +++ b/tests/bundle/Functional/TrashTest.php @@ -1,7 +1,7 @@ $constantName], ['defaultAuthor' => constant("eZ\\Publish\\Core\\FieldType\\Author\\Type::{$constantName}")], diff --git a/tests/lib/FieldTypeProcessor/BinaryInputProcessorTest.php b/tests/lib/FieldTypeProcessor/BinaryInputProcessorTest.php index 64efbdfd..d779bb3d 100644 --- a/tests/lib/FieldTypeProcessor/BinaryInputProcessorTest.php +++ b/tests/lib/FieldTypeProcessor/BinaryInputProcessorTest.php @@ -1,7 +1,7 @@ $constantName], ['defaultType' => constant("eZ\\Publish\\Core\\FieldType\\DateAndTime\\Type::{$constantName}")], diff --git a/tests/lib/FieldTypeProcessor/DateProcessorTest.php b/tests/lib/FieldTypeProcessor/DateProcessorTest.php index 0187ad01..7c183afc 100644 --- a/tests/lib/FieldTypeProcessor/DateProcessorTest.php +++ b/tests/lib/FieldTypeProcessor/DateProcessorTest.php @@ -1,7 +1,7 @@ $constantName], ['defaultType' => constant("eZ\\Publish\\Core\\FieldType\\Date\\Type::{$constantName}")], diff --git a/tests/lib/FieldTypeProcessor/ImageProcessorTest.php b/tests/lib/FieldTypeProcessor/ImageProcessorTest.php index 8cc6844c..8a052e0a 100644 --- a/tests/lib/FieldTypeProcessor/ImageProcessorTest.php +++ b/tests/lib/FieldTypeProcessor/ImageProcessorTest.php @@ -1,13 +1,12 @@ $constantName], ['mediaType' => constant("eZ\\Publish\\Core\\FieldType\\Media\\Type::{$constantName}")], diff --git a/tests/lib/FieldTypeProcessor/RelationListProcessorTest.php b/tests/lib/FieldTypeProcessor/RelationListProcessorTest.php index dad65308..fa6730c7 100644 --- a/tests/lib/FieldTypeProcessor/RelationListProcessorTest.php +++ b/tests/lib/FieldTypeProcessor/RelationListProcessorTest.php @@ -1,7 +1,7 @@ $constantName], ['selectionMethod' => constant("eZ\\Publish\\Core\\FieldType\\RelationList\\Type::{$constantName}")], diff --git a/tests/lib/FieldTypeProcessor/RelationProcessorTest.php b/tests/lib/FieldTypeProcessor/RelationProcessorTest.php index 17a924cc..09bdbce2 100644 --- a/tests/lib/FieldTypeProcessor/RelationProcessorTest.php +++ b/tests/lib/FieldTypeProcessor/RelationProcessorTest.php @@ -1,7 +1,7 @@ $constantName], ['selectionMethod' => constant("eZ\\Publish\\Core\\FieldType\\Relation\\Type::{$constantName}")], diff --git a/tests/lib/FieldTypeProcessor/TimeProcessorTest.php b/tests/lib/FieldTypeProcessor/TimeProcessorTest.php index 1d5685e6..a69d91e1 100644 --- a/tests/lib/FieldTypeProcessor/TimeProcessorTest.php +++ b/tests/lib/FieldTypeProcessor/TimeProcessorTest.php @@ -1,7 +1,7 @@ $constantName], ['defaultType' => constant("eZ\\Publish\\Core\\FieldType\\Time\\Type::{$constantName}")], diff --git a/tests/lib/FieldTypeProcessorRegistryTest.php b/tests/lib/FieldTypeProcessorRegistryTest.php index fa188a7b..3ea13662 100644 --- a/tests/lib/FieldTypeProcessorRegistryTest.php +++ b/tests/lib/FieldTypeProcessorRegistryTest.php @@ -1,13 +1,13 @@ method('convert') ->with('Hello world!') ->willReturn( - [ + [ [ 'someKey' => 'someValue', ], diff --git a/tests/lib/Input/FieldTypeParserTest.php b/tests/lib/Input/FieldTypeParserTest.php index 0a4f308a..d689cf05 100644 --- a/tests/lib/Input/FieldTypeParserTest.php +++ b/tests/lib/Input/FieldTypeParserTest.php @@ -1,21 +1,21 @@ with('42') ->willReturnCallback( // Avoid PHPUnit cloning - function () use ($contentTypeMock) { + static function () use ($contentTypeMock) { return $contentTypeMock; } ); @@ -92,7 +92,7 @@ function () use ($contentTypeMock) { ->with($this->equalTo('some-fancy-field-type')) ->willReturnCallback( // Avoid PHPUnit cloning - function () use ($fieldTypeMock) { + static function () use ($fieldTypeMock) { return $fieldTypeMock; } ); @@ -127,7 +127,7 @@ public function testParseValue() ->with($this->equalTo('some-fancy-field-type')) ->willReturnCallback( // Avoid PHPUnit cloning - function () use ($fieldTypeMock) { + static function () use ($fieldTypeMock) { return $fieldTypeMock; } ); @@ -160,7 +160,7 @@ public function testParseValueWithPreProcessing() ->method('getProcessor') ->with($this->equalTo('some-fancy-field-type')) ->willReturnCallback( - function () use ($processor) { + static function () use ($processor) { return $processor; } ); @@ -176,7 +176,7 @@ function () use ($processor) { ->with($this->equalTo('some-fancy-field-type')) ->willReturnCallback( // Avoid PHPUnit cloning - function () use ($fieldTypeMock) { + static function () use ($fieldTypeMock) { return $fieldTypeMock; } ); @@ -205,7 +205,7 @@ public function testParseFieldSettings() ->with($this->equalTo('some-fancy-field-type')) ->willReturnCallback( // Avoid PHPUnit cloning - function () use ($fieldTypeMock) { + static function () use ($fieldTypeMock) { return $fieldTypeMock; } ); @@ -238,7 +238,7 @@ public function testParseFieldSettingsWithPreProcessing() ->method('getProcessor') ->with($this->equalTo('some-fancy-field-type')) ->willReturnCallback( - function () use ($processor) { + static function () use ($processor) { return $processor; } ); @@ -254,7 +254,7 @@ function () use ($processor) { ->with($this->equalTo('some-fancy-field-type')) ->willReturnCallback( // Avoid PHPUnit cloning - function () use ($fieldTypeMock) { + static function () use ($fieldTypeMock) { return $fieldTypeMock; } ); @@ -283,7 +283,7 @@ public function testParseValidatorConfiguration() ->with($this->equalTo('some-fancy-field-type')) ->willReturnCallback( // Avoid PHPUnit cloning - function () use ($fieldTypeMock) { + static function () use ($fieldTypeMock) { return $fieldTypeMock; } ); @@ -316,7 +316,7 @@ public function testParseValidatorConfigurationWithPreProcessing() ->method('getProcessor') ->with($this->equalTo('some-fancy-field-type')) ->willReturnCallback( - function () use ($processor) { + static function () use ($processor) { return $processor; } ); @@ -332,7 +332,7 @@ function () use ($processor) { ->with($this->equalTo('some-fancy-field-type')) ->willReturnCallback( // Avoid PHPUnit cloning - function () use ($fieldTypeMock) { + static function () use ($fieldTypeMock) { return $fieldTypeMock; } ); diff --git a/tests/lib/Input/Handler/JsonTest.php b/tests/lib/Input/Handler/JsonTest.php index 732bdd2e..6ca12abb 100644 --- a/tests/lib/Input/Handler/JsonTest.php +++ b/tests/lib/Input/Handler/JsonTest.php @@ -1,13 +1,13 @@ method('getFieldType') ->with($this->equalTo('myFancyFieldType')) ->willReturnCallback( - function () use ($fieldTypeMock) { + static function () use ($fieldTypeMock) { return $fieldTypeMock; } ); @@ -100,7 +100,7 @@ public function testSerializeFieldValueWithProcessor() ->with( $this->equalTo('some-field') )->willReturn( - new FieldDefinition( + new FieldDefinition( [ 'fieldTypeIdentifier' => 'myFancyFieldType', ] @@ -118,7 +118,7 @@ public function testSerializeFieldValueWithProcessor() ->method('getProcessor') ->with('myFancyFieldType') ->willReturnCallback( - function () use ($processorMock) { + static function () use ($processorMock) { return $processorMock; } ); @@ -132,7 +132,7 @@ function () use ($processorMock) { ->method('getFieldType') ->with($this->equalTo('myFancyFieldType')) ->willReturnCallback( - function () use ($fieldTypeMock) { + static function () use ($fieldTypeMock) { return $fieldTypeMock; } ); @@ -173,7 +173,7 @@ public function testSerializeFieldDefaultValue() ->method('getFieldType') ->with($this->equalTo('myFancyFieldType')) ->willReturnCallback( - function () use ($fieldTypeMock) { + static function () use ($fieldTypeMock) { return $fieldTypeMock; } ); @@ -206,7 +206,7 @@ public function testSerializeFieldSettings() ->method('getFieldType') ->with($this->equalTo('myFancyFieldType')) ->willReturnCallback( - function () use ($fieldTypeMock) { + static function () use ($fieldTypeMock) { return $fieldTypeMock; } ); @@ -239,7 +239,7 @@ public function testSerializeFieldSettingsWithPostProcessing() ->method('getProcessor') ->with('myFancyFieldType') ->willReturnCallback( - function () use ($processorMock) { + static function () use ($processorMock) { return $processorMock; } ); @@ -259,7 +259,7 @@ function () use ($processorMock) { ->method('getFieldType') ->with($this->equalTo('myFancyFieldType')) ->willReturnCallback( - function () use ($fieldTypeMock) { + static function () use ($fieldTypeMock) { return $fieldTypeMock; } ); @@ -292,7 +292,7 @@ public function testSerializeValidatorConfiguration() ->method('getFieldType') ->with($this->equalTo('myFancyFieldType')) ->willReturnCallback( - function () use ($fieldTypeMock) { + static function () use ($fieldTypeMock) { return $fieldTypeMock; } ); @@ -325,7 +325,7 @@ public function testSerializeValidatorConfigurationWithPostProcessing() ->method('getProcessor') ->with('myFancyFieldType') ->willReturnCallback( - function () use ($processorMock) { + static function () use ($processorMock) { return $processorMock; } ); @@ -339,7 +339,7 @@ function () use ($processorMock) { ->method('getFieldType') ->with($this->equalTo('myFancyFieldType')) ->willReturnCallback( - function () use ($fieldTypeMock) { + static function () use ($fieldTypeMock) { return $fieldTypeMock; } ); @@ -355,7 +355,7 @@ function () use ($fieldTypeMock) { ->method('getFieldType') ->with($this->equalTo('myFancyFieldType')) ->willReturnCallback( - function () use ($fieldTypeMock) { + static function () use ($fieldTypeMock) { return $fieldTypeMock; } ); diff --git a/tests/lib/Output/Generator/FieldTypeHashGeneratorBaseTest.php b/tests/lib/Output/Generator/FieldTypeHashGeneratorBaseTest.php index 8594b6e7..d045d1e9 100644 --- a/tests/lib/Output/Generator/FieldTypeHashGeneratorBaseTest.php +++ b/tests/lib/Output/Generator/FieldTypeHashGeneratorBaseTest.php @@ -1,7 +1,7 @@ getGeneratorMock(); $valueObjectDispatcherMock = $this->getValueObjectDispatcherMock(); @@ -217,7 +217,7 @@ public function testSetStatusCodeNoOverride() } /** - * @return Common\Output\ValueObjectVisitorDispatcher|\PHPUnit\Framework\MockObject\MockObject + * @return \Ibexa\Contracts\Rest\Output\ValueObjectVisitorDispatcher|\PHPUnit\Framework\MockObject\MockObject */ public function getValueObjectDispatcherMock() { diff --git a/tests/lib/Server/BaseTest.php b/tests/lib/Server/BaseTest.php index 74688490..1704b68f 100644 --- a/tests/lib/Server/BaseTest.php +++ b/tests/lib/Server/BaseTest.php @@ -1,7 +1,7 @@ requestParserMock)) { $that = &$this; - $callback = function ($href, $attribute) use ($that) { + $callback = static function ($href, $attribute) use ($that) { foreach ($that->getParseHrefExpectationsMap() as $map) { if ($map[0] == $href && $map[1] == $attribute) { if ($map[2] instanceof \Exception) { diff --git a/tests/lib/Server/Input/Parser/ContentCreateTest.php b/tests/lib/Server/Input/Parser/ContentCreateTest.php index dc8013b2..35330f26 100644 --- a/tests/lib/Server/Input/Parser/ContentCreateTest.php +++ b/tests/lib/Server/Input/Parser/ContentCreateTest.php @@ -1,23 +1,23 @@ equalTo('eng-US') ) ->willReturn( - new ContentCreateStruct( + new ContentCreateStruct( [ 'contentType' => $contentType, 'mainLanguageCode' => 'eng-US', diff --git a/tests/lib/Server/Input/Parser/ContentObjectStatesTest.php b/tests/lib/Server/Input/Parser/ContentObjectStatesTest.php index b072ffb4..93c65929 100644 --- a/tests/lib/Server/Input/Parser/ContentObjectStatesTest.php +++ b/tests/lib/Server/Input/Parser/ContentObjectStatesTest.php @@ -1,7 +1,7 @@ method('newContentTypeCreateStruct') ->with($this->equalTo('new_content_type')) ->willReturn( - new ContentTypeCreateStruct( + new ContentTypeCreateStruct( [ 'identifier' => 'new_content_type', ] diff --git a/tests/lib/Server/Input/Parser/ContentTypeGroupInputTest.php b/tests/lib/Server/Input/Parser/ContentTypeGroupInputTest.php index 6f0d88f9..1f2bac97 100644 --- a/tests/lib/Server/Input/Parser/ContentTypeGroupInputTest.php +++ b/tests/lib/Server/Input/Parser/ContentTypeGroupInputTest.php @@ -1,15 +1,15 @@ method('newFieldDefinitionCreateStruct') ->with($this->equalTo('title'), $this->equalTo('ezstring')) ->willReturn( - new FieldDefinitionCreateStruct( + new FieldDefinitionCreateStruct( [ 'identifier' => 'title', 'fieldTypeIdentifier' => 'ezstring', diff --git a/tests/lib/Server/Input/Parser/FieldDefinitionUpdateTest.php b/tests/lib/Server/Input/Parser/FieldDefinitionUpdateTest.php index a45f8345..24b7e9e0 100644 --- a/tests/lib/Server/Input/Parser/FieldDefinitionUpdateTest.php +++ b/tests/lib/Server/Input/Parser/FieldDefinitionUpdateTest.php @@ -1,20 +1,20 @@ expects($this->any()) ->method('newFieldDefinitionUpdateStruct') ->willReturn( - new FieldDefinitionUpdateStruct() + new FieldDefinitionUpdateStruct() ); $contentTypeServiceMock->expects($this->any()) ->method('loadContentTypeDraft') ->with($this->equalTo(42)) ->willReturn( - new ContentTypeDraft( + new ContentTypeDraft( [ 'innerContentType' => new ContentType([ 'fieldDefinitions' => new FieldDefinitionCollection([ diff --git a/tests/lib/Server/Input/Parser/JWTInputTest.php b/tests/lib/Server/Input/Parser/JWTInputTest.php index a784c654..988bfe4c 100644 --- a/tests/lib/Server/Input/Parser/JWTInputTest.php +++ b/tests/lib/Server/Input/Parser/JWTInputTest.php @@ -1,7 +1,7 @@ equalTo($contentType) ) ->willReturn( - new UserCreateStruct( + new UserCreateStruct( [ 'contentType' => $contentType, 'mainLanguageCode' => 'eng-US', diff --git a/tests/lib/Server/Input/Parser/UserGroupCreateTest.php b/tests/lib/Server/Input/Parser/UserGroupCreateTest.php index 641e4a3b..ac31440a 100644 --- a/tests/lib/Server/Input/Parser/UserGroupCreateTest.php +++ b/tests/lib/Server/Input/Parser/UserGroupCreateTest.php @@ -1,22 +1,22 @@ equalTo($contentType) ) ->willReturn( - new UserGroupCreateStruct( + new UserGroupCreateStruct( [ 'contentType' => $contentType, 'mainLanguageCode' => 'eng-US', diff --git a/tests/lib/Server/Input/Parser/UserGroupUpdateTest.php b/tests/lib/Server/Input/Parser/UserGroupUpdateTest.php index 9b103ed5..b3c0c09d 100644 --- a/tests/lib/Server/Input/Parser/UserGroupUpdateTest.php +++ b/tests/lib/Server/Input/Parser/UserGroupUpdateTest.php @@ -1,25 +1,25 @@ method('loadLocation') ->with($this->equalTo(5)) ->willReturn( - new Location( + new Location( [ 'contentInfo' => new ContentInfo( [ diff --git a/tests/lib/Server/Input/Parser/UserUpdateTest.php b/tests/lib/Server/Input/Parser/UserUpdateTest.php index 8e1e423f..0b9e2c87 100644 --- a/tests/lib/Server/Input/Parser/UserUpdateTest.php +++ b/tests/lib/Server/Input/Parser/UserUpdateTest.php @@ -1,22 +1,22 @@ expects($this->any()) ->method('hasParameter') ->willReturnCallback( - function ($parameterName) use ($options) { + static function ($parameterName) use ($options) { return isset($options[$parameterName]); } ); @@ -175,7 +174,7 @@ function ($parameterName) use ($options) { ->expects($this->any()) ->method('getParameter') ->willReturnCallback( - function ($parameterName, $defaultValue) use ($options) { + static function ($parameterName, $defaultValue) use ($options) { return isset($options[$parameterName]) ? $options[$parameterName] : $defaultValue; } ); diff --git a/tests/lib/Server/Output/ValueObjectVisitor/ConflictTest.php b/tests/lib/Server/Output/ValueObjectVisitor/ConflictTest.php index 7f43615a..8bd66f20 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/ConflictTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/ConflictTest.php @@ -1,14 +1,14 @@ getVisitorMock()->expects($this->exactly(2)) ->method('setHeader') ->willReturnMap( - ['Allow', 'GET,POST'], - ['Content-Length', 0] + ['Allow', 'GET,POST'], + ['Content-Length', 0] ); $visitor->visit( diff --git a/tests/lib/Server/Output/ValueObjectVisitor/PermanentRedirectTest.php b/tests/lib/Server/Output/ValueObjectVisitor/PermanentRedirectTest.php index 88c809ce..a4e95238 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/PermanentRedirectTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/PermanentRedirectTest.php @@ -1,14 +1,14 @@ translationHelper = $this->createMock(TranslationHelper::class); $this->translationHelper ->method('getTranslatedContentNameByContentInfo') - ->willReturnCallback(function (ContentInfo $content) { + ->willReturnCallback(static function (ContentInfo $content) { return $content->name . ' (Translated)'; }); } diff --git a/tests/lib/Server/Output/ValueObjectVisitor/RestContentTypeTest.php b/tests/lib/Server/Output/ValueObjectVisitor/RestContentTypeTest.php index 61e22002..5fe18c15 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/RestContentTypeTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/RestContentTypeTest.php @@ -1,16 +1,16 @@ Date: Wed, 1 Dec 2021 18:21:08 +0100 Subject: [PATCH 6/7] fix: Coding Standards --- src/lib/Server/Security/CsrfTokenManager.php | 3 +-- tests/lib/Output/FieldTypeSerializerTest.php | 4 ++-- tests/lib/Server/Input/Parser/ContentCreateTest.php | 4 ++-- tests/lib/Server/Input/Parser/ContentTypeCreateTest.php | 4 ++-- .../lib/Server/Input/Parser/FieldDefinitionCreateTest.php | 4 ++-- .../lib/Server/Input/Parser/FieldDefinitionUpdateTest.php | 4 ++-- tests/lib/Server/Input/Parser/UserCreateTest.php | 4 ++-- tests/lib/Server/Input/Parser/UserGroupCreateTest.php | 4 ++-- tests/lib/Server/Input/Parser/UserGroupUpdateTest.php | 4 ++-- .../Server/Output/ValueObjectVisitor/CachedValueTest.php | 8 ++++---- 10 files changed, 21 insertions(+), 22 deletions(-) diff --git a/src/lib/Server/Security/CsrfTokenManager.php b/src/lib/Server/Security/CsrfTokenManager.php index e2ac1951..8fe54e07 100644 --- a/src/lib/Server/Security/CsrfTokenManager.php +++ b/src/lib/Server/Security/CsrfTokenManager.php @@ -28,8 +28,7 @@ public function __construct( TokenGeneratorInterface $generator = null, TokenStorageInterface $storage = null, RequestStack $requestStack = null - ) - { + ) { $this->storage = $storage ?: new NativeSessionTokenStorage(); $this->namespace = $this->resolveNamespace($requestStack); diff --git a/tests/lib/Output/FieldTypeSerializerTest.php b/tests/lib/Output/FieldTypeSerializerTest.php index 3113fcbd..38165621 100644 --- a/tests/lib/Output/FieldTypeSerializerTest.php +++ b/tests/lib/Output/FieldTypeSerializerTest.php @@ -101,10 +101,10 @@ public function testSerializeFieldValueWithProcessor() $this->equalTo('some-field') )->willReturn( new FieldDefinition( - [ + [ 'fieldTypeIdentifier' => 'myFancyFieldType', ] - ) + ) ); $processorMock = $this->getFieldTypeProcessorMock(); diff --git a/tests/lib/Server/Input/Parser/ContentCreateTest.php b/tests/lib/Server/Input/Parser/ContentCreateTest.php index 35330f26..3b400765 100644 --- a/tests/lib/Server/Input/Parser/ContentCreateTest.php +++ b/tests/lib/Server/Input/Parser/ContentCreateTest.php @@ -568,11 +568,11 @@ protected function getContentServiceMock() ) ->willReturn( new ContentCreateStruct( - [ + [ 'contentType' => $contentType, 'mainLanguageCode' => 'eng-US', ] - ) + ) ); return $contentServiceMock; diff --git a/tests/lib/Server/Input/Parser/ContentTypeCreateTest.php b/tests/lib/Server/Input/Parser/ContentTypeCreateTest.php index 75c3c679..a1b062fb 100644 --- a/tests/lib/Server/Input/Parser/ContentTypeCreateTest.php +++ b/tests/lib/Server/Input/Parser/ContentTypeCreateTest.php @@ -276,10 +276,10 @@ protected function getContentTypeServiceMock() ->with($this->equalTo('new_content_type')) ->willReturn( new ContentTypeCreateStruct( - [ + [ 'identifier' => 'new_content_type', ] - ) + ) ); return $contentTypeServiceMock; diff --git a/tests/lib/Server/Input/Parser/FieldDefinitionCreateTest.php b/tests/lib/Server/Input/Parser/FieldDefinitionCreateTest.php index f32eb991..f2c7141b 100644 --- a/tests/lib/Server/Input/Parser/FieldDefinitionCreateTest.php +++ b/tests/lib/Server/Input/Parser/FieldDefinitionCreateTest.php @@ -228,11 +228,11 @@ protected function getContentTypeServiceMock() ->with($this->equalTo('title'), $this->equalTo('ezstring')) ->willReturn( new FieldDefinitionCreateStruct( - [ + [ 'identifier' => 'title', 'fieldTypeIdentifier' => 'ezstring', ] - ) + ) ); return $contentTypeServiceMock; diff --git a/tests/lib/Server/Input/Parser/FieldDefinitionUpdateTest.php b/tests/lib/Server/Input/Parser/FieldDefinitionUpdateTest.php index 24b7e9e0..d7472186 100644 --- a/tests/lib/Server/Input/Parser/FieldDefinitionUpdateTest.php +++ b/tests/lib/Server/Input/Parser/FieldDefinitionUpdateTest.php @@ -204,7 +204,7 @@ protected function getContentTypeServiceMock() ->with($this->equalTo(42)) ->willReturn( new ContentTypeDraft( - [ + [ 'innerContentType' => new ContentType([ 'fieldDefinitions' => new FieldDefinitionCollection([ new FieldDefinition( @@ -216,7 +216,7 @@ protected function getContentTypeServiceMock() ]), ]), ] - ) + ) ); return $contentTypeServiceMock; diff --git a/tests/lib/Server/Input/Parser/UserCreateTest.php b/tests/lib/Server/Input/Parser/UserCreateTest.php index 502f0b0d..26003e4e 100644 --- a/tests/lib/Server/Input/Parser/UserCreateTest.php +++ b/tests/lib/Server/Input/Parser/UserCreateTest.php @@ -485,11 +485,11 @@ protected function getUserServiceMock() ) ->willReturn( new UserCreateStruct( - [ + [ 'contentType' => $contentType, 'mainLanguageCode' => 'eng-US', ] - ) + ) ); return $userServiceMock; diff --git a/tests/lib/Server/Input/Parser/UserGroupCreateTest.php b/tests/lib/Server/Input/Parser/UserGroupCreateTest.php index ac31440a..4a158aaf 100644 --- a/tests/lib/Server/Input/Parser/UserGroupCreateTest.php +++ b/tests/lib/Server/Input/Parser/UserGroupCreateTest.php @@ -350,11 +350,11 @@ protected function getUserServiceMock() ) ->willReturn( new UserGroupCreateStruct( - [ + [ 'contentType' => $contentType, 'mainLanguageCode' => 'eng-US', ] - ) + ) ); return $userServiceMock; diff --git a/tests/lib/Server/Input/Parser/UserGroupUpdateTest.php b/tests/lib/Server/Input/Parser/UserGroupUpdateTest.php index b3c0c09d..7e1b0302 100644 --- a/tests/lib/Server/Input/Parser/UserGroupUpdateTest.php +++ b/tests/lib/Server/Input/Parser/UserGroupUpdateTest.php @@ -268,14 +268,14 @@ protected function getLocationServiceMock() ->with($this->equalTo(5)) ->willReturn( new Location( - [ + [ 'contentInfo' => new ContentInfo( [ 'id' => 4, ] ), ] - ) + ) ); return $userServiceMock; diff --git a/tests/lib/Server/Output/ValueObjectVisitor/CachedValueTest.php b/tests/lib/Server/Output/ValueObjectVisitor/CachedValueTest.php index a57f4d52..432472ae 100644 --- a/tests/lib/Server/Output/ValueObjectVisitor/CachedValueTest.php +++ b/tests/lib/Server/Output/ValueObjectVisitor/CachedValueTest.php @@ -167,16 +167,16 @@ protected function getConfigProviderMock() ->method('hasParameter') ->willReturnCallback( static function ($parameterName) use ($options) { - return isset($options[$parameterName]); - } + return isset($options[$parameterName]); + } ); $mock ->expects($this->any()) ->method('getParameter') ->willReturnCallback( static function ($parameterName, $defaultValue) use ($options) { - return isset($options[$parameterName]) ? $options[$parameterName] : $defaultValue; - } + return isset($options[$parameterName]) ? $options[$parameterName] : $defaultValue; + } ); return $mock; From 2fca5543ed8c0367222a155ae12074470adb2a3d Mon Sep 17 00:00:00 2001 From: Nattfarinn Date: Thu, 2 Dec 2021 14:42:54 +0100 Subject: [PATCH 7/7] fix: make php-cs-fixer verbose --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 9a479062..b839ba29 100644 --- a/composer.json +++ b/composer.json @@ -57,7 +57,7 @@ "symfony/browser-kit": "^5.3" }, "scripts": { - "fix-cs": "php-cs-fixer fix --config=.php-cs-fixer.php --show-progress=dots" + "fix-cs": "php-cs-fixer fix --config=.php-cs-fixer.php -v --show-progress=dots" }, "extra": { "branch-alias": {