From 70016ad4de865a9548620f3b13ca5c47df889530 Mon Sep 17 00:00:00 2001 From: Pranav Kant Date: Wed, 14 Sep 2016 11:47:24 +0530 Subject: [PATCH] Fix incorrect constructor signature Fallback from c166c7b18907bb5e25144723810bf567b1910a30 --- controller/documentcontroller.php | 3 ++- tests/controller/documentcontrollertest.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/controller/documentcontroller.php b/controller/documentcontroller.php index 7ccafe85..5245a7a4 100644 --- a/controller/documentcontroller.php +++ b/controller/documentcontroller.php @@ -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; diff --git a/tests/controller/documentcontrollertest.php b/tests/controller/documentcontrollertest.php index d12378d4..871c8754 100644 --- a/tests/controller/documentcontrollertest.php +++ b/tests/controller/documentcontrollertest.php @@ -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() ;