diff options
| author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-09-11 20:24:04 +0200 |
|---|---|---|
| committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-09-11 22:15:31 +0200 |
| commit | 015c7a8359c950f9621b38b11c3973860a981da8 (patch) | |
| tree | c9564ff38242df100e19f2de77d8d640599c0ea2 /src/Wallabag/ImportBundle/Controller | |
| parent | 7d862f83b95d24b4f081d73ca7b0bdf4435ae008 (diff) | |
| download | wallabag-015c7a8359c950f9621b38b11c3973860a981da8.tar.gz wallabag-015c7a8359c950f9621b38b11c3973860a981da8.tar.zst wallabag-015c7a8359c950f9621b38b11c3973860a981da8.zip | |
Add more tests
And ability to define how many messages can be hanle by the redis worker before stopping (usefull for tests)
Diffstat (limited to 'src/Wallabag/ImportBundle/Controller')
| -rw-r--r-- | src/Wallabag/ImportBundle/Controller/ReadabilityController.php | 2 | ||||
| -rw-r--r-- | src/Wallabag/ImportBundle/Controller/WallabagController.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Wallabag/ImportBundle/Controller/ReadabilityController.php b/src/Wallabag/ImportBundle/Controller/ReadabilityController.php index 61243042..8775e8a3 100644 --- a/src/Wallabag/ImportBundle/Controller/ReadabilityController.php +++ b/src/Wallabag/ImportBundle/Controller/ReadabilityController.php | |||
| @@ -31,7 +31,7 @@ class ReadabilityController extends Controller | |||
| 31 | $markAsRead = $form->get('mark_as_read')->getData(); | 31 | $markAsRead = $form->get('mark_as_read')->getData(); |
| 32 | $name = 'readability_'.$this->getUser()->getId().'.json'; | 32 | $name = 'readability_'.$this->getUser()->getId().'.json'; |
| 33 | 33 | ||
| 34 | if (in_array($file->getClientMimeType(), $this->getParameter('wallabag_import.allow_mimetypes')) && $file->move($this->getParameter('wallabag_import.resource_dir'), $name)) { | 34 | if (null !== $file && in_array($file->getClientMimeType(), $this->getParameter('wallabag_import.allow_mimetypes')) && $file->move($this->getParameter('wallabag_import.resource_dir'), $name)) { |
| 35 | $res = $readability | 35 | $res = $readability |
| 36 | ->setFilepath($this->getParameter('wallabag_import.resource_dir').'/'.$name) | 36 | ->setFilepath($this->getParameter('wallabag_import.resource_dir').'/'.$name) |
| 37 | ->setMarkAsRead($markAsRead) | 37 | ->setMarkAsRead($markAsRead) |
diff --git a/src/Wallabag/ImportBundle/Controller/WallabagController.php b/src/Wallabag/ImportBundle/Controller/WallabagController.php index 1e6114c5..3c2dd6d1 100644 --- a/src/Wallabag/ImportBundle/Controller/WallabagController.php +++ b/src/Wallabag/ImportBundle/Controller/WallabagController.php | |||
| @@ -45,7 +45,7 @@ abstract class WallabagController extends Controller | |||
| 45 | $markAsRead = $form->get('mark_as_read')->getData(); | 45 | $markAsRead = $form->get('mark_as_read')->getData(); |
| 46 | $name = $this->getUser()->getId().'.json'; | 46 | $name = $this->getUser()->getId().'.json'; |
| 47 | 47 | ||
| 48 | if (in_array($file->getClientMimeType(), $this->getParameter('wallabag_import.allow_mimetypes')) && $file->move($this->getParameter('wallabag_import.resource_dir'), $name)) { | 48 | if (null !== $file && in_array($file->getClientMimeType(), $this->getParameter('wallabag_import.allow_mimetypes')) && $file->move($this->getParameter('wallabag_import.resource_dir'), $name)) { |
| 49 | $res = $wallabag | 49 | $res = $wallabag |
| 50 | ->setFilepath($this->getParameter('wallabag_import.resource_dir').'/'.$name) | 50 | ->setFilepath($this->getParameter('wallabag_import.resource_dir').'/'.$name) |
| 51 | ->setMarkAsRead($markAsRead) | 51 | ->setMarkAsRead($markAsRead) |