Passed
Push — master ( d23e96...1bc100 )
by Roeland
11:25 queued 10s
created
apps/encryption/lib/Command/EnableMasterKey.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -68,7 +68,7 @@
 block discarded – undo
68 68
 
69 69
 		$isAlreadyEnabled = $this->util->isMasterKeyEnabled();
70 70
 
71
-		if($isAlreadyEnabled) {
71
+		if ($isAlreadyEnabled) {
72 72
 			$output->writeln('Master key already enabled');
73 73
 		} else {
74 74
 			$question = new ConfirmationQuestion(
Please login to merge, or discard this patch.
apps/encryption/lib/Crypto/Encryption.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -177,7 +177,7 @@  discard block
 block discarded – undo
177 177
 		$this->isWriteOperation = false;
178 178
 		$this->writeCache = '';
179 179
 
180
-		if($this->session->isReady() === false) {
180
+		if ($this->session->isReady() === false) {
181 181
 			// if the master key is enabled we can initialize encryption
182 182
 			// with a empty password and user name
183 183
 			if ($this->util->isMasterKeyEnabled()) {
@@ -198,7 +198,7 @@  discard block
 block discarded – undo
198 198
 		// always use the version from the original file, also part files
199 199
 		// need to have a correct version number if they get moved over to the
200 200
 		// final location
201
-		$this->version = (int)$this->keyManager->getVersion($this->stripPartFileExtension($path), new View());
201
+		$this->version = (int) $this->keyManager->getVersion($this->stripPartFileExtension($path), new View());
202 202
 
203 203
 		if (
204 204
 			$mode === 'w'
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
214 214
 			// if we read a part file we need to increase the version by 1
215 215
 			// because the version number was also increased by writing
216 216
 			// the part file
217
-			if(Scanner::isPartialFile($path)) {
217
+			if (Scanner::isPartialFile($path)) {
218 218
 				$this->version = $this->version + 1;
219 219
 			}
220 220
 		}
@@ -300,7 +300,7 @@  discard block
 block discarded – undo
300 300
 		if ($this->writeCache) {
301 301
 
302 302
 			// Concat writeCache to start of $data
303
-			$data = $this->writeCache . $data;
303
+			$data = $this->writeCache.$data;
304 304
 
305 305
 			// Clear the write cache, ready for reuse - it has been
306 306
 			// flushed and its old contents processed
@@ -402,7 +402,7 @@  discard block
 block discarded – undo
402 402
 					try {
403 403
 						$publicKeys[$user] = $this->keyManager->getPublicKey($user);
404 404
 					} catch (PublicKeyMissingException $e) {
405
-						$this->logger->warning('Could not encrypt file for ' . $user . ': ' . $e->getMessage());
405
+						$this->logger->warning('Could not encrypt file for '.$user.': '.$e->getMessage());
406 406
 					}
407 407
 				}
408 408
 			}
@@ -489,8 +489,8 @@  discard block
 block discarded – undo
489 489
 				// error message because in this case it means that the file was
490 490
 				// shared with the user at a point where the user didn't had a
491 491
 				// valid private/public key
492
-				$msg = 'Encryption module "' . $this->getDisplayName() .
493
-					'" is not able to read ' . $path;
492
+				$msg = 'Encryption module "'.$this->getDisplayName().
493
+					'" is not able to read '.$path;
494 494
 				$hint = $this->l->t('Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you.');
495 495
 				$this->logger->warning($msg);
496 496
 				throw new DecryptionFailedException($msg, $hint);
@@ -532,7 +532,7 @@  discard block
 block discarded – undo
532 532
 		$realPath = $path;
533 533
 		$parts = explode('/', $path);
534 534
 		if ($parts[2] === 'files_versions') {
535
-			$realPath = '/' . $parts[1] . '/files/' . implode('/', array_slice($parts, 3));
535
+			$realPath = '/'.$parts[1].'/files/'.implode('/', array_slice($parts, 3));
536 536
 			$length = strrpos($realPath, '.');
537 537
 			$realPath = substr($realPath, 0, $length);
538 538
 		}
Please login to merge, or discard this patch.
apps/encryption/lib/Crypto/DecryptAll.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -83,10 +83,10 @@  discard block
 block discarded – undo
83 83
 
84 84
 		$question = new Question('Please enter the recovery key password: ');
85 85
 
86
-		if($this->util->isMasterKeyEnabled()) {
86
+		if ($this->util->isMasterKeyEnabled()) {
87 87
 			$output->writeln('Use master key to decrypt all files');
88 88
 			$user = $this->keyManager->getMasterKeyId();
89
-			$password =$this->keyManager->getMasterKeyPassword();
89
+			$password = $this->keyManager->getMasterKeyPassword();
90 90
 		} else {
91 91
 			$recoveryKeyId = $this->keyManager->getRecoveryKeyId();
92 92
 			if (!empty($user)) {
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
 				if ($useLoginPassword) {
102 102
 					$question = new Question('Please enter the user\'s login password: ');
103 103
 				} else if ($this->util->isRecoveryEnabledForUser($user) === false) {
104
-					$output->writeln('No recovery key available for user ' . $user);
104
+					$output->writeln('No recovery key available for user '.$user);
105 105
 					return false;
106 106
 				} else {
107 107
 					$user = $recoveryKeyId;
Please login to merge, or discard this patch.
apps/comments/lib/Notification/Listener.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -55,15 +55,15 @@  discard block
 block discarded – undo
55 55
 		$comment = $event->getComment();
56 56
 
57 57
 		$mentions = $this->extractMentions($comment->getMentions());
58
-		if(empty($mentions)) {
58
+		if (empty($mentions)) {
59 59
 			// no one to notify
60 60
 			return;
61 61
 		}
62 62
 
63 63
 		$notification = $this->instantiateNotification($comment);
64 64
 
65
-		foreach($mentions as $uid) {
66
-			if( ($comment->getActorType() === 'users' && $uid === $comment->getActorId())
65
+		foreach ($mentions as $uid) {
66
+			if (($comment->getActorType() === 'users' && $uid === $comment->getActorId())
67 67
 				|| !$this->userManager->userExists($uid)
68 68
 			) {
69 69
 				// do not notify unknown users or yourself
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
 			}
72 72
 
73 73
 			$notification->setUser($uid);
74
-			if(    $event->getEvent() === CommentsEvent::EVENT_DELETE
74
+			if ($event->getEvent() === CommentsEvent::EVENT_DELETE
75 75
 				|| $event->getEvent() === CommentsEvent::EVENT_PRE_UPDATE)
76 76
 			{
77 77
 				$this->notificationManager->markProcessed($notification);
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 		$notification
93 93
 			->setApp('comments')
94 94
 			->setObject('comment', $comment->getId())
95
-			->setSubject('mention', [ $comment->getObjectType(), $comment->getObjectId() ])
95
+			->setSubject('mention', [$comment->getObjectType(), $comment->getObjectId()])
96 96
 			->setDateTime($comment->getCreationDateTime());
97 97
 
98 98
 		return $notification;
@@ -105,12 +105,12 @@  discard block
 block discarded – undo
105 105
 	 * @return string[] containing the mentions, e.g. ['alice', 'bob']
106 106
 	 */
107 107
 	public function extractMentions(array $mentions) {
108
-		if(empty($mentions)) {
108
+		if (empty($mentions)) {
109 109
 			return [];
110 110
 		}
111 111
 		$uids = [];
112
-		foreach($mentions as $mention) {
113
-			if($mention['type'] === 'user') {
112
+		foreach ($mentions as $mention) {
113
+			if ($mention['type'] === 'user') {
114 114
 				$uids[] = $mention['id'];
115 115
 			}
116 116
 		}
Please login to merge, or discard this patch.
apps/comments/lib/EventHandler.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -51,13 +51,13 @@  discard block
 block discarded – undo
51 51
 	 * @param CommentsEvent $event
52 52
 	 */
53 53
 	public function handle(CommentsEvent $event) {
54
-		if($event->getComment()->getObjectType() !== 'files') {
54
+		if ($event->getComment()->getObjectType() !== 'files') {
55 55
 			// this is a 'files'-specific Handler
56 56
 			return;
57 57
 		}
58 58
 
59 59
 		$eventType = $event->getEvent();
60
-		if( $eventType === CommentsEvent::EVENT_ADD
60
+		if ($eventType === CommentsEvent::EVENT_ADD
61 61
 		) {
62 62
 			$this->notificationHandler($event);
63 63
 			$this->activityHandler($event);
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
 			CommentsEvent::EVENT_UPDATE,
70 70
 			CommentsEvent::EVENT_DELETE,
71 71
 		];
72
-		if(in_array($eventType, $applicableEvents)) {
72
+		if (in_array($eventType, $applicableEvents)) {
73 73
 			$this->notificationHandler($event);
74 74
 			return;
75 75
 		}
Please login to merge, or discard this patch.
apps/files_trashbin/lib/Command/ExpireTrash.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -117,7 +117,7 @@
 block discarded – undo
117 117
 		\OC_Util::setupFS($user);
118 118
 
119 119
 		// Check if this user has a trashbin directory
120
-		$view = new \OC\Files\View('/' . $user);
120
+		$view = new \OC\Files\View('/'.$user);
121 121
 		if (!$view->is_dir('/files_trashbin/files')) {
122 122
 			return false;
123 123
 		}
Please login to merge, or discard this patch.
apps/files_trashbin/lib/Command/CleanUp.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -107,8 +107,8 @@
 block discarded – undo
107 107
 	protected function removeDeletedFiles($uid) {
108 108
 		\OC_Util::tearDownFS();
109 109
 		\OC_Util::setupFS($uid);
110
-		if ($this->rootFolder->nodeExists('/' . $uid . '/files_trashbin')) {
111
-			$this->rootFolder->get('/' . $uid . '/files_trashbin')->delete();
110
+		if ($this->rootFolder->nodeExists('/'.$uid.'/files_trashbin')) {
111
+			$this->rootFolder->get('/'.$uid.'/files_trashbin')->delete();
112 112
 			$query = $this->dbConnection->getQueryBuilder();
113 113
 			$query->delete('files_trash')
114 114
 				->where($query->expr()->eq('user', $query->createParameter('uid')))
Please login to merge, or discard this patch.
apps/workflowengine/lib/Check/AbstractStringCheck.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -59,7 +59,7 @@
 block discarded – undo
59 59
 	 * @param string $value
60 60
 	 * @return bool
61 61
 	 */
62
-	public function executeCheck($operator, $value)  {
62
+	public function executeCheck($operator, $value) {
63 63
 		$actualValue = $this->getActualValue();
64 64
 		return $this->executeStringCheck($operator, $value, $actualValue);
65 65
 	}
Please login to merge, or discard this patch.
apps/workflowengine/lib/Check/RequestTime.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -109,8 +109,8 @@
 block discarded – undo
109 109
 			throw new \UnexpectedValueException($this->l->t('The given operator is invalid'), 1);
110 110
 		}
111 111
 
112
-		$regexValue = '\"' . self::REGEX_TIME . ' ' . self::REGEX_TIMEZONE . '\"';
113
-		$result = preg_match('/^\[' . $regexValue . ',' . $regexValue . '\]$/', $value, $matches);
112
+		$regexValue = '\"'.self::REGEX_TIME.' '.self::REGEX_TIMEZONE.'\"';
113
+		$result = preg_match('/^\['.$regexValue.','.$regexValue.'\]$/', $value, $matches);
114 114
 		if (!$result) {
115 115
 			throw new \UnexpectedValueException($this->l->t('The given time span is invalid'), 2);
116 116
 		}
Please login to merge, or discard this patch.