Skip to content

Commit 2c8f9ca

Browse files
adriendupuisadriendupuis
committed
Merge branch 'phpdoc-5.0' into phpdoc-5.0-html
# Conflicts: # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-IO-BinaryFile.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Persistence-Bookmark-Bookmark.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Persistence-Bookmark-CreateStruct.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Persistence-Content-ContentInfo.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Persistence-Content-LoadStruct.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Persistence-Content-Location-CreateStruct.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Persistence-Content-Location-Trashed.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Persistence-Content-Location.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Persistence-FieldType-IsEmptyValue.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-SearchService.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Location.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-LocationList.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-LocationQuery.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-FullText.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-LogicalAnd.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-LogicalNot.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-LogicalOperator.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-LogicalOr.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-Criterion-MapLocationDistance.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-FacetBuilder-ContentTypeFacetBuilder.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-FacetBuilder-CriterionFacetBuilder.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-FacetBuilder-Location-LocationFacetBuilder.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-FacetBuilder-Location.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-FacetBuilder-LocationFacetBuilder.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-FacetBuilder-SectionFacetBuilder.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-FacetBuilder-TermFacetBuilder.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query-FacetBuilder.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Query.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Relation.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Search-Facet-ContentTypeFacet.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Search-Facet-CriterionFacet.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Search-Facet-DateRangeFacet.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Search-Facet-FieldFacet.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Search-Facet-FieldRangeFacet.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Search-Facet-LocationFacet.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Search-Facet-RangeFacetEntry.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Search-Facet-SectionFacet.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Search-Facet-TermFacet.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Search-Facet-UserFacet.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Search-Facet.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Search-SearchResult.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-Trash-SearchResult.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Content-TrashItem.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-ContentType-ContentType.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-ContentType-ContentTypeDraft.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-ContentType-ContentTypeGroup.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-ContentType-FieldDefinition.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Notification-Query-Criterion-Status.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-Notification-Query-Criterion-Type.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Repository-Values-User-User.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-User-Identity.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-User-IdentityAware.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Variation-Values-ImageVariation.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Core-Variation-Values-Variation.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-CorporateAccount-Commerce-Address-AddressMapper.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Elasticsearch-Query-FacetBuilderVisitor.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Elasticsearch-Query-FacetResultExtractor.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Migration-StepExecutor-AbstractStepExecutor.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-OAuth2Client-Repository-Values-User-PasswordHashType.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Rest-Output-Exceptions-AbstractExceptionVisitor.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Rest-Output-Generator.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Rest-Output-ValueObjectVisitor.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-Rest-Output-Visitor.html # docs/api/php_api/php_api_reference/classes/Ibexa-Contracts-SiteFactory-Values-Site-SiteList.html # docs/api/php_api/php_api_reference/namespaces/ibexa-contracts-collaboration-rest.html # docs/api/php_api/php_api_reference/namespaces/ibexa-contracts-share-ui.html
2 parents fc0a05c + 3fd793e commit 2c8f9ca

Sorry, this diff is taking too long to generate.

It may be too large to display on GitHub.