nextcloud / server

apps/files_trashbin/lib/Capabilities.php

Indentation +12 added lines, -12 removed lines

@@ -33,17 +33,17 @@
  */
 class Capabilities implements ICapability {
 
-	/**
-	 * Return this classes capabilities
-	 *
-	 * @return array
-	 */
-	public function getCapabilities() {
-		return [
-			'files' => [
-				'undelete' => true
-			]
-		];
-	}
+    /**
+     * Return this classes capabilities
+     *
+     * @return array
+     */
+    public function getCapabilities() {
+        return [
+            'files' => [
+                'undelete' => true
+            ]
+        ];
+    }
 	
 }

apps/testing/lib/AlternativeHomeUserBackend.php

Indentation +18 added lines, -18 removed lines

@@ -34,23 +34,23 @@
  *	]
  */
 class AlternativeHomeUserBackend extends \OC\User\Database {
-	public function __construct() {
-		parent::__construct();
-	}
-	/**
-	 * get the user's home directory
-	 * @param string $uid the username
-	 * @return string|false
-	 */
-	public function getHome($uid) {
-		if ($this->userExists($uid)) {
-			// workaround to avoid killing the admin
-			if ($uid !== 'admin') {
-				$uid = md5($uid);
-			}
-			return \OC::$server->getConfig()->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/' . $uid;
-		}
+    public function __construct() {
+        parent::__construct();
+    }
+    /**
+     * get the user's home directory
+     * @param string $uid the username
+     * @return string|false
+     */
+    public function getHome($uid) {
+        if ($this->userExists($uid)) {
+            // workaround to avoid killing the admin
+            if ($uid !== 'admin') {
+                $uid = md5($uid);
+            }
+            return \OC::$server->getConfig()->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/' . $uid;
+        }
 
-		return false;
-	}
+        return false;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
 			if ($uid !== 'admin') {
 				$uid = md5($uid);
 			}
-			return \OC::$server->getConfig()->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/' . $uid;
+			return \OC::$server->getConfig()->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data').'/'.$uid;
 		}
 
 		return false;

apps/dav/lib/DAV/PublicAuth.php

Spacing +1 added lines, -1 removed lines

@@ -84,7 +84,7 @@
 	 */
 	private function isRequestPublic(RequestInterface $request) {
 		$url = $request->getPath();
-		$matchingUrls = array_filter($this->publicURLs, function ($publicUrl) use ($url) {
+		$matchingUrls = array_filter($this->publicURLs, function($publicUrl) use ($url) {
 			return strpos($url, $publicUrl, 0) === 0;
 		});
 		return !empty($matchingUrls);

Indentation +58 added lines, -58 removed lines

@@ -26,66 +26,66 @@
 
 class PublicAuth implements BackendInterface {
 
-	/** @var string[] */
-	private $publicURLs;
+    /** @var string[] */
+    private $publicURLs;
 
-	public function __construct() {
-		$this->publicURLs = [
-			'public-calendars',
-			'principals/system/public'
-		];
-	}
+    public function __construct() {
+        $this->publicURLs = [
+            'public-calendars',
+            'principals/system/public'
+        ];
+    }
 
-	/**
-	 * When this method is called, the backend must check if authentication was
-	 * successful.
-	 *
-	 * The returned value must be one of the following
-	 *
-	 * [true, "principals/username"]
-	 * [false, "reason for failure"]
-	 *
-	 * If authentication was successful, it's expected that the authentication
-	 * backend returns a so-called principal url.
-	 *
-	 * Examples of a principal url:
-	 *
-	 * principals/admin
-	 * principals/user1
-	 * principals/users/joe
-	 * principals/uid/123457
-	 *
-	 * If you don't use WebDAV ACL (RFC3744) we recommend that you simply
-	 * return a string such as:
-	 *
-	 * principals/users/[username]
-	 *
-	 * @param RequestInterface $request
-	 * @param ResponseInterface $response
-	 * @return array
-	 */
-	public function check(RequestInterface $request, ResponseInterface $response) {
-		if ($this->isRequestPublic($request)) {
-			return [true, "principals/system/public"];
-		}
-		return [false, "No public access to this resource."];
-	}
+    /**
+     * When this method is called, the backend must check if authentication was
+     * successful.
+     *
+     * The returned value must be one of the following
+     *
+     * [true, "principals/username"]
+     * [false, "reason for failure"]
+     *
+     * If authentication was successful, it's expected that the authentication
+     * backend returns a so-called principal url.
+     *
+     * Examples of a principal url:
+     *
+     * principals/admin
+     * principals/user1
+     * principals/users/joe
+     * principals/uid/123457
+     *
+     * If you don't use WebDAV ACL (RFC3744) we recommend that you simply
+     * return a string such as:
+     *
+     * principals/users/[username]
+     *
+     * @param RequestInterface $request
+     * @param ResponseInterface $response
+     * @return array
+     */
+    public function check(RequestInterface $request, ResponseInterface $response) {
+        if ($this->isRequestPublic($request)) {
+            return [true, "principals/system/public"];
+        }
+        return [false, "No public access to this resource."];
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function challenge(RequestInterface $request, ResponseInterface $response) {
-	}
+    /**
+     * @inheritdoc
+     */
+    public function challenge(RequestInterface $request, ResponseInterface $response) {
+    }
 
-	/**
-	 * @param RequestInterface $request
-	 * @return bool
-	 */
-	private function isRequestPublic(RequestInterface $request) {
-		$url = $request->getPath();
-		$matchingUrls = array_filter($this->publicURLs, function ($publicUrl) use ($url) {
-			return strpos($url, $publicUrl, 0) === 0;
-		});
-		return !empty($matchingUrls);
-	}
+    /**
+     * @param RequestInterface $request
+     * @return bool
+     */
+    private function isRequestPublic(RequestInterface $request) {
+        $url = $request->getPath();
+        $matchingUrls = array_filter($this->publicURLs, function ($publicUrl) use ($url) {
+            return strpos($url, $publicUrl, 0) === 0;
+        });
+        return !empty($matchingUrls);
+    }
 }

apps/dav/lib/Connector/Sabre/Exception/Forbidden.php

Spacing +3 added lines, -3 removed lines

@@ -49,17 +49,17 @@
 	 * @param \DOMElement $errorNode
 	 * @return void
 	 */
-	public function serialize(\Sabre\DAV\Server $server,\DOMElement $errorNode) {
+	public function serialize(\Sabre\DAV\Server $server, \DOMElement $errorNode) {
 
 		// set ownCloud namespace
 		$errorNode->setAttribute('xmlns:o', self::NS_OWNCLOUD);
 
 		// adding the retry node
-		$error = $errorNode->ownerDocument->createElementNS('o:','o:retry', var_export($this->retry, true));
+		$error = $errorNode->ownerDocument->createElementNS('o:', 'o:retry', var_export($this->retry, true));
 		$errorNode->appendChild($error);
 
 		// adding the message node
-		$error = $errorNode->ownerDocument->createElementNS('o:','o:reason', $this->getMessage());
+		$error = $errorNode->ownerDocument->createElementNS('o:', 'o:reason', $this->getMessage());
 		$errorNode->appendChild($error);
 	}
 }

Indentation +32 added lines, -32 removed lines

@@ -23,42 +23,42 @@
 namespace OCA\DAV\Connector\Sabre\Exception;
 
 class Forbidden extends \Sabre\DAV\Exception\Forbidden {
-	public const NS_OWNCLOUD = 'http://owncloud.org/ns';
+    public const NS_OWNCLOUD = 'http://owncloud.org/ns';
 
-	/**
-	 * @var bool
-	 */
-	private $retry;
+    /**
+     * @var bool
+     */
+    private $retry;
 
-	/**
-	 * @param string $message
-	 * @param bool $retry
-	 * @param \Exception $previous
-	 */
-	public function __construct($message, $retry = false, \Exception $previous = null) {
-		parent::__construct($message, 0, $previous);
-		$this->retry = $retry;
-	}
+    /**
+     * @param string $message
+     * @param bool $retry
+     * @param \Exception $previous
+     */
+    public function __construct($message, $retry = false, \Exception $previous = null) {
+        parent::__construct($message, 0, $previous);
+        $this->retry = $retry;
+    }
 
-	/**
-	 * This method allows the exception to include additional information
-	 * into the WebDAV error response
-	 *
-	 * @param \Sabre\DAV\Server $server
-	 * @param \DOMElement $errorNode
-	 * @return void
-	 */
-	public function serialize(\Sabre\DAV\Server $server,\DOMElement $errorNode) {
+    /**
+     * This method allows the exception to include additional information
+     * into the WebDAV error response
+     *
+     * @param \Sabre\DAV\Server $server
+     * @param \DOMElement $errorNode
+     * @return void
+     */
+    public function serialize(\Sabre\DAV\Server $server,\DOMElement $errorNode) {
 
-		// set ownCloud namespace
-		$errorNode->setAttribute('xmlns:o', self::NS_OWNCLOUD);
+        // set ownCloud namespace
+        $errorNode->setAttribute('xmlns:o', self::NS_OWNCLOUD);
 
-		// adding the retry node
-		$error = $errorNode->ownerDocument->createElementNS('o:','o:retry', var_export($this->retry, true));
-		$errorNode->appendChild($error);
+        // adding the retry node
+        $error = $errorNode->ownerDocument->createElementNS('o:','o:retry', var_export($this->retry, true));
+        $errorNode->appendChild($error);
 
-		// adding the message node
-		$error = $errorNode->ownerDocument->createElementNS('o:','o:reason', $this->getMessage());
-		$errorNode->appendChild($error);
-	}
+        // adding the message node
+        $error = $errorNode->ownerDocument->createElementNS('o:','o:reason', $this->getMessage());
+        $errorNode->appendChild($error);
+    }
 }

apps/dav/lib/Connector/LegacyDAVACL.php

Spacing +2 added lines, -2 removed lines

@@ -60,9 +60,9 @@
 
 	public function propFind(PropFind $propFind, INode $node) {
 		/* Overload current-user-principal */
-		$propFind->handle('{DAV:}current-user-principal', function () {
+		$propFind->handle('{DAV:}current-user-principal', function() {
 			if ($url = parent::getCurrentUserPrincipal()) {
-				return new Principal(Principal::HREF, $url . '/');
+				return new Principal(Principal::HREF, $url.'/');
 			} else {
 				return new Principal(Principal::UNAUTHENTICATED);
 			}

Indentation +35 added lines, -35 removed lines

@@ -33,44 +33,44 @@
 
 class LegacyDAVACL extends DavAclPlugin {
 
-	/**
-	 * @inheritdoc
-	 */
-	public function getCurrentUserPrincipals() {
-		$principalV2 = $this->getCurrentUserPrincipal();
+    /**
+     * @inheritdoc
+     */
+    public function getCurrentUserPrincipals() {
+        $principalV2 = $this->getCurrentUserPrincipal();
 
-		if (is_null($principalV2)) {
-			return [];
-		}
+        if (is_null($principalV2)) {
+            return [];
+        }
 
-		$principalV1 = $this->convertPrincipal($principalV2, false);
-		return array_merge(
-			[
-				$principalV2,
-				$principalV1
-			],
-			$this->getPrincipalMembership($principalV1)
-		);
-	}
+        $principalV1 = $this->convertPrincipal($principalV2, false);
+        return array_merge(
+            [
+                $principalV2,
+                $principalV1
+            ],
+            $this->getPrincipalMembership($principalV1)
+        );
+    }
 
-	private function convertPrincipal($principal, $toV2) {
-		[, $name] = \Sabre\Uri\split($principal);
-		if ($toV2) {
-			return "principals/users/$name";
-		}
-		return "principals/$name";
-	}
+    private function convertPrincipal($principal, $toV2) {
+        [, $name] = \Sabre\Uri\split($principal);
+        if ($toV2) {
+            return "principals/users/$name";
+        }
+        return "principals/$name";
+    }
 
-	public function propFind(PropFind $propFind, INode $node) {
-		/* Overload current-user-principal */
-		$propFind->handle('{DAV:}current-user-principal', function () {
-			if ($url = parent::getCurrentUserPrincipal()) {
-				return new Principal(Principal::HREF, $url . '/');
-			} else {
-				return new Principal(Principal::UNAUTHENTICATED);
-			}
-		});
+    public function propFind(PropFind $propFind, INode $node) {
+        /* Overload current-user-principal */
+        $propFind->handle('{DAV:}current-user-principal', function () {
+            if ($url = parent::getCurrentUserPrincipal()) {
+                return new Principal(Principal::HREF, $url . '/');
+            } else {
+                return new Principal(Principal::UNAUTHENTICATED);
+            }
+        });
 
-		return parent::propFind($propFind, $node);
-	}
+        return parent::propFind($propFind, $node);
+    }
 }

apps/dav/lib/SystemTag/SystemTagNode.php

Indentation +132 added lines, -132 removed lines

@@ -39,136 +39,136 @@
  */
 class SystemTagNode implements \Sabre\DAV\INode {
 
-	/**
-	 * @var ISystemTag
-	 */
-	protected $tag;
-
-	/**
-	 * @var ISystemTagManager
-	 */
-	protected $tagManager;
-
-	/**
-	 * User
-	 *
-	 * @var IUser
-	 */
-	protected $user;
-
-	/**
-	 * Whether to allow permissions for admins
-	 *
-	 * @var bool
-	 */
-	protected $isAdmin;
-
-	/**
-	 * Sets up the node, expects a full path name
-	 *
-	 * @param ISystemTag $tag system tag
-	 * @param IUser $user user
-	 * @param bool $isAdmin whether to allow operations for admins
-	 * @param ISystemTagManager $tagManager tag manager
-	 */
-	public function __construct(ISystemTag $tag, IUser $user, $isAdmin, ISystemTagManager $tagManager) {
-		$this->tag = $tag;
-		$this->user = $user;
-		$this->isAdmin = $isAdmin;
-		$this->tagManager = $tagManager;
-	}
-
-	/**
-	 *  Returns the id of the tag
-	 *
-	 * @return string
-	 */
-	public function getName() {
-		return $this->tag->getId();
-	}
-
-	/**
-	 * Returns the system tag represented by this node
-	 *
-	 * @return ISystemTag system tag
-	 */
-	public function getSystemTag() {
-		return $this->tag;
-	}
-
-	/**
-	 * Renames the node
-	 *
-	 * @param string $name The new name
-	 *
-	 * @throws MethodNotAllowed not allowed to rename node
-	 */
-	public function setName($name) {
-		throw new MethodNotAllowed();
-	}
-
-	/**
-	 * Update tag
-	 *
-	 * @param string $name new tag name
-	 * @param bool $userVisible user visible
-	 * @param bool $userAssignable user assignable
-	 * @throws NotFound whenever the given tag id does not exist
-	 * @throws Forbidden whenever there is no permission to update said tag
-	 * @throws Conflict whenever a tag already exists with the given attributes
-	 */
-	public function update($name, $userVisible, $userAssignable) {
-		try {
-			if (!$this->tagManager->canUserSeeTag($this->tag, $this->user)) {
-				throw new NotFound('Tag with id ' . $this->tag->getId() . ' does not exist');
-			}
-			if (!$this->tagManager->canUserAssignTag($this->tag, $this->user)) {
-				throw new Forbidden('No permission to update tag ' . $this->tag->getId());
-			}
-
-			// only admin is able to change permissions, regular users can only rename
-			if (!$this->isAdmin) {
-				// only renaming is allowed for regular users
-				if ($userVisible !== $this->tag->isUserVisible()
-					|| $userAssignable !== $this->tag->isUserAssignable()
-				) {
-					throw new Forbidden('No permission to update permissions for tag ' . $this->tag->getId());
-				}
-			}
-
-			$this->tagManager->updateTag($this->tag->getId(), $name, $userVisible, $userAssignable);
-		} catch (TagNotFoundException $e) {
-			throw new NotFound('Tag with id ' . $this->tag->getId() . ' does not exist');
-		} catch (TagAlreadyExistsException $e) {
-			throw new Conflict(
-				'Tag with the properties "' . $name . '", ' .
-				$userVisible . ', ' . $userAssignable . ' already exists'
-			);
-		}
-	}
-
-	/**
-	 * Returns null, not supported
-	 *
-	 */
-	public function getLastModified() {
-		return null;
-	}
-
-	public function delete() {
-		try {
-			if (!$this->isAdmin) {
-				throw new Forbidden('No permission to delete tag ' . $this->tag->getId());
-			}
-
-			if (!$this->tagManager->canUserSeeTag($this->tag, $this->user)) {
-				throw new NotFound('Tag with id ' . $this->tag->getId() . ' not found');
-			}
-
-			$this->tagManager->deleteTags($this->tag->getId());
-		} catch (TagNotFoundException $e) {
-			// can happen if concurrent deletion occurred
-			throw new NotFound('Tag with id ' . $this->tag->getId() . ' not found', 0, $e);
-		}
-	}
+    /**
+     * @var ISystemTag
+     */
+    protected $tag;
+
+    /**
+     * @var ISystemTagManager
+     */
+    protected $tagManager;
+
+    /**
+     * User
+     *
+     * @var IUser
+     */
+    protected $user;
+
+    /**
+     * Whether to allow permissions for admins
+     *
+     * @var bool
+     */
+    protected $isAdmin;
+
+    /**
+     * Sets up the node, expects a full path name
+     *
+     * @param ISystemTag $tag system tag
+     * @param IUser $user user
+     * @param bool $isAdmin whether to allow operations for admins
+     * @param ISystemTagManager $tagManager tag manager
+     */
+    public function __construct(ISystemTag $tag, IUser $user, $isAdmin, ISystemTagManager $tagManager) {
+        $this->tag = $tag;
+        $this->user = $user;
+        $this->isAdmin = $isAdmin;
+        $this->tagManager = $tagManager;
+    }
+
+    /**
+     *  Returns the id of the tag
+     *
+     * @return string
+     */
+    public function getName() {
+        return $this->tag->getId();
+    }
+
+    /**
+     * Returns the system tag represented by this node
+     *
+     * @return ISystemTag system tag
+     */
+    public function getSystemTag() {
+        return $this->tag;
+    }
+
+    /**
+     * Renames the node
+     *
+     * @param string $name The new name
+     *
+     * @throws MethodNotAllowed not allowed to rename node
+     */
+    public function setName($name) {
+        throw new MethodNotAllowed();
+    }
+
+    /**
+     * Update tag
+     *
+     * @param string $name new tag name
+     * @param bool $userVisible user visible
+     * @param bool $userAssignable user assignable
+     * @throws NotFound whenever the given tag id does not exist
+     * @throws Forbidden whenever there is no permission to update said tag
+     * @throws Conflict whenever a tag already exists with the given attributes
+     */
+    public function update($name, $userVisible, $userAssignable) {
+        try {
+            if (!$this->tagManager->canUserSeeTag($this->tag, $this->user)) {
+                throw new NotFound('Tag with id ' . $this->tag->getId() . ' does not exist');
+            }
+            if (!$this->tagManager->canUserAssignTag($this->tag, $this->user)) {
+                throw new Forbidden('No permission to update tag ' . $this->tag->getId());
+            }
+
+            // only admin is able to change permissions, regular users can only rename
+            if (!$this->isAdmin) {
+                // only renaming is allowed for regular users
+                if ($userVisible !== $this->tag->isUserVisible()
+                    || $userAssignable !== $this->tag->isUserAssignable()
+                ) {
+                    throw new Forbidden('No permission to update permissions for tag ' . $this->tag->getId());
+                }
+            }
+
+            $this->tagManager->updateTag($this->tag->getId(), $name, $userVisible, $userAssignable);
+        } catch (TagNotFoundException $e) {
+            throw new NotFound('Tag with id ' . $this->tag->getId() . ' does not exist');
+        } catch (TagAlreadyExistsException $e) {
+            throw new Conflict(
+                'Tag with the properties "' . $name . '", ' .
+                $userVisible . ', ' . $userAssignable . ' already exists'
+            );
+        }
+    }
+
+    /**
+     * Returns null, not supported
+     *
+     */
+    public function getLastModified() {
+        return null;
+    }
+
+    public function delete() {
+        try {
+            if (!$this->isAdmin) {
+                throw new Forbidden('No permission to delete tag ' . $this->tag->getId());
+            }
+
+            if (!$this->tagManager->canUserSeeTag($this->tag, $this->user)) {
+                throw new NotFound('Tag with id ' . $this->tag->getId() . ' not found');
+            }
+
+            $this->tagManager->deleteTags($this->tag->getId());
+        } catch (TagNotFoundException $e) {
+            // can happen if concurrent deletion occurred
+            throw new NotFound('Tag with id ' . $this->tag->getId() . ' not found', 0, $e);
+        }
+    }
 }

Spacing +9 added lines, -9 removed lines

@@ -120,10 +120,10 @@ 
 	public function update($name, $userVisible, $userAssignable) {
 		try {
 			if (!$this->tagManager->canUserSeeTag($this->tag, $this->user)) {
-				throw new NotFound('Tag with id ' . $this->tag->getId() . ' does not exist');
+				throw new NotFound('Tag with id '.$this->tag->getId().' does not exist');
 			}
 			if (!$this->tagManager->canUserAssignTag($this->tag, $this->user)) {
-				throw new Forbidden('No permission to update tag ' . $this->tag->getId());
+				throw new Forbidden('No permission to update tag '.$this->tag->getId());
 			}
 
 			// only admin is able to change permissions, regular users can only rename
@@ -132,17 +132,17 @@ 
 				if ($userVisible !== $this->tag->isUserVisible()
 					|| $userAssignable !== $this->tag->isUserAssignable()
 				) {
-					throw new Forbidden('No permission to update permissions for tag ' . $this->tag->getId());
+					throw new Forbidden('No permission to update permissions for tag '.$this->tag->getId());
 				}
 			}
 
 			$this->tagManager->updateTag($this->tag->getId(), $name, $userVisible, $userAssignable);
 		} catch (TagNotFoundException $e) {
-			throw new NotFound('Tag with id ' . $this->tag->getId() . ' does not exist');
+			throw new NotFound('Tag with id '.$this->tag->getId().' does not exist');
 		} catch (TagAlreadyExistsException $e) {
 			throw new Conflict(
-				'Tag with the properties "' . $name . '", ' .
-				$userVisible . ', ' . $userAssignable . ' already exists'
+				'Tag with the properties "'.$name.'", '.
+				$userVisible.', '.$userAssignable.' already exists'
 			);
 		}
 	}
@@ -158,17 +158,17 @@ 
 	public function delete() {
 		try {
 			if (!$this->isAdmin) {
-				throw new Forbidden('No permission to delete tag ' . $this->tag->getId());
+				throw new Forbidden('No permission to delete tag '.$this->tag->getId());
 			}
 
 			if (!$this->tagManager->canUserSeeTag($this->tag, $this->user)) {
-				throw new NotFound('Tag with id ' . $this->tag->getId() . ' not found');
+				throw new NotFound('Tag with id '.$this->tag->getId().' not found');
 			}
 
 			$this->tagManager->deleteTags($this->tag->getId());
 		} catch (TagNotFoundException $e) {
 			// can happen if concurrent deletion occurred
-			throw new NotFound('Tag with id ' . $this->tag->getId() . ' not found', 0, $e);
+			throw new NotFound('Tag with id '.$this->tag->getId().' not found', 0, $e);
 		}
 	}
 }

apps/dav/lib/SystemTag/SystemTagMappingNode.php

Indentation +130 added lines, -130 removed lines

@@ -37,134 +37,134 @@
  * Mapping node for system tag to object id
  */
 class SystemTagMappingNode implements \Sabre\DAV\INode {
-	/**
-	 * @var ISystemTag
-	 */
-	protected $tag;
-
-	/**
-	 * @var string
-	 */
-	private $objectId;
-
-	/**
-	 * @var string
-	 */
-	private $objectType;
-
-	/**
-	 * User
-	 *
-	 * @var IUser
-	 */
-	protected $user;
-
-	/**
-	 * @var ISystemTagManager
-	 */
-	protected $tagManager;
-
-	/**
-	 * @var ISystemTagObjectMapper
-	 */
-	private $tagMapper;
-
-	/**
-	 * Sets up the node, expects a full path name
-	 *
-	 * @param ISystemTag $tag system tag
-	 * @param string $objectId
-	 * @param string $objectType
-	 * @param IUser $user user
-	 * @param ISystemTagManager $tagManager
-	 * @param ISystemTagObjectMapper $tagMapper
-	 */
-	public function __construct(
-		ISystemTag $tag,
-		$objectId,
-		$objectType,
-		IUser $user,
-		ISystemTagManager $tagManager,
-		ISystemTagObjectMapper $tagMapper
-	) {
-		$this->tag = $tag;
-		$this->objectId = $objectId;
-		$this->objectType = $objectType;
-		$this->user = $user;
-		$this->tagManager = $tagManager;
-		$this->tagMapper = $tagMapper;
-	}
-
-	/**
-	 * Returns the object id of the relationship
-	 *
-	 * @return string object id
-	 */
-	public function getObjectId() {
-		return $this->objectId;
-	}
-
-	/**
-	 * Returns the object type of the relationship
-	 *
-	 * @return string object type
-	 */
-	public function getObjectType() {
-		return $this->objectType;
-	}
-
-	/**
-	 * Returns the system tag represented by this node
-	 *
-	 * @return ISystemTag system tag
-	 */
-	public function getSystemTag() {
-		return $this->tag;
-	}
-
-	/**
-	 *  Returns the id of the tag
-	 *
-	 * @return string
-	 */
-	public function getName() {
-		return $this->tag->getId();
-	}
-
-	/**
-	 * Renames the node
-	 *
-	 * @param string $name The new name
-	 *
-	 * @throws MethodNotAllowed not allowed to rename node
-	 */
-	public function setName($name) {
-		throw new MethodNotAllowed();
-	}
-
-	/**
-	 * Returns null, not supported
-	 *
-	 */
-	public function getLastModified() {
-		return null;
-	}
-
-	/**
-	 * Delete tag to object association
-	 */
-	public function delete() {
-		try {
-			if (!$this->tagManager->canUserSeeTag($this->tag, $this->user)) {
-				throw new NotFound('Tag with id ' . $this->tag->getId() . ' not found');
-			}
-			if (!$this->tagManager->canUserAssignTag($this->tag, $this->user)) {
-				throw new Forbidden('No permission to unassign tag ' . $this->tag->getId());
-			}
-			$this->tagMapper->unassignTags($this->objectId, $this->objectType, $this->tag->getId());
-		} catch (TagNotFoundException $e) {
-			// can happen if concurrent deletion occurred
-			throw new NotFound('Tag with id ' . $this->tag->getId() . ' not found', 0, $e);
-		}
-	}
+    /**
+     * @var ISystemTag
+     */
+    protected $tag;
+
+    /**
+     * @var string
+     */
+    private $objectId;
+
+    /**
+     * @var string
+     */
+    private $objectType;
+
+    /**
+     * User
+     *
+     * @var IUser
+     */
+    protected $user;
+
+    /**
+     * @var ISystemTagManager
+     */
+    protected $tagManager;
+
+    /**
+     * @var ISystemTagObjectMapper
+     */
+    private $tagMapper;
+
+    /**
+     * Sets up the node, expects a full path name
+     *
+     * @param ISystemTag $tag system tag
+     * @param string $objectId
+     * @param string $objectType
+     * @param IUser $user user
+     * @param ISystemTagManager $tagManager
+     * @param ISystemTagObjectMapper $tagMapper
+     */
+    public function __construct(
+        ISystemTag $tag,
+        $objectId,
+        $objectType,
+        IUser $user,
+        ISystemTagManager $tagManager,
+        ISystemTagObjectMapper $tagMapper
+    ) {
+        $this->tag = $tag;
+        $this->objectId = $objectId;
+        $this->objectType = $objectType;
+        $this->user = $user;
+        $this->tagManager = $tagManager;
+        $this->tagMapper = $tagMapper;
+    }
+
+    /**
+     * Returns the object id of the relationship
+     *
+     * @return string object id
+     */
+    public function getObjectId() {
+        return $this->objectId;
+    }
+
+    /**
+     * Returns the object type of the relationship
+     *
+     * @return string object type
+     */
+    public function getObjectType() {
+        return $this->objectType;
+    }
+
+    /**
+     * Returns the system tag represented by this node
+     *
+     * @return ISystemTag system tag
+     */
+    public function getSystemTag() {
+        return $this->tag;
+    }
+
+    /**
+     *  Returns the id of the tag
+     *
+     * @return string
+     */
+    public function getName() {
+        return $this->tag->getId();
+    }
+
+    /**
+     * Renames the node
+     *
+     * @param string $name The new name
+     *
+     * @throws MethodNotAllowed not allowed to rename node
+     */
+    public function setName($name) {
+        throw new MethodNotAllowed();
+    }
+
+    /**
+     * Returns null, not supported
+     *
+     */
+    public function getLastModified() {
+        return null;
+    }
+
+    /**
+     * Delete tag to object association
+     */
+    public function delete() {
+        try {
+            if (!$this->tagManager->canUserSeeTag($this->tag, $this->user)) {
+                throw new NotFound('Tag with id ' . $this->tag->getId() . ' not found');
+            }
+            if (!$this->tagManager->canUserAssignTag($this->tag, $this->user)) {
+                throw new Forbidden('No permission to unassign tag ' . $this->tag->getId());
+            }
+            $this->tagMapper->unassignTags($this->objectId, $this->objectType, $this->tag->getId());
+        } catch (TagNotFoundException $e) {
+            // can happen if concurrent deletion occurred
+            throw new NotFound('Tag with id ' . $this->tag->getId() . ' not found', 0, $e);
+        }
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -156,15 +156,15 @@
 	public function delete() {
 		try {
 			if (!$this->tagManager->canUserSeeTag($this->tag, $this->user)) {
-				throw new NotFound('Tag with id ' . $this->tag->getId() . ' not found');
+				throw new NotFound('Tag with id '.$this->tag->getId().' not found');
 			}
 			if (!$this->tagManager->canUserAssignTag($this->tag, $this->user)) {
-				throw new Forbidden('No permission to unassign tag ' . $this->tag->getId());
+				throw new Forbidden('No permission to unassign tag '.$this->tag->getId());
 			}
 			$this->tagMapper->unassignTags($this->objectId, $this->objectType, $this->tag->getId());
 		} catch (TagNotFoundException $e) {
 			// can happen if concurrent deletion occurred
-			throw new NotFound('Tag with id ' . $this->tag->getId() . ' not found', 0, $e);
+			throw new NotFound('Tag with id '.$this->tag->getId().' not found', 0, $e);
 		}
 	}
 }

lib/public/Activity/IProvider.php

Indentation +11 added lines, -11 removed lines

@@ -28,15 +28,15 @@
  * @since 11.0.0
  */
 interface IProvider {
-	/**
-	 * @param string $language The language which should be used for translating, e.g. "en"
-	 * @param IEvent $event The current event which should be parsed
-	 * @param IEvent|null $previousEvent A potential previous event which you can combine with the current one.
-	 *                                   To do so, simply use setChildEvent($previousEvent) after setting the
-	 *                                   combined subject on the current event.
-	 * @return IEvent
-	 * @throws \InvalidArgumentException Should be thrown if your provider does not know this event
-	 * @since 11.0.0
-	 */
-	public function parse($language, IEvent $event, IEvent $previousEvent = null);
+    /**
+     * @param string $language The language which should be used for translating, e.g. "en"
+     * @param IEvent $event The current event which should be parsed
+     * @param IEvent|null $previousEvent A potential previous event which you can combine with the current one.
+     *                                   To do so, simply use setChildEvent($previousEvent) after setting the
+     *                                   combined subject on the current event.
+     * @return IEvent
+     * @throws \InvalidArgumentException Should be thrown if your provider does not know this event
+     * @since 11.0.0
+     */
+    public function parse($language, IEvent $event, IEvent $previousEvent = null);
 }

lib/public/Activity/IConsumer.php

Indentation +7 added lines, -7 removed lines

@@ -38,12 +38,12 @@
  * @since 6.0.0
  */
 interface IConsumer {
-	/**
-	 * @param IEvent $event
-	 * @return null
-	 * @since 6.0.0
-	 * @since 8.2.0 Replaced the parameters with an IEvent object
-	 */
-	public function receive(IEvent $event);
+    /**
+     * @param IEvent $event
+     * @return null
+     * @since 6.0.0
+     * @since 8.2.0 Replaced the parameters with an IEvent object
+     */
+    public function receive(IEvent $event);
 }