add l10n to constructor

This commit is contained in:
Bjoern Schiessle 2015-05-18 13:09:36 +02:00 committed by Joas Schilling
parent a1e60e7882
commit 7676166254
3 changed files with 18 additions and 4 deletions

View File

@ -104,7 +104,8 @@ class Application extends \OCP\AppFramework\App {
$container->query('Crypt'),
$container->query('KeyManager'),
$container->query('Util'),
$container->getServer()->getLogger()
$container->getServer()->getLogger(),
$container->getServer()->getL10N($container->getAppName())
);
});

View File

@ -29,6 +29,7 @@ use OCA\Encryption\Exceptions\PublicKeyMissingException;
use OCA\Encryption\Util;
use OCP\Encryption\IEncryptionModule;
use OCA\Encryption\KeyManager;
use OCP\IL10N;
use OCP\ILogger;
class Encryption implements IEncryptionModule {
@ -68,25 +69,30 @@ class Encryption implements IEncryptionModule {
/** @var Util */
private $util;
/** @var ILogger */
private $logger;
/** @var IL10N */
private $l;
/**
*
* @param Crypt $crypt
* @param KeyManager $keyManager
* @param Util $util
* @param ILogger $logger
* @param IL10N $il10n
*/
public function __construct(Crypt $crypt,
KeyManager $keyManager,
Util $util,
ILogger $logger) {
ILogger $logger,
IL10N $il10n) {
$this->crypt = $crypt;
$this->keyManager = $keyManager;
$this->util = $util;
$this->logger = $logger;
$this->l = $il10n;
}
/**

View File

@ -42,6 +42,9 @@ class EncryptionTest extends TestCase {
/** @var \PHPUnit_Framework_MockObject_MockObject */
private $loggerMock;
/** @var \PHPUnit_Framework_MockObject_MockObject */
private $l10nMock;
public function setUp() {
parent::setUp();
@ -57,12 +60,16 @@ class EncryptionTest extends TestCase {
$this->loggerMock = $this->getMockBuilder('OCP\ILogger')
->disableOriginalConstructor()
->getMock();
$this->l10nMock = $this->getMockBuilder('OCP\IL10N')
->disableOriginalConstructor()
->getMock();
$this->instance = new Encryption(
$this->cryptMock,
$this->keyManagerMock,
$this->utilMock,
$this->loggerMock
$this->loggerMock,
$this->l10nMock
);
}