Merge pull request #110 from pranavk/constsig

Fix incorrect constructor signature

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;

lib/appconfig.php

@@ -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);
 	}
  }
-

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()
 		;