DontSellMe/richdocuments
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #110 from pranavk/constsig

Browse Source 
Fix incorrect constructor signature
This commit is contained in:
Lukas Reschke 2016-09-17 16:41:33 +02:00 committed by GitHub
commit 52379137fc
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
controller/documentcontroller.php
View File

@ -19,6 +19,7 @@ use \OCP\AppFramework\Http\ContentSecurityPolicy;
use \OCP\AppFramework\Http\JSONResponse;
use \OCP\AppFramework\Http\TemplateResponse;
use \OCA\Richdocuments\AppConfig;
use \OCA\Richdocuments\Db;
use \OCA\Richdocuments\Helper;
use \OCA\Richdocuments\Storage;
@ -53,7 +54,7 @@ class DocumentController extends Controller {
private $logger;
const ODT_TEMPLATE_PATH = '/assets/odttemplate.odt';
public function __construct($appName, IRequest $request, IConfig $settings, IConfig $appConfig, IL10N $l10n, $uid, ICacheFactory $cache, ILogger $logger){
public function __construct($appName, IRequest $request, IConfig $settings, AppConfig $appConfig, IL10N $l10n, $uid, ICacheFactory $cache, ILogger $logger){
parent::__construct($appName, $request);
$this->uid = $uid;
$this->l10n = $l10n;

5
lib/appconfig.php
View File

@ -13,8 +13,8 @@ namespace OCA\Richdocuments;
use \OCP\IConfig;
class AppConfig{
private $appName = 'richdocuments';
class AppConfig{
private $appName = 'richdocuments';
private $defaults = [
'wopi_url' => 'https://localhost:9980'
];
@ -73,4 +73,3 @@ use \OCP\IConfig;
return $this->config->setAppValue($userId, $this->appName, $key, $value);
}
}

2
tests/controller/documentcontrollertest.php
View File

@ -31,7 +31,7 @@ class DocumentControllerTest extends \PHPUnit_Framework_TestCase {
->disableOriginalConstructor()
->getMock()
;
$this->appConfig = $this->getMockBuilder('\OCP\IConfig')
$this->appConfig = $this->getMockBuilder('\OCA\Richdocuments\AppConfig')
->disableOriginalConstructor()
->getMock()
;