diff options
author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2019-02-28 07:35:41 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-28 07:35:41 +0100 |
commit | 249352c9d3d1f22f1f06d0c46c842984d7910d30 (patch) | |
tree | 11a7e72337010ed79b3440edee3ec41e31916b37 /lib/Fetcher/YoutubeFetcher.php | |
parent | 89d9b77994d564f4ef29db7cc7191c5cd87b8705 (diff) | |
parent | 7c17b2c24b1131ace6b464723978841566714f54 (diff) |
Merge pull request #282 from SMillerDev/switch_feedIO
Switch to feed-io for parsing
Diffstat (limited to 'lib/Fetcher/YoutubeFetcher.php')
-rw-r--r-- | lib/Fetcher/YoutubeFetcher.php | 35 |
1 files changed, 7 insertions, 28 deletions
diff --git a/lib/Fetcher/YoutubeFetcher.php b/lib/Fetcher/YoutubeFetcher.php index a47b8fdb8..41319a36b 100644 --- a/lib/Fetcher/YoutubeFetcher.php +++ b/lib/Fetcher/YoutubeFetcher.php @@ -39,7 +39,7 @@ class YoutubeFetcher implements IFeedFetcher /** * This fetcher handles all the remaining urls therefore always returns true */ - public function canHandle($url) + public function canHandle($url): bool { return $this->buildUrl($url) !== $url; } @@ -48,39 +48,18 @@ 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 $etag an etag from an http header. - * If lastModified matches the http header from the feed no results are fetched - * @param bool $fullTextEnabled if true tells the fetcher to enhance the articles by fetching more content - * @param string $basicAuthUser if given, basic auth is set for this feed - * @param string $basicAuthPassword 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, - $etag = null, - $fullTextEnabled = false, - $basicAuthUser = null, - $basicAuthPassword = null - ) { + public function fetch(string $url, bool $favicon, $lastModified, $user, $password): array + { $transformedUrl = $this->buildUrl($url); $result = $this->feedFetcher->fetch( $transformedUrl, - $getFavicon, + $favicon, $lastModified, - $etag, - $fullTextEnabled, - $basicAuthUser, - $basicAuthPassword + $user, + $password ); // reset feed url so we know the correct added url for the feed |