aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag/UserBundle
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/UserBundle
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/UserBundle')
-rw-r--r--src/Wallabag/UserBundle/Controller/ManageController.php3
-rw-r--r--src/Wallabag/UserBundle/Entity/User.php4
-rw-r--r--src/Wallabag/UserBundle/Form/UserType.php7
-rw-r--r--src/Wallabag/UserBundle/Mailer/AuthCodeMailer.php12
4 files changed, 5 insertions, 21 deletions
diff --git a/src/Wallabag/UserBundle/Controller/ManageController.php b/src/Wallabag/UserBundle/Controller/ManageController.php
index 63a06206..1122f8f0 100644
--- a/src/Wallabag/UserBundle/Controller/ManageController.php
+++ b/src/Wallabag/UserBundle/Controller/ManageController.php
@@ -127,8 +127,7 @@ class ManageController extends Controller
127 } 127 }
128 128
129 /** 129 /**
130 * @param Request $request 130 * @param int $page
131 * @param int $page
132 * 131 *
133 * @Route("/list/{page}", name="user_index", defaults={"page" = 1}) 132 * @Route("/list/{page}", name="user_index", defaults={"page" = 1})
134 * 133 *
diff --git a/src/Wallabag/UserBundle/Entity/User.php b/src/Wallabag/UserBundle/Entity/User.php
index 43fa6a80..aeab761d 100644
--- a/src/Wallabag/UserBundle/Entity/User.php
+++ b/src/Wallabag/UserBundle/Entity/User.php
@@ -188,8 +188,6 @@ class User extends BaseUser implements EmailTwoFactorInterface, GoogleTwoFactorI
188 } 188 }
189 189
190 /** 190 /**
191 * @param Entry $entry
192 *
193 * @return User 191 * @return User
194 */ 192 */
195 public function addEntry(Entry $entry) 193 public function addEntry(Entry $entry)
@@ -355,8 +353,6 @@ class User extends BaseUser implements EmailTwoFactorInterface, GoogleTwoFactorI
355 } 353 }
356 354
357 /** 355 /**
358 * @param Client $client
359 *
360 * @return User 356 * @return User
361 */ 357 */
362 public function addClient(Client $client) 358 public function addClient(Client $client)
diff --git a/src/Wallabag/UserBundle/Form/UserType.php b/src/Wallabag/UserBundle/Form/UserType.php
index 026db9a2..03fad971 100644
--- a/src/Wallabag/UserBundle/Form/UserType.php
+++ b/src/Wallabag/UserBundle/Form/UserType.php
@@ -12,10 +12,6 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
12 12
13class UserType extends AbstractType 13class UserType extends AbstractType
14{ 14{
15 /**
16 * @param FormBuilderInterface $builder
17 * @param array $options
18 */
19 public function buildForm(FormBuilderInterface $builder, array $options) 15 public function buildForm(FormBuilderInterface $builder, array $options)
20 { 16 {
21 $builder 17 $builder
@@ -50,9 +46,6 @@ class UserType extends AbstractType
50 ; 46 ;
51 } 47 }
52 48
53 /**
54 * @param OptionsResolver $resolver
55 */
56 public function configureOptions(OptionsResolver $resolver) 49 public function configureOptions(OptionsResolver $resolver)
57 { 50 {
58 $resolver->setDefaults([ 51 $resolver->setDefaults([
diff --git a/src/Wallabag/UserBundle/Mailer/AuthCodeMailer.php b/src/Wallabag/UserBundle/Mailer/AuthCodeMailer.php
index b25ba685..4eea444f 100644
--- a/src/Wallabag/UserBundle/Mailer/AuthCodeMailer.php
+++ b/src/Wallabag/UserBundle/Mailer/AuthCodeMailer.php
@@ -57,12 +57,10 @@ class AuthCodeMailer implements AuthCodeMailerInterface
57 /** 57 /**
58 * Initialize the auth code mailer with the SwiftMailer object. 58 * Initialize the auth code mailer with the SwiftMailer object.
59 * 59 *
60 * @param \Swift_Mailer $mailer 60 * @param string $senderEmail
61 * @param Environment $twig 61 * @param string $senderName
62 * @param string $senderEmail 62 * @param string $supportUrl wallabag support url
63 * @param string $senderName 63 * @param string $wallabagUrl wallabag instance url
64 * @param string $supportUrl wallabag support url
65 * @param string $wallabagUrl wallabag instance url
66 */ 64 */
67 public function __construct(\Swift_Mailer $mailer, Environment $twig, $senderEmail, $senderName, $supportUrl, $wallabagUrl) 65 public function __construct(\Swift_Mailer $mailer, Environment $twig, $senderEmail, $senderName, $supportUrl, $wallabagUrl)
68 { 66 {
@@ -76,8 +74,6 @@ class AuthCodeMailer implements AuthCodeMailerInterface
76 74
77 /** 75 /**
78 * Send the auth code to the user via email. 76 * Send the auth code to the user via email.
79 *
80 * @param TwoFactorInterface $user
81 */ 77 */
82 public function sendAuthCode(TwoFactorInterface $user): void 78 public function sendAuthCode(TwoFactorInterface $user): void
83 { 79 {