@@ -97,7 +97,7 @@ |
||
97 | 97 | } |
98 | 98 | |
99 | 99 | /** |
100 | - * @param string|int $category |
|
100 | + * @param string $category |
|
101 | 101 | * @return int |
102 | 102 | */ |
103 | 103 | protected function getCategory($category) { |
@@ -65,7 +65,7 @@ |
||
65 | 65 | * |
66 | 66 | * @NoAdminRequired |
67 | 67 | * @NoSubadminRequired |
68 | - * @return array |
|
68 | + * @return DataResponse |
|
69 | 69 | */ |
70 | 70 | public function addPersonalRootCertificate() { |
71 | 71 | $headers = []; |
@@ -27,7 +27,6 @@ |
||
27 | 27 | namespace OC\Settings\Controller; |
28 | 28 | |
29 | 29 | use OC\AppFramework\Http; |
30 | -use OC\Settings\Factory\SubAdminFactory; |
|
31 | 30 | use OC\User\User; |
32 | 31 | use OCP\App\IAppManager; |
33 | 32 | use OCP\AppFramework\Controller; |
@@ -23,14 +23,11 @@ |
||
23 | 23 | use OC; |
24 | 24 | use OC\Core\Application; |
25 | 25 | use OCP\AppFramework\IAppContainer; |
26 | -use OC\Files\Filesystem; |
|
27 | 26 | use OCP\AppFramework\Http; |
28 | -use OCP\Image; |
|
29 | 27 | use OCP\Files\Folder; |
30 | 28 | use OCP\Files\File; |
31 | 29 | use OCP\IUser; |
32 | 30 | use OCP\IAvatar; |
33 | - |
|
34 | 31 | use Test\Traits\UserTrait; |
35 | 32 | |
36 | 33 | /** |
@@ -228,6 +228,10 @@ discard block |
||
228 | 228 | $this->assertEquals($expected, $this->activityManager->getCurrentUserId()); |
229 | 229 | } |
230 | 230 | |
231 | + /** |
|
232 | + * @param string $requestToken |
|
233 | + * @param string $userToken |
|
234 | + */ |
|
231 | 235 | protected function mockRSSToken($requestToken, $userToken, $users) { |
232 | 236 | if ($requestToken !== null) { |
233 | 237 | $this->request->expects($this->any()) |
@@ -242,6 +246,9 @@ discard block |
||
242 | 246 | ->willReturn($users); |
243 | 247 | } |
244 | 248 | |
249 | + /** |
|
250 | + * @param string $user |
|
251 | + */ |
|
245 | 252 | protected function mockUserSession($user) { |
246 | 253 | $mockUser = $this->getMockBuilder('\OCP\IUser') |
247 | 254 | ->disableOriginalConstructor() |
@@ -32,6 +32,9 @@ |
||
32 | 32 | |
33 | 33 | class ChildController extends Controller { |
34 | 34 | |
35 | + /** |
|
36 | + * @param Request $request |
|
37 | + */ |
|
35 | 38 | public function __construct($appName, $request) { |
36 | 39 | parent::__construct($appName, $request); |
37 | 40 | $this->registerResponder('tom', function ($respone) { |
@@ -42,6 +42,9 @@ |
||
42 | 42 | protected $testId; |
43 | 43 | protected $preName; |
44 | 44 | |
45 | + /** |
|
46 | + * @param string $name |
|
47 | + */ |
|
45 | 48 | public function __construct($name=null){ |
46 | 49 | $this->addType('testId', 'integer'); |
47 | 50 | $this->name = $name; |
@@ -10,7 +10,6 @@ |
||
10 | 10 | |
11 | 11 | namespace OC\AppFramework\Http; |
12 | 12 | |
13 | -use OC\Security\Crypto; |
|
14 | 13 | use OCP\Security\ISecureRandom; |
15 | 14 | use OCP\IConfig; |
16 | 15 |
@@ -14,8 +14,6 @@ |
||
14 | 14 | |
15 | 15 | use OC\AppFramework\Http\Request; |
16 | 16 | use OC\AppFramework\Utility\ControllerMethodReflector; |
17 | - |
|
18 | -use OCP\AppFramework\Http; |
|
19 | 17 | use OCP\AppFramework\Http\JSONResponse; |
20 | 18 | use OCP\AppFramework\Http\Response; |
21 | 19 |