43 files changed, 20 insertions, 252 deletions
diff --git a/src/Wallabag/AnnotationBundle/Controller/WallabagAnnotationController.php b/src/Wallabag/AnnotationBundle/Controller/WallabagAnnotationController.php
index 3a7421c7..883ce4a8 100644
--- a/src/Wallabag/AnnotationBundle/Controller/WallabagAnnotationController.php
+++ b/src/Wallabag/AnnotationBundle/Controller/WallabagAnnotationController.php
@@ -16,8 +16,6 @@ class WallabagAnnotationController extends FOSRestController
    /**
     * Retrieve annotations for an entry.
     *
-     * @param Entry $entry
-     *
     * @see Wallabag\ApiBundle\Controller\WallabagRestController
     *
     * @return JsonResponse
@@ -39,9 +37,6 @@ class WallabagAnnotationController extends FOSRestController
    /**
     * Creates a new annotation.
     *
-     * @param Request $request
-     * @param Entry   $entry
-     *
     * @return JsonResponse
     *
     * @see Wallabag\ApiBundle\Controller\WallabagRestController
@@ -79,9 +74,6 @@ class WallabagAnnotationController extends FOSRestController
     *
     * @ParamConverter("annotation", class="WallabagAnnotationBundle:Annotation")
     *
-     * @param Annotation $annotation
-     * @param Request    $request
-     *
     * @return JsonResponse
     */
    public function putAnnotationAction(Annotation $annotation, Request $request)
@@ -114,8 +106,6 @@ class WallabagAnnotationController extends FOSRestController
     *
     * @ParamConverter("annotation", class="WallabagAnnotationBundle:Annotation")
     *
-     * @param Annotation $annotation
-     *
     * @return JsonResponse
     */
    public function deleteAnnotationAction(Annotation $annotation)
diff --git a/src/Wallabag/ApiBundle/Controller/AnnotationRestController.php b/src/Wallabag/ApiBundle/Controller/AnnotationRestController.php
index 28d55ba9..f59431e4 100644
--- a/src/Wallabag/ApiBundle/Controller/AnnotationRestController.php
+++ b/src/Wallabag/ApiBundle/Controller/AnnotationRestController.php
@@ -20,8 +20,6 @@ class AnnotationRestController extends WallabagRestController
     *      }
     * )
     *
-     * @param Entry $entry
-     *
     * @return JsonResponse
     */
    public function getAnnotationsAction(Entry $entry)
@@ -44,9 +42,6 @@ class AnnotationRestController extends WallabagRestController
     *      }
     * )
     *
-     * @param Request $request
-     * @param Entry   $entry
-     *
     * @return JsonResponse
     */
    public function postAnnotationAction(Request $request, Entry $entry)
@@ -70,9 +65,6 @@ class AnnotationRestController extends WallabagRestController
     *
     * @ParamConverter("annotation", class="WallabagAnnotationBundle:Annotation")
     *
-     * @param Annotation $annotation
-     * @param Request    $request
-     *
     * @return JsonResponse
     */
    public function putAnnotationAction(Annotation $annotation, Request $request)
@@ -96,8 +88,6 @@ class AnnotationRestController extends WallabagRestController
     *
     * @ParamConverter("annotation", class="WallabagAnnotationBundle:Annotation")
     *
-     * @param Annotation $annotation
-     *
     * @return JsonResponse
     */
    public function deleteAnnotationAction(Annotation $annotation)
diff --git a/src/Wallabag/ApiBundle/Controller/DeveloperController.php b/src/Wallabag/ApiBundle/Controller/DeveloperController.php
index ae7e83da..3224d789 100644
--- a/src/Wallabag/ApiBundle/Controller/DeveloperController.php
+++ b/src/Wallabag/ApiBundle/Controller/DeveloperController.php
@@ -29,8 +29,6 @@ class DeveloperController extends Controller
    /**
     * Create a client (an app).
     *
-     * @param Request $request
-     *
     * @Route("/developer/client/create", name="developer_create_client")
     *
     * @return \Symfony\Component\HttpFoundation\Response
@@ -67,8 +65,6 @@ class DeveloperController extends Controller
    /**
     * Remove a client.
     *
-     * @param Client $client
-     *
     * @Route("/developer/client/delete/{id}", requirements={"id" = "\d+"}, name="developer_delete_client")
     *
     * @return \Symfony\Component\HttpFoundation\RedirectResponse
diff --git a/src/Wallabag/ApiBundle/Controller/EntryRestController.php b/src/Wallabag/ApiBundle/Controller/EntryRestController.php
index 9f933adb..c09fdaeb 100644
--- a/src/Wallabag/ApiBundle/Controller/EntryRestController.php
+++ b/src/Wallabag/ApiBundle/Controller/EntryRestController.php
@@ -822,8 +822,6 @@ class EntryRestController extends WallabagRestController
     * Retrieve value from the request.
     * Used for POST & PATCH on a an entry.
     *
-     * @param Request $request
-     *
     * @return array
     */
    private function retrieveValueFromRequest(Request $request)
diff --git a/src/Wallabag/ApiBundle/Controller/UserRestController.php b/src/Wallabag/ApiBundle/Controller/UserRestController.php
index 1b10a076..922ab7bb 100644
--- a/src/Wallabag/ApiBundle/Controller/UserRestController.php
+++ b/src/Wallabag/ApiBundle/Controller/UserRestController.php
@@ -119,7 +119,6 @@ class UserRestController extends WallabagRestController
    /**
     * Send user response.
     *
-     * @param User   $user
     * @param string $group  Used to define with serialized group might be used
     * @param int    $status HTTP Status code to send
     *
diff --git a/src/Wallabag/CoreBundle/Command/CleanDuplicatesCommand.php b/src/Wallabag/CoreBundle/Command/CleanDuplicatesCommand.php
index 99170967..64b91520 100644
--- a/src/Wallabag/CoreBundle/Command/CleanDuplicatesCommand.php
+++ b/src/Wallabag/CoreBundle/Command/CleanDuplicatesCommand.php
@@ -63,9 +63,6 @@ class CleanDuplicatesCommand extends ContainerAwareCommand
        return 0;
    }
-    /**
-     * @param User $user
-     */
    private function cleanDuplicates(User $user)
    {
        $em = $this->getContainer()->get('doctrine.orm.entity_manager');
diff --git a/src/Wallabag/CoreBundle/Command/GenerateUrlHashesCommand.php b/src/Wallabag/CoreBundle/Command/GenerateUrlHashesCommand.php
index 8f2bff11..a0e9221e 100644
--- a/src/Wallabag/CoreBundle/Command/GenerateUrlHashesCommand.php
+++ b/src/Wallabag/CoreBundle/Command/GenerateUrlHashesCommand.php
@@ -54,9 +54,6 @@ class GenerateUrlHashesCommand extends ContainerAwareCommand
        return 0;
    }
-    /**
-     * @param User $user
-     */
    private function generateHashedUrls(User $user)
    {
        $em = $this->getContainer()->get('doctrine.orm.entity_manager');
diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php
index f73e0696..3aa332f1 100644
--- a/src/Wallabag/CoreBundle/Command/InstallCommand.php
+++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php
@@ -326,9 +326,7 @@ class InstallCommand extends ContainerAwareCommand
        if (0 !== $exitCode) {
            $this->getApplication()->setAutoExit(true);
-            throw new \RuntimeException(
+            throw new \RuntimeException('The command "' . $command . "\" generates some errors: \n\n" . $output->fetch());
-                'The command "' . $command . "\" generates some errors: \n\n"
-                . $output->fetch());
        }
        return $this;
diff --git a/src/Wallabag/CoreBundle/Command/ShowUserCommand.php b/src/Wallabag/CoreBundle/Command/ShowUserCommand.php
index c95efbf3..87bccf71 100644
--- a/src/Wallabag/CoreBundle/Command/ShowUserCommand.php
+++ b/src/Wallabag/CoreBundle/Command/ShowUserCommand.php
@@ -46,9 +46,6 @@ class ShowUserCommand extends ContainerAwareCommand
        return 0;
    }
-    /**
-     * @param User $user
-     */
    private function showUser(User $user)
    {
        $this->io->listing([
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;
 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)
    {
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;
 class EntryController extends Controller
 {
    /**
-     * @param Request $request
+     * @param int $page
-     * @param int     $page
     *
     * @Route("/search/{page}", name="search", defaults={"page" = 1})
     *
@@ -53,8 +52,6 @@ class EntryController extends Controller
    }
    /**
-     * @param Request $request
-     *
     * @Route("/new-entry", name="new_entry")
     *
     * @return \Symfony\Component\HttpFoundation\Response
@@ -97,8 +94,6 @@ class EntryController extends Controller
    }
    /**
-     * @param Request $request
-     *
     * @Route("/bookmarklet", name="bookmarklet")
     *
     * @return \Symfony\Component\HttpFoundation\Response
@@ -135,9 +130,6 @@ class EntryController extends Controller
    /**
     * Edit an entry content.
     *
-     * @param Request $request
-     * @param Entry   $entry
-     *
     * @Route("/edit/{id}", requirements={"id" = "\d+"}, name="edit")
     *
     * @return \Symfony\Component\HttpFoundation\Response
@@ -171,8 +163,7 @@ class EntryController extends Controller
    /**
     * Shows all entries for current user.
     *
-     * @param Request $request
+     * @param int $page
-     * @param int     $page
     *
     * @Route("/all/list/{page}", name="all", defaults={"page" = "1"})
     *
@@ -186,8 +177,7 @@ class EntryController extends Controller
    /**
     * Shows unread entries for current user.
     *
-     * @param Request $request
+     * @param int $page
-     * @param int     $page
     *
     * @Route("/unread/list/{page}", name="unread", defaults={"page" = "1"})
     *
@@ -206,8 +196,7 @@ class EntryController extends Controller
    /**
     * Shows read entries for current user.
     *
-     * @param Request $request
+     * @param int $page
-     * @param int     $page
     *
     * @Route("/archive/list/{page}", name="archive", defaults={"page" = "1"})
     *
@@ -221,8 +210,7 @@ class EntryController extends Controller
    /**
     * Shows starred entries for current user.
     *
-     * @param Request $request
+     * @param int $page
-     * @param int     $page
     *
     * @Route("/starred/list/{page}", name="starred", defaults={"page" = "1"})
     *
@@ -236,8 +224,7 @@ class EntryController extends Controller
    /**
     * Shows untagged articles for current user.
     *
-     * @param Request $request
+     * @param int $page
-     * @param int     $page
     *
     * @Route("/untagged/list/{page}", name="untagged", defaults={"page" = "1"})
     *
@@ -276,8 +263,6 @@ class EntryController extends Controller
    /**
     * Shows entry content.
     *
-     * @param Entry $entry
-     *
     * @Route("/view/{id}", requirements={"id" = "\d+"}, name="view")
     *
     * @return \Symfony\Component\HttpFoundation\Response
@@ -296,8 +281,6 @@ class EntryController extends Controller
     * Reload an entry.
     * Refetch content from the website and make it readable again.
     *
-     * @param Entry $entry
-     *
     * @Route("/reload/{id}", requirements={"id" = "\d+"}, name="reload_entry")
     *
     * @return \Symfony\Component\HttpFoundation\RedirectResponse
@@ -330,9 +313,6 @@ class EntryController extends Controller
    /**
     * Changes read status for an entry.
     *
-     * @param Request $request
-     * @param Entry   $entry
-     *
     * @Route("/archive/{id}", requirements={"id" = "\d+"}, name="archive_entry")
     *
     * @return \Symfony\Component\HttpFoundation\RedirectResponse
@@ -362,9 +342,6 @@ class EntryController extends Controller
    /**
     * Changes starred status for an entry.
     *
-     * @param Request $request
-     * @param Entry   $entry
-     *
     * @Route("/star/{id}", requirements={"id" = "\d+"}, name="star_entry")
     *
     * @return \Symfony\Component\HttpFoundation\RedirectResponse
@@ -395,8 +372,6 @@ class EntryController extends Controller
    /**
     * Deletes entry and redirect to the homepage or the last viewed page.
     *
-     * @param Entry $entry
-     *
     * @Route("/delete/{id}", requirements={"id" = "\d+"}, name="delete_entry")
     *
     * @return \Symfony\Component\HttpFoundation\RedirectResponse
@@ -437,8 +412,6 @@ class EntryController extends Controller
    /**
     * Get public URL for entry (and generate it if necessary).
     *
-     * @param Entry $entry
-     *
     * @Route("/share/{id}", requirements={"id" = "\d+"}, name="share")
     *
     * @return \Symfony\Component\HttpFoundation\Response
@@ -463,8 +436,6 @@ class EntryController extends Controller
    /**
     * Disable public sharing for an entry.
     *
-     * @param Entry $entry
-     *
     * @Route("/share/delete/{id}", requirements={"id" = "\d+"}, name="delete_share")
     *
     * @return \Symfony\Component\HttpFoundation\Response
@@ -487,8 +458,6 @@ class EntryController extends Controller
    /**
     * Ability to view a content publicly.
     *
-     * @param Entry $entry
-     *
     * @Route("/share/{uid}", requirements={"uid" = ".+"}, name="share_entry")
     * @Cache(maxage="25200", smaxage="25200", public=true)
     *
@@ -510,9 +479,8 @@ class EntryController extends Controller
     * Global method to retrieve entries depending on the given type
     * It returns the response to be send.
     *
-     * @param string  $type    Entries type: unread, starred or archive
+     * @param string $type Entries type: unread, starred or archive
-     * @param Request $request
+     * @param int    $page
-     * @param int     $page
     *
     * @return \Symfony\Component\HttpFoundation\Response
     */
@@ -582,7 +550,6 @@ class EntryController extends Controller
     * Fetch content and update entry.
     * In case it fails, $entry->getContent will return an error message.
     *
-     * @param Entry  $entry
     * @param string $prefixMessage Should be the translation key: entry_saved or entry_reloaded
     */
    private function updateEntry(Entry $entry, $prefixMessage = 'entry_saved')
@@ -613,8 +580,6 @@ class EntryController extends Controller
    /**
     * Check if the logged user can manage the given entry.
-     *
-     * @param Entry $entry
     */
    private function checkUserAction(Entry $entry)
    {
@@ -626,8 +591,6 @@ class EntryController extends Controller
    /**
     * Check for existing entry, if it exists, redirect to it with a message.
     *
-     * @param Entry $entry
-     *
     * @return Entry|bool
     */
    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
    /**
     * Gets one entry content.
     *
-     * @param Entry  $entry
     * @param string $format
     *
     * @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
     *
     * @ParamConverter("user", class="WallabagUserBundle:User", converter="username_feed_token_converter")
     *
-     * @param User $user
     * @param $page
     *
     * @return \Symfony\Component\HttpFoundation\Response
@@ -40,7 +39,6 @@ class FeedController extends Controller
     *
     * @ParamConverter("user", class="WallabagUserBundle:User", converter="username_feed_token_converter")
     *
-     * @param User $user
     * @param $page
     *
     * @return \Symfony\Component\HttpFoundation\Response
@@ -57,7 +55,6 @@ class FeedController extends Controller
     *
     * @ParamConverter("user", class="WallabagUserBundle:User", converter="username_feed_token_converter")
     *
-     * @param User $user
     * @param $page
     *
     * @return \Symfony\Component\HttpFoundation\Response
@@ -147,7 +144,6 @@ class FeedController extends Controller
     * It returns the response to be send.
     *
     * @param string $type Entries type: unread, starred or archive
-     * @param User   $user
     * @param int    $page
     *
     * @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
     *
     * @Route("/new", name="site_credentials_new", methods={"GET", "POST"})
     *
-     * @param Request $request
-     *
     * @return \Symfony\Component\HttpFoundation\Response
     */
    public function newAction(Request $request)
@@ -76,9 +74,6 @@ class SiteCredentialController extends Controller
     *
     * @Route("/{id}/edit", name="site_credentials_edit", methods={"GET", "POST"})
     *
-     * @param Request        $request
-     * @param SiteCredential $siteCredential
-     *
     * @return \Symfony\Component\HttpFoundation\Response
     */
    public function editAction(Request $request, SiteCredential $siteCredential)
@@ -119,9 +114,6 @@ class SiteCredentialController extends Controller
     *
     * @Route("/{id}", name="site_credentials_delete", methods={"DELETE"})
     *
-     * @param Request        $request
-     * @param SiteCredential $siteCredential
-     *
     * @return \Symfony\Component\HttpFoundation\RedirectResponse
     */
    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;
 class TagController extends Controller
 {
    /**
-     * @param Request $request
-     * @param Entry   $entry
-     *
     * @Route("/new-tag/{entry}", requirements={"entry" = "\d+"}, name="new_tag")
     *
     * @return \Symfony\Component\HttpFoundation\Response
@@ -103,7 +100,6 @@ class TagController extends Controller
    }
    /**
-     * @param Tag $tag
     * @param int $page
     *
     * @Route("/tag/list/{slug}/{page}", name="tag_entries", defaults={"page" = "1"})
@@ -145,9 +141,6 @@ class TagController extends Controller
     * Rename a given tag with a new label
     * Create a new tag with the new name and drop the old one.
     *
-     * @param Tag     $tag
-     * @param Request $request
-     *
     * @Route("/tag/rename/{slug}", name="tag_rename")
     * @ParamConverter("tag", options={"mapping": {"slug": "slug"}})
     *
diff --git a/src/Wallabag/CoreBundle/Entity/Config.php b/src/Wallabag/CoreBundle/Entity/Config.php
index 35be9655..fe7942ee 100644
--- a/src/Wallabag/CoreBundle/Entity/Config.php
+++ b/src/Wallabag/CoreBundle/Entity/Config.php
@@ -371,8 +371,6 @@ class Config
    }
    /**
-     * @param TaggingRule $rule
-     *
     * @return Config
     */
    public function addTaggingRule(TaggingRule $rule)
diff --git a/src/Wallabag/CoreBundle/Entity/Entry.php b/src/Wallabag/CoreBundle/Entity/Entry.php
index 4acec261..beda581a 100644
--- a/src/Wallabag/CoreBundle/Entity/Entry.php
+++ b/src/Wallabag/CoreBundle/Entity/Entry.php
@@ -550,8 +550,6 @@ class Entry
     * Set created_at.
     * Only used when importing data from an other service.
     *
-     * @param \DateTime $createdAt
-     *
     * @return Entry
     */
    public function setCreatedAt(\DateTime $createdAt)
@@ -623,9 +621,6 @@ class Entry
        return $this->annotations;
    }
-    /**
-     * @param Annotation $annotation
-     */
    public function setAnnotation(Annotation $annotation)
    {
        $this->annotations[] = $annotation;
@@ -702,9 +697,6 @@ class Entry
        return $data;
    }
-    /**
-     * @param Tag $tag
-     */
    public function addTag(Tag $tag)
    {
        if ($this->tags->contains($tag)) {
@@ -725,8 +717,6 @@ class Entry
    /**
     * Remove the given tag from the entry (if the tag is associated).
-     *
-     * @param Tag $tag
     */
    public function removeTag(Tag $tag)
    {
@@ -874,8 +864,6 @@ class Entry
    }
    /**
-     * @param \Datetime $publishedAt
-     *
     * @return Entry
     */
    public function setPublishedAt(\Datetime $publishedAt)
diff --git a/src/Wallabag/CoreBundle/Entity/Tag.php b/src/Wallabag/CoreBundle/Entity/Tag.php
index 3ccb20a5..9fb2f94f 100644
--- a/src/Wallabag/CoreBundle/Entity/Tag.php
+++ b/src/Wallabag/CoreBundle/Entity/Tag.php
@@ -104,9 +104,6 @@ class Tag
        return $this->slug;
    }
-    /**
-     * @param Entry $entry
-     */
    public function addEntry(Entry $entry)
    {
        if ($this->entries->contains($entry)) {
@@ -117,9 +114,6 @@ class Tag
        $entry->addTag($this);
    }
-    /**
-     * @param Entry $entry
-     */
    public function removeEntry(Entry $entry)
    {
        if (!$this->entries->contains($entry)) {
diff --git a/src/Wallabag/CoreBundle/Entity/TaggingRule.php b/src/Wallabag/CoreBundle/Entity/TaggingRule.php
index eac53fa3..f7166087 100644
--- a/src/Wallabag/CoreBundle/Entity/TaggingRule.php
+++ b/src/Wallabag/CoreBundle/Entity/TaggingRule.php
@@ -121,8 +121,6 @@ class TaggingRule
    /**
     * Set config.
     *
-     * @param Config $config
-     *
     * @return TaggingRule
     */
    public function setConfig(Config $config)
diff --git a/src/Wallabag/CoreBundle/Event/Listener/UserLocaleListener.php b/src/Wallabag/CoreBundle/Event/Listener/UserLocaleListener.php
index dc1db5c7..1b5d61ad 100644
--- a/src/Wallabag/CoreBundle/Event/Listener/UserLocaleListener.php
+++ b/src/Wallabag/CoreBundle/Event/Listener/UserLocaleListener.php
@@ -25,9 +25,6 @@ class UserLocaleListener
        $this->session = $session;
    }
-    /**
-     * @param InteractiveLoginEvent $event
-     */
    public function onInteractiveLogin(InteractiveLoginEvent $event)
    {
        $user = $event->getAuthenticationToken()->getUser();
diff --git a/src/Wallabag/CoreBundle/Event/Subscriber/CustomDoctrineORMSubscriber.php b/src/Wallabag/CoreBundle/Event/Subscriber/CustomDoctrineORMSubscriber.php
index cabb3eca..b8f6e1d6 100644
--- a/src/Wallabag/CoreBundle/Event/Subscriber/CustomDoctrineORMSubscriber.php
+++ b/src/Wallabag/CoreBundle/Event/Subscriber/CustomDoctrineORMSubscriber.php
@@ -12,9 +12,6 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 */
 class CustomDoctrineORMSubscriber extends DoctrineORMSubscriber implements EventSubscriberInterface
 {
-    /**
-     * @param GetFilterConditionEvent $event
-     */
    public function filterDateRange(GetFilterConditionEvent $event)
    {
        $expr = $event->getFilterQuery()->getExpressionBuilder();
diff --git a/src/Wallabag/CoreBundle/Event/Subscriber/DownloadImagesSubscriber.php b/src/Wallabag/CoreBundle/Event/Subscriber/DownloadImagesSubscriber.php
index 1dd0a1a4..ef8d7d3b 100644
--- a/src/Wallabag/CoreBundle/Event/Subscriber/DownloadImagesSubscriber.php
+++ b/src/Wallabag/CoreBundle/Event/Subscriber/DownloadImagesSubscriber.php
@@ -35,8 +35,6 @@ class DownloadImagesSubscriber implements EventSubscriberInterface
    /**
     * Download images and updated the data into the entry.
-     *
-     * @param EntrySavedEvent $event
     */
    public function onEntrySaved(EntrySavedEvent $event)
    {
@@ -69,8 +67,6 @@ class DownloadImagesSubscriber implements EventSubscriberInterface
    /**
     * Remove images related to the entry.
-     *
-     * @param EntryDeletedEvent $event
     */
    public function onEntryDeleted(EntryDeletedEvent $event)
    {
@@ -88,8 +84,6 @@ class DownloadImagesSubscriber implements EventSubscriberInterface
     *
     * @todo If we want to add async download, it should be done in that method
     *
-     * @param Entry $entry
-     *
     * @return string|false False in case of async
     */
    private function downloadImages(Entry $entry)
@@ -106,8 +100,6 @@ class DownloadImagesSubscriber implements EventSubscriberInterface
     *
     * @todo If we want to add async download, it should be done in that method
     *
-     * @param Entry $entry
-     *
     * @return string|false False in case of async
     */
    private function downloadPreviewImage(Entry $entry)
diff --git a/src/Wallabag/CoreBundle/Event/Subscriber/SQLiteCascadeDeleteSubscriber.php b/src/Wallabag/CoreBundle/Event/Subscriber/SQLiteCascadeDeleteSubscriber.php
index 9c1d8a1d..dcadeedf 100644
--- a/src/Wallabag/CoreBundle/Event/Subscriber/SQLiteCascadeDeleteSubscriber.php
+++ b/src/Wallabag/CoreBundle/Event/Subscriber/SQLiteCascadeDeleteSubscriber.php
@@ -18,9 +18,6 @@ class SQLiteCascadeDeleteSubscriber implements EventSubscriber
 {
    private $doctrine;
-    /**
-     * @param \Doctrine\Bundle\DoctrineBundle\Registry $doctrine
-     */
    public function __construct(Registry $doctrine)
    {
        $this->doctrine = $doctrine;
@@ -39,8 +36,6 @@ class SQLiteCascadeDeleteSubscriber implements EventSubscriber
    /**
     * We removed everything related to the upcoming removed entry because SQLite can't handle it on it own.
     * We do it in the preRemove, because we can't retrieve tags in the postRemove (because the entry id is gone).
-     *
-     * @param LifecycleEventArgs $args
     */
    public function preRemove(LifecycleEventArgs $args)
    {
diff --git a/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php b/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php
index 8a575b68..17070c59 100644
--- a/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php
@@ -23,9 +23,6 @@ class EntryFilterType extends AbstractType
    /**
     * Repository & user are used to get a list of language entries for this user.
-     *
-     * @param EntityRepository      $entryRepository
-     * @param TokenStorageInterface $tokenStorage
     */
    public function __construct(EntityRepository $entryRepository, TokenStorageInterface $tokenStorage)
    {
diff --git a/src/Wallabag/CoreBundle/GuzzleSiteAuthenticator/GrabySiteConfigBuilder.php b/src/Wallabag/CoreBundle/GuzzleSiteAuthenticator/GrabySiteConfigBuilder.php
index c7502bac..b0be2176 100644
--- a/src/Wallabag/CoreBundle/GuzzleSiteAuthenticator/GrabySiteConfigBuilder.php
+++ b/src/Wallabag/CoreBundle/GuzzleSiteAuthenticator/GrabySiteConfigBuilder.php
@@ -34,11 +34,6 @@ class GrabySiteConfigBuilder implements SiteConfigBuilder
    /**
     * GrabySiteConfigBuilder constructor.
-     *
-     * @param ConfigBuilder            $grabyConfigBuilder
-     * @param TokenStorage             $token
-     * @param SiteCredentialRepository $credentialRepository
-     * @param LoggerInterface          $logger
     */
    public function __construct(ConfigBuilder $grabyConfigBuilder, TokenStorage $token, SiteCredentialRepository $credentialRepository, LoggerInterface $logger)
    {
diff --git a/src/Wallabag/CoreBundle/Helper/ContentProxy.php b/src/Wallabag/CoreBundle/Helper/ContentProxy.php
index 5901df8b..9c6fa8db 100644
--- a/src/Wallabag/CoreBundle/Helper/ContentProxy.php
+++ b/src/Wallabag/CoreBundle/Helper/ContentProxy.php
@@ -86,7 +86,6 @@ class ContentProxy
    /**
     * Use a Symfony validator to ensure the language is well formatted.
     *
-     * @param Entry  $entry
     * @param string $value Language to validate and save
     */
    public function updateLanguage(Entry $entry, $value)
@@ -112,7 +111,6 @@ class ContentProxy
    /**
     * Use a Symfony validator to ensure the preview picture is a real url.
     *
-     * @param Entry  $entry
     * @param string $value URL to validate and save
     */
    public function updatePreviewPicture(Entry $entry, $value)
@@ -134,7 +132,6 @@ class ContentProxy
    /**
     * Update date.
     *
-     * @param Entry  $entry
     * @param string $value Date to validate and save
     */
    public function updatePublishedAt(Entry $entry, $value)
@@ -161,8 +158,6 @@ class ContentProxy
    /**
     * Helper to extract and save host from entry url.
-     *
-     * @param Entry $entry
     */
    public function setEntryDomainName(Entry $entry)
    {
@@ -176,8 +171,6 @@ class ContentProxy
     * Helper to set a default title using:
     * - url basename, if applicable
     * - hostname.
-     *
-     * @param Entry $entry
     */
    public function setDefaultEntryTitle(Entry $entry)
    {
@@ -333,7 +326,6 @@ class ContentProxy
     * Update the origin_url field when a redirection occurs
     * This field is set if it is empty and new url does not match ignore list.
     *
-     * @param Entry  $entry
     * @param string $url
     */
    private function updateOriginUrl(Entry $entry, $url)
@@ -441,8 +433,6 @@ class ContentProxy
    /**
     * Validate that the given content has at least a title, an html and a url.
     *
-     * @param array $content
-     *
     * @return bool true if valid otherwise false
     */
    private function validateContent(array $content)
diff --git a/src/Wallabag/CoreBundle/Helper/DownloadImages.php b/src/Wallabag/CoreBundle/Helper/DownloadImages.php
index 1d361d6d..1d98fd1a 100644
--- a/src/Wallabag/CoreBundle/Helper/DownloadImages.php
+++ b/src/Wallabag/CoreBundle/Helper/DownloadImages.php
@@ -213,8 +213,6 @@ class DownloadImages
    /**
     * Get images urls from the srcset image attribute.
     *
-     * @param Crawler $imagesCrawler
-     *
     * @return array An array of urls
     */
    private static function getSrcsetUrls(Crawler $imagesCrawler)
diff --git a/src/Wallabag/CoreBundle/Helper/HttpClientFactory.php b/src/Wallabag/CoreBundle/Helper/HttpClientFactory.php
index b8e95381..ea864acb 100644
--- a/src/Wallabag/CoreBundle/Helper/HttpClientFactory.php
+++ b/src/Wallabag/CoreBundle/Helper/HttpClientFactory.php
@@ -27,9 +27,7 @@ class HttpClientFactory implements ClientFactory
    /**
     * HttpClientFactory constructor.
     *
-     * @param \GuzzleHttp\Cookie\CookieJar $cookieJar
+     * @param string $restrictedAccess This param is a kind of boolean. Values: 0 or 1
-     * @param string                       $restrictedAccess This param is a kind of boolean. Values: 0 or 1
-     * @param LoggerInterface              $logger
     */
    public function __construct(CookieJar $cookieJar, $restrictedAccess, LoggerInterface $logger)
    {
@@ -40,8 +38,6 @@ class HttpClientFactory implements ClientFactory
    /**
     * Adds a subscriber to the HTTP client.
-     *
-     * @param SubscriberInterface $subscriber
     */
    public function addSubscriber(SubscriberInterface $subscriber)
    {
@@ -51,8 +47,6 @@ class HttpClientFactory implements ClientFactory
    /**
     * Input an array of configuration to be able to create a HttpClient.
     *
-     * @param array $config
-     *
     * @return HttpClient
     */
    public function createClient(array $config = [])
diff --git a/src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php b/src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php
index 04abc6d0..3d56a6d8 100644
--- a/src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php
+++ b/src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php
@@ -20,8 +20,7 @@ class PreparePagerForEntries
    }
    /**
-     * @param AdapterInterface $adapter
+     * @param User $user If user isn't logged in, we can force it (like for feed)
-     * @param User             $user    If user isn't logged in, we can force it (like for feed)
     *
     * @return Pagerfanta|null
     */
diff --git a/src/Wallabag/CoreBundle/Helper/RuleBasedTagger.php b/src/Wallabag/CoreBundle/Helper/RuleBasedTagger.php
index fbdf2ac7..d48e2469 100644
--- a/src/Wallabag/CoreBundle/Helper/RuleBasedTagger.php
+++ b/src/Wallabag/CoreBundle/Helper/RuleBasedTagger.php
@@ -56,8 +56,6 @@ class RuleBasedTagger
    /**
     * Apply all the tagging rules defined by a user on its entries.
     *
-     * @param User $user
-     *
     * @return array<Entry> A list of modified entries
     */
    public function tagAllForUser(User $user)
@@ -109,8 +107,6 @@ class RuleBasedTagger
    /**
     * Retrieves the tagging rules for a given user.
     *
-     * @param User $user
-     *
     * @return array<TaggingRule>
     */
    private function getRulesForUser(User $user)
diff --git a/src/Wallabag/CoreBundle/Helper/TagsAssigner.php b/src/Wallabag/CoreBundle/Helper/TagsAssigner.php
index e6b4989f..433b09fe 100644
--- a/src/Wallabag/CoreBundle/Helper/TagsAssigner.php
+++ b/src/Wallabag/CoreBundle/Helper/TagsAssigner.php
@@ -21,7 +21,6 @@ class TagsAssigner
    /**
     * Assign some tags to an entry.
     *
-     * @param Entry        $entry
     * @param array|string $tags          An array of tag or a string coma separated of tag
     * @param array        $entitiesReady Entities from the EntityManager which are persisted but not yet flushed
     *                                    It is mostly to fix duplicate tag on import @see http://stackoverflow.com/a/7879164/569101
diff --git a/src/Wallabag/CoreBundle/Helper/UrlHasher.php b/src/Wallabag/CoreBundle/Helper/UrlHasher.php
index d123eaba..6753745f 100644
--- a/src/Wallabag/CoreBundle/Helper/UrlHasher.php
+++ b/src/Wallabag/CoreBundle/Helper/UrlHasher.php
@@ -11,7 +11,6 @@ class UrlHasher
     * Hash the given url using the given algorithm.
     * Hashed url are faster to be retrieved in the database than the real url.
     *
-     * @param string $url
     * @param string $algorithm
     *
     * @return string
diff --git a/src/Wallabag/CoreBundle/Repository/EntryRepository.php b/src/Wallabag/CoreBundle/Repository/EntryRepository.php
index d9675982..bfd07937 100644
--- a/src/Wallabag/CoreBundle/Repository/EntryRepository.php
+++ b/src/Wallabag/CoreBundle/Repository/EntryRepository.php
@@ -306,7 +306,6 @@ class EntryRepository extends EntityRepository
     * DELETE et FROM entry_tag et WHERE et.entry_id IN ( SELECT e.id FROM entry e WHERE e.user_id = :userId ) AND et.tag_id = :tagId
     *
     * @param int $userId
-     * @param Tag $tag
     */
    public function removeTag($userId, Tag $tag)
    {
@@ -565,9 +564,8 @@ class EntryRepository extends EntityRepository
    /**
     * Return the given QueryBuilder with an orderBy() call.
     *
-     * @param QueryBuilder $qb
+     * @param string $sortBy
-     * @param string       $sortBy
+     * @param string $direction
-     * @param string       $direction
     *
     * @return QueryBuilder
     */
diff --git a/src/Wallabag/ImportBundle/Controller/BrowserController.php b/src/Wallabag/ImportBundle/Controller/BrowserController.php
index 58d2a730..8c2bdfe5 100644
--- a/src/Wallabag/ImportBundle/Controller/BrowserController.php
+++ b/src/Wallabag/ImportBundle/Controller/BrowserController.php
@@ -13,8 +13,6 @@ abstract class BrowserController extends Controller
    /**
     * @Route("/browser", name="import_browser")
     *
-     * @param Request $request
-     *
     * @return Response
     */
    public function indexAction(Request $request)
diff --git a/src/Wallabag/ImportBundle/Controller/WallabagController.php b/src/Wallabag/ImportBundle/Controller/WallabagController.php
index d182dd2c..5180006d 100644
--- a/src/Wallabag/ImportBundle/Controller/WallabagController.php
+++ b/src/Wallabag/ImportBundle/Controller/WallabagController.php
@@ -16,8 +16,6 @@ abstract class WallabagController extends Controller
    /**
     * Handle import request.
     *
-     * @param Request $request
-     *
     * @return Response|RedirectResponse
     */
    public function indexAction(Request $request)
diff --git a/src/Wallabag/ImportBundle/Import/AbstractImport.php b/src/Wallabag/ImportBundle/Import/AbstractImport.php
index d39d71b6..1b073e99 100644
--- a/src/Wallabag/ImportBundle/Import/AbstractImport.php
+++ b/src/Wallabag/ImportBundle/Import/AbstractImport.php
@@ -46,8 +46,6 @@ abstract class AbstractImport implements ImportInterface
    /**
     * Set RabbitMQ/Redis Producer to send each entry to a queue.
     * This method should be called when user has enabled RabbitMQ.
-     *
-     * @param ProducerInterface $producer
     */
    public function setProducer(ProducerInterface $producer)
    {
@@ -57,8 +55,6 @@ abstract class AbstractImport implements ImportInterface
    /**
     * Set current user.
     * Could the current *connected* user or one retrieve by the consumer.
-     *
-     * @param User $user
     */
    public function setUser(User $user)
    {
@@ -112,8 +108,6 @@ abstract class AbstractImport implements ImportInterface
    /**
     * Parse one entry.
     *
-     * @param array $importedEntry
-     *
     * @return Entry
     */
    abstract public function parseEntry(array $importedEntry);
@@ -121,8 +115,6 @@ abstract class AbstractImport implements ImportInterface
    /**
     * Validate that an entry is valid (like has some required keys, etc.).
     *
-     * @param array $importedEntry
-     *
     * @return bool
     */
    abstract public function validateEntry(array $importedEntry);
@@ -149,8 +141,6 @@ abstract class AbstractImport implements ImportInterface
    /**
     * Parse and insert all given entries.
-     *
-     * @param array $entries
     */
    protected function parseEntries(array $entries)
    {
@@ -210,8 +200,6 @@ abstract class AbstractImport implements ImportInterface
     *
     * Faster parse entries for Producer.
     * We don't care to make check at this time. They'll be done by the consumer.
-     *
-     * @param array $entries
     */
    protected function parseEntriesForProducer(array $entries)
    {
@@ -233,8 +221,6 @@ abstract class AbstractImport implements ImportInterface
     * Set current imported entry to archived / read.
     * Implementation is different accross all imports.
     *
-     * @param array $importedEntry
-     *
     * @return array
     */
    abstract protected function setEntryAsRead(array $importedEntry);
diff --git a/src/Wallabag/ImportBundle/Import/BrowserImport.php b/src/Wallabag/ImportBundle/Import/BrowserImport.php
index 3987e80f..ea7afd3d 100644
--- a/src/Wallabag/ImportBundle/Import/BrowserImport.php
+++ b/src/Wallabag/ImportBundle/Import/BrowserImport.php
@@ -148,8 +148,6 @@ abstract class BrowserImport extends AbstractImport
    /**
     * Parse and insert all given entries.
-     *
-     * @param array $entries
     */
    protected function parseEntries(array $entries)
    {
@@ -199,8 +197,6 @@ abstract class BrowserImport extends AbstractImport
     *
     * Faster parse entries for Producer.
     * We don't care to make check at this time. They'll be done by the consumer.
-     *
-     * @param array $entries
     */
    protected function parseEntriesForProducer(array $entries)
    {
diff --git a/src/Wallabag/ImportBundle/Import/ImportChain.php b/src/Wallabag/ImportBundle/Import/ImportChain.php
index 9dd77956..e1b5867d 100644
--- a/src/Wallabag/ImportBundle/Import/ImportChain.php
+++ b/src/Wallabag/ImportBundle/Import/ImportChain.php
@@ -14,8 +14,7 @@ class ImportChain
    /**
     * Add an import to the chain.
     *
-     * @param ImportInterface $import
+     * @param string $alias
-     * @param string          $alias
     */
    public function addImport(ImportInterface $import, $alias)
    {
diff --git a/src/Wallabag/ImportBundle/Import/PocketImport.php b/src/Wallabag/ImportBundle/Import/PocketImport.php
index 746120af..24fdaa2b 100644
--- a/src/Wallabag/ImportBundle/Import/PocketImport.php
+++ b/src/Wallabag/ImportBundle/Import/PocketImport.php
@@ -151,9 +151,6 @@ class PocketImport extends AbstractImport
    /**
     * Set the Http client.
-     *
-     * @param HttpClient          $client
-     * @param MessageFactory|null $messageFactory
     */
    public function setClient(HttpClient $client, MessageFactory $messageFactory = null)
    {
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
    }
    /**
-     * @param Request $request
+     * @param int $page
-     * @param int     $page
     *
     * @Route("/list/{page}", name="user_index", defaults={"page" = 1})
     *
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
    }
    /**
-     * @param Entry $entry
-     *
     * @return User
     */
    public function addEntry(Entry $entry)
@@ -355,8 +353,6 @@ class User extends BaseUser implements EmailTwoFactorInterface, GoogleTwoFactorI
    }
    /**
-     * @param Client $client
-     *
     * @return User
     */
    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;
 class UserType extends AbstractType
 {
-    /**
-     * @param FormBuilderInterface $builder
-     * @param array                $options
-     */
    public function buildForm(FormBuilderInterface $builder, array $options)
    {
        $builder
@@ -50,9 +46,6 @@ class UserType extends AbstractType
        ;
    }
-    /**
-     * @param OptionsResolver $resolver
-     */
    public function configureOptions(OptionsResolver $resolver)
    {
        $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
    /**
     * Initialize the auth code mailer with the SwiftMailer object.
     *
-     * @param \Swift_Mailer $mailer
+     * @param string $senderEmail
-     * @param Environment   $twig
+     * @param string $senderName
-     * @param string        $senderEmail
+     * @param string $supportUrl  wallabag support url
-     * @param string        $senderName
+     * @param string $wallabagUrl wallabag instance url
-     * @param string        $supportUrl  wallabag support url
-     * @param string        $wallabagUrl wallabag instance url
     */
    public function __construct(\Swift_Mailer $mailer, Environment $twig, $senderEmail, $senderName, $supportUrl, $wallabagUrl)
    {
@@ -76,8 +74,6 @@ class AuthCodeMailer implements AuthCodeMailerInterface
    /**
     * Send the auth code to the user via email.
-     *
-     * @param TwoFactorInterface $user
     */
    public function sendAuthCode(TwoFactorInterface $user): void
    {