remove php 7.4

Signed-off-by: Benjamin Brahmer <[email protected]>

.github/workflows/api-integration-tests.yml

@@ -28,7 +28,7 @@ jobs:
           - 5432:5432 # Maps tcp port 5432 on service container to the host
     strategy:
       matrix:
-        php-versions: ['7.4', '8.0']
+        php-versions: ['8.0']
         nextcloud: ['stable24', 'stable25']
         database: ['sqlite', 'pgsql', 'mysql']
         experimental: [false]

.github/workflows/api-php-static-code-check.yml

@@ -7,7 +7,7 @@ jobs:
     continue-on-error: true
     strategy:
       matrix:
-        php-versions: [ '7.4', '8.0', '8.1' ]
+        php-versions: ['8.0', '8.1' ]
         nextcloud: [ 'stable25' ]
         database: [ 'sqlite' ]
         include:

AUTHORS.md

@@ -129,6 +129,7 @@
 * [Hendrik Leppelsack](mailto:[email protected])
 * [Jasper Knockaert](mailto:[email protected])
 * [Kevin Decherf](mailto:[email protected])
+* [Kuba Orlik](mailto:[email protected])
 * [Maceček Richard](mailto:[email protected])
 * [Marc Cousin](mailto:[email protected])
 * [Martin Ferretti](mailto:[email protected])

appinfo/info.xml

@@ -43,7 +43,7 @@ Report a [feed issue](https://github.com/nextcloud/news/discussions/new)
     <screenshot small-thumbnail="https://raw.githubusercontent.com/nextcloud/news/master/screenshots/2-small.png">https://raw.githubusercontent.com/nextcloud/news/master/screenshots/2.png</screenshot>
     <screenshot small-thumbnail="https://raw.githubusercontent.com/nextcloud/news/master/screenshots/3-small.png">https://raw.githubusercontent.com/nextcloud/news/master/screenshots/3.png</screenshot>
     <dependencies>
-        <php min-version="7.4" min-int-size="64"/>
+        <php min-version="8.0" min-int-size="64"/>
         <database min-version="10">pgsql</database>
         <database>sqlite</database>
         <database min-version="8.0">mysql</database>

composer.json

@@ -40,11 +40,11 @@
     "source": "https://github.com/nextcloud/news/"
   },
   "require": {
-    "php": "^7.4 || ~8.0",
+    "php": "~8.0",
     "ezyang/htmlpurifier": "^4.16.0",
     "pear/net_url2": "^2.2.2",
     "riimu/kit-pathjoin": "^1.2.0",
-    "debril/feed-io": "^v4.9.12",
+    "debril/feed-io": "^v5.3.1",
     "arthurhoaro/favicon": "^1.3.3",
     "fivefilters/readability.php": "^3.1",
     "ext-json": "*",

lib/Fetcher/Client/FeedIoClient.php

@@ -45,7 +45,7 @@ public function __construct(\GuzzleHttp\ClientInterface $guzzleClient)
      * @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 @@ public function getResponse(string $url, DateTime $modifiedSince) : ResponseInte
                 case 404:
                     throw new NotFoundException($e->getMessage());
                 default:
-                    throw new ServerErrorException($e->getMessage());
+                    throw new ServerErrorException($e->getResponse());
             }
         }
     }

lib/Fetcher/FeedFetcher.php

@@ -120,7 +120,7 @@ public function fetch(
             $url2->setUserinfo(rawurlencode($user), rawurlencode($password));
         }
         $url = $url2->getNormalizedURL();
-        $this->reader->resetFilters();
+
         $resource = $this->reader->read($url);
 
         $location     = $resource->getUrl();