@@ -367,7 +367,7 @@ discard block |
||
| 367 | 367 | * |
| 368 | 368 | * @covers \eZ\Publish\Core\Repository\ContentTypeService::loadContentTypeGroups |
| 369 | 369 | * |
| 370 | - * @return array |
|
| 370 | + * @return \eZ\Publish\API\Repository\Values\ContentType\ContentTypeGroup[] |
|
| 371 | 371 | */ |
| 372 | 372 | public function testLoadContentTypeGroups() |
| 373 | 373 | { |
@@ -2038,7 +2038,7 @@ discard block |
||
| 2038 | 2038 | * |
| 2039 | 2039 | * @todo when all fieldTypes are functional revisit this and simplify by testing against fixtures |
| 2040 | 2040 | * |
| 2041 | - * @return array |
|
| 2041 | + * @return ContentType[] |
|
| 2042 | 2042 | */ |
| 2043 | 2043 | public function testLoadContentTypes() |
| 2044 | 2044 | { |
@@ -2946,6 +2946,10 @@ discard block |
||
| 2946 | 2946 | $this->assertAddFieldDefinitionStructValues($loadedType, $fieldDefCreate); |
| 2947 | 2947 | } |
| 2948 | 2948 | |
| 2949 | + /** |
|
| 2950 | + * @param \eZ\Publish\API\Repository\Values\ContentType\ContentTypeDraft $loadedType |
|
| 2951 | + * @param \eZ\Publish\API\Repository\Values\ContentType\FieldDefinitionCreateStruct $fieldDefCreate |
|
| 2952 | + */ |
|
| 2949 | 2953 | public function assertAddFieldDefinitionStructValues($loadedType, $fieldDefCreate) |
| 2950 | 2954 | { |
| 2951 | 2955 | foreach ($loadedType->fieldDefinitions as $fieldDefinition) { |
@@ -3276,6 +3280,11 @@ discard block |
||
| 3276 | 3280 | ); |
| 3277 | 3281 | } |
| 3278 | 3282 | |
| 3283 | + /** |
|
| 3284 | + * @param \eZ\Publish\API\Repository\Values\ContentType\FieldDefinition $originalField |
|
| 3285 | + * @param \eZ\Publish\API\Repository\Values\ContentType\FieldDefinition $updatedField |
|
| 3286 | + * @param \eZ\Publish\API\Repository\Values\ContentType\FieldDefinitionUpdateStruct $updateStruct |
|
| 3287 | + */ |
|
| 3279 | 3288 | protected function assertUpdateFieldDefinitionStructValues($originalField, $updatedField, $updateStruct) |
| 3280 | 3289 | { |
| 3281 | 3290 | $this->assertPropertiesCorrect( |
@@ -153,7 +153,7 @@ discard block |
||
| 153 | 153 | } |
| 154 | 154 | |
| 155 | 155 | /** |
| 156 | - * @return \eZ\Publish\API\Repository\Values\Content\Field[] |
|
| 156 | + * @return Field[] |
|
| 157 | 157 | */ |
| 158 | 158 | protected function getFields() |
| 159 | 159 | { |
@@ -204,7 +204,7 @@ discard block |
||
| 204 | 204 | } |
| 205 | 205 | |
| 206 | 206 | /** |
| 207 | - * @return \eZ\Publish\Core\Repository\Values\ContentType\FieldDefinition[] |
|
| 207 | + * @return FieldDefinition[] |
|
| 208 | 208 | */ |
| 209 | 209 | protected function getFieldDefinitions() |
| 210 | 210 | { |
@@ -502,7 +502,7 @@ |
||
| 502 | 502 | * |
| 503 | 503 | * @param mixed $userId |
| 504 | 504 | * |
| 505 | - * @return \eZ\Publish\API\Repository\Values\User\User |
|
| 505 | + * @return \eZ\Publish\API\Repository\Values\ValueObject |
|
| 506 | 506 | * |
| 507 | 507 | * @throws \eZ\Publish\API\Repository\Exceptions\NotFoundException if a user with the given id was not found |
| 508 | 508 | */ |
@@ -154,7 +154,7 @@ discard block |
||
| 154 | 154 | * Returns the fallback default value of field type when no such default |
| 155 | 155 | * value is provided in the field definition in content types. |
| 156 | 156 | * |
| 157 | - * @return mixed |
|
| 157 | + * @return Value |
|
| 158 | 158 | */ |
| 159 | 159 | public function getEmptyValue() |
| 160 | 160 | { |
@@ -184,7 +184,7 @@ discard block |
||
| 184 | 184 | * |
| 185 | 185 | * @param mixed $hash |
| 186 | 186 | * |
| 187 | - * @return mixed |
|
| 187 | + * @return Value |
|
| 188 | 188 | */ |
| 189 | 189 | public function fromHash($hash) |
| 190 | 190 | { |
@@ -122,7 +122,7 @@ discard block |
||
| 122 | 122 | * |
| 123 | 123 | * @throws \eZ\Publish\API\Repository\Exceptions\NotFoundException If group can not be found |
| 124 | 124 | * |
| 125 | - * @param mixed $contentTypeGroupId |
|
| 125 | + * @param string $contentTypeGroupId |
|
| 126 | 126 | * |
| 127 | 127 | * @return \eZ\Publish\API\Repository\Values\ContentType\ContentTypeGroup |
| 128 | 128 | */ |
@@ -174,7 +174,7 @@ discard block |
||
| 174 | 174 | /** |
| 175 | 175 | * Get all Content Type Groups. |
| 176 | 176 | * |
| 177 | - * @return \eZ\Publish\API\Repository\Values\ContentType\ContentTypeGroup[] |
|
| 177 | + * @return \eZ\Publish\API\Repository\Values\ValueObject |
|
| 178 | 178 | */ |
| 179 | 179 | public function loadContentTypeGroups() |
| 180 | 180 | { |
@@ -535,9 +535,9 @@ discard block |
||
| 535 | 535 | * ATTENTION: This is not an API method and only meant for internal use in |
| 536 | 536 | * the REST Client implementation. |
| 537 | 537 | * |
| 538 | - * @param mixed $fieldDefinitionListReference |
|
| 538 | + * @param string $fieldDefinitionListReference |
|
| 539 | 539 | * |
| 540 | - * @return \eZ\Publish\Core\REST\Client\Values\FieldDefinitionList |
|
| 540 | + * @return \eZ\Publish\API\Repository\Values\ValueObject |
|
| 541 | 541 | */ |
| 542 | 542 | public function loadFieldDefinitionList($fieldDefinitionListReference) |
| 543 | 543 | { |
@@ -558,9 +558,9 @@ discard block |
||
| 558 | 558 | * ATTENTION: This is not an API method and only meant for internal use in |
| 559 | 559 | * the REST Client implementation. |
| 560 | 560 | * |
| 561 | - * @param mixed $contentTypeGroupListReference |
|
| 561 | + * @param string $contentTypeGroupListReference |
|
| 562 | 562 | * |
| 563 | - * @return \eZ\Publish\Core\REST\Client\Values\ContentTypeGroupRefList |
|
| 563 | + * @return \eZ\Publish\API\Repository\Values\ValueObject |
|
| 564 | 564 | */ |
| 565 | 565 | public function loadContentTypeGroupList($contentTypeGroupListReference) |
| 566 | 566 | { |
@@ -29,7 +29,8 @@ |
||
| 29 | 29 | use eZ\Publish\Core\REST\Common\RequestParser; |
| 30 | 30 | use eZ\Publish\Core\REST\Common\Input\Dispatcher; |
| 31 | 31 | use eZ\Publish\Core\REST\Common\Output\Visitor; |
| 32 | -use eZ\Publish\Core\REST\Common\Message; use eZ\Publish\Core\REST\Client\Exceptions\InvalidArgumentValue; |
|
| 32 | +use eZ\Publish\Core\REST\Common\Message; |
|
| 33 | +use eZ\Publish\Core\REST\Client\Exceptions\InvalidArgumentValue; |
|
| 33 | 34 | use eZ\Publish\Core\REST\Common\Exceptions\InvalidArgumentException; |
| 34 | 35 | use eZ\Publish\Core\REST\Common\Exceptions\ForbiddenException; |
| 35 | 36 | use eZ\Publish\Core\REST\Client\Exceptions\BadStateException; |
@@ -42,7 +42,7 @@ |
||
| 42 | 42 | * @param array $data |
| 43 | 43 | * @param \eZ\Publish\Core\REST\Common\Input\ParsingDispatcher $parsingDispatcher |
| 44 | 44 | * |
| 45 | - * @return \eZ\Publish\API\Repository\Values\Relation\Version |
|
| 45 | + * @return Values\Content\Relation |
|
| 46 | 46 | * |
| 47 | 47 | * @todo Error handling |
| 48 | 48 | * @todo Should the related ContentInfo structs really be loaded here or do |
@@ -52,7 +52,7 @@ |
||
| 52 | 52 | * |
| 53 | 53 | * @todo Error handling |
| 54 | 54 | * |
| 55 | - * @return \eZ\Publish\API\Repository\Values\User\Role |
|
| 55 | + * @return Values\UserSession |
|
| 56 | 56 | */ |
| 57 | 57 | public function parse(array $data, ParsingDispatcher $parsingDispatcher) |
| 58 | 58 | { |
@@ -54,7 +54,7 @@ |
||
| 54 | 54 | * @param \eZ\Publish\Core\REST\Common\Input\Dispatcher $inputDispatcher |
| 55 | 55 | * @param \eZ\Publish\Core\REST\Common\Output\Visitor $outputVisitor |
| 56 | 56 | * @param \eZ\Publish\SPI\FieldType\FieldType[] $fieldTypes |
| 57 | - * @param \eZ\Publish\Core\REST\Client\HttpClient\Authentication\IntegrationTestAuthentication $authenticator |
|
| 57 | + * @param IntegrationTestAuthenticator $authenticator |
|
| 58 | 58 | */ |
| 59 | 59 | public function __construct(HttpClient $client, Dispatcher $inputDispatcher, Visitor $outputVisitor, RequestParser $requestParser, array $fieldTypes, IntegrationTestAuthenticator $authenticator) |
| 60 | 60 | { |
@@ -128,7 +128,7 @@ |
||
| 128 | 128 | * |
| 129 | 129 | * @throws \eZ\Publish\API\Repository\Exceptions\NotFoundException |
| 130 | 130 | * |
| 131 | - * @param string $binaryFileid |
|
| 131 | + * @param string $binaryFileId |
|
| 132 | 132 | * |
| 133 | 133 | * @return \eZ\Publish\Core\IO\Values\BinaryFile |
| 134 | 134 | */ |