mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

inject logger

This commit is contained in:
Robin Appelman 2016-01-28 13:07:19 +01:00
parent d0f5687687
commit 6b18134ceb
6 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/files_external/controller/globalstoragescontroller.php
View File

@ -24,6 +24,7 @@ namespace OCA\Files_External\Controller;
use \OCP\IConfig; use \OCP\IConfig;
use OCP\ILogger;
use \OCP\IUserSession; use \OCP\IUserSession;
use \OCP\IRequest; use \OCP\IRequest;
use \OCP\IL10N; use \OCP\IL10N;
@ -46,18 +47,21 @@ class GlobalStoragesController extends StoragesController {
* @param IRequest $request request object * @param IRequest $request request object
* @param IL10N $l10n l10n service * @param IL10N $l10n l10n service
* @param GlobalStoragesService $globalStoragesService storage service * @param GlobalStoragesService $globalStoragesService storage service
* @param ILogger $logger
*/ */
public function __construct( public function __construct(
$AppName, $AppName,
IRequest $request, IRequest $request,
IL10N $l10n, IL10N $l10n,
GlobalStoragesService $globalStoragesService GlobalStoragesService $globalStoragesService,
ILogger $logger
) { ) {
parent::__construct( parent::__construct(
$AppName, $AppName,
$request, $request,
$l10n, $l10n,
$globalStoragesService $globalStoragesService,
$logger
); );
} }

15
apps/files_external/controller/storagescontroller.php
View File

@ -25,6 +25,7 @@ namespace OCA\Files_External\Controller;
use \OCP\IConfig; use \OCP\IConfig;
use OCP\ILogger;
use OCP\IUser; use OCP\IUser;
use \OCP\IUserSession; use \OCP\IUserSession;
use \OCP\IRequest; use \OCP\IRequest;
@ -60,6 +61,11 @@ abstract class StoragesController extends Controller {
*/ */
protected $service; protected $service;
/**
* @var ILogger
*/
protected $logger;
/** /**
* Creates a new storages controller. * Creates a new storages controller.
* *
@ -67,16 +73,19 @@ abstract class StoragesController extends Controller {
* @param IRequest $request request object * @param IRequest $request request object
* @param IL10N $l10n l10n service * @param IL10N $l10n l10n service
* @param StoragesService $storagesService storage service * @param StoragesService $storagesService storage service
* @param ILogger $logger
*/ */
public function __construct( public function __construct(
$AppName, $AppName,
IRequest $request, IRequest $request,
IL10N $l10n, IL10N $l10n,
StoragesService $storagesService StoragesService $storagesService,
ILogger $logger
) { ) {
parent::__construct($AppName, $request); parent::__construct($AppName, $request);
$this->l10n = $l10n; $this->l10n = $l10n;
$this->service = $storagesService; $this->service = $storagesService;
$this->logger = $logger;
} }
/** /**
@ -115,7 +124,7 @@ abstract class StoragesController extends Controller {
$priority $priority
); );
} catch (\InvalidArgumentException $e) { } catch (\InvalidArgumentException $e) {
\OC::$server->getLogger()->logException($e); $this->logger->logException($e);
return new DataResponse( return new DataResponse(
[ [
'message' => (string)$this->l10n->t('Invalid backend or authentication mechanism class') 'message' => (string)$this->l10n->t('Invalid backend or authentication mechanism class')
@ -129,7 +138,7 @@ abstract class StoragesController extends Controller {
* Validate storage config * Validate storage config
* *
* @param StorageConfig $storage storage config * @param StorageConfig $storage storage config
* *1
* @return DataResponse|null returns response in case of validation error * @return DataResponse|null returns response in case of validation error
*/ */
protected function validate(StorageConfig $storage) { protected function validate(StorageConfig $storage) {

7
apps/files_external/controller/userglobalstoragescontroller.php
View File

@ -24,6 +24,7 @@ namespace OCA\Files_External\Controller;
use OCA\Files_External\Lib\Auth\AuthMechanism; use OCA\Files_External\Lib\Auth\AuthMechanism;
use OCA\Files_External\Lib\Auth\IUserProvided; use OCA\Files_External\Lib\Auth\IUserProvided;
use OCA\Files_External\Lib\InsufficientDataForMeaningfulAnswerException; use OCA\Files_External\Lib\InsufficientDataForMeaningfulAnswerException;
use OCP\ILogger;
use \OCP\IRequest; use \OCP\IRequest;
use \OCP\IL10N; use \OCP\IL10N;
use \OCP\AppFramework\Http\DataResponse; use \OCP\AppFramework\Http\DataResponse;
@ -57,13 +58,15 @@ class UserGlobalStoragesController extends StoragesController {
IRequest $request, IRequest $request,
IL10N $l10n, IL10N $l10n,
UserGlobalStoragesService $userGlobalStoragesService, UserGlobalStoragesService $userGlobalStoragesService,
IUserSession $userSession IUserSession $userSession,
ILogger $logger
) { ) {
parent::__construct( parent::__construct(
$AppName, $AppName,
$request, $request,
$l10n, $l10n,
$userGlobalStoragesService $userGlobalStoragesService,
$logger
); );
$this->userSession = $userSession; $this->userSession = $userSession;
} }

8
apps/files_external/controller/userstoragescontroller.php
View File

@ -25,6 +25,7 @@ namespace OCA\Files_External\Controller;
use OCA\Files_External\Lib\Auth\AuthMechanism; use OCA\Files_External\Lib\Auth\AuthMechanism;
use \OCP\IConfig; use \OCP\IConfig;
use OCP\ILogger;
use OCP\IUser; use OCP\IUser;
use \OCP\IUserSession; use \OCP\IUserSession;
use \OCP\IRequest; use \OCP\IRequest;
@ -55,19 +56,22 @@ class UserStoragesController extends StoragesController {
* @param IL10N $l10n l10n service * @param IL10N $l10n l10n service
* @param UserStoragesService $userStoragesService storage service * @param UserStoragesService $userStoragesService storage service
* @param IUserSession $userSession * @param IUserSession $userSession
* @param ILogger $logger
*/ */
public function __construct( public function __construct(
$AppName, $AppName,
IRequest $request, IRequest $request,
IL10N $l10n, IL10N $l10n,
UserStoragesService $userStoragesService, UserStoragesService $userStoragesService,
IUserSession $userSession IUserSession $userSession,
ILogger $logger
) { ) {
parent::__construct( parent::__construct(
$AppName, $AppName,
$request, $request,
$l10n, $l10n,
$userStoragesService $userStoragesService,
$logger
); );
$this->userSession = $userSession; $this->userSession = $userSession;
} }

3
apps/files_external/tests/controller/globalstoragescontrollertest.php
View File

@ -41,7 +41,8 @@ class GlobalStoragesControllerTest extends StoragesControllerTest {
'files_external', 'files_external',
$this->getMock('\OCP\IRequest'), $this->getMock('\OCP\IRequest'),
$this->getMock('\OCP\IL10N'), $this->getMock('\OCP\IL10N'),
$this->service $this->service,
$this->getMock('\OCP\ILogger')
); );
} }
} }

3
apps/files_external/tests/controller/userstoragescontrollertest.php
View File

@ -49,7 +49,8 @@ class UserStoragesControllerTest extends StoragesControllerTest {
$this->getMock('\OCP\IRequest'), $this->getMock('\OCP\IRequest'),
$this->getMock('\OCP\IL10N'), $this->getMock('\OCP\IL10N'),
$this->service, $this->service,
$this->getMock('\OCP\IUserSession') $this->getMock('\OCP\IUserSession'),
$this->getMock('\OCP\ILogger')
); );
} }