From 160a0dfebaeb21cc75d7166dfbac6d0ef1a51460 Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Wed, 14 May 2014 17:32:49 +0200 Subject: convert array() to [] --- controller/entityapiserializer.php | 14 +++++------- controller/exportcontroller.php | 6 ++--- controller/feedapicontroller.php | 16 ++++++-------- controller/feedcontroller.php | 44 ++++++++++++++++++------------------- controller/foldercontroller.php | 16 ++++---------- controller/itemcontroller.php | 8 +++---- controller/jsonhttperror.php | 7 ++---- controller/pagecontroller.php | 4 ++-- controller/utilityapicontroller.php | 2 +- 9 files changed, 49 insertions(+), 68 deletions(-) (limited to 'controller') diff --git a/controller/entityapiserializer.php b/controller/entityapiserializer.php index b84006750..c09e27dbd 100644 --- a/controller/entityapiserializer.php +++ b/controller/entityapiserializer.php @@ -40,17 +40,13 @@ class EntityApiSerializer implements IResponseSerializer { } if($data instanceof IAPI) { - return array( - $this->level => array($data->toAPI()) - ); + return [$this->level => [$data->toAPI()]]; } if(is_array($data) && array_key_exists($this->level, $data)) { $data[$this->level] = $this->convert($data[$this->level]); } elseif(is_array($data)) { - $data = array( - $this->level => $this->convert($data) - ); + $data = [$this->level => $this->convert($data)]; } return $data; @@ -58,13 +54,15 @@ class EntityApiSerializer implements IResponseSerializer { private function convert($entities) { - $converted = array(); + $converted = []; foreach($entities as $entity) { if($entity instanceof IAPI) { $converted[] = $entity->toAPI(); + + // break if it contains anything else than entities } else { - $converted[] = $entity; + return $entities; } } diff --git a/controller/exportcontroller.php b/controller/exportcontroller.php index 61cf37c9c..4652fa9a4 100644 --- a/controller/exportcontroller.php +++ b/controller/exportcontroller.php @@ -70,14 +70,14 @@ class ExportController extends Controller { $items = $this->itemBusinessLayer->getUnreadOrStarred($this->userId); // build assoc array for fast access - $feedsDict = array(); + $feedsDict = []; foreach($feeds as $feed) { $feedsDict['feed' . $feed->getId()] = $feed; } - $articles = array(); + $articles = []; foreach($items as $item) { - array_push($articles, $item->toExport($feedsDict)); + $articles[] = $item->toExport($feedsDict); } $response = new JSONResponse($articles); diff --git a/controller/feedapicontroller.php b/controller/feedapicontroller.php index a6f52f9ea..750d504af 100644 --- a/controller/feedapicontroller.php +++ b/controller/feedapicontroller.php @@ -62,11 +62,11 @@ class FeedApiController extends ApiController { */ public function index() { - $result = array( - 'feeds' => array(), + $result = [ + 'feeds' => [], 'starredCount' => $this->itemBusinessLayer->starredCount($this->userId), 'feeds' => $this->feedBusinessLayer->findAll($this->userId) - ); + ]; try { @@ -92,9 +92,7 @@ class FeedApiController extends ApiController { $this->feedBusinessLayer->purgeDeleted($this->userId, false); $feed = $this->feedBusinessLayer->create($url, $folderId, $this->userId); - $result = array( - 'feeds' => array($feed) - ); + $result = ['feeds' => [$feed]]; try { $result['newestItemId'] = $this->itemBusinessLayer->getNewestItemId($this->userId); @@ -181,13 +179,13 @@ class FeedApiController extends ApiController { */ public function fromAllUsers() { $feeds = $this->feedBusinessLayer->findAllFromAllUsers(); - $result = array('feeds' => array()); + $result = ['feeds' => []]; foreach ($feeds as $feed) { - $result['feeds'][] = array( + $result['feeds'][] = [ 'id' => $feed->getId(), 'userId' => $feed->getUserId() - ); + ]; } return $result; diff --git a/controller/feedcontroller.php b/controller/feedcontroller.php index eb172debb..9b5274fb5 100644 --- a/controller/feedcontroller.php +++ b/controller/feedcontroller.php @@ -60,10 +60,10 @@ class FeedController extends Controller { // this method is also used to update the interface // because of this we also pass the starred count and the newest // item id which will be used for marking feeds read - $params = array( + $params = [ 'feeds' => $this->feedBusinessLayer->findAll($this->userId), 'starred' => $this->itemBusinessLayer->starredCount($this->userId) - ); + ]; try { $params['newestItemId'] = @@ -109,12 +109,12 @@ class FeedController extends Controller { $feedType = FeedType::SUBSCRIPTIONS; } - return array( - 'activeFeed' => array( + return [ + 'activeFeed' => [ 'id' => $feedId, 'type' => $feedType - ) - ); + ] + ]; } @@ -131,9 +131,7 @@ class FeedController extends Controller { $this->feedBusinessLayer->purgeDeleted($this->userId, false); $feed = $this->feedBusinessLayer->create($url, $parentFolderId, $this->userId); - $params = array( - 'feeds' => array($feed) - ); + $params = ['feeds' => [$feed]]; try { $params['newestItemId'] = @@ -176,16 +174,16 @@ class FeedController extends Controller { try { $feed = $this->feedBusinessLayer->update($feedId, $this->userId); - return array( - 'feeds' => array( + return [ + 'feeds' => [ // only pass unreadcount to not accidentally readd // the feed again - array( + [ 'id' => $feed->getId(), 'unreadCount' => $feed->getUnreadCount() - ) - ) - ); + ] + ] + ]; } catch(BusinessLayerException $ex) { return $this->error($ex, Http::STATUS_NOT_FOUND); @@ -230,10 +228,10 @@ class FeedController extends Controller { public function import($json) { $feed = $this->feedBusinessLayer->importArticles($json, $this->userId); - $params = array(); + $params = []; if($feed) { - $params['feeds'] = array($feed); + $params['feeds'] = [$feed]; } return $params; @@ -249,14 +247,14 @@ class FeedController extends Controller { public function read($feedId, $highestItemId){ $this->itemBusinessLayer->readFeed($feedId, $highestItemId, $this->userId); - return array( - 'feeds' => array( - array( + return [ + 'feeds' => [ + [ 'id' => $feedId, 'unreadCount' => 0 - ) - ) - ); + ] + ] + ]; } diff --git a/controller/foldercontroller.php b/controller/foldercontroller.php index 9b0db2be7..4cfc819b1 100644 --- a/controller/foldercontroller.php +++ b/controller/foldercontroller.php @@ -53,9 +53,7 @@ class FolderController extends Controller { */ public function index(){ $folders = $this->folderBusinessLayer->findAll($this->userId); - return array( - 'folders' => $folders - ); + return ['folders' => $folders]; } @@ -104,9 +102,7 @@ class FolderController extends Controller { $this->folderBusinessLayer->purgeDeleted($this->userId, false); $folder = $this->folderBusinessLayer->create($folderName, $this->userId); - return array( - 'folders' => array($folder) - ); + return ['folders' => [$folder]]; } catch(BusinessLayerConflictException $ex) { return $this->error($ex, Http::STATUS_CONFLICT); @@ -142,9 +138,7 @@ class FolderController extends Controller { $folder = $this->folderBusinessLayer->rename($folderId, $folderName, $this->userId); - return array( - 'folders' => array($folder) - ); + return ['folders' => [$folder]]; } catch(BusinessLayerConflictException $ex) { return $this->error($ex, Http::STATUS_CONFLICT); @@ -164,9 +158,7 @@ class FolderController extends Controller { public function read($folderId, $highestItemId){ $this->itemBusinessLayer->readFolder($folderId, $highestItemId, $this->userId); - return array( - 'feeds' => $this->feedBusinessLayer->findAll($this->userId) - ); + return ['feeds' => $this->feedBusinessLayer->findAll($this->userId)]; } diff --git a/controller/itemcontroller.php b/controller/itemcontroller.php index 67efb4b85..dfc059505 100644 --- a/controller/itemcontroller.php +++ b/controller/itemcontroller.php @@ -63,7 +63,7 @@ class ItemController extends Controller { $this->settings->setUserValue($this->userId, $this->appName, 'lastViewedFeedType', $type); - $params = array(); + $params = []; try { @@ -99,7 +99,7 @@ class ItemController extends Controller { $showAll = $this->settings->getUserValue($this->userId, $this->appName, 'showAll') === '1'; - $params = array(); + $params = []; try { $params['newestItemId'] = $this->itemBusinessLayer->getNewestItemId($this->userId); @@ -181,9 +181,7 @@ class ItemController extends Controller { */ public function readAll($highestItemId){ $this->itemBusinessLayer->readAll($highestItemId, $this->userId); - return array( - 'feeds' => $this->feedBusinessLayer->findAll($this->userId) - ); + return ['feeds' => $this->feedBusinessLayer->findAll($this->userId)]; } diff --git a/controller/jsonhttperror.php b/controller/jsonhttperror.php index b841ba5b5..962520b6a 100644 --- a/controller/jsonhttperror.php +++ b/controller/jsonhttperror.php @@ -23,11 +23,8 @@ trait JSONHttpError { * @param int the http error code * @return \OCP\AppFramework\Http\JSONResponse */ - public function error($exception, $code) { - return new JSONResponse( - array('message' => $exception->getMessage()), - $code - ); + public function error(\Exception $exception, $code) { + return new JSONResponse(['message' => $exception->getMessage()], $code); } diff --git a/controller/pagecontroller.php b/controller/pagecontroller.php index d60a24cea..88154803f 100644 --- a/controller/pagecontroller.php +++ b/controller/pagecontroller.php @@ -57,11 +57,11 @@ class PageController extends Controller { 'compact'); $language = $this->l10n->getLanguageCode(); - return array( + return [ 'showAll' => $showAll === '1', 'compact' => $compact === '1', 'language' => $language - ); + ]; } diff --git a/controller/utilityapicontroller.php b/controller/utilityapicontroller.php index ea94d33ea..320f94747 100644 --- a/controller/utilityapicontroller.php +++ b/controller/utilityapicontroller.php @@ -46,7 +46,7 @@ class UtilityApiController extends ApiController { public function version() { $version = $this->settings->getAppValue($this->appName, 'installed_version'); - return array('version' => $version); + return ['version' => $version]; } -- cgit v1.2.3