nextcloud / server

apps/comments/lib/Activity/Provider.php

Spacing +4 added lines, -4 removed lines

@@ -213,18 +213,18 @@
 					continue;
 				}
 
-				$pattern = '/(^|\s)(' . '@' . $mention['id'] . ')(\b)/';
+				$pattern = '/(^|\s)('.'@'.$mention['id'].')(\b)/';
 				if (strpos($mention['id'], ' ') !== false) {
-					$pattern = '/(^|\s)(' . '@"' . $mention['id'] . '"' . ')(\b)?/';
+					$pattern = '/(^|\s)('.'@"'.$mention['id'].'"'.')(\b)?/';
 				}
 
 				$message = preg_replace(
 					$pattern,
 					//'${1}' . $this->regexSafeUser($mention['id'], $displayName) . '${3}',
-					'${1}' . '{mention' . $mentionCount . '}' . '${3}',
+					'${1}'.'{mention'.$mentionCount.'}'.'${3}',
 					$message
 				);
-				$mentions['mention' . $mentionCount] = $this->generateUserParameter($mention['id']);
+				$mentions['mention'.$mentionCount] = $this->generateUserParameter($mention['id']);
 				$mentionCount++;
 			}
 

lib/private/Comments/Comment.php

Spacing +22 added lines, -22 removed lines

@@ -52,7 +52,7 @@ 
 	 * 						the comments database scheme
 	 */
 	public function __construct(array $data = null) {
-		if(is_array($data)) {
+		if (is_array($data)) {
 			$this->fromArray($data);
 		}
 	}
@@ -85,12 +85,12 @@ 
 	 * @since 9.0.0
 	 */
 	public function setId($id) {
-		if(!is_string($id)) {
+		if (!is_string($id)) {
 			throw new \InvalidArgumentException('String expected.');
 		}
 
 		$id = trim($id);
-		if($this->data['id'] === '' || ($this->data['id'] !== '' && $id === '')) {
+		if ($this->data['id'] === '' || ($this->data['id'] !== '' && $id === '')) {
 			$this->data['id'] = $id;
 			return $this;
 		}
@@ -116,7 +116,7 @@ 
 	 * @since 9.0.0
 	 */
 	public function setParentId($parentId) {
-		if(!is_string($parentId)) {
+		if (!is_string($parentId)) {
 			throw new \InvalidArgumentException('String expected.');
 		}
 		$this->data['parentId'] = trim($parentId);
@@ -142,7 +142,7 @@ 
 	 * @since 9.0.0
 	 */
 	public function setTopmostParentId($id) {
-		if(!is_string($id)) {
+		if (!is_string($id)) {
 			throw new \InvalidArgumentException('String expected.');
 		}
 		$this->data['topmostParentId'] = trim($id);
@@ -167,7 +167,7 @@ 
 	 * @since 9.0.0
 	 */
 	public function setChildrenCount($count) {
-		if(!is_int($count)) {
+		if (!is_int($count)) {
 			throw new \InvalidArgumentException('Integer expected.');
 		}
 		$this->data['childrenCount'] = $count;
@@ -193,12 +193,12 @@ 
 	 * @since 9.0.0
 	 */
 	public function setMessage($message) {
-		if(!is_string($message)) {
+		if (!is_string($message)) {
 			throw new \InvalidArgumentException('String expected.');
 		}
 		$message = trim($message);
-		if(mb_strlen($message, 'UTF-8') > IComment::MAX_MESSAGE_LENGTH) {
-			throw new MessageTooLongException('Comment message must not exceed ' . IComment::MAX_MESSAGE_LENGTH . ' characters');
+		if (mb_strlen($message, 'UTF-8') > IComment::MAX_MESSAGE_LENGTH) {
+			throw new MessageTooLongException('Comment message must not exceed '.IComment::MAX_MESSAGE_LENGTH.' characters');
 		}
 		$this->data['message'] = $message;
 		return $this;
@@ -226,7 +226,7 @@ 
 	 */
 	public function getMentions() {
 		$ok = preg_match_all("/\B(?<![^a-z0-9_\-@\.\'\s])@(\"[a-z0-9_\-@\.\' ]+\"|[a-z0-9_\-@\.\']+)/i", $this->getMessage(), $mentions);
-		if(!$ok || !isset($mentions[0]) || !is_array($mentions[0])) {
+		if (!$ok || !isset($mentions[0]) || !is_array($mentions[0])) {
 			return [];
 		}
 		$uids = array_unique($mentions[0]);
@@ -255,7 +255,7 @@ 
 	 * @since 9.0.0
 	 */
 	public function setVerb($verb) {
-		if(!is_string($verb) || !trim($verb)) {
+		if (!is_string($verb) || !trim($verb)) {
 			throw new \InvalidArgumentException('Non-empty String expected.');
 		}
 		$this->data['verb'] = trim($verb);
@@ -291,9 +291,9 @@ 
 	 * @since 9.0.0
 	 */
 	public function setActor($actorType, $actorId) {
-		if(
+		if (
 		       !is_string($actorType) || !trim($actorType)
-		    || !is_string($actorId)   || !trim($actorId)
+		    || !is_string($actorId) || !trim($actorId)
 		) {
 			throw new \InvalidArgumentException('String expected.');
 		}
@@ -377,9 +377,9 @@ 
 	 * @since 9.0.0
 	 */
 	public function setObject($objectType, $objectId) {
-		if(
+		if (
 		       !is_string($objectType) || !trim($objectType)
-		    || !is_string($objectId)   || !trim($objectId)
+		    || !is_string($objectId) || !trim($objectId)
 		) {
 			throw new \InvalidArgumentException('String expected.');
 		}
@@ -396,20 +396,20 @@ 
 	 * @return IComment
 	 */
 	protected function fromArray($data) {
-		foreach(array_keys($data) as $key) {
+		foreach (array_keys($data) as $key) {
 			// translate DB keys to internal setter names
-			$setter = 'set' . implode('', array_map('ucfirst', explode('_', $key)));
+			$setter = 'set'.implode('', array_map('ucfirst', explode('_', $key)));
 			$setter = str_replace('Timestamp', 'DateTime', $setter);
 
-			if(method_exists($this, $setter)) {
+			if (method_exists($this, $setter)) {
 				$this->$setter($data[$key]);
 			}
 		}
 
-		foreach(['actor', 'object'] as $role) {
-			if(isset($data[$role . '_type']) && isset($data[$role . '_id'])) {
-				$setter = 'set' . ucfirst($role);
-				$this->$setter($data[$role . '_type'], $data[$role . '_id']);
+		foreach (['actor', 'object'] as $role) {
+			if (isset($data[$role.'_type']) && isset($data[$role.'_id'])) {
+				$setter = 'set'.ucfirst($role);
+				$this->$setter($data[$role.'_type'], $data[$role.'_id']);
 			}
 		}