nextcloud / circles

lib/Db/CoreQueryBuilder.php

Spacing +79 added lines, -79 removed lines

@@ -395,7 +395,7 @@ 
 		}
 
 		if ($circle->getDisplayName() !== '') {
-			$this->searchInDBField('display_name', '%' . $circle->getDisplayName() . '%');
+			$this->searchInDBField('display_name', '%'.$circle->getDisplayName().'%');
 		}
 		if ($circle->getConfig() > 0) {
 			$this->limitBitwise('config', $circle->getConfig());
@@ -414,7 +414,7 @@ 
 			$this->generateRemoteInstanceSelectAlias($aliasRemoteInstance)
 				 ->leftJoin(
 					 $alias, CoreRequestBuilder::TABLE_REMOTE, $aliasRemoteInstance,
-					 $expr->eq($alias . '.instance', $aliasRemoteInstance . '.instance')
+					 $expr->eq($alias.'.instance', $aliasRemoteInstance.'.instance')
 				 );
 		} catch (RequestBuilderException $e) {
 		}
@@ -467,7 +467,7 @@ 
 		$expr = $this->expr();
 		$this->leftJoin(
 			$this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_REMOTE, $aliasRemote,
-			$expr->eq($aliasRemote . '.instance', $this->createNamedParameter($remoteInstance->getInstance()))
+			$expr->eq($aliasRemote.'.instance', $this->createNamedParameter($remoteInstance->getInstance()))
 		);
 	}
 
@@ -495,12 +495,12 @@ 
 		$this->leftJoin(
 			$this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_MEMBER, $aliasRemoteMember,
 			$expr->andX(
-				$expr->eq($aliasRemoteMember . '.circle_id', $aliasCircle . '.unique_id'),
+				$expr->eq($aliasRemoteMember.'.circle_id', $aliasCircle.'.unique_id'),
 				$expr->eq(
-					$aliasRemoteMember . '.instance',
+					$aliasRemoteMember.'.instance',
 					$this->createNamedParameter($remoteInstance->getInstance())
 				),
-				$expr->gte($aliasRemoteMember . '.level', $this->createNamedParameter(Member::LEVEL_MEMBER))
+				$expr->gte($aliasRemoteMember.'.level', $this->createNamedParameter(Member::LEVEL_MEMBER))
 			)
 		);
 	}
@@ -532,21 +532,21 @@ 
 		$this->leftJoin(
 			$this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_MEMBER, $aliasRemoteCircle,
 			$expr->andX(
-				$expr->eq($aliasRemoteCircle . '.single_id', $aliasCircle . '.unique_id'),
-				$expr->emptyString($aliasRemoteCircle . '.instance'),
-				$expr->gte($aliasRemoteCircle . '.level', $this->createNamedParameter(Member::LEVEL_MEMBER))
+				$expr->eq($aliasRemoteCircle.'.single_id', $aliasCircle.'.unique_id'),
+				$expr->emptyString($aliasRemoteCircle.'.instance'),
+				$expr->gte($aliasRemoteCircle.'.level', $this->createNamedParameter(Member::LEVEL_MEMBER))
 			)
 		);
 		$this->leftJoin(
 			$this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_MEMBER, $aliasRemoteCircleOwner,
 			$expr->andX(
-				$expr->eq($aliasRemoteCircle . '.circle_id', $aliasRemoteCircleOwner . '.circle_id'),
+				$expr->eq($aliasRemoteCircle.'.circle_id', $aliasRemoteCircleOwner.'.circle_id'),
 				$expr->eq(
-					$aliasRemoteCircleOwner . '.instance',
+					$aliasRemoteCircleOwner.'.instance',
 					$this->createNamedParameter($remoteInstance->getInstance())
 				),
 				$expr->eq(
-					$aliasRemoteCircleOwner . '.level', $this->createNamedParameter(Member::LEVEL_OWNER)
+					$aliasRemoteCircleOwner.'.level', $this->createNamedParameter(Member::LEVEL_OWNER)
 				)
 			)
 		);
@@ -579,16 +579,16 @@ 
 		$expr = $this->expr();
 		$orX = $expr->orX();
 		$orX->add(
-			$expr->eq($aliasRemote . '.type', $this->createNamedParameter(RemoteInstance::TYPE_GLOBALSCALE))
+			$expr->eq($aliasRemote.'.type', $this->createNamedParameter(RemoteInstance::TYPE_GLOBALSCALE))
 		);
 
 		$orExtOrPassive = $expr->orX();
 		$orExtOrPassive->add(
-			$expr->eq($aliasRemote . '.type', $this->createNamedParameter(RemoteInstance::TYPE_EXTERNAL))
+			$expr->eq($aliasRemote.'.type', $this->createNamedParameter(RemoteInstance::TYPE_EXTERNAL))
 		);
 		if (!$sensitive) {
 			$orExtOrPassive->add(
-				$expr->eq($aliasRemote . '.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE))
+				$expr->eq($aliasRemote.'.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE))
 			);
 		} else {
 			if ($this->getDefaultSelectAlias() === CoreQueryBuilder::MEMBER) {
@@ -597,8 +597,8 @@ 
 		}
 
 		$orInstance = $expr->orX();
-		$orInstance->add($expr->isNotNull($aliasRemoteMember . '.instance'));
-		$orInstance->add($expr->isNotNull($aliasRemoteCircleOwner . '.instance'));
+		$orInstance->add($expr->isNotNull($aliasRemoteMember.'.instance'));
+		$orInstance->add($expr->isNotNull($aliasRemoteCircleOwner.'.instance'));
 
 		$andExternal = $expr->andX();
 		$andExternal->add($orExtOrPassive);
@@ -607,13 +607,13 @@ 
 		$orExtOrTrusted = $expr->orX();
 		$orExtOrTrusted->add($andExternal);
 		$orExtOrTrusted->add(
-			$expr->eq($aliasRemote . '.type', $this->createNamedParameter(RemoteInstance::TYPE_TRUSTED))
+			$expr->eq($aliasRemote.'.type', $this->createNamedParameter(RemoteInstance::TYPE_TRUSTED))
 		);
 
 		$andTrusted = $expr->andX();
 		$andTrusted->add($orExtOrTrusted);
 		$andTrusted->add($this->exprLimitBitwise('config', Circle::CFG_FEDERATED, $aliasCircle));
-		$andTrusted->add($expr->emptyString($aliasOwner . '.instance'));
+		$andTrusted->add($expr->emptyString($aliasOwner.'.instance'));
 		$orX->add($andTrusted);
 
 		$this->andWhere($orX);
@@ -640,7 +640,7 @@ 
 		}
 		$this->leftJoin(
 			$this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_MEMBER, $aliasMember,
-			$expr->eq($aliasMember . '.circle_id', $alias . '.unique_id')
+			$expr->eq($aliasMember.'.circle_id', $alias.'.unique_id')
 		);
 
 		$this->filterDirectMembership($aliasMember, $member);
@@ -661,30 +661,30 @@ 
 
 		if ($member->getUserId() !== '') {
 			$andX->add(
-				$expr->eq($aliasMember . '.user_id', $this->createNamedParameter($member->getUserId()))
+				$expr->eq($aliasMember.'.user_id', $this->createNamedParameter($member->getUserId()))
 			);
 		}
 
 		if ($member->getSingleId() !== '') {
 			$andX->add(
-				$expr->eq($aliasMember . '.single_id', $this->createNamedParameter($member->getSingleId()))
+				$expr->eq($aliasMember.'.single_id', $this->createNamedParameter($member->getSingleId()))
 			);
 		}
 
 		if ($member->getUserType() > 0) {
 			$andX->add(
-				$expr->eq($aliasMember . '.user_type', $this->createNamedParameter($member->getUserType()))
+				$expr->eq($aliasMember.'.user_type', $this->createNamedParameter($member->getUserType()))
 			);
 		}
 
 		$andX->add(
-			$expr->eq($aliasMember . '.instance', $this->createNamedParameter($this->getInstance($member)))
+			$expr->eq($aliasMember.'.instance', $this->createNamedParameter($this->getInstance($member)))
 		);
 
 		if ($member->getLevel() > 0) {
 			$andX->add(
 				$expr->gte(
-					$aliasMember . '.level',
+					$aliasMember.'.level',
 					$this->createNamedParameter($member->getLevel(), IQueryBuilder::PARAM_INT)
 				)
 			);
@@ -715,12 +715,12 @@ 
 
 		$expr = $this->expr();
 		$this->selectAlias(
-			$this->createFunction('COUNT(`' . $aliasMemberCount . '`.`member_id`)'),
-			(($alias !== $this->getDefaultSelectAlias()) ? $alias . '_' : '') . 'population'
+			$this->createFunction('COUNT(`'.$aliasMemberCount.'`.`member_id`)'),
+			(($alias !== $this->getDefaultSelectAlias()) ? $alias.'_' : '').'population'
 		);
 		$this->leftJoin(
 			$alias, CoreRequestBuilder::TABLE_MEMBER, $aliasMemberCount,
-			$expr->eq($alias . '.unique_id', $aliasMemberCount . '.circle_id')
+			$expr->eq($alias.'.unique_id', $aliasMemberCount.'.circle_id')
 		);
 	}
 
@@ -756,7 +756,7 @@ 
 			$helperAlias,
 			CoreRequestBuilder::TABLE_CIRCLE,
 			$aliasCircle,
-			$expr->eq($aliasCircle . '.unique_id', $helperAlias . '.' . $field)
+			$expr->eq($aliasCircle.'.unique_id', $helperAlias.'.'.$field)
 		);
 
 		if (!is_null($initiator)) {
@@ -787,7 +787,7 @@ 
 		$this->generateCircleSelectAlias($aliasInvitedBy)
 			 ->leftJoin(
 				 $aliasMember, CoreRequestBuilder::TABLE_CIRCLE, $aliasInvitedBy,
-				 $expr->eq($aliasMember . '.invited_by', $aliasInvitedBy . '.unique_id')
+				 $expr->eq($aliasMember.'.invited_by', $aliasInvitedBy.'.unique_id')
 			 );
 
 		$this->leftJoinOwner($aliasInvitedBy);
@@ -818,7 +818,7 @@ 
 		$this->generateCircleSelectAlias($aliasBasedOn)
 			 ->leftJoin(
 				 $aliasMember, CoreRequestBuilder::TABLE_CIRCLE, $aliasBasedOn,
-				 $expr->eq($aliasBasedOn . '.unique_id', $aliasMember . '.single_id')
+				 $expr->eq($aliasBasedOn.'.unique_id', $aliasMember.'.single_id')
 			 );
 
 		if (!is_null($initiator)) {
@@ -851,9 +851,9 @@ 
 			 ->leftJoin(
 				 $alias, CoreRequestBuilder::TABLE_MEMBER, $aliasMember,
 				 $expr->andX(
-					 $expr->eq($aliasMember . '.circle_id', $alias . '.' . $field),
+					 $expr->eq($aliasMember.'.circle_id', $alias.'.'.$field),
 					 $expr->eq(
-						 $aliasMember . '.level',
+						 $aliasMember.'.level',
 						 $this->createNamedParameter(Member::LEVEL_OWNER, self::PARAM_INT)
 					 )
 				 )
@@ -891,10 +891,10 @@ 
 			 ->leftJoin(
 				 $alias, CoreRequestBuilder::TABLE_MEMBER, $aliasMember,
 				 $expr->andX(
-					 $expr->eq($aliasMember . '.circle_id', $alias . '.' . $fieldCircleId),
-					 $expr->eq($aliasMember . '.single_id', $alias . '.' . $fieldSingleId),
+					 $expr->eq($aliasMember.'.circle_id', $alias.'.'.$fieldCircleId),
+					 $expr->eq($aliasMember.'.single_id', $alias.'.'.$fieldSingleId),
 					 $expr->gte(
-						 $aliasMember . '.level',
+						 $aliasMember.'.level',
 						 $this->createNamedParameter(Member::LEVEL_MEMBER, self::PARAM_INT)
 					 )
 				 )
@@ -927,7 +927,7 @@ 
 
 		$this->leftJoin(
 			$alias, CoreRequestBuilder::TABLE_MEMBERSHIP, $aliasMembership,
-			$expr->eq($aliasMembership . '.circle_id', $alias . '.' . $field)
+			$expr->eq($aliasMembership.'.circle_id', $alias.'.'.$field)
 		);
 
 //		if (!$this->getBool('getData', $options, false)) {
@@ -941,8 +941,8 @@ 
 			 ->leftJoin(
 				 $alias, CoreRequestBuilder::TABLE_MEMBER, $aliasInheritedBy,
 				 $expr->andX(
-					 $expr->eq($aliasMembership . '.inheritance_last', $aliasInheritedBy . '.circle_id'),
-					 $expr->eq($aliasMembership . '.single_id', $aliasInheritedBy . '.single_id')
+					 $expr->eq($aliasMembership.'.inheritance_last', $aliasInheritedBy.'.circle_id'),
+					 $expr->eq($aliasMembership.'.single_id', $aliasInheritedBy.'.single_id')
 				 )
 			 );
 
@@ -959,12 +959,12 @@ 
 		$aliasUpstreamMembership = $this->generateAlias($alias, self::UPSTREAM_MEMBERSHIPS, $options);
 		$this->leftJoin(
 			$alias, CoreRequestBuilder::TABLE_MEMBERSHIP, $aliasUpstreamMembership,
-			$expr->eq($aliasUpstreamMembership . '.single_id', $this->createNamedParameter($singleId))
+			$expr->eq($aliasUpstreamMembership.'.single_id', $this->createNamedParameter($singleId))
 		);
 
 		$orX = $expr->orX(
-			$expr->eq($aliasUpstreamMembership . '.circle_id', $alias . '.' . $field),
-			$expr->eq($alias . '.' . $field, $this->createNamedParameter($singleId))
+			$expr->eq($aliasUpstreamMembership.'.circle_id', $alias.'.'.$field),
+			$expr->eq($alias.'.'.$field, $this->createNamedParameter($singleId))
 		);
 
 		$this->andWhere($orX);
@@ -985,11 +985,11 @@ 
 
 		$expr = $this->expr();
 		$aliasMembership = $this->generateAlias($alias, self::MEMBERSHIPS);
-		$this->andWhere($expr->eq($aliasMembership . '.circle_id', $this->createNamedParameter($singleId)));
+		$this->andWhere($expr->eq($aliasMembership.'.circle_id', $this->createNamedParameter($singleId)));
 		if ($level > 1) {
 			$this->andWhere(
 				$expr->gte(
-					$aliasMembership . '.level',
+					$aliasMembership.'.level',
 					$this->createNamedParameter($level, IQueryBuilder::PARAM_INT)
 				)
 			);
@@ -1017,8 +1017,8 @@ 
 		$this->leftJoin(
 			$alias, CoreRequestBuilder::TABLE_MEMBERSHIP, $aliasMembership,
 			$expr->andX(
-				$expr->eq($aliasMembership . '.inheritance_last', $alias . '.' . $field),
-				$expr->eq($aliasMembership . '.single_id', $alias . '.single_id')
+				$expr->eq($aliasMembership.'.inheritance_last', $alias.'.'.$field),
+				$expr->eq($aliasMembership.'.single_id', $alias.'.single_id')
 			)
 		);
 
@@ -1031,8 +1031,8 @@ 
 			 ->leftJoin(
 				 $aliasMembership, CoreRequestBuilder::TABLE_MEMBER, $aliasInheritanceFrom,
 				 $expr->andX(
-					 $expr->eq($aliasMembership . '.circle_id', $aliasInheritanceFrom . '.circle_id'),
-					 $expr->eq($aliasMembership . '.inheritance_first', $aliasInheritanceFrom . '.single_id')
+					 $expr->eq($aliasMembership.'.circle_id', $aliasInheritanceFrom.'.circle_id'),
+					 $expr->eq($aliasMembership.'.inheritance_first', $aliasInheritanceFrom.'.single_id')
 				 )
 			 );
 	}
@@ -1075,14 +1075,14 @@ 
 		try {
 			$aliasConfig = $this->generateAlias($alias, self::CONFIG, $options);
 			$this->selectAlias(
-				$aliasConfig . '.config',
-				(($alias !== $this->getDefaultSelectAlias()) ? $alias . '_' : '') . 'circle_config'
+				$aliasConfig.'.config',
+				(($alias !== $this->getDefaultSelectAlias()) ? $alias.'_' : '').'circle_config'
 			);
 			$this->leftJoin(
 				$alias,
 				CoreRequestBuilder::TABLE_CIRCLE,
 				$aliasConfig,
-				$expr->eq($alias . '.circle_id', $aliasConfig . '.unique_id')
+				$expr->eq($alias.'.circle_id', $aliasConfig.'.unique_id')
 			);
 		} catch (RequestBuilderException $e) {
 		}
@@ -1120,7 +1120,7 @@ 
 			$aliasMembership,
 			$expr->andX(
 				$this->exprLimit('single_id', $initiator->getSingleId(), $aliasMembership),
-				$expr->eq($aliasMembership . '.circle_id', $helperAlias . '.' . $field)
+				$expr->eq($aliasMembership.'.circle_id', $helperAlias.'.'.$field)
 			)
 		);
 
@@ -1130,7 +1130,7 @@ 
 				$aliasMembership,
 				CoreRequestBuilder::TABLE_CIRCLE,
 				$aliasMembershipCircle,
-				$expr->eq($aliasMembership . '.circle_id', $aliasMembershipCircle . '.unique_id')
+				$expr->eq($aliasMembership.'.circle_id', $aliasMembershipCircle.'.unique_id')
 			);
 		} catch (RequestBuilderException $e) {
 		}
@@ -1151,7 +1151,7 @@ 
 						 $aliasDirectInitiator,
 						 $expr->andX(
 							 $this->exprLimit('single_id', $initiator->getSingleId(), $aliasDirectInitiator),
-							 $expr->eq($aliasDirectInitiator . '.circle_id', $helperAlias . '.' . $field)
+							 $expr->eq($aliasDirectInitiator.'.circle_id', $helperAlias.'.'.$field)
 						 )
 					 );
 			} catch (RequestBuilderException $e) {
@@ -1164,8 +1164,8 @@ 
 			$this->leftJoin(
 				$aliasMembership, CoreRequestBuilder::TABLE_MEMBER, $aliasInitiator,
 				$expr->andX(
-					$expr->eq($aliasMembership . '.inheritance_first', $aliasInitiator . '.single_id'),
-					$expr->eq($aliasMembership . '.circle_id', $aliasInitiator . '.circle_id')
+					$expr->eq($aliasMembership.'.inheritance_first', $aliasInitiator.'.single_id'),
+					$expr->eq($aliasMembership.'.circle_id', $aliasInitiator.'.circle_id')
 				)
 			);
 
@@ -1173,8 +1173,8 @@ 
 			$this->leftJoin(
 				$aliasInitiator, CoreRequestBuilder::TABLE_MEMBER, $aliasInheritedBy,
 				$expr->andX(
-					$expr->eq($aliasMembership . '.single_id', $aliasInheritedBy . '.single_id'),
-					$expr->eq($aliasMembership . '.inheritance_last', $aliasInheritedBy . '.circle_id')
+					$expr->eq($aliasMembership.'.single_id', $aliasInheritedBy.'.single_id'),
+					$expr->eq($aliasMembership.'.inheritance_last', $aliasInheritedBy.'.circle_id')
 				)
 			);
 
@@ -1226,7 +1226,7 @@ 
 			$orX->add(
 				$expr->andX(
 					$this->exprLimitBitwise('config', Circle::CFG_PERSONAL, $aliasMembershipCircle),
-					$expr->eq($aliasMembership . '.level', $this->createNamedParameter(Member::LEVEL_OWNER))
+					$expr->eq($aliasMembership.'.level', $this->createNamedParameter(Member::LEVEL_OWNER))
 				)
 			);
 		}
@@ -1315,21 +1315,21 @@ 
 		$expr = $this->expr();
 		$andPassive = $expr->andX();
 		$andPassive->add(
-			$expr->eq($alias . '.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE))
+			$expr->eq($alias.'.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE))
 		);
 
 		$orMemberOrLevel = $expr->orX();
 		$orMemberOrLevel->add(
-			$expr->eq($this->getDefaultSelectAlias() . '.instance', $alias . '.instance')
+			$expr->eq($this->getDefaultSelectAlias().'.instance', $alias.'.instance')
 		);
 		// TODO: do we need this ? (display members from the local instance)
 		$orMemberOrLevel->add(
-			$expr->emptyString($this->getDefaultSelectAlias() . '.instance')
+			$expr->emptyString($this->getDefaultSelectAlias().'.instance')
 		);
 
 		$orMemberOrLevel->add(
 			$expr->eq(
-				$this->getDefaultSelectAlias() . '.level',
+				$this->getDefaultSelectAlias().'.level',
 				$this->createNamedParameter(Member::LEVEL_OWNER)
 			)
 		);
@@ -1366,11 +1366,11 @@ 
 			 )
 			 ->leftJoin(
 				 $aliasShare, CoreRequestBuilder::TABLE_FILE_CACHE, $aliasFileCache,
-				 $expr->eq($aliasShare . '.file_source', $aliasFileCache . '.fileid')
+				 $expr->eq($aliasShare.'.file_source', $aliasFileCache.'.fileid')
 			 )
 			 ->leftJoin(
 				 $aliasFileCache, CoreRequestBuilder::TABLE_STORAGES, $aliasStorages,
-				 $expr->eq($aliasFileCache . '.storage', $aliasStorages . '.numeric_id')
+				 $expr->eq($aliasFileCache.'.storage', $aliasStorages.'.numeric_id')
 			 );
 	}
 
@@ -1392,8 +1392,8 @@ 
 		$this->leftJoin(
 			$aliasShareMemberships, CoreRequestBuilder::TABLE_SHARE, $aliasShareChild,
 			$expr->andX(
-				$expr->eq($aliasShareChild . '.parent', $aliasShare . '.id'),
-				$expr->eq($aliasShareChild . '.share_with', $aliasShareMemberships . '.single_id')
+				$expr->eq($aliasShareChild.'.parent', $aliasShare.'.id'),
+				$expr->eq($aliasShareChild.'.share_with', $aliasShareMemberships.'.single_id')
 			)
 		);
 
@@ -1443,13 +1443,13 @@ 
 		$this->leftJoin(
 			$aliasMountMemberships, CoreRequestBuilder::TABLE_MOUNTPOINT, $aliasMountpoint,
 			$expr->andX(
-				$expr->eq($aliasMountpoint . '.mount_id', $aliasMount . '.mount_id'),
-				$expr->eq($aliasMountpoint . '.single_id', $aliasMountMemberships . '.single_id')
+				$expr->eq($aliasMountpoint.'.mount_id', $aliasMount.'.mount_id'),
+				$expr->eq($aliasMountpoint.'.single_id', $aliasMountMemberships.'.single_id')
 			)
 		);
 
-		$this->selectAlias($aliasMountpoint . '.mountpoint', $aliasMountpoint . '_mountpoint');
-		$this->selectAlias($aliasMountpoint . '.mountpoint_hash', $aliasMountpoint . '_mountpoint_hash');
+		$this->selectAlias($aliasMountpoint.'.mountpoint', $aliasMountpoint.'_mountpoint');
+		$this->selectAlias($aliasMountpoint.'.mountpoint_hash', $aliasMountpoint.'_mountpoint_hash');
 	}
 
 
@@ -1553,10 +1553,10 @@ 
 	 */
 	public function generateAlias(string $base, string $extension, ?array &$options = []): string {
 		$search = str_replace('_', '.', $base);
-		$path = $search . '.' . $extension;
+		$path = $search.'.'.$extension;
 		if (!$this->validKey($path, self::$SQL_PATH)
 			&& !in_array($extension, $this->getArray($search, self::$SQL_PATH))) {
-			throw new RequestBuilderException($extension . ' not found in ' . $search);
+			throw new RequestBuilderException($extension.' not found in '.$search);
 		}
 
 		if (!is_array($options)) {
@@ -1565,15 +1565,15 @@ 
 
 		$optionPath = '';
 		foreach (explode('.', $path) as $p) {
-			$optionPath = trim($optionPath . '.' . $p, '.');
+			$optionPath = trim($optionPath.'.'.$p, '.');
 			$options = array_merge(
 				$options,
-				$this->getArray($optionPath . '.' . self::OPTIONS, self::$SQL_PATH),
-				$this->getArray($optionPath . '.' . self::OPTIONS, $this->options)
+				$this->getArray($optionPath.'.'.self::OPTIONS, self::$SQL_PATH),
+				$this->getArray($optionPath.'.'.self::OPTIONS, $this->options)
 			);
 		}
 
-		return $base . '_' . $extension;
+		return $base.'_'.$extension;
 	}
 
 
@@ -1593,7 +1593,7 @@ 
 			} else {
 				$k = $arr;
 			}
-			$path[$k] = $prefix . '_' . $k . '_';
+			$path[$k] = $prefix.'_'.$k.'_';
 		}
 
 		return $path;
@@ -1610,7 +1610,7 @@ 
 		$expr = $this->expr();
 		$orX = $expr->orX();
 		foreach ($aliases as $alias) {
-			$orX->add($expr->gte($alias . '.level', $this->createNamedParameter($level)));
+			$orX->add($expr->gte($alias.'.level', $this->createNamedParameter($level)));
 		}
 
 		return $orX;