mirror of
https://github.com/wallabag/wallabag.git
synced 2024-11-26 19:11:07 +00:00
Few phpDoc fix
And some little mistakes
This commit is contained in:
parent
c5c7f90a81
commit
8eedc8cfac
6 changed files with 27 additions and 16 deletions
|
@ -60,7 +60,7 @@ class WallabagRestController extends FOSRestController
|
||||||
* }
|
* }
|
||||||
* )
|
* )
|
||||||
*
|
*
|
||||||
* @return Entry
|
* @return Response
|
||||||
*/
|
*/
|
||||||
public function getEntriesAction(Request $request)
|
public function getEntriesAction(Request $request)
|
||||||
{
|
{
|
||||||
|
@ -101,7 +101,7 @@ class WallabagRestController extends FOSRestController
|
||||||
* }
|
* }
|
||||||
* )
|
* )
|
||||||
*
|
*
|
||||||
* @return Entry
|
* @return Response
|
||||||
*/
|
*/
|
||||||
public function getEntryAction(Entry $entry)
|
public function getEntryAction(Entry $entry)
|
||||||
{
|
{
|
||||||
|
@ -124,7 +124,7 @@ class WallabagRestController extends FOSRestController
|
||||||
* }
|
* }
|
||||||
* )
|
* )
|
||||||
*
|
*
|
||||||
* @return Entry
|
* @return Response
|
||||||
*/
|
*/
|
||||||
public function postEntriesAction(Request $request)
|
public function postEntriesAction(Request $request)
|
||||||
{
|
{
|
||||||
|
@ -166,7 +166,7 @@ class WallabagRestController extends FOSRestController
|
||||||
* }
|
* }
|
||||||
* )
|
* )
|
||||||
*
|
*
|
||||||
* @return Entry
|
* @return Response
|
||||||
*/
|
*/
|
||||||
public function patchEntriesAction(Entry $entry, Request $request)
|
public function patchEntriesAction(Entry $entry, Request $request)
|
||||||
{
|
{
|
||||||
|
@ -211,7 +211,7 @@ class WallabagRestController extends FOSRestController
|
||||||
* }
|
* }
|
||||||
* )
|
* )
|
||||||
*
|
*
|
||||||
* @return Entry
|
* @return Response
|
||||||
*/
|
*/
|
||||||
public function deleteEntriesAction(Entry $entry)
|
public function deleteEntriesAction(Entry $entry)
|
||||||
{
|
{
|
||||||
|
@ -235,6 +235,8 @@ class WallabagRestController extends FOSRestController
|
||||||
* {"name"="entry", "dataType"="integer", "requirement"="\w+", "description"="The entry ID"}
|
* {"name"="entry", "dataType"="integer", "requirement"="\w+", "description"="The entry ID"}
|
||||||
* }
|
* }
|
||||||
* )
|
* )
|
||||||
|
*
|
||||||
|
* @return Response
|
||||||
*/
|
*/
|
||||||
public function getEntriesTagsAction(Entry $entry)
|
public function getEntriesTagsAction(Entry $entry)
|
||||||
{
|
{
|
||||||
|
@ -257,6 +259,8 @@ class WallabagRestController extends FOSRestController
|
||||||
* {"name"="tags", "dataType"="string", "required"=false, "format"="tag1,tag2,tag3", "description"="a comma-separated list of tags."},
|
* {"name"="tags", "dataType"="string", "required"=false, "format"="tag1,tag2,tag3", "description"="a comma-separated list of tags."},
|
||||||
* }
|
* }
|
||||||
* )
|
* )
|
||||||
|
*
|
||||||
|
* @return Response
|
||||||
*/
|
*/
|
||||||
public function postEntriesTagsAction(Request $request, Entry $entry)
|
public function postEntriesTagsAction(Request $request, Entry $entry)
|
||||||
{
|
{
|
||||||
|
@ -286,6 +290,8 @@ class WallabagRestController extends FOSRestController
|
||||||
* {"name"="entry", "dataType"="integer", "requirement"="\w+", "description"="The entry ID"}
|
* {"name"="entry", "dataType"="integer", "requirement"="\w+", "description"="The entry ID"}
|
||||||
* }
|
* }
|
||||||
* )
|
* )
|
||||||
|
*
|
||||||
|
* @return Response
|
||||||
*/
|
*/
|
||||||
public function deleteEntriesTagsAction(Entry $entry, Tag $tag)
|
public function deleteEntriesTagsAction(Entry $entry, Tag $tag)
|
||||||
{
|
{
|
||||||
|
@ -306,6 +312,8 @@ class WallabagRestController extends FOSRestController
|
||||||
* Retrieve all tags.
|
* Retrieve all tags.
|
||||||
*
|
*
|
||||||
* @ApiDoc()
|
* @ApiDoc()
|
||||||
|
*
|
||||||
|
* @return Response
|
||||||
*/
|
*/
|
||||||
public function getTagsAction()
|
public function getTagsAction()
|
||||||
{
|
{
|
||||||
|
@ -328,6 +336,8 @@ class WallabagRestController extends FOSRestController
|
||||||
* {"name"="tag", "dataType"="integer", "requirement"="\w+", "description"="The tag"}
|
* {"name"="tag", "dataType"="integer", "requirement"="\w+", "description"="The tag"}
|
||||||
* }
|
* }
|
||||||
* )
|
* )
|
||||||
|
*
|
||||||
|
* @return Response
|
||||||
*/
|
*/
|
||||||
public function deleteTagAction(Tag $tag)
|
public function deleteTagAction(Tag $tag)
|
||||||
{
|
{
|
||||||
|
|
|
@ -11,7 +11,6 @@ use Symfony\Component\Console\Output\NullOutput;
|
||||||
use Symfony\Component\Console\Question\Question;
|
use Symfony\Component\Console\Question\Question;
|
||||||
use Symfony\Component\Console\Question\ConfirmationQuestion;
|
use Symfony\Component\Console\Question\ConfirmationQuestion;
|
||||||
use Symfony\Component\Console\Helper\Table;
|
use Symfony\Component\Console\Helper\Table;
|
||||||
use Wallabag\UserBundle\Entity\User;
|
|
||||||
use Wallabag\CoreBundle\Entity\Config;
|
use Wallabag\CoreBundle\Entity\Config;
|
||||||
|
|
||||||
class InstallCommand extends ContainerAwareCommand
|
class InstallCommand extends ContainerAwareCommand
|
||||||
|
|
|
@ -5,6 +5,7 @@ namespace Wallabag\CoreBundle\Entity;
|
||||||
use Doctrine\Common\Collections\ArrayCollection;
|
use Doctrine\Common\Collections\ArrayCollection;
|
||||||
use Doctrine\ORM\Mapping as ORM;
|
use Doctrine\ORM\Mapping as ORM;
|
||||||
use Symfony\Component\Validator\Constraints as Assert;
|
use Symfony\Component\Validator\Constraints as Assert;
|
||||||
|
use Wallabag\UserBundle\Entity\User;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Config.
|
* Config.
|
||||||
|
@ -86,7 +87,7 @@ class Config
|
||||||
/*
|
/*
|
||||||
* @param User $user
|
* @param User $user
|
||||||
*/
|
*/
|
||||||
public function __construct(\Wallabag\UserBundle\Entity\User $user)
|
public function __construct(User $user)
|
||||||
{
|
{
|
||||||
$this->user = $user;
|
$this->user = $user;
|
||||||
$this->taggingRules = new ArrayCollection();
|
$this->taggingRules = new ArrayCollection();
|
||||||
|
@ -181,7 +182,7 @@ class Config
|
||||||
*
|
*
|
||||||
* @return Config
|
* @return Config
|
||||||
*/
|
*/
|
||||||
public function setUser(\Wallabag\UserBundle\Entity\User $user = null)
|
public function setUser(User $user = null)
|
||||||
{
|
{
|
||||||
$this->user = $user;
|
$this->user = $user;
|
||||||
|
|
||||||
|
@ -225,7 +226,7 @@ class Config
|
||||||
/**
|
/**
|
||||||
* Set rssLimit.
|
* Set rssLimit.
|
||||||
*
|
*
|
||||||
* @param string $rssLimit
|
* @param int $rssLimit
|
||||||
*
|
*
|
||||||
* @return Config
|
* @return Config
|
||||||
*/
|
*/
|
||||||
|
@ -239,7 +240,7 @@ class Config
|
||||||
/**
|
/**
|
||||||
* Get rssLimit.
|
* Get rssLimit.
|
||||||
*
|
*
|
||||||
* @return string
|
* @return int
|
||||||
*/
|
*/
|
||||||
public function getRssLimit()
|
public function getRssLimit()
|
||||||
{
|
{
|
||||||
|
|
|
@ -245,7 +245,7 @@ class Entry
|
||||||
/**
|
/**
|
||||||
* Set isArchived.
|
* Set isArchived.
|
||||||
*
|
*
|
||||||
* @param string $isArchived
|
* @param bool $isArchived
|
||||||
*
|
*
|
||||||
* @return Entry
|
* @return Entry
|
||||||
*/
|
*/
|
||||||
|
@ -259,7 +259,7 @@ class Entry
|
||||||
/**
|
/**
|
||||||
* Get isArchived.
|
* Get isArchived.
|
||||||
*
|
*
|
||||||
* @return string
|
* @return bool
|
||||||
*/
|
*/
|
||||||
public function isArchived()
|
public function isArchived()
|
||||||
{
|
{
|
||||||
|
@ -276,7 +276,7 @@ class Entry
|
||||||
/**
|
/**
|
||||||
* Set isStarred.
|
* Set isStarred.
|
||||||
*
|
*
|
||||||
* @param string $isStarred
|
* @param bool $isStarred
|
||||||
*
|
*
|
||||||
* @return Entry
|
* @return Entry
|
||||||
*/
|
*/
|
||||||
|
@ -290,7 +290,7 @@ class Entry
|
||||||
/**
|
/**
|
||||||
* Get isStarred.
|
* Get isStarred.
|
||||||
*
|
*
|
||||||
* @return string
|
* @return bool
|
||||||
*/
|
*/
|
||||||
public function isStarred()
|
public function isStarred()
|
||||||
{
|
{
|
||||||
|
|
|
@ -18,6 +18,7 @@ class PocketImport implements ImportInterface
|
||||||
private $em;
|
private $em;
|
||||||
private $contentProxy;
|
private $contentProxy;
|
||||||
private $logger;
|
private $logger;
|
||||||
|
private $client;
|
||||||
private $consumerKey;
|
private $consumerKey;
|
||||||
private $skippedEntries = 0;
|
private $skippedEntries = 0;
|
||||||
private $importedEntries = 0;
|
private $importedEntries = 0;
|
||||||
|
@ -255,7 +256,7 @@ class PocketImport implements ImportInterface
|
||||||
|
|
||||||
// flush every 20 entries
|
// flush every 20 entries
|
||||||
if (($i % 20) === 0) {
|
if (($i % 20) === 0) {
|
||||||
$em->flush();
|
$this->em->flush();
|
||||||
}
|
}
|
||||||
++$i;
|
++$i;
|
||||||
}
|
}
|
||||||
|
|
|
@ -149,7 +149,7 @@ class WallabagV1Import implements ImportInterface
|
||||||
|
|
||||||
// flush every 20 entries
|
// flush every 20 entries
|
||||||
if (($i % 20) === 0) {
|
if (($i % 20) === 0) {
|
||||||
$em->flush();
|
$this->em->flush();
|
||||||
}
|
}
|
||||||
++$i;
|
++$i;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue