| @@ -162,7 +162,7 @@ | ||
| 162 | 162 | * getMembersFromCircleSql() | 
| 163 | 163 | * getMemberFromCircleSql() | 
| 164 | 164 | * | 
| 165 | - * @param $circleId | |
| 165 | + * @param integer $circleId | |
| 166 | 166 | * | 
| 167 | 167 | * @return \OCP\DB\QueryBuilder\IQueryBuilder | 
| 168 | 168 | */ | 
| @@ -73,7 +73,7 @@ discard block | ||
| 73 | 73 | $expr = $qb->expr(); | 
| 74 | 74 | $pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : ''; | 
| 75 | 75 | |
| 76 | - $qb->andWhere($expr->eq($pf . 'share_with', $qb->createNamedParameter($circleId))); | |
| 76 | + $qb->andWhere($expr->eq($pf.'share_with', $qb->createNamedParameter($circleId))); | |
| 77 | 77 | } | 
| 78 | 78 | |
| 79 | 79 | |
| @@ -87,7 +87,7 @@ discard block | ||
| 87 | 87 | $expr = $qb->expr(); | 
| 88 | 88 | $pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : ''; | 
| 89 | 89 | |
| 90 | - $qb->andWhere($expr->eq($pf . 'id', $qb->createNamedParameter($shareId))); | |
| 90 | + $qb->andWhere($expr->eq($pf.'id', $qb->createNamedParameter($shareId))); | |
| 91 | 91 | } | 
| 92 | 92 | |
| 93 | 93 | |
| @@ -136,8 +136,8 @@ discard block | ||
| 136 | 136 | /** @noinspection PhpMethodParametersCountMismatchInspection */ | 
| 137 | 137 | $qb->andWhere( | 
| 138 | 138 | $expr->orX( | 
| 139 | - $expr->eq($pf . 'parent', $qb->createNamedParameter($circleId)), | |
| 140 | - $expr->eq($pf . 'id', $qb->createNamedParameter($circleId)) | |
| 139 | + $expr->eq($pf.'parent', $qb->createNamedParameter($circleId)), | |
| 140 | + $expr->eq($pf.'id', $qb->createNamedParameter($circleId)) | |
| 141 | 141 | ) | 
| 142 | 142 | ); | 
| 143 | 143 | } | 
| @@ -159,7 +159,7 @@ discard block | ||
| 159 | 159 | $pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : ''; | 
| 160 | 160 | $qb->andWhere( | 
| 161 | 161 | $expr->in( | 
| 162 | - $pf . 'file_source', | |
| 162 | + $pf.'file_source', | |
| 163 | 163 | $qb->createNamedParameter($files, IQueryBuilder::PARAM_INT_ARRAY) | 
| 164 | 164 | ) | 
| 165 | 165 | ); | 
| @@ -191,13 +191,13 @@ discard block | ||
| 191 | 191 | $pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : ''; | 
| 192 | 192 | |
| 193 | 193 |  		if ($reShares === false) { | 
| 194 | - $qb->andWhere($expr->eq($pf . 'uid_initiator', $qb->createNamedParameter($userId))); | |
| 194 | + $qb->andWhere($expr->eq($pf.'uid_initiator', $qb->createNamedParameter($userId))); | |
| 195 | 195 |  		} else { | 
| 196 | 196 | /** @noinspection PhpMethodParametersCountMismatchInspection */ | 
| 197 | 197 | $qb->andWhere( | 
| 198 | 198 | $expr->orX( | 
| 199 | - $expr->eq($pf . 'uid_owner', $qb->createNamedParameter($userId)), | |
| 200 | - $expr->eq($pf . 'uid_initiator', $qb->createNamedParameter($userId)) | |
| 199 | + $expr->eq($pf.'uid_owner', $qb->createNamedParameter($userId)), | |
| 200 | + $expr->eq($pf.'uid_initiator', $qb->createNamedParameter($userId)) | |
| 201 | 201 | ) | 
| 202 | 202 | ); | 
| 203 | 203 | } | 
| @@ -51,9 +51,9 @@ | ||
| 51 | 51 | */ | 
| 52 | 52 |  	protected function limitToCircle(& $qb, $circleId) { | 
| 53 | 53 | $expr = $qb->expr(); | 
| 54 | - $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : ''; | |
| 54 | + $pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : ''; | |
| 55 | 55 | |
| 56 | - $qb->andWhere($expr->eq($pf . 'circle_id', $qb->createNamedParameter($circleId))); | |
| 56 | + $qb->andWhere($expr->eq($pf.'circle_id', $qb->createNamedParameter($circleId))); | |
| 57 | 57 | } | 
| 58 | 58 | |
| 59 | 59 | |
| @@ -92,7 +92,7 @@ | ||
| 92 | 92 | } | 
| 93 | 93 | |
| 94 | 94 | /** | 
| 95 | - * @return mixed | |
| 95 | + * @return string | |
| 96 | 96 | */ | 
| 97 | 97 |  	public function getCircleName() { | 
| 98 | 98 | return $this->circleName; | 
| @@ -84,7 +84,7 @@ discard block | ||
| 84 | 84 | * | 
| 85 | 85 | * @param $container | 
| 86 | 86 | */ | 
| 87 | -	private function registerServices(IAppContainer &$container) { | |
| 87 | +	private function registerServices(IAppContainer & $container) { | |
| 88 | 88 | |
| 89 | 89 | $container->registerService( | 
| 90 | 90 |  			'MiscService', function(IAppContainer $c) { | 
| @@ -143,7 +143,7 @@ discard block | ||
| 143 | 143 | * | 
| 144 | 144 | * @param $container | 
| 145 | 145 | */ | 
| 146 | -	private static function registerControllers(IAppContainer &$container) { | |
| 146 | +	private static function registerControllers(IAppContainer & $container) { | |
| 147 | 147 | |
| 148 | 148 | $container->registerService( | 
| 149 | 149 |  			'NavigationController', function(IAppContainer $c) { | 
| @@ -193,7 +193,7 @@ discard block | ||
| 193 | 193 | * | 
| 194 | 194 | * @param IAppContainer $container | 
| 195 | 195 | */ | 
| 196 | -	private static function registerDatabaseRequesters(IAppContainer &$container) { | |
| 196 | +	private static function registerDatabaseRequesters(IAppContainer & $container) { | |
| 197 | 197 | |
| 198 | 198 | $container->registerService( | 
| 199 | 199 |  			'CirclesRequest', function(IAppContainer $c) { | 
| @@ -211,7 +211,7 @@ discard block | ||
| 211 | 211 | * | 
| 212 | 212 | * @param $container | 
| 213 | 213 | */ | 
| 214 | -	private static function registerMappers(IAppContainer &$container) { | |
| 214 | +	private static function registerMappers(IAppContainer & $container) { | |
| 215 | 215 | |
| 216 | 216 | $container->registerService( | 
| 217 | 217 |  			'CirclesMapper', function(IAppContainer $c) { | 
| @@ -239,7 +239,7 @@ discard block | ||
| 239 | 239 | * | 
| 240 | 240 | * @param $container | 
| 241 | 241 | */ | 
| 242 | -	private static function registerCores(IAppContainer &$container) { | |
| 242 | +	private static function registerCores(IAppContainer & $container) { | |
| 243 | 243 | |
| 244 | 244 | $container->registerService( | 
| 245 | 245 |  			'Logger', function(IAppContainer $c) { | 
| @@ -148,7 +148,7 @@ | ||
| 148 | 148 | continue; | 
| 149 | 149 | } | 
| 150 | 150 | |
| 151 | - $level = (int) $row['role'] === 1 ? Member::LEVEL_OWNER : Member::LEVEL_MEMBER; | |
| 151 | + $level = (int)$row['role'] === 1 ? Member::LEVEL_OWNER : Member::LEVEL_MEMBER; | |
| 152 | 152 | |
| 153 | 153 |  			if ($level === Member::LEVEL_OWNER) { | 
| 154 | 154 |  				if (isset($this->circleHasAdmin[$this->circlesById[$row['group_id']]])) { | 
| @@ -193,10 +193,10 @@ discard block | ||
| 193 | 193 | */ | 
| 194 | 194 |  	private function generateLinkRemoteURL($remote) { | 
| 195 | 195 |  		if (strpos($remote, 'http') !== 0) { | 
| 196 | - $remote = 'https://' . $remote; | |
| 196 | + $remote = 'https://'.$remote; | |
| 197 | 197 | } | 
| 198 | 198 | |
| 199 | - return rtrim($remote, '/') . '/index.php/apps/circles/circles/link/'; | |
| 199 | + return rtrim($remote, '/').'/index.php/apps/circles/circles/link/'; | |
| 200 | 200 | } | 
| 201 | 201 | |
| 202 | 202 | |
| @@ -207,7 +207,7 @@ discard block | ||
| 207 | 207 | * @return int | 
| 208 | 208 | * @throws Exception | 
| 209 | 209 | */ | 
| 210 | -	private function requestLink(Circle $circle, FederatedLink &$link) { | |
| 210 | +	private function requestLink(Circle $circle, FederatedLink & $link) { | |
| 211 | 211 | $args = [ | 
| 212 | 212 | 'token' => $link->getToken(), | 
| 213 | 213 | 'uniqueId' => $circle->getUniqueId(), | 
| @@ -269,7 +269,7 @@ discard block | ||
| 269 | 269 | * | 
| 270 | 270 | * @return bool | 
| 271 | 271 | */ | 
| 272 | -	public function initiateLink(Circle $circle, FederatedLink &$link) { | |
| 272 | +	public function initiateLink(Circle $circle, FederatedLink & $link) { | |
| 273 | 273 | |
| 274 | 274 | $link->setCircleId($circle->getId()); | 
| 275 | 275 | |
| @@ -149,8 +149,8 @@ discard block | ||
| 149 | 149 | |
| 150 | 150 | |
| 151 | 151 | /** | 
| 152 | - * @param $circleId | |
| 153 | - * @param $remote | |
| 152 | + * @param integer $circleId | |
| 153 | + * @param string $remote | |
| 154 | 154 | * | 
| 155 | 155 | * @return FederatedLink | 
| 156 | 156 | * @throws Exception | 
| @@ -204,7 +204,7 @@ discard block | ||
| 204 | 204 | * @param Circle $circle | 
| 205 | 205 | * @param FederatedLink $link | 
| 206 | 206 | * | 
| 207 | - * @return int | |
| 207 | + * @return boolean | |
| 208 | 208 | * @throws Exception | 
| 209 | 209 | */ | 
| 210 | 210 |  	private function requestLink(Circle $circle, FederatedLink &$link) { | 
| @@ -296,7 +296,7 @@ discard block | ||
| 296 | 296 | |
| 297 | 297 | |
| 298 | 298 | /** | 
| 299 | - * @param $circleId | |
| 299 | + * @param integer $circleId | |
| 300 | 300 | * @param $uniqueId | 
| 301 | 301 | * | 
| 302 | 302 | * @return FederatedLink |