From 8de3ad77fc9e445353cd0861931b2215d9f24859 Mon Sep 17 00:00:00 2001 From: anoy Date: Sat, 9 Jan 2021 18:19:24 +0100 Subject: remove deprecated colon prefix for parameters Signed-off-by: anoy --- CHANGELOG.md | 3 +++ lib/Db/FeedMapperV2.php | 14 +++++++------- lib/Db/FolderMapperV2.php | 6 +++--- lib/Db/ItemMapperV2.php | 14 +++++++------- lib/Db/NewsMapperV2.php | 4 ++-- tests/Unit/Db/FeedMapperTest.php | 12 ++++++------ tests/Unit/Db/FolderMapperTest.php | 8 ++++---- tests/Unit/Db/NewsMapperTest.php | 6 +++--- 8 files changed, 35 insertions(+), 32 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e9b6ae6b1..9ee5e611d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,9 @@ The format is almost based on [Keep a Changelog](https://keepachangelog.com/en/1 - add background & hover for entries - Improve spacing of open articles in compact mode (nextcloud/news#1017) +### Fixed +- `MissingNamedParameter` exception after upgrading to NC 21 beta5 (#1030) + ## [15.1.1] - 2020-12-27 ### Changed diff --git a/lib/Db/FeedMapperV2.php b/lib/Db/FeedMapperV2.php index 85a1bd3f3..3f25b26aa 100644 --- a/lib/Db/FeedMapperV2.php +++ b/lib/Db/FeedMapperV2.php @@ -62,8 +62,8 @@ class FeedMapperV2 extends NewsMapperV2 ->where('feeds.user_id = :user_id') ->andWhere('feeds.deleted_at = 0') ->groupBy('feeds.id') - ->setParameter(':unread', true, IQueryBuilder::PARAM_BOOL) - ->setParameter(':user_id', $userId); + ->setParameter('unread', true, IQueryBuilder::PARAM_BOOL) + ->setParameter('user_id', $userId); return $this->findEntities($builder); } @@ -86,8 +86,8 @@ class FeedMapperV2 extends NewsMapperV2 ->from(static::TABLE_NAME) ->where('user_id = :user_id') ->andWhere('id = :id') - ->setParameter(':user_id', $userId) - ->setParameter(':id', $id); + ->setParameter('user_id', $userId) + ->setParameter('id', $id); return $this->findEntity($builder); } @@ -125,8 +125,8 @@ class FeedMapperV2 extends NewsMapperV2 ->from(static::TABLE_NAME) ->where('user_id = :user_id') ->andWhere('url = :url') - ->setParameter(':user_id', $userId) - ->setParameter(':url', $url); + ->setParameter('user_id', $userId) + ->setParameter('url', $url); return $this->findEntity($builder); } @@ -148,7 +148,7 @@ class FeedMapperV2 extends NewsMapperV2 $builder->where('folder_id IS NULL'); } else { $builder->where('folder_id = :folder_id') - ->setParameter(':folder_id', $id); + ->setParameter('folder_id', $id); } return $this->findEntities($builder); diff --git a/lib/Db/FolderMapperV2.php b/lib/Db/FolderMapperV2.php index a69f8be45..85e07c07f 100644 --- a/lib/Db/FolderMapperV2.php +++ b/lib/Db/FolderMapperV2.php @@ -52,7 +52,7 @@ class FolderMapperV2 extends NewsMapperV2 ->from($this->tableName) ->where('user_id = :user_id') ->andWhere('deleted_at = 0') - ->setParameter(':user_id', $userId); + ->setParameter('user_id', $userId); return $this->findEntities($builder); } @@ -90,8 +90,8 @@ class FolderMapperV2 extends NewsMapperV2 ->where('user_id = :user_id') ->andWhere('id = :id') ->andWhere('deleted_at = 0') - ->setParameter(':user_id', $userId) - ->setParameter(':id', $id); + ->setParameter('user_id', $userId) + ->setParameter('id', $id); return $this->findEntity($builder); } diff --git a/lib/Db/ItemMapperV2.php b/lib/Db/ItemMapperV2.php index 1925b846c..a67275320 100644 --- a/lib/Db/ItemMapperV2.php +++ b/lib/Db/ItemMapperV2.php @@ -56,11 +56,11 @@ class ItemMapperV2 extends NewsMapperV2 ->innerJoin('items', FeedMapperV2::TABLE_NAME, 'feeds', 'items.feed_id = feeds.id') ->where('feeds.user_id = :user_id') ->andWhere('deleted_at = 0') - ->setParameter(':user_id', $userId, IQueryBuilder::PARAM_STR); + ->setParameter('user_id', $userId, IQueryBuilder::PARAM_STR); foreach ($params as $key => $value) { $builder->andWhere("${key} = :${key}") - ->setParameter(":${key}", $value); + ->setParameter($key, $value); } return $this->findEntities($builder); @@ -90,8 +90,8 @@ class ItemMapperV2 extends NewsMapperV2 ->where('feeds.user_id = :user_id') ->andWhere('items.id = :item_id') ->andWhere('deleted_at = 0') - ->setParameter(':user_id', $userId, IQueryBuilder::PARAM_STR) - ->setParameter(':item_id', $id, IQueryBuilder::PARAM_STR); + ->setParameter('user_id', $userId, IQueryBuilder::PARAM_STR) + ->setParameter('item_id', $id, IQueryBuilder::PARAM_STR); return $this->findEntity($builder); } @@ -114,8 +114,8 @@ class ItemMapperV2 extends NewsMapperV2 ->from($this->tableName) ->andWhere('feed_id = :feed_id') ->andWhere('guid_hash = :guid_hash') - ->setParameter(':feed_id', $feedId, IQueryBuilder::PARAM_INT) - ->setParameter(':guid_hash', $guidHash, IQueryBuilder::PARAM_STR); + ->setParameter('feed_id', $feedId, IQueryBuilder::PARAM_INT) + ->setParameter('guid_hash', $guidHash, IQueryBuilder::PARAM_STR); return $this->findEntity($builder); } @@ -131,7 +131,7 @@ class ItemMapperV2 extends NewsMapperV2 $builder->addSelect('*') ->from($this->tableName) ->andWhere('feed_id = :feed_id') - ->setParameter(':feed_id', $feedId, IQueryBuilder::PARAM_INT); + ->setParameter('feed_id', $feedId, IQueryBuilder::PARAM_INT); return $this->findEntities($builder); } diff --git a/lib/Db/NewsMapperV2.php b/lib/Db/NewsMapperV2.php index 93500c7c9..4d0c6fc2e 100644 --- a/lib/Db/NewsMapperV2.php +++ b/lib/Db/NewsMapperV2.php @@ -86,12 +86,12 @@ abstract class NewsMapperV2 extends QBMapper if ($userID !== null) { $builder->andWhere('user_id = :user_id') - ->setParameter(':user_id', $userID); + ->setParameter('user_id', $userID); } if ($oldestDelete !== null) { $builder->andWhere('deleted_at < :deleted_at') - ->setParameter(':deleted_at', $oldestDelete); + ->setParameter('deleted_at', $oldestDelete); } $builder->execute(); diff --git a/tests/Unit/Db/FeedMapperTest.php b/tests/Unit/Db/FeedMapperTest.php index 59e1440fb..a6a4be866 100644 --- a/tests/Unit/Db/FeedMapperTest.php +++ b/tests/Unit/Db/FeedMapperTest.php @@ -109,7 +109,7 @@ class FeedMapperTest extends MapperTestUtility $this->builder->expects($this->exactly(2)) ->method('setParameter') - ->withConsecutive([':unread', true], [':user_id', 'jack']) + ->withConsecutive(['unread', true], ['user_id', 'jack']) ->will($this->returnSelf()); $this->builder->expects($this->once()) @@ -159,7 +159,7 @@ class FeedMapperTest extends MapperTestUtility $this->builder->expects($this->exactly(2)) ->method('setParameter') - ->withConsecutive([':user_id', 'jack'], [':id', 1]) + ->withConsecutive(['user_id', 'jack'], ['id', 1]) ->will($this->returnSelf()); $this->builder->expects($this->once()) @@ -208,7 +208,7 @@ class FeedMapperTest extends MapperTestUtility $this->builder->expects($this->exactly(2)) ->method('setParameter') - ->withConsecutive([':user_id', 'jack'], [':id', 1]) + ->withConsecutive(['user_id', 'jack'], ['id', 1]) ->will($this->returnSelf()); $this->builder->expects($this->once()) @@ -256,7 +256,7 @@ class FeedMapperTest extends MapperTestUtility $this->builder->expects($this->exactly(2)) ->method('setParameter') - ->withConsecutive([':user_id', 'jack'], [':url', 'https://url.com']) + ->withConsecutive(['user_id', 'jack'], ['url', 'https://url.com']) ->will($this->returnSelf()); $this->builder->expects($this->once()) @@ -306,7 +306,7 @@ class FeedMapperTest extends MapperTestUtility $this->builder->expects($this->exactly(2)) ->method('setParameter') - ->withConsecutive([':user_id', 'jack'], [':id', 1]) + ->withConsecutive(['user_id', 'jack'], ['id', 1]) ->will($this->returnSelf()); $this->builder->expects($this->once()) @@ -390,7 +390,7 @@ class FeedMapperTest extends MapperTestUtility $this->builder->expects($this->exactly(1)) ->method('setParameter') - ->withConsecutive([':folder_id', 1]) + ->withConsecutive(['folder_id', 1]) ->will($this->returnSelf()); $this->builder->expects($this->once()) diff --git a/tests/Unit/Db/FolderMapperTest.php b/tests/Unit/Db/FolderMapperTest.php index ab2fb3995..dd87b22b5 100644 --- a/tests/Unit/Db/FolderMapperTest.php +++ b/tests/Unit/Db/FolderMapperTest.php @@ -74,7 +74,7 @@ class FolderMapperTest extends MapperTestUtility $this->builder->expects($this->once()) ->method('setParameter') - ->with(':user_id', 'jack') + ->with('user_id', 'jack') ->will($this->returnSelf()); $this->builder->expects($this->once()) @@ -124,7 +124,7 @@ class FolderMapperTest extends MapperTestUtility $this->builder->expects($this->exactly(2)) ->method('setParameter') - ->withConsecutive([':user_id', 'jack'], [':id', 1]) + ->withConsecutive(['user_id', 'jack'], ['id', 1]) ->will($this->returnSelf()); $this->builder->expects($this->once()) @@ -173,7 +173,7 @@ class FolderMapperTest extends MapperTestUtility $this->builder->expects($this->exactly(2)) ->method('setParameter') - ->withConsecutive([':user_id', 'jack'], [':id', 1]) + ->withConsecutive(['user_id', 'jack'], ['id', 1]) ->will($this->returnSelf()); $this->builder->expects($this->once()) @@ -222,7 +222,7 @@ class FolderMapperTest extends MapperTestUtility $this->builder->expects($this->exactly(2)) ->method('setParameter') - ->withConsecutive([':user_id', 'jack'], [':id', 1]) + ->withConsecutive(['user_id', 'jack'], ['id', 1]) ->will($this->returnSelf()); $this->builder->expects($this->once()) diff --git a/tests/Unit/Db/NewsMapperTest.php b/tests/Unit/Db/NewsMapperTest.php index b6d4422c2..5d75f740f 100644 --- a/tests/Unit/Db/NewsMapperTest.php +++ b/tests/Unit/Db/NewsMapperTest.php @@ -193,7 +193,7 @@ class NewsMapperTest extends TestCase $qb->expects($this->once()) ->method('setParameter') - ->with(':user_id', 'jack') + ->with('user_id', 'jack') ->will($this->returnSelf()); $qb->expects($this->once()) @@ -226,7 +226,7 @@ class NewsMapperTest extends TestCase $qb->expects($this->once()) ->method('setParameter') - ->with(':deleted_at', 1) + ->with('deleted_at', 1) ->will($this->returnSelf()); $qb->expects($this->once()) @@ -259,7 +259,7 @@ class NewsMapperTest extends TestCase $qb->expects($this->exactly(2)) ->method('setParameter') - ->withConsecutive([':user_id', 'jack'], [':deleted_at', 1]) + ->withConsecutive(['user_id', 'jack'], ['deleted_at', 1]) ->will($this->returnSelf()); $qb->expects($this->once()) -- cgit v1.2.3