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

Merge pull request #3986 from wallabag/fix/scrutinizer-issues

Browse source 
Fix some Scrutinizer issues
This commit is contained in:
Jérémy Benoist 2019-05-29 14:40:01 +02:00 committed by GitHub
commit ecd54aa57e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Wallabag/ApiBundle/Controller/EntryRestController.php
View file

@ -564,7 +564,7 @@ class EntryRestController extends WallabagRestController
} }
// if refreshing entry failed, don't save it // if refreshing entry failed, don't save it
if ($this->getParameter('wallabag_core.fetching_error_message') === $entry->getContent()) { if ($this->container->getParameter('wallabag_core.fetching_error_message') === $entry->getContent()) {
return new JsonResponse([], 304); return new JsonResponse([], 304);
} }

2
src/Wallabag/ApiBundle/Controller/UserRestController.php
View file

@ -45,7 +45,7 @@ class UserRestController extends WallabagRestController
*/ */
public function putUserAction(Request $request) public function putUserAction(Request $request)
{ {
if (!$this->getParameter('fosuser_registration') || !$this->get('craue_config')->get('api_user_registration')) { if (!$this->container->getParameter('fosuser_registration') || !$this->get('craue_config')->get('api_user_registration')) {
$json = $this->get('jms_serializer')->serialize(['error' => "Server doesn't allow registrations"], 'json'); $json = $this->get('jms_serializer')->serialize(['error' => "Server doesn't allow registrations"], 'json');
return (new JsonResponse()) return (new JsonResponse())

4
src/Wallabag/ApiBundle/Controller/WallabagRestController.php
View file

@ -2,13 +2,13 @@
namespace Wallabag\ApiBundle\Controller; namespace Wallabag\ApiBundle\Controller;
use FOS\RestBundle\Controller\FOSRestController; use FOS\RestBundle\Controller\AbstractFOSRestController;
use JMS\Serializer\SerializationContext; use JMS\Serializer\SerializationContext;
use Nelmio\ApiDocBundle\Annotation\ApiDoc; use Nelmio\ApiDocBundle\Annotation\ApiDoc;
use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\Security\Core\Exception\AccessDeniedException; use Symfony\Component\Security\Core\Exception\AccessDeniedException;
class WallabagRestController extends FOSRestController class WallabagRestController extends AbstractFOSRestController
{ {
/** /**
* Retrieve version number. * Retrieve version number.

2
src/Wallabag/CoreBundle/Entity/Entry.php
View file

@ -771,7 +771,7 @@ class Entry
} }
/** /**
* @return string * @return string|null
*/ */
public function getUid() public function getUid()
{ {

4
src/Wallabag/CoreBundle/Repository/EntryRepository.php
View file

@ -345,7 +345,7 @@ class EntryRepository extends EntityRepository
* @param string $url * @param string $url
* @param int $userId * @param int $userId
* *
* @return Entry|bool * @return Entry|false
*/ */
public function findByUrlAndUserId($url, $userId) public function findByUrlAndUserId($url, $userId)
{ {
@ -362,7 +362,7 @@ class EntryRepository extends EntityRepository
* @param string $hashedUrl Url hashed using sha1 * @param string $hashedUrl Url hashed using sha1
* @param int $userId * @param int $userId
* *
* @return Entry|bool * @return Entry|false
*/ */
public function findByHashedUrlAndUserId($hashedUrl, $userId) public function findByHashedUrlAndUserId($hashedUrl, $userId)
{ {