Completed
Pull Request — master (#9345)
by Björn
26:01 queued 08:55
created
apps/systemtags/appinfo/app.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -65,7 +65,7 @@
 block discarded – undo
65 65
 $eventDispatcher->addListener(MapperEvent::EVENT_ASSIGN, $mapperListener);
66 66
 $eventDispatcher->addListener(MapperEvent::EVENT_UNASSIGN, $mapperListener);
67 67
 
68
-\OCA\Files\App::getNavigationManager()->add(function () {
68
+\OCA\Files\App::getNavigationManager()->add(function() {
69 69
 	$l = \OC::$server->getL10N('systemtags');
70 70
 	return [
71 71
 		'id' => 'systemtagsfilter',
Please login to merge, or discard this patch.
apps/files_sharing/appinfo/app.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
 
51 51
 $config = \OC::$server->getConfig();
52 52
 if ($config->getAppValue('core', 'shareapi_enabled', 'yes') === 'yes') {
53
-	\OCA\Files\App::getNavigationManager()->add(function () {
53
+	\OCA\Files\App::getNavigationManager()->add(function() {
54 54
 		$l = \OC::$server->getL10N('files_sharing');
55 55
 		return [
56 56
 			'id' => 'sharingin',
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
 	});
63 63
 
64 64
 	if (\OCP\Util::isSharingDisabledForUser() === false) {
65
-		\OCA\Files\App::getNavigationManager()->add(function () {
65
+		\OCA\Files\App::getNavigationManager()->add(function() {
66 66
 			$l = \OC::$server->getL10N('files_sharing');
67 67
 			return [
68 68
 				'id' => 'sharingout',
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
 
76 76
 		// Check if sharing by link is enabled
77 77
 		if ($config->getAppValue('core', 'shareapi_allow_links', 'yes') === 'yes') {
78
-			\OCA\Files\App::getNavigationManager()->add(function () {
78
+			\OCA\Files\App::getNavigationManager()->add(function() {
79 79
 				$l = \OC::$server->getL10N('files_sharing');
80 80
 				return [
81 81
 					'id' => 'sharinglinks',
Please login to merge, or discard this patch.
apps/files_trashbin/appinfo/app.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@
 block discarded – undo
28 28
 // register hooks
29 29
 \OCA\Files_Trashbin\Trashbin::registerHooks();
30 30
 
31
-\OCA\Files\App::getNavigationManager()->add(function () {
31
+\OCA\Files\App::getNavigationManager()->add(function() {
32 32
 	$l = \OC::$server->getL10N('files_trashbin');
33 33
 	return [
34 34
 		'id' => 'trashbin',
Please login to merge, or discard this patch.
apps/dav/lib/CardDAV/Converter.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -119,9 +119,9 @@
 block discarded – undo
119 119
 		$elements = explode(' ', $fullName);
120 120
 		$result = ['', '', '', '', ''];
121 121
 		if (count($elements) > 2) {
122
-			$result[0] = implode(' ', array_slice($elements, count($elements)-1));
122
+			$result[0] = implode(' ', array_slice($elements, count($elements) - 1));
123 123
 			$result[1] = $elements[0];
124
-			$result[2] = implode(' ', array_slice($elements, 1, count($elements)-2));
124
+			$result[2] = implode(' ', array_slice($elements, 1, count($elements) - 2));
125 125
 		} elseif (count($elements) === 2) {
126 126
 			$result[0] = $elements[1];
127 127
 			$result[1] = $elements[0];
Please login to merge, or discard this patch.
lib/private/Setup/Sqlite.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -33,10 +33,10 @@
 block discarded – undo
33 33
 	}
34 34
 
35 35
 	public function setupDatabase($username) {
36
-		$datadir = $this->config->getValue('datadirectory', \OC::$SERVERROOT . '/data');
36
+		$datadir = $this->config->getValue('datadirectory', \OC::$SERVERROOT.'/data');
37 37
 
38 38
 		//delete the old sqlite database first, might cause infinte loops otherwise
39
-		if(file_exists("$datadir/owncloud.db")) {
39
+		if (file_exists("$datadir/owncloud.db")) {
40 40
 			unlink("$datadir/owncloud.db");
41 41
 		}
42 42
 		//in case of sqlite, we can always fill the database
Please login to merge, or discard this patch.
apps/dav/lib/Connector/Sabre/DummyGetResponsePlugin.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -57,9 +57,9 @@
 block discarded – undo
57 57
 	 * @return false
58 58
 	 */
59 59
 	function httpGet(RequestInterface $request, ResponseInterface $response) {
60
-		$string = 'This is the WebDAV interface. It can only be accessed by ' .
60
+		$string = 'This is the WebDAV interface. It can only be accessed by '.
61 61
 			'WebDAV clients such as the Nextcloud desktop sync client.';
62
-		$stream = fopen('php://memory','r+');
62
+		$stream = fopen('php://memory', 'r+');
63 63
 		fwrite($stream, $string);
64 64
 		rewind($stream);
65 65
 
Please login to merge, or discard this patch.
lib/private/Authentication/Token/DefaultTokenProvider.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -253,10 +253,10 @@  discard block
 block discarded – undo
253 253
 	 */
254 254
 	public function invalidateOldTokens() {
255 255
 		$olderThan = $this->time->getTime() - (int) $this->config->getSystemValue('session_lifetime', 60 * 60 * 24);
256
-		$this->logger->debug('Invalidating session tokens older than ' . date('c', $olderThan), ['app' => 'cron']);
256
+		$this->logger->debug('Invalidating session tokens older than '.date('c', $olderThan), ['app' => 'cron']);
257 257
 		$this->mapper->invalidateOld($olderThan, IToken::DO_NOT_REMEMBER);
258 258
 		$rememberThreshold = $this->time->getTime() - (int) $this->config->getSystemValue('remember_login_cookie_lifetime', 60 * 60 * 24 * 15);
259
-		$this->logger->debug('Invalidating remembered session tokens older than ' . date('c', $rememberThreshold), ['app' => 'cron']);
259
+		$this->logger->debug('Invalidating remembered session tokens older than '.date('c', $rememberThreshold), ['app' => 'cron']);
260 260
 		$this->mapper->invalidateOld($rememberThreshold, IToken::REMEMBER);
261 261
 	}
262 262
 
@@ -266,7 +266,7 @@  discard block
 block discarded – undo
266 266
 	 */
267 267
 	private function hashToken($token) {
268 268
 		$secret = $this->config->getSystemValue('secret');
269
-		return hash('sha512', $token . $secret);
269
+		return hash('sha512', $token.$secret);
270 270
 	}
271 271
 
272 272
 	/**
@@ -280,7 +280,7 @@  discard block
 block discarded – undo
280 280
 	 */
281 281
 	private function encryptPassword($password, $token) {
282 282
 		$secret = $this->config->getSystemValue('secret');
283
-		return $this->crypto->encrypt($password, $token . $secret);
283
+		return $this->crypto->encrypt($password, $token.$secret);
284 284
 	}
285 285
 
286 286
 	/**
@@ -296,7 +296,7 @@  discard block
 block discarded – undo
296 296
 	private function decryptPassword($password, $token) {
297 297
 		$secret = $this->config->getSystemValue('secret');
298 298
 		try {
299
-			return $this->crypto->decrypt($password, $token . $secret);
299
+			return $this->crypto->decrypt($password, $token.$secret);
300 300
 		} catch (Exception $ex) {
301 301
 			// Delete the invalid token
302 302
 			$this->invalidateToken($token);
Please login to merge, or discard this patch.
apps/files_sharing/lib/MountProvider.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
 		$shares = array_merge($shares, $this->shareManager->getSharedWith($user->getUID(), \OCP\Share::SHARE_TYPE_CIRCLE, null, -1));
75 75
 
76 76
 		// filter out excluded shares and group shares that includes self
77
-		$shares = array_filter($shares, function (\OCP\Share\IShare $share) use ($user) {
77
+		$shares = array_filter($shares, function(\OCP\Share\IShare $share) use ($user) {
78 78
 			return $share->getPermissions() > 0 && $share->getShareOwner() !== $user->getUID();
79 79
 		});
80 80
 
@@ -186,7 +186,7 @@  discard block
 block discarded – undo
186 186
 						// null groups which usually appear with group backend
187 187
 						// caching inconsistencies
188 188
 						$this->logger->debug(
189
-							'Could not adjust share target for share ' . $share->getId() . ' to make it consistent: ' . $e->getMessage(),
189
+							'Could not adjust share target for share '.$share->getId().' to make it consistent: '.$e->getMessage(),
190 190
 							['app' => 'files_sharing']
191 191
 						);
192 192
 					}
Please login to merge, or discard this patch.
lib/private/Files/Config/MountProviderCollection.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -74,13 +74,13 @@  discard block
 block discarded – undo
74 74
 	 */
75 75
 	public function getMountsForUser(IUser $user) {
76 76
 		$loader = $this->loader;
77
-		$mounts = array_map(function (IMountProvider $provider) use ($user, $loader) {
77
+		$mounts = array_map(function(IMountProvider $provider) use ($user, $loader) {
78 78
 			return $provider->getMountsForUser($user, $loader);
79 79
 		}, $this->providers);
80
-		$mounts = array_filter($mounts, function ($result) {
80
+		$mounts = array_filter($mounts, function($result) {
81 81
 			return is_array($result);
82 82
 		});
83
-		return array_reduce($mounts, function (array $mounts, array $providerMounts) {
83
+		return array_reduce($mounts, function(array $mounts, array $providerMounts) {
84 84
 			return array_merge($mounts, $providerMounts);
85 85
 		}, array());
86 86
 	}
@@ -89,10 +89,10 @@  discard block
 block discarded – undo
89 89
 		// shared mount provider gets to go last since it needs to know existing files
90 90
 		// to check for name collisions
91 91
 		$firstMounts = [];
92
-		$firstProviders = array_filter($this->providers, function (IMountProvider $provider) {
92
+		$firstProviders = array_filter($this->providers, function(IMountProvider $provider) {
93 93
 			return (get_class($provider) !== 'OCA\Files_Sharing\MountProvider');
94 94
 		});
95
-		$lastProviders = array_filter($this->providers, function (IMountProvider $provider) {
95
+		$lastProviders = array_filter($this->providers, function(IMountProvider $provider) {
96 96
 			return (get_class($provider) === 'OCA\Files_Sharing\MountProvider');
97 97
 		});
98 98
 		foreach ($firstProviders as $provider) {
@@ -128,11 +128,11 @@  discard block
 block discarded – undo
128 128
 		$providers = array_reverse($this->homeProviders); // call the latest registered provider first to give apps an opportunity to overwrite builtin
129 129
 		foreach ($providers as $homeProvider) {
130 130
 			if ($mount = $homeProvider->getHomeMountForUser($user, $this->loader)) {
131
-				$mount->setMountPoint('/' . $user->getUID()); //make sure the mountpoint is what we expect
131
+				$mount->setMountPoint('/'.$user->getUID()); //make sure the mountpoint is what we expect
132 132
 				return $mount;
133 133
 			}
134 134
 		}
135
-		throw new \Exception('No home storage configured for user ' . $user);
135
+		throw new \Exception('No home storage configured for user '.$user);
136 136
 	}
137 137
 
138 138
 	/**
Please login to merge, or discard this patch.