1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-08-26 18:21:02 +00:00

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)
This commit is contained in:
Jeremy Benoist 2019-11-12 14:18:58 +01:00
parent 76fe5dfb71
commit 8d4ed0df06
No known key found for this signature in database
GPG key ID: 84290C294324D304
84 changed files with 250 additions and 698 deletions

View file

@ -26,8 +26,6 @@ use Wallabag\CoreBundle\Tools\Utils;
class ConfigController extends Controller
{
/**
* @param Request $request
*
* @Route("/config", name="config")
*/
public function indexAction(Request $request)
@ -279,8 +277,6 @@ class ConfigController extends Controller
/**
* Validate OTP code.
*
* @param Request $request
*
* @Route("/config/otp/app/check", name="config_otp_app_check")
*/
public function otpAppCheckAction(Request $request)
@ -308,8 +304,6 @@ class ConfigController extends Controller
}
/**
* @param Request $request
*
* @Route("/generate-token", name="generate_token")
*
* @return RedirectResponse|JsonResponse
@ -336,8 +330,6 @@ class ConfigController extends Controller
}
/**
* @param Request $request
*
* @Route("/revoke-token", name="revoke_token")
*
* @return RedirectResponse|JsonResponse
@ -366,8 +358,6 @@ class ConfigController extends Controller
/**
* Deletes a tagging rule and redirect to the config homepage.
*
* @param TaggingRule $rule
*
* @Route("/tagging-rule/delete/{id}", requirements={"id" = "\d+"}, name="delete_tagging_rule")
*
* @return RedirectResponse
@ -391,8 +381,6 @@ class ConfigController extends Controller
/**
* Edit a tagging rule.
*
* @param TaggingRule $rule
*
* @Route("/tagging-rule/edit/{id}", requirements={"id" = "\d+"}, name="edit_tagging_rule")
*
* @return RedirectResponse
@ -459,8 +447,6 @@ class ConfigController extends Controller
*
* @Route("/account/delete", name="delete_account")
*
* @param Request $request
*
* @throws AccessDeniedHttpException
*
* @return \Symfony\Component\HttpFoundation\RedirectResponse
@ -491,8 +477,6 @@ class ConfigController extends Controller
*
* @Route("/config/view-mode", name="switch_view_mode")
*
* @param Request $request
*
* @return \Symfony\Component\HttpFoundation\RedirectResponse
*/
public function changeViewModeAction(Request $request)
@ -510,8 +494,7 @@ class ConfigController extends Controller
/**
* Change the locale for the current user.
*
* @param Request $request
* @param string $language
* @param string $language
*
* @Route("/locale/{language}", name="changeLocale")
*
@ -620,8 +603,6 @@ class ConfigController extends Controller
/**
* Validate that a rule can be edited/deleted by the current user.
*
* @param TaggingRule $rule
*/
private function validateRuleAction(TaggingRule $rule)
{