diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-12-14 11:54:30 +0100 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-12-15 21:38:16 +0100 |
commit | 21e7ccef3d960f4747d58fc0c9e081618e9451eb (patch) | |
tree | 295c0af56ecaaf9202618d14b67244da373e5f99 /src/Wallabag/ImportBundle/Controller | |
parent | 202a66ce02bf42743e66fbc1ea1dbfe5b6a1c83a (diff) | |
download | wallabag-21e7ccef3d960f4747d58fc0c9e081618e9451eb.tar.gz wallabag-21e7ccef3d960f4747d58fc0c9e081618e9451eb.tar.zst wallabag-21e7ccef3d960f4747d58fc0c9e081618e9451eb.zip |
Fix tests & deprecation notice
Diffstat (limited to 'src/Wallabag/ImportBundle/Controller')
5 files changed, 5 insertions, 5 deletions
diff --git a/src/Wallabag/ImportBundle/Controller/BrowserController.php b/src/Wallabag/ImportBundle/Controller/BrowserController.php index 144a4880..e119098f 100644 --- a/src/Wallabag/ImportBundle/Controller/BrowserController.php +++ b/src/Wallabag/ImportBundle/Controller/BrowserController.php | |||
@@ -39,7 +39,7 @@ abstract class BrowserController extends Controller | |||
39 | $wallabag = $this->getImportService(); | 39 | $wallabag = $this->getImportService(); |
40 | $wallabag->setUser($this->getUser()); | 40 | $wallabag->setUser($this->getUser()); |
41 | 41 | ||
42 | if ($form->isValid()) { | 42 | if ($form->isSubmitted() && $form->isValid()) { |
43 | $file = $form->get('file')->getData(); | 43 | $file = $form->get('file')->getData(); |
44 | $markAsRead = $form->get('mark_as_read')->getData(); | 44 | $markAsRead = $form->get('mark_as_read')->getData(); |
45 | $name = $this->getUser()->getId().'.json'; | 45 | $name = $this->getUser()->getId().'.json'; |
diff --git a/src/Wallabag/ImportBundle/Controller/InstapaperController.php b/src/Wallabag/ImportBundle/Controller/InstapaperController.php index c3fc8a39..0251acb9 100644 --- a/src/Wallabag/ImportBundle/Controller/InstapaperController.php +++ b/src/Wallabag/ImportBundle/Controller/InstapaperController.php | |||
@@ -26,7 +26,7 @@ class InstapaperController extends Controller | |||
26 | $instapaper->setProducer($this->get('wallabag_import.producer.redis.instapaper')); | 26 | $instapaper->setProducer($this->get('wallabag_import.producer.redis.instapaper')); |
27 | } | 27 | } |
28 | 28 | ||
29 | if ($form->isValid()) { | 29 | if ($form->isSubmitted() && $form->isValid()) { |
30 | $file = $form->get('file')->getData(); | 30 | $file = $form->get('file')->getData(); |
31 | $markAsRead = $form->get('mark_as_read')->getData(); | 31 | $markAsRead = $form->get('mark_as_read')->getData(); |
32 | $name = 'instapaper_'.$this->getUser()->getId().'.csv'; | 32 | $name = 'instapaper_'.$this->getUser()->getId().'.csv'; |
diff --git a/src/Wallabag/ImportBundle/Controller/PinboardController.php b/src/Wallabag/ImportBundle/Controller/PinboardController.php index 9c3f98d6..d0ad8aa8 100644 --- a/src/Wallabag/ImportBundle/Controller/PinboardController.php +++ b/src/Wallabag/ImportBundle/Controller/PinboardController.php | |||
@@ -26,7 +26,7 @@ class PinboardController extends Controller | |||
26 | $pinboard->setProducer($this->get('wallabag_import.producer.redis.pinboard')); | 26 | $pinboard->setProducer($this->get('wallabag_import.producer.redis.pinboard')); |
27 | } | 27 | } |
28 | 28 | ||
29 | if ($form->isValid()) { | 29 | if ($form->isSubmitted() && $form->isValid()) { |
30 | $file = $form->get('file')->getData(); | 30 | $file = $form->get('file')->getData(); |
31 | $markAsRead = $form->get('mark_as_read')->getData(); | 31 | $markAsRead = $form->get('mark_as_read')->getData(); |
32 | $name = 'pinboard_'.$this->getUser()->getId().'.json'; | 32 | $name = 'pinboard_'.$this->getUser()->getId().'.json'; |
diff --git a/src/Wallabag/ImportBundle/Controller/ReadabilityController.php b/src/Wallabag/ImportBundle/Controller/ReadabilityController.php index d00e22c2..aa732ddd 100644 --- a/src/Wallabag/ImportBundle/Controller/ReadabilityController.php +++ b/src/Wallabag/ImportBundle/Controller/ReadabilityController.php | |||
@@ -26,7 +26,7 @@ class ReadabilityController extends Controller | |||
26 | $readability->setProducer($this->get('wallabag_import.producer.redis.readability')); | 26 | $readability->setProducer($this->get('wallabag_import.producer.redis.readability')); |
27 | } | 27 | } |
28 | 28 | ||
29 | if ($form->isValid()) { | 29 | if ($form->isSubmitted() && $form->isValid()) { |
30 | $file = $form->get('file')->getData(); | 30 | $file = $form->get('file')->getData(); |
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'; |
diff --git a/src/Wallabag/ImportBundle/Controller/WallabagController.php b/src/Wallabag/ImportBundle/Controller/WallabagController.php index 9c0cde80..e81c1ca9 100644 --- a/src/Wallabag/ImportBundle/Controller/WallabagController.php +++ b/src/Wallabag/ImportBundle/Controller/WallabagController.php | |||
@@ -40,7 +40,7 @@ abstract class WallabagController extends Controller | |||
40 | $wallabag = $this->getImportService(); | 40 | $wallabag = $this->getImportService(); |
41 | $wallabag->setUser($this->getUser()); | 41 | $wallabag->setUser($this->getUser()); |
42 | 42 | ||
43 | if ($form->isValid()) { | 43 | if ($form->isSubmitted() && $form->isValid()) { |
44 | $file = $form->get('file')->getData(); | 44 | $file = $form->get('file')->getData(); |
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'; |