Use the short array syntax, everywhere

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>

3 files changed, 83 insertions, 83 deletions

diff --git a/tests/lib/Encryption/Keys/StorageTest.php b/tests/lib/Encryption/Keys/StorageTest.php
index b333729ef87..7e21fe881fc 100644
--- a/tests/lib/Encryption/Keys/StorageTest.php
+++ b/tests/lib/Encryption/Keys/StorageTest.php
@@ -63,7 +63,7 @@ class StorageTest extends TestCase {
 	public function testSetFileKey() {
 		$this->util->expects($this->any())
 			->method('getUidAndFilename')
-			->willReturn(array('user1', '/files/foo.txt'));
+			->willReturn(['user1', '/files/foo.txt']);
 		$this->util->expects($this->any())
 			->method('stripPartialFileExtension')
 			->willReturnArgument(0);
@@ -143,7 +143,7 @@ class StorageTest extends TestCase {
 	public function testSetFileKeySystemWide() {
 		$this->util->expects($this->any())
 			->method('getUidAndFilename')
-			->willReturn(array('user1', '/files/foo.txt'));
+			->willReturn(['user1', '/files/foo.txt']);
 		$this->util->expects($this->any())
 			->method('isSystemWideMountPoint')
 			->willReturn(true);
@@ -164,7 +164,7 @@ class StorageTest extends TestCase {
 	public function testGetFileKeySystemWide() {
 		$this->util->expects($this->any())
 			->method('getUidAndFilename')
-			->willReturn(array('user1', '/files/foo.txt'));
+			->willReturn(['user1', '/files/foo.txt']);
 		$this->util->expects($this->any())
 			->method('stripPartialFileExtension')
 			->willReturnArgument(0);
@@ -272,7 +272,7 @@ class StorageTest extends TestCase {
 	public function testDeleteFileKeySystemWide() {
 		$this->util->expects($this->any())
 			->method('getUidAndFilename')
-			->willReturn(array('user1', '/files/foo.txt'));
+			->willReturn(['user1', '/files/foo.txt']);
 		$this->util->expects($this->any())
 			->method('stripPartialFileExtension')
 			->willReturnArgument(0);
@@ -296,7 +296,7 @@ class StorageTest extends TestCase {
 	public function testDeleteFileKey() {
 		$this->util->expects($this->any())
 			->method('getUidAndFilename')
-			->willReturn(array('user1', '/files/foo.txt'));
+			->willReturn(['user1', '/files/foo.txt']);
 		$this->util->expects($this->any())
 			->method('stripPartialFileExtension')
 			->willReturnArgument(0);
@@ -335,7 +335,7 @@ class StorageTest extends TestCase {
 			->willReturn(true);
 		$this->util->expects($this->any())
 			->method('getUidAndFilename')
-			->willReturnCallback(array($this, 'getUidAndFilenameCallback'));
+			->willReturnCallback([$this, 'getUidAndFilenameCallback']);
 		$this->util->expects($this->any())
 			->method('isSystemWideMountPoint')
 			->willReturnCallback(function($path, $owner) use ($systemWideMountSource, $systemWideMountTarget) {
@@ -366,7 +366,7 @@ class StorageTest extends TestCase {
 			->willReturn(true);
 		$this->util->expects($this->any())
 			->method('getUidAndFilename')
-			->willReturnCallback(array($this, 'getUidAndFilenameCallback'));
+			->willReturnCallback([$this, 'getUidAndFilenameCallback']);
 		$this->util->expects($this->any())
 			->method('isSystemWideMountPoint')
 			->willReturnCallback(function($path, $owner) use ($systemWideMountSource, $systemWideMountTarget) {
@@ -385,37 +385,37 @@ class StorageTest extends TestCase {
 		$path = $args[0];
 		$parts = explode('/', $path);
 
-		return array($parts[1], '/' . implode('/', array_slice($parts, 2)));
+		return [$parts[1], '/' . implode('/', array_slice($parts, 2))];
 	}
 
 	public function dataProviderCopyRename() {
-		return array(
-			array('/user1/files/source.txt', '/user1/files/target.txt', false, false,
-				'/user1/files_encryption/keys/files/source.txt/', '/user1/files_encryption/keys/files/target.txt/'),
-			array('/user1/files/foo/source.txt', '/user1/files/target.txt', false, false,
-				'/user1/files_encryption/keys/files/foo/source.txt/', '/user1/files_encryption/keys/files/target.txt/'),
-			array('/user1/files/source.txt', '/user1/files/foo/target.txt', false, false,
-				'/user1/files_encryption/keys/files/source.txt/', '/user1/files_encryption/keys/files/foo/target.txt/'),
-			array('/user1/files/source.txt', '/user1/files/foo/target.txt', true, true,
-				'/files_encryption/keys/files/source.txt/', '/files_encryption/keys/files/foo/target.txt/'),
-			array('/user1/files/source.txt', '/user1/files/target.txt', false, true,
-				'/user1/files_encryption/keys/files/source.txt/', '/files_encryption/keys/files/target.txt/'),
-			array('/user1/files/source.txt', '/user1/files/target.txt', true, false,
-				'/files_encryption/keys/files/source.txt/', '/user1/files_encryption/keys/files/target.txt/'),
-
-			array('/user2/files/source.txt', '/user1/files/target.txt', false, false,
-				'/user2/files_encryption/keys/files/source.txt/', '/user1/files_encryption/keys/files/target.txt/'),
-			array('/user2/files/foo/source.txt', '/user1/files/target.txt', false, false,
-				'/user2/files_encryption/keys/files/foo/source.txt/', '/user1/files_encryption/keys/files/target.txt/'),
-			array('/user2/files/source.txt', '/user1/files/foo/target.txt', false, false,
-				'/user2/files_encryption/keys/files/source.txt/', '/user1/files_encryption/keys/files/foo/target.txt/'),
-			array('/user2/files/source.txt', '/user1/files/foo/target.txt', true, true,
-				'/files_encryption/keys/files/source.txt/', '/files_encryption/keys/files/foo/target.txt/'),
-			array('/user2/files/source.txt', '/user1/files/target.txt', false, true,
-				'/user2/files_encryption/keys/files/source.txt/', '/files_encryption/keys/files/target.txt/'),
-			array('/user2/files/source.txt', '/user1/files/target.txt', true, false,
-				'/files_encryption/keys/files/source.txt/', '/user1/files_encryption/keys/files/target.txt/'),
-		);
+		return [
+			['/user1/files/source.txt', '/user1/files/target.txt', false, false,
+				'/user1/files_encryption/keys/files/source.txt/', '/user1/files_encryption/keys/files/target.txt/'],
+			['/user1/files/foo/source.txt', '/user1/files/target.txt', false, false,
+				'/user1/files_encryption/keys/files/foo/source.txt/', '/user1/files_encryption/keys/files/target.txt/'],
+			['/user1/files/source.txt', '/user1/files/foo/target.txt', false, false,
+				'/user1/files_encryption/keys/files/source.txt/', '/user1/files_encryption/keys/files/foo/target.txt/'],
+			['/user1/files/source.txt', '/user1/files/foo/target.txt', true, true,
+				'/files_encryption/keys/files/source.txt/', '/files_encryption/keys/files/foo/target.txt/'],
+			['/user1/files/source.txt', '/user1/files/target.txt', false, true,
+				'/user1/files_encryption/keys/files/source.txt/', '/files_encryption/keys/files/target.txt/'],
+			['/user1/files/source.txt', '/user1/files/target.txt', true, false,
+				'/files_encryption/keys/files/source.txt/', '/user1/files_encryption/keys/files/target.txt/'],
+
+			['/user2/files/source.txt', '/user1/files/target.txt', false, false,
+				'/user2/files_encryption/keys/files/source.txt/', '/user1/files_encryption/keys/files/target.txt/'],
+			['/user2/files/foo/source.txt', '/user1/files/target.txt', false, false,
+				'/user2/files_encryption/keys/files/foo/source.txt/', '/user1/files_encryption/keys/files/target.txt/'],
+			['/user2/files/source.txt', '/user1/files/foo/target.txt', false, false,
+				'/user2/files_encryption/keys/files/source.txt/', '/user1/files_encryption/keys/files/foo/target.txt/'],
+			['/user2/files/source.txt', '/user1/files/foo/target.txt', true, true,
+				'/files_encryption/keys/files/source.txt/', '/files_encryption/keys/files/foo/target.txt/'],
+			['/user2/files/source.txt', '/user1/files/target.txt', false, true,
+				'/user2/files_encryption/keys/files/source.txt/', '/files_encryption/keys/files/target.txt/'],
+			['/user2/files/source.txt', '/user1/files/target.txt', true, false,
+				'/files_encryption/keys/files/source.txt/', '/user1/files_encryption/keys/files/target.txt/'],
+		];
 	}
 
 	/**
@@ -432,7 +432,7 @@ class StorageTest extends TestCase {
 
 		$this->util->expects($this->any())
 			->method('getUidAndFilename')
-			->willReturnCallback(array($this, 'getUidAndFilenameCallback'));
+			->willReturnCallback([$this, 'getUidAndFilenameCallback']);
 		$this->util->expects($this->any())
 			->method('isSystemWideMountPoint')
 			->willReturn($systemWideMountPoint);
@@ -460,15 +460,15 @@ class StorageTest extends TestCase {
 			->willReturn(false);
 		$this->view->expects($this->any())
 			->method('mkdir')
-			->willReturnCallback(array($this, 'mkdirCallback'));
+			->willReturnCallback([$this, 'mkdirCallback']);
 
-		$this->mkdirStack = array(
+		$this->mkdirStack = [
 			'/user1/files_encryption/keys/foo',
 			'/user1/files_encryption/keys',
 			'/user1/files_encryption',
-			'/user1');
+			'/user1'];
 
-		self::invokePrivate($this->storage, 'keySetPreparation', array('/user1/files_encryption/keys/foo'));
+		self::invokePrivate($this->storage, 'keySetPreparation', ['/user1/files_encryption/keys/foo']);
 	}
 
 	public function mkdirCallback() {
diff --git a/tests/lib/Encryption/UpdateTest.php b/tests/lib/Encryption/UpdateTest.php
index 28d7ca81163..6328df3dc30 100644
--- a/tests/lib/Encryption/UpdateTest.php
+++ b/tests/lib/Encryption/UpdateTest.php
@@ -121,10 +121,10 @@ class UpdateTest extends TestCase {
 	 * @return array
 	 */
 	public function dataTestUpdate() {
-		return array(
-			array('/user/files/foo', true, ['/user/files/foo/file1.txt', '/user/files/foo/file1.txt'], 2),
-			array('/user/files/test.txt', false, [], 1),
-		);
+		return [
+			['/user/files/foo', true, ['/user/files/foo/file1.txt', '/user/files/foo/file1.txt'], 2],
+			['/user/files/test.txt', false, [], 1],
+		];
 	}
 
 	/**
@@ -168,14 +168,14 @@ class UpdateTest extends TestCase {
 	 * @return array
 	 */
 	public function dataTestPostRename() {
-		return array(
-			array('/test.txt', '/testNew.txt', true),
-			array('/test.txt', '/testNew.txt', false),
-			array('/folder/test.txt', '/testNew.txt', true),
-			array('/folder/test.txt', '/testNew.txt', false),
-			array('/folder/test.txt', '/testNew.txt', true),
-			array('/test.txt', '/folder/testNew.txt', false),
-		);
+		return [
+			['/test.txt', '/testNew.txt', true],
+			['/test.txt', '/testNew.txt', false],
+			['/folder/test.txt', '/testNew.txt', true],
+			['/folder/test.txt', '/testNew.txt', false],
+			['/folder/test.txt', '/testNew.txt', true],
+			['/test.txt', '/folder/testNew.txt', false],
+		];
 	}
 
 
@@ -208,10 +208,10 @@ class UpdateTest extends TestCase {
 	 * @return array
 	 */
 	public function dataTestPostRestore() {
-		return array(
-			array(true),
-			array(false),
-		);
+		return [
+			[true],
+			[false],
+		];
 	}
 
 	/**
diff --git a/tests/lib/Encryption/UtilTest.php b/tests/lib/Encryption/UtilTest.php
index 2c5bd1a80f3..0ac474faa0f 100644
--- a/tests/lib/Encryption/UtilTest.php
+++ b/tests/lib/Encryption/UtilTest.php
@@ -101,7 +101,7 @@ class UtilTest extends TestCase {
 		$this->expectException(\OC\Encryption\Exceptions\EncryptionHeaderKeyExistsException::class);
 
 
-		$header = array('header1' => 1, 'header2' => 2, 'oc_encryption_module' => 'foo');
+		$header = ['header1' => 1, 'header2' => 2, 'oc_encryption_module' => 'foo'];
 
 		$em = $this->createMock(IEncryptionModule::class);
 		$em->expects($this->any())->method('getId')->willReturn('moduleId');
@@ -120,7 +120,7 @@ class UtilTest extends TestCase {
 		$this->userManager
 			->expects($this->any())
 			->method('userExists')
-			->willReturnCallback(array($this, 'isExcludedCallback'));
+			->willReturnCallback([$this, 'isExcludedCallback']);
 
 		$this->assertSame($expected,
 			$this->util->isExcluded($path)
@@ -128,17 +128,17 @@ class UtilTest extends TestCase {
 	}
 
 	public function providePathsForTestIsExcluded() {
-		return array(
-			array('/files_encryption', '', true),
-			array('files_encryption/foo.txt', '', true),
-			array('test/foo.txt', '', false),
-			array('/user1/files_encryption/foo.txt', '', true),
-			array('/user1/files/foo.txt', '', false),
-			array('/keyStorage/user1/files/foo.txt', 'keyStorage', true),
-			array('/keyStorage/files_encryption', '/keyStorage', true),
-			array('keyStorage/user1/files_encryption', '/keyStorage/', true),
+		return [
+			['/files_encryption', '', true],
+			['files_encryption/foo.txt', '', true],
+			['test/foo.txt', '', false],
+			['/user1/files_encryption/foo.txt', '', true],
+			['/user1/files/foo.txt', '', false],
+			['/keyStorage/user1/files/foo.txt', 'keyStorage', true],
+			['/keyStorage/files_encryption', '/keyStorage', true],
+			['keyStorage/user1/files_encryption', '/keyStorage/', true],
 
-		);
+		];
 	}
 
 	public function isExcludedCallback() {
@@ -160,15 +160,15 @@ class UtilTest extends TestCase {
 	}
 
 	public function dataTestIsFile() {
-		return array(
-			array('/user/files/test.txt', true),
-			array('/user/files', true),
-			array('/user/files_versions/test.txt', false),
-			array('/user/foo/files/test.txt', false),
-			array('/files/foo/files/test.txt', false),
-			array('/user', false),
-			array('/user/test.txt', false),
-		);
+		return [
+			['/user/files/test.txt', true],
+			['/user/files', true],
+			['/user/files_versions/test.txt', false],
+			['/user/foo/files/test.txt', false],
+			['/files/foo/files/test.txt', false],
+			['/user', false],
+			['/user/test.txt', false],
+		];
 	}
 
 	/**
@@ -183,12 +183,12 @@ class UtilTest extends TestCase {
 	}
 
 	public function dataTestStripPartialFileExtension() {
-		return array(
-			array('/foo/test.txt', '/foo/test.txt'),
-			array('/foo/test.txt.part', '/foo/test.txt'),
-			array('/foo/test.txt.ocTransferId7567846853.part', '/foo/test.txt'),
-			array('/foo/test.txt.ocTransferId7567.part', '/foo/test.txt'),
-		);
+		return [
+			['/foo/test.txt', '/foo/test.txt'],
+			['/foo/test.txt.part', '/foo/test.txt'],
+			['/foo/test.txt.ocTransferId7567846853.part', '/foo/test.txt'],
+			['/foo/test.txt.ocTransferId7567.part', '/foo/test.txt'],
+		];
 	}
 
 }