@@ -30,7 +30,7 @@ |
||
| 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 | { |
@@ -17,7 +17,7 @@ |
||
| 17 | 17 | /** |
| 18 | 18 | * Returns a list of functions to add to the existing list. |
| 19 | 19 | * |
| 20 | - * @return array An array of functions |
|
| 20 | + * @return \Twig_SimpleFunction[] An array of functions |
|
| 21 | 21 | */ |
| 22 | 22 | public function getFunctions() |
| 23 | 23 | { |
@@ -278,6 +278,10 @@ discard block |
||
| 278 | 278 | return $response; |
| 279 | 279 | } |
| 280 | 280 | |
| 281 | + /** |
|
| 282 | + * @param string $code |
|
| 283 | + * @param string $message |
|
| 284 | + */ |
|
| 281 | 285 | private function returnJsonError($code, $message){ |
| 282 | 286 | |
| 283 | 287 | return new JsonResponse([ |
@@ -450,7 +454,7 @@ discard block |
||
| 450 | 454 | * @Route("move/", name="KunstmaanMediaBundle_media_move") |
| 451 | 455 | * @Method({"POST"}) |
| 452 | 456 | * |
| 453 | - * @return string |
|
| 457 | + * @return JsonResponse |
|
| 454 | 458 | */ |
| 455 | 459 | public function moveMedia(Request $request) |
| 456 | 460 | { |
@@ -17,7 +17,7 @@ |
||
| 17 | 17 | /** |
| 18 | 18 | * Returns a list of functions to add to the existing list. |
| 19 | 19 | * |
| 20 | - * @return array An array of functions |
|
| 20 | + * @return \Twig_SimpleFunction[] An array of functions |
|
| 21 | 21 | */ |
| 22 | 22 | public function getFunctions() |
| 23 | 23 | { |
@@ -29,7 +29,7 @@ |
||
| 29 | 29 | /** |
| 30 | 30 | * Get Twig functions defined in this extension. |
| 31 | 31 | * |
| 32 | - * @return array |
|
| 32 | + * @return \Twig_SimpleFunction[] |
|
| 33 | 33 | */ |
| 34 | 34 | public function getFunctions() |
| 35 | 35 | { |
@@ -17,7 +17,7 @@ |
||
| 17 | 17 | /** |
| 18 | 18 | * Returns a list of functions to add to the existing list. |
| 19 | 19 | * |
| 20 | - * @return array An array of functions |
|
| 20 | + * @return \Twig_SimpleFunction[] An array of functions |
|
| 21 | 21 | */ |
| 22 | 22 | public function getFunctions() |
| 23 | 23 | { |
@@ -17,7 +17,7 @@ |
||
| 17 | 17 | /** |
| 18 | 18 | * Returns a list of functions to add to the existing list. |
| 19 | 19 | * |
| 20 | - * @return array An array of functions |
|
| 20 | + * @return \Twig_SimpleFunction[] An array of functions |
|
| 21 | 21 | */ |
| 22 | 22 | public function getFunctions() |
| 23 | 23 | { |
@@ -26,7 +26,7 @@ |
||
| 26 | 26 | } |
| 27 | 27 | |
| 28 | 28 | /** |
| 29 | - * @return array |
|
| 29 | + * @return \Twig_SimpleFunction[] |
|
| 30 | 30 | */ |
| 31 | 31 | public function getFunctions() |
| 32 | 32 | { |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | * |
| 55 | 55 | * @param string $name The name of the route |
| 56 | 56 | * @param mixed $parameters An array of parameters |
| 57 | - * @param Boolean|string $referenceType The type of reference to be generated (one of the constants) |
|
| 57 | + * @param integer $referenceType The type of reference to be generated (one of the constants) |
|
| 58 | 58 | * |
| 59 | 59 | * @return string The generated URL |
| 60 | 60 | * |
@@ -136,7 +136,7 @@ discard block |
||
| 136 | 136 | |
| 137 | 137 | /** |
| 138 | 138 | * @param Redirect $redirect |
| 139 | - * @return bool |
|
| 139 | + * @return string|false |
|
| 140 | 140 | */ |
| 141 | 141 | private function isWildcardRedirect(Redirect $redirect) |
| 142 | 142 | { |
@@ -148,6 +148,9 @@ discard block |
||
| 148 | 148 | return false; |
| 149 | 149 | } |
| 150 | 150 | |
| 151 | + /** |
|
| 152 | + * @param string $matchSegment |
|
| 153 | + */ |
|
| 151 | 154 | private function isPathInfoWildcardMatch($matchSegment) |
| 152 | 155 | { |
| 153 | 156 | $path = $this->context->getPathInfo(); |