@@ -879,7 +879,7 @@ |
||
879 | 879 | /** |
880 | 880 | * get database row of a give share |
881 | 881 | * |
882 | - * @param $id |
|
882 | + * @param integer $id |
|
883 | 883 | * |
884 | 884 | * @return array |
885 | 885 | * @throws ShareNotFound |
@@ -173,11 +173,11 @@ discard block |
||
173 | 173 | |
174 | 174 | $data = $exists->fetch(); |
175 | 175 | $exists->closeCursor(); |
176 | - $this->misc->log('______ ' . var_export($data, true)); |
|
176 | + $this->misc->log('______ '.var_export($data, true)); |
|
177 | 177 | |
178 | - $this->misc->log('______ ' . $qb->getSQL()); |
|
178 | + $this->misc->log('______ '.$qb->getSQL()); |
|
179 | 179 | $this->misc->log( |
180 | - '______ ' . \OCP\Share::SHARE_TYPE_CIRCLE . ' ' . $share->getSharedWith() . ' ' |
|
180 | + '______ '.\OCP\Share::SHARE_TYPE_CIRCLE.' '.$share->getSharedWith().' ' |
|
181 | 181 | . |
182 | 182 | $share->getNode() |
183 | 183 | ->getId()); |
@@ -689,7 +689,7 @@ discard block |
||
689 | 689 | ) |
690 | 690 | ->leftJoin( |
691 | 691 | 's', 'share', 's2', $qb->expr() |
692 | - ->eq('s.id', 's2.parent') . ' AND ' . $qb->expr() |
|
692 | + ->eq('s.id', 's2.parent').' AND '.$qb->expr() |
|
693 | 693 | ->eq( |
694 | 694 | 's2.share_with', |
695 | 695 | $qb->createNamedParameter( |
@@ -64,14 +64,14 @@ discard block |
||
64 | 64 | * Services |
65 | 65 | */ |
66 | 66 | $container->registerService( |
67 | - 'MiscService', function ($c) { |
|
67 | + 'MiscService', function($c) { |
|
68 | 68 | return new MiscService($c->query('Logger'), $c->query('AppName')); |
69 | 69 | } |
70 | 70 | ); |
71 | 71 | |
72 | 72 | |
73 | 73 | $container->registerService( |
74 | - 'ConfigService', function ($c) { |
|
74 | + 'ConfigService', function($c) { |
|
75 | 75 | return new ConfigService( |
76 | 76 | $c->query('AppName'), $c->query('CoreConfig'), $c->query('UserId'), |
77 | 77 | $c->query('MiscService') |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | ); |
81 | 81 | |
82 | 82 | $container->registerService( |
83 | - 'DatabaseService', function ($c) { |
|
83 | + 'DatabaseService', function($c) { |
|
84 | 84 | return new DatabaseService( |
85 | 85 | $c->query('CirclesMapper'), |
86 | 86 | $c->query('MembersMapper') |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | ); |
90 | 90 | |
91 | 91 | $container->registerService( |
92 | - 'CirclesService', function ($c) { |
|
92 | + 'CirclesService', function($c) { |
|
93 | 93 | return new CirclesService( |
94 | 94 | $c->query('UserId'), $c->query('L10N'), |
95 | 95 | $c->query('ConfigService'), |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | ); |
101 | 101 | |
102 | 102 | $container->registerService( |
103 | - 'MembersService', function ($c) { |
|
103 | + 'MembersService', function($c) { |
|
104 | 104 | return new MembersService( |
105 | 105 | $c->query('UserId'), $c->query('L10N'), |
106 | 106 | $c->query('UserManager'), |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | // ); |
134 | 134 | |
135 | 135 | $container->registerService( |
136 | - 'NavigationController', function ($c) { |
|
136 | + 'NavigationController', function($c) { |
|
137 | 137 | return new NavigationController( |
138 | 138 | $c->query('AppName'), $c->query('Request'), $c->query('UserId'), $c->query('L10N'), |
139 | 139 | $c->query('ConfigService'), |
@@ -143,7 +143,7 @@ discard block |
||
143 | 143 | ); |
144 | 144 | |
145 | 145 | $container->registerService( |
146 | - 'CirclesController', function ($c) { |
|
146 | + 'CirclesController', function($c) { |
|
147 | 147 | return new CirclesController( |
148 | 148 | $c->query('AppName'), $c->query('Request'), $c->query('UserId'), $c->query('L10N'), |
149 | 149 | $c->query('ConfigService'), |
@@ -154,7 +154,7 @@ discard block |
||
154 | 154 | ); |
155 | 155 | |
156 | 156 | $container->registerService( |
157 | - 'MembersController', function ($c) { |
|
157 | + 'MembersController', function($c) { |
|
158 | 158 | return new MembersController( |
159 | 159 | $c->query('AppName'), $c->query('Request'), $c->query('UserId'), $c->query('L10N'), |
160 | 160 | $c->query('ConfigService'), |
@@ -168,7 +168,7 @@ discard block |
||
168 | 168 | * Mapper |
169 | 169 | */ |
170 | 170 | $container->registerService( |
171 | - 'CirclesMapper', function ($c) { |
|
171 | + 'CirclesMapper', function($c) { |
|
172 | 172 | return new CirclesMapper( |
173 | 173 | $c->query('ServerContainer') |
174 | 174 | ->getDatabaseConnection(), $c->query('MiscService') |
@@ -177,7 +177,7 @@ discard block |
||
177 | 177 | ); |
178 | 178 | |
179 | 179 | $container->registerService( |
180 | - 'MembersMapper', function ($c) { |
|
180 | + 'MembersMapper', function($c) { |
|
181 | 181 | return new MembersMapper( |
182 | 182 | $c->query('ServerContainer') |
183 | 183 | ->getDatabaseConnection(), $c->query('MiscService') |
@@ -188,7 +188,7 @@ discard block |
||
188 | 188 | |
189 | 189 | // Translates |
190 | 190 | $container->registerService( |
191 | - 'L10N', function ($c) { |
|
191 | + 'L10N', function($c) { |
|
192 | 192 | return $c->query('ServerContainer') |
193 | 193 | ->getL10N($c->query('AppName')); |
194 | 194 | } |
@@ -198,20 +198,20 @@ discard block |
||
198 | 198 | * Core |
199 | 199 | */ |
200 | 200 | $container->registerService( |
201 | - 'Logger', function ($c) { |
|
201 | + 'Logger', function($c) { |
|
202 | 202 | return $c->query('ServerContainer') |
203 | 203 | ->getLogger(); |
204 | 204 | } |
205 | 205 | ); |
206 | 206 | $container->registerService( |
207 | - 'CoreConfig', function ($c) { |
|
207 | + 'CoreConfig', function($c) { |
|
208 | 208 | return $c->query('ServerContainer') |
209 | 209 | ->getConfig(); |
210 | 210 | } |
211 | 211 | ); |
212 | 212 | |
213 | 213 | $container->registerService( |
214 | - 'UserId', function ($c) { |
|
214 | + 'UserId', function($c) { |
|
215 | 215 | $user = $c->query('ServerContainer') |
216 | 216 | ->getUserSession() |
217 | 217 | ->getUser(); |
@@ -221,7 +221,7 @@ discard block |
||
221 | 221 | ); |
222 | 222 | |
223 | 223 | $container->registerService( |
224 | - 'UserManager', function ($c) { |
|
224 | + 'UserManager', function($c) { |
|
225 | 225 | return $c->query('ServerContainer') |
226 | 226 | ->getUserManager(); |
227 | 227 | } |
@@ -247,7 +247,7 @@ discard block |
||
247 | 247 | ->getServer() |
248 | 248 | ->getNavigationManager() |
249 | 249 | ->add( |
250 | - function () { |
|
250 | + function() { |
|
251 | 251 | return [ |
252 | 252 | 'id' => $this->appName, |
253 | 253 | 'order' => 5, |
@@ -67,7 +67,7 @@ |
||
67 | 67 | * Create circle using this->userId as owner |
68 | 68 | * |
69 | 69 | * @param $type |
70 | - * @param $name |
|
70 | + * @param string $name |
|
71 | 71 | * |
72 | 72 | * @return Circle |
73 | 73 | * @throws CircleTypeDisabledException |
@@ -239,7 +239,7 @@ |
||
239 | 239 | * @throws CircleAlreadyExistsException |
240 | 240 | * @throws CircleCreationException |
241 | 241 | */ |
242 | - public function create(Circle &$circle, Member &$owner) { |
|
242 | + public function create(Circle & $circle, Member & $owner) { |
|
243 | 243 | |
244 | 244 | if ($circle->getType() === Circle::CIRCLES_PERSONAL) { |
245 | 245 |
@@ -74,6 +74,9 @@ discard block |
||
74 | 74 | return $this; |
75 | 75 | } |
76 | 76 | |
77 | + /** |
|
78 | + * @return string |
|
79 | + */ |
|
77 | 80 | public function getName() { |
78 | 81 | return $this->name; |
79 | 82 | } |
@@ -83,6 +86,9 @@ discard block |
||
83 | 86 | return $this->owner; |
84 | 87 | } |
85 | 88 | |
89 | + /** |
|
90 | + * @param Member|null $owner |
|
91 | + */ |
|
86 | 92 | public function setOwner($owner) { |
87 | 93 | $this->owner = $owner; |
88 | 94 | } |
@@ -92,6 +98,9 @@ discard block |
||
92 | 98 | return $this->user; |
93 | 99 | } |
94 | 100 | |
101 | + /** |
|
102 | + * @param Member|null $user |
|
103 | + */ |
|
95 | 104 | public function setUser($user) { |
96 | 105 | $this->user = $user; |
97 | 106 | } |
@@ -121,6 +130,9 @@ discard block |
||
121 | 130 | return $this->type; |
122 | 131 | } |
123 | 132 | |
133 | + /** |
|
134 | + * @param string $str |
|
135 | + */ |
|
124 | 136 | public function setTypeString($str) { |
125 | 137 | $this->typeString = $str; |
126 | 138 | |
@@ -131,6 +143,9 @@ discard block |
||
131 | 143 | return $this->typeString; |
132 | 144 | } |
133 | 145 | |
146 | + /** |
|
147 | + * @param string $str |
|
148 | + */ |
|
134 | 149 | public function setTypeLongString($str) { |
135 | 150 | $this->typeLongString = $str; |
136 | 151 | } |
@@ -223,7 +238,7 @@ discard block |
||
223 | 238 | * |
224 | 239 | * @param $array |
225 | 240 | * |
226 | - * @return mixed |
|
241 | + * @return Member|null |
|
227 | 242 | */ |
228 | 243 | private static function getOwnerMemberFromArray($array) { |
229 | 244 | if (key_exists('owner', $array)) { |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | |
85 | 85 | /** |
86 | 86 | * @param $circleId |
87 | - * @param $name |
|
87 | + * @param string $name |
|
88 | 88 | * |
89 | 89 | * @return array |
90 | 90 | * @throws CircleDoesNotExistException |
@@ -165,7 +165,7 @@ discard block |
||
165 | 165 | /** |
166 | 166 | * Invite a Member to a private Circle, or accept his request. |
167 | 167 | * |
168 | - * @param $member |
|
168 | + * @param null|Member $member |
|
169 | 169 | */ |
170 | 170 | public static function InviteMemberToPrivateCircle(&$member) { |
171 | 171 | if ($member->getStatus() === Member::STATUS_REQUEST) { |