mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-12-23 08:06:33 +00:00
Code Issues Projects Releases Wiki Activity

Fix phpcs and tests

Browse source
This commit is contained in:
Thomas Citharel 2017-01-24 20:42:02 +01:00
parent a607b7a9c0
commit 3b0380f049
2 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/Wallabag/CoreBundle/Command/ExportCommand.php
View file

@ -7,7 +7,6 @@ use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Output\StreamOutput;
class ExportCommand extends ContainerAwareCommand class ExportCommand extends ContainerAwareCommand
{ {
@ -33,11 +32,13 @@ class ExportCommand extends ContainerAwareCommand
protected function execute(InputInterface $input, OutputInterface $output) protected function execute(InputInterface $input, OutputInterface $output)
{ {
try { try {
$user = $this->getUser($input->getArgument('username')); $user = $this->getDoctrine()->getRepository('WallabagUserBundle:User')->findOneByUserName($input->getArgument('username'));
} catch (NoResultException $e) { } catch (NoResultException $e) {
$output->writeln(sprintf('<error>User "%s" not found.</error>', $input->getArgument('username'))); $output->writeln(sprintf('<error>User "%s" not found.</error>', $input->getArgument('username')));
return 1; return 1;
} }
$entries = $this->getDoctrine() $entries = $this->getDoctrine()
->getRepository('WallabagCoreBundle:Entry') ->getRepository('WallabagCoreBundle:Entry')
->getBuilderForAllByUser($user->getId()) ->getBuilderForAllByUser($user->getId())
@ -47,9 +48,11 @@ class ExportCommand extends ContainerAwareCommand
$output->write(sprintf('Exporting %d entrie(s) for user « <comment>%s</comment> »... ', count($entries), $user->getUserName())); $output->write(sprintf('Exporting %d entrie(s) for user « <comment>%s</comment> »... ', count($entries), $user->getUserName()));
$filePath = $input->getArgument('filepath'); $filePath = $input->getArgument('filepath');
if (!$filePath) { if (!$filePath) {
$filePath = $this->getContainer()->getParameter('kernel.root_dir') . '/../' . sprintf('%s-export', $user->getUsername()); $filePath = $this->getContainer()->getParameter('kernel.root_dir').'/../'.sprintf('%s-export.json', $user->getUsername());
} }
try { try {
$data = $this->getContainer()->get('wallabag_core.helper.entries_export') $data = $this->getContainer()->get('wallabag_core.helper.entries_export')
->setEntries($entries) ->setEntries($entries)
@ -58,21 +61,13 @@ class ExportCommand extends ContainerAwareCommand
file_put_contents($filePath, $data); file_put_contents($filePath, $data);
} catch (\InvalidArgumentException $e) { } catch (\InvalidArgumentException $e) {
$output->writeln(sprintf('<error>Error: "%s"</error>', $e->getMessage())); $output->writeln(sprintf('<error>Error: "%s"</error>', $e->getMessage()));
return 1;
} }
$output->writeln('<info>Done.</info>'); $output->writeln('<info>Done.</info>');
}
/** return 0;
* Fetches a user from its username.
*
* @param string $username
*
* @return \Wallabag\UserBundle\Entity\User
*/
private function getUser($username)
{
return $this->getDoctrine()->getRepository('WallabagUserBundle:User')->findOneByUserName($username);
} }
private function getDoctrine() private function getDoctrine()

1
tests/Wallabag/CoreBundle/Command/ExportCommandTest.php
View file

@ -56,6 +56,7 @@ class ExportCommandTest extends WallabagCoreTestCase
]); ]);
$this->assertContains('Exporting 6 entrie(s) for user « admin »... Done', $tester->getDisplay()); $this->assertContains('Exporting 6 entrie(s) for user « admin »... Done', $tester->getDisplay());
$this->assertFileExists('admin-export.json');
} }
public function testExportCommandWithSpecialPath() public function testExportCommandWithSpecialPath()