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 [] --- db/feed.php | 4 ++-- db/feedmapper.php | 16 ++++++++-------- db/folder.php | 4 ++-- db/foldermapper.php | 16 ++++++++-------- db/item.php | 8 ++++---- db/itemmapper.php | 44 ++++++++++++++++++++++---------------------- db/postgres/itemmapper.php | 4 ++-- 7 files changed, 48 insertions(+), 48 deletions(-) (limited to 'db') diff --git a/db/feed.php b/db/feed.php index 1e47a89cf..30bcbf865 100644 --- a/db/feed.php +++ b/db/feed.php @@ -70,7 +70,7 @@ class Feed extends Entity implements IAPI { public function toAPI() { - return array( + return [ 'id' => $this->getId(), 'url' => $this->getUrl(), 'title' => $this->getTitle(), @@ -79,7 +79,7 @@ class Feed extends Entity implements IAPI { 'folderId' => $this->getFolderId(), 'unreadCount' => $this->getUnreadCount(), 'link' => $this->getLink() - ); + ]; } diff --git a/db/feedmapper.php b/db/feedmapper.php index ed6fd893d..21fbd1d12 100644 --- a/db/feedmapper.php +++ b/db/feedmapper.php @@ -43,7 +43,7 @@ class FeedMapper extends Mapper implements IMapper { '`feeds`.`url`, `feeds`.`title`, `feeds`.`link`,'. '`feeds`.`favicon_link`, `feeds`.`added`, `feeds`.`articles_per_update`,'. '`feeds`.`folder_id`, `feeds`.`prevent_update`, `feeds`.`deleted_at`'; - $params = array($id, $userId); + $params = [$id, $userId]; return $this->findEntity($sql, $params); } @@ -71,7 +71,7 @@ class FeedMapper extends Mapper implements IMapper { '`feeds`.`url`, `feeds`.`title`, `feeds`.`link`,'. '`feeds`.`favicon_link`, `feeds`.`added`, `feeds`.`articles_per_update`,'. '`feeds`.`folder_id`, `feeds`.`prevent_update`, `feeds`.`deleted_at`'; - $params = array($userId); + $params = [$userId]; return $this->findEntities($sql, $params); } @@ -120,7 +120,7 @@ class FeedMapper extends Mapper implements IMapper { '`feeds`.`url`, `feeds`.`title`, `feeds`.`link`,'. '`feeds`.`favicon_link`, `feeds`.`added`, `feeds`.`articles_per_update`,'. '`feeds`.`folder_id`, `feeds`.`prevent_update`, `feeds`.`deleted_at`'; - $params = array($hash, $userId); + $params = [$hash, $userId]; $row = $this->findOneQuery($sql, $params); $feed = new Feed(); @@ -136,7 +136,7 @@ class FeedMapper extends Mapper implements IMapper { // someone please slap me for doing this manually :P // we needz CASCADE + FKs please $sql = 'DELETE FROM `*PREFIX*news_items` WHERE `feed_id` = ?'; - $params = array($entity->getId()); + $params = [$entity->getId()]; $this->execute($sql, $params); } @@ -150,18 +150,18 @@ class FeedMapper extends Mapper implements IMapper { public function getToDelete($deleteOlderThan=null, $userId=null) { $sql = 'SELECT * FROM `*PREFIX*news_feeds` ' . 'WHERE `deleted_at` > 0 '; - $params = array(); + $params = []; // sometimes we want to delete all entries if ($deleteOlderThan !== null) { $sql .= 'AND `deleted_at` < ? '; - array_push($params, $deleteOlderThan); + $params[] = $deleteOlderThan; } // we need to sometimes only delete feeds of a user if($userId !== null) { $sql .= 'AND `user_id` = ?'; - array_push($params, $userId); + $params[] = $userId; } return $this->findEntities($sql, $params); @@ -175,7 +175,7 @@ class FeedMapper extends Mapper implements IMapper { */ public function deleteUser($userId) { $sql = 'DELETE FROM `*PREFIX*news_feeds` WHERE `user_id` = ?'; - $this->execute($sql, array($userId)); + $this->execute($sql, [$userId]); } diff --git a/db/folder.php b/db/folder.php index 851fae6d8..ed536e18c 100644 --- a/db/folder.php +++ b/db/folder.php @@ -45,9 +45,9 @@ class Folder extends Entity implements IAPI { public function toAPI() { - return array( + return [ 'id' => $this->getId(), 'name' => $this->getName() - ); + ]; } } \ No newline at end of file diff --git a/db/foldermapper.php b/db/foldermapper.php index bf3fbbc7b..62ca09747 100644 --- a/db/foldermapper.php +++ b/db/foldermapper.php @@ -28,7 +28,7 @@ class FolderMapper extends Mapper implements IMapper { 'WHERE `id` = ? ' . 'AND `user_id` = ?'; - return $this->findEntity($sql, array($id, $userId)); + return $this->findEntity($sql, [$id, $userId]); } @@ -36,7 +36,7 @@ class FolderMapper extends Mapper implements IMapper { $sql = 'SELECT * FROM `*PREFIX*news_folders` ' . 'WHERE `user_id` = ? ' . 'AND `deleted_at` = 0'; - $params = array($userId); + $params = [$userId]; return $this->findEntities($sql, $params); } @@ -46,7 +46,7 @@ class FolderMapper extends Mapper implements IMapper { $sql = 'SELECT * FROM `*PREFIX*news_folders` ' . 'WHERE `name` = ? ' . 'AND `user_id` = ?'; - $params = array($folderName, $userId); + $params = [$folderName, $userId]; return $this->findEntities($sql, $params); } @@ -58,7 +58,7 @@ class FolderMapper extends Mapper implements IMapper { // someone please slap me for doing this manually :P // we needz CASCADE + FKs please $sql = 'DELETE FROM `*PREFIX*news_feeds` WHERE `folder_id` = ?'; - $params = array($entity->getId()); + $params = [$entity->getId()]; $this->execute($sql, $params); $sql = 'DELETE FROM `*PREFIX*news_items` WHERE `feed_id` NOT IN '. @@ -77,18 +77,18 @@ class FolderMapper extends Mapper implements IMapper { public function getToDelete($deleteOlderThan=null, $userId=null) { $sql = 'SELECT * FROM `*PREFIX*news_folders` ' . 'WHERE `deleted_at` > 0 '; - $params = array(); + $params = []; // sometimes we want to delete all entries if ($deleteOlderThan !== null) { $sql .= 'AND `deleted_at` < ? '; - array_push($params, $deleteOlderThan); + $params[] = $deleteOlderThan; } // we need to sometimes only delete feeds of a user if($userId !== null) { $sql .= 'AND `user_id` = ?'; - array_push($params, $userId); + $params[] = $userId; } return $this->findEntities($sql, $params); @@ -101,7 +101,7 @@ class FolderMapper extends Mapper implements IMapper { */ public function deleteUser($userId) { $sql = 'DELETE FROM `*PREFIX*news_folders` WHERE `user_id` = ?'; - $this->execute($sql, array($userId)); + $this->execute($sql, [$userId]); } diff --git a/db/item.php b/db/item.php index 535dd745c..3b18cbc8e 100644 --- a/db/item.php +++ b/db/item.php @@ -106,7 +106,7 @@ class Item extends Entity implements IAPI { public function toAPI() { - return array( + return [ 'id' => $this->getId(), 'guid' => $this->getGuid(), 'guidHash' => $this->getGuidHash(), @@ -121,12 +121,12 @@ class Item extends Entity implements IAPI { 'unread' => $this->isUnread(), 'starred' => $this->isStarred(), 'lastModified' => $this->getLastModified() - ); + ]; } public function toExport($feeds) { - return array( + return [ 'guid' => $this->getGuid(), 'url' => $this->getUrl(), 'title' => $this->getTitle(), @@ -138,7 +138,7 @@ class Item extends Entity implements IAPI { 'unread' => $this->isUnread(), 'starred' => $this->isStarred(), 'feedLink' => $feeds['feed'. $this->getFeedId()]->getLink() - ); + ]; } diff --git a/db/itemmapper.php b/db/itemmapper.php index 0ce4eb665..201022735 100644 --- a/db/itemmapper.php +++ b/db/itemmapper.php @@ -64,7 +64,7 @@ class ItemMapper extends Mapper implements IMapper { public function find($id, $userId){ $sql = $this->makeSelectQuery('AND `items`.`id` = ? '); - return $this->findEntity($sql, array($userId, $id)); + return $this->findEntity($sql, [$userId, $id]); } @@ -80,7 +80,7 @@ class ItemMapper extends Mapper implements IMapper { 'WHERE ((`items`.`status` & ' . StatusFlag::STARRED . ') = ' . StatusFlag::STARRED . ')'; - $params = array($userId); + $params = [$userId]; $result = $this->execute($sql, $params)->fetch(); @@ -97,7 +97,7 @@ class ItemMapper extends Mapper implements IMapper { 'WHERE `user_id` = ? ' . ') '. 'AND `id` <= ?'; - $params = array(~StatusFlag::UNREAD, $time, $userId, $highestItemId); + $params = [~StatusFlag::UNREAD, $time, $userId, $highestItemId]; $this->execute($sql, $params); } @@ -112,8 +112,8 @@ class ItemMapper extends Mapper implements IMapper { 'AND `user_id` = ? ' . ') '. 'AND `id` <= ?'; - $params = array(~StatusFlag::UNREAD, $time, $folderId, $userId, - $highestItemId); + $params = [~StatusFlag::UNREAD, $time, $folderId, $userId, + $highestItemId]; $this->execute($sql, $params); } @@ -128,8 +128,8 @@ class ItemMapper extends Mapper implements IMapper { 'SELECT * FROM `*PREFIX*news_feeds` ' . 'WHERE `user_id` = ? ' . 'AND `id` = ? ) '; - $params = array(~StatusFlag::UNREAD, $time, $feedId, $highestItemId, - $userId, $feedId); + $params = [~StatusFlag::UNREAD, $time, $feedId, $highestItemId, + $userId, $feedId]; $this->execute($sql, $params); } @@ -138,7 +138,7 @@ class ItemMapper extends Mapper implements IMapper { public function findAllNew($updatedSince, $status, $userId){ $sql = $this->makeSelectQueryStatus( 'AND `items`.`last_modified` >= ? ', $status); - $params = array($userId, $updatedSince); + $params = [$userId, $updatedSince]; return $this->findEntities($sql, $params); } @@ -147,7 +147,7 @@ class ItemMapper extends Mapper implements IMapper { $sql = 'AND `feeds`.`folder_id` = ? ' . 'AND `items`.`last_modified` >= ? '; $sql = $this->makeSelectQueryStatus($sql, $status); - $params = array($userId, $id, $updatedSince); + $params = [$userId, $id, $updatedSince]; return $this->findEntities($sql, $params); } @@ -156,17 +156,17 @@ class ItemMapper extends Mapper implements IMapper { $sql = 'AND `items`.`feed_id` = ? ' . 'AND `items`.`last_modified` >= ? '; $sql = $this->makeSelectQueryStatus($sql, $status); - $params = array($userId, $id, $updatedSince); + $params = [$userId, $id, $updatedSince]; return $this->findEntities($sql, $params); } public function findAllFeed($id, $limit, $offset, $status, $userId){ - $params = array($userId, $id); + $params = [$userId, $id]; $sql = 'AND `items`.`feed_id` = ? '; if($offset !== 0){ $sql .= 'AND `items`.`id` < ? '; - array_push($params, $offset); + $params[] = $offset; } $sql = $this->makeSelectQueryStatus($sql, $status); return $this->findEntities($sql, $params, $limit); @@ -174,11 +174,11 @@ class ItemMapper extends Mapper implements IMapper { public function findAllFolder($id, $limit, $offset, $status, $userId){ - $params = array($userId, $id); + $params = [$userId, $id]; $sql = 'AND `feeds`.`folder_id` = ? '; if($offset !== 0){ $sql .= 'AND `items`.`id` < ? '; - array_push($params, $offset); + $params[] = $offset; } $sql = $this->makeSelectQueryStatus($sql, $status); return $this->findEntities($sql, $params, $limit); @@ -186,11 +186,11 @@ class ItemMapper extends Mapper implements IMapper { public function findAll($limit, $offset, $status, $userId){ - $params = array($userId); + $params = [$userId]; $sql = ''; if($offset !== 0){ $sql .= 'AND `items`.`id` < ? '; - array_push($params, $offset); + $params[] = $offset; } $sql = $this->makeSelectQueryStatus($sql, $status); return $this->findEntities($sql, $params, $limit); @@ -198,7 +198,7 @@ class ItemMapper extends Mapper implements IMapper { public function findAllUnreadOrStarred($userId) { - $params = array($userId); + $params = [$userId]; $status = StatusFlag::UNREAD | StatusFlag::STARRED; $sql = 'AND ((`items`.`status` & ' . $status . ') > 0) '; $sql = $this->makeSelectQuery($sql); @@ -211,7 +211,7 @@ class ItemMapper extends Mapper implements IMapper { 'AND `items`.`guid_hash` = ? ' . 'AND `feeds`.`id` = ? '); - return $this->findEntity($sql, array($userId, $guidHash, $feedId)); + return $this->findEntity($sql, [$userId, $guidHash, $feedId]); } @@ -229,7 +229,7 @@ class ItemMapper extends Mapper implements IMapper { 'WHERE NOT ((`items`.`status` & ?) > 0) ' . 'GROUP BY `items`.`feed_id`, `feeds`.`articles_per_update` ' . 'HAVING COUNT(*) > ?'; - $params = array($status, $threshold); + $params = [$status, $threshold]; $result = $this->execute($sql, $params); while($row = $result->fetch()) { @@ -238,7 +238,7 @@ class ItemMapper extends Mapper implements IMapper { $limit = $size - $threshold; if($limit > 0) { - $params = array($status, $row['feed_id']); + $params = [$status, $row['feed_id']]; $sql = 'DELETE FROM `*PREFIX*news_items` ' . 'WHERE NOT ((`status` & ?) > 0) ' . @@ -256,7 +256,7 @@ class ItemMapper extends Mapper implements IMapper { 'JOIN `*PREFIX*news_feeds` `feeds` ' . 'ON `feeds`.`id` = `items`.`feed_id` '. 'AND `feeds`.`user_id` = ?'; - $params = array($userId); + $params = [$userId]; $result = $this->findOneQuery($sql, $params); @@ -275,7 +275,7 @@ class ItemMapper extends Mapper implements IMapper { 'WHERE `feeds`.`user_id` = ?' . ')'; - $this->execute($sql, array($userId)); + $this->execute($sql, [$userId]); } diff --git a/db/postgres/itemmapper.php b/db/postgres/itemmapper.php index 8a305bcb4..593a0719a 100644 --- a/db/postgres/itemmapper.php +++ b/db/postgres/itemmapper.php @@ -39,7 +39,7 @@ class ItemMapper extends \OCA\News\Db\ItemMapper { 'WHERE NOT ((`items`.`status` & ?) > 0) ' . 'GROUP BY `items`.`feed_id`, `feeds`.`articles_per_update` ' . 'HAVING COUNT(*) > ?'; - $params = array($status, $threshold); + $params = [$status, $threshold]; $result = $this->execute($sql, $params); while($row = $result->fetch()) { @@ -48,7 +48,7 @@ class ItemMapper extends \OCA\News\Db\ItemMapper { $limit = $size - $threshold; if($limit > 0) { - $params = array($status, $row['feed_id'], $limit); + $params = [$status, $row['feed_id'], $limit]; $sql = 'DELETE FROM `*PREFIX*news_items` ' . 'WHERE `id` IN (' . -- cgit v1.2.3