diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/Wallabag/ApiBundle/Controller/EntryRestController.php | 4 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Repository/EntryRepository.php | 26 |
2 files changed, 2 insertions, 28 deletions
diff --git a/src/Wallabag/ApiBundle/Controller/EntryRestController.php b/src/Wallabag/ApiBundle/Controller/EntryRestController.php index 77eb489e..bdd02129 100644 --- a/src/Wallabag/ApiBundle/Controller/EntryRestController.php +++ b/src/Wallabag/ApiBundle/Controller/EntryRestController.php | |||
@@ -848,8 +848,8 @@ class EntryRestController extends WallabagRestController | |||
848 | /** | 848 | /** |
849 | * Return information about the entry if it exist and depending on the id or not. | 849 | * Return information about the entry if it exist and depending on the id or not. |
850 | * | 850 | * |
851 | * @param Entry|null $entry | 851 | * @param Entry|bool|null $entry |
852 | * @param bool $returnId | 852 | * @param bool $returnId |
853 | * | 853 | * |
854 | * @return bool|int | 854 | * @return bool|int |
855 | */ | 855 | */ |
diff --git a/src/Wallabag/CoreBundle/Repository/EntryRepository.php b/src/Wallabag/CoreBundle/Repository/EntryRepository.php index 7c4a05ed..880e7c65 100644 --- a/src/Wallabag/CoreBundle/Repository/EntryRepository.php +++ b/src/Wallabag/CoreBundle/Repository/EntryRepository.php | |||
@@ -509,32 +509,6 @@ class EntryRepository extends EntityRepository | |||
509 | } | 509 | } |
510 | 510 | ||
511 | /** | 511 | /** |
512 | * Inject a UrlHasher. | ||
513 | * | ||
514 | * @param UrlHasher $hasher | ||
515 | */ | ||
516 | public function setUrlHasher(UrlHasher $hasher) | ||
517 | { | ||
518 | $this->urlHasher = $hasher; | ||
519 | } | ||
520 | |||
521 | /** | ||
522 | * Get the UrlHasher, or create a default one if not injected. | ||
523 | * | ||
524 | * XXX: the default uses the default hash algorithm | ||
525 | * | ||
526 | * @return UrlHasher | ||
527 | */ | ||
528 | protected function getUrlHasher() | ||
529 | { | ||
530 | if (!isset($this->urlHasher)) { | ||
531 | $this->setUrlHasher(new UrlHasher()); | ||
532 | } | ||
533 | |||
534 | return $this->urlHasher; | ||
535 | } | ||
536 | |||
537 | /** | ||
538 | * Return a query builder to be used by other getBuilderFor* method. | 512 | * Return a query builder to be used by other getBuilderFor* method. |
539 | * | 513 | * |
540 | * @param int $userId | 514 | * @param int $userId |