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 [] --- appinfo/app.php | 2 +- appinfo/application.php | 10 +- appinfo/routes.php | 122 +++++++-------- articleenhancer/enhancer.php | 2 +- articleenhancer/xpatharticleenhancer.php | 2 +- businesslayer/feedbusinesslayer.php | 2 +- config/appconfig.php | 20 +-- 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 +- 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 +- fetcher/feedfetcher.php | 4 +- fetcher/fetcher.php | 4 +- templates/main.php | 2 +- templates/part.listfolder.php | 2 +- tests/unit/articleenhancer/EnhancerTest.php | 4 +- .../articleenhancer/RegexArticleEnhancerTest.php | 2 +- .../articleenhancer/XPathArticleEnhancerTest.php | 28 ++-- tests/unit/businesslayer/FeedBusinessLayerTest.php | 52 +++---- .../unit/businesslayer/FolderBusinessLayerTest.php | 18 +-- tests/unit/businesslayer/ItemBusinessLayerTest.php | 2 +- tests/unit/config/AppConfigTest.php | 115 +++++++------- tests/unit/controller/EntityApiSerializerTest.php | 14 +- tests/unit/controller/ExportControllerTest.php | 10 +- tests/unit/controller/FeedApiControllerTest.php | 36 ++--- tests/unit/controller/FeedControllerTest.php | 101 ++++++------ tests/unit/controller/FolderApiControllerTest.php | 8 +- tests/unit/controller/FolderControllerTest.php | 23 +-- tests/unit/controller/ItemApiControllerTest.php | 54 +++---- tests/unit/controller/ItemControllerTest.php | 30 ++-- tests/unit/controller/JSONHttpErrorTest.php | 2 +- tests/unit/controller/PageControllerTest.php | 4 +- tests/unit/db/FeedMapperTest.php | 109 ++++++------- tests/unit/db/FeedTest.php | 4 +- tests/unit/db/FolderMapperTest.php | 65 +++----- tests/unit/db/FolderTest.php | 4 +- tests/unit/db/ItemMapperTest.php | 79 +++++----- tests/unit/db/ItemTest.php | 16 +- tests/unit/db/postgres/ItemMapperTest.php | 29 ++-- tests/unit/fetcher/FeedFetcherTest.php | 40 ++--- tests/unit/utility/ConfigTest.php | 6 +- tests/unit/utility/OPMLExporterTest.php | 13 +- utility/controllertestutility.php | 102 ------------- utility/mappertestutility.php | 170 --------------------- 56 files changed, 564 insertions(+), 961 deletions(-) delete mode 100644 utility/controllertestutility.php delete mode 100644 utility/mappertestutility.php diff --git a/appinfo/app.php b/appinfo/app.php index daf0ec5b4..e50525a5c 100644 --- a/appinfo/app.php +++ b/appinfo/app.php @@ -27,6 +27,6 @@ try { } catch(\OCA\News\Config\DependencyException $e) { $logger = $container->getLogger(); $params = $container->getLoggerParameters(); - $logger->warning($e->getMessage(), $params); + $logger->emergency($e->getMessage(), $params); } diff --git a/appinfo/application.php b/appinfo/application.php index 8b7f46e25..d325adf00 100644 --- a/appinfo/application.php +++ b/appinfo/application.php @@ -243,16 +243,16 @@ class Application extends App { // not performant but well :/ // $config = $c->query('ServerContainer')->getAppConfig(); oc7 only $installedApps = \OC_Appconfig::getApps(); - $apps = array(); + $apps = []; foreach($installedApps as $app) { - $apps[] = array( + $apps[] = [ $app => \OC_Appconfig::getValue($app, 'installed_version', '0') - ); + ]; } // order extensions in name => version $loadedExtensions = get_loaded_extensions(); - $extensions = array(); + $extensions = []; foreach ($loadedExtensions as $extension) { $extensions[$extension] = phpversion($extension); } @@ -285,7 +285,7 @@ class Application extends App { }); $container->registerService('LoggerParameters', function($c) { - return array('app' => $c->query('AppName')); + return ['app' => $c->query('AppName')]; }); $container->registerService('Db', function($c) { diff --git a/appinfo/routes.php b/appinfo/routes.php index 2d59e7ff7..fd9e513d3 100644 --- a/appinfo/routes.php +++ b/appinfo/routes.php @@ -18,82 +18,82 @@ use \OCP\AppFramework\App; use \OCA\News\AppInfo\Application; $application = new Application(); -$application->registerRoutes($this, array('routes' => array( +$application->registerRoutes($this, ['routes' => [ // page - array('name' => 'page#index', 'url' => '/', 'verb' => 'GET'), - array('name' => 'page#settings', 'url' => '/settings', 'verb' => 'GET'), - array('name' => 'page#update_settings', 'url' => '/settings', 'verb' => 'POST'), + ['name' => 'page#index', 'url' => '/', 'verb' => 'GET'], + ['name' => 'page#settings', 'url' => '/settings', 'verb' => 'GET'], + ['name' => 'page#update_settings', 'url' => '/settings', 'verb' => 'POST'], // folders - array('name' => 'folder#index', 'url' => '/folders', 'verb' => 'GET'), - array('name' => 'folder#create', 'url' => '/folders', 'verb' => 'POST'), - array('name' => 'folder#delete', 'url' => '/folders/{folderId}', 'verb' => 'DELETE'), - array('name' => 'folder#restore', 'url' => '/folders/{folderId}/restore', 'verb' => 'POST'), - array('name' => 'folder#rename', 'url' => '/folders/{folderId}/rename', 'verb' => 'POST'), - array('name' => 'folder#read', 'url' => '/folders/{folderId}/read', 'verb' => 'POST'), - array('name' => 'folder#open', 'url' => '/folders/{folderId}/open', 'verb' => 'POST'), - array('name' => 'folder#collapse', 'url' => '/folders/{folderId}/collapse', 'verb' => 'POST'), + ['name' => 'folder#index', 'url' => '/folders', 'verb' => 'GET'], + ['name' => 'folder#create', 'url' => '/folders', 'verb' => 'POST'], + ['name' => 'folder#delete', 'url' => '/folders/{folderId}', 'verb' => 'DELETE'], + ['name' => 'folder#restore', 'url' => '/folders/{folderId}/restore', 'verb' => 'POST'], + ['name' => 'folder#rename', 'url' => '/folders/{folderId}/rename', 'verb' => 'POST'], + ['name' => 'folder#read', 'url' => '/folders/{folderId}/read', 'verb' => 'POST'], + ['name' => 'folder#open', 'url' => '/folders/{folderId}/open', 'verb' => 'POST'], + ['name' => 'folder#collapse', 'url' => '/folders/{folderId}/collapse', 'verb' => 'POST'], // feeds - array('name' => 'feed#index', 'url' => '/feeds', 'verb' => 'GET'), - array('name' => 'feed#create', 'url' => '/feeds', 'verb' => 'POST'), - array('name' => 'feed#delete', 'url' => '/feeds/{feedId}', 'verb' => 'DELETE'), - array('name' => 'feed#restore', 'url' => '/feeds/{feedId}/restore', 'verb' => 'POST'), - array('name' => 'feed#move', 'url' => '/feeds/{feedId}/move', 'verb' => 'POST'), - array('name' => 'feed#rename', 'url' => '/feeds/{feedId}/rename', 'verb' => 'POST'), - array('name' => 'feed#read', 'url' => '/feeds/{feedId}/read', 'verb' => 'POST'), - array('name' => 'feed#update', 'url' => '/feeds/{feedId}/update', 'verb' => 'POST'), - array('name' => 'feed#active', 'url' => '/feeds/active', 'verb' => 'GET'), - array('name' => 'feed#import', 'url' => '/feeds/import/articles', 'verb' => 'POST'), + ['name' => 'feed#index', 'url' => '/feeds', 'verb' => 'GET'], + ['name' => 'feed#create', 'url' => '/feeds', 'verb' => 'POST'], + ['name' => 'feed#delete', 'url' => '/feeds/{feedId}', 'verb' => 'DELETE'], + ['name' => 'feed#restore', 'url' => '/feeds/{feedId}/restore', 'verb' => 'POST'], + ['name' => 'feed#move', 'url' => '/feeds/{feedId}/move', 'verb' => 'POST'], + ['name' => 'feed#rename', 'url' => '/feeds/{feedId}/rename', 'verb' => 'POST'], + ['name' => 'feed#read', 'url' => '/feeds/{feedId}/read', 'verb' => 'POST'], + ['name' => 'feed#update', 'url' => '/feeds/{feedId}/update', 'verb' => 'POST'], + ['name' => 'feed#active', 'url' => '/feeds/active', 'verb' => 'GET'], + ['name' => 'feed#import', 'url' => '/feeds/import/articles', 'verb' => 'POST'], // items - array('name' => 'item#index', 'url' => '/items', 'verb' => 'GET'), - array('name' => 'item#new_items', 'url' => '/items/new', 'verb' => 'GET'), - array('name' => 'item#readAll', 'url' => '/items/read', 'verb' => 'POST'), - array('name' => 'item#read', 'url' => '/items/{itemId}/read', 'verb' => 'POST'), - array('name' => 'item#unread', 'url' => '/items/{itemId}/unread', 'verb' => 'POST'), - array('name' => 'item#star', 'url' => '/items/{feedId}/{guidHash}/star', 'verb' => 'POST'), - array('name' => 'item#unstar', 'url' => '/items/{feedId}/{guidHash}/unstar', 'verb' => 'POST'), + ['name' => 'item#index', 'url' => '/items', 'verb' => 'GET'], + ['name' => 'item#new_items', 'url' => '/items/new', 'verb' => 'GET'], + ['name' => 'item#readAll', 'url' => '/items/read', 'verb' => 'POST'], + ['name' => 'item#read', 'url' => '/items/{itemId}/read', 'verb' => 'POST'], + ['name' => 'item#unread', 'url' => '/items/{itemId}/unread', 'verb' => 'POST'], + ['name' => 'item#star', 'url' => '/items/{feedId}/{guidHash}/star', 'verb' => 'POST'], + ['name' => 'item#unstar', 'url' => '/items/{feedId}/{guidHash}/unstar', 'verb' => 'POST'], // export - array('name' => 'export#opml', 'url' => '/export/opml', 'verb' => 'GET'), - array('name' => 'export#articles', 'url' => '/export/articles', 'verb' => 'GET'), + ['name' => 'export#opml', 'url' => '/export/opml', 'verb' => 'GET'], + ['name' => 'export#articles', 'url' => '/export/articles', 'verb' => 'GET'], // API - array('name' => 'utility_api#version', 'url' => '/api/v1-2/version', 'verb' => 'GET'), - array('name' => 'utility_api#before_update', 'url' => '/api/v1-2/cleanup/before-update', 'verb' => 'GET'), - array('name' => 'utility_api#after_update', 'url' => '/api/v1-2/cleanup/after-update', 'verb' => 'GET'), - array('name' => 'utility_api#preflighted_cors', 'url' => '/api/v1-2/{path}', 'verb' => 'OPTIONS', 'requirements' => array('path' => '.+')), + ['name' => 'utility_api#version', 'url' => '/api/v1-2/version', 'verb' => 'GET'], + ['name' => 'utility_api#before_update', 'url' => '/api/v1-2/cleanup/before-update', 'verb' => 'GET'], + ['name' => 'utility_api#after_update', 'url' => '/api/v1-2/cleanup/after-update', 'verb' => 'GET'], + ['name' => 'utility_api#preflighted_cors', 'url' => '/api/v1-2/{path}', 'verb' => 'OPTIONS', 'requirements' => ['path' => '.+']], // folders - array('name' => 'folder_api#index', 'url' => '/api/v1-2/folders', 'verb' => 'GET'), - array('name' => 'folder_api#create', 'url' => '/api/v1-2/folders', 'verb' => 'POST'), - array('name' => 'folder_api#update', 'url' => '/api/v1-2/folders/{folderId}', 'verb' => 'PUT'), - array('name' => 'folder_api#delete', 'url' => '/api/v1-2/folders/{folderId}', 'verb' => 'DELETE'), - array('name' => 'folder_api#read', 'url' => '/api/v1-2/folders/{folderId}/read', 'verb' => 'PUT'), // FIXME: POST would be more correct + ['name' => 'folder_api#index', 'url' => '/api/v1-2/folders', 'verb' => 'GET'], + ['name' => 'folder_api#create', 'url' => '/api/v1-2/folders', 'verb' => 'POST'], + ['name' => 'folder_api#update', 'url' => '/api/v1-2/folders/{folderId}', 'verb' => 'PUT'], + ['name' => 'folder_api#delete', 'url' => '/api/v1-2/folders/{folderId}', 'verb' => 'DELETE'], + ['name' => 'folder_api#read', 'url' => '/api/v1-2/folders/{folderId}/read', 'verb' => 'PUT'], // FIXME: POST would be more correct // feeds - array('name' => 'feed_api#index', 'url' => '/api/v1-2/feeds', 'verb' => 'GET'), - array('name' => 'feed_api#create', 'url' => '/api/v1-2/feeds', 'verb' => 'POST'), - array('name' => 'feed_api#update', 'url' => '/api/v1-2/feeds/{feedId}', 'verb' => 'PUT'), - array('name' => 'feed_api#delete', 'url' => '/api/v1-2/feeds/{feedId}', 'verb' => 'DELETE'), - array('name' => 'feed_api#from_all_users', 'url' => '/api/v1-2/feeds/all', 'verb' => 'GET'), - array('name' => 'feed_api#move', 'url' => '/api/v1-2/feeds/{feedId}/move', 'verb' => 'PUT'), // FIXME: POST would be more correct - array('name' => 'feed_api#rename', 'url' => '/api/v1-2/feeds/{feedId}/rename', 'verb' => 'PUT'), // FIXME: POST would be more correct - array('name' => 'feed_api#read', 'url' => '/api/v1-2/feeds/{feedId}/read', 'verb' => 'PUT'), // FIXME: POST would be more correct - array('name' => 'feed_api#update', 'url' => '/api/v1-2/feeds/update', 'verb' => 'GET'), + ['name' => 'feed_api#index', 'url' => '/api/v1-2/feeds', 'verb' => 'GET'], + ['name' => 'feed_api#create', 'url' => '/api/v1-2/feeds', 'verb' => 'POST'], + ['name' => 'feed_api#update', 'url' => '/api/v1-2/feeds/{feedId}', 'verb' => 'PUT'], + ['name' => 'feed_api#delete', 'url' => '/api/v1-2/feeds/{feedId}', 'verb' => 'DELETE'], + ['name' => 'feed_api#from_all_users', 'url' => '/api/v1-2/feeds/all', 'verb' => 'GET'], + ['name' => 'feed_api#move', 'url' => '/api/v1-2/feeds/{feedId}/move', 'verb' => 'PUT'], // FIXME: POST would be more correct + ['name' => 'feed_api#rename', 'url' => '/api/v1-2/feeds/{feedId}/rename', 'verb' => 'PUT'], // FIXME: POST would be more correct + ['name' => 'feed_api#read', 'url' => '/api/v1-2/feeds/{feedId}/read', 'verb' => 'PUT'], // FIXME: POST would be more correct + ['name' => 'feed_api#update', 'url' => '/api/v1-2/feeds/update', 'verb' => 'GET'], // items - array('name' => 'item_api#index', 'url' => '/api/v1-2/items', 'verb' => 'GET'), - array('name' => 'item_api#updated', 'url' => '/api/v1-2/items/updated', 'verb' => 'GET'), - array('name' => 'item_api#read', 'url' => '/api/v1-2/items/{itemId}/read', 'verb' => 'PUT'), // FIXME: POST would be more correct - array('name' => 'item_api#unread', 'url' => '/api/v1-2/items/{itemId}/unread', 'verb' => 'PUT'), // FIXME: POST would be more correct - array('name' => 'item_api#read_all', 'url' => '/api/v1-2/items/read', 'verb' => 'PUT'), // FIXME: POST would be more correct - array('name' => 'item_api#read_multiple', 'url' => '/api/v1-2/items/read/multiple', 'verb' => 'PUT'), // FIXME: POST would be more correct - array('name' => 'item_api#unread_multiple', 'url' => '/api/v1-2/items/unread/multiple', 'verb' => 'PUT'), // FIXME: POST would be more correct - array('name' => 'item_api#star', 'url' => '/api/v1-2/items/{feedId}/{guidHash}/star', 'verb' => 'PUT'), // FIXME: POST would be more correct - array('name' => 'item_api#unstar', 'url' => '/api/v1-2/items/{feedId}/{guidHash}/unstar', 'verb' => 'PUT'), // FIXME: POST would be more correct - array('name' => 'item_api#star_multiple', 'url' => '/api/v1-2/items/star/multiple', 'verb' => 'PUT'), // FIXME: POST would be more correct - array('name' => 'item_api#unstar_multiple', 'url' => '/api/v1-2/items/unstar/multiple', 'verb' => 'PUT') // FIXME: POST would be more correct -))); + ['name' => 'item_api#index', 'url' => '/api/v1-2/items', 'verb' => 'GET'], + ['name' => 'item_api#updated', 'url' => '/api/v1-2/items/updated', 'verb' => 'GET'], + ['name' => 'item_api#read', 'url' => '/api/v1-2/items/{itemId}/read', 'verb' => 'PUT'], // FIXME: POST would be more correct + ['name' => 'item_api#unread', 'url' => '/api/v1-2/items/{itemId}/unread', 'verb' => 'PUT'], // FIXME: POST would be more correct + ['name' => 'item_api#read_all', 'url' => '/api/v1-2/items/read', 'verb' => 'PUT'], // FIXME: POST would be more correct + ['name' => 'item_api#read_multiple', 'url' => '/api/v1-2/items/read/multiple', 'verb' => 'PUT'], // FIXME: POST would be more correct + ['name' => 'item_api#unread_multiple', 'url' => '/api/v1-2/items/unread/multiple', 'verb' => 'PUT'], // FIXME: POST would be more correct + ['name' => 'item_api#star', 'url' => '/api/v1-2/items/{feedId}/{guidHash}/star', 'verb' => 'PUT'], // FIXME: POST would be more correct + ['name' => 'item_api#unstar', 'url' => '/api/v1-2/items/{feedId}/{guidHash}/unstar', 'verb' => 'PUT'], // FIXME: POST would be more correct + ['name' => 'item_api#star_multiple', 'url' => '/api/v1-2/items/star/multiple', 'verb' => 'PUT'], // FIXME: POST would be more correct + ['name' => 'item_api#unstar_multiple', 'url' => '/api/v1-2/items/unstar/multiple', 'verb' => 'PUT'] // FIXME: POST would be more correct +]]); diff --git a/articleenhancer/enhancer.php b/articleenhancer/enhancer.php index cfdc960b6..f9b4d5d64 100644 --- a/articleenhancer/enhancer.php +++ b/articleenhancer/enhancer.php @@ -16,7 +16,7 @@ namespace OCA\News\ArticleEnhancer; class Enhancer { - private $enhancers = array(); + private $enhancers = []; /** * @param string $feedUrl diff --git a/articleenhancer/xpatharticleenhancer.php b/articleenhancer/xpatharticleenhancer.php index 6761fd0c5..ecde135bf 100644 --- a/articleenhancer/xpatharticleenhancer.php +++ b/articleenhancer/xpatharticleenhancer.php @@ -136,7 +136,7 @@ class XPathArticleEnhancer implements ArticleEnhancer { // remove $dom->replaceChild($dom->firstChild->firstChild, $dom->firstChild); - $substitution = array("href", "src"); + $substitution = ["href", "src"]; foreach ($substitution as $attribute) { $xpath = new \DOMXpath($dom); diff --git a/businesslayer/feedbusinesslayer.php b/businesslayer/feedbusinesslayer.php index acb999aa4..46e7ab2da 100644 --- a/businesslayer/feedbusinesslayer.php +++ b/businesslayer/feedbusinesslayer.php @@ -260,7 +260,7 @@ class FeedBusinessLayer extends BusinessLayer { // build assoc array for fast access $feeds = $this->findAll($userId); - $feedsDict = array(); + $feedsDict = []; foreach($feeds as $feed) { $feedsDict[$feed->getLink()] = $feed; } diff --git a/config/appconfig.php b/config/appconfig.php index b42301209..4315569d6 100644 --- a/config/appconfig.php +++ b/config/appconfig.php @@ -55,7 +55,7 @@ class AppConfig { $this->installedApps = $installedApps; $this->installedExtensions = $installedExtensions; $this->databaseType = $databaseType; - $this->config = array(); + $this->config = []; } @@ -75,13 +75,13 @@ class AppConfig { $nav =& $this->config['navigation']; // add defaults - $defaults = array( + $defaults = [ 'id' => $this->config['id'], 'route' => $this->config['id'] . '.page.index', 'order' => 10, 'icon' => 'app.svg', 'name' => $this->config['name'] - ); + ]; foreach($defaults as $key => $value) { if(!array_key_exists($key, $nav)) { @@ -113,10 +113,10 @@ class AppConfig { if(array_key_exists('navigation', $this->config)) { $nav =& $this->config['navigation']; - $navConfig = array( + $navConfig = [ 'id' => $nav['id'], 'order' => $nav['order'] - ); + ]; $navConfig['name'] = $this->l10n->t($nav['name']); $navConfig['href'] = $this->urlGenerator->linkToRoute($nav['route']); @@ -252,21 +252,21 @@ class AppConfig { * @return array of arrays with key=version value=operator */ private function splitVersions($versions) { - $result = array(); + $result = []; $versions = explode(',', $versions); foreach($versions as $version) { preg_match('/^(?<|<=|>=|>|<>)?(?.*)$/', $version, $matches); if($matches['operator'] !== '') { - $required = array( + $required = [ 'version' => $matches['version'], 'operator' => $matches['operator'], - ); + ]; } else { - $required = array( + $required = [ 'version' => $matches['version'], 'operator' => '==', - ); + ]; } $result[] = $required; } 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]; } 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 (' . diff --git a/fetcher/feedfetcher.php b/fetcher/feedfetcher.php index 9c2049395..81b91738e 100644 --- a/fetcher/feedfetcher.php +++ b/fetcher/feedfetcher.php @@ -89,7 +89,7 @@ class FeedFetcher implements IFeedFetcher { try { // somehow $simplePie turns into a feed after init - $items = array(); + $items = []; $permaLink = $simplePie->get_permalink(); if ($feedItems = $simplePie->get_items()) { foreach($feedItems as $feedItem) { @@ -99,7 +99,7 @@ class FeedFetcher implements IFeedFetcher { $feed = $this->buildFeed($simplePie, $url, $getFavicon); - return array($feed, $items); + return [$feed, $items]; } catch(\Exception $ex){ throw new FetcherException($ex->getMessage()); diff --git a/fetcher/fetcher.php b/fetcher/fetcher.php index a2ea42626..8082f2f6d 100644 --- a/fetcher/fetcher.php +++ b/fetcher/fetcher.php @@ -19,7 +19,7 @@ class Fetcher { private $fetchers; public function __construct(){ - $this->fetchers = array(); + $this->fetchers = []; } @@ -28,7 +28,7 @@ class Fetcher { * @param IFeedFetcher $fetcher the fetcher */ public function registerFetcher(IFeedFetcher $fetcher){ - array_push($this->fetchers, $fetcher); + $this->fetchers[] = $fetcher; } /** diff --git a/templates/main.php b/templates/main.php index 03c5a7c03..e33b534cb 100644 --- a/templates/main.php +++ b/templates/main.php @@ -29,7 +29,7 @@ inc('part.addnew')) ?> inc('part.feed.unread')) ?> inc('part.feed.starred')) ?> - inc('part.listfeed', array('folderId' => '0'))) ?> + inc('part.listfeed', ['folderId' => '0'])) ?> inc('part.listfolder')) ?> inc('part.showall')); ?> diff --git a/templates/part.listfolder.php b/templates/part.listfolder.php index 89626d5c9..c104303b5 100644 --- a/templates/part.listfolder.php +++ b/templates/part.listfolder.php @@ -69,7 +69,7 @@
    - inc('part.listfeed', array('folderId' => 'folder.id'))); ?> + inc('part.listfeed', ['folderId' => 'folder.id'])); ?>
{{ folder.error }}
diff --git a/tests/unit/articleenhancer/EnhancerTest.php b/tests/unit/articleenhancer/EnhancerTest.php index 5c54816a8..4a72e19a8 100644 --- a/tests/unit/articleenhancer/EnhancerTest.php +++ b/tests/unit/articleenhancer/EnhancerTest.php @@ -37,14 +37,14 @@ class EnhancerTest extends \PHPUnit_Framework_TestCase { public function testEnhanceSetsCorrectHash(){ $item = new Item(); $item->setUrl('hi'); - $urls = array( + $urls = [ 'https://test.com', 'https://www.test.com', 'https://test.com/', 'http://test.com', 'http://test.com/', 'http://www.test.com' - ); + ]; for ($i=0; $i < count($urls); $i++) { $this->articleEnhancer->expects($this->at($i)) ->method('enhance') diff --git a/tests/unit/articleenhancer/RegexArticleEnhancerTest.php b/tests/unit/articleenhancer/RegexArticleEnhancerTest.php index b88abc985..f464c9275 100644 --- a/tests/unit/articleenhancer/RegexArticleEnhancerTest.php +++ b/tests/unit/articleenhancer/RegexArticleEnhancerTest.php @@ -25,7 +25,7 @@ class RegexArticleEnhancerTest extends \PHPUnit_Framework_TestCase { $item = new Item(); $item->setBody('atests is a nice thing'); $item->setUrl('http://john.com'); - $regex = array("%tes(ts)%" => "heho$1tests"); + $regex = ["%tes(ts)%" => "heho$1tests"]; $regexEnhancer = new RegexArticleEnhancer('%john.com%', $regex); $item = $regexEnhancer->enhance($item); diff --git a/tests/unit/articleenhancer/XPathArticleEnhancerTest.php b/tests/unit/articleenhancer/XPathArticleEnhancerTest.php index a0120a6f3..55493bed7 100644 --- a/tests/unit/articleenhancer/XPathArticleEnhancerTest.php +++ b/tests/unit/articleenhancer/XPathArticleEnhancerTest.php @@ -57,12 +57,12 @@ class XPathArticleEnhancerTest extends \PHPUnit_Framework_TestCase { $this->testEnhancer = new XPathArticleEnhancer( $this->fileFactory, - array( + [ '/explosm.net\/comics/' => '//*[@id=\'maincontent\']/div[2]/div/span', '/explosm.net\/shorts/' => '//*[@id=\'maincontent\']/div/div', '/explosm.net\/all/' => '//body/*', '/themerepublic.net/' => '//*[@class=\'post hentry\']' - ), + ], $this->config ); $this->redirects = 5; @@ -73,7 +73,7 @@ class XPathArticleEnhancerTest extends \PHPUnit_Framework_TestCase { public function testXPathUsesNoProxy() { $file = new \stdClass; - $file->headers = array("content-type"=>"text/html; charset=utf-8"); + $file->headers = ["content-type"=>"text/html; charset=utf-8"]; $file->body = ''; $item = new Item(); $item->setUrl('https://www.explosm.net/comics/312'); @@ -117,17 +117,17 @@ class XPathArticleEnhancerTest extends \PHPUnit_Framework_TestCase { $this->testEnhancer = new XPathArticleEnhancer( $this->fileFactory, - array( + [ '/explosm.net\/comics/' => '//*[@id=\'maincontent\']/div[2]/div/span', '/explosm.net\/shorts/' => '//*[@id=\'maincontent\']/div/div', '/explosm.net\/all/' => '//body/*', '/themerepublic.net/' => '//*[@class=\'post hentry\']' - ), + ], $this->config ); $file = new \stdClass; - $file->headers = array("content-type"=>"text/html; charset=utf-8"); + $file->headers = ["content-type"=>"text/html; charset=utf-8"]; $file->body = ''; $item = new Item(); $item->setUrl('https://www.explosm.net/comics/312'); @@ -165,7 +165,7 @@ class XPathArticleEnhancerTest extends \PHPUnit_Framework_TestCase { public function testDoesModifiyArticlesThatMatch() { $file = new \stdClass; - $file->headers = array("content-type"=>"text/html; charset=utf-8"); + $file->headers = ["content-type"=>"text/html; charset=utf-8"]; $file->body = '
@@ -194,7 +194,7 @@ class XPathArticleEnhancerTest extends \PHPUnit_Framework_TestCase { public function testDoesModifiyAllArticlesThatMatch() { $file = new \stdClass; - $file->headers = array("content-type"=>"text/html; charset=utf-8"); + $file->headers = ["content-type"=>"text/html; charset=utf-8"]; $file->body = '
@@ -223,7 +223,7 @@ class XPathArticleEnhancerTest extends \PHPUnit_Framework_TestCase { public function testModificationHandlesEmptyResults() { $file = new \stdClass; - $file->headers = array("content-type"=>"text/html; charset=utf-8"); + $file->headers = ["content-type"=>"text/html; charset=utf-8"]; $file->body = '
@@ -250,7 +250,7 @@ class XPathArticleEnhancerTest extends \PHPUnit_Framework_TestCase { public function testModificationDoesNotBreakOnEmptyDom() { $file = new \stdClass; - $file->headers = array("content-type"=>"text/html; charset=utf-8"); + $file->headers = ["content-type"=>"text/html; charset=utf-8"]; $file->body = ''; $item = new Item(); $item->setUrl('https://www.explosm.net/comics/312'); @@ -272,7 +272,7 @@ class XPathArticleEnhancerTest extends \PHPUnit_Framework_TestCase { public function testModificationDoesNotBreakOnBrokenDom() { $file = new \stdClass; - $file->headers = array("content-type"=>"text/html; charset=utf-8"); + $file->headers = ["content-type"=>"text/html; charset=utf-8"]; $file->body = '

@@ -299,7 +299,7 @@ class XPathArticleEnhancerTest extends \PHPUnit_Framework_TestCase { public function testTransformRelativeUrls() { $file = new \stdClass; - $file->headers = array("content-type"=>"text/html; charset=utf-8"); + $file->headers = ["content-type"=>"text/html; charset=utf-8"]; $file->body = ' link @@ -326,7 +326,7 @@ class XPathArticleEnhancerTest extends \PHPUnit_Framework_TestCase { public function testTransformRelativeUrlSpecials() { $file = new \stdClass; - $file->headers = array("content-type"=>"text/html; charset=utf-8"); + $file->headers = ["content-type"=>"text/html; charset=utf-8"]; $file->body = ' @@ -351,7 +351,7 @@ class XPathArticleEnhancerTest extends \PHPUnit_Framework_TestCase { public function testDontTransformAbsoluteUrlsAndMails() { $file = new \stdClass; - $file->headers = array("content-type"=>"text/html; charset=utf-8"); + $file->headers = ["content-type"=>"text/html; charset=utf-8"]; $file->body = ' diff --git a/tests/unit/businesslayer/FeedBusinessLayerTest.php b/tests/unit/businesslayer/FeedBusinessLayerTest.php index 65cd3e3db..786b3016c 100644 --- a/tests/unit/businesslayer/FeedBusinessLayerTest.php +++ b/tests/unit/businesslayer/FeedBusinessLayerTest.php @@ -46,10 +46,10 @@ class FeedBusinessLayerTest extends \PHPUnit_Framework_TestCase { '\OCP\ILogger') ->disableOriginalConstructor() ->getMock(); - $this->loggerParams = array('hi'); + $this->loggerParams = ['hi']; $this->time = 222; $this->autoPurgeMinimumInterval = 10; - $timeFactory = $this->getMock('TimeFactory', array('getTime')); + $timeFactory = $this->getMock('TimeFactory', ['getTime']); $timeFactory->expects($this->any()) ->method('getTime') ->will($this->returnValue($this->time)); @@ -68,7 +68,7 @@ class FeedBusinessLayerTest extends \PHPUnit_Framework_TestCase { $this->enhancer = $this->getMockBuilder('\OCA\News\ArticleEnhancer\Enhancer') ->disableOriginalConstructor() ->getMock(); - $this->purifier = $this->getMock('purifier', array('purify')); + $this->purifier = $this->getMock('purifier', ['purify']); $config = $this->getMockBuilder( '\OCA\News\Utility\Config') ->disableOriginalConstructor() @@ -120,10 +120,10 @@ class FeedBusinessLayerTest extends \PHPUnit_Framework_TestCase { $item1->setGuidHash('hi'); $item2 = new Item(); $item2->setGuidHash('yo'); - $return = array( + $return = [ $createdFeed, - array($item1, $item2) - ); + [$item1, $item2] + ]; $this->feedMapper->expects($this->once()) ->method('findByUrlHash') @@ -196,10 +196,10 @@ class FeedBusinessLayerTest extends \PHPUnit_Framework_TestCase { $item1->setGuidHash('hi'); $item2 = new Item(); $item2->setGuidHash('yo'); - $return = array( + $return = [ $createdFeed, - array($item1, $item2) - ); + [$item1, $item2] + ]; $this->feedMapper->expects($this->once()) ->method('findByUrlHash') @@ -257,13 +257,11 @@ class FeedBusinessLayerTest extends \PHPUnit_Framework_TestCase { $item = new Item(); $item->setGuidHash(md5('hi')); $item->setFeedId(3); - $items = array( - $item - ); + $items = [$item]; $ex = new DoesNotExistException('hi'); - $fetchReturn = array($feed, $items); + $fetchReturn = [$feed, $items]; $this->feedMapper->expects($this->at(0)) ->method('find') @@ -314,9 +312,7 @@ class FeedBusinessLayerTest extends \PHPUnit_Framework_TestCase { $item = new Item(); $item->setGuidHash(md5('hi')); $item->setFeedId(3); - $items = array( - $item - ); + $items = [$item]; $this->feedMapper->expects($this->any()) ->method('find') @@ -324,7 +320,7 @@ class FeedBusinessLayerTest extends \PHPUnit_Framework_TestCase { $this->fetcher->expects($this->once()) ->method('fetch') - ->will($this->returnValue(array($feed, $items))); + ->will($this->returnValue([$feed, $items])); $this->feedMapper->expects($this->once()) ->method('update') @@ -387,14 +383,12 @@ class FeedBusinessLayerTest extends \PHPUnit_Framework_TestCase { $item->setGuidHash(md5('hi')); $item->setPubDate(3333); $item->setId(4); - $items = array( - $item - ); + $items = [$item]; $item2 = new Item(); $item2->setPubDate(111); - $fetchReturn = array($feed, $items); + $fetchReturn = [$feed, $items]; $ex = new DoesNotExistException(''); $this->feedMapper->expects($this->at(0)) @@ -499,7 +493,7 @@ class FeedBusinessLayerTest extends \PHPUnit_Framework_TestCase { $feed->setFolderId(0); $feed->setPreventUpdate(true); - $feeds = array($feed); + $feeds = [$feed]; $item = new Item(); $item->setFeedId(3); @@ -514,9 +508,9 @@ class FeedBusinessLayerTest extends \PHPUnit_Framework_TestCase { $item->setUnstarred(); $item->setLastModified($this->time); - $json = $item->toExport(array('feed3' => $feed)); + $json = $item->toExport(['feed3' => $feed]); - $items = array($json); + $items = [$json]; $this->feedMapper->expects($this->once()) ->method('findAllFromUser') @@ -554,7 +548,7 @@ class FeedBusinessLayerTest extends \PHPUnit_Framework_TestCase { $feed->setFolderId(0); $feed->setPreventUpdate(true); - $feeds = array($feed); + $feeds = [$feed]; $item = new Item(); $item->setFeedId(3); @@ -569,11 +563,11 @@ class FeedBusinessLayerTest extends \PHPUnit_Framework_TestCase { $item->setUnstarred(); $item->setLastModified($this->time); - $json = $item->toExport(array('feed3' => $feed)); + $json = $item->toExport(['feed3' => $feed]); $json2 = $json; $json2['feedLink'] = 'http://test.com'; // believe it or not this copies stuff :D - $items = array($json, $json2); + $items = [$json, $json2]; $insertFeed = new Feed(); $insertFeed->setLink('http://owncloud/nofeed'); @@ -666,7 +660,7 @@ class FeedBusinessLayerTest extends \PHPUnit_Framework_TestCase { $feed1->setId(3); $feed2 = new Feed(); $feed2->setId(5); - $feeds = array($feed1, $feed2); + $feeds = [$feed1, $feed2]; $time = $this->time - $this->autoPurgeMinimumInterval; $this->feedMapper->expects($this->once()) @@ -689,7 +683,7 @@ class FeedBusinessLayerTest extends \PHPUnit_Framework_TestCase { $feed1->setId(3); $feed2 = new Feed(); $feed2->setId(5); - $feeds = array($feed1, $feed2); + $feeds = [$feed1, $feed2]; $this->feedMapper->expects($this->once()) ->method('getToDelete') diff --git a/tests/unit/businesslayer/FolderBusinessLayerTest.php b/tests/unit/businesslayer/FolderBusinessLayerTest.php index 62f53100c..bf3cae569 100644 --- a/tests/unit/businesslayer/FolderBusinessLayerTest.php +++ b/tests/unit/businesslayer/FolderBusinessLayerTest.php @@ -33,7 +33,7 @@ class FolderBusinessLayerTest extends \PHPUnit_Framework_TestCase { ->disableOriginalConstructor() ->getMock(); $this->time = 222; - $timeFactory = $this->getMock('TimeFactory', array('getTime')); + $timeFactory = $this->getMock('TimeFactory', ['getTime']); $timeFactory->expects($this->any()) ->method('getTime') ->will($this->returnValue($this->time)); @@ -89,9 +89,7 @@ class FolderBusinessLayerTest extends \PHPUnit_Framework_TestCase { public function testCreateThrowsExWhenFolderNameExists(){ $folderName = 'hihi'; - $rows = array( - array('id' => 1) - ); + $rows = [['id' => 1]]; $this->l10n->expects($this->once()) ->method('t'); @@ -111,7 +109,7 @@ class FolderBusinessLayerTest extends \PHPUnit_Framework_TestCase { $this->folderMapper->expects($this->once()) ->method('findByName') ->with($this->equalTo($folderName)) - ->will($this->returnValue(array())); + ->will($this->returnValue([])); $this->setExpectedException('\OCA\News\BusinessLayer\BusinessLayerValidationException'); $this->folderBusinessLayer->create($folderName, 'john', 3); @@ -158,9 +156,7 @@ class FolderBusinessLayerTest extends \PHPUnit_Framework_TestCase { public function testRenameThrowsExWhenFolderNameExists(){ $folderName = 'hihi'; - $rows = array( - array('id' => 1) - ); + $rows = [['id' => 1]]; $this->l10n->expects($this->once()) ->method('t'); @@ -180,7 +176,7 @@ class FolderBusinessLayerTest extends \PHPUnit_Framework_TestCase { $this->folderMapper->expects($this->once()) ->method('findByName') ->with($this->equalTo($folderName)) - ->will($this->returnValue(array())); + ->will($this->returnValue([])); $this->setExpectedException('\OCA\News\BusinessLayer\BusinessLayerException'); $this->folderBusinessLayer->rename(3, $folderName, 'john'); @@ -227,7 +223,7 @@ class FolderBusinessLayerTest extends \PHPUnit_Framework_TestCase { $folder1->setId(3); $folder2 = new Folder(); $folder2->setId(5); - $feeds = array($folder1, $folder2); + $feeds = [$folder1, $folder2]; $time = $this->time - $this->autoPurgeMinimumInterval; $this->folderMapper->expects($this->once()) @@ -250,7 +246,7 @@ class FolderBusinessLayerTest extends \PHPUnit_Framework_TestCase { $folder1->setId(3); $folder2 = new Folder(); $folder2->setId(5); - $feeds = array($folder1, $folder2); + $feeds = [$folder1, $folder2]; $this->folderMapper->expects($this->once()) ->method('getToDelete') diff --git a/tests/unit/businesslayer/ItemBusinessLayerTest.php b/tests/unit/businesslayer/ItemBusinessLayerTest.php index 770791ce6..1b31963c1 100644 --- a/tests/unit/businesslayer/ItemBusinessLayerTest.php +++ b/tests/unit/businesslayer/ItemBusinessLayerTest.php @@ -35,7 +35,7 @@ class ItemBusinessLayerTest extends \PHPUnit_Framework_TestCase { protected function setUp(){ $this->time = 222; - $timeFactory = $this->getMock('TimeFactory', array('getTime')); + $timeFactory = $this->getMock('TimeFactory', ['getTime']); $timeFactory->expects($this->any()) ->method('getTime') ->will($this->returnValue($this->time)); diff --git a/tests/unit/config/AppConfigTest.php b/tests/unit/config/AppConfigTest.php index 8f91dd338..d785ceea4 100644 --- a/tests/unit/config/AppConfigTest.php +++ b/tests/unit/config/AppConfigTest.php @@ -35,13 +35,8 @@ class AppConfigTest extends \PHPUnit_Framework_TestCase { ->getMock(); $phpVersion = '5.3'; $ownCloudVersion = '6.0.3'; - $installedApps = array( - 'contacts' => '5.3', - 'calendar' => '2.3' - ); - $installedExtensions = array( - 'curl' => '4.3' - ); + $installedApps = ['contacts' => '5.3', 'calendar' => '2.3']; + $installedExtensions = ['curl' => '4.3']; $databaseType = 'oracle'; $this->config = new AppConfig($this->nav, $this->l10n, @@ -56,7 +51,7 @@ class AppConfigTest extends \PHPUnit_Framework_TestCase { public function testNoNavigation() { - $this->config->loadConfig(array()); + $this->config->loadConfig([]); $this->nav->expects($this->never()) ->method('add'); @@ -64,13 +59,13 @@ class AppConfigTest extends \PHPUnit_Framework_TestCase { public function testDefaultNavigation() { - $expected = array( + $expected = [ 'id' => 'news', 'href' => 'news.page.index', 'order' => 10, 'icon' => 'app.svg', 'name' => 'News' - ); + ]; $this->l10n->expects($this->once()) ->method('t') @@ -92,23 +87,23 @@ class AppConfigTest extends \PHPUnit_Framework_TestCase { ->method('add') ->with($this->equalTo($expected)); - $this->config->loadConfig(array( + $this->config->loadConfig([ 'id' => 'news', 'name' => 'News', - 'navigation' => array() - )); + 'navigation' => [] + ]); $this->config->registerNavigation(); } public function testCustomNavigation() { - $expected = array( + $expected = [ 'id' => 'abc', 'href' => 'abc.page.index', 'order' => 1, 'icon' => 'test.svg', 'name' => 'haha' - ); + ]; $this->l10n->expects($this->once()) ->method('t') @@ -130,11 +125,11 @@ class AppConfigTest extends \PHPUnit_Framework_TestCase { ->method('add') ->with($this->equalTo($expected)); - $this->config->loadConfig(array( + $this->config->loadConfig([ 'id' => 'abc', 'name' => 'News', 'navigation' => $expected - )); + ]); $this->config->registerNavigation(); } @@ -143,11 +138,11 @@ class AppConfigTest extends \PHPUnit_Framework_TestCase { * @expectedException \OCA\News\Config\DependencyException */ public function testPHPVersion() { - $this->config->loadConfig(array( - 'dependencies' => array( + $this->config->loadConfig([ + 'dependencies' => [ 'php' => '5.7' - ) - )); + ] + ]); $this->config->testDependencies(); } @@ -156,11 +151,11 @@ class AppConfigTest extends \PHPUnit_Framework_TestCase { * @expectedException \OCA\News\Config\DependencyException */ public function testOwnCloudVersion() { - $this->config->loadConfig(array( - 'dependencies' => array( + $this->config->loadConfig([ + 'dependencies' => [ 'owncloud' => '>=4.5,<=6.0.2' - ) - )); + ] + ]); $this->config->testDependencies(); } @@ -169,15 +164,14 @@ class AppConfigTest extends \PHPUnit_Framework_TestCase { * @expectedException \OCA\News\Config\DependencyException */ public function testAppVersion() { - $this->config->loadConfig(array( - 'dependenc