From cd10f93e0d271840caff92b88195385a2a3f15b2 Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Thu, 26 Jun 2014 11:33:44 +0200 Subject: style fixes --- controller/entityapiserializer.php | 2 -- controller/exportcontroller.php | 1 - controller/itemcontroller.php | 1 + controller/jsonhttperror.php | 2 +- controller/pagecontroller.php | 4 ++-- controller/utilityapicontroller.php | 2 -- 6 files changed, 4 insertions(+), 8 deletions(-) (limited to 'controller') diff --git a/controller/entityapiserializer.php b/controller/entityapiserializer.php index 5153d9aa3..955b8db98 100644 --- a/controller/entityapiserializer.php +++ b/controller/entityapiserializer.php @@ -11,8 +11,6 @@ namespace OCA\News\Controller; -use \OCP\AppFramework\Http\Response; - use \OCA\News\Db\IAPI; diff --git a/controller/exportcontroller.php b/controller/exportcontroller.php index f5f97ee71..b455f2fcc 100644 --- a/controller/exportcontroller.php +++ b/controller/exportcontroller.php @@ -17,7 +17,6 @@ use \OCP\IRequest; use \OCP\AppFramework\Controller; use \OCP\AppFramework\Http; use \OCP\AppFramework\Http\JSONResponse; -use \OCP\AppFramework\Http\Response; use \OCA\News\Http\TextDownloadResponse; use \OCA\News\Service\FolderService; diff --git a/controller/itemcontroller.php b/controller/itemcontroller.php index bbfcaeb56..d62e704f7 100644 --- a/controller/itemcontroller.php +++ b/controller/itemcontroller.php @@ -19,6 +19,7 @@ use \OCP\AppFramework\Controller; use \OCP\AppFramework\Http; use \OCA\News\Service\ServiceException; +use \OCA\News\Service\ServiceNotFoundException; use \OCA\News\Service\ItemService; use \OCA\News\Service\FeedService; diff --git a/controller/jsonhttperror.php b/controller/jsonhttperror.php index 9ac8704c5..a271878a8 100644 --- a/controller/jsonhttperror.php +++ b/controller/jsonhttperror.php @@ -20,7 +20,7 @@ trait JSONHttpError { /** * @param \Exception $exception the message that is returned taken from the * exception - * @param int the http error code + * @param int $code the http error code * @return \OCP\AppFramework\Http\JSONResponse */ public function error(\Exception $exception, $code) { diff --git a/controller/pagecontroller.php b/controller/pagecontroller.php index bdbbf13f0..3fa9f88b8 100644 --- a/controller/pagecontroller.php +++ b/controller/pagecontroller.php @@ -13,10 +13,10 @@ namespace OCA\News\Controller; +use OCP\AppFramework\Http\TemplateResponse; use \OCP\IRequest; use \OCP\IConfig; use \OCP\IL10N; -use \OCP\AppFramework\Http\JSONResponse; use \OCP\AppFramework\Controller; @@ -43,7 +43,7 @@ class PageController extends Controller { * @NoCSRFRequired */ public function index() { - return $this->render('main'); + return new TemplateResponse($this->appName, 'main'); } diff --git a/controller/utilityapicontroller.php b/controller/utilityapicontroller.php index 320f94747..ac23faa9e 100644 --- a/controller/utilityapicontroller.php +++ b/controller/utilityapicontroller.php @@ -17,8 +17,6 @@ use \OCP\IRequest; use \OCP\IConfig; use \OCP\AppFramework\ApiController; use \OCP\AppFramework\Http; -use \OCP\AppFramework\Http\JSONResponse; -use \OCP\AppFramework\Http\Response; use \OCA\News\Utility\Updater; -- cgit v1.2.3