aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Wallabag/AnnotationBundle/Controller/WallabagAnnotationController.php10
-rw-r--r--src/Wallabag/ApiBundle/Controller/AnnotationRestController.php10
-rw-r--r--src/Wallabag/ApiBundle/Controller/DeveloperController.php4
-rw-r--r--src/Wallabag/ApiBundle/Controller/EntryRestController.php2
-rw-r--r--src/Wallabag/ApiBundle/Controller/UserRestController.php1
-rw-r--r--src/Wallabag/CoreBundle/Command/CleanDuplicatesCommand.php3
-rw-r--r--src/Wallabag/CoreBundle/Command/GenerateUrlHashesCommand.php3
-rw-r--r--src/Wallabag/CoreBundle/Command/InstallCommand.php4
-rw-r--r--src/Wallabag/CoreBundle/Command/ShowUserCommand.php3
-rw-r--r--src/Wallabag/CoreBundle/Controller/ConfigController.php21
-rw-r--r--src/Wallabag/CoreBundle/Controller/EntryController.php57
-rw-r--r--src/Wallabag/CoreBundle/Controller/ExportController.php1
-rw-r--r--src/Wallabag/CoreBundle/Controller/FeedController.php4
-rw-r--r--src/Wallabag/CoreBundle/Controller/SiteCredentialController.php8
-rw-r--r--src/Wallabag/CoreBundle/Controller/TagController.php7
-rw-r--r--src/Wallabag/CoreBundle/Entity/Config.php2
-rw-r--r--src/Wallabag/CoreBundle/Entity/Entry.php12
-rw-r--r--src/Wallabag/CoreBundle/Entity/Tag.php6
-rw-r--r--src/Wallabag/CoreBundle/Entity/TaggingRule.php2
-rw-r--r--src/Wallabag/CoreBundle/Event/Listener/UserLocaleListener.php3
-rw-r--r--src/Wallabag/CoreBundle/Event/Subscriber/CustomDoctrineORMSubscriber.php3
-rw-r--r--src/Wallabag/CoreBundle/Event/Subscriber/DownloadImagesSubscriber.php8
-rw-r--r--src/Wallabag/CoreBundle/Event/Subscriber/SQLiteCascadeDeleteSubscriber.php5
-rw-r--r--src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php3
-rw-r--r--src/Wallabag/CoreBundle/GuzzleSiteAuthenticator/GrabySiteConfigBuilder.php5
-rw-r--r--src/Wallabag/CoreBundle/Helper/ContentProxy.php10
-rw-r--r--src/Wallabag/CoreBundle/Helper/DownloadImages.php2
-rw-r--r--src/Wallabag/CoreBundle/Helper/HttpClientFactory.php8
-rw-r--r--src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php3
-rw-r--r--src/Wallabag/CoreBundle/Helper/RuleBasedTagger.php4
-rw-r--r--src/Wallabag/CoreBundle/Helper/TagsAssigner.php1
-rw-r--r--src/Wallabag/CoreBundle/Helper/UrlHasher.php1
-rw-r--r--src/Wallabag/CoreBundle/Repository/EntryRepository.php6
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.da.yml3
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.de.yml3
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.en.yml3
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.es.yml3
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml3
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml3
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.it.yml3
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml3
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml3
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml3
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml3
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml3
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.th.yml3
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml3
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig6
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig6
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new_form.html.twig4
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/search_form.html.twig4
-rw-r--r--src/Wallabag/ImportBundle/Controller/BrowserController.php2
-rw-r--r--src/Wallabag/ImportBundle/Controller/ElcuratorController.php41
-rw-r--r--src/Wallabag/ImportBundle/Controller/WallabagController.php2
-rw-r--r--src/Wallabag/ImportBundle/Import/AbstractImport.php14
-rw-r--r--src/Wallabag/ImportBundle/Import/BrowserImport.php4
-rw-r--r--src/Wallabag/ImportBundle/Import/ElcuratorImport.php54
-rw-r--r--src/Wallabag/ImportBundle/Import/ImportChain.php3
-rw-r--r--src/Wallabag/ImportBundle/Import/PocketImport.php3
-rw-r--r--src/Wallabag/ImportBundle/Resources/config/rabbit.yml8
-rw-r--r--src/Wallabag/ImportBundle/Resources/config/redis.yml21
-rw-r--r--src/Wallabag/ImportBundle/Resources/config/services.yml12
-rw-r--r--src/Wallabag/ImportBundle/Resources/views/Elcurator/index.html.twig3
-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
67 files changed, 221 insertions, 256 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
16 /** 16 /**
17 * Retrieve annotations for an entry. 17 * Retrieve annotations for an entry.
18 * 18 *
19 * @param Entry $entry
20 *
21 * @see Wallabag\ApiBundle\Controller\WallabagRestController 19 * @see Wallabag\ApiBundle\Controller\WallabagRestController
22 * 20 *
23 * @return JsonResponse 21 * @return JsonResponse
@@ -39,9 +37,6 @@ class WallabagAnnotationController extends FOSRestController
39 /** 37 /**
40 * Creates a new annotation. 38 * Creates a new annotation.
41 * 39 *
42 * @param Request $request
43 * @param Entry $entry
44 *
45 * @return JsonResponse 40 * @return JsonResponse
46 * 41 *
47 * @see Wallabag\ApiBundle\Controller\WallabagRestController 42 * @see Wallabag\ApiBundle\Controller\WallabagRestController
@@ -79,9 +74,6 @@ class WallabagAnnotationController extends FOSRestController
79 * 74 *
80 * @ParamConverter("annotation", class="WallabagAnnotationBundle:Annotation") 75 * @ParamConverter("annotation", class="WallabagAnnotationBundle:Annotation")
81 * 76 *
82 * @param Annotation $annotation
83 * @param Request $request
84 *
85 * @return JsonResponse 77 * @return JsonResponse
86 */ 78 */
87 public function putAnnotationAction(Annotation $annotation, Request $request) 79 public function putAnnotationAction(Annotation $annotation, Request $request)
@@ -114,8 +106,6 @@ class WallabagAnnotationController extends FOSRestController
114 * 106 *
115 * @ParamConverter("annotation", class="WallabagAnnotationBundle:Annotation") 107 * @ParamConverter("annotation", class="WallabagAnnotationBundle:Annotation")
116 * 108 *
117 * @param Annotation $annotation
118 *
119 * @return JsonResponse 109 * @return JsonResponse
120 */ 110 */
121 public function deleteAnnotationAction(Annotation $annotation) 111 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
20 * } 20 * }
21 * ) 21 * )
22 * 22 *
23 * @param Entry $entry
24 *
25 * @return JsonResponse 23 * @return JsonResponse
26 */ 24 */
27 public function getAnnotationsAction(Entry $entry) 25 public function getAnnotationsAction(Entry $entry)
@@ -44,9 +42,6 @@ class AnnotationRestController extends WallabagRestController
44 * } 42 * }
45 * ) 43 * )
46 * 44 *
47 * @param Request $request
48 * @param Entry $entry
49 *
50 * @return JsonResponse 45 * @return JsonResponse
51 */ 46 */
52 public function postAnnotationAction(Request $request, Entry $entry) 47 public function postAnnotationAction(Request $request, Entry $entry)
@@ -70,9 +65,6 @@ class AnnotationRestController extends WallabagRestController
70 * 65 *
71 * @ParamConverter("annotation", class="WallabagAnnotationBundle:Annotation") 66 * @ParamConverter("annotation", class="WallabagAnnotationBundle:Annotation")
72 * 67 *
73 * @param Annotation $annotation
74 * @param Request $request
75 *
76 * @return JsonResponse 68 * @return JsonResponse
77 */ 69 */
78 public function putAnnotationAction(Annotation $annotation, Request $request) 70 public function putAnnotationAction(Annotation $annotation, Request $request)
@@ -96,8 +88,6 @@ class AnnotationRestController extends WallabagRestController
96 * 88 *
97 * @ParamConverter("annotation", class="WallabagAnnotationBundle:Annotation") 89 * @ParamConverter("annotation", class="WallabagAnnotationBundle:Annotation")
98 * 90 *
99 * @param Annotation $annotation
100 *
101 * @return JsonResponse 91 * @return JsonResponse
102 */ 92 */
103 public function deleteAnnotationAction(Annotation $annotation) 93 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
29 /** 29 /**
30 * Create a client (an app). 30 * Create a client (an app).
31 * 31 *
32 * @param Request $request
33 *
34 * @Route("/developer/client/create", name="developer_create_client") 32 * @Route("/developer/client/create", name="developer_create_client")
35 * 33 *
36 * @return \Symfony\Component\HttpFoundation\Response 34 * @return \Symfony\Component\HttpFoundation\Response
@@ -67,8 +65,6 @@ class DeveloperController extends Controller
67 /** 65 /**
68 * Remove a client. 66 * Remove a client.
69 * 67 *
70 * @param Client $client
71 *
72 * @Route("/developer/client/delete/{id}", requirements={"id" = "\d+"}, name="developer_delete_client") 68 * @Route("/developer/client/delete/{id}", requirements={"id" = "\d+"}, name="developer_delete_client")
73 * 69 *
74 * @return \Symfony\Component\HttpFoundation\RedirectResponse 70 * @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
822 * Retrieve value from the request. 822 * Retrieve value from the request.
823 * Used for POST & PATCH on a an entry. 823 * Used for POST & PATCH on a an entry.
824 * 824 *
825 * @param Request $request
826 *
827 * @return array 825 * @return array
828 */ 826 */
829 private function retrieveValueFromRequest(Request $request) 827 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
119 /** 119 /**
120 * Send user response. 120 * Send user response.
121 * 121 *
122 * @param User $user
123 * @param string $group Used to define with serialized group might be used 122 * @param string $group Used to define with serialized group might be used
124 * @param int $status HTTP Status code to send 123 * @param int $status HTTP Status code to send
125 * 124 *
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
63 return 0; 63 return 0;
64 } 64 }
65 65
66 /**
67 * @param User $user
68 */
69 private function cleanDuplicates(User $user) 66 private function cleanDuplicates(User $user)
70 { 67 {
71 $em = $this->getContainer()->get('doctrine.orm.entity_manager'); 68 $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
54 return 0; 54 return 0;
55 } 55 }
56 56
57 /**
58 * @param User $user
59 */
60 private function generateHashedUrls(User $user) 57 private function generateHashedUrls(User $user)
61 { 58 {
62 $em = $this->getContainer()->get('doctrine.orm.entity_manager'); 59 $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
326 if (0 !== $exitCode) { 326 if (0 !== $exitCode) {
327 $this->getApplication()->setAutoExit(true); 327 $this->getApplication()->setAutoExit(true);
328 328
329 throw new \RuntimeException( 329 throw new \RuntimeException('The command "' . $command . "\" generates some errors: \n\n" . $output->fetch());
330 'The command "' . $command . "\" generates some errors: \n\n"
331 . $output->fetch());
332 } 330 }
333 331
334 return $this; 332 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
46 return 0; 46 return 0;
47 } 47 }
48 48
49 /**
50 * @param User $user
51 */
52 private function showUser(User $user) 49 private function showUser(User $user)
53 { 50 {
54 $this->io->listing([ 51 $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;
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 {
diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php
index 5c8ecb40..ba5bfbe2 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;
21class EntryController extends Controller 21class 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 */
@@ -567,6 +535,9 @@ class EntryController extends Controller
567 } 535 }
568 } 536 }
569 537
538 $nbEntriesUntagged = $this->get('wallabag_core.entry_repository')
539 ->countUntaggedEntriesByUser($this->getUser()->getId());
540
570 return $this->render( 541 return $this->render(
571 'WallabagCoreBundle:Entry:entries.html.twig', [ 542 'WallabagCoreBundle:Entry:entries.html.twig', [
572 'form' => $form->createView(), 543 'form' => $form->createView(),
@@ -574,6 +545,7 @@ class EntryController extends Controller
574 'currentPage' => $page, 545 'currentPage' => $page,
575 'searchTerm' => $searchTerm, 546 'searchTerm' => $searchTerm,
576 'isFiltered' => $form->isSubmitted(), 547 'isFiltered' => $form->isSubmitted(),
548 'nbEntriesUntagged' => $nbEntriesUntagged,
577 ] 549 ]
578 ); 550 );
579 } 551 }
@@ -582,7 +554,6 @@ class EntryController extends Controller
582 * Fetch content and update entry. 554 * Fetch content and update entry.
583 * In case it fails, $entry->getContent will return an error message. 555 * In case it fails, $entry->getContent will return an error message.
584 * 556 *
585 * @param Entry $entry
586 * @param string $prefixMessage Should be the translation key: entry_saved or entry_reloaded 557 * @param string $prefixMessage Should be the translation key: entry_saved or entry_reloaded
587 */ 558 */
588 private function updateEntry(Entry $entry, $prefixMessage = 'entry_saved') 559 private function updateEntry(Entry $entry, $prefixMessage = 'entry_saved')
@@ -613,8 +584,6 @@ class EntryController extends Controller
613 584
614 /** 585 /**
615 * Check if the logged user can manage the given entry. 586 * Check if the logged user can manage the given entry.
616 *
617 * @param Entry $entry
618 */ 587 */
619 private function checkUserAction(Entry $entry) 588 private function checkUserAction(Entry $entry)
620 { 589 {
@@ -626,8 +595,6 @@ class EntryController extends Controller
626 /** 595 /**
627 * Check for existing entry, if it exists, redirect to it with a message. 596 * Check for existing entry, if it exists, redirect to it with a message.
628 * 597 *
629 * @param Entry $entry
630 *
631 * @return Entry|bool 598 * @return Entry|bool
632 */ 599 */
633 private function checkIfEntryAlreadyExists(Entry $entry) 600 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;
16class TagController extends Controller 16class 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 *
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
371 } 371 }
372 372
373 /** 373 /**
374 * @param TaggingRule $rule
375 *
376 * @return Config 374 * @return Config
377 */ 375 */
378 public function addTaggingRule(TaggingRule $rule) 376 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
550 * Set created_at. 550 * Set created_at.
551 * Only used when importing data from an other service. 551 * Only used when importing data from an other service.
552 * 552 *
553 * @param \DateTime $createdAt
554 *
555 * @return Entry 553 * @return Entry
556 */ 554 */
557 public function setCreatedAt(\DateTime $createdAt) 555 public function setCreatedAt(\DateTime $createdAt)
@@ -623,9 +621,6 @@ class Entry
623 return $this->annotations; 621 return $this->annotations;
624 } 622 }
625 623
626 /**
627 * @param Annotation $annotation
628 */
629 public function setAnnotation(Annotation $annotation) 624 public function setAnnotation(Annotation $annotation)
630 { 625 {
631 $this->annotations[] = $annotation; 626 $this->annotations[] = $annotation;
@@ -702,9 +697,6 @@ class Entry
702 return $data; 697 return $data;
703 } 698 }
704 699
705 /**
706 * @param Tag $tag
707 */
708 public function addTag(Tag $tag) 700 public function addTag(Tag $tag)
709 { 701 {
710 if ($this->tags->contains($tag)) { 702 if ($this->tags->contains($tag)) {
@@ -725,8 +717,6 @@ class Entry
725 717
726 /** 718 /**
727 * Remove the given tag from the entry (if the tag is associated). 719 * Remove the given tag from the entry (if the tag is associated).
728 *
729 * @param Tag $tag
730 */ 720 */
731 public function removeTag(Tag $tag) 721 public function removeTag(Tag $tag)
732 { 722 {
@@ -874,8 +864,6 @@ class Entry
874 } 864 }
875 865
876 /** 866 /**
877 * @param \Datetime $publishedAt
878 *
879 * @return Entry 867 * @return Entry
880 */ 868 */
881 public function setPublishedAt(\Datetime $publishedAt) 869 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
104 return $this->slug; 104 return $this->slug;
105 } 105 }
106 106
107 /**
108 * @param Entry $entry
109 */
110 public function addEntry(Entry $entry) 107 public function addEntry(Entry $entry)
111 { 108 {
112 if ($this->entries->contains($entry)) { 109 if ($this->entries->contains($entry)) {
@@ -117,9 +114,6 @@ class Tag
117 $entry->addTag($this); 114 $entry->addTag($this);
118 } 115 }
119 116
120 /**
121 * @param Entry $entry
122 */
123 public function removeEntry(Entry $entry) 117 public function removeEntry(Entry $entry)
124 { 118 {
125 if (!$this->entries->contains($entry)) { 119 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
121 /** 121 /**
122 * Set config. 122 * Set config.
123 * 123 *
124 * @param Config $config
125 *
126 * @return TaggingRule 124 * @return TaggingRule
127 */ 125 */
128 public function setConfig(Config $config) 126 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
25 $this->session = $session; 25 $this->session = $session;
26 } 26 }
27 27
28 /**
29 * @param InteractiveLoginEvent $event
30 */
31 public function onInteractiveLogin(InteractiveLoginEvent $event) 28 public function onInteractiveLogin(InteractiveLoginEvent $event)
32 { 29 {
33 $user = $event->getAuthenticationToken()->getUser(); 30 $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;
12 */ 12 */
13class CustomDoctrineORMSubscriber extends DoctrineORMSubscriber implements EventSubscriberInterface 13class CustomDoctrineORMSubscriber extends DoctrineORMSubscriber implements EventSubscriberInterface
14{ 14{
15 /**
16 * @param GetFilterConditionEvent $event
17 */
18 public function filterDateRange(GetFilterConditionEvent $event) 15 public function filterDateRange(GetFilterConditionEvent $event)
19 { 16 {
20 $expr = $event->getFilterQuery()->getExpressionBuilder(); 17 $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
35 35
36 /** 36 /**
37 * Download images and updated the data into the entry. 37 * Download images and updated the data into the entry.
38 *
39 * @param EntrySavedEvent $event
40 */ 38 */
41 public function onEntrySaved(EntrySavedEvent $event) 39 public function onEntrySaved(EntrySavedEvent $event)
42 { 40 {
@@ -69,8 +67,6 @@ class DownloadImagesSubscriber implements EventSubscriberInterface
69 67
70 /** 68 /**
71 * Remove images related to the entry. 69 * Remove images related to the entry.
72 *
73 * @param EntryDeletedEvent $event
74 */ 70 */
75 public function onEntryDeleted(EntryDeletedEvent $event) 71 public function onEntryDeleted(EntryDeletedEvent $event)
76 { 72 {
@@ -88,8 +84,6 @@ class DownloadImagesSubscriber implements EventSubscriberInterface
88 * 84 *
89 * @todo If we want to add async download, it should be done in that method 85 * @todo If we want to add async download, it should be done in that method
90 * 86 *
91 * @param Entry $entry
92 *
93 * @return string|false False in case of async 87 * @return string|false False in case of async
94 */ 88 */
95 private function downloadImages(Entry $entry) 89 private function downloadImages(Entry $entry)
@@ -106,8 +100,6 @@ class DownloadImagesSubscriber implements EventSubscriberInterface
106 * 100 *
107 * @todo If we want to add async download, it should be done in that method 101 * @todo If we want to add async download, it should be done in that method
108 * 102 *
109 * @param Entry $entry
110 *
111 * @return string|false False in case of async 103 * @return string|false False in case of async
112 */ 104 */
113 private function downloadPreviewImage(Entry $entry) 105 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
18{ 18{
19 private $doctrine; 19 private $doctrine;
20 20
21 /**
22 * @param \Doctrine\Bundle\DoctrineBundle\Registry $doctrine
23 */
24 public function __construct(Registry $doctrine) 21 public function __construct(Registry $doctrine)
25 { 22 {
26 $this->doctrine = $doctrine; 23 $this->doctrine = $doctrine;
@@ -39,8 +36,6 @@ class SQLiteCascadeDeleteSubscriber implements EventSubscriber
39 /** 36 /**
40 * We removed everything related to the upcoming removed entry because SQLite can't handle it on it own. 37 * We removed everything related to the upcoming removed entry because SQLite can't handle it on it own.
41 * We do it in the preRemove, because we can't retrieve tags in the postRemove (because the entry id is gone). 38 * We do it in the preRemove, because we can't retrieve tags in the postRemove (because the entry id is gone).
42 *
43 * @param LifecycleEventArgs $args
44 */ 39 */
45 public function preRemove(LifecycleEventArgs $args) 40 public function preRemove(LifecycleEventArgs $args)
46 { 41 {
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
23 23
24 /** 24 /**
25 * Repository & user are used to get a list of language entries for this user. 25 * Repository & user are used to get a list of language entries for this user.
26 *
27 * @param EntityRepository $entryRepository
28 * @param TokenStorageInterface $tokenStorage
29 */ 26 */
30 public function __construct(EntityRepository $entryRepository, TokenStorageInterface $tokenStorage) 27 public function __construct(EntityRepository $entryRepository, TokenStorageInterface $tokenStorage)
31 { 28 {
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
34 34
35 /** 35 /**
36 * GrabySiteConfigBuilder constructor. 36 * GrabySiteConfigBuilder constructor.
37 *
38 * @param ConfigBuilder $grabyConfigBuilder
39 * @param TokenStorage $token
40 * @param SiteCredentialRepository $credentialRepository
41 * @param LoggerInterface $logger
42 */ 37 */
43 public function __construct(ConfigBuilder $grabyConfigBuilder, TokenStorage $token, SiteCredentialRepository $credentialRepository, LoggerInterface $logger) 38 public function __construct(ConfigBuilder $grabyConfigBuilder, TokenStorage $token, SiteCredentialRepository $credentialRepository, LoggerInterface $logger)
44 { 39 {
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
86 /** 86 /**
87 * Use a Symfony validator to ensure the language is well formatted. 87 * Use a Symfony validator to ensure the language is well formatted.
88 * 88 *
89 * @param Entry $entry
90 * @param string $value Language to validate and save 89 * @param string $value Language to validate and save
91 */ 90 */
92 public function updateLanguage(Entry $entry, $value) 91 public function updateLanguage(Entry $entry, $value)
@@ -112,7 +111,6 @@ class ContentProxy
112 /** 111 /**
113 * Use a Symfony validator to ensure the preview picture is a real url. 112 * Use a Symfony validator to ensure the preview picture is a real url.
114 * 113 *
115 * @param Entry $entry
116 * @param string $value URL to validate and save 114 * @param string $value URL to validate and save
117 */ 115 */
118 public function updatePreviewPicture(Entry $entry, $value) 116 public function updatePreviewPicture(Entry $entry, $value)
@@ -134,7 +132,6 @@ class ContentProxy
134 /** 132 /**
135 * Update date. 133 * Update date.
136 * 134 *
137 * @param Entry $entry
138 * @param string $value Date to validate and save 135 * @param string $value Date to validate and save
139 */ 136 */
140 public function updatePublishedAt(Entry $entry, $value) 137 public function updatePublishedAt(Entry $entry, $value)
@@ -161,8 +158,6 @@ class ContentProxy
161 158
162 /** 159 /**
163 * Helper to extract and save host from entry url. 160 * Helper to extract and save host from entry url.
164 *
165 * @param Entry $entry
166 */ 161 */
167 public function setEntryDomainName(Entry $entry) 162 public function setEntryDomainName(Entry $entry)
168 { 163 {
@@ -176,8 +171,6 @@ class ContentProxy
176 * Helper to set a default title using: 171 * Helper to set a default title using:
177 * - url basename, if applicable 172 * - url basename, if applicable
178 * - hostname. 173 * - hostname.
179 *
180 * @param Entry $entry
181 */ 174 */
182 public function setDefaultEntryTitle(Entry $entry) 175 public function setDefaultEntryTitle(Entry $entry)
183 { 176 {
@@ -333,7 +326,6 @@ class ContentProxy
333 * Update the origin_url field when a redirection occurs 326 * Update the origin_url field when a redirection occurs
334 * This field is set if it is empty and new url does not match ignore list. 327 * This field is set if it is empty and new url does not match ignore list.
335 * 328 *
336 * @param Entry $entry
337 * @param string $url 329 * @param string $url
338 */ 330 */
339 private function updateOriginUrl(Entry $entry, $url) 331 private function updateOriginUrl(Entry $entry, $url)
@@ -441,8 +433,6 @@ class ContentProxy
441 /** 433 /**
442 * Validate that the given content has at least a title, an html and a url. 434 * Validate that the given content has at least a title, an html and a url.
443 * 435 *
444 * @param array $content
445 *
446 * @return bool true if valid otherwise false 436 * @return bool true if valid otherwise false
447 */ 437 */
448 private function validateContent(array $content) 438 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
213 /** 213 /**
214 * Get images urls from the srcset image attribute. 214 * Get images urls from the srcset image attribute.
215 * 215 *
216 * @param Crawler $imagesCrawler
217 *
218 * @return array An array of urls 216 * @return array An array of urls
219 */ 217 */
220 private static function getSrcsetUrls(Crawler $imagesCrawler) 218 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
27 /** 27 /**
28 * HttpClientFactory constructor. 28 * HttpClientFactory constructor.
29 * 29 *
30 * @param \GuzzleHttp\Cookie\CookieJar $cookieJar 30 * @param string $restrictedAccess This param is a kind of boolean. Values: 0 or 1
31 * @param string $restrictedAccess This param is a kind of boolean. Values: 0 or 1
32 * @param LoggerInterface $logger
33 */ 31 */
34 public function __construct(CookieJar $cookieJar, $restrictedAccess, LoggerInterface $logger) 32 public function __construct(CookieJar $cookieJar, $restrictedAccess, LoggerInterface $logger)
35 { 33 {
@@ -40,8 +38,6 @@ class HttpClientFactory implements ClientFactory
40 38
41 /** 39 /**
42 * Adds a subscriber to the HTTP client. 40 * Adds a subscriber to the HTTP client.
43 *
44 * @param SubscriberInterface $subscriber
45 */ 41 */
46 public function addSubscriber(SubscriberInterface $subscriber) 42 public function addSubscriber(SubscriberInterface $subscriber)
47 { 43 {
@@ -51,8 +47,6 @@ class HttpClientFactory implements ClientFactory
51 /** 47 /**
52 * Input an array of configuration to be able to create a HttpClient. 48 * Input an array of configuration to be able to create a HttpClient.
53 * 49 *
54 * @param array $config
55 *
56 * @return HttpClient 50 * @return HttpClient
57 */ 51 */
58 public function createClient(array $config = []) 52 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
20 } 20 }
21 21
22 /** 22 /**
23 * @param AdapterInterface $adapter 23 * @param User $user If user isn't logged in, we can force it (like for feed)
24 * @param User $user If user isn't logged in, we can force it (like for feed)
25 * 24 *
26 * @return Pagerfanta|null 25 * @return Pagerfanta|null
27 */ 26 */
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
56 /** 56 /**
57 * Apply all the tagging rules defined by a user on its entries. 57 * Apply all the tagging rules defined by a user on its entries.
58 * 58 *
59 * @param User $user
60 *
61 * @return array<Entry> A list of modified entries 59 * @return array<Entry> A list of modified entries
62 */ 60 */
63 public function tagAllForUser(User $user) 61 public function tagAllForUser(User $user)
@@ -109,8 +107,6 @@ class RuleBasedTagger
109 /** 107 /**
110 * Retrieves the tagging rules for a given user. 108 * Retrieves the tagging rules for a given user.
111 * 109 *
112 * @param User $user
113 *
114 * @return array<TaggingRule> 110 * @return array<TaggingRule>
115 */ 111 */
116 private function getRulesForUser(User $user) 112 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
21 /** 21 /**
22 * Assign some tags to an entry. 22 * Assign some tags to an entry.
23 * 23 *
24 * @param Entry $entry
25 * @param array|string $tags An array of tag or a string coma separated of tag 24 * @param array|string $tags An array of tag or a string coma separated of tag
26 * @param array $entitiesReady Entities from the EntityManager which are persisted but not yet flushed 25 * @param array $entitiesReady Entities from the EntityManager which are persisted but not yet flushed
27 * It is mostly to fix duplicate tag on import @see http://stackoverflow.com/a/7879164/569101 26 * 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
11 * Hash the given url using the given algorithm. 11 * Hash the given url using the given algorithm.
12 * Hashed url are faster to be retrieved in the database than the real url. 12 * Hashed url are faster to be retrieved in the database than the real url.
13 * 13 *
14 * @param string $url
15 * @param string $algorithm 14 * @param string $algorithm
16 * 15 *
17 * @return string 16 * @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
306 * 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 306 * 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
307 * 307 *
308 * @param int $userId 308 * @param int $userId
309 * @param Tag $tag
310 */ 309 */
311 public function removeTag($userId, Tag $tag) 310 public function removeTag($userId, Tag $tag)
312 { 311 {
@@ -565,9 +564,8 @@ class EntryRepository extends EntityRepository
565 /** 564 /**
566 * Return the given QueryBuilder with an orderBy() call. 565 * Return the given QueryBuilder with an orderBy() call.
567 * 566 *
568 * @param QueryBuilder $qb 567 * @param string $sortBy
569 * @param string $sortBy 568 * @param string $direction
570 * @param string $direction
571 * 569 *
572 * @return QueryBuilder 570 * @return QueryBuilder
573 */ 571 */
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
index 6f381408..8573ba72 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
@@ -465,6 +465,9 @@ import:
465 # wallabag_v2: 465 # wallabag_v2:
466 # page_title: 'Import > Wallabag v2' 466 # page_title: 'Import > Wallabag v2'
467 # description: 'This importer will import all your wallabag v2 articles. Go to All articles, then, on the export sidebar, click on "JSON". You will have a "All articles.json" file.' 467 # description: 'This importer will import all your wallabag v2 articles. Go to All articles, then, on the export sidebar, click on "JSON". You will have a "All articles.json" file.'
468 # elcurator:
469 # page_title: 'Import > elCurator'
470 # description: 'This importer will import all your elCurator articles. Go to your preferences in your elCurator account and then, export your content. You will have a JSON file.'
468 # readability: 471 # readability:
469 # page_title: 'Import > Readability' 472 # page_title: 'Import > Readability'
470 # description: 'This importer will import all your Readability articles. On the tools (https://www.readability.com/tools/) page, click on "Export your data" in the "Data Export" section. You will received an email to download a json (which does not end with .json in fact).' 473 # description: 'This importer will import all your Readability articles. On the tools (https://www.readability.com/tools/) page, click on "Export your data" in the "Data Export" section. You will received an email to download a json (which does not end with .json in fact).'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
index 7efb18aa..50e67d47 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
@@ -465,6 +465,9 @@ import:
465 wallabag_v2: 465 wallabag_v2:
466 page_title: 'Aus wallabag v2 importieren' 466 page_title: 'Aus wallabag v2 importieren'
467 description: 'Dieser Import wird all deine Artikel aus wallabag v2 importieren. Gehe auf "Alle Artikel" und dann, in der Exportieren-Seitenleiste auf "JSON". Dabei erhältst du eine "All articles.json"-Datei.' 467 description: 'Dieser Import wird all deine Artikel aus wallabag v2 importieren. Gehe auf "Alle Artikel" und dann, in der Exportieren-Seitenleiste auf "JSON". Dabei erhältst du eine "All articles.json"-Datei.'
468 # elcurator:
469 # page_title: 'Import > elCurator'
470 # description: 'This importer will import all your elCurator articles. Go to your preferences in your elCurator account and then, export your content. You will have a JSON file.'
468 readability: 471 readability:
469 page_title: 'Aus Readability importieren' 472 page_title: 'Aus Readability importieren'
470 description: 'Dieser Import wird all deine Artikel aus Readability importieren. Auf der Tools Seite (https://www.readability.com/tools/) klickst du auf "Exportiere deine Daten" in dem Abschnitt "Datenexport". Du wirst eine E-Mail mit einem Downloadlink zu einer json Datei, die aber nicht auf .json endet, erhalten' 473 description: 'Dieser Import wird all deine Artikel aus Readability importieren. Auf der Tools Seite (https://www.readability.com/tools/) klickst du auf "Exportiere deine Daten" in dem Abschnitt "Datenexport". Du wirst eine E-Mail mit einem Downloadlink zu einer json Datei, die aber nicht auf .json endet, erhalten'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
index cf98e408..206d3562 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -465,6 +465,9 @@ import:
465 wallabag_v2: 465 wallabag_v2:
466 page_title: 'Import > Wallabag v2' 466 page_title: 'Import > Wallabag v2'
467 description: 'This importer will import all your wallabag v2 articles. Go to All articles, then, on the export sidebar, click on "JSON". You will have a "All articles.json" file.' 467 description: 'This importer will import all your wallabag v2 articles. Go to All articles, then, on the export sidebar, click on "JSON". You will have a "All articles.json" file.'
468 elcurator:
469 page_title: 'Import > elCurator'
470 description: 'This importer will import all your elCurator articles. Go to your preferences in your elCurator account and then, export your content. You will have a JSON file.'
468 readability: 471 readability:
469 page_title: 'Import > Readability' 472 page_title: 'Import > Readability'
470 description: 'This importer will import all your Readability articles. On the tools (https://www.readability.com/tools/) page, click on "Export your data" in the "Data Export" section. You will received an email to download a json (which does not end with .json in fact).' 473 description: 'This importer will import all your Readability articles. On the tools (https://www.readability.com/tools/) page, click on "Export your data" in the "Data Export" section. You will received an email to download a json (which does not end with .json in fact).'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
index b7cdd261..10f5e79a 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
@@ -465,6 +465,9 @@ import:
465 wallabag_v2: 465 wallabag_v2:
466 page_title: 'Importar > Wallabag v2' 466 page_title: 'Importar > Wallabag v2'
467 description: 'Importa todos tus artículos de wallabag v2. En la sección Todos los artículos, en la barra lateral, haga clic en "JSON". Obtendrás un archivo llamado "All articles.json".' 467 description: 'Importa todos tus artículos de wallabag v2. En la sección Todos los artículos, en la barra lateral, haga clic en "JSON". Obtendrás un archivo llamado "All articles.json".'
468 # elcurator:
469 # page_title: 'Import > elCurator'
470 # description: 'This importer will import all your elCurator articles. Go to your preferences in your elCurator account and then, export your content. You will have a JSON file.'
468 readability: 471 readability:
469 page_title: 'Importar > Readability' 472 page_title: 'Importar > Readability'
470 description: 'Importa todos tus artículos de Readability. En la página de herramientas (https://www.readability.com/tools/), haga clic en "Exportar tus datos" en la sección "Exportar datos". Recibirás un correo electrónico para descargar un JSON (que no tiene extensión .json).' 473 description: 'Importa todos tus artículos de Readability. En la página de herramientas (https://www.readability.com/tools/), haga clic en "Exportar tus datos" en la sección "Exportar datos". Recibirás un correo electrónico para descargar un JSON (que no tiene extensión .json).'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
index 66e83e16..730b7e68 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
@@ -465,6 +465,9 @@ import:
465 wallabag_v2: 465 wallabag_v2:
466 page_title: 'درون‌ریزی > Wallabag v2' 466 page_title: 'درون‌ریزی > Wallabag v2'
467 description: 'این برنامه همهٔ داده‌های شما را در نسخهٔ ۲ wallabag درون‌ریزی می‌کند. به بخش «همهٔ مقاله‌ها» بروید و در بخش «برون‌ریزی» روی "JSON" کلیک کنید. با این کار شما پرونده‌ای به شکل "All articles.json" دریافت خواهید کرد.' 467 description: 'این برنامه همهٔ داده‌های شما را در نسخهٔ ۲ wallabag درون‌ریزی می‌کند. به بخش «همهٔ مقاله‌ها» بروید و در بخش «برون‌ریزی» روی "JSON" کلیک کنید. با این کار شما پرونده‌ای به شکل "All articles.json" دریافت خواهید کرد.'
468 # elcurator:
469 # page_title: 'Import > elCurator'
470 # description: 'This importer will import all your elCurator articles. Go to your preferences in your elCurator account and then, export your content. You will have a JSON file.'
468 readability: 471 readability:
469 page_title: 'درون‌ریزی > Readability' 472 page_title: 'درون‌ریزی > Readability'
470 # description: 'This importer will import all your Readability articles. On the tools (https://www.readability.com/tools/) page, click on "Export your data" in the "Data Export" section. You will received an email to download a json (which does not end with .json in fact).' 473 # description: 'This importer will import all your Readability articles. On the tools (https://www.readability.com/tools/) page, click on "Export your data" in the "Data Export" section. You will received an email to download a json (which does not end with .json in fact).'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index 6fb856f2..1eecd111 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -465,6 +465,9 @@ import:
465 wallabag_v2: 465 wallabag_v2:
466 page_title: "Importer > wallabag v2" 466 page_title: "Importer > wallabag v2"
467 description: "Cet outil va importer tous vos articles d’une autre instance de wallabag v2. Allez dans tous vos articles, puis, sur la barre latérale, cliquez sur « JSON ». Vous allez récupérer un fichier « All articles.json »" 467 description: "Cet outil va importer tous vos articles d’une autre instance de wallabag v2. Allez dans tous vos articles, puis, sur la barre latérale, cliquez sur « JSON ». Vous allez récupérer un fichier « All articles.json »"
468 # elcurator:
469 # page_title: 'Import > elCurator'
470 # description: 'This importer will import all your elCurator articles. Go to your preferences in your elCurator account and then, export your content. You will have a JSON file.'
468 readability: 471 readability:
469 page_title: "Importer > Readability" 472 page_title: "Importer > Readability"
470 description: "Cet outil va importer toutes vos données de Readability. Sur la page des outils (https://www.readability.com/tools/), cliquez sur « Export your data » dans la section « Data Export ». Vous allez recevoir un courriel avec un lien pour télécharger le json." 473 description: "Cet outil va importer toutes vos données de Readability. Sur la page des outils (https://www.readability.com/tools/), cliquez sur « Export your data » dans la section « Data Export ». Vous allez recevoir un courriel avec un lien pour télécharger le json."
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
index 3640e0a0..f1a8e3b1 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
@@ -465,6 +465,9 @@ import:
465 wallabag_v2: 465 wallabag_v2:
466 page_title: 'Importa da > Wallabag v2' 466 page_title: 'Importa da > Wallabag v2'
467 description: 'Questo importatore copierà tutti i tuoi dati da un wallabag v2. Vai in "Tutti i contenuti", e, nella barra laterale di esportazione, clicca su "JSON". Otterrai un file "Tutti i contenuti.json' 467 description: 'Questo importatore copierà tutti i tuoi dati da un wallabag v2. Vai in "Tutti i contenuti", e, nella barra laterale di esportazione, clicca su "JSON". Otterrai un file "Tutti i contenuti.json'
468 # elcurator:
469 # page_title: 'Import > elCurator'
470 # description: 'This importer will import all your elCurator articles. Go to your preferences in your elCurator account and then, export your content. You will have a JSON file.'
468 readability: 471 readability:
469 page_title: 'Importa da > Readability' 472 page_title: 'Importa da > Readability'
470 description: 'Questo importatore copierà tutti i tuoi articoli da Readability. Nella pagina strumenti (https://www.readability.com/tools/), clicca su "Export your data" nella sezione "Data Export". Riceverai una E-mail per scaricare un file json (che tuttavia non termina con .json).' 473 description: 'Questo importatore copierà tutti i tuoi articoli da Readability. Nella pagina strumenti (https://www.readability.com/tools/), clicca su "Export your data" nella sezione "Data Export". Riceverai una E-mail per scaricare un file json (che tuttavia non termina con .json).'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
index cd60566a..89bf8b16 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
@@ -465,6 +465,9 @@ import:
465 wallabag_v2: 465 wallabag_v2:
466 page_title: 'Importar > Wallabag v2' 466 page_title: 'Importar > Wallabag v2'
467 description: "Aquesta aisina importarà totas vòstras donadas d'una instància mai de wallabag v2. Anatz dins totes vòstres articles, puèi, sus la barra laterala, clicatz sus \"JSON\". Traparetz un fichièr \"All articles.json\"." 467 description: "Aquesta aisina importarà totas vòstras donadas d'una instància mai de wallabag v2. Anatz dins totes vòstres articles, puèi, sus la barra laterala, clicatz sus \"JSON\". Traparetz un fichièr \"All articles.json\"."
468 # elcurator:
469 # page_title: 'Import > elCurator'
470 # description: 'This importer will import all your elCurator articles. Go to your preferences in your elCurator account and then, export your content. You will have a JSON file.'
468 readability: 471 readability:
469 page_title: 'Importar > Readability' 472 page_title: 'Importar > Readability'
470 description: "Aquesta aisina importarà totas vòstres articles de Readability. Sus la pagina de l'aisina (https://www.readability.com/tools/), clicatz sus \"Export your data\" dins la seccion \"Data Export\". Recebretz un corrièl per telecargar un json (qu'acaba pas amb un .json de fach)." 473 description: "Aquesta aisina importarà totas vòstres articles de Readability. Sus la pagina de l'aisina (https://www.readability.com/tools/), clicatz sus \"Export your data\" dins la seccion \"Data Export\". Recebretz un corrièl per telecargar un json (qu'acaba pas amb un .json de fach)."
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
index 909f7058..0118ad21 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
@@ -465,6 +465,9 @@ import:
465 wallabag_v2: 465 wallabag_v2:
466 page_title: 'Import > Wallabag v2' 466 page_title: 'Import > Wallabag v2'
467 description: 'Ten importer, zaimportuje wszystkie twoje artykułu z wallabag v2. Idź do wszystkich artykułów, a następnie na panelu exportu kliknij na "JSON". Otrzymasz plik "All articles.json".' 467 description: 'Ten importer, zaimportuje wszystkie twoje artykułu z wallabag v2. Idź do wszystkich artykułów, a następnie na panelu exportu kliknij na "JSON". Otrzymasz plik "All articles.json".'
468 # elcurator:
469 # page_title: 'Import > elCurator'
470 # description: 'This importer will import all your elCurator articles. Go to your preferences in your elCurator account and then, export your content. You will have a JSON file.'
468 readability: 471 readability:
469 page_title: 'Import > Readability' 472 page_title: 'Import > Readability'
470 description: 'Ten importer, zaimportuje wszystkie twoje artykuły z Readability. Na stronie narzędzi (https://www.readability.com/tools/), kliknij na "Export your data" w sekcji "Data Export". Otrzymach email z plikiem JSON (plik nie będzie zawierał rozszerzenia .json).' 473 description: 'Ten importer, zaimportuje wszystkie twoje artykuły z Readability. Na stronie narzędzi (https://www.readability.com/tools/), kliknij na "Export your data" w sekcji "Data Export". Otrzymach email z plikiem JSON (plik nie będzie zawierał rozszerzenia .json).'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
index 47e7b4db..d0082cda 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
@@ -465,6 +465,9 @@ import:
465 wallabag_v2: 465 wallabag_v2:
466 page_title: 'Importar > Wallabag v2' 466 page_title: 'Importar > Wallabag v2'
467 description: 'Com este importador você importa todos os seus artigos do wallabag v2. Vá em Todos os artigos e então, na barra lateral de exportação, clique em "JSON". Você irá criar um arquivo "All articles.json".' 467 description: 'Com este importador você importa todos os seus artigos do wallabag v2. Vá em Todos os artigos e então, na barra lateral de exportação, clique em "JSON". Você irá criar um arquivo "All articles.json".'
468 # elcurator:
469 # page_title: 'Import > elCurator'
470 # description: 'This importer will import all your elCurator articles. Go to your preferences in your elCurator account and then, export your content. You will have a JSON file.'
468 readability: 471 readability:
469 page_title: 'Importar > Readability' 472 page_title: 'Importar > Readability'
470 description: 'Este importador pode importar todos os artigos do Readability. Nas página ferramentas (https://www.readability.com/tools/), clique em "Export your data" na seção "Data Export". Você receberá um e-mail para fazer o download de um json (que de fato não termina com .json).' 473 description: 'Este importador pode importar todos os artigos do Readability. Nas página ferramentas (https://www.readability.com/tools/), clique em "Export your data" na seção "Data Export". Você receberá um e-mail para fazer o download de um json (que de fato não termina com .json).'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
index 380b5233..c8e2dfb4 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
@@ -465,6 +465,9 @@ import:
465 # wallabag_v2: 465 # wallabag_v2:
466 # page_title: 'Import > Wallabag v2' 466 # page_title: 'Import > Wallabag v2'
467 # description: 'This importer will import all your wallabag v2 articles. Go to All articles, then, on the export sidebar, click on "JSON". You will have a "All articles.json" file.' 467 # description: 'This importer will import all your wallabag v2 articles. Go to All articles, then, on the export sidebar, click on "JSON". You will have a "All articles.json" file.'
468 # elcurator:
469 # page_title: 'Import > elCurator'
470 # description: 'This importer will import all your elCurator articles. Go to your preferences in your elCurator account and then, export your content. You will have a JSON file.'
468 # readability: 471 # readability:
469 # page_title: 'Import > Readability' 472 # page_title: 'Import > Readability'
470 # description: 'This importer will import all your Readability articles. On the tools (https://www.readability.com/tools/) page, click on "Export your data" in the "Data Export" section. You will received an email to download a json (which does not end with .json in fact).' 473 # description: 'This importer will import all your Readability articles. On the tools (https://www.readability.com/tools/) page, click on "Export your data" in the "Data Export" section. You will received an email to download a json (which does not end with .json in fact).'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml
index a47525c6..41379f90 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml
@@ -465,6 +465,9 @@ import:
465 wallabag_v2: 465 wallabag_v2:
466 page_title: 'Импорт > Wallabag v2' 466 page_title: 'Импорт > Wallabag v2'
467 description: 'Функция импорта добавит все ваши записи wallabag v2. Перейдите ко всем статьям, затем на боковой панели экспорта нажмите "JSON". У вас появится файл со всеми записями "All articles.json".' 467 description: 'Функция импорта добавит все ваши записи wallabag v2. Перейдите ко всем статьям, затем на боковой панели экспорта нажмите "JSON". У вас появится файл со всеми записями "All articles.json".'
468 # elcurator:
469 # page_title: 'Import > elCurator'
470 # description: 'This importer will import all your elCurator articles. Go to your preferences in your elCurator account and then, export your content. You will have a JSON file.'
468 readability: 471 readability:
469 page_title: 'Импорт > Readability' 472 page_title: 'Импорт > Readability'
470 description: 'Функция импорта добавит все ваши записи для чтения. На странице инструментов (https://www.readability.com/tools/) нажмите "Экспорт ваших данных" в разделе "Экспорт данных". Вы получите электронное письмо для загрузки json (что не заканчивается только .json файлом).' 473 description: 'Функция импорта добавит все ваши записи для чтения. На странице инструментов (https://www.readability.com/tools/) нажмите "Экспорт ваших данных" в разделе "Экспорт данных". Вы получите электронное письмо для загрузки json (что не заканчивается только .json файлом).'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml
index 5879c48f..b5a3bcb6 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml
@@ -465,6 +465,9 @@ import:
465 wallabag_v2: 465 wallabag_v2:
466 page_title: 'นำเข้าข้อมูล > Wallabag v2' 466 page_title: 'นำเข้าข้อมูล > Wallabag v2'
467 description: 'สำหรับผู้นำเข้าข้อมูลจะ import บทความ wallabag v2 ทั้งหมดของคุณ ไปยังบทความทั้งหมด, ดังนั้น, บน export sidebar, click ที่ "JSON" คุณจะมีไฟล์ "All articles.json"' 467 description: 'สำหรับผู้นำเข้าข้อมูลจะ import บทความ wallabag v2 ทั้งหมดของคุณ ไปยังบทความทั้งหมด, ดังนั้น, บน export sidebar, click ที่ "JSON" คุณจะมีไฟล์ "All articles.json"'
468 # elcurator:
469 # page_title: 'Import > elCurator'
470 # description: 'This importer will import all your elCurator articles. Go to your preferences in your elCurator account and then, export your content. You will have a JSON file.'
468 readability: 471 readability:
469 page_title: 'นำเข้าข้อมูล > Readability' 472 page_title: 'นำเข้าข้อมูล > Readability'
470 description: 'สำหรับผู้นำเข้าข้อมูลจะ import บทความ Readability ทั้งหมดของคุณ ไปที่เครื่องมือ (https://www.readability.com/tools/) ของหน้านั้น, click ที่ "Export your data" ในส่วน "Data Export" คุณจะได้รับ email ไป download json (which does not end with .json in fact).' 473 description: 'สำหรับผู้นำเข้าข้อมูลจะ import บทความ Readability ทั้งหมดของคุณ ไปที่เครื่องมือ (https://www.readability.com/tools/) ของหน้านั้น, click ที่ "Export your data" ในส่วน "Data Export" คุณจะได้รับ email ไป download json (which does not end with .json in fact).'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
index d023e368..4aaef781 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
@@ -465,6 +465,9 @@ import:
465 wallabag_v2: 465 wallabag_v2:
466 page_title: 'İçe Aktar > Wallabag v2' 466 page_title: 'İçe Aktar > Wallabag v2'
467 # description: 'This importer will import all your wallabag v2 articles. Go to All articles, then, on the export sidebar, click on "JSON". You will have a "All articles.json" file.' 467 # description: 'This importer will import all your wallabag v2 articles. Go to All articles, then, on the export sidebar, click on "JSON". You will have a "All articles.json" file.'
468 # elcurator:
469 # page_title: 'Import > elCurator'
470 # description: 'This importer will import all your elCurator articles. Go to your preferences in your elCurator account and then, export your content. You will have a JSON file.'
468 readability: 471 readability:
469 page_title: 'İçe Aktar > Readability' 472 page_title: 'İçe Aktar > Readability'
470 # description: 'This importer will import all your Readability articles. On the tools (https://www.readability.com/tools/) page, click on "Export your data" in the "Data Export" section. You will received an email to download a json (which does not end with .json in fact).' 473 # description: 'This importer will import all your Readability articles. On the tools (https://www.readability.com/tools/) page, click on "Export your data" in the "Data Export" section. You will received an email to download a json (which does not end with .json in fact).'
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
index d8b39160..b747ed84 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
@@ -117,6 +117,12 @@
117 <a href="javascript: void(null);" id="filter-form-close" class="close-button--popup close-button">&times;</a> 117 <a href="javascript: void(null);" id="filter-form-close" class="close-button--popup close-button">&times;</a>
118 118
119 <div id="filter-status" class="filter-group"> 119 <div id="filter-status" class="filter-group">
120 {% if currentRoute != 'untagged' and nbEntriesUntagged != 0 %}
121 <div class="">
122 <a href="{{ path('untagged') }}">{{ 'tag.list.see_untagged_entries'|trans }} ({{nbEntriesUntagged}})</a>
123 </div>
124 {% endif %}
125
120 <div class=""> 126 <div class="">
121 <label>{{ 'entry.filters.status_label'|trans }}</label> 127 <label>{{ 'entry.filters.status_label'|trans }}</label>
122 </div> 128 </div>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
index 476d7403..3906e1e0 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
@@ -83,6 +83,12 @@
83 <h4 class="center">{{ 'entry.filters.title'|trans }}</h4> 83 <h4 class="center">{{ 'entry.filters.title'|trans }}</h4>
84 84
85 <div class="row"> 85 <div class="row">
86 {% if currentRoute != 'untagged' and nbEntriesUntagged != 0 %}
87 <div class="col s12 center-align">
88 <a href="{{ path('untagged') }}">{{ 'tag.list.see_untagged_entries'|trans }} ({{nbEntriesUntagged}})</a>
89 </div>
90 {% endif %}
91
86 <div class="col s12"> 92 <div class="col s12">
87 <label>{{ 'entry.filters.status_label'|trans }}</label> 93 <label>{{ 'entry.filters.status_label'|trans }}</label>
88 </div> 94 </div>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new_form.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new_form.html.twig
index e0d5e794..4cf81167 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new_form.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new_form.html.twig
@@ -2,14 +2,14 @@
2 {% if form_errors(form) %} 2 {% if form_errors(form) %}
3 <span class="black-text">{{ form_errors(form) }}</span> 3 <span class="black-text">{{ form_errors(form) }}</span>
4 {% endif %} 4 {% endif %}
5 <button type="submit" class="nav-form-button"><i class="material-icons add">add</i></button> 5 <button type="submit" class="nav-form-button" aria-label="add"><i class="material-icons add" aria-hidden="true"></i></button>
6 6
7 {% if form_errors(form.url) %} 7 {% if form_errors(form.url) %}
8 <span class="black-text">{{ form_errors(form.url) }}</span> 8 <span class="black-text">{{ form_errors(form.url) }}</span>
9 {% endif %} 9 {% endif %}
10 10
11 {{ form_widget(form.url, { 'attr': {'autocomplete': 'off', 'placeholder': 'entry.new.placeholder'} }) }} 11 {{ form_widget(form.url, { 'attr': {'autocomplete': 'off', 'placeholder': 'entry.new.placeholder'} }) }}
12 <i class="material-icons close">clear</i> 12 <i class="material-icons close" aria-label="clear" role="button"></i>
13 13
14 {{ form_rest(form) }} 14 {{ form_rest(form) }}
15</form> 15</form>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/search_form.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/search_form.html.twig
index ba1b3aac..0ae8b0b3 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/search_form.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/search_form.html.twig
@@ -2,7 +2,7 @@
2 {% if form_errors(form) %} 2 {% if form_errors(form) %}
3 <span class="black-text">{{ form_errors(form) }}</span> 3 <span class="black-text">{{ form_errors(form) }}</span>
4 {% endif %} 4 {% endif %}
5 <button type="submit" class="nav-form-button"><i class="material-icons search">search</i></button> 5 <button type="submit" class="nav-form-button" aria-label="search"><i class="material-icons search" aria-hidden="true"></i></button>
6 6
7 {% if form_errors(form.term) %} 7 {% if form_errors(form.term) %}
8 <span class="black-text">{{ form_errors(form.term) }}</span> 8 <span class="black-text">{{ form_errors(form.term) }}</span>
@@ -11,7 +11,7 @@
11 <input type="hidden" name="currentRoute" value="{{ currentRoute }}" /> 11 <input type="hidden" name="currentRoute" value="{{ currentRoute }}" />
12 12
13 {{ form_widget(form.term, { 'attr': {'autocomplete': 'off', 'placeholder': 'entry.search.placeholder'} }) }} 13 {{ form_widget(form.term, { 'attr': {'autocomplete': 'off', 'placeholder': 'entry.search.placeholder'} }) }}
14 <i class="material-icons close">clear</i> 14 <i class="material-icons close" aria-label="clear" role="button"></i>
15 15
16 {{ form_rest(form) }} 16 {{ form_rest(form) }}
17</form> 17</form>
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
13 /** 13 /**
14 * @Route("/browser", name="import_browser") 14 * @Route("/browser", name="import_browser")
15 * 15 *
16 * @param Request $request
17 *
18 * @return Response 16 * @return Response
19 */ 17 */
20 public function indexAction(Request $request) 18 public function indexAction(Request $request)
diff --git a/src/Wallabag/ImportBundle/Controller/ElcuratorController.php b/src/Wallabag/ImportBundle/Controller/ElcuratorController.php
new file mode 100644
index 00000000..174c2c96
--- /dev/null
+++ b/src/Wallabag/ImportBundle/Controller/ElcuratorController.php
@@ -0,0 +1,41 @@
1<?php
2
3namespace Wallabag\ImportBundle\Controller;
4
5use Symfony\Component\HttpFoundation\Request;
6use Symfony\Component\Routing\Annotation\Route;
7
8class ElcuratorController extends WallabagController
9{
10 /**
11 * @Route("/elcurator", name="import_elcurator")
12 */
13 public function indexAction(Request $request)
14 {
15 return parent::indexAction($request);
16 }
17
18 /**
19 * {@inheritdoc}
20 */
21 protected function getImportService()
22 {
23 $service = $this->get('wallabag_import.elcurator.import');
24
25 if ($this->get('craue_config')->get('import_with_rabbitmq')) {
26 $service->setProducer($this->get('old_sound_rabbit_mq.import_elcurator_producer'));
27 } elseif ($this->get('craue_config')->get('import_with_redis')) {
28 $service->setProducer($this->get('wallabag_import.producer.redis.elcurator'));
29 }
30
31 return $service;
32 }
33
34 /**
35 * {@inheritdoc}
36 */
37 protected function getImportTemplate()
38 {
39 return 'WallabagImportBundle:Elcurator:index.html.twig';
40 }
41}
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
16 /** 16 /**
17 * Handle import request. 17 * Handle import request.
18 * 18 *
19 * @param Request $request
20 *
21 * @return Response|RedirectResponse 19 * @return Response|RedirectResponse
22 */ 20 */
23 public function indexAction(Request $request) 21 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
46 /** 46 /**
47 * Set RabbitMQ/Redis Producer to send each entry to a queue. 47 * Set RabbitMQ/Redis Producer to send each entry to a queue.
48 * This method should be called when user has enabled RabbitMQ. 48 * This method should be called when user has enabled RabbitMQ.
49 *
50 * @param ProducerInterface $producer
51 */ 49 */
52 public function setProducer(ProducerInterface $producer) 50 public function setProducer(ProducerInterface $producer)
53 { 51 {
@@ -57,8 +55,6 @@ abstract class AbstractImport implements ImportInterface
57 /** 55 /**
58 * Set current user. 56 * Set current user.
59 * Could the current *connected* user or one retrieve by the consumer. 57 * Could the current *connected* user or one retrieve by the consumer.
60 *
61 * @param User $user
62 */ 58 */
63 public function setUser(User $user) 59 public function setUser(User $user)
64 { 60 {
@@ -112,8 +108,6 @@ abstract class AbstractImport implements ImportInterface
112 /** 108 /**
113 * Parse one entry. 109 * Parse one entry.
114 * 110 *
115 * @param array $importedEntry
116 *
117 * @return Entry 111 * @return Entry
118 */ 112 */
119 abstract public function parseEntry(array $importedEntry); 113 abstract public function parseEntry(array $importedEntry);
@@ -121,8 +115,6 @@ abstract class AbstractImport implements ImportInterface
121 /** 115 /**
122 * Validate that an entry is valid (like has some required keys, etc.). 116 * Validate that an entry is valid (like has some required keys, etc.).
123 * 117 *
124 * @param array $importedEntry
125 *
126 * @return bool 118 * @return bool
127 */ 119 */
128 abstract public function validateEntry(array $importedEntry); 120 abstract public function validateEntry(array $importedEntry);
@@ -149,8 +141,6 @@ abstract class AbstractImport implements ImportInterface
149 141
150 /** 142 /**
151 * Parse and insert all given entries. 143 * Parse and insert all given entries.
152 *
153 * @param array $entries
154 */ 144 */
155 protected function parseEntries(array $entries) 145 protected function parseEntries(array $entries)
156 { 146 {
@@ -210,8 +200,6 @@ abstract class AbstractImport implements ImportInterface
210 * 200 *
211 * Faster parse entries for Producer. 201 * Faster parse entries for Producer.
212 * We don't care to make check at this time. They'll be done by the consumer. 202 * We don't care to make check at this time. They'll be done by the consumer.
213 *
214 * @param array $entries
215 */ 203 */
216 protected function parseEntriesForProducer(array $entries) 204 protected function parseEntriesForProducer(array $entries)
217 { 205 {
@@ -233,8 +221,6 @@ abstract class AbstractImport implements ImportInterface
233 * Set current imported entry to archived / read. 221 * Set current imported entry to archived / read.
234 * Implementation is different accross all imports. 222 * Implementation is different accross all imports.
235 * 223 *
236 * @param array $importedEntry
237 *
238 * @return array 224 * @return array
239 */ 225 */
240 abstract protected function setEntryAsRead(array $importedEntry); 226 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
148 148
149 /** 149 /**
150 * Parse and insert all given entries. 150 * Parse and insert all given entries.
151 *
152 * @param array $entries
153 */ 151 */
154 protected function parseEntries(array $entries) 152 protected function parseEntries(array $entries)
155 { 153 {
@@ -199,8 +197,6 @@ abstract class BrowserImport extends AbstractImport
199 * 197 *
200 * Faster parse entries for Producer. 198 * Faster parse entries for Producer.
201 * We don't care to make check at this time. They'll be done by the consumer. 199 * We don't care to make check at this time. They'll be done by the consumer.
202 *
203 * @param array $entries
204 */ 200 */
205 protected function parseEntriesForProducer(array $entries) 201 protected function parseEntriesForProducer(array $entries)
206 { 202 {
diff --git a/src/Wallabag/ImportBundle/Import/ElcuratorImport.php b/src/Wallabag/ImportBundle/Import/ElcuratorImport.php
new file mode 100644
index 00000000..d1281613
--- /dev/null
+++ b/src/Wallabag/ImportBundle/Import/ElcuratorImport.php
@@ -0,0 +1,54 @@
1<?php
2
3namespace Wallabag\ImportBundle\Import;
4
5class ElcuratorImport extends WallabagImport
6{
7 /**
8 * {@inheritdoc}
9 */
10 public function getName()
11 {
12 return 'elcurator';
13 }
14
15 /**
16 * {@inheritdoc}
17 */
18 public function getUrl()
19 {
20 return 'import_elcurator';
21 }
22
23 /**
24 * {@inheritdoc}
25 */
26 public function getDescription()
27 {
28 return 'import.elcurator.description';
29 }
30
31 /**
32 * {@inheritdoc}
33 */
34 protected function prepareEntry($entry = [])
35 {
36 return [
37 'url' => $entry['url'],
38 'title' => $entry['title'],
39 'created_at' => $entry['created_at'],
40 'is_archived' => 0,
41 'is_starred' => $entry['is_saved'],
42 ] + $entry;
43 }
44
45 /**
46 * {@inheritdoc}
47 */
48 protected function setEntryAsRead(array $importedEntry)
49 {
50 $importedEntry['is_archived'] = 1;
51
52 return $importedEntry;
53 }
54}
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
14 /** 14 /**
15 * Add an import to the chain. 15 * Add an import to the chain.
16 * 16 *
17 * @param ImportInterface $import 17 * @param string $alias
18 * @param string $alias
19 */ 18 */
20 public function addImport(ImportInterface $import, $alias) 19 public function addImport(ImportInterface $import, $alias)
21 { 20 {
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
151 151
152 /** 152 /**
153 * Set the Http client. 153 * Set the Http client.
154 *
155 * @param HttpClient $client
156 * @param MessageFactory|null $messageFactory
157 */ 154 */
158 public function setClient(HttpClient $client, MessageFactory $messageFactory = null) 155 public function setClient(HttpClient $client, MessageFactory $messageFactory = null)
159 { 156 {
diff --git a/src/Wallabag/ImportBundle/Resources/config/rabbit.yml b/src/Wallabag/ImportBundle/Resources/config/rabbit.yml
index e9ecb846..0bf0e761 100644
--- a/src/Wallabag/ImportBundle/Resources/config/rabbit.yml
+++ b/src/Wallabag/ImportBundle/Resources/config/rabbit.yml
@@ -48,6 +48,14 @@ services:
48 - "@wallabag_import.wallabag_v2.import" 48 - "@wallabag_import.wallabag_v2.import"
49 - "@event_dispatcher" 49 - "@event_dispatcher"
50 - "@logger" 50 - "@logger"
51 wallabag_import.consumer.amqp.elcurator:
52 class: Wallabag\ImportBundle\Consumer\AMQPEntryConsumer
53 arguments:
54 - "@doctrine.orm.entity_manager"
55 - "@wallabag_user.user_repository"
56 - "@wallabag_import.elcurator.import"
57 - "@event_dispatcher"
58 - "@logger"
51 wallabag_import.consumer.amqp.firefox: 59 wallabag_import.consumer.amqp.firefox:
52 class: Wallabag\ImportBundle\Consumer\AMQPEntryConsumer 60 class: Wallabag\ImportBundle\Consumer\AMQPEntryConsumer
53 arguments: 61 arguments:
diff --git a/src/Wallabag/ImportBundle/Resources/config/redis.yml b/src/Wallabag/ImportBundle/Resources/config/redis.yml
index 091cdba0..40a6e224 100644
--- a/src/Wallabag/ImportBundle/Resources/config/redis.yml
+++ b/src/Wallabag/ImportBundle/Resources/config/redis.yml
@@ -126,6 +126,27 @@ services:
126 - "@event_dispatcher" 126 - "@event_dispatcher"
127 - "@logger" 127 - "@logger"
128 128
129 # elcurator
130 wallabag_import.queue.redis.elcurator:
131 class: Simpleue\Queue\RedisQueue
132 arguments:
133 - "@wallabag_core.redis.client"
134 - "wallabag.import.elcurator"
135
136 wallabag_import.producer.redis.elcurator:
137 class: Wallabag\ImportBundle\Redis\Producer
138 arguments:
139 - "@wallabag_import.queue.redis.elcurator"
140
141 wallabag_import.consumer.redis.elcurator:
142 class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
143 arguments:
144 - "@doctrine.orm.entity_manager"
145 - "@wallabag_user.user_repository"
146 - "@wallabag_import.elcurator.import"
147 - "@event_dispatcher"
148 - "@logger"
149
129 # firefox 150 # firefox
130 wallabag_import.queue.redis.firefox: 151 wallabag_import.queue.redis.firefox:
131 class: Simpleue\Queue\RedisQueue 152 class: Simpleue\Queue\RedisQueue
diff --git a/src/Wallabag/ImportBundle/Resources/config/services.yml b/src/Wallabag/ImportBundle/Resources/config/services.yml
index 973c0d03..d824da4a 100644
--- a/src/Wallabag/ImportBundle/Resources/config/services.yml
+++ b/src/Wallabag/ImportBundle/Resources/config/services.yml
@@ -48,6 +48,18 @@ services:
48 tags: 48 tags:
49 - { name: wallabag_import.import, alias: wallabag_v2 } 49 - { name: wallabag_import.import, alias: wallabag_v2 }
50 50
51 wallabag_import.elcurator.import:
52 class: Wallabag\ImportBundle\Import\ElcuratorImport
53 arguments:
54 - "@doctrine.orm.entity_manager"
55 - "@wallabag_core.content_proxy"
56 - "@wallabag_core.tags_assigner"
57 - "@event_dispatcher"
58 calls:
59 - [ setLogger, [ "@logger" ]]
60 tags:
61 - { name: wallabag_import.import, alias: elcurator }
62
51 wallabag_import.readability.import: 63 wallabag_import.readability.import:
52 class: Wallabag\ImportBundle\Import\ReadabilityImport 64 class: Wallabag\ImportBundle\Import\ReadabilityImport
53 arguments: 65 arguments:
diff --git a/src/Wallabag/ImportBundle/Resources/views/Elcurator/index.html.twig b/src/Wallabag/ImportBundle/Resources/views/Elcurator/index.html.twig
new file mode 100644
index 00000000..e3a0d709
--- /dev/null
+++ b/src/Wallabag/ImportBundle/Resources/views/Elcurator/index.html.twig
@@ -0,0 +1,3 @@
1{% extends "WallabagImportBundle:WallabagV1:index.html.twig" %}
2
3{% block title %}{{ 'import.elcurator.page_title'|trans }}{% endblock %}
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 {