From 160a0dfebaeb21cc75d7166dfbac6d0ef1a51460 Mon Sep 17 00:00:00 2001
From: Bernhard Posselt <dev@bernhard-posselt.com>
Date: Wed, 14 May 2014 17:32:49 +0200
Subject: convert array() to []

---
 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 ++-
 27 files changed, 381 insertions(+), 487 deletions(-)

(limited to 'tests')

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 = '<html>
 			<body>
 				<div id="maincontent">
@@ -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 = '<html>
 			<body>
 				<div id="maincontent">
@@ -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 = '<html>
 			<body>
 				<div id="maincontent">
@@ -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 = '<html/><p>
 			<body>
 				<div id="maincontent">
@@ -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 = '<html>
 			<body>
 				<a href="../a/relative/url.html?a=1#b">link</a>
@@ -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 = '<html>
 			<body>
 				<img src="relative/url.png?a=1&b=2">
@@ -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 = '<html>
 			<body>
 				<img src="http://www.url.com/absolute/url.png">
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(
-			'dependencies' => array(
-				'apps' => 
-					array(
-						'contacts' => '5.3',
-						'calendar' => '>2.3'
-					)
-			)
-		));
+		$this->config->loadConfig([
+			'dependencies' => [
+				'apps' => [
+					'contacts' => '5.3',
+					'calendar' => '>2.3'
+				]
+			]
+		]);
 		$this->config->testDependencies();
 	}
 
@@ -186,14 +180,13 @@ class AppConfigTest extends \PHPUnit_Framework_TestCase {
 	 * @expectedException \OCA\News\Config\DependencyException
 	 */
 	public function testLibsVersion() {
-		$this->config->loadConfig(array(
-			'dependencies' => array(
-				'libs' => 
-					array(
-						'curl' => '>=4.3,<=4.3'
-					)
-			)
-		));
+		$this->config->loadConfig([
+			'dependencies' => [
+				'libs' => [
+					'curl' => '>=4.3,<=4.3'
+				]
+			]
+		]);
 		$this->config->testDependencies();
 	}
 
@@ -202,14 +195,13 @@ class AppConfigTest extends \PHPUnit_Framework_TestCase {
 	 * @expectedException \OCA\News\Config\DependencyException
 	 */
 	public function testLibsExistence() {
-		$this->config->loadConfig(array(
-			'dependencies' => array(
-				'libs' => 
-					array(
-						'dope' => '>=4.3,<=4.3'
-					)
-			)
-		));
+		$this->config->loadConfig([
+			'dependencies' => [
+				'libs' => [
+					'dope' => '>=4.3,<=4.3'
+				]
+			]
+		]);
 		$this->config->testDependencies();
 	}
 
@@ -218,14 +210,13 @@ class AppConfigTest extends \PHPUnit_Framework_TestCase {
 	 * @expectedException \OCA\News\Config\DependencyException
 	 */
 	public function testAppsExistence() {
-		$this->config->loadConfig(array(
-			'dependencies' => array(
-				'apps' => 
-					array(
-						'news' => '>=4.3,<=4.3'
-					)
-			)
-		));
+		$this->config->loadConfig([
+			'dependencies' => [
+				'apps' => [
+					'news' => '>=4.3,<=4.3'
+				]
+			]
+		]);
 		$this->config->testDependencies();
 	}
 
@@ -234,11 +225,11 @@ class AppConfigTest extends \PHPUnit_Framework_TestCase {
 	 * @expectedException \OCA\News\Config\DependencyException
 	 */
 	public function testSupportedDb() {
-		$this->config->loadConfig(array(
-			'databases' => array(
+		$this->config->loadConfig([
+			'databases' => [
 				'pgsql', 'sqlite'
-			)
-		));
+			]
+		]);
 		$this->config->testDependencies();
 	}
 }
\ No newline at end of file
diff --git a/tests/unit/controller/EntityApiSerializerTest.php b/tests/unit/controller/EntityApiSerializerTest.php
index 5541cc3be..68675824b 100644
--- a/tests/unit/controller/EntityApiSerializerTest.php
+++ b/tests/unit/controller/EntityApiSerializerTest.php
@@ -44,7 +44,7 @@ class EntityApiSerializerTest extends \PHPUnit_Framework_TestCase {
 
         $serializer = new EntityApiSerializer('items');
 
-        $result = $serializer->serialize(array($item, $item2));
+        $result = $serializer->serialize([$item, $item2]);
 
         $this->assertTrue($result['items'][0]['unread']);
         $this->assertFalse($result['items'][1]['unread']);
@@ -70,10 +70,10 @@ class EntityApiSerializerTest extends \PHPUnit_Framework_TestCase {
 
         $serializer = new EntityApiSerializer('items');
 
-        $in = array(
-            'items' => array($item, $item2),
+        $in = [
+            'items' => [$item, $item2],
             'test' => 1
-        );
+        ];
 
         $result = $serializer->serialize($in);
 
@@ -86,10 +86,10 @@ class EntityApiSerializerTest extends \PHPUnit_Framework_TestCase {
     public function noEntityNoChange() {
         $serializer = new EntityApiSerializer('items');
 
-        $in = array(
-            'items' => array('hi', '2'),
+        $in = [
+            'items' => ['hi', '2'],
             'test' => 1
-        );
+        ];
 
         $result = $serializer->serialize($in);
 
diff --git a/tests/unit/controller/ExportControllerTest.php b/tests/unit/controller/ExportControllerTest.php
index f41977241..fd3aece97 100644
--- a/tests/unit/controller/ExportControllerTest.php
+++ b/tests/unit/controller/ExportControllerTest.php
@@ -72,11 +72,11 @@ class ExportControllerTest extends \PHPUnit_Framework_TestCase {
 		$this->feedBusinessLayer->expects($this->once())
 			->method('findAll')
 			->with($this->equalTo($this->user))
-			->will($this->returnValue(array()));
+			->will($this->returnValue([]));
 		$this->folderBusinessLayer->expects($this->once())
 			->method('findAll')
 			->with($this->equalTo($this->user))
-			->will($this->returnValue(array()));
+			->will($this->returnValue([]));
 
 		$return = $this->controller->opml();
 		$this->assertTrue($return instanceof TextDownloadResponse);
@@ -96,11 +96,9 @@ class ExportControllerTest extends \PHPUnit_Framework_TestCase {
 		$feed2 = new Feed();
 		$feed2->setId(5);
 		$feed2->setLink('http://gee');
-		$feeds = array($feed1, $feed2);
+		$feeds = [$feed1, $feed2];
 
-		$articles = array(
-			$item1, $item2
-		);
+		$articles = [$item1, $item2];
 
 		$this->feedBusinessLayer->expects($this->once())
 			->method('findAll')
diff --git a/tests/unit/controller/FeedApiControllerTest.php b/tests/unit/controller/FeedApiControllerTest.php
index 79c21af28..6e18d89da 100644
--- a/tests/unit/controller/FeedApiControllerTest.php
+++ b/tests/unit/controller/FeedApiControllerTest.php
@@ -39,7 +39,7 @@ class FeedApiControllerTest extends \PHPUnit_Framework_TestCase {
 
 	protected function setUp() {
 		$this->user = 'tom';
-		$this->loggerParams = array('hi');
+		$this->loggerParams = ['hi'];
 		$this->logger = $this->getMockBuilder(
 			'\OCP\ILogger')
 			->disableOriginalConstructor()
@@ -76,9 +76,7 @@ class FeedApiControllerTest extends \PHPUnit_Framework_TestCase {
 
 
 	public function testIndex() {
-		$feeds = array(
-			new Feed()
-		);
+		$feeds = [new Feed()];
 		$starredCount = 3;
 		$newestItemId = 2;
 
@@ -97,18 +95,16 @@ class FeedApiControllerTest extends \PHPUnit_Framework_TestCase {
 
 		$response = $this->feedAPI->index();
 
-		$this->assertEquals(array(
+		$this->assertEquals([
 			'feeds' => $feeds,
 			'starredCount' => $starredCount,
 			'newestItemId' => $newestItemId
-		), $response);
+		], $response);
 	}
 
 
 	public function testIndexNoNewestItemId() {
-		$feeds = array(
-			new Feed()
-		);
+		$feeds = [new Feed()];
 		$starredCount = 3;
 
 		$this->itemBusinessLayer->expects($this->once())
@@ -126,10 +122,10 @@ class FeedApiControllerTest extends \PHPUnit_Framework_TestCase {
 
 		$response = $this->feedAPI->index();
 
-		$this->assertEquals(array(
+		$this->assertEquals([
 			'feeds' => $feeds,
 			'starredCount' => $starredCount,
-		), $response);
+		], $response);
 	}
 
 
@@ -158,9 +154,7 @@ class FeedApiControllerTest extends \PHPUnit_Framework_TestCase {
 
 
 	public function testCreate() {
-		$feeds = array(
-			new Feed()
-		);
+		$feeds = [new Feed()];
 
 		$this->feedBusinessLayer->expects($this->once())
 			->method('purgeDeleted')
@@ -178,17 +172,15 @@ class FeedApiControllerTest extends \PHPUnit_Framework_TestCase {
 
 		$response = $this->feedAPI->create('url', 3);
 
-		$this->assertEquals(array(
+		$this->assertEquals([
 			'feeds' => $feeds,
 			'newestItemId' => 3
-		), $response);
+		], $response);
 	}
 
 
 	public function testCreateNoItems() {
-		$feeds = array(
-			new Feed()
-		);
+		$feeds = [new Feed()];
 
 		$this->feedBusinessLayer->expects($this->once())
 			->method('purgeDeleted')
@@ -206,9 +198,9 @@ class FeedApiControllerTest extends \PHPUnit_Framework_TestCase {
 
 		$response = $this->feedAPI->create('ho', 3);
 
-		$this->assertEquals(array(
+		$this->assertEquals([
 			'feeds' => $feeds
-		), $response);
+		], $response);
 	}
 
 
@@ -299,7 +291,7 @@ class FeedApiControllerTest extends \PHPUnit_Framework_TestCase {
 		$feed->setUrl(3);
 		$feed->setId(1);
 		$feed->setUserId('john');
-		$feeds = array($feed);
+		$feeds = [$feed];
 		$this->feedBusinessLayer->expects($this->once())
 			->method('findAllFromAllUsers')
 			->will($this->returnValue($feeds));
diff --git a/tests/unit/controller/FeedControllerTest.php b/tests/unit/controller/FeedControllerTest.php
index ba9d86a8a..b59175468 100644
--- a/tests/unit/controller/FeedControllerTest.php
+++ b/tests/unit/controller/FeedControllerTest.php
@@ -32,6 +32,7 @@ class FeedControllerTest extends \PHPUnit_Framework_TestCase {
 	private $folderBusinessLayer;
 	private $itemBusinessLayer;
 	private $settings;
+	private $exampleResult;
 
 
 	/**
@@ -63,16 +64,22 @@ class FeedControllerTest extends \PHPUnit_Framework_TestCase {
 				$this->itemBusinessLayer,
 				$this->settings,
 				$this->user);
+		$this->exampleResult = [
+			'activeFeed' => [
+				'id' => 0,
+				'type' => FeedType::SUBSCRIPTIONS
+			]
+		];
 	}
 
 
 	public function testIndex(){
-		$result = array(
-			'feeds' => array(
-				array('a feed'),
-			),
+		$result = [
+			'feeds' => [
+				['a feed'],
+			],
 			'starred' => 13
-		);
+		];
 		$this->feedBusinessLayer->expects($this->once())
 			->method('findAll')
 			->with($this->equalTo($this->user))
@@ -93,13 +100,13 @@ class FeedControllerTest extends \PHPUnit_Framework_TestCase {
 
 
 	public function testIndexHighestItemIdExists(){
-		$result = array(
-			'feeds' => array(
-				array('a feed'),
-			),
+		$result = [
+			'feeds' => [
+				['a feed'],
+			],
 			'starred' => 13,
 			'newestItemId' => 5
-		);
+		];
 		$this->feedBusinessLayer->expects($this->once())
 			->method('findAll')
 			->with($this->equalTo($this->user))
@@ -139,12 +146,12 @@ class FeedControllerTest extends \PHPUnit_Framework_TestCase {
 	public function testActive(){
 		$id = 3;
 		$type = FeedType::STARRED;
-		$result = array(
-			'activeFeed' => array(
+		$result = [
+			'activeFeed' => [
 				'id' => $id,
 				'type' => $type
-			)
-		);
+			]
+		];
 
 		$this->activeInitMocks($id, $type);
 
@@ -158,12 +165,8 @@ class FeedControllerTest extends \PHPUnit_Framework_TestCase {
 		$id = 3;
 		$type = FeedType::FEED;
 		$ex = new BusinessLayerException('hiu');
-		$result = array(
-			'activeFeed' => array(
-				'id' => 0,
-				'type' => FeedType::SUBSCRIPTIONS
-			)
-		);
+		$result = $this->exampleResult;
+
 		$this->feedBusinessLayer->expects($this->once())
 			->method('find')
 			->with($this->equalTo($id), $this->equalTo($this->user))
@@ -181,12 +184,8 @@ class FeedControllerTest extends \PHPUnit_Framework_TestCase {
 		$id = 3;
 		$type = FeedType::FOLDER;
 		$ex = new BusinessLayerException('hiu');
-		$result = array(
-			'activeFeed' => array(
-				'id' => 0,
-				'type' => FeedType::SUBSCRIPTIONS
-			)
-		);
+		$result = $this->exampleResult;
+
 		$this->folderBusinessLayer->expects($this->once())
 			->method('find')
 			->with($this->equalTo($id), $this->equalTo($this->user))
@@ -203,12 +202,8 @@ class FeedControllerTest extends \PHPUnit_Framework_TestCase {
 	public function testActiveActiveIsNull(){
 		$id = 3;
 		$type = null;
-		$result = array(
-			'activeFeed' => array(
-				'id' => 0,
-				'type' => FeedType::SUBSCRIPTIONS
-			)
-		);
+		$result = $this->exampleResult;
+
 
 		$this->activeInitMocks($id, $type);
 
@@ -219,10 +214,10 @@ class FeedControllerTest extends \PHPUnit_Framework_TestCase {
 
 
 	public function testCreate(){
-		$result = array(
-			'feeds' => array(new Feed()),
+		$result = [
+			'feeds' => [new Feed()],
 			'newestItemId' => 3
-		);
+		];
 
 		$this->itemBusinessLayer->expects($this->once())
 			->method('getNewestItemId')
@@ -244,9 +239,7 @@ class FeedControllerTest extends \PHPUnit_Framework_TestCase {
 
 
 	public function testCreateNoItems(){
-		$result = array(
-			'feeds' => array(new Feed())
-		);
+		$result = ['feeds' => [new Feed()]];
 
 		$this->feedBusinessLayer->expects($this->once())
 			->method('purgeDeleted')
@@ -333,14 +326,14 @@ class FeedControllerTest extends \PHPUnit_Framework_TestCase {
 		$feed = new Feed();
 		$feed->setId(3);
 		$feed->setUnreadCount(44);
-		$result = array(
-			'feeds' => array(
-				array(
+		$result = [
+			'feeds' => [
+				[
 					'id' => $feed->getId(),
 					'unreadCount' => $feed->getUnreadCount()
-				)
-			)
-		);
+				]
+			]
+		];
 
 		$this->feedBusinessLayer->expects($this->once())
 			->method('update')
@@ -427,9 +420,9 @@ class FeedControllerTest extends \PHPUnit_Framework_TestCase {
 	public function testImport() {
 		$feed = new Feed();
 
-		$expected = array(
-			'feeds' => array($feed)
-		);
+		$expected = [
+			'feeds' => [$feed]
+		];
 
 		$this->feedBusinessLayer->expects($this->once())
 			->method('importArticles')
@@ -452,19 +445,19 @@ class FeedControllerTest extends \PHPUnit_Framework_TestCase {
 
 		$response = $this->controller->import('json');
 
-		$this->assertEquals(array(), $response);
+		$this->assertEquals([], $response);
 	}
 
 
 	public function testReadFeed(){
-		$expected = array(
-			'feeds' => array(
-				array(
+		$expected = [
+			'feeds' => [
+				[
 					'id' => 4,
 					'unreadCount' => 0
-				)
-			)
-		);
+				]
+			]
+		];
 
 		$this->itemBusinessLayer->expects($this->once())
 			->method('readFeed')
diff --git a/tests/unit/controller/FolderApiControllerTest.php b/tests/unit/controller/FolderApiControllerTest.php
index cf23984ce..d3171e397 100644
--- a/tests/unit/controller/FolderApiControllerTest.php
+++ b/tests/unit/controller/FolderApiControllerTest.php
@@ -64,9 +64,7 @@ class FolderApiControllerTest extends \PHPUnit_Framework_TestCase {
 
 
 	public function testIndex() {
-		$folders = array(
-			new Folder()
-		);
+		$folders = [new Folder()];
 
 		$this->folderBusinessLayer->expects($this->once())
 			->method('findAll')
@@ -83,9 +81,7 @@ class FolderApiControllerTest extends \PHPUnit_Framework_TestCase {
 		$folderName = 'test';
 		$folder = new Folder();
 		$folder->setName($folderName);
-		$folders = array(
-			$folder
-		);
+		$folders = [$folder];
 		
 		$this->folderBusinessLayer->expects($this->once())
 			->method('purgeDeleted')
diff --git a/tests/unit/controller/FolderControllerTest.php b/tests/unit/controller/FolderControllerTest.php
index 332b48bbe..af63aa959 100644
--- a/tests/unit/controller/FolderControllerTest.php
+++ b/tests/unit/controller/FolderControllerTest.php
@@ -65,18 +65,13 @@ class FolderControllerTest extends \PHPUnit_Framework_TestCase {
 
 	
 	public function testIndex(){
-		$return = array(
-			new Folder(),
-			new Folder(),
-		);
+		$return = [new Folder(), new Folder()];
 		$this->folderBusinessLayer->expects($this->once())
 					->method('findAll')
 					->will($this->returnValue($return));
 
 		$response = $this->controller->index();
-		$expected = array(
-			'folders' => $return
-		);
+		$expected = ['folders' => $return];
 		$this->assertEquals($expected, $response);
 	}
 
@@ -132,9 +127,7 @@ class FolderControllerTest extends \PHPUnit_Framework_TestCase {
 
 
 	public function testCreate(){
-		$result = array(
-			'folders' => array(new Folder())
-		);
+		$result = ['folders' => [new Folder()]];
 
 		$this->folderBusinessLayer->expects($this->once())
 			->method('purgeDeleted')
@@ -212,9 +205,7 @@ class FolderControllerTest extends \PHPUnit_Framework_TestCase {
 
 
 	public function testRename(){
-		$result = array(
-			'folders' => array(new Folder())
-		);
+		$result = ['folders' => [new Folder()]];
 
 		$this->folderBusinessLayer->expects($this->once())
 			->method('rename')
@@ -277,9 +268,7 @@ class FolderControllerTest extends \PHPUnit_Framework_TestCase {
 	
 	public function testRead(){
 		$feed = new Feed();
-		$expected = array(
-			'feeds' => array($feed)
-		);
+		$expected = ['feeds' => [$feed]];
 
 		$this->itemBusinessLayer->expects($this->once())
 			->method('readFolder')
@@ -289,7 +278,7 @@ class FolderControllerTest extends \PHPUnit_Framework_TestCase {
 		$this->feedBusinessLayer->expects($this->once())
 			->method('findAll')
 			->with($this->equalTo($this->user))
-			->will($this->returnValue(array($feed)));
+			->will($this->returnValue([$feed]));
 
 		$response = $this->controller->read(4, 5);
 		$this->assertEquals($expected, $response);
diff --git a/tests/unit/controller/ItemApiControllerTest.php b/tests/unit/controller/ItemApiControllerTest.php
index 848e00ec3..f78db838b 100644
--- a/tests/unit/controller/ItemApiControllerTest.php
+++ b/tests/unit/controller/ItemApiControllerTest.php
@@ -52,9 +52,7 @@ class ItemApiControllerTest extends \PHPUnit_Framework_TestCase {
 
 
 	public function testIndex() {
-		$items = array(
-			new Item()
-		);
+		$items = [new Item()];
 
 		$this->itemBusinessLayer->expects($this->once())
 			->method('findAll')
@@ -75,9 +73,7 @@ class ItemApiControllerTest extends \PHPUnit_Framework_TestCase {
 
 
 	public function testIndexDefaultBatchSize() {
-		$items = array(
-			new Item()
-		);
+		$items = [new Item()];
 
 		$this->itemBusinessLayer->expects($this->once())
 			->method('findAll')
@@ -98,9 +94,7 @@ class ItemApiControllerTest extends \PHPUnit_Framework_TestCase {
 
 
 	public function testUpdated() {
-		$items = array(
-			new Item()
-		);
+		$items = [new Item()];
 
 		$this->itemBusinessLayer->expects($this->once())
 			->method('findAllNew')
@@ -248,7 +242,7 @@ class ItemApiControllerTest extends \PHPUnit_Framework_TestCase {
 			->with($this->equalTo(4),
 				$this->equalTo(true),
 				$this->equalTo($this->user));
-		$this->itemAPI->readMultiple(array(2, 4));
+		$this->itemAPI->readMultiple([2, 4]);
 	}
 
 
@@ -261,7 +255,7 @@ class ItemApiControllerTest extends \PHPUnit_Framework_TestCase {
 			->with($this->equalTo(4),
 				$this->equalTo(true),
 				$this->equalTo($this->user));
-		$this->itemAPI->readMultiple(array(2, 4));
+		$this->itemAPI->readMultiple([2, 4]);
 	}
 
 
@@ -276,21 +270,21 @@ class ItemApiControllerTest extends \PHPUnit_Framework_TestCase {
 			->with($this->equalTo(4),
 				$this->equalTo(false),
 				$this->equalTo($this->user));
-		$this->itemAPI->unreadMultiple(array(2, 4));
+		$this->itemAPI->unreadMultiple([2, 4]);
 	}
 
 
 	public function testStarMultiple() {
-		$ids = array(
-					array(
+		$ids = [
+					[
 						'feedId' => 2,
 						'guidHash' => 'a'
-					),
-					array(
+					],
+					[
 						'feedId' => 4,
 						'guidHash' => 'b'
-					)
-				);
+					]
+				];
 
 		$this->itemBusinessLayer->expects($this->at(0))
 			->method('star')
@@ -309,16 +303,16 @@ class ItemApiControllerTest extends \PHPUnit_Framework_TestCase {
 
 
 	public function testStarMultipleDoesntCareAboutException() {
-		$ids = array(
-					array(
+		$ids = [
+					[
 						'feedId' => 2,
 						'guidHash' => 'a'
-					),
-					array(
+					],
+					[
 						'feedId' => 4,
 						'guidHash' => 'b'
-					)
-				);
+					]
+				];
 
 		$this->itemBusinessLayer->expects($this->at(0))
 			->method('star')
@@ -334,16 +328,16 @@ class ItemApiControllerTest extends \PHPUnit_Framework_TestCase {
 
 
 	public function testUnstarMultiple() {
-		$ids = array(
-					array(
+		$ids = [
+					[
 						'feedId' => 2,
 						'guidHash' => 'a'
-					),
-					array(
+					],
+					[
 						'feedId' => 4,
 						'guidHash' => 'b'
-					)
-				);
+					]
+				];
 
 		$this->itemBusinessLayer->expects($this->at(0))
 			->method('star')
diff --git a/tests/unit/controller/ItemControllerTest.php b/tests/unit/controller/ItemControllerTest.php
index 7017d52e4..b4f87a0e9 100644
--- a/tests/unit/controller/ItemControllerTest.php
+++ b/tests/unit/controller/ItemControllerTest.php
@@ -172,9 +172,7 @@ class ItemControllerTest extends \PHPUnit_Framework_TestCase {
 	public function testReadAll(){
 		$feed = new Feed();
 
-		$expected = array(
-			'feeds' => array($feed)
-		);
+		$expected = ['feeds' => [$feed]];
 
 		$this->itemBusinessLayer->expects($this->once())
 			->method('readAll')
@@ -183,7 +181,7 @@ class ItemControllerTest extends \PHPUnit_Framework_TestCase {
 		$this->feedBusinessLayer->expects($this->once())
 			->method('findAll')
 			->with($this->equalTo($this->user))
-			->will($this->returnValue(array($feed)));
+			->will($this->returnValue([$feed]));
 
 		$response = $this->controller->readAll(5);
 		$this->assertEquals($expected, $response);
@@ -213,13 +211,13 @@ class ItemControllerTest extends \PHPUnit_Framework_TestCase {
 
 
 	public function testIndex(){
-		$feeds = array(new Feed());
-		$result = array(
-			'items' => array(new Item()),
+		$feeds = [new Feed()];
+		$result = [
+			'items' => [new Item()],
 			'feeds' => $feeds,
 			'newestItemId' => $this->newestItemId,
 			'starred' => 3111
-		);
+		];
 
 		$this->itemsApiExpects(2, FeedType::FEED);
 
@@ -255,9 +253,7 @@ class ItemControllerTest extends \PHPUnit_Framework_TestCase {
 
 
 	public function testItemsOffsetNotZero(){
-		$result = array(
-			'items' => array(new Item())
-		);
+		$result = ['items' => [new Item()]];
 
 		$this->itemsApiExpects(2, FeedType::FEED);
 
@@ -288,18 +284,18 @@ class ItemControllerTest extends \PHPUnit_Framework_TestCase {
 			->will($this->throwException(new BusinessLayerException('')));
 
 		$response = $this->controller->index(FeedType::FEED, 2, 3);
-		$this->assertEquals(array(), $response);
+		$this->assertEquals([], $response);
 	}
 
 
 	public function testNewItems(){
-		$feeds = array(new Feed());
-		$result = array(
-			'items' => array(new Item()),
+		$feeds = [new Feed()];
+		$result = [
+			'items' => [new Item()],
 			'feeds' => $feeds,
 			'newestItemId' => $this->newestItemId,
 			'starred' => 3111
-		);
+		];
 
 		$this->settings->expects($this->once())
 			->method('getUserValue')
@@ -352,7 +348,7 @@ class ItemControllerTest extends \PHPUnit_Framework_TestCase {
 			->will($this->throwException(new BusinessLayerException('')));
 
 		$response = $this->controller->newItems(FeedType::FEED, 2, 3);
-		$this->assertEquals(array(), $response);
+		$this->assertEquals([], $response);
 	}
 
 
diff --git a/tests/unit/controller/JSONHttpErrorTest.php b/tests/unit/controller/JSONHttpErrorTest.php
index 135095e1f..dfcbd202e 100644
--- a/tests/unit/controller/JSONHttpErrorTest.php
+++ b/tests/unit/controller/JSONHttpErrorTest.php
@@ -23,7 +23,7 @@ class JSONHttpErrorTest extends \PHPUnit_Framework_TestCase {
         $ex = new \Exception('hi');
         $result = JSONHttpError::error($ex, 3);
 
-        $this->assertEquals(array('message' => 'hi'), $result->getData());
+        $this->assertEquals(['message' => 'hi'], $result->getData());
         $this->assertEquals(3, $result->getStatus());
     }
 
diff --git a/tests/unit/controller/PageControllerTest.php b/tests/unit/controller/PageControllerTest.php
index ef3384431..d4c53e468 100644
--- a/tests/unit/controller/PageControllerTest.php
+++ b/tests/unit/controller/PageControllerTest.php
@@ -57,11 +57,11 @@ class PageControllerTest extends \PHPUnit_Framework_TestCase {
 
 
 	public function testSettings() {
-		$result = array(
+		$result = [
 			'showAll' => true,
 			'compact' => true,
 			'language' => 'de'
-		);
+		];
 
 		$this->l10n->expects($this->once())
 			->method('getLanguageCode')
diff --git a/tests/unit/db/FeedMapperTest.php b/tests/unit/db/FeedMapperTest.php
index 607255fde..c3b276ba6 100644
--- a/tests/unit/db/FeedMapperTest.php
+++ b/tests/unit/db/FeedMapperTest.php
@@ -30,10 +30,7 @@ class FeedMapperTest extends \OCP\AppFramework\Db\MapperTestUtility {
 		$feed1 = new Feed();
 		$feed2 = new Feed();
 
-		$this->feeds = array(
-			$feed1,
-			$feed2
-		);
+		$this->feeds = [$feed1, $feed2];
 		$this->user = 'herman';
 	}
 
@@ -41,9 +38,9 @@ class FeedMapperTest extends \OCP\AppFramework\Db\MapperTestUtility {
 	public function testFind(){
 		$userId = 'john';
 		$id = 3;
-		$rows = array(
-		  array('id' => $this->feeds[0]->getId()),
-		);
+		$rows = [
+		  ['id' => $this->feeds[0]->getId()],
+		];
 		$sql = 'SELECT `feeds`.*, COUNT(`items`.`id`) AS `unread_count` ' .
 			'FROM `*PREFIX*news_feeds` `feeds` ' .
 			'LEFT JOIN `*PREFIX*news_items` `items` ' .
@@ -56,7 +53,7 @@ class FeedMapperTest extends \OCP\AppFramework\Db\MapperTestUtility {
 		        	'`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];
 		$this->setMapperResult($sql, $params, $rows);
 
 		$result = $this->mapper->find($id, $userId);
@@ -80,7 +77,7 @@ class FeedMapperTest extends \OCP\AppFramework\Db\MapperTestUtility {
 		        	'`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];
 		$this->setMapperResult($sql, $params);
 
 		$this->setExpectedException('\OCP\AppFramework\Db\DoesNotExistException');
@@ -91,10 +88,10 @@ class FeedMapperTest extends \OCP\AppFramework\Db\MapperTestUtility {
 	public function testFindMoreThanOneResultFound(){
 		$userId = 'john';
 		$id = 3;
-		$rows = array(
-			array('id' => $this->feeds[0]->getId()),
-			array('id' => $this->feeds[1]->getId())
-		);
+		$rows = [
+			['id' => $this->feeds[0]->getId()],
+			['id' => $this->feeds[1]->getId()]
+		];
 		$sql = 'SELECT `feeds`.*, COUNT(`items`.`id`) AS `unread_count` ' .
 			'FROM `*PREFIX*news_feeds` `feeds` ' .
 			'LEFT JOIN `*PREFIX*news_items` `items` ' .
@@ -107,7 +104,7 @@ class FeedMapperTest extends \OCP\AppFramework\Db\MapperTestUtility {
 		        	'`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];
 		$this->setMapperResult($sql, $params, $rows);
 
 		$this->setExpectedException('\OCP\AppFramework\Db\MultipleObjectsReturnedException');
@@ -116,10 +113,10 @@ class FeedMapperTest extends \OCP\AppFramework\Db\MapperTestUtility {
 
 
 	public function testFindAll(){
-		$rows = array(
-			array('id' => $this->feeds[0]->getId()),
-			array('id' => $this->feeds[1]->getId())
-		);
+		$rows = [
+			['id' => $this->feeds[0]->getId()],
+			['id' => $this->feeds[1]->getId()]
+		];
 		$sql = 'SELECT `feeds`.*, COUNT(`items`.`id`) AS `unread_count` ' .
 			'FROM `*PREFIX*news_feeds` `feeds` ' .
 			'LEFT OUTER JOIN `*PREFIX*news_folders` `folders` '.
@@ -141,7 +138,7 @@ class FeedMapperTest extends \OCP\AppFramework\Db\MapperTestUtility {
 				'`feeds`.`favicon_link`, `feeds`.`added`, `feeds`.`articles_per_update`,'.
 				'`feeds`.`folder_id`, `feeds`.`prevent_update`, `feeds`.`deleted_at`';
 
-		$this->setMapperResult($sql, array(), $rows);
+		$this->setMapperResult($sql, [], $rows);
 
 		$result = $this->mapper->findAll();
 		$this->assertEquals($this->feeds, $result);
@@ -150,10 +147,10 @@ class FeedMapperTest extends \OCP\AppFramework\Db\MapperTestUtility {
 
 	public function testFindAllFromUser(){
 		$userId = 'john';
-		$rows = array(
-			array('id' => $this->feeds[0]->getId()),
-			array('id' => $this->feeds[1]->getId())
-		);
+		$rows = [
+			['id' => $this->feeds[0]->getId()],
+			['id' => $this->feeds[1]->getId()]
+		];
 		$sql = 'SELECT `feeds`.*, COUNT(`items`.`id`) AS `unread_count` ' .
 			'FROM `*PREFIX*news_feeds` `feeds` ' .
 			'LEFT OUTER JOIN `*PREFIX*news_folders` `folders` '.
@@ -175,8 +172,7 @@ class FeedMapperTest extends \OCP\AppFramework\Db\MapperTestUtility {
 				'`feeds`.`url`, `feeds`.`title`, `feeds`.`link`,'.
 				'`feeds`.`favicon_link`, `feeds`.`added`, `feeds`.`articles_per_update`,'.
 				'`feeds`.`folder_id`, `feeds`.`prevent_update`, `feeds`.`deleted_at`';
-		$this->setMapperResult($sql,
-			array($userId), $rows);
+		$this->setMapperResult($sql, [$userId], $rows);
 
 		$result = $this->mapper->findAllFromUser($userId);
 		$this->assertEquals($this->feeds, $result);
@@ -185,9 +181,7 @@ class FeedMapperTest extends \OCP\AppFramework\Db\MapperTestUtility {
 
 	public function testFindByUrlHash(){
 		$urlHash = md5('hihi');
-		$row = array(
-			array('id' => $this->feeds[0]->getId()),
-		);
+		$row = [['id' => $this->feeds[0]->getId()]];
 		$sql = 'SELECT `feeds`.*, COUNT(`items`.`id`) AS `unread_count` ' .
 			'FROM `*PREFIX*news_feeds` `feeds` ' .
 			'LEFT JOIN `*PREFIX*news_items` `items` ' .
@@ -200,8 +194,7 @@ class FeedMapperTest extends \OCP\AppFramework\Db\MapperTestUtility {
 		        	'`feeds`.`url`, `feeds`.`title`, `feeds`.`link`,'.
 		        	'`feeds`.`favicon_link`, `feeds`.`added`, `feeds`.`articles_per_update`,'.
 		        	'`feeds`.`folder_id`, `feeds`.`prevent_update`, `feeds`.`deleted_at`';
-		$this->setMapperResult($sql,
-			array($urlHash, $this->user), $row);
+		$this->setMapperResult($sql, [$urlHash, $this->user], $row);
 
 		$result = $this->mapper->findByUrlHash($urlHash, $this->user);
 		$this->assertEquals($this->feeds[0], $result);
@@ -222,8 +215,7 @@ class FeedMapperTest extends \OCP\AppFramework\Db\MapperTestUtility {
 		        	'`feeds`.`url`, `feeds`.`title`, `feeds`.`link`,'.
 		        	'`feeds`.`favicon_link`, `feeds`.`added`, `feeds`.`articles_per_update`,'.
 		        	'`feeds`.`folder_id`, `feeds`.`prevent_update`, `feeds`.`deleted_at`';
-		$this->setMapperResult($sql,
-			array($urlHash, $this->user));
+		$this->setMapperResult($sql, [$urlHash, $this->user]);
 
 		$this->setExpectedException('\OCP\AppFramework\Db\DoesNotExistException');
 		$this->mapper->findByUrlHash($urlHash, $this->user);
@@ -232,10 +224,10 @@ class FeedMapperTest extends \OCP\AppFramework\Db\MapperTestUtility {
 
 	public function testFindByUrlHashMoreThanOneResultFound(){
 		$urlHash = md5('hihi');
-		$rows = array(
-			array('id' => $this->feeds[0]->getId()),
-			array('id' => $this->feeds[1]->getId())
-		);
+		$rows = [
+			['id' => $this->feeds[0]->getId()],
+			['id' => $this->feeds[1]->getId()]
+		];
 		$sql = 'SELECT `feeds`.*, COUNT(`items`.`id`) AS `unread_count` ' .
 			'FROM `*PREFIX*news_feeds` `feeds` ' .
 			'LEFT JOIN `*PREFIX*news_items` `items` ' .
@@ -248,8 +240,7 @@ class FeedMapperTest extends \OCP\AppFramework\Db\MapperTestUtility {
 		        	'`feeds`.`url`, `feeds`.`title`, `feeds`.`link`,'.
 		        	'`feeds`.`favicon_link`, `feeds`.`added`, `feeds`.`articles_per_update`,'.
 		        	'`feeds`.`folder_id`, `feeds`.`prevent_update`, `feeds`.`deleted_at`';
-		$this->setMapperResult($sql,
-			array($urlHash, $this->user), $rows);
+		$this->setMapperResult($sql, [$urlHash, $this->user], $rows);
 
 		$this->setExpectedException('\OCP\AppFramework\Db\MultipleObjectsReturnedException');
 		$this->mapper->findByUrlHash($urlHash, $this->user);
@@ -261,15 +252,13 @@ class FeedMapperTest extends \OCP\AppFramework\Db\MapperTestUtility {
 		$feed->setId(3);
 
 		$sql = 'DELETE FROM `*PREFIX*news_feeds` WHERE `id` = ?';
-		$arguments = array($feed->getId());
+		$arguments = [$feed->getId()];
 
 		$sql2 = 'DELETE FROM `*PREFIX*news_items` WHERE `feed_id` = ?';
-		$arguments2 = array($feed->getId());
+		$arguments2 = [$feed->getId()];
 
-		$pdoResult = $this->getMock('Result',
-			array('fetchRow'));
-		$pdoResult->expects($this->any())
-			->method('fetchRow');
+		$pdoResult = $this->getMock('Result', ['fetch']);
+		$pdoResult->expects($this->any())->method('fetch');
 
 		$this->setMapperResult($sql, $arguments);
 		$this->setMapperResult($sql2, $arguments2);
@@ -280,15 +269,15 @@ class FeedMapperTest extends \OCP\AppFramework\Db\MapperTestUtility {
 
 
 	public function testGetPurgeDeleted(){
-		$rows = array(
-			array('id' => $this->feeds[0]->getId()),
-			array('id' => $this->feeds[1]->getId())
-		);
+		$rows = [
+			['id' => $this->feeds[0]->getId()],
+			['id' => $this->feeds[1]->getId()]
+		];
 		$deleteOlderThan = 110;
 		$sql = 'SELECT * FROM `*PREFIX*news_feeds` ' .
 			'WHERE `deleted_at` > 0 ' .
 			'AND `deleted_at` < ? ';
-		$this->setMapperResult($sql, array($deleteOlderThan), $rows);
+		$this->setMapperResult($sql, [$deleteOlderThan], $rows);
 		$result = $this->mapper->getToDelete($deleteOlderThan);
 
 		$this->assertEquals($this->feeds, $result);
@@ -296,16 +285,16 @@ class FeedMapperTest extends \OCP\AppFramework\Db\MapperTestUtility {
 
 
 	public function testGetPurgeDeletedFromUser(){
-		$rows = array(
-			array('id' => $this->feeds[0]->getId()),
-			array('id' => $this->feeds[1]->getId())
-		);
+		$rows = [
+			['id' => $this->feeds[0]->getId()],
+			['id' => $this->feeds[1]->getId()]
+		];
 		$deleteOlderThan = 110;
 		$sql = 'SELECT * FROM `*PREFIX*news_feeds` ' .
 			'WHERE `deleted_at` > 0 ' .
 			'AND `deleted_at` < ? ' .
 			'AND `user_id` = ?';
-		$this->setMapperResult($sql, array($deleteOlderThan, $this->user), $rows);
+		$this->setMapperResult($sql, [$deleteOlderThan, $this->user], $rows);
 		$result = $this->mapper->getToDelete($deleteOlderThan, $this->user);
 
 		$this->assertEquals($this->feeds, $result);
@@ -313,15 +302,15 @@ class FeedMapperTest extends \OCP\AppFramework\Db\MapperTestUtility {
 
 
 	public function testGetAllPurgeDeletedFromUser(){
-		$rows = array(
-			array('id' => $this->feeds[0]->getId()),
-			array('id' => $this->feeds[1]->getId())
-		);
+		$rows = [
+			['id' => $this->feeds[0]->getId()],
+			['id' => $this->feeds[1]->getId()]
+		];
 
 		$sql = 'SELECT * FROM `*PREFIX*news_feeds` ' .
 			'WHERE `deleted_at` > 0 ' .
 			'AND `user_id` = ?';
-		$this->setMapperResult($sql, array($this->user), $rows);
+		$this->setMapperResult($sql, [$this->user], $rows);
 		$result = $this->mapper->getToDelete(null, $this->user);
 
 		$this->assertEquals($this->feeds, $result);
@@ -332,7 +321,7 @@ class FeedMapperTest extends \OCP\AppFramework\Db\MapperTestUtility {
 		$userId = 'john';
 		$sql = 'DELETE FROM `*PREFIX*news_feeds` WHERE `user_id` = ?';
 
-		$this->setMapperResult($sql, array($userId));
+		$this->setMapperResult($sql, [$userId]);
 
 		$this->mapper->deleteUser($userId);
 	}
diff --git a/tests/unit/db/FeedTest.php b/tests/unit/db/FeedTest.php
index 8e627c753..6ebe27732 100644
--- a/tests/unit/db/FeedTest.php
+++ b/tests/unit/db/FeedTest.php
@@ -30,7 +30,7 @@ class FeedTest extends \PHPUnit_Framework_TestCase {
 		$feed->setUnreadCount(321);
 		$feed->setLink('https://google');
 
-		$this->assertEquals(array(
+		$this->assertEquals([
 			'id' => 3,
 			'url' => 'http://google',
 			'title' => 'title',
@@ -39,7 +39,7 @@ class FeedTest extends \PHPUnit_Framework_TestCase {
 			'folderId' => 1,
 			'unreadCount' => 321,
 			'link' => 'https://google'
-			), $feed->toAPI());
+			], $feed->toAPI());
 	}
 
 
diff --git a/tests/unit/db/FolderMapperTest.php b/tests/unit/db/FolderMapperTest.php
index 359d63894..192b303c9 100644
--- a/tests/unit/db/FolderMapperTest.php
+++ b/tests/unit/db/FolderMapperTest.php
@@ -31,25 +31,24 @@ class FolderMapperTest extends \OCP\AppFramework\Db\MapperTestUtility {
 		$folder1 = new Folder();
 		$folder2 = new Folder();
 
-		$this->folders = array(
-			$folder1,
-			$folder2
-		);
+		$this->folders = [$folder1, $folder2];
 		$this->user = 'hh';
+		$this->twoRows = [
+			['id' => $this->folders[0]->getId()],
+			['id' => $this->folders[1]->getId()]
+		];
 	}
 
 
 	public function testFind(){
 		$userId = 'john';
 		$id = 3;
-		$rows = array(
-		  array('id' => $this->folders[0]->getId()),
-		);
+		$rows = [['id' => $this->folders[0]->getId()]];
 		$sql = 'SELECT * FROM `*PREFIX*news_folders` ' .
 			'WHERE `id` = ? ' .
 			'AND `user_id` = ?';
 			
-		$this->setMapperResult($sql, array($id, $userId), $rows);
+		$this->setMapperResult($sql, [$id, $userId], $rows);
 		
 		$result = $this->folderMapper->find($id, $userId);
 		$this->assertEquals($this->folders[0], $result);
@@ -64,7 +63,7 @@ class FolderMapperTest extends \OCP\AppFramework\Db\MapperTestUtility {
 			'WHERE `id` = ? ' .
 			'AND `user_id` = ?';
 			
-		$this->setMapperResult($sql, array($id, $userId));
+		$this->setMapperResult($sql, [$id, $userId]);
 		
 		$this->setExpectedException('\OCP\AppFramework\Db\DoesNotExistException');
 		$this->folderMapper->find($id, $userId);	
@@ -74,15 +73,12 @@ class FolderMapperTest extends \OCP\AppFramework\Db\MapperTestUtility {
 	public function testFindMoreThanOneResultFound(){
 		$userId = 'john';
 		$id = 3;
-		$rows = array(
-			array('id' => $this->folders[0]->getId()),
-			array('id' => $this->folders[1]->getId())
-		);
+		$rows = $this->twoRows;
 		$sql = 'SELECT * FROM `*PREFIX*news_folders` ' .
 			'WHERE `id` = ? ' .
 			'AND `user_id` = ?';
 		
-		$this->setMapperResult($sql, array($id, $userId), $rows);
+		$this->setMapperResult($sql, [$id, $userId], $rows);
 		
 		$this->setExpectedException('\OCP\AppFramework\Db\MultipleObjectsReturnedException');
 		$this->folderMapper->find($id, $userId);
@@ -92,15 +88,12 @@ class FolderMapperTest extends \OCP\AppFramework\Db\MapperTestUtility {
 
 	public function testFindAllFromUser(){
 		$userId = 'john';
-		$rows = array(
-			array('id' => $this->folders[0]->getId()),
-			array('id' => $this->folders[1]->getId())
-		);
+		$rows = $this->twoRows;
 		$sql = 'SELECT * FROM `*PREFIX*news_folders` ' .
 			'WHERE `user_id` = ? ' .
 			'AND `deleted_at` = 0';
 		
-		$this->setMapperResult($sql, array($userId), $rows);
+		$this->setMapperResult($sql, [$userId], $rows);
 		
 		$result = $this->folderMapper->findAllFromUser($userId);
 		$this->assertEquals($this->folders, $result);
@@ -110,15 +103,12 @@ class FolderMapperTest extends \OCP\AppFramework\Db\MapperTestUtility {
 	public function testFindByName(){
 		$folderName = 'heheh';
 		$userId = 'john';
-		$rows = array(
-			array('id' => $this->folders[0]->getId()),
-			array('id' => $this->folders[1]->getId())
-		);
+		$rows = $this->twoRows;
 		$sql = 'SELECT * FROM `*PREFIX*news_folders` ' .
 			'WHERE `name` = ? ' .
 			'AND `user_id` = ?';
 		
-		$this->setMapperResult($sql, array($folderName, $userId), $rows);
+		$this->setMapperResult($sql, [$folderName, $userId], $rows);
 		
 		$result = $this->folderMapper->findByName($folderName, $userId);
 		$this->assertEquals($this->folders, $result);
@@ -130,13 +120,13 @@ class FolderMapperTest extends \OCP\AppFramework\Db\MapperTestUtility {
 		$folder->setId(3);
 
 		$sql = 'DELETE FROM `*PREFIX*news_folders` WHERE `id` = ?';
-		$arguments = array($folder->getId());
+		$arguments = [$folder->getId()];
 
 		$sql2 = 'DELETE FROM `*PREFIX*news_feeds` WHERE `folder_id` = ?';
 
 		$sql3 = 'DELETE FROM `*PREFIX*news_items` WHERE `feed_id` NOT IN '.
 			'(SELECT `feeds`.`id` FROM `*PREFIX*news_feeds` `feeds`)';
-		$arguments2 = array($folder->getId());
+		$arguments2 = [$folder->getId()];
 
 		$this->setMapperResult($sql, $arguments);
 		$this->setMapperResult($sql2, $arguments2);
@@ -147,15 +137,12 @@ class FolderMapperTest extends \OCP\AppFramework\Db\MapperTestUtility {
 
 
 	public function testGetPurgeDeleted(){
-		$rows = array(
-			array('id' => $this->folders[0]->getId()),
-			array('id' => $this->folders[1]->getId())
-		);
+		$rows = $this->twoRows;
 		$deleteOlderThan = 110;
 		$sql = 'SELECT * FROM `*PREFIX*news_folders` ' .
 			'WHERE `deleted_at` > 0 ' .
 			'AND `deleted_at` < ? ';
-		$this->setMapperResult($sql, array($deleteOlderThan), $rows);
+		$this->setMapperResult($sql, [$deleteOlderThan], $rows);
 		$result = $this->folderMapper->getToDelete($deleteOlderThan);
 
 		$this->assertEquals($this->folders, $result);
@@ -164,16 +151,13 @@ class FolderMapperTest extends \OCP\AppFramework\Db\MapperTestUtility {
 
 
 	public function testGetPurgeDeletedUser(){
-		$rows = array(
-			array('id' => $this->folders[0]->getId()),
-			array('id' => $this->folders[1]->getId())
-		);
+		$rows = $this->twoRows;
 		$deleteOlderThan = 110;
 		$sql = 'SELECT * FROM `*PREFIX*news_folders` ' .
 			'WHERE `deleted_at` > 0 ' .
 			'AND `deleted_at` < ? ' .
 			'AND `user_id` = ?';
-		$this->setMapperResult($sql, array($deleteOlderThan, $this->user), $rows);
+		$this->setMapperResult($sql, [$deleteOlderThan, $this->user], $rows);
 		$result = $this->folderMapper->getToDelete($deleteOlderThan, $this->user);
 
 		$this->assertEquals($this->folders, $result);
@@ -181,15 +165,12 @@ class FolderMapperTest extends \OCP\AppFramework\Db\MapperTestUtility {
 
 
 	public function testGetAllPurgeDeletedUser(){
-		$rows = array(
-			array('id' => $this->folders[0]->getId()),
-			array('id' => $this->folders[1]->getId())
-		);
+		$rows = $this->twoRows;
 
 		$sql = 'SELECT * FROM `*PREFIX*news_folders` ' .
 			'WHERE `deleted_at` > 0 ' .
 			'AND `user_id` = ?';
-		$this->setMapperResult($sql, array($this->user), $rows);
+		$this->setMapperResult($sql, [$this->user], $rows);
 		$result = $this->folderMapper->getToDelete(null, $this->user);
 
 		$this->assertEquals($this->folders, $result);
@@ -200,7 +181,7 @@ class FolderMapperTest extends \OCP\AppFramework\Db\MapperTestUtility {
 		$userId = 'john';
 		$sql = 'DELETE FROM `*PREFIX*news_folders` WHERE `user_id` = ?';
 
-		$this->setMapperResult($sql, array($userId));
+		$this->setMapperResult($sql, [$userId]);
 
 		$this->folderMapper->deleteUser($userId);
 	}
diff --git a/tests/unit/db/FolderTest.php b/tests/unit/db/FolderTest.php
index 9c59cdeec..e2726e556 100644
--- a/tests/unit/db/FolderTest.php
+++ b/tests/unit/db/FolderTest.php
@@ -24,10 +24,10 @@ class FolderTest extends \PHPUnit_Framework_TestCase {
 		$folder->setId(3);
 		$folder->setName('name');
 
-		$this->assertEquals(array(
+		$this->assertEquals([
 			'id' => 3,
 			'name' => 'name'
-			), $folder->toAPI());
+			], $folder->toAPI());
 	}
 
 }
\ No newline at end of file
diff --git a/tests/unit/db/ItemMapperTest.php b/tests/unit/db/ItemMapperTest.php
index b0a64a16d..15379f485 100644
--- a/tests/unit/db/ItemMapperTest.php
+++ b/tests/unit/db/ItemMapperTest.php
@@ -37,23 +37,20 @@ class ItemMapperTest extends \OCP\AppFramework\Db\MapperTestUtility {
 		$item1 = new Item();
 		$item2 = new Item();
 
-		$this->items = array(
-			$item1,
-			$item2
-		);
+		$this->items = [$item1, $item2];
 
 		$this->userId = 'john';
 		$this->id = 3;
 		$this->folderId = 2;
 
-		$this->row = array(
-			array('id' => $this->items[0]->getId()),
-		);
+		$this->row = [
+			['id' => $this->items[0]->getId()],
+		];
 
-		$this->rows = array(
-			array('id' => $this->items[0]->getId()),
-			array('id' => $this->items[1]->getId())
-		);
+		$this->rows = [
+			['id' => $this->items[0]->getId()],
+			['id' => $this->items[1]->getId()]
+		];
 
 		$this->user = 'john';
 		$this->limit = 10;
@@ -93,7 +90,7 @@ class ItemMapperTest extends \OCP\AppFramework\Db\MapperTestUtility {
 	public function testFind(){
 		$sql = $this->makeSelectQuery('AND `items`.`id` = ? ');
 
-		$this->setMapperResult($sql, array($this->userId, $this->id), $this->row);
+		$this->setMapperResult($sql, [$this->userId, $this->id], $this->row);
 
 		$result = $this->mapper->find($this->id, $this->userId);
 		$this->assertEquals($this->items[0], $result);
@@ -102,9 +99,7 @@ class ItemMapperTest extends \OCP\AppFramework\Db\MapperTestUtility {
 
 	public function testGetStarredCount(){
 		$userId = 'john';
-		$row = array(
-			array('size' => 9)
-		);
+		$row = [['size' => 9]];
 		$sql = 'SELECT COUNT(*) AS size FROM `*PREFIX*news_feeds` `feeds` ' .
 			'JOIN `*PREFIX*news_items` `items` ' .
 				'ON `items`.`feed_id` = `feeds`.`id` ' .
@@ -112,7 +107,7 @@ class ItemMapperTest extends \OCP\AppFramework\Db\MapperTestUtility {
 			'WHERE ((`items`.`status` & ' . StatusFlag::STARRED . ') = '
 				. StatusFlag::STARRED . ')';
 
-		$this->setMapperResult($sql, array($userId), $row);
+		$this->setMapperResult($sql, [$userId], $row);
 
 		$result = $this->mapper->starredCount($userId);
 		$this->assertEquals($row[0]['size'], $result);
@@ -128,7 +123,7 @@ class ItemMapperTest extends \OCP\AppFramework\Db\MapperTestUtility {
 					'WHERE `user_id` = ? ' .
 				') '.
 			'AND `id` <= ?';
-		$params = array(~StatusFlag::UNREAD, $this->updatedSince, $this->user, 3);
+		$params = [~StatusFlag::UNREAD, $this->updatedSince, $this->user, 3];
 		$this->setMapperResult($sql, $params);
 		$this->mapper->readAll(3, $this->updatedSince, $this->user);
 	}
@@ -144,7 +139,7 @@ class ItemMapperTest extends \OCP\AppFramework\Db\MapperTestUtility {
 					'AND `user_id` = ? ' .
 				') '.
 			'AND `id` <= ?';
-		$params = array(~StatusFlag::UNREAD, $this->updatedSince, 3, $this->user, 6);
+		$params = [~StatusFlag::UNREAD, $this->updatedSince, 3, $this->user, 6];
 		$this->setMapperResult($sql, $params);
 		$this->mapper->readFolder(3, 6, $this->updatedSince, $this->user);
 	}
@@ -160,8 +155,7 @@ class ItemMapperTest extends \OCP\AppFramework\Db\MapperTestUtility {
 					'SELECT * FROM `*PREFIX*news_feeds` ' .
 					'WHERE `user_id` = ? ' .
 					'AND `id` = ? ) ';
-		$params = array(~StatusFlag::UNREAD, $this->updatedSince, 3, 6,
-			$this->user, 3);
+		$params = [~StatusFlag::UNREAD, $this->updatedSince, 3, 6, $this->user, 3];
 		$this->setM