diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2019-11-12 14:18:58 +0100 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2019-11-12 14:18:58 +0100 |
commit | 8d4ed0df0633f43fc2d65fef72c36070113844d1 (patch) | |
tree | 40df943c0326bd69ba88b599889e03ff7f4dbb8d /src/Wallabag/CoreBundle/Controller | |
parent | 76fe5dfb7189b8f5eebf3f372718cd5e2cf286c4 (diff) | |
download | wallabag-8d4ed0df0633f43fc2d65fef72c36070113844d1.tar.gz wallabag-8d4ed0df0633f43fc2d65fef72c36070113844d1.tar.zst wallabag-8d4ed0df0633f43fc2d65fef72c36070113844d1.zip |
Update deps
Also CS (because cs-fixer got an update)
Package operations: 0 installs, 26 updates, 0 removals
- Updating twig/twig (v2.12.1 => v2.12.2)
- Updating symfony/symfony (v3.4.33 => v3.4.34)
- Updating doctrine/event-manager (v1.0.0 => 1.1.0)
- Updating doctrine/collections (v1.6.2 => 1.6.3)
- Updating doctrine/cache (v1.8.1 => 1.9.0)
- Updating doctrine/persistence (1.1.1 => 1.2.0)
- Updating doctrine/inflector (v1.3.0 => 1.3.1)
- Updating symfony/mime (v4.3.5 => v4.3.7)
- Updating swiftmailer/swiftmailer (v6.2.1 => v6.2.3)
- Updating symfony/swiftmailer-bundle (v3.3.0 => v3.3.1)
- Updating doctrine/dbal (v2.9.2 => v2.9.3)
- Updating doctrine/instantiator (1.2.0 => 1.3.0)
- Updating j0k3r/graby-site-config (1.0.93 => 1.0.94)
- Updating phpoption/phpoption (1.5.0 => 1.5.2)
- Updating symfony/http-client-contracts (v1.1.7 => v1.1.8)
- Updating symfony/http-client (v4.3.5 => v4.3.7)
- Updating sensiolabs/security-checker (v6.0.2 => v6.0.3)
- Updating paragonie/constant_time_encoding (v2.2.3 => v2.3.0)
- Updating scheb/two-factor-bundle (v4.7.1 => v4.8.0)
- Updating symfony/phpunit-bridge (v4.3.6 => v4.3.7)
- Updating composer/xdebug-handler (1.3.3 => 1.4.0)
- Updating friendsofphp/php-cs-fixer (v2.15.3 => v2.16.0)
- Updating doctrine/data-fixtures (v1.3.2 => 1.3.3)
- Updating nette/schema (v1.0.0 => v1.0.1)
- Updating nikic/php-parser (v4.2.4 => v4.3.0)
- Updating sentry/sentry (2.2.2 => 2.2.4)
Diffstat (limited to 'src/Wallabag/CoreBundle/Controller')
6 files changed, 9 insertions, 85 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php index 0db90ba4..6655ef93 100644 --- a/src/Wallabag/CoreBundle/Controller/ConfigController.php +++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php | |||
@@ -26,8 +26,6 @@ use Wallabag\CoreBundle\Tools\Utils; | |||
26 | class ConfigController extends Controller | 26 | class ConfigController extends Controller |
27 | { | 27 | { |
28 | /** | 28 | /** |
29 | * @param Request $request | ||
30 | * | ||
31 | * @Route("/config", name="config") | 29 | * @Route("/config", name="config") |
32 | */ | 30 | */ |
33 | public function indexAction(Request $request) | 31 | public function indexAction(Request $request) |
@@ -279,8 +277,6 @@ class ConfigController extends Controller | |||
279 | /** | 277 | /** |
280 | * Validate OTP code. | 278 | * Validate OTP code. |
281 | * | 279 | * |
282 | * @param Request $request | ||
283 | * | ||
284 | * @Route("/config/otp/app/check", name="config_otp_app_check") | 280 | * @Route("/config/otp/app/check", name="config_otp_app_check") |
285 | */ | 281 | */ |
286 | public function otpAppCheckAction(Request $request) | 282 | public function otpAppCheckAction(Request $request) |
@@ -308,8 +304,6 @@ class ConfigController extends Controller | |||
308 | } | 304 | } |
309 | 305 | ||
310 | /** | 306 | /** |
311 | * @param Request $request | ||
312 | * | ||
313 | * @Route("/generate-token", name="generate_token") | 307 | * @Route("/generate-token", name="generate_token") |
314 | * | 308 | * |
315 | * @return RedirectResponse|JsonResponse | 309 | * @return RedirectResponse|JsonResponse |
@@ -336,8 +330,6 @@ class ConfigController extends Controller | |||
336 | } | 330 | } |
337 | 331 | ||
338 | /** | 332 | /** |
339 | * @param Request $request | ||
340 | * | ||
341 | * @Route("/revoke-token", name="revoke_token") | 333 | * @Route("/revoke-token", name="revoke_token") |
342 | * | 334 | * |
343 | * @return RedirectResponse|JsonResponse | 335 | * @return RedirectResponse|JsonResponse |
@@ -366,8 +358,6 @@ class ConfigController extends Controller | |||
366 | /** | 358 | /** |
367 | * Deletes a tagging rule and redirect to the config homepage. | 359 | * Deletes a tagging rule and redirect to the config homepage. |
368 | * | 360 | * |
369 | * @param TaggingRule $rule | ||
370 | * | ||
371 | * @Route("/tagging-rule/delete/{id}", requirements={"id" = "\d+"}, name="delete_tagging_rule") | 361 | * @Route("/tagging-rule/delete/{id}", requirements={"id" = "\d+"}, name="delete_tagging_rule") |
372 | * | 362 | * |
373 | * @return RedirectResponse | 363 | * @return RedirectResponse |
@@ -391,8 +381,6 @@ class ConfigController extends Controller | |||
391 | /** | 381 | /** |
392 | * Edit a tagging rule. | 382 | * Edit a tagging rule. |
393 | * | 383 | * |
394 | * @param TaggingRule $rule | ||
395 | * | ||
396 | * @Route("/tagging-rule/edit/{id}", requirements={"id" = "\d+"}, name="edit_tagging_rule") | 384 | * @Route("/tagging-rule/edit/{id}", requirements={"id" = "\d+"}, name="edit_tagging_rule") |
397 | * | 385 | * |
398 | * @return RedirectResponse | 386 | * @return RedirectResponse |
@@ -459,8 +447,6 @@ class ConfigController extends Controller | |||
459 | * | 447 | * |
460 | * @Route("/account/delete", name="delete_account") | 448 | * @Route("/account/delete", name="delete_account") |
461 | * | 449 | * |
462 | * @param Request $request | ||
463 | * | ||
464 | * @throws AccessDeniedHttpException | 450 | * @throws AccessDeniedHttpException |
465 | * | 451 | * |
466 | * @return \Symfony\Component\HttpFoundation\RedirectResponse | 452 | * @return \Symfony\Component\HttpFoundation\RedirectResponse |
@@ -491,8 +477,6 @@ class ConfigController extends Controller | |||
491 | * | 477 | * |
492 | * @Route("/config/view-mode", name="switch_view_mode") | 478 | * @Route("/config/view-mode", name="switch_view_mode") |
493 | * | 479 | * |
494 | * @param Request $request | ||
495 | * | ||
496 | * @return \Symfony\Component\HttpFoundation\RedirectResponse | 480 | * @return \Symfony\Component\HttpFoundation\RedirectResponse |
497 | */ | 481 | */ |
498 | public function changeViewModeAction(Request $request) | 482 | public function changeViewModeAction(Request $request) |
@@ -510,8 +494,7 @@ class ConfigController extends Controller | |||
510 | /** | 494 | /** |
511 | * Change the locale for the current user. | 495 | * Change the locale for the current user. |
512 | * | 496 | * |
513 | * @param Request $request | 497 | * @param string $language |
514 | * @param string $language | ||
515 | * | 498 | * |
516 | * @Route("/locale/{language}", name="changeLocale") | 499 | * @Route("/locale/{language}", name="changeLocale") |
517 | * | 500 | * |
@@ -620,8 +603,6 @@ class ConfigController extends Controller | |||
620 | 603 | ||
621 | /** | 604 | /** |
622 | * Validate that a rule can be edited/deleted by the current user. | 605 | * Validate that a rule can be edited/deleted by the current user. |
623 | * | ||
624 | * @param TaggingRule $rule | ||
625 | */ | 606 | */ |
626 | private function validateRuleAction(TaggingRule $rule) | 607 | private function validateRuleAction(TaggingRule $rule) |
627 | { | 608 | { |
diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php index 5c8ecb40..cd9e8d27 100644 --- a/src/Wallabag/CoreBundle/Controller/EntryController.php +++ b/src/Wallabag/CoreBundle/Controller/EntryController.php | |||
@@ -21,8 +21,7 @@ use Wallabag\CoreBundle\Form\Type\SearchEntryType; | |||
21 | class EntryController extends Controller | 21 | class EntryController extends Controller |
22 | { | 22 | { |
23 | /** | 23 | /** |
24 | * @param Request $request | 24 | * @param int $page |
25 | * @param int $page | ||
26 | * | 25 | * |
27 | * @Route("/search/{page}", name="search", defaults={"page" = 1}) | 26 | * @Route("/search/{page}", name="search", defaults={"page" = 1}) |
28 | * | 27 | * |
@@ -53,8 +52,6 @@ class EntryController extends Controller | |||
53 | } | 52 | } |
54 | 53 | ||
55 | /** | 54 | /** |
56 | * @param Request $request | ||
57 | * | ||
58 | * @Route("/new-entry", name="new_entry") | 55 | * @Route("/new-entry", name="new_entry") |
59 | * | 56 | * |
60 | * @return \Symfony\Component\HttpFoundation\Response | 57 | * @return \Symfony\Component\HttpFoundation\Response |
@@ -97,8 +94,6 @@ class EntryController extends Controller | |||
97 | } | 94 | } |
98 | 95 | ||
99 | /** | 96 | /** |
100 | * @param Request $request | ||
101 | * | ||
102 | * @Route("/bookmarklet", name="bookmarklet") | 97 | * @Route("/bookmarklet", name="bookmarklet") |
103 | * | 98 | * |
104 | * @return \Symfony\Component\HttpFoundation\Response | 99 | * @return \Symfony\Component\HttpFoundation\Response |
@@ -135,9 +130,6 @@ class EntryController extends Controller | |||
135 | /** | 130 | /** |
136 | * Edit an entry content. | 131 | * Edit an entry content. |
137 | * | 132 | * |
138 | * @param Request $request | ||
139 | * @param Entry $entry | ||
140 | * | ||
141 | * @Route("/edit/{id}", requirements={"id" = "\d+"}, name="edit") | 133 | * @Route("/edit/{id}", requirements={"id" = "\d+"}, name="edit") |
142 | * | 134 | * |
143 | * @return \Symfony\Component\HttpFoundation\Response | 135 | * @return \Symfony\Component\HttpFoundation\Response |
@@ -171,8 +163,7 @@ class EntryController extends Controller | |||
171 | /** | 163 | /** |
172 | * Shows all entries for current user. | 164 | * Shows all entries for current user. |
173 | * | 165 | * |
174 | * @param Request $request | 166 | * @param int $page |
175 | * @param int $page | ||
176 | * | 167 | * |
177 | * @Route("/all/list/{page}", name="all", defaults={"page" = "1"}) | 168 | * @Route("/all/list/{page}", name="all", defaults={"page" = "1"}) |
178 | * | 169 | * |
@@ -186,8 +177,7 @@ class EntryController extends Controller | |||
186 | /** | 177 | /** |
187 | * Shows unread entries for current user. | 178 | * Shows unread entries for current user. |
188 | * | 179 | * |
189 | * @param Request $request | 180 | * @param int $page |
190 | * @param int $page | ||
191 | * | 181 | * |
192 | * @Route("/unread/list/{page}", name="unread", defaults={"page" = "1"}) | 182 | * @Route("/unread/list/{page}", name="unread", defaults={"page" = "1"}) |
193 | * | 183 | * |
@@ -206,8 +196,7 @@ class EntryController extends Controller | |||
206 | /** | 196 | /** |
207 | * Shows read entries for current user. | 197 | * Shows read entries for current user. |
208 | * | 198 | * |
209 | * @param Request $request | 199 | * @param int $page |
210 | * @param int $page | ||
211 | * | 200 | * |
212 | * @Route("/archive/list/{page}", name="archive", defaults={"page" = "1"}) | 201 | * @Route("/archive/list/{page}", name="archive", defaults={"page" = "1"}) |
213 | * | 202 | * |
@@ -221,8 +210,7 @@ class EntryController extends Controller | |||
221 | /** | 210 | /** |
222 | * Shows starred entries for current user. | 211 | * Shows starred entries for current user. |
223 | * | 212 | * |
224 | * @param Request $request | 213 | * @param int $page |
225 | * @param int $page | ||
226 | * | 214 | * |
227 | * @Route("/starred/list/{page}", name="starred", defaults={"page" = "1"}) | 215 | * @Route("/starred/list/{page}", name="starred", defaults={"page" = "1"}) |
228 | * | 216 | * |
@@ -236,8 +224,7 @@ class EntryController extends Controller | |||
236 | /** | 224 | /** |
237 | * Shows untagged articles for current user. | 225 | * Shows untagged articles for current user. |
238 | * | 226 | * |
239 | * @param Request $request | 227 | * @param int $page |
240 | * @param int $page | ||
241 | * | 228 | * |
242 | * @Route("/untagged/list/{page}", name="untagged", defaults={"page" = "1"}) | 229 | * @Route("/untagged/list/{page}", name="untagged", defaults={"page" = "1"}) |
243 | * | 230 | * |
@@ -276,8 +263,6 @@ class EntryController extends Controller | |||
276 | /** | 263 | /** |
277 | * Shows entry content. | 264 | * Shows entry content. |
278 | * | 265 | * |
279 | * @param Entry $entry | ||
280 | * | ||
281 | * @Route("/view/{id}", requirements={"id" = "\d+"}, name="view") | 266 | * @Route("/view/{id}", requirements={"id" = "\d+"}, name="view") |
282 | * | 267 | * |
283 | * @return \Symfony\Component\HttpFoundation\Response | 268 | * @return \Symfony\Component\HttpFoundation\Response |
@@ -296,8 +281,6 @@ class EntryController extends Controller | |||
296 | * Reload an entry. | 281 | * Reload an entry. |
297 | * Refetch content from the website and make it readable again. | 282 | * Refetch content from the website and make it readable again. |
298 | * | 283 | * |
299 | * @param Entry $entry | ||
300 | * | ||
301 | * @Route("/reload/{id}", requirements={"id" = "\d+"}, name="reload_entry") | 284 | * @Route("/reload/{id}", requirements={"id" = "\d+"}, name="reload_entry") |
302 | * | 285 | * |
303 | * @return \Symfony\Component\HttpFoundation\RedirectResponse | 286 | * @return \Symfony\Component\HttpFoundation\RedirectResponse |
@@ -330,9 +313,6 @@ class EntryController extends Controller | |||
330 | /** | 313 | /** |
331 | * Changes read status for an entry. | 314 | * Changes read status for an entry. |
332 | * | 315 | * |
333 | * @param Request $request | ||
334 | * @param Entry $entry | ||
335 | * | ||
336 | * @Route("/archive/{id}", requirements={"id" = "\d+"}, name="archive_entry") | 316 | * @Route("/archive/{id}", requirements={"id" = "\d+"}, name="archive_entry") |
337 | * | 317 | * |
338 | * @return \Symfony\Component\HttpFoundation\RedirectResponse | 318 | * @return \Symfony\Component\HttpFoundation\RedirectResponse |
@@ -362,9 +342,6 @@ class EntryController extends Controller | |||
362 | /** | 342 | /** |
363 | * Changes starred status for an entry. | 343 | * Changes starred status for an entry. |
364 | * | 344 | * |
365 | * @param Request $request | ||
366 | * @param Entry $entry | ||
367 | * | ||
368 | * @Route("/star/{id}", requirements={"id" = "\d+"}, name="star_entry") | 345 | * @Route("/star/{id}", requirements={"id" = "\d+"}, name="star_entry") |
369 | * | 346 | * |
370 | * @return \Symfony\Component\HttpFoundation\RedirectResponse | 347 | * @return \Symfony\Component\HttpFoundation\RedirectResponse |
@@ -395,8 +372,6 @@ class EntryController extends Controller | |||
395 | /** | 372 | /** |
396 | * Deletes entry and redirect to the homepage or the last viewed page. | 373 | * Deletes entry and redirect to the homepage or the last viewed page. |
397 | * | 374 | * |
398 | * @param Entry $entry | ||
399 | * | ||
400 | * @Route("/delete/{id}", requirements={"id" = "\d+"}, name="delete_entry") | 375 | * @Route("/delete/{id}", requirements={"id" = "\d+"}, name="delete_entry") |
401 | * | 376 | * |
402 | * @return \Symfony\Component\HttpFoundation\RedirectResponse | 377 | * @return \Symfony\Component\HttpFoundation\RedirectResponse |
@@ -437,8 +412,6 @@ class EntryController extends Controller | |||
437 | /** | 412 | /** |
438 | * Get public URL for entry (and generate it if necessary). | 413 | * Get public URL for entry (and generate it if necessary). |
439 | * | 414 | * |
440 | * @param Entry $entry | ||
441 | * | ||
442 | * @Route("/share/{id}", requirements={"id" = "\d+"}, name="share") | 415 | * @Route("/share/{id}", requirements={"id" = "\d+"}, name="share") |
443 | * | 416 | * |
444 | * @return \Symfony\Component\HttpFoundation\Response | 417 | * @return \Symfony\Component\HttpFoundation\Response |
@@ -463,8 +436,6 @@ class EntryController extends Controller | |||
463 | /** | 436 | /** |
464 | * Disable public sharing for an entry. | 437 | * Disable public sharing for an entry. |
465 | * | 438 | * |
466 | * @param Entry $entry | ||
467 | * | ||
468 | * @Route("/share/delete/{id}", requirements={"id" = "\d+"}, name="delete_share") | 439 | * @Route("/share/delete/{id}", requirements={"id" = "\d+"}, name="delete_share") |
469 | * | 440 | * |
470 | * @return \Symfony\Component\HttpFoundation\Response | 441 | * @return \Symfony\Component\HttpFoundation\Response |
@@ -487,8 +458,6 @@ class EntryController extends Controller | |||
487 | /** | 458 | /** |
488 | * Ability to view a content publicly. | 459 | * Ability to view a content publicly. |
489 | * | 460 | * |
490 | * @param Entry $entry | ||
491 | * | ||
492 | * @Route("/share/{uid}", requirements={"uid" = ".+"}, name="share_entry") | 461 | * @Route("/share/{uid}", requirements={"uid" = ".+"}, name="share_entry") |
493 | * @Cache(maxage="25200", smaxage="25200", public=true) | 462 | * @Cache(maxage="25200", smaxage="25200", public=true) |
494 | * | 463 | * |
@@ -510,9 +479,8 @@ class EntryController extends Controller | |||
510 | * Global method to retrieve entries depending on the given type | 479 | * Global method to retrieve entries depending on the given type |
511 | * It returns the response to be send. | 480 | * It returns the response to be send. |
512 | * | 481 | * |
513 | * @param string $type Entries type: unread, starred or archive | 482 | * @param string $type Entries type: unread, starred or archive |
514 | * @param Request $request | 483 | * @param int $page |
515 | * @param int $page | ||
516 | * | 484 | * |
517 | * @return \Symfony\Component\HttpFoundation\Response | 485 | * @return \Symfony\Component\HttpFoundation\Response |
518 | */ | 486 | */ |
@@ -582,7 +550,6 @@ class EntryController extends Controller | |||
582 | * Fetch content and update entry. | 550 | * Fetch content and update entry. |
583 | * In case it fails, $entry->getContent will return an error message. | 551 | * In case it fails, $entry->getContent will return an error message. |
584 | * | 552 | * |
585 | * @param Entry $entry | ||
586 | * @param string $prefixMessage Should be the translation key: entry_saved or entry_reloaded | 553 | * @param string $prefixMessage Should be the translation key: entry_saved or entry_reloaded |
587 | */ | 554 | */ |
588 | private function updateEntry(Entry $entry, $prefixMessage = 'entry_saved') | 555 | private function updateEntry(Entry $entry, $prefixMessage = 'entry_saved') |
@@ -613,8 +580,6 @@ class EntryController extends Controller | |||
613 | 580 | ||
614 | /** | 581 | /** |
615 | * Check if the logged user can manage the given entry. | 582 | * Check if the logged user can manage the given entry. |
616 | * | ||
617 | * @param Entry $entry | ||
618 | */ | 583 | */ |
619 | private function checkUserAction(Entry $entry) | 584 | private function checkUserAction(Entry $entry) |
620 | { | 585 | { |
@@ -626,8 +591,6 @@ class EntryController extends Controller | |||
626 | /** | 591 | /** |
627 | * Check for existing entry, if it exists, redirect to it with a message. | 592 | * Check for existing entry, if it exists, redirect to it with a message. |
628 | * | 593 | * |
629 | * @param Entry $entry | ||
630 | * | ||
631 | * @return Entry|bool | 594 | * @return Entry|bool |
632 | */ | 595 | */ |
633 | private function checkIfEntryAlreadyExists(Entry $entry) | 596 | private function checkIfEntryAlreadyExists(Entry $entry) |
diff --git a/src/Wallabag/CoreBundle/Controller/ExportController.php b/src/Wallabag/CoreBundle/Controller/ExportController.php index 9ff35ff5..282fd733 100644 --- a/src/Wallabag/CoreBundle/Controller/ExportController.php +++ b/src/Wallabag/CoreBundle/Controller/ExportController.php | |||
@@ -17,7 +17,6 @@ class ExportController extends Controller | |||
17 | /** | 17 | /** |
18 | * Gets one entry content. | 18 | * Gets one entry content. |
19 | * | 19 | * |
20 | * @param Entry $entry | ||
21 | * @param string $format | 20 | * @param string $format |
22 | * | 21 | * |
23 | * @Route("/export/{id}.{format}", name="export_entry", requirements={ | 22 | * @Route("/export/{id}.{format}", name="export_entry", requirements={ |
diff --git a/src/Wallabag/CoreBundle/Controller/FeedController.php b/src/Wallabag/CoreBundle/Controller/FeedController.php index 9f671735..95c3427b 100644 --- a/src/Wallabag/CoreBundle/Controller/FeedController.php +++ b/src/Wallabag/CoreBundle/Controller/FeedController.php | |||
@@ -23,7 +23,6 @@ class FeedController extends Controller | |||
23 | * | 23 | * |
24 | * @ParamConverter("user", class="WallabagUserBundle:User", converter="username_feed_token_converter") | 24 | * @ParamConverter("user", class="WallabagUserBundle:User", converter="username_feed_token_converter") |
25 | * | 25 | * |
26 | * @param User $user | ||
27 | * @param $page | 26 | * @param $page |
28 | * | 27 | * |
29 | * @return \Symfony\Component\HttpFoundation\Response | 28 | * @return \Symfony\Component\HttpFoundation\Response |
@@ -40,7 +39,6 @@ class FeedController extends Controller | |||
40 | * | 39 | * |
41 | * @ParamConverter("user", class="WallabagUserBundle:User", converter="username_feed_token_converter") | 40 | * @ParamConverter("user", class="WallabagUserBundle:User", converter="username_feed_token_converter") |
42 | * | 41 | * |
43 | * @param User $user | ||
44 | * @param $page | 42 | * @param $page |
45 | * | 43 | * |
46 | * @return \Symfony\Component\HttpFoundation\Response | 44 | * @return \Symfony\Component\HttpFoundation\Response |
@@ -57,7 +55,6 @@ class FeedController extends Controller | |||
57 | * | 55 | * |
58 | * @ParamConverter("user", class="WallabagUserBundle:User", converter="username_feed_token_converter") | 56 | * @ParamConverter("user", class="WallabagUserBundle:User", converter="username_feed_token_converter") |
59 | * | 57 | * |
60 | * @param User $user | ||
61 | * @param $page | 58 | * @param $page |
62 | * | 59 | * |
63 | * @return \Symfony\Component\HttpFoundation\Response | 60 | * @return \Symfony\Component\HttpFoundation\Response |
@@ -147,7 +144,6 @@ class FeedController extends Controller | |||
147 | * It returns the response to be send. | 144 | * It returns the response to be send. |
148 | * | 145 | * |
149 | * @param string $type Entries type: unread, starred or archive | 146 | * @param string $type Entries type: unread, starred or archive |
150 | * @param User $user | ||
151 | * @param int $page | 147 | * @param int $page |
152 | * | 148 | * |
153 | * @return \Symfony\Component\HttpFoundation\Response | 149 | * @return \Symfony\Component\HttpFoundation\Response |
diff --git a/src/Wallabag/CoreBundle/Controller/SiteCredentialController.php b/src/Wallabag/CoreBundle/Controller/SiteCredentialController.php index 51bc1d94..4320c5ff 100644 --- a/src/Wallabag/CoreBundle/Controller/SiteCredentialController.php +++ b/src/Wallabag/CoreBundle/Controller/SiteCredentialController.php | |||
@@ -36,8 +36,6 @@ class SiteCredentialController extends Controller | |||
36 | * | 36 | * |
37 | * @Route("/new", name="site_credentials_new", methods={"GET", "POST"}) | 37 | * @Route("/new", name="site_credentials_new", methods={"GET", "POST"}) |
38 | * | 38 | * |
39 | * @param Request $request | ||
40 | * | ||
41 | * @return \Symfony\Component\HttpFoundation\Response | 39 | * @return \Symfony\Component\HttpFoundation\Response |
42 | */ | 40 | */ |
43 | public function newAction(Request $request) | 41 | public function newAction(Request $request) |
@@ -76,9 +74,6 @@ class SiteCredentialController extends Controller | |||
76 | * | 74 | * |
77 | * @Route("/{id}/edit", name="site_credentials_edit", methods={"GET", "POST"}) | 75 | * @Route("/{id}/edit", name="site_credentials_edit", methods={"GET", "POST"}) |
78 | * | 76 | * |
79 | * @param Request $request | ||
80 | * @param SiteCredential $siteCredential | ||
81 | * | ||
82 | * @return \Symfony\Component\HttpFoundation\Response | 77 | * @return \Symfony\Component\HttpFoundation\Response |
83 | */ | 78 | */ |
84 | public function editAction(Request $request, SiteCredential $siteCredential) | 79 | public function editAction(Request $request, SiteCredential $siteCredential) |
@@ -119,9 +114,6 @@ class SiteCredentialController extends Controller | |||
119 | * | 114 | * |
120 | * @Route("/{id}", name="site_credentials_delete", methods={"DELETE"}) | 115 | * @Route("/{id}", name="site_credentials_delete", methods={"DELETE"}) |
121 | * | 116 | * |
122 | * @param Request $request | ||
123 | * @param SiteCredential $siteCredential | ||
124 | * | ||
125 | * @return \Symfony\Component\HttpFoundation\RedirectResponse | 117 | * @return \Symfony\Component\HttpFoundation\RedirectResponse |
126 | */ | 118 | */ |
127 | public function deleteAction(Request $request, SiteCredential $siteCredential) | 119 | public function deleteAction(Request $request, SiteCredential $siteCredential) |
diff --git a/src/Wallabag/CoreBundle/Controller/TagController.php b/src/Wallabag/CoreBundle/Controller/TagController.php index 90d36d71..a6ad131f 100644 --- a/src/Wallabag/CoreBundle/Controller/TagController.php +++ b/src/Wallabag/CoreBundle/Controller/TagController.php | |||
@@ -16,9 +16,6 @@ use Wallabag\CoreBundle\Form\Type\RenameTagType; | |||
16 | class TagController extends Controller | 16 | class TagController extends Controller |
17 | { | 17 | { |
18 | /** | 18 | /** |
19 | * @param Request $request | ||
20 | * @param Entry $entry | ||
21 | * | ||
22 | * @Route("/new-tag/{entry}", requirements={"entry" = "\d+"}, name="new_tag") | 19 | * @Route("/new-tag/{entry}", requirements={"entry" = "\d+"}, name="new_tag") |
23 | * | 20 | * |
24 | * @return \Symfony\Component\HttpFoundation\Response | 21 | * @return \Symfony\Component\HttpFoundation\Response |
@@ -103,7 +100,6 @@ class TagController extends Controller | |||
103 | } | 100 | } |
104 | 101 | ||
105 | /** | 102 | /** |
106 | * @param Tag $tag | ||
107 | * @param int $page | 103 | * @param int $page |
108 | * | 104 | * |
109 | * @Route("/tag/list/{slug}/{page}", name="tag_entries", defaults={"page" = "1"}) | 105 | * @Route("/tag/list/{slug}/{page}", name="tag_entries", defaults={"page" = "1"}) |
@@ -145,9 +141,6 @@ class TagController extends Controller | |||
145 | * Rename a given tag with a new label | 141 | * Rename a given tag with a new label |
146 | * Create a new tag with the new name and drop the old one. | 142 | * Create a new tag with the new name and drop the old one. |
147 | * | 143 | * |
148 | * @param Tag $tag | ||
149 | * @param Request $request | ||
150 | * | ||
151 | * @Route("/tag/rename/{slug}", name="tag_rename") | 144 | * @Route("/tag/rename/{slug}", name="tag_rename") |
152 | * @ParamConverter("tag", options={"mapping": {"slug": "slug"}}) | 145 | * @ParamConverter("tag", options={"mapping": {"slug": "slug"}}) |
153 | * | 146 | * |