diff options
author | Kevin Decherf <kevin@kdecherf.com> | 2019-02-13 15:05:57 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-13 15:05:57 +0100 |
commit | b1992b340e21b6846a1ec2ae6ddd7217f3b24fb5 (patch) | |
tree | c8c5ab6b1354782c82139a12372c3532001124fd /src/Wallabag/CoreBundle | |
parent | 47e47841105a34c852744e207b4a0ea9e879ec49 (diff) | |
parent | 44560c77677d1d2a0eda0bf63f56c9dff033744f (diff) | |
download | wallabag-b1992b340e21b6846a1ec2ae6ddd7217f3b24fb5.tar.gz wallabag-b1992b340e21b6846a1ec2ae6ddd7217f3b24fb5.tar.zst wallabag-b1992b340e21b6846a1ec2ae6ddd7217f3b24fb5.zip |
Merge pull request #3882 from wallabag/fix/cors
Fix CORS for API
Diffstat (limited to 'src/Wallabag/CoreBundle')
3 files changed, 3 insertions, 3 deletions
diff --git a/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php b/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php index 702c7f7a..37d0640a 100644 --- a/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php +++ b/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php | |||
@@ -108,7 +108,7 @@ class EntryFilterType extends AbstractType | |||
108 | ->add('httpStatus', TextFilterType::class, [ | 108 | ->add('httpStatus', TextFilterType::class, [ |
109 | 'apply_filter' => function (QueryInterface $filterQuery, $field, $values) { | 109 | 'apply_filter' => function (QueryInterface $filterQuery, $field, $values) { |
110 | $value = $values['value']; | 110 | $value = $values['value']; |
111 | if (false === array_key_exists($value, Response::$statusTexts)) { | 111 | if (false === \array_key_exists($value, Response::$statusTexts)) { |
112 | return; | 112 | return; |
113 | } | 113 | } |
114 | 114 | ||
diff --git a/src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php b/src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php index 1c2c5093..183d394a 100644 --- a/src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php +++ b/src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php | |||
@@ -23,7 +23,7 @@ class PreparePagerForEntries | |||
23 | * @param AdapterInterface $adapter | 23 | * @param AdapterInterface $adapter |
24 | * @param User $user If user isn't logged in, we can force it (like for rss) | 24 | * @param User $user If user isn't logged in, we can force it (like for rss) |
25 | * | 25 | * |
26 | * @return null|Pagerfanta | 26 | * @return Pagerfanta|null |
27 | */ | 27 | */ |
28 | public function prepare(AdapterInterface $adapter, User $user = null) | 28 | public function prepare(AdapterInterface $adapter, User $user = null) |
29 | { | 29 | { |
diff --git a/src/Wallabag/CoreBundle/Repository/SiteCredentialRepository.php b/src/Wallabag/CoreBundle/Repository/SiteCredentialRepository.php index 36906761..b2e212a4 100644 --- a/src/Wallabag/CoreBundle/Repository/SiteCredentialRepository.php +++ b/src/Wallabag/CoreBundle/Repository/SiteCredentialRepository.php | |||
@@ -22,7 +22,7 @@ class SiteCredentialRepository extends \Doctrine\ORM\EntityRepository | |||
22 | * @param string $host | 22 | * @param string $host |
23 | * @param int $userId | 23 | * @param int $userId |
24 | * | 24 | * |
25 | * @return null|array | 25 | * @return array|null |
26 | */ | 26 | */ |
27 | public function findOneByHostAndUser($host, $userId) | 27 | public function findOneByHostAndUser($host, $userId) |
28 | { | 28 | { |