From 6f2f0b4045107a4a71308213c137cb144fbe1e43 Mon Sep 17 00:00:00 2001 From: Benjamin Brahmer Date: Wed, 8 Nov 2023 09:52:49 +0100 Subject: [PATCH 1/2] adjust makefile, npm didn't find package.json Signed-off-by: Benjamin Brahmer --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b2c600f682..6311c57608 100644 --- a/Makefile +++ b/Makefile @@ -194,7 +194,7 @@ appstore: .PHONY: js-test js-test: - cd js && $(npm) run test + $(npm) run test .PHONY: php-test-dependencies php-test-dependencies: From 64470705491ee4961810b5a0aa4af8dbd005f94f Mon Sep 17 00:00:00 2001 From: Benjamin Brahmer Date: Wed, 8 Nov 2023 09:53:21 +0100 Subject: [PATCH 2/2] fix dbal deprecations Signed-off-by: Benjamin Brahmer --- lib/Db/ItemMapperV2.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/Db/ItemMapperV2.php b/lib/Db/ItemMapperV2.php index 972295ee36..7c70c68798 100644 --- a/lib/Db/ItemMapperV2.php +++ b/lib/Db/ItemMapperV2.php @@ -14,7 +14,7 @@ use OC\DB\QueryBuilder\Literal; use OCA\News\Service\Exceptions\ServiceValidationException; -use Doctrine\DBAL\FetchMode; +use PDO; use OCA\News\Utility\Time; use OCP\AppFramework\Db\DoesNotExistException; use OCP\AppFramework\Db\Entity; @@ -201,7 +201,7 @@ public function deleteOverThreshold(int $threshold, bool $purgeUnread): ?int ->groupBy('feed_id'); $feeds = $this->db->executeQuery($feedQb->getSQL()) - ->fetchAll(FetchMode::ASSOCIATIVE); + ->fetchAll(); if ($feeds === []) { return null; @@ -227,7 +227,7 @@ public function deleteOverThreshold(int $threshold, bool $purgeUnread): ?int $rangeQuery->setFirstResult(max($threshold, $feed['articlesPerUpdate'])); $items = $this->db->executeQuery($rangeQuery->getSQL(), ['feedId' => $feed['feed_id']]) - ->fetchAll(FetchMode::COLUMN); + ->fetchAll(PDO::FETCH_COLUMN); $total_items = array_merge($total_items, $items); }