1 files changed, 35 insertions, 37 deletions

diff --git a/tests/lib/ContactsManagerTest.php b/tests/lib/ContactsManagerTest.php
index 9e8b75fbf4d..4699d894e4b 100644
--- a/tests/lib/ContactsManagerTest.php
+++ b/tests/lib/ContactsManagerTest.php
@@ -14,55 +14,55 @@ class ContactsManagerTest extends \Test\TestCase {
 		$this->cm = new \OC\ContactsManager();
 	}
 
-	public function searchProvider(){
-		$search1 = array(
-			0 => array(
-				'N' => array(0 => '', 1 => 'Jan', 2 => 'Jansen', 3 => '', 4 => '',),
+	public function searchProvider() {
+		$search1 = [
+			0 => [
+				'N' => [0 => '', 1 => 'Jan', 2 => 'Jansen', 3 => '', 4 => '',],
 				'UID' => '04ada7f5-01f9-4309-9c82-6b555b2170ed',
 				'FN' => 'Jan Jansen',
 				'id' => '1',
 				'addressbook-key' => 'simple:1',
-			),
-			0 => array(
-				'N' => array(0 => '', 1 => 'Tom', 2 => 'Peeters', 3 => '', 4 => '',),
+			],
+			0 => [
+				'N' => [0 => '', 1 => 'Tom', 2 => 'Peeters', 3 => '', 4 => '',],
 				'UID' => '04ada7f5-01f9-4309-9c82-2345-2345--6b555b2170ed',
 				'FN' => 'Tom Peeters',
 				'id' => '2',
 				'addressbook-key' => 'simple:1',
-			),
-		);
+			],
+		];
 
-		$search2 = array(
-			0 => array(
-				'N' => array(0 => '', 1 => 'fg', 2 => '', 3 => '', 4 => '',),
+		$search2 = [
+			0 => [
+				'N' => [0 => '', 1 => 'fg', 2 => '', 3 => '', 4 => '',],
 				'UID' => '04ada234h5jh357f5-01f9-4309-9c82-6b555b2170ed',
 				'FN' => 'Jan Rompuy',
 				'id' => '1',
 				'addressbook-key' => 'simple:2',
-			),
-			0 => array(
-				'N' => array(0 => '', 1 => 'fg', 2 => '', 3 => '', 4 => '',),
+			],
+			0 => [
+				'N' => [0 => '', 1 => 'fg', 2 => '', 3 => '', 4 => '',],
 				'UID' => '04ada7f5-01f9-4309-345kj345j9c82-2345-2345--6b555b2170ed',
 				'FN' => 'Tim Peeters',
 				'id' => '2',
 				'addressbook-key' => 'simple:2',
-			),
-		);
+			],
+		];
 
 		$expectedResult =  array_merge($search1, $search2);
-		return array(
-			array(
+		return [
+			[
 				$search1,
 				$search2,
 				$expectedResult
-			)
-		);
+			]
+		];
 	}
 
 	/**
 	 * @dataProvider searchProvider
 	 */
-	public function testSearch($search1, $search2, $expectedResult ){
+	public function testSearch($search1, $search2, $expectedResult) {
 		/** @var \PHPUnit_Framework_MockObject_MockObject|IAddressBook $addressbook */
 		$addressbook1 = $this->getMockBuilder('\OCP\IAddressBook')
 			->disableOriginalConstructor()
@@ -96,7 +96,7 @@ class ContactsManagerTest extends \Test\TestCase {
 	}
 	
 
-	public function testDeleteHavePermission(){
+	public function testDeleteHavePermission() {
 		/** @var \PHPUnit_Framework_MockObject_MockObject|IAddressBook $addressbook */
 		$addressbook = $this->getMockBuilder('\OCP\IAddressBook')
 			->disableOriginalConstructor()
@@ -116,7 +116,7 @@ class ContactsManagerTest extends \Test\TestCase {
 		$this->assertEquals($result, 'returnMe');
 	}
 
-	public function testDeleteNoPermission(){
+	public function testDeleteNoPermission() {
 		/** @var \PHPUnit_Framework_MockObject_MockObject|IAddressBook $addressbook */
 		$addressbook = $this->getMockBuilder('\OCP\IAddressBook')
 			->disableOriginalConstructor()
@@ -134,7 +134,7 @@ class ContactsManagerTest extends \Test\TestCase {
 		$this->assertEquals($result, null);
 	}
 
-	public function testDeleteNoAddressbook(){
+	public function testDeleteNoAddressbook() {
 		/** @var \PHPUnit_Framework_MockObject_MockObject|IAddressBook $addressbook */
 		$addressbook = $this->getMockBuilder('\OCP\IAddressBook')
 			->disableOriginalConstructor()
@@ -146,10 +146,9 @@ class ContactsManagerTest extends \Test\TestCase {
 		$this->cm->registerAddressBook($addressbook);
 		$result = $this->cm->delete(1, 'noaddressbook');
 		$this->assertEquals($result, null);
-
 	}
 
-	public function testCreateOrUpdateHavePermission(){
+	public function testCreateOrUpdateHavePermission() {
 		/** @var \PHPUnit_Framework_MockObject_MockObject|IAddressBook $addressbook */
 		$addressbook = $this->getMockBuilder('\OCP\IAddressBook')
 			->disableOriginalConstructor()
@@ -164,11 +163,11 @@ class ContactsManagerTest extends \Test\TestCase {
 			->willReturn('returnMe');
 
 		$this->cm->registerAddressBook($addressbook);
-		$result = $this->cm->createOrUpdate(array(), $addressbook->getKey());
+		$result = $this->cm->createOrUpdate([], $addressbook->getKey());
 		$this->assertEquals($result, 'returnMe');
 	}
 
-	public function testCreateOrUpdateNoPermission(){
+	public function testCreateOrUpdateNoPermission() {
 		/** @var \PHPUnit_Framework_MockObject_MockObject|IAddressBook $addressbook */
 		$addressbook = $this->getMockBuilder('\OCP\IAddressBook')
 			->disableOriginalConstructor()
@@ -182,12 +181,11 @@ class ContactsManagerTest extends \Test\TestCase {
 			->method('createOrUpdate');
 
 		$this->cm->registerAddressBook($addressbook);
-		$result = $this->cm->createOrUpdate(array(), $addressbook->getKey());
+		$result = $this->cm->createOrUpdate([], $addressbook->getKey());
 		$this->assertEquals($result, null);
-
 	}
 
-	public function testCreateOrUpdateNOAdressbook(){
+	public function testCreateOrUpdateNOAdressbook() {
 		/** @var \PHPUnit_Framework_MockObject_MockObject|IAddressBook $addressbook */
 		$addressbook = $this->getMockBuilder('\OCP\IAddressBook')
 			->disableOriginalConstructor()
@@ -197,16 +195,16 @@ class ContactsManagerTest extends \Test\TestCase {
 			->method('createOrUpdate');
 
 		$this->cm->registerAddressBook($addressbook);
-		$result = $this->cm->createOrUpdate(array(), 'noaddressbook');
+		$result = $this->cm->createOrUpdate([], 'noaddressbook');
 		$this->assertEquals($result, null);
 	}
 
-	public function testIsEnabledIfNot(){
+	public function testIsEnabledIfNot() {
 		$result = $this->cm->isEnabled();
 		$this->assertFalse($result);
 	}
 
-	public function testIsEnabledIfSo(){
+	public function testIsEnabledIfSo() {
 		/** @var \PHPUnit_Framework_MockObject_MockObject|IAddressBook $addressbook */
 		$addressbook = $this->getMockBuilder('\OCP\IAddressBook')
 			->disableOriginalConstructor()
@@ -227,10 +225,10 @@ class ContactsManagerTest extends \Test\TestCase {
 		// setup return for method calls
 		$addressbook->expects($this->any())
 			->method('getKey')
-			->will($this->returnValue('SIMPLE_ADDRESS_BOOK'));
+			->willReturn('SIMPLE_ADDRESS_BOOK');
 		$addressbook->expects($this->any())
 			->method('getDisplayName')
-			->will($this->returnValue('A very simple Addressbook'));
+			->willReturn('A very simple Addressbook');
 
 		// register the address book
 		$this->cm->registerAddressBook($addressbook);