@@ -118,6 +118,9 @@ discard block |
||
118 | 118 | |
119 | 119 | protected $contentTypeHandler; |
120 | 120 | |
121 | + /** |
|
122 | + * @return \eZ\Publish\SPI\Persistence\Content\Type\Handler |
|
123 | + */ |
|
121 | 124 | protected function getContentTypeHandler() |
122 | 125 | { |
123 | 126 | if (!isset($this->contentTypeHandler)) { |
@@ -155,7 +158,7 @@ discard block |
||
155 | 158 | /** |
156 | 159 | * Returns a content mapper mock. |
157 | 160 | * |
158 | - * @return \eZ\Publish\Core\Persistence\Legacy\Content\Mapper |
|
161 | + * @return \PHPUnit\Framework\MockObject\MockObject |
|
159 | 162 | */ |
160 | 163 | protected function getContentMapperMock() |
161 | 164 | { |
@@ -211,7 +214,7 @@ discard block |
||
211 | 214 | /** |
212 | 215 | * Returns a content field handler mock. |
213 | 216 | * |
214 | - * @return \eZ\Publish\Core\Persistence\Legacy\Content\FieldHandler |
|
217 | + * @return \PHPUnit\Framework\MockObject\MockObject |
|
215 | 218 | */ |
216 | 219 | protected function getContentFieldHandlerMock() |
217 | 220 | { |
@@ -60,6 +60,7 @@ discard block |
||
60 | 60 | |
61 | 61 | /** |
62 | 62 | * Assert that the elements are. |
63 | + * @param \eZ\Publish\API\Repository\Values\Content\Search\SearchResult $searchResult |
|
63 | 64 | */ |
64 | 65 | protected function assertSearchResults($expectedIds, $searchResult) |
65 | 66 | { |
@@ -237,6 +238,9 @@ discard block |
||
237 | 238 | |
238 | 239 | protected $contentTypeHandler; |
239 | 240 | |
241 | + /** |
|
242 | + * @return \eZ\Publish\SPI\Persistence\Content\Type\Handler |
|
243 | + */ |
|
240 | 244 | protected function getContentTypeHandler() |
241 | 245 | { |
242 | 246 | if (!isset($this->contentTypeHandler)) { |
@@ -277,7 +281,7 @@ discard block |
||
277 | 281 | /** |
278 | 282 | * Returns a content mapper mock. |
279 | 283 | * |
280 | - * @return \eZ\Publish\Core\Persistence\Legacy\Content\Mapper |
|
284 | + * @return \PHPUnit\Framework\MockObject\MockObject |
|
281 | 285 | */ |
282 | 286 | protected function getContentMapperMock() |
283 | 287 | { |
@@ -316,7 +320,7 @@ discard block |
||
316 | 320 | /** |
317 | 321 | * Returns a content field handler mock. |
318 | 322 | * |
319 | - * @return \eZ\Publish\Core\Persistence\Legacy\Content\FieldHandler |
|
323 | + * @return \PHPUnit\Framework\MockObject\MockObject |
|
320 | 324 | */ |
321 | 325 | protected function getContentFieldHandlerMock() |
322 | 326 | { |
@@ -57,6 +57,8 @@ discard block |
||
57 | 57 | |
58 | 58 | /** |
59 | 59 | * Assert that the elements are. |
60 | + * @param integer[] $expectedIds |
|
61 | + * @param \eZ\Publish\API\Repository\Values\Content\Search\SearchResult $locations |
|
60 | 62 | */ |
61 | 63 | protected function assertSearchResults($expectedIds, $locations) |
62 | 64 | { |
@@ -141,6 +143,9 @@ discard block |
||
141 | 143 | |
142 | 144 | protected $contentTypeHandler; |
143 | 145 | |
146 | + /** |
|
147 | + * @return \eZ\Publish\SPI\Persistence\Content\Type\Handler |
|
148 | + */ |
|
144 | 149 | protected function getContentTypeHandler() |
145 | 150 | { |
146 | 151 | if (!isset($this->contentTypeHandler)) { |
@@ -160,6 +165,9 @@ discard block |
||
160 | 165 | |
161 | 166 | protected $fieldRegistry; |
162 | 167 | |
168 | + /** |
|
169 | + * @return ConverterRegistry |
|
170 | + */ |
|
163 | 171 | protected function getConverterRegistry() |
164 | 172 | { |
165 | 173 | if (!isset($this->fieldRegistry)) { |
@@ -187,7 +195,7 @@ discard block |
||
187 | 195 | /** |
188 | 196 | * Returns a location mapper mock. |
189 | 197 | * |
190 | - * @return \eZ\Publish\Core\Persistence\Legacy\Content\Location\Mapper |
|
198 | + * @return \PHPUnit\Framework\MockObject\MockObject |
|
191 | 199 | */ |
192 | 200 | protected function getLocationMapperMock() |
193 | 201 | { |
@@ -58,6 +58,7 @@ discard block |
||
58 | 58 | |
59 | 59 | /** |
60 | 60 | * Assert that the elements are. |
61 | + * @param \eZ\Publish\API\Repository\Values\Content\Search\SearchResult $searchResult |
|
61 | 62 | */ |
62 | 63 | protected function assertSearchResults($expectedIds, $searchResult) |
63 | 64 | { |
@@ -209,6 +210,9 @@ discard block |
||
209 | 210 | |
210 | 211 | protected $contentTypeHandler; |
211 | 212 | |
213 | + /** |
|
214 | + * @return \eZ\Publish\SPI\Persistence\Content\Type\Handler |
|
215 | + */ |
|
212 | 216 | protected function getContentTypeHandler() |
213 | 217 | { |
214 | 218 | if (!isset($this->contentTypeHandler)) { |
@@ -228,6 +232,9 @@ discard block |
||
228 | 232 | |
229 | 233 | protected $fieldRegistry; |
230 | 234 | |
235 | + /** |
|
236 | + * @return ConverterRegistry |
|
237 | + */ |
|
231 | 238 | protected function getConverterRegistry() |
232 | 239 | { |
233 | 240 | if (!isset($this->fieldRegistry)) { |
@@ -251,7 +258,7 @@ discard block |
||
251 | 258 | /** |
252 | 259 | * Returns a location mapper mock. |
253 | 260 | * |
254 | - * @return \eZ\Publish\Core\Persistence\Legacy\Content\Location\Mapper |
|
261 | + * @return \PHPUnit\Framework\MockObject\MockObject |
|
255 | 262 | */ |
256 | 263 | protected function getLocationMapperMock() |
257 | 264 | { |
@@ -154,8 +154,8 @@ discard block |
||
154 | 154 | /** |
155 | 155 | * Creates a User object from $userId, $userRemoteId and $userVersionNo. |
156 | 156 | * |
157 | - * @param mixed $userId |
|
158 | - * @param mixed $userRemoteId |
|
157 | + * @param integer $userId |
|
158 | + * @param string $userRemoteId |
|
159 | 159 | * @param int $userVersionNo |
160 | 160 | * |
161 | 161 | * @return \eZ\Publish\Core\Repository\Values\User\User |
@@ -177,8 +177,8 @@ discard block |
||
177 | 177 | /** |
178 | 178 | * Returns a new UserGroup. |
179 | 179 | * |
180 | - * @param mixed $groupId |
|
181 | - * @param mixed $groupRemoteId |
|
180 | + * @param integer $groupId |
|
181 | + * @param string $groupRemoteId |
|
182 | 182 | * @param int $groupVersioNo |
183 | 183 | * |
184 | 184 | * @return \eZ\Publish\Core\Repository\Values\User\UserGroup |
@@ -9,10 +9,9 @@ |
||
9 | 9 | namespace eZ\Publish\Core\MVC\Symfony\SiteAccess\Tests; |
10 | 10 | |
11 | 11 | use eZ\Publish\Core\MVC\Symfony\SiteAccess; |
12 | -use eZ\Publish\Core\MVC\Symfony\SiteAccess\Matcher\URIElement; |
|
12 | +use eZ\Publish\Core\MVC\Symfony\SiteAccess\Matcher\URIElement as URIElementMatcher; |
|
13 | 13 | use PHPUnit\Framework\TestCase; |
14 | 14 | use eZ\Publish\Core\MVC\Symfony\SiteAccess\Router; |
15 | -use eZ\Publish\Core\MVC\Symfony\SiteAccess\Matcher\URIElement as URIElementMatcher; |
|
16 | 15 | use eZ\Publish\Core\MVC\Symfony\Routing\SimplifiedRequest; |
17 | 16 | use eZ\Publish\Core\MVC\Symfony\SiteAccess\MatcherBuilder; |
18 | 17 | use Psr\Log\LoggerInterface; |
@@ -89,7 +89,7 @@ |
||
89 | 89 | /** |
90 | 90 | * Get the content type service mock object. |
91 | 91 | * |
92 | - * @return \eZ\Publish\API\Repository\ContentTypeService |
|
92 | + * @return \PHPUnit\Framework\MockObject\MockObject |
|
93 | 93 | */ |
94 | 94 | protected function getContentTypeServiceMock() |
95 | 95 | { |
@@ -195,7 +195,7 @@ discard block |
||
195 | 195 | /** |
196 | 196 | * Get the FieldTypeParser mock object. |
197 | 197 | * |
198 | - * @return \eZ\Publish\Core\REST\Common\Input\FieldTypeParser |
|
198 | + * @return \PHPUnit\Framework\MockObject\MockObject |
|
199 | 199 | */ |
200 | 200 | protected function getFieldTypeParserMock() |
201 | 201 | { |
@@ -228,7 +228,7 @@ discard block |
||
228 | 228 | /** |
229 | 229 | * Get the content type service mock object. |
230 | 230 | * |
231 | - * @return \eZ\Publish\API\Repository\ContentTypeService |
|
231 | + * @return \PHPUnit\Framework\MockObject\MockObject |
|
232 | 232 | */ |
233 | 233 | protected function getContentTypeServiceMock() |
234 | 234 | { |
@@ -178,7 +178,7 @@ |
||
178 | 178 | /** |
179 | 179 | * Get the location service mock object. |
180 | 180 | * |
181 | - * @return \eZ\Publish\API\Repository\LocationService |
|
181 | + * @return \PHPUnit\Framework\MockObject\MockObject |
|
182 | 182 | */ |
183 | 183 | protected function getLocationServiceMock() |
184 | 184 | { |