22.0.0-alpha.6

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
nextcloud · Jun 1, 2021 · 1acecaa · 1acecaa
1 parent 3ceb7c8
commit 1acecaa
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/Makefile b/Makefile
@@ -8,7 +8,7 @@ package_name=$(app_name)
 cert_dir=$(HOME)/.nextcloud/certificates
 github_account=nextcloud
 branch=master
-version+=22.0.0-alpha.5
+version+=22.0.0-alpha.6
 
 all: appstore
 

diff --git a/appinfo/info.xml b/appinfo/info.xml
@@ -8,7 +8,7 @@
 Those groups of users (or "circles") can then be used by any other app for sharing purpose.
 		]]>
 	</description>
-	<version>22.0.0-alpha.5</version>
+	<version>22.0.0-alpha.6</version>
 	<licence>agpl</licence>
 	<author>Maxence Lange</author>
 	<types>

diff --git a/lib/Db/CoreQueryBuilder.php b/lib/Db/CoreQueryBuilder.php
@@ -48,7 +48,7 @@
 
 
 /**
- * Class CoreRequestBuilder
+ * Class CoreQueryBuilder
  *
  * @package OCA\Circles\Db
  */
@@ -62,20 +62,21 @@ class CoreQueryBuilder extends NC22ExtendedQueryBuilder {
 	const CIRCLE = 'circle';
 	const MEMBER = 'member';
 	const OWNER = 'owner';
-	const FEDERATED_EVENT = 'federatedEvent';
+	const FEDERATED_EVENT = 'federatedevent';
 	const REMOTE = 'remote';
-	const BASED_ON = 'basedOn';
+	const BASED_ON = 'basedon';
 	const INITIATOR = 'initiator';
 	const MEMBERSHIPS = 'memberships';
-	const UPSTREAM_MEMBERSHIPS = 'upstreamMemberships';
-	const INHERITANCE_FROM = 'inheritanceFrom';
-	const INHERITED_BY = 'inheritedBy';
+	const UPSTREAM_MEMBERSHIPS = 'upstreammemberships';
+	const INHERITANCE_FROM = 'inheritancefrom';
+	const INHERITED_BY = 'inheritedby';
 	const MOUNT = 'mount';
 	const MOUNTPOINT = 'mountpoint';
 	const SHARE = 'share';
-	const FILE_CACHE = 'fileCache';
+	const FILE_CACHE = 'filecache';
 	const STORAGES = 'storages';
 	const OPTIONS = 'options';
+	const HELPER = 'circleshelper';
 
 
 	public static $SQL_PATH = [
@@ -212,7 +213,7 @@ class CoreQueryBuilder extends NC22ExtendedQueryBuilder {
 
 
 	/**
-	 * CoreRequestBuilder constructor.
+	 * CoreQueryBuilder constructor.
 	 */
 	public function __construct() {
 		parent::__construct();

diff --git a/lib/Db/MemberRequest.php b/lib/Db/MemberRequest.php
@@ -249,8 +249,6 @@ public function getInheritedMembers(string $singleId, bool $getData = false): ar
 		$qb->orderBy($aliasMembership . '.inheritance_depth', 'asc')
 		   ->addGroupBy($aliasMembership . '.inheritance_depth');
 
-//		$qb->groupBy(CoreQueryBuilder::MEMBER . '.single_id');
-
 		return $this->getItemsFromRequest($qb);
 	}
 
@@ -359,9 +357,9 @@ public function getAlternateSingleId(IFederatedUser $federatedUser) {
 
 		$expr = $qb->expr();
 		$orX = $expr->orX(
-			$qb->exprLimitToDBField('user_id', $federatedUser->getUserId(), false, true),
-			$qb->exprLimitToDBFieldInt('user_type', $federatedUser->getUserType(), false),
-			$qb->exprLimitToDBField('instance', $qb->getInstance($federatedUser), false, false)
+			$qb->exprFilter('user_id', $federatedUser->getUserId()),
+			$qb->exprFilter('user_type', $federatedUser->getUserType()),
+			$qb->exprFilter('instance', $qb->getInstance($federatedUser), '', false)
 		);
 
 		$qb->andWhere($orX);

diff --git a/lib/Service/ShareWrapperService.php b/lib/Service/ShareWrapperService.php
@@ -188,6 +188,7 @@ public function getSharedWith(
 	 * @param int $offset
 	 * @param int $limit
 	 * @param bool $getData
+	 * @param bool $completeDetails
 	 *
 	 * @return ShareWrapper[]
 	 * @throws RequestBuilderException