@@ -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) { |
@@ -105,7 +105,7 @@ |
||
105 | 105 | * @param int $circleId |
106 | 106 | * @param string $link |
107 | 107 | * |
108 | - * @return bool |
|
108 | + * @return integer |
|
109 | 109 | * @throws Exception |
110 | 110 | * @throws FederatedCircleLinkFormatException |
111 | 111 | * @throws CircleTypeNotValid |
@@ -146,10 +146,10 @@ discard block |
||
146 | 146 | */ |
147 | 147 | private function generateLinkRemoteURL($remote) { |
148 | 148 | if (strpos($remote, 'http') !== 0) { |
149 | - $remote = 'https://' . $remote; |
|
149 | + $remote = 'https://'.$remote; |
|
150 | 150 | } |
151 | 151 | |
152 | - return rtrim($remote, '/') . '/ocs/v2.php/apps/circles/api/v2/link/'; |
|
152 | + return rtrim($remote, '/').'/ocs/v2.php/apps/circles/api/v2/link/'; |
|
153 | 153 | } |
154 | 154 | |
155 | 155 | |
@@ -163,7 +163,7 @@ discard block |
||
163 | 163 | */ |
164 | 164 | private function requestLinkWithCircle(Circle $circle, $remoteAddress, $remoteCircle) { |
165 | 165 | $this->miscService->log( |
166 | - "create link : " . $remoteCircle . ' - ' . $remoteAddress . ' - ' . $circle->getId() |
|
166 | + "create link : ".$remoteCircle.' - '.$remoteAddress.' - '.$circle->getId() |
|
167 | 167 | ); |
168 | 168 | |
169 | 169 | $args = ['circleName' => $remoteCircle]; |
@@ -177,7 +177,7 @@ discard block |
||
177 | 177 | 'connect_timeout' => 10, |
178 | 178 | ] |
179 | 179 | ); |
180 | - $this->miscService->log("RESULT: " . var_export($toto, true)); |
|
180 | + $this->miscService->log("RESULT: ".var_export($toto, true)); |
|
181 | 181 | |
182 | 182 | return 1; |
183 | 183 | } catch (ClientException $e) { |