aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Wallabag/CoreBundle/Command/CleanDuplicatesCommand.php5
-rw-r--r--src/Wallabag/CoreBundle/Command/ExportCommand.php5
-rw-r--r--src/Wallabag/CoreBundle/Command/InstallCommand.php1
-rw-r--r--src/Wallabag/CoreBundle/Command/ShowUserCommand.php28
-rw-r--r--src/Wallabag/CoreBundle/Helper/ContentProxy.php10
-rw-r--r--src/Wallabag/ImportBundle/Controller/BrowserController.php12
6 files changed, 27 insertions, 34 deletions
diff --git a/src/Wallabag/CoreBundle/Command/CleanDuplicatesCommand.php b/src/Wallabag/CoreBundle/Command/CleanDuplicatesCommand.php
index d964439d..b4aa4e47 100644
--- a/src/Wallabag/CoreBundle/Command/CleanDuplicatesCommand.php
+++ b/src/Wallabag/CoreBundle/Command/CleanDuplicatesCommand.php
@@ -111,9 +111,4 @@ class CleanDuplicatesCommand extends ContainerAwareCommand
111 { 111 {
112 return $this->getContainer()->get('wallabag_user.user_repository')->findOneByUserName($username); 112 return $this->getContainer()->get('wallabag_user.user_repository')->findOneByUserName($username);
113 } 113 }
114
115 private function getDoctrine()
116 {
117 return $this->getContainer()->get('doctrine');
118 }
119} 114}
diff --git a/src/Wallabag/CoreBundle/Command/ExportCommand.php b/src/Wallabag/CoreBundle/Command/ExportCommand.php
index c2e4be05..291926e4 100644
--- a/src/Wallabag/CoreBundle/Command/ExportCommand.php
+++ b/src/Wallabag/CoreBundle/Command/ExportCommand.php
@@ -69,9 +69,4 @@ class ExportCommand extends ContainerAwareCommand
69 69
70 return 0; 70 return 0;
71 } 71 }
72
73 private function getDoctrine()
74 {
75 return $this->getContainer()->get('doctrine');
76 }
77} 72}
diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php
index 50551480..c7809053 100644
--- a/src/Wallabag/CoreBundle/Command/InstallCommand.php
+++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php
@@ -14,7 +14,6 @@ use Symfony\Component\Console\Output\BufferedOutput;
14use Symfony\Component\Console\Output\OutputInterface; 14use Symfony\Component\Console\Output\OutputInterface;
15use Symfony\Component\Console\Question\ConfirmationQuestion; 15use Symfony\Component\Console\Question\ConfirmationQuestion;
16use Symfony\Component\Console\Question\Question; 16use Symfony\Component\Console\Question\Question;
17use Wallabag\CoreBundle\Entity\Config;
18 17
19class InstallCommand extends ContainerAwareCommand 18class InstallCommand extends ContainerAwareCommand
20{ 19{
diff --git a/src/Wallabag/CoreBundle/Command/ShowUserCommand.php b/src/Wallabag/CoreBundle/Command/ShowUserCommand.php
index eef04988..090309d9 100644
--- a/src/Wallabag/CoreBundle/Command/ShowUserCommand.php
+++ b/src/Wallabag/CoreBundle/Command/ShowUserCommand.php
@@ -7,12 +7,13 @@ use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
7use Symfony\Component\Console\Input\InputArgument; 7use Symfony\Component\Console\Input\InputArgument;
8use Symfony\Component\Console\Input\InputInterface; 8use Symfony\Component\Console\Input\InputInterface;
9use Symfony\Component\Console\Output\OutputInterface; 9use Symfony\Component\Console\Output\OutputInterface;
10use Symfony\Component\Console\Style\SymfonyStyle;
10use Wallabag\UserBundle\Entity\User; 11use Wallabag\UserBundle\Entity\User;
11 12
12class ShowUserCommand extends ContainerAwareCommand 13class ShowUserCommand extends ContainerAwareCommand
13{ 14{
14 /** @var OutputInterface */ 15 /** @var SymfonyStyle */
15 protected $output; 16 protected $io;
16 17
17 protected function configure() 18 protected function configure()
18 { 19 {
@@ -29,7 +30,7 @@ class ShowUserCommand extends ContainerAwareCommand
29 30
30 protected function execute(InputInterface $input, OutputInterface $output) 31 protected function execute(InputInterface $input, OutputInterface $output)
31 { 32 {
32 $this->output = $output; 33 $this->io = new SymfonyStyle($input, $output);
33 34
34 $username = $input->getArgument('username'); 35 $username = $input->getArgument('username');
35 36
@@ -37,7 +38,7 @@ class ShowUserCommand extends ContainerAwareCommand
37 $user = $this->getUser($username); 38 $user = $this->getUser($username);
38 $this->showUser($user); 39 $this->showUser($user);
39 } catch (NoResultException $e) { 40 } catch (NoResultException $e) {
40 $output->writeln(sprintf('<error>User "%s" not found.</error>', $username)); 41 $this->io->error(sprintf('User "%s" not found.', $username));
41 42
42 return 1; 43 return 1;
43 } 44 }
@@ -50,12 +51,14 @@ class ShowUserCommand extends ContainerAwareCommand
50 */ 51 */
51 private function showUser(User $user) 52 private function showUser(User $user)
52 { 53 {
53 $this->output->writeln(sprintf('Username : %s', $user->getUsername())); 54 $this->io->listing([
54 $this->output->writeln(sprintf('Email : %s', $user->getEmail())); 55 sprintf('Username : %s', $user->getUsername()),
55 $this->output->writeln(sprintf('Display name : %s', $user->getName())); 56 sprintf('Email : %s', $user->getEmail()),
56 $this->output->writeln(sprintf('Creation date : %s', $user->getCreatedAt()->format('Y-m-d H:i:s'))); 57 sprintf('Display name : %s', $user->getName()),
57 $this->output->writeln(sprintf('Last login : %s', $user->getLastLogin() !== null ? $user->getLastLogin()->format('Y-m-d H:i:s') : 'never')); 58 sprintf('Creation date : %s', $user->getCreatedAt()->format('Y-m-d H:i:s')),
58 $this->output->writeln(sprintf('2FA activated: %s', $user->isTwoFactorAuthentication() ? 'yes' : 'no')); 59 sprintf('Last login : %s', $user->getLastLogin() !== null ? $user->getLastLogin()->format('Y-m-d H:i:s') : 'never'),
60 sprintf('2FA activated: %s', $user->isTwoFactorAuthentication() ? 'yes' : 'no'),
61 ]);
59 } 62 }
60 63
61 /** 64 /**
@@ -69,9 +72,4 @@ class ShowUserCommand extends ContainerAwareCommand
69 { 72 {
70 return $this->getContainer()->get('wallabag_user.user_repository')->findOneByUserName($username); 73 return $this->getContainer()->get('wallabag_user.user_repository')->findOneByUserName($username);
71 } 74 }
72
73 private function getDoctrine()
74 {
75 return $this->getContainer()->get('doctrine');
76 }
77} 75}
diff --git a/src/Wallabag/CoreBundle/Helper/ContentProxy.php b/src/Wallabag/CoreBundle/Helper/ContentProxy.php
index 656ac6ee..1ac7ad83 100644
--- a/src/Wallabag/CoreBundle/Helper/ContentProxy.php
+++ b/src/Wallabag/CoreBundle/Helper/ContentProxy.php
@@ -126,11 +126,17 @@ class ContentProxy
126 126
127 // is it a timestamp? 127 // is it a timestamp?
128 if (filter_var($date, FILTER_VALIDATE_INT) !== false) { 128 if (filter_var($date, FILTER_VALIDATE_INT) !== false) {
129 $date = '@' . $value; 129 $date = '@' . $date;
130 } 130 }
131 131
132 try { 132 try {
133 $entry->setPublishedAt(new \DateTime($date)); 133 // is it already a DateTime?
134 // (it's inside the try/catch in case of fail to be parse time string)
135 if (!$date instanceof \DateTime) {
136 $date = new \DateTime($date);
137 }
138
139 $entry->setPublishedAt($date);
134 } catch (\Exception $e) { 140 } catch (\Exception $e) {
135 $this->logger->warning('Error while defining date', ['e' => $e, 'url' => $entry->getUrl(), 'date' => $value]); 141 $this->logger->warning('Error while defining date', ['e' => $e, 'url' => $entry->getUrl(), 'date' => $value]);
136 } 142 }
diff --git a/src/Wallabag/ImportBundle/Controller/BrowserController.php b/src/Wallabag/ImportBundle/Controller/BrowserController.php
index 0753e318..77a7a904 100644
--- a/src/Wallabag/ImportBundle/Controller/BrowserController.php
+++ b/src/Wallabag/ImportBundle/Controller/BrowserController.php
@@ -80,10 +80,10 @@ abstract class BrowserController extends Controller
80 */ 80 */
81 abstract protected function getImportService(); 81 abstract protected function getImportService();
82 82
83 /** 83 /**
84 * Return the template used for the form. 84 * Return the template used for the form.
85 * 85 *
86 * @return string 86 * @return string
87 */ 87 */
88 abstract protected function getImportTemplate(); 88 abstract protected function getImportTemplate();
89} 89}