From becce6b7520912257c3d72697a3aefec9923a467 Mon Sep 17 00:00:00 2001 From: Sean Molenaar Date: Thu, 29 Nov 2018 20:59:46 +0100 Subject: Define an official codestyle and adhere to it. --- lib/Fetcher/YoutubeFetcher.php | 52 +++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 26 deletions(-) (limited to 'lib/Fetcher/YoutubeFetcher.php') diff --git a/lib/Fetcher/YoutubeFetcher.php b/lib/Fetcher/YoutubeFetcher.php index 90087e58c..a47b8fdb8 100644 --- a/lib/Fetcher/YoutubeFetcher.php +++ b/lib/Fetcher/YoutubeFetcher.php @@ -11,7 +11,6 @@ namespace OCA\News\Fetcher; - class YoutubeFetcher implements IFeedFetcher { @@ -23,7 +22,7 @@ class YoutubeFetcher implements IFeedFetcher } - private function buildUrl($url) + private function buildUrl($url) { $baseRegex = '%(?:https?://|//)?(?:www.)?youtube.com'; $playRegex = $baseRegex . '.*?list=([^&]*)%'; @@ -49,36 +48,39 @@ 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 custom enhanced 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 null or an - * empty string + * @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 */ - public function fetch($url, $getFavicon=true, $lastModified=null, - $etag=null, $fullTextEnabled=false, - $basicAuthUser=null, $basicAuthPassword=null + public function fetch( + $url, + $getFavicon = true, + $lastModified = null, + $etag = null, + $fullTextEnabled = false, + $basicAuthUser = null, + $basicAuthPassword = null ) { $transformedUrl = $this->buildUrl($url); $result = $this->feedFetcher->fetch( - $transformedUrl, $getFavicon, $lastModified, $etag, - $fullTextEnabled, $basicAuthUser, $basicAuthPassword + $transformedUrl, + $getFavicon, + $lastModified, + $etag, + $fullTextEnabled, + $basicAuthUser, + $basicAuthPassword ); // reset feed url so we know the correct added url for the feed @@ -86,6 +88,4 @@ class YoutubeFetcher implements IFeedFetcher return $result; } - - } -- cgit v1.2.3