@@ -524,7 +524,7 @@ |
||
| 524 | 524 | * @param array $input The array to work on |
| 525 | 525 | * @param int $case Either MB_CASE_UPPER or MB_CASE_LOWER (default) |
| 526 | 526 | * @param string $encoding The encoding parameter is the character encoding. Defaults to UTF-8 |
| 527 | - * @return array |
|
| 527 | + * @return string |
|
| 528 | 528 | * @since 4.5.0 |
| 529 | 529 | */ |
| 530 | 530 | public static function mb_array_change_key_case($input, $case = MB_CASE_LOWER, $encoding = 'UTF-8') { |
@@ -53,7 +53,7 @@ |
||
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | /** |
| 56 | - * @param \Doctrine\DBAL\Connection $connection |
|
| 56 | + * @param \OCP\IDBConnection $connection |
|
| 57 | 57 | * @return string[] |
| 58 | 58 | */ |
| 59 | 59 | private function getAllMyIsamTables($connection) { |
@@ -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 = []; |
@@ -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 | |
@@ -72,6 +72,10 @@ |
||
| 72 | 72 | } |
| 73 | 73 | |
| 74 | 74 | |
| 75 | + /** |
|
| 76 | + * @param boolean $isLoggedIn |
|
| 77 | + * @param boolean $isAdminUser |
|
| 78 | + */ |
|
| 75 | 79 | private function getMiddleware($isLoggedIn, $isAdminUser){ |
| 76 | 80 | return new SecurityMiddleware( |
| 77 | 81 | $this->request, |