Fix mismatched interface

3 files changed, 14 insertions, 34 deletions

diff --git a/lib/Fetcher/FeedFetcher.php b/lib/Fetcher/FeedFetcher.php
index abfd0095b..38fcab823 100644
--- a/lib/Fetcher/FeedFetcher.php
+++ b/lib/Fetcher/FeedFetcher.php
@@ -58,20 +58,9 @@ class FeedFetcher implements IFeedFetcher
     /**
      * Fetch a feed from remote
      *
-     * @param string  $url          Remote url of the feed
-     * @param boolean $getFavicon   If the favicon should also be fetched,
-     *                              defaults to true
-     * @param string  $lastModified A last modified value from an http header
-     *                              defaults to false. If lastModified matches
-     *                              the header from the feed no results are fetched
-     * @param string  $user         If given, basic auth is set for this feed
-     * @param string  $password     If given, basic auth is set for this feed.
-     *                              Ignored if user is null or an empty string.
-     *
-     * @return array an array containing the new feed and its items, first
-     * element being the Feed and second element being an array of Items
+     * @inheritdoc
      */
-    public function fetch(string $url, $getFavicon = true, $lastModified = null, $user = null, $password = null): array
+    public function fetch(string $url, bool $favicon, $lastModified, $user, $password): array
     {
         if ($user !== null && trim($user) !== '') {
             $url = explode('://', $url);
@@ -88,7 +77,7 @@ class FeedFetcher implements IFeedFetcher
         $feed = $this->buildFeed(
             $parsedFeed,
             $url,
-            $getFavicon,
+            $favicon,
             $location
         );
 
@@ -220,7 +209,7 @@ class FeedFetcher implements IFeedFetcher
      *
      * @return Feed
      */
-    protected function buildFeed(FeedInterface $feed, string $url, boolean $getFavicon, string $location): Feed
+    protected function buildFeed(FeedInterface $feed, string $url, bool $getFavicon, string $location): Feed
     {
         $newFeed = new Feed();
 
diff --git a/lib/Fetcher/IFeedFetcher.php b/lib/Fetcher/IFeedFetcher.php
index 70f153d2e..ecc0ffc16 100644
--- a/lib/Fetcher/IFeedFetcher.php
+++ b/lib/Fetcher/IFeedFetcher.php
@@ -19,18 +19,18 @@ interface IFeedFetcher
     /**
      * Fetch feed content.
      *
-     * @param  string  $url               remote url of the feed
-     * @param  boolean $getFavicon        if the favicon should also be fetched, defaults to true
-     * @param  string  $lastModified      a last modified value from an http header defaults to false.
+     * @param  string      $url           remote url of the feed
+     * @param  boolean     $favicon       if the favicon should also be fetched, defaults to true
+     * @param  string|null $lastModified  a last modified value from an http header defaults to false.
      *                                    If lastModified matches the http header from the feed no results are fetched
-     * @param  string  $user              if given, basic auth is set for this feed
-     * @param  string  $password          if given, basic auth is set for this feed. Ignored if user is empty
+     * @param  string|null $user          if given, basic auth is set for this feed
+     * @param  string|null $password      if given, basic auth is set for this feed. Ignored if user is empty
      *
-     * @throws FetcherException if the fetcher encounters a problem
      * @return array an array containing the new feed and its items, first
      * element being the Feed and second element being an array of Items
+     * @throws FetcherException if the fetcher encounters a problem
      */
-    public function fetch($url, $getFavicon = true, $lastModified = null, $user = null, $password = null): array;
+    public function fetch(string $url, bool $favicon, $lastModified, $user, $password): array;
 
     /**
      * Can a fetcher handle a feed.
diff --git a/lib/Fetcher/YoutubeFetcher.php b/lib/Fetcher/YoutubeFetcher.php
index fd4e7d2fb..41319a36b 100644
--- a/lib/Fetcher/YoutubeFetcher.php
+++ b/lib/Fetcher/YoutubeFetcher.php
@@ -48,24 +48,15 @@ class YoutubeFetcher implements IFeedFetcher
     /**
      * Fetch a feed from remote
      *
-     * @param  string  $url               remote url of the feed
-     * @param  boolean $getFavicon        if the favicon should also be fetched, defaults to true
-     * @param  string  $lastModified      a last modified value from an http header defaults to false.
-     *                                    If lastModified matches the http header from the feed no results are fetched
-     * @param  string  $user              if given, basic auth is set for this feed
-     * @param  string  $password          if given, basic auth is set for this feed. Ignored if user is empty
-     *
-     * @throws FetcherException if it fails
-     * @return array an array containing the new feed and its items, first
-     * element being the Feed and second element being an array of Items
+     * @inheritdoc
      */
-    public function fetch($url, $getFavicon = true, $lastModified = null, $user = null, $password = null): array
+    public function fetch(string $url, bool $favicon, $lastModified, $user, $password): array
     {
         $transformedUrl = $this->buildUrl($url);
 
         $result = $this->feedFetcher->fetch(
             $transformedUrl,
-            $getFavicon,
+            $favicon,
             $lastModified,
             $user,
             $password