Completed
Pull Request — master (#3770)
by Thomas
38:05 queued 14:21
created
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/Activity/Provider.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -181,12 +181,12 @@
 block discarded – undo
181 181
 				}
182 182
 
183 183
 				$message = preg_replace(
184
-					'/(^|\s)(' . '@' . $mention['id'] . ')(\b)/',
184
+					'/(^|\s)('.'@'.$mention['id'].')(\b)/',
185 185
 					//'${1}' . $this->regexSafeUser($mention['id'], $displayName) . '${3}',
186
-					'${1}' . '{mention' . $mentionCount . '}' . '${3}',
186
+					'${1}'.'{mention'.$mentionCount.'}'.'${3}',
187 187
 					$message
188 188
 				);
189
-				$mentions['mention' . $mentionCount] = $this->generateUserParameter($mention['id']);
189
+				$mentions['mention'.$mentionCount] = $this->generateUserParameter($mention['id']);
190 190
 				$mentionCount++;
191 191
 			}
192 192
 
Please login to merge, or discard this patch.
apps/comments/lib/Activity/Listener.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -92,8 +92,8 @@
 block discarded – undo
92 92
 				/** @var Node $node */
93 93
 				$node = array_shift($nodes);
94 94
 				$path = $node->getPath();
95
-				if (strpos($path, '/' . $owner . '/files/') === 0) {
96
-					$path = substr($path, strlen('/' . $owner . '/files'));
95
+				if (strpos($path, '/'.$owner.'/files/') === 0) {
96
+					$path = substr($path, strlen('/'.$owner.'/files'));
97 97
 				}
98 98
 				// Get all users that have access to the mount point
99 99
 				$users = array_merge($users, Share::getUsersSharingFile($path, $owner, true, true));
Please login to merge, or discard this patch.
apps/comments/lib/Notification/Notifier.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -68,33 +68,33 @@
 block discarded – undo
68 68
 	 * @throws \InvalidArgumentException When the notification was not prepared by a notifier
69 69
 	 */
70 70
 	public function prepare(INotification $notification, $languageCode) {
71
-		if($notification->getApp() !== 'comments') {
71
+		if ($notification->getApp() !== 'comments') {
72 72
 			throw new \InvalidArgumentException();
73 73
 		}
74 74
 		try {
75 75
 			$comment = $this->commentsManager->get($notification->getObjectId());
76
-		} catch(NotFoundException $e) {
76
+		} catch (NotFoundException $e) {
77 77
 			// needs to be converted to InvalidArgumentException, otherwise none Notifications will be shown at all
78 78
 			throw new \InvalidArgumentException('Comment not found', 0, $e);
79 79
 		}
80 80
 		$l = $this->l10nFactory->get('comments', $languageCode);
81 81
 		$displayName = $comment->getActorId();
82 82
 		$isDeletedActor = $comment->getActorType() === ICommentsManager::DELETED_USER;
83
-		if($comment->getActorType() === 'users') {
83
+		if ($comment->getActorType() === 'users') {
84 84
 			$commenter = $this->userManager->get($comment->getActorId());
85
-			if(!is_null($commenter)) {
85
+			if (!is_null($commenter)) {
86 86
 				$displayName = $commenter->getDisplayName();
87 87
 			}
88 88
 		}
89 89
 
90
-		switch($notification->getSubject()) {
90
+		switch ($notification->getSubject()) {
91 91
 			case 'mention':
92 92
 				$parameters = $notification->getSubjectParameters();
93
-				if($parameters[0] !== 'files') {
93
+				if ($parameters[0] !== 'files') {
94 94
 					throw new \InvalidArgumentException('Unsupported comment object');
95 95
 				}
96 96
 				$nodes = $this->userFolder->getById($parameters[1]);
97
-				if(empty($nodes)) {
97
+				if (empty($nodes)) {
98 98
 					throw new \InvalidArgumentException('Cannot resolve file id to Node instance');
99 99
 				}
100 100
 				$node = $nodes[0];
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/Controller/Notifications.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -93,18 +93,18 @@  discard block
 block discarded – undo
93 93
 	public function view($id) {
94 94
 		try {
95 95
 			$comment = $this->commentsManager->get($id);
96
-			if($comment->getObjectType() !== 'files') {
96
+			if ($comment->getObjectType() !== 'files') {
97 97
 				return new NotFoundResponse();
98 98
 			}
99 99
 			$files = $this->folder->getById($comment->getObjectId());
100
-			if(count($files) === 0) {
100
+			if (count($files) === 0) {
101 101
 				$this->markProcessed($comment);
102 102
 				return new NotFoundResponse();
103 103
 			}
104 104
 
105 105
 			$url = $this->urlGenerator->linkToRouteAbsolute(
106 106
 				'files.viewcontroller.showFile',
107
-				[ 'fileid' => $comment->getObjectId() ]
107
+				['fileid' => $comment->getObjectId()]
108 108
 			);
109 109
 
110 110
 			$this->markProcessed($comment);
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
 	 */
122 122
 	protected function markProcessed(IComment $comment) {
123 123
 		$user = $this->userSession->getUser();
124
-		if(is_null($user)) {
124
+		if (is_null($user)) {
125 125
 			return;
126 126
 		}
127 127
 		$notification = $this->notificationManager->createNotification();
Please login to merge, or discard this patch.
apps/comments/lib/AppInfo/Application.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@
 block discarded – undo
26 26
 
27 27
 class Application extends App {
28 28
 
29
-	public function __construct (array $urlParams = array()) {
29
+	public function __construct(array $urlParams = array()) {
30 30
 		parent::__construct('comments', $urlParams);
31 31
 		$container = $this->getContainer();
32 32
 
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/comments/appinfo/app.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -50,14 +50,14 @@  discard block
 block discarded – undo
50 50
 		$application = new \OCP\AppFramework\App('comments');
51 51
 		return $application->getContainer()->query(\OCA\Comments\Notification\Notifier::class);
52 52
 	},
53
-	function () {
53
+	function() {
54 54
 		$l = \OC::$server->getL10N('comments');
55 55
 		return ['id' => 'comments', 'name' => $l->t('Comments')];
56 56
 	}
57 57
 );
58 58
 
59 59
 $commentsManager = \OC::$server->getCommentsManager();
60
-$commentsManager->registerEventHandler(function () {
60
+$commentsManager->registerEventHandler(function() {
61 61
 	$application = new \OCP\AppFramework\App('comments');
62 62
 	/** @var \OCA\Comments\EventHandler $handler */
63 63
 	$handler = $application->getContainer()->query(\OCA\Comments\EventHandler::class);
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
 $commentsManager->registerDisplayNameResolver('user', function($id) {
67 67
 	$manager = \OC::$server->getUserManager();
68 68
 	$user = $manager->get($id);
69
-	if(is_null($user)) {
69
+	if (is_null($user)) {
70 70
 		$l = \OC::$server->getL10N('comments');
71 71
 		$displayName = $l->t('Unknown user');
72 72
 	} else {
Please login to merge, or discard this patch.