@@ -230,7 +230,7 @@ discard block |
||
| 230 | 230 | * |
| 231 | 231 | * @param mixed $id |
| 232 | 232 | * |
| 233 | - * @return \eZ\Publish\API\Repository\Values\User\RoleDraft |
|
| 233 | + * @return \eZ\Publish\SPI\Persistence\User\Policy |
|
| 234 | 234 | */ |
| 235 | 235 | public function loadRoleDraft($id) |
| 236 | 236 | { |
@@ -1396,7 +1396,7 @@ discard block |
||
| 1396 | 1396 | * |
| 1397 | 1397 | * @param \eZ\Publish\API\Repository\Values\User\RoleCreateStruct $roleCreateStruct |
| 1398 | 1398 | * |
| 1399 | - * @return \eZ\Publish\Core\FieldType\ValidationError[][][] |
|
| 1399 | + * @return \eZ\Publish\Core\FieldType\ValidationError[] |
|
| 1400 | 1400 | */ |
| 1401 | 1401 | protected function validateRoleCreateStruct(APIRoleCreateStruct $roleCreateStruct) |
| 1402 | 1402 | { |
@@ -1426,7 +1426,7 @@ discard block |
||
| 1426 | 1426 | * @param string $function |
| 1427 | 1427 | * @param \eZ\Publish\API\Repository\Values\User\Limitation[] $limitations |
| 1428 | 1428 | * |
| 1429 | - * @return \eZ\Publish\Core\FieldType\ValidationError[][] |
|
| 1429 | + * @return \eZ\Publish\Core\FieldType\ValidationError[] |
|
| 1430 | 1430 | */ |
| 1431 | 1431 | protected function validatePolicy($module, $function, array $limitations) |
| 1432 | 1432 | { |
@@ -123,7 +123,7 @@ discard block |
||
| 123 | 123 | * |
| 124 | 124 | * @param mixed[] $expectedValues |
| 125 | 125 | * @param \eZ\Publish\API\Repository\Values\ValueObject $actualObject |
| 126 | - * @param array $skipProperties |
|
| 126 | + * @param string[] $skipProperties |
|
| 127 | 127 | */ |
| 128 | 128 | protected function assertPropertiesCorrect(array $expectedValues, ValueObject $actualObject, array $skipProperties = array()) |
| 129 | 129 | { |
@@ -158,7 +158,7 @@ discard block |
||
| 158 | 158 | * |
| 159 | 159 | * @param \eZ\Publish\API\Repository\Values\ValueObject $expectedValues |
| 160 | 160 | * @param \eZ\Publish\API\Repository\Values\ValueObject $actualObject |
| 161 | - * @param array $skipProperties |
|
| 161 | + * @param string[] $skipProperties |
|
| 162 | 162 | */ |
| 163 | 163 | protected function assertStructPropertiesCorrect(ValueObject $expectedValues, ValueObject $actualObject, array $skipProperties = array()) |
| 164 | 164 | { |
@@ -951,7 +951,7 @@ discard block |
||
| 951 | 951 | * @param \eZ\Publish\API\Repository\Values\Content\Field[] $fields |
| 952 | 952 | * @param string $mainLanguageCode |
| 953 | 953 | * |
| 954 | - * @return array an array of language code strings |
|
| 954 | + * @return string[] an array of language code strings |
|
| 955 | 955 | */ |
| 956 | 956 | protected function getLanguageCodesFromFields(array $fields, $mainLanguageCode) |
| 957 | 957 | { |
@@ -2298,6 +2298,11 @@ discard block |
||
| 2298 | 2298 | $this->assertRelations($relations, $contentDraft->contentInfo, $mediaContentInfo); |
| 2299 | 2299 | } |
| 2300 | 2300 | |
| 2301 | + /** |
|
| 2302 | + * @param Relation[] $relations |
|
| 2303 | + * @param \eZ\Publish\API\Repository\Values\Content\ContentInfo $sourceContentInfo |
|
| 2304 | + * @param \eZ\Publish\API\Repository\Values\Content\ContentInfo $destinationContentInfo |
|
| 2305 | + */ |
|
| 2301 | 2306 | protected function assertRelations($relations, $sourceContentInfo, $destinationContentInfo) |
| 2302 | 2307 | { |
| 2303 | 2308 | self::assertInternalType('array', $relations); |
@@ -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( |
@@ -1054,7 +1054,7 @@ discard block |
||
| 1054 | 1054 | * @param string $mainLanguageCode |
| 1055 | 1055 | * @param \eZ\Publish\API\Repository\Values\Content\Field[] $structFields |
| 1056 | 1056 | * @param \eZ\Publish\API\Repository\Values\ContentType\FieldDefinition[] $fieldDefinitions |
| 1057 | - * @param array $languageCodes |
|
| 1057 | + * @param string[] $languageCodes |
|
| 1058 | 1058 | * |
| 1059 | 1059 | * @return array |
| 1060 | 1060 | */ |
@@ -1128,10 +1128,9 @@ discard block |
||
| 1128 | 1128 | * @param \eZ\Publish\SPI\Persistence\Content\Field[] $spiFields |
| 1129 | 1129 | * @param \eZ\Publish\API\Repository\Values\ContentType\FieldDefinition[] $fieldDefinitions |
| 1130 | 1130 | * @param \eZ\Publish\API\Repository\Values\Content\LocationCreateStruct[] $locationCreateStructs |
| 1131 | - * @param \eZ\Publish\SPI\Persistence\Content\ObjectState\Group[] $objectStateGroups |
|
| 1132 | 1131 | * @param bool $execute |
| 1133 | 1132 | * |
| 1134 | - * @return mixed |
|
| 1133 | + * @return ContentCreateStruct |
|
| 1135 | 1134 | */ |
| 1136 | 1135 | protected function assertForTestCreateContentNonRedundantFieldSet( |
| 1137 | 1136 | $mainLanguageCode, |
@@ -2008,7 +2007,7 @@ discard block |
||
| 2008 | 2007 | * @param \eZ\Publish\API\Repository\Values\Content\Field[] $structFields |
| 2009 | 2008 | * @param \eZ\Publish\API\Repository\Values\ContentType\FieldDefinition[] $fieldDefinitions |
| 2010 | 2009 | * |
| 2011 | - * @return mixed |
|
| 2010 | + * @return ContentCreateStruct |
|
| 2012 | 2011 | */ |
| 2013 | 2012 | protected function assertForTestCreateContentThrowsContentValidationExceptionRequiredField( |
| 2014 | 2013 | $mainLanguageCode, |
@@ -4795,6 +4794,10 @@ discard block |
||
| 4795 | 4794 | ); |
| 4796 | 4795 | } |
| 4797 | 4796 | |
| 4797 | + /** |
|
| 4798 | + * @param Field[] $existingFields |
|
| 4799 | + * @param FieldDefinition[] $fieldDefinitions |
|
| 4800 | + */ |
|
| 4798 | 4801 | public function assertForTestUpdateContentThrowsContentValidationExceptionRequiredField( |
| 4799 | 4802 | $initialLanguageCode, |
| 4800 | 4803 | $structFields, |
@@ -4993,6 +4996,10 @@ discard block |
||
| 4993 | 4996 | } |
| 4994 | 4997 | } |
| 4995 | 4998 | |
| 4999 | + /** |
|
| 5000 | + * @param Field[] $existingFields |
|
| 5001 | + * @param FieldDefinition[] $fieldDefinitions |
|
| 5002 | + */ |
|
| 4996 | 5003 | public function assertForTestUpdateContentThrowsContentFieldValidationException( |
| 4997 | 5004 | $initialLanguageCode, |
| 4998 | 5005 | $structFields, |
@@ -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 | { |
@@ -504,6 +504,11 @@ |
||
| 504 | 504 | ); |
| 505 | 505 | } |
| 506 | 506 | |
| 507 | + /** |
|
| 508 | + * @param integer $id |
|
| 509 | + * @param null|integer $fieldDefinitionId |
|
| 510 | + * @param integer $contentId |
|
| 511 | + */ |
|
| 507 | 512 | protected function getStubbedRelation($id, $type, $fieldDefinitionId, $contentId) |
| 508 | 513 | { |
| 509 | 514 | return new \eZ\Publish\Core\Repository\Values\Content\Relation( |
@@ -110,7 +110,7 @@ |
||
| 110 | 110 | * |
| 111 | 111 | * @param \eZ\Publish\API\Repository\Values\Content\Location $location |
| 112 | 112 | * |
| 113 | - * @return null|\eZ\Publish\API\Repository\Values\Content\TrashItem null if location was deleted, otherwise TrashItem |
|
| 113 | + * @return TrashItem|null null if location was deleted, otherwise TrashItem |
|
| 114 | 114 | */ |
| 115 | 115 | public function trash(Location $location) |
| 116 | 116 | { |
@@ -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 | */ |