diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Command/ShowFeed.php | 2 | ||||
-rwxr-xr-x | lib/Fetcher/FeedFetcher.php | 1 | ||||
-rw-r--r-- | lib/Fetcher/Fetcher.php | 4 | ||||
-rw-r--r-- | lib/Fetcher/IFeedFetcher.php | 5 | ||||
-rw-r--r-- | lib/Service/FeedServiceV2.php | 1 |
5 files changed, 2 insertions, 11 deletions
diff --git a/lib/Command/ShowFeed.php b/lib/Command/ShowFeed.php index 180c6ca3a..7408ed191 100644 --- a/lib/Command/ShowFeed.php +++ b/lib/Command/ShowFeed.php @@ -70,7 +70,7 @@ class ShowFeed extends Command $fullTextEnabled = (bool) $input->getOption('full-text'); try { - list($feed, $items) = $this->feedFetcher->fetch($url, null, $fullTextEnabled, $user, $password); + list($feed, $items) = $this->feedFetcher->fetch($url, $fullTextEnabled, $user, $password); } catch (\Exception $ex) { $output->writeln('<error>Failed to fetch feed info:</error>'); $output->writeln($ex->getMessage()); diff --git a/lib/Fetcher/FeedFetcher.php b/lib/Fetcher/FeedFetcher.php index a70e67114..3035b0e5e 100755 --- a/lib/Fetcher/FeedFetcher.php +++ b/lib/Fetcher/FeedFetcher.php @@ -107,7 +107,6 @@ class FeedFetcher implements IFeedFetcher */ public function fetch( string $url, - ?string $lastModified, bool $fullTextEnabled, ?string $user, ?string $password diff --git a/lib/Fetcher/Fetcher.php b/lib/Fetcher/Fetcher.php index 724c264bc..8c755bc85 100644 --- a/lib/Fetcher/Fetcher.php +++ b/lib/Fetcher/Fetcher.php @@ -44,8 +44,6 @@ class Fetcher * Fetch a feed from remote * * @param string $url remote url of the feed - * @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 bool $fullTextEnabled If true use a scraper to download the full article * @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 @@ -56,7 +54,6 @@ class Fetcher */ public function fetch( string $url, - ?string $lastModified = null, bool $fullTextEnabled = false, ?string $user = null, ?string $password = null @@ -67,7 +64,6 @@ class Fetcher } return $fetcher->fetch( $url, - $lastModified, $fullTextEnabled, $user, $password diff --git a/lib/Fetcher/IFeedFetcher.php b/lib/Fetcher/IFeedFetcher.php index abb367889..45e0915f0 100644 --- a/lib/Fetcher/IFeedFetcher.php +++ b/lib/Fetcher/IFeedFetcher.php @@ -24,9 +24,7 @@ interface IFeedFetcher * Fetch feed content. * * @param string $url remote url of the feed - * @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 bool $fullTextEnabled If true use a scraper to download the full article + * @param bool $fullTextEnabled If true use a scraper to download the full article * @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 * @@ -37,7 +35,6 @@ interface IFeedFetcher */ public function fetch( string $url, - ?string $lastModified, bool $fullTextEnabled, ?string $user, ?string $password diff --git a/lib/Service/FeedServiceV2.php b/lib/Service/FeedServiceV2.php index f340bfc8d..d49c540b1 100644 --- a/lib/Service/FeedServiceV2.php +++ b/lib/Service/FeedServiceV2.php @@ -258,7 +258,6 @@ class FeedServiceV2 extends Service */ list($fetchedFeed, $items) = $this->feedFetcher->fetch( $location, - $feed->getHttpLastModified(), $feed->getFullTextEnabled(), $feed->getBasicAuthUser(), $feed->getBasicAuthPassword() |