From 3bbfb9618bd3529182937da45e32edafe1692ee5 Mon Sep 17 00:00:00 2001 From: Benjamin Brahmer Date: Fri, 27 Jan 2023 12:01:20 +0100 Subject: remove php 7.4 Signed-off-by: Benjamin Brahmer --- .github/workflows/api-integration-tests.yml | 2 +- .github/workflows/api-php-static-code-check.yml | 2 +- AUTHORS.md | 1 + appinfo/info.xml | 2 +- composer.json | 4 +- composer.lock | 115 ++++++++++++------------ lib/Fetcher/Client/FeedIoClient.php | 4 +- lib/Fetcher/FeedFetcher.php | 2 +- 8 files changed, 66 insertions(+), 66 deletions(-) diff --git a/.github/workflows/api-integration-tests.yml b/.github/workflows/api-integration-tests.yml index bfbb320aa..e9de426aa 100644 --- a/.github/workflows/api-integration-tests.yml +++ b/.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] diff --git a/.github/workflows/api-php-static-code-check.yml b/.github/workflows/api-php-static-code-check.yml index 57776f400..b98767c99 100644 --- a/.github/workflows/api-php-static-code-check.yml +++ b/.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: diff --git a/AUTHORS.md b/AUTHORS.md index 42fe73777..475f72f35 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -129,6 +129,7 @@ * [Hendrik Leppelsack](mailto:hendrik@leppelsack.de) * [Jasper Knockaert](mailto:jasper@knockaert.nl) * [Kevin Decherf](mailto:kevin@kdecherf.com) +* [Kuba Orlik](mailto:kontakt@kuba-orlik.name) * [Maceček Richard](mailto:46937538+macecekrichard@users.noreply.github.com) * [Marc Cousin](mailto:marc.cousin@people-doc.com) * [Martin Ferretti](mailto:ferrettimartin@protonmail.com) diff --git a/appinfo/info.xml b/appinfo/info.xml index 912fcabc8..824bf1c03 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -43,7 +43,7 @@ Report a [feed issue](https://github.com/nextcloud/news/discussions/new) https://raw.githubusercontent.com/nextcloud/news/master/screenshots/2.png https://raw.githubusercontent.com/nextcloud/news/master/screenshots/3.png - + pgsql sqlite mysql diff --git a/composer.json b/composer.json index 9eda9d0c2..cdd936adc 100644 --- a/composer.json +++ b/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": "*", diff --git a/composer.lock b/composer.lock index cffbaf7bc..545109f34 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "ef78570de5a74f2897085ba3b65bec55", + "content-hash": "2e9e30b54f858fd7e6ae2350f0347fb5", "packages": [ { "name": "arthurhoaro/favicon", @@ -66,16 +66,16 @@ }, { "name": "debril/feed-io", - "version": "v4.9.15", + "version": "v5.3.1", "source": { "type": "git", "url": "https://github.com/alexdebril/feed-io.git", - "reference": "1c45bd07837123ec6eacf8cdd612cbb0dc27229c" + "reference": "b1237713ae174fc4dd57aff1e472303a1162ccfc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/alexdebril/feed-io/zipball/1c45bd07837123ec6eacf8cdd612cbb0dc27229c", - "reference": "1c45bd07837123ec6eacf8cdd612cbb0dc27229c", + "url": "https://api.github.com/repos/alexdebril/feed-io/zipball/b1237713ae174fc4dd57aff1e472303a1162ccfc", + "reference": "b1237713ae174fc4dd57aff1e472303a1162ccfc", "shasum": "" }, "require": { @@ -83,13 +83,13 @@ "ext-json": "*", "ext-libxml": "*", "guzzlehttp/guzzle": "~6.2|~7.0", - "php": ">=7.1", - "psr/log": "~1.0", - "symfony/console": "~3.4|~4.0|~5.0|~6.0" + "php": ">=8.0", + "psr/log": "~1.0|~2.0|~3.0" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^2.4", - "monolog/monolog": "1.*", + "friendsofphp/php-cs-fixer": "^3.5", + "monolog/monolog": "1.*|2.*", + "phpstan/phpstan": "^0.12.81", "phpunit/phpunit": "~9.3.0" }, "suggest": { @@ -127,9 +127,9 @@ ], "support": { "issues": "https://github.com/alexdebril/feed-io/issues", - "source": "https://github.com/alexdebril/feed-io/tree/v4.9.15" + "source": "https://github.com/alexdebril/feed-io/tree/v5.3.1" }, - "time": "2022-10-26T20:16:20+00:00" + "time": "2022-10-26T20:20:14+00:00" }, { "name": "ezyang/htmlpurifier", @@ -922,30 +922,29 @@ }, { "name": "doctrine/event-manager", - "version": "1.2.0", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/doctrine/event-manager.git", - "reference": "95aa4cb529f1e96576f3fda9f5705ada4056a520" + "reference": "750671534e0241a7c50ea5b43f67e23eb5c96f32" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/event-manager/zipball/95aa4cb529f1e96576f3fda9f5705ada4056a520", - "reference": "95aa4cb529f1e96576f3fda9f5705ada4056a520", + "url": "https://api.github.com/repos/doctrine/event-manager/zipball/750671534e0241a7c50ea5b43f67e23eb5c96f32", + "reference": "750671534e0241a7c50ea5b43f67e23eb5c96f32", "shasum": "" }, "require": { - "doctrine/deprecations": "^0.5.3 || ^1", - "php": "^7.1 || ^8.0" + "php": "^8.1" }, "conflict": { "doctrine/common": "<2.9" }, "require-dev": { - "doctrine/coding-standard": "^9 || ^10", - "phpstan/phpstan": "~1.4.10 || ^1.8.8", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "vimeo/psalm": "^4.24" + "doctrine/coding-standard": "^10", + "phpstan/phpstan": "^1.8.8", + "phpunit/phpunit": "^9.5", + "vimeo/psalm": "^4.28" }, "type": "library", "autoload": { @@ -994,7 +993,7 @@ ], "support": { "issues": "https://github.com/doctrine/event-manager/issues", - "source": "https://github.com/doctrine/event-manager/tree/1.2.0" + "source": "https://github.com/doctrine/event-manager/tree/2.0.0" }, "funding": [ { @@ -1010,34 +1009,34 @@ "type": "tidelift" } ], - "time": "2022-10-12T20:51:15+00:00" + "time": "2022-10-12T20:59:15+00:00" }, { "name": "doctrine/instantiator", - "version": "1.5.0", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b" + "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/0a0fa9780f5d4e507415a065172d26a98d02047b", - "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/c6222283fa3f4ac679f8b9ced9a4e23f163e80d0", + "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0", "shasum": "" }, "require": { - "php": "^7.1 || ^8.0" + "php": "^8.1" }, "require-dev": { - "doctrine/coding-standard": "^9 || ^11", + "doctrine/coding-standard": "^11", "ext-pdo": "*", "ext-phar": "*", - "phpbench/phpbench": "^0.16 || ^1", - "phpstan/phpstan": "^1.4", - "phpstan/phpstan-phpunit": "^1", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "vimeo/psalm": "^4.30 || ^5.4" + "phpbench/phpbench": "^1.2", + "phpstan/phpstan": "^1.9.4", + "phpstan/phpstan-phpunit": "^1.3", + "phpunit/phpunit": "^9.5.27", + "vimeo/psalm": "^5.4" }, "type": "library", "autoload": { @@ -1064,7 +1063,7 @@ ], "support": { "issues": "https://github.com/doctrine/instantiator/issues", - "source": "https://github.com/doctrine/instantiator/tree/1.5.0" + "source": "https://github.com/doctrine/instantiator/tree/2.0.0" }, "funding": [ { @@ -1080,7 +1079,7 @@ "type": "tidelift" } ], - "time": "2022-12-30T00:15:36+00:00" + "time": "2022-12-30T00:23:10+00:00" }, { "name": "myclabs/deep-copy", @@ -1143,16 +1142,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.15.2", + "version": "v4.15.3", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc" + "reference": "570e980a201d8ed0236b0a62ddf2c9cbb2034039" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc", - "reference": "f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/570e980a201d8ed0236b0a62ddf2c9cbb2034039", + "reference": "570e980a201d8ed0236b0a62ddf2c9cbb2034039", "shasum": "" }, "require": { @@ -1193,9 +1192,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.2" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.3" }, - "time": "2022-11-12T15:38:23+00:00" + "time": "2023-01-16T22:05:37+00:00" }, { "name": "phar-io/manifest", @@ -1631,16 +1630,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "9.2.23", + "version": "9.2.24", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "9f1f0f9a2fbb680b26d1cf9b61b6eac43a6e4e9c" + "reference": "2cf940ebc6355a9d430462811b5aaa308b174bed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/9f1f0f9a2fbb680b26d1cf9b61b6eac43a6e4e9c", - "reference": "9f1f0f9a2fbb680b26d1cf9b61b6eac43a6e4e9c", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/2cf940ebc6355a9d430462811b5aaa308b174bed", + "reference": "2cf940ebc6355a9d430462811b5aaa308b174bed", "shasum": "" }, "require": { @@ -1696,7 +1695,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.23" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.24" }, "funding": [ { @@ -1704,7 +1703,7 @@ "type": "github" } ], - "time": "2022-12-28T12:41:10+00:00" + "time": "2023-01-26T08:26:55+00:00" }, { "name": "phpunit/php-file-iterator", @@ -2051,20 +2050,20 @@ }, { "name": "psr/cache", - "version": "1.0.1", + "version": "3.0.0", "source": { "type": "git", "url": "https://github.com/php-fig/cache.git", - "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8" + "reference": "aa5030cfa5405eccfdcb1083ce040c2cb8d253bf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/cache/zipball/d11b50ad223250cf17b86e38383413f5a6764bf8", - "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8", + "url": "https://api.github.com/repos/php-fig/cache/zipball/aa5030cfa5405eccfdcb1083ce040c2cb8d253bf", + "reference": "aa5030cfa5405eccfdcb1083ce040c2cb8d253bf", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": ">=8.0.0" }, "type": "library", "extra": { @@ -2084,7 +2083,7 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "description": "Common interface for caching libraries", @@ -2094,9 +2093,9 @@ "psr-6" ], "support": { - "source": "https://github.com/php-fig/cache/tree/master" + "source": "https://github.com/php-fig/cache/tree/3.0.0" }, - "time": "2016-08-06T20:24:11+00:00" + "time": "2021-02-03T23:26:27+00:00" }, { "name": "sebastian/cli-parser", @@ -3175,7 +3174,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "^7.4 || ~8.0", + "php": "~8.0", "ext-json": "*", "ext-simplexml": "*", "ext-libxml": "*", diff --git a/lib/Fetcher/Client/FeedIoClient.php b/lib/Fetcher/Client/FeedIoClient.php index ac1f62a1f..f863d44cc 100644 --- a/lib/Fetcher/Client/FeedIoClient.php +++ b/lib/Fetcher/Client/FeedIoClient.php @@ -45,7 +45,7 @@ class FeedIoClient implements ClientInterface * @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 c79d40685..dbd6e1a4d 100755 --- a/lib/Fetcher/FeedFetcher.php +++ b/lib/Fetcher/FeedFetcher.php @@ -120,7 +120,7 @@ class FeedFetcher implements IFeedFetcher $url2->setUserinfo(rawurlencode($user), rawurlencode($password)); } $url = $url2->getNormalizedURL(); - $this->reader->resetFilters(); + $resource = $this->reader->read($url); $location = $resource->getUrl(); -- cgit v1.2.3