summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorBenjamin Brahmer <info@b-brahmer.de>2023-05-18 07:52:28 +0200
committerBenjamin Brahmer <info@b-brahmer.de>2023-08-09 10:58:45 +0200
commitca6cedeb28ec3299263df2e07dfe15744d166646 (patch)
treecec1aac1b154e58731f4754187e551d63a717ec1 /lib
parentd1dc011abe51878e93ddecb1207914ea93692855 (diff)
Upgrade feed-io to v5.1.3
Signed-off-by: Benjamin Brahmer <info@b-brahmer.de>
Diffstat (limited to 'lib')
-rw-r--r--lib/Fetcher/Client/FeedIoClient.php8
-rwxr-xr-xlib/Fetcher/FeedFetcher.php2
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/Fetcher/Client/FeedIoClient.php b/lib/Fetcher/Client/FeedIoClient.php
index ac1f62a1f..fe57c5889 100644
--- a/lib/Fetcher/Client/FeedIoClient.php
+++ b/lib/Fetcher/Client/FeedIoClient.php
@@ -38,14 +38,14 @@ class FeedIoClient implements ClientInterface
}
/**
- * @param string $url
- * @param DateTime $modifiedSince
+ * @param string $url
+ * @param DateTime|null $modifiedSince
*
* @return ResponseInterface
* @throws ServerErrorException|GuzzleException
* @throws NotFoundException
*/
- public function getResponse(string $url, DateTime $modifiedSince) : ResponseInterface
+ public function getResponse(string $url, ?DateTime $modifiedSince = null) : ResponseInterface
{
$modifiedSince->setTimezone(new \DateTimeZone('GMT'));
try {
@@ -65,7 +65,7 @@ class FeedIoClient implements ClientInterface
case 404:
throw new NotFoundException($e->getMessage());
default:
- throw new ServerErrorException($e->getMessage());
+ throw new ServerErrorException($e->getResponse());
}
}
}
diff --git a/lib/Fetcher/FeedFetcher.php b/lib/Fetcher/FeedFetcher.php
index 60d798889..9fdee1d97 100755
--- a/lib/Fetcher/FeedFetcher.php
+++ b/lib/Fetcher/FeedFetcher.php
@@ -127,7 +127,7 @@ class FeedFetcher implements IFeedFetcher
$lastModified = null;
}
$url = $url2->getNormalizedURL();
- $this->reader->resetFilters();
+
$resource = $this->reader->read($url, null, $lastModified);
$location = $resource->getUrl();