use Hateoas\Configuration\Route;
use Hateoas\Representation\Factory\PagerfantaFactory;
+use JMS\Serializer\SerializationContext;
use Nelmio\ApiDocBundle\Annotation\ApiDoc;
-use Symfony\Component\HttpKernel\Exception\HttpException;
-use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Exception\HttpException;
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
use Wallabag\CoreBundle\Entity\Entry;
use Wallabag\CoreBundle\Entity\Tag;
-use Wallabag\CoreBundle\Event\EntrySavedEvent;
use Wallabag\CoreBundle\Event\EntryDeletedEvent;
+use Wallabag\CoreBundle\Event\EntrySavedEvent;
class EntryRestController extends WallabagRestController
{
* Return ID if entry(ies) exist (and if you give the return_id parameter).
* Otherwise it returns false.
*
+ * @todo Remove that `return_id` in the next major release
+ *
* @ApiDoc(
* parameters={
* {"name"="return_id", "dataType"="string", "required"=false, "format"="1 or 0", "description"="Set 1 if you want to retrieve ID in case entry(ies) exists, 0 by default"},
{
$this->validateAuthentication();
- $returnId = (null === $request->query->get('return_id')) ? 0 : (bool) $request->query->get('return_id');
+ $returnId = (null === $request->query->get('return_id')) ? false : (bool) $request->query->get('return_id');
$urls = $request->query->get('urls', []);
// handle multiple urls first
->getRepository('WallabagCoreBundle:Entry')
->findByUrlAndUserId($url, $this->getUser()->getId());
- $results[$url] = $res instanceof Entry ? ($returnId ? $res->getId() : true) : false;
+ $results[$url] = $this->returnExistInformation($res, $returnId);
}
return $this->sendResponse($results);
$url = $request->query->get('url', '');
if (empty($url)) {
- throw $this->createAccessDeniedException('URL is empty?, logged user id: '.$this->getUser()->getId());
+ throw $this->createAccessDeniedException('URL is empty?, logged user id: ' . $this->getUser()->getId());
}
$res = $this->getDoctrine()
->getRepository('WallabagCoreBundle:Entry')
->findByUrlAndUserId($url, $this->getUser()->getId());
- $exists = $res instanceof Entry ? ($returnId ? $res->getId() : true) : false;
+ $exists = $this->returnExistInformation($res, $returnId);
return $this->sendResponse(['exists' => $exists]);
}
* }
* )
*
- * @return JsonResponse
- *
* @throws HttpException When limit is reached
+ *
+ * @return JsonResponse
*/
public function postEntriesListAction(Request $request)
{
*/
private function sendResponse($data)
{
- $json = $this->get('serializer')->serialize($data, 'json');
+ // https://github.com/schmittjoh/JMSSerializerBundle/issues/293
+ $context = new SerializationContext();
+ $context->setSerializeNull(true);
+
+ $json = $this->get('serializer')->serialize($data, 'json', $context);
return (new JsonResponse())->setJson($json);
}
]);
}
- if (!is_null($isArchived)) {
+ if (null !== $isArchived) {
$entry->setArchived((bool) $isArchived);
}
- if (!is_null($isStarred)) {
+ if (null !== $isStarred) {
$entry->setStarred((bool) $isStarred);
}
$this->get('wallabag_core.tags_assigner')->assignTagsToEntry($entry, $tags);
}
- if (!is_null($isPublic)) {
+ if (null !== $isPublic) {
if (true === (bool) $isPublic && null === $entry->getUid()) {
$entry->generateUid();
} elseif (false === (bool) $isPublic) {
// entry saved, dispatch event about it!
$this->get('event_dispatcher')->dispatch(EntrySavedEvent::NAME, new EntrySavedEvent($entry));
}
+
+ /**
+ * Return information about the entry if it exist and depending on the id or not.
+ *
+ * @param Entry|null $entry
+ * @param bool $returnId
+ *
+ * @return bool|int
+ */
+ private function returnExistInformation($entry, $returnId)
+ {
+ if ($returnId) {
+ return $entry instanceof Entry ? $entry->getId() : null;
+ }
+
+ return $entry instanceof Entry;
+ }
}