@@ -384,6 +384,9 @@ |
||
384 | 384 | |
385 | 385 | protected $limitationServiceMock; |
386 | 386 | |
387 | + /** |
|
388 | + * @return integer |
|
389 | + */ |
|
387 | 390 | protected function getLimitationServiceMock($methods = []) |
388 | 391 | { |
389 | 392 | // Tests first calls here with methods set before initiating PermissionCriterionResolver with same instance. |
@@ -142,7 +142,7 @@ discard block |
||
142 | 142 | } |
143 | 143 | |
144 | 144 | /** |
145 | - * @return \PHPUnit\Framework\MockObject\MockObject|\eZ\Publish\Core\Repository\Helper\ContentTypeDomainMapper |
|
145 | + * @return ContentTypeDomainMapper |
|
146 | 146 | */ |
147 | 147 | protected function getContentTypeDomainMapperMock() |
148 | 148 | { |
@@ -156,7 +156,7 @@ discard block |
||
156 | 156 | /** |
157 | 157 | * Returns a persistence Handler mock. |
158 | 158 | * |
159 | - * @return \eZ\Publish\SPI\Persistence\Handler|\PHPUnit\Framework\MockObject\MockObject |
|
159 | + * @return Handler |
|
160 | 160 | */ |
161 | 161 | protected function getPersistenceMock() |
162 | 162 | { |
@@ -253,7 +253,7 @@ discard block |
||
253 | 253 | * |
254 | 254 | * @param int $id |
255 | 255 | * |
256 | - * @return \eZ\Publish\API\Repository\Values\User\User |
|
256 | + * @return null|\eZ\Publish\API\Repository\Values\User\UserReference |
|
257 | 257 | */ |
258 | 258 | protected function getStubbedUser($id) |
259 | 259 | { |
@@ -141,7 +141,7 @@ |
||
141 | 141 | * |
142 | 142 | * @throws \eZ\Publish\API\Repository\Exceptions\NotFoundException if the url wild card was not found |
143 | 143 | * |
144 | - * @param mixed $id |
|
144 | + * @param string $id |
|
145 | 145 | * |
146 | 146 | * @return \eZ\Publish\API\Repository\Values\Content\UrlWildcard |
147 | 147 | */ |
@@ -62,9 +62,9 @@ discard block |
||
62 | 62 | * Search User with given username, optionally at given location. |
63 | 63 | * |
64 | 64 | * @param string $username name of User to search for |
65 | - * @param string $parentGroupLocationId where to search, in User Group tree |
|
65 | + * @param string $parentGroupId where to search, in User Group tree |
|
66 | 66 | * |
67 | - * @return User found |
|
67 | + * @return null|\eZ\Publish\API\Repository\Values\User\User found |
|
68 | 68 | */ |
69 | 69 | public function searchUserByLogin($username, $parentGroupId = null) |
70 | 70 | { |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | * @param string $name name of User Group to search for |
96 | 96 | * @param string $parentLocationId (optional) parent location id to search in |
97 | 97 | * |
98 | - * @return search results |
|
98 | + * @return \eZ\Publish\API\Repository\Values\Content\Search\SearchHit[] results |
|
99 | 99 | */ |
100 | 100 | public function searchUserGroups($name, $parentLocationId = null) |
101 | 101 | { |
@@ -118,12 +118,12 @@ discard block |
||
118 | 118 | /** |
119 | 119 | * Create user inside given User Group; DELETES existing User if login already exists! |
120 | 120 | * |
121 | - * @param $username username of the user to create |
|
122 | - * @param $email email address of user to create |
|
123 | - * @param $password account password for user to create |
|
124 | - * @param $parentGroup pathstring wherein to create user |
|
121 | + * @param string $username username of the user to create |
|
122 | + * @param string $email email address of user to create |
|
123 | + * @param string $password account password for user to create |
|
124 | + * @param \eZ\Publish\API\Repository\Values\User\UserGroup $parentGroup pathstring wherein to create user |
|
125 | 125 | * |
126 | - * @return eZ\Publish\API\Repository\Values\User\User |
|
126 | + * @return \eZ\Publish\API\Repository\Values\User\User |
|
127 | 127 | */ |
128 | 128 | protected function createUser($username, $email, $password, $parentGroup = null, $fields = []) |
129 | 129 | { |
@@ -317,6 +317,9 @@ discard block |
||
317 | 317 | return false; |
318 | 318 | } |
319 | 319 | |
320 | + /** |
|
321 | + * @param integer $type |
|
322 | + */ |
|
320 | 323 | public function createPasswordHash($login, $password, $type) |
321 | 324 | { |
322 | 325 | switch ($type) { |
@@ -44,7 +44,6 @@ discard block |
||
44 | 44 | * @param array $headers An array of response headers |
45 | 45 | * @param bool $public Files are public by default |
46 | 46 | * @param null|string $contentDisposition The type of Content-Disposition to set automatically with the filename |
47 | - * @param bool $autoEtag Whether the ETag header should be automatically set |
|
48 | 47 | * @param bool $autoLastModified Whether the Last-Modified header should be automatically set |
49 | 48 | */ |
50 | 49 | public function __construct(BinaryFile $binaryFile, IOServiceInterface $ioService, $status = 200, $headers = [], $public = true, $contentDisposition = null, $autoLastModified = true) |
@@ -63,12 +62,11 @@ discard block |
||
63 | 62 | /** |
64 | 63 | * Sets the file to stream. |
65 | 64 | * |
66 | - * @param \SplFileInfo|string $file The file to stream |
|
65 | + * @param BinaryFile $file The file to stream |
|
67 | 66 | * @param string $contentDisposition |
68 | - * @param bool $autoEtag |
|
69 | 67 | * @param bool $autoLastModified |
70 | 68 | * |
71 | - * @return BinaryFileResponse |
|
69 | + * @return BinaryStreamResponse |
|
72 | 70 | */ |
73 | 71 | public function setFile($file, $contentDisposition = null, $autoLastModified = true) |
74 | 72 | { |
@@ -215,7 +215,6 @@ discard block |
||
215 | 215 | * |
216 | 216 | * @param \eZ\Publish\API\Repository\Values\ValueObject $expectedValues |
217 | 217 | * @param \eZ\Publish\API\Repository\Values\ValueObject $actualObject |
218 | - * @param array $propertyNames |
|
219 | 218 | */ |
220 | 219 | protected function assertStructPropertiesCorrect(ValueObject $expectedValues, ValueObject $actualObject, array $additionalProperties = []) |
221 | 220 | { |
@@ -477,7 +476,7 @@ discard block |
||
477 | 476 | /** |
478 | 477 | * Create role of a given name with the given policies described by an array. |
479 | 478 | * |
480 | - * @param $roleName |
|
479 | + * @param string $roleName |
|
481 | 480 | * @param array $policiesData [['module' => 'content', 'function' => 'read', 'limitations' => []] |
482 | 481 | * |
483 | 482 | * @return \eZ\Publish\API\Repository\Values\User\Role |
@@ -476,6 +476,9 @@ |
||
476 | 476 | ]; |
477 | 477 | } |
478 | 478 | |
479 | + /** |
|
480 | + * @param boolean $persistenceCalled |
|
481 | + */ |
|
479 | 482 | protected function assertContentHandlerExpectations($callNo, $persistenceCalled, $contentId, $contentInfo) |
480 | 483 | { |
481 | 484 | $this->getPersistenceMock() |
@@ -19,7 +19,6 @@ |
||
19 | 19 | * Constructor. |
20 | 20 | * |
21 | 21 | * @param \eZ\Publish\Core\Persistence\TransformationProcessor\PcreCompiler $compiler |
22 | - * @param string $installDir Base dir for rule loading |
|
23 | 22 | * @param array $ruleFiles |
24 | 23 | */ |
25 | 24 | public function __construct(PcreCompiler $compiler, array $ruleFiles = []) |
@@ -27,7 +27,7 @@ |
||
27 | 27 | /** |
28 | 28 | * @param array $mockMethods For specifying the methods to mock, all by default |
29 | 29 | * |
30 | - * @return \eZ\Publish\SPI\Persistence\Handler|\PHPUnit\Framework\MockObject\MockObject |
|
30 | + * @return SPIHandler |
|
31 | 31 | */ |
32 | 32 | public function getPersistenceMock(array $mockMethods = []) |
33 | 33 | { |