Merge remote-tracking branch 'nextcloud/master' into master-merge

Signed-off-by: Devlin Junker <devlin.junker@gmail.com>

1 files changed, 4 insertions, 4 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());
             }
         }
     }