@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | * @Route("/{popup}/add", requirements={"popup" = "\d+"}, name="kunstmaanleadgenerationbundle_admin_rule_abstractrule_add") |
| 45 | 45 | * @Method({"GET", "POST"}) |
| 46 | 46 | * |
| 47 | - * @return array |
|
| 47 | + * @return \Symfony\Component\HttpFoundation\Response |
|
| 48 | 48 | */ |
| 49 | 49 | public function addAction(Request $request, $popup) |
| 50 | 50 | { |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | * @Route("/{popup}/rules/{id}/edit", requirements={"popup" = "\d+", "rule" = "\d+"}, name="kunstmaanleadgenerationbundle_admin_rule_abstractrule_edit") |
| 62 | 62 | * @Method({"GET", "POST"}) |
| 63 | 63 | * |
| 64 | - * @return array |
|
| 64 | + * @return \Symfony\Component\HttpFoundation\Response |
|
| 65 | 65 | */ |
| 66 | 66 | public function editAction(Request $request, $id, $popup) |
| 67 | 67 | { |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | * @Route("/{popup}/rules/{id}/delete", requirements={"popup" = "\d+"}, name="kunstmaanleadgenerationbundle_admin_rule_abstractrule_delete") |
| 77 | 77 | * @Method({"GET", "POST"}) |
| 78 | 78 | * |
| 79 | - * @return array |
|
| 79 | + * @return \Symfony\Component\HttpFoundation\Response |
|
| 80 | 80 | */ |
| 81 | 81 | public function deleteAction(Request $request, $id, $popup) |
| 82 | 82 | { |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | /** |
| 35 | 35 | * @param int $percentage |
| 36 | 36 | * |
| 37 | - * @return AfterXScrollPercent |
|
| 37 | + * @return AfterXScrollPercentRule |
|
| 38 | 38 | */ |
| 39 | 39 | public function setPercentage($percentage) |
| 40 | 40 | { |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | } |
| 71 | 71 | |
| 72 | 72 | /** |
| 73 | - * @return AfterXScrollPercentAdminType |
|
| 73 | + * @return AfterXScrollPercentRuleAdminType |
|
| 74 | 74 | */ |
| 75 | 75 | public function getAdminType() |
| 76 | 76 | { |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | /** |
| 31 | 31 | * @param string $locale |
| 32 | 32 | * |
| 33 | - * @return LocaleWhitelistRule |
|
| 33 | + * @return LocaleBlacklistRule |
|
| 34 | 34 | */ |
| 35 | 35 | public function setLocale($locale) |
| 36 | 36 | { |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | } |
| 75 | 75 | |
| 76 | 76 | /** |
| 77 | - * @return LocaleBlackListAdminType |
|
| 77 | + * @return string |
|
| 78 | 78 | */ |
| 79 | 79 | public function getAdminType() |
| 80 | 80 | { |
@@ -74,7 +74,7 @@ |
||
| 74 | 74 | } |
| 75 | 75 | |
| 76 | 76 | /** |
| 77 | - * @return LocaleWhiteListAdminType |
|
| 77 | + * @return string |
|
| 78 | 78 | */ |
| 79 | 79 | public function getAdminType() |
| 80 | 80 | { |
@@ -30,7 +30,7 @@ |
||
| 30 | 30 | /** |
| 31 | 31 | * @param string $urls |
| 32 | 32 | * |
| 33 | - * @return UrlWhitelistRule |
|
| 33 | + * @return UrlBlacklistRule |
|
| 34 | 34 | */ |
| 35 | 35 | public function setUrls($urls) |
| 36 | 36 | { |
@@ -47,7 +47,7 @@ |
||
| 47 | 47 | /** |
| 48 | 48 | * Returns a list of functions to add to the existing list. |
| 49 | 49 | * |
| 50 | - * @return array An array of functions |
|
| 50 | + * @return \Twig_SimpleFunction[] An array of functions |
|
| 51 | 51 | */ |
| 52 | 52 | public function getFunctions() |
| 53 | 53 | { |
@@ -135,7 +135,7 @@ discard block |
||
| 135 | 135 | * @Route("bulkuploadsubmit/{folderId}", requirements={"folderId" = "\d+"}, name="KunstmaanMediaBundle_media_bulk_upload_submit") |
| 136 | 136 | * @Template() |
| 137 | 137 | * |
| 138 | - * @return array|RedirectResponse |
|
| 138 | + * @return JsonResponse |
|
| 139 | 139 | */ |
| 140 | 140 | public function bulkUploadSubmitAction($folderId) |
| 141 | 141 | { |
@@ -277,6 +277,10 @@ discard block |
||
| 277 | 277 | )); |
| 278 | 278 | } |
| 279 | 279 | |
| 280 | + /** |
|
| 281 | + * @param string $code |
|
| 282 | + * @param string $message |
|
| 283 | + */ |
|
| 280 | 284 | private function returnJsonError($code, $message){ |
| 281 | 285 | |
| 282 | 286 | return new JsonResponse([ |
@@ -296,7 +300,7 @@ discard block |
||
| 296 | 300 | * @Route("drop/{folderId}", requirements={"folderId" = "\d+"}, name="KunstmaanMediaBundle_media_drop_upload") |
| 297 | 301 | * @Method({"GET", "POST"}) |
| 298 | 302 | * |
| 299 | - * @return array|RedirectResponse |
|
| 303 | + * @return Response |
|
| 300 | 304 | */ |
| 301 | 305 | public function dropAction(Request $request, $folderId) |
| 302 | 306 | { |
@@ -449,7 +453,7 @@ discard block |
||
| 449 | 453 | * @Route("move/", name="KunstmaanMediaBundle_media_move") |
| 450 | 454 | * @Method({"POST"}) |
| 451 | 455 | * |
| 452 | - * @return string |
|
| 456 | + * @return JsonResponse |
|
| 453 | 457 | */ |
| 454 | 458 | public function moveMedia(Request $request) |
| 455 | 459 | { |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | /** |
| 49 | 49 | * Returns handler with the highest priority to handle the Media item which can handle the item. If no handler is found, it returns FileHandler |
| 50 | 50 | * |
| 51 | - * @param Media|File $media |
|
| 51 | + * @param Media $media |
|
| 52 | 52 | * |
| 53 | 53 | * @return AbstractMediaHandler |
| 54 | 54 | */ |
@@ -129,7 +129,7 @@ discard block |
||
| 129 | 129 | } |
| 130 | 130 | |
| 131 | 131 | /** |
| 132 | - * @param mixed $data |
|
| 132 | + * @param \stdClass $data |
|
| 133 | 133 | * |
| 134 | 134 | * @return Media |
| 135 | 135 | */ |
@@ -58,7 +58,7 @@ |
||
| 58 | 58 | } |
| 59 | 59 | |
| 60 | 60 | /** |
| 61 | - * @return mixed |
|
| 61 | + * @return string |
|
| 62 | 62 | */ |
| 63 | 63 | public function getSoundcloudApiKey() |
| 64 | 64 | { |