aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag/CoreBundle/Controller/ConfigController.php
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2019-11-12 14:18:58 +0100
committerJeremy Benoist <jeremy.benoist@gmail.com>2019-11-12 14:18:58 +0100
commit8d4ed0df0633f43fc2d65fef72c36070113844d1 (patch)
tree40df943c0326bd69ba88b599889e03ff7f4dbb8d /src/Wallabag/CoreBundle/Controller/ConfigController.php
parent76fe5dfb7189b8f5eebf3f372718cd5e2cf286c4 (diff)
downloadwallabag-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/ConfigController.php')
-rw-r--r--src/Wallabag/CoreBundle/Controller/ConfigController.php21
1 files changed, 1 insertions, 20 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;
26class ConfigController extends Controller 26class 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 {