Completed
Branch master (65ba54)
by Olivier
02:25
created
lib/Controller/CirclesController.php 2 patches
Doc Comments   -3 removed lines patch added patch discarded remove patch
@@ -159,7 +159,6 @@  discard block
 block discarded – undo
159 159
 	 * @NoAdminRequired
160 160
 	 * @NoSubAdminRequired
161 161
 	 *
162
-	 * @param string $name
163 162
 	 *
164 163
 	 * @return DataResponse
165 164
 	 */
@@ -194,7 +193,6 @@  discard block
 block discarded – undo
194 193
 	 * @NoAdminRequired
195 194
 	 * @NoSubAdminRequired
196 195
 	 *
197
-	 * @param string $name
198 196
 	 *
199 197
 	 * @return DataResponse
200 198
 	 */
@@ -233,7 +231,6 @@  discard block
 block discarded – undo
233 231
 	 * @NoAdminRequired
234 232
 	 * @NoSubAdminRequired
235 233
 	 *
236
-	 * @param string $name
237 234
 	 *
238 235
 	 * @return DataResponse
239 236
 	 */
Please login to merge, or discard this patch.
Unused Use Statements   -2 removed lines patch added patch discarded remove patch
@@ -39,9 +39,7 @@
 block discarded – undo
39 39
 use OC\AppFramework\Http;
40 40
 use OCP\AppFramework\Controller;
41 41
 use OCP\AppFramework\Http\DataResponse;
42
-use OCP\AppFramework\Http\TemplateResponse;
43 42
 use OCP\IL10N;
44
-use OCP\ILogger;
45 43
 use OCP\IRequest;
46 44
 
47 45
 class CirclesController extends Controller {
Please login to merge, or discard this patch.
lib/Controller/MembersController.php 2 patches
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -143,7 +143,6 @@
 block discarded – undo
143 143
 	 * @NoAdminRequired
144 144
 	 * @NoSubAdminRequired
145 145
 	 *
146
-	 * @param string $name
147 146
 	 *
148 147
 	 * @return DataResponse
149 148
 	 */
Please login to merge, or discard this patch.
Unused Use Statements   -2 removed lines patch added patch discarded remove patch
@@ -39,9 +39,7 @@
 block discarded – undo
39 39
 use OC\AppFramework\Http;
40 40
 use OCP\AppFramework\Controller;
41 41
 use OCP\AppFramework\Http\DataResponse;
42
-use OCP\AppFramework\Http\TemplateResponse;
43 42
 use OCP\IL10N;
44
-use OCP\ILogger;
45 43
 use OCP\IRequest;
46 44
 
47 45
 class MembersController extends Controller {
Please login to merge, or discard this patch.
lib/Model/Circle.php 2 patches
Doc Comments   +15 added lines patch added patch discarded remove patch
@@ -69,6 +69,9 @@  discard block
 block discarded – undo
69 69
 		return $this;
70 70
 	}
71 71
 
72
+	/**
73
+	 * @return string
74
+	 */
72 75
 	public function getName() {
73 76
 		return $this->name;
74 77
 	}
@@ -78,6 +81,9 @@  discard block
 block discarded – undo
78 81
 		return $this->owner;
79 82
 	}
80 83
 
84
+	/**
85
+	 * @param Member $owner
86
+	 */
81 87
 	public function setOwner($owner) {
82 88
 		$this->owner = $owner;
83 89
 	}
@@ -87,6 +93,9 @@  discard block
 block discarded – undo
87 93
 		return $this->user;
88 94
 	}
89 95
 
96
+	/**
97
+	 * @param Member $user
98
+	 */
90 99
 	public function setUser($user) {
91 100
 		$this->user = $user;
92 101
 	}
@@ -116,6 +125,9 @@  discard block
 block discarded – undo
116 125
 		return $this->type;
117 126
 	}
118 127
 
128
+	/**
129
+	 * @param string|null $str
130
+	 */
119 131
 	public function setTypeString($str) {
120 132
 		$this->typeString = $str;
121 133
 
@@ -126,6 +138,9 @@  discard block
 block discarded – undo
126 138
 		return $this->typeString;
127 139
 	}
128 140
 
141
+	/**
142
+	 * @param string|null $str
143
+	 */
129 144
 	public function setTypeLongString($str) {
130 145
 		$this->typeLongString = $str;
131 146
 	}
Please login to merge, or discard this patch.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -202,8 +202,9 @@
 block discarded – undo
202 202
 		$circle->setDescription($arr['description']);
203 203
 		$circle->setType($arr['type']);
204 204
 		$circle->setCreation($arr['creation']);
205
-		if (key_exists('count', $arr))
206
-			$circle->setCount($arr['count']);
205
+		if (key_exists('count', $arr)) {
206
+					$circle->setCount($arr['count']);
207
+		}
207 208
 
208 209
 		$owner = new Member();
209 210
 		$owner->setUserId($arr['owner']);
Please login to merge, or discard this patch.
lib/Model/iError.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -55,6 +55,9 @@
 block discarded – undo
55 55
 	function __construct() {
56 56
 	}
57 57
 
58
+	/**
59
+	 * @param string $message
60
+	 */
58 61
 	public function setMessage($message) {
59 62
 		$this->message = $message;
60 63
 
Please login to merge, or discard this patch.
lib/Service/CirclesService.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -55,6 +55,9 @@
 block discarded – undo
55 55
 	}
56 56
 
57 57
 
58
+	/**
59
+	 * @param string $name
60
+	 */
58 61
 	public function createCircle($type, $name, &$iError = '') {
59 62
 
60 63
 		$iError = new iError();
Please login to merge, or discard this patch.
lib/Service/MembersService.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -77,6 +77,9 @@
 block discarded – undo
77 77
 //		return $result;
78 78
 //	}
79 79
 
80
+	/**
81
+	 * @param string $name
82
+	 */
80 83
 	public function addMember($circleid, $name, &$iError = '') {
81 84
 
82 85
 		if ($iError === '' || $iError === null) {
Please login to merge, or discard this patch.
lib/ShareByCircleProvider.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -879,7 +879,7 @@
 block discarded – undo
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
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -686,7 +686,7 @@
 block discarded – undo
686 686
 		   )
687 687
 		   ->leftJoin(
688 688
 			   's', 'share', 's2', $qb->expr()
689
-									  ->eq('s.id', 's2.parent') . ' AND ' . $qb->expr()
689
+									  ->eq('s.id', 's2.parent').' AND '.$qb->expr()
690 690
 																			   ->eq(
691 691
 																				   's2.share_with',
692 692
 																				   $qb->createNamedParameter(
Please login to merge, or discard this patch.
lib/AppInfo/Application.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -64,14 +64,14 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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,
Please login to merge, or discard this patch.
lib/Db/CirclesMapper.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -225,7 +225,7 @@
 block discarded – undo
225 225
 	}
226 226
 
227 227
 
228
-	public function create(Circle &$circle, Member &$owner, &$iError = '') {
228
+	public function create(Circle & $circle, Member & $owner, &$iError = '') {
229 229
 
230 230
 		if ($iError === '') {
231 231
 			$iError = new iError();
Please login to merge, or discard this patch.