YetiForceCompany / YetiForceCRM

libraries/SabreDAV/DAVACL/FS/File.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -2,9 +2,9 @@
 
 namespace Sabre\DAVACL\FS;
 
-use Sabre\DAV\FSExt\File as BaseFile;
 use Sabre\DAVACL\IACL;
 use Sabre\DAV\Exception\Forbidden;
+use Sabre\DAV\FSExt\File as BaseFile;
 
 /**
  * This is an ACL-enabled file node.

Indentation +104 added lines, -104 removed lines

@@ -15,109 +15,109 @@
  */
 class File extends BaseFile implements IACL {
 
-    /**
-     * A list of ACL rules.
-     *
-     * @var array
-     */
-    protected $acl;
-
-    /**
-     * Owner uri, or null for no owner.
-     *
-     * @var string|null
-     */
-    protected $owner;
-
-    /**
-     * Constructor
-     *
-     * @param string $path on-disk path.
-     * @param array $acl ACL rules.
-     * @param string|null $owner principal owner string.
-     */
-    public function __construct($path, array $acl, $owner = null) {
-
-        parent::__construct($path);
-        $this->acl = $acl;
-        $this->owner = $owner;
-
-    }
-
-    /**
-     * Returns the owner principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getOwner() {
-
-        return $this->owner;
-
-    }
-
-    /**
-     * Returns a group principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getGroup() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to
-     *      be updated.
-     *
-     * @return array
-     */
-    public function getACL() {
-
-        return $this->acl;
-
-    }
-
-    /**
-     * Updates the ACL
-     *
-     * This method will receive a list of new ACE's as an array argument.
-     *
-     * @param array $acl
-     * @return void
-     */
-    public function setACL(array $acl) {
-
-        throw new Forbidden('Setting ACL is not allowed here');
-
-    }
-
-    /**
-     * Returns the list of supported privileges for this node.
-     *
-     * The returned data structure is a list of nested privileges.
-     * See Sabre\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
-     * standard structure.
-     *
-     * If null is returned from this method, the default privilege set is used,
-     * which is fine for most common usecases.
-     *
-     * @return array|null
-     */
-    public function getSupportedPrivilegeSet() {
-
-        return null;
-
-    }
+	/**
+	 * A list of ACL rules.
+	 *
+	 * @var array
+	 */
+	protected $acl;
+
+	/**
+	 * Owner uri, or null for no owner.
+	 *
+	 * @var string|null
+	 */
+	protected $owner;
+
+	/**
+	 * Constructor
+	 *
+	 * @param string $path on-disk path.
+	 * @param array $acl ACL rules.
+	 * @param string|null $owner principal owner string.
+	 */
+	public function __construct($path, array $acl, $owner = null) {
+
+		parent::__construct($path);
+		$this->acl = $acl;
+		$this->owner = $owner;
+
+	}
+
+	/**
+	 * Returns the owner principal
+	 *
+	 * This must be a url to a principal, or null if there's no owner
+	 *
+	 * @return string|null
+	 */
+	public function getOwner() {
+
+		return $this->owner;
+
+	}
+
+	/**
+	 * Returns a group principal
+	 *
+	 * This must be a url to a principal, or null if there's no owner
+	 *
+	 * @return string|null
+	 */
+	public function getGroup() {
+
+		return null;
+
+	}
+
+	/**
+	 * Returns a list of ACE's for this node.
+	 *
+	 * Each ACE has the following properties:
+	 *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
+	 *     currently the only supported privileges
+	 *   * 'principal', a url to the principal who owns the node
+	 *   * 'protected' (optional), indicating that this ACE is not allowed to
+	 *      be updated.
+	 *
+	 * @return array
+	 */
+	public function getACL() {
+
+		return $this->acl;
+
+	}
+
+	/**
+	 * Updates the ACL
+	 *
+	 * This method will receive a list of new ACE's as an array argument.
+	 *
+	 * @param array $acl
+	 * @return void
+	 */
+	public function setACL(array $acl) {
+
+		throw new Forbidden('Setting ACL is not allowed here');
+
+	}
+
+	/**
+	 * Returns the list of supported privileges for this node.
+	 *
+	 * The returned data structure is a list of nested privileges.
+	 * See Sabre\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
+	 * standard structure.
+	 *
+	 * If null is returned from this method, the default privilege set is used,
+	 * which is fine for most common usecases.
+	 *
+	 * @return array|null
+	 */
+	public function getSupportedPrivilegeSet() {
+
+		return null;
+
+	}
 
 }

libraries/SabreDAV/DAVACL/FS/HomeCollection.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -2,10 +2,10 @@
 
 namespace Sabre\DAVACL\FS;
 
-use Sabre\DAV\Exception\Forbidden;
 use Sabre\DAVACL\AbstractPrincipalCollection;
 use Sabre\DAVACL\IACL;
 use Sabre\DAVACL\PrincipalBackend\BackendInterface;
+use Sabre\DAV\Exception\Forbidden;
 use Sabre\Uri;
 
 /**

Indentation +163 added lines, -163 removed lines

@@ -21,168 +21,168 @@
  */
 class HomeCollection extends AbstractPrincipalCollection implements IACL {
 
-    /**
-     * Name of this collection.
-     *
-     * @var string
-     */
-    public $collectionName = 'home';
-
-    /**
-     * Path to where the users' files are actually stored.
-     *
-     * @var string
-     */
-    protected $storagePath;
-
-    /**
-     * Creates the home collection.
-     *
-     * @param BackendInterface $principalBackend
-     * @param string $storagePath Where the actual files are stored.
-     * @param string $principalPrefix list of principals to iterate.
-     */
-    public function __construct(BackendInterface $principalBackend, $storagePath, $principalPrefix = 'principals') {
-
-        parent::__construct($principalBackend, $principalPrefix);
-        $this->storagePath = $storagePath;
-
-    }
-
-    /**
-     * Returns the name of the node.
-     *
-     * This is used to generate the url.
-     *
-     * @return string
-     */
-    public function getName() {
-
-        return $this->collectionName;
-
-    }
-
-    /**
-     * Returns a principals' collection of files.
-     *
-     * The passed array contains principal information, and is guaranteed to
-     * at least contain a uri item. Other properties may or may not be
-     * supplied by the authentication backend.
-     *
-     * @param array $principalInfo
-     * @return void
-     */
-    public function getChildForPrincipal(array $principalInfo) {
-
-        $owner = $principalInfo['uri'];
-        $acl = [
-            [
-                'privilege' => '{DAV:}read',
-                'principal' => $owner,
-                'protected' => true,
-            ],
-            [
-                'privilege' => '{DAV:}write',
-                'principal' => $owner,
-                'protected' => true,
-            ],
-        ];
-
-        list(, $principalBaseName) = Uri\split($owner);
-
-        $path = $this->storagePath . '/' . $principalBaseName;
-
-        if (!is_dir($path)) {
-            mkdir($path, 0777, true);
-        }
-        return new Collection(
-            $path,
-            $acl,
-            $owner
-        );
-
-    }
-
-    /**
-     * Returns the owner principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getOwner() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns a group principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getGroup() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to
-     *      be updated.
-     *
-     * @return array
-     */
-    public function getACL() {
-
-        return [
-            [
-                'principal' => '{DAV:}authenticated',
-                'privilege' => '{DAV:}read',
-                'protected' => true,
-            ]
-        ];
-
-    }
-
-    /**
-     * Updates the ACL
-     *
-     * This method will receive a list of new ACE's as an array argument.
-     *
-     * @param array $acl
-     * @return void
-     */
-    public function setACL(array $acl) {
-
-        throw new Forbidden('Setting ACL is not allowed here');
-
-    }
-
-    /**
-     * Returns the list of supported privileges for this node.
-     *
-     * The returned data structure is a list of nested privileges.
-     * See Sabre\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
-     * standard structure.
-     *
-     * If null is returned from this method, the default privilege set is used,
-     * which is fine for most common usecases.
-     *
-     * @return array|null
-     */
-    public function getSupportedPrivilegeSet() {
-
-        return null;
-
-    }
+	/**
+	 * Name of this collection.
+	 *
+	 * @var string
+	 */
+	public $collectionName = 'home';
+
+	/**
+	 * Path to where the users' files are actually stored.
+	 *
+	 * @var string
+	 */
+	protected $storagePath;
+
+	/**
+	 * Creates the home collection.
+	 *
+	 * @param BackendInterface $principalBackend
+	 * @param string $storagePath Where the actual files are stored.
+	 * @param string $principalPrefix list of principals to iterate.
+	 */
+	public function __construct(BackendInterface $principalBackend, $storagePath, $principalPrefix = 'principals') {
+
+		parent::__construct($principalBackend, $principalPrefix);
+		$this->storagePath = $storagePath;
+
+	}
+
+	/**
+	 * Returns the name of the node.
+	 *
+	 * This is used to generate the url.
+	 *
+	 * @return string
+	 */
+	public function getName() {
+
+		return $this->collectionName;
+
+	}
+
+	/**
+	 * Returns a principals' collection of files.
+	 *
+	 * The passed array contains principal information, and is guaranteed to
+	 * at least contain a uri item. Other properties may or may not be
+	 * supplied by the authentication backend.
+	 *
+	 * @param array $principalInfo
+	 * @return void
+	 */
+	public function getChildForPrincipal(array $principalInfo) {
+
+		$owner = $principalInfo['uri'];
+		$acl = [
+			[
+				'privilege' => '{DAV:}read',
+				'principal' => $owner,
+				'protected' => true,
+			],
+			[
+				'privilege' => '{DAV:}write',
+				'principal' => $owner,
+				'protected' => true,
+			],
+		];
+
+		list(, $principalBaseName) = Uri\split($owner);
+
+		$path = $this->storagePath . '/' . $principalBaseName;
+
+		if (!is_dir($path)) {
+			mkdir($path, 0777, true);
+		}
+		return new Collection(
+			$path,
+			$acl,
+			$owner
+		);
+
+	}
+
+	/**
+	 * Returns the owner principal
+	 *
+	 * This must be a url to a principal, or null if there's no owner
+	 *
+	 * @return string|null
+	 */
+	public function getOwner() {
+
+		return null;
+
+	}
+
+	/**
+	 * Returns a group principal
+	 *
+	 * This must be a url to a principal, or null if there's no owner
+	 *
+	 * @return string|null
+	 */
+	public function getGroup() {
+
+		return null;
+
+	}
+
+	/**
+	 * Returns a list of ACE's for this node.
+	 *
+	 * Each ACE has the following properties:
+	 *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
+	 *     currently the only supported privileges
+	 *   * 'principal', a url to the principal who owns the node
+	 *   * 'protected' (optional), indicating that this ACE is not allowed to
+	 *      be updated.
+	 *
+	 * @return array
+	 */
+	public function getACL() {
+
+		return [
+			[
+				'principal' => '{DAV:}authenticated',
+				'privilege' => '{DAV:}read',
+				'protected' => true,
+			]
+		];
+
+	}
+
+	/**
+	 * Updates the ACL
+	 *
+	 * This method will receive a list of new ACE's as an array argument.
+	 *
+	 * @param array $acl
+	 * @return void
+	 */
+	public function setACL(array $acl) {
+
+		throw new Forbidden('Setting ACL is not allowed here');
+
+	}
+
+	/**
+	 * Returns the list of supported privileges for this node.
+	 *
+	 * The returned data structure is a list of nested privileges.
+	 * See Sabre\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
+	 * standard structure.
+	 *
+	 * If null is returned from this method, the default privilege set is used,
+	 * which is fine for most common usecases.
+	 *
+	 * @return array|null
+	 */
+	public function getSupportedPrivilegeSet() {
+
+		return null;
+
+	}
 
 }

Doc Comments +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
      * supplied by the authentication backend.
      *
      * @param array $principalInfo
-     * @return void
+     * @return Collection
      */
     public function getChildForPrincipal(array $principalInfo) {
 

libraries/SabreDAV/DAVACL/Plugin.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -3,8 +3,8 @@
 namespace Sabre\DAVACL;
 
 use Sabre\DAV;
-use Sabre\DAV\INode;
 use Sabre\DAV\Exception\BadRequest;
+use Sabre\DAV\INode;
 use Sabre\HTTP\RequestInterface;
 use Sabre\HTTP\ResponseInterface;
 use Sabre\Uri;

Indentation +1255 added lines, -1255 removed lines

@@ -25,1265 +25,1265 @@ 
  */
 class Plugin extends DAV\ServerPlugin {
 
-    /**
-     * Recursion constants
-     *
-     * This only checks the base node
-     */
-    const R_PARENT = 1;
-
-    /**
-     * Recursion constants
-     *
-     * This checks every node in the tree
-     */
-    const R_RECURSIVE = 2;
-
-    /**
-     * Recursion constants
-     *
-     * This checks every parentnode in the tree, but not leaf-nodes.
-     */
-    const R_RECURSIVEPARENTS = 3;
-
-    /**
-     * Reference to server object.
-     *
-     * @var Sabre\DAV\Server
-     */
-    protected $server;
-
-    /**
-     * List of urls containing principal collections.
-     * Modify this if your principals are located elsewhere.
-     *
-     * @var array
-     */
-    public $principalCollectionSet = [
-        'principals',
-    ];
-
-    /**
-     * By default ACL is only enforced for nodes that have ACL support (the
-     * ones that implement IACL). For any other node, access is
-     * always granted.
-     *
-     * To override this behaviour you can turn this setting off. This is useful
-     * if you plan to fully support ACL in the entire tree.
-     *
-     * @var bool
-     */
-    public $allowAccessToNodesWithoutACL = true;
-
-    /**
-     * By default nodes that are inaccessible by the user, can still be seen
-     * in directory listings (PROPFIND on parent with Depth: 1)
-     *
-     * In certain cases it's desirable to hide inaccessible nodes. Setting this
-     * to true will cause these nodes to be hidden from directory listings.
-     *
-     * @var bool
-     */
-    public $hideNodesFromListings = false;
-
-    /**
-     * This list of properties are the properties a client can search on using
-     * the {DAV:}principal-property-search report.
-     *
-     * The keys are the property names, values are descriptions.
-     *
-     * @var array
-     */
-    public $principalSearchPropertySet = [
-        '{DAV:}displayname'                     => 'Display name',
-        '{http://sabredav.org/ns}email-address' => 'Email address',
-    ];
-
-    /**
-     * Any principal uri's added here, will automatically be added to the list
-     * of ACL's. They will effectively receive {DAV:}all privileges, as a
-     * protected privilege.
-     *
-     * @var array
-     */
-    public $adminPrincipals = [];
-
-    /**
-     * Returns a list of features added by this plugin.
-     *
-     * This list is used in the response of a HTTP OPTIONS request.
-     *
-     * @return array
-     */
-    public function getFeatures() {
-
-        return ['access-control', 'calendarserver-principal-property-search'];
-
-    }
-
-    /**
-     * Returns a list of available methods for a given url
-     *
-     * @param string $uri
-     * @return array
-     */
-    public function getMethods($uri) {
-
-        return ['ACL'];
-
-    }
-
-    /**
-     * Returns a plugin name.
-     *
-     * Using this name other plugins will be able to access other plugins
-     * using Sabre\DAV\Server::getPlugin
-     *
-     * @return string
-     */
-    public function getPluginName() {
-
-        return 'acl';
-
-    }
-
-    /**
-     * Returns a list of reports this plugin supports.
-     *
-     * This will be used in the {DAV:}supported-report-set property.
-     * Note that you still need to subscribe to the 'report' event to actually
-     * implement them
-     *
-     * @param string $uri
-     * @return array
-     */
-    public function getSupportedReportSet($uri) {
-
-        return [
-            '{DAV:}expand-property',
-            '{DAV:}principal-property-search',
-            '{DAV:}principal-search-property-set',
-        ];
-
-    }
-
-
-    /**
-     * Checks if the current user has the specified privilege(s).
-     *
-     * You can specify a single privilege, or a list of privileges.
-     * This method will throw an exception if the privilege is not available
-     * and return true otherwise.
-     *
-     * @param string $uri
-     * @param array|string $privileges
-     * @param int $recursion
-     * @param bool $throwExceptions if set to false, this method won't throw exceptions.
-     * @throws Sabre\DAVACL\Exception\NeedPrivileges
-     * @return bool
-     */
-    public function checkPrivileges($uri, $privileges, $recursion = self::R_PARENT, $throwExceptions = true) {
-
-        if (!is_array($privileges)) $privileges = [$privileges];
-
-        $acl = $this->getCurrentUserPrivilegeSet($uri);
-
-        if (is_null($acl)) {
-            if ($this->allowAccessToNodesWithoutACL) {
-                return true;
-            } else {
-                if ($throwExceptions)
-                    throw new Exception\NeedPrivileges($uri, $privileges);
-                else
-                    return false;
-
-            }
-        }
-
-        $failed = [];
-        foreach ($privileges as $priv) {
-
-            if (!in_array($priv, $acl)) {
-                $failed[] = $priv;
-            }
-
-        }
-
-        if ($failed) {
-            if ($throwExceptions)
-                throw new Exception\NeedPrivileges($uri, $failed);
-            else
-                return false;
-        }
-        return true;
+	/**
+	 * Recursion constants
+	 *
+	 * This only checks the base node
+	 */
+	const R_PARENT = 1;
+
+	/**
+	 * Recursion constants
+	 *
+	 * This checks every node in the tree
+	 */
+	const R_RECURSIVE = 2;
+
+	/**
+	 * Recursion constants
+	 *
+	 * This checks every parentnode in the tree, but not leaf-nodes.
+	 */
+	const R_RECURSIVEPARENTS = 3;
+
+	/**
+	 * Reference to server object.
+	 *
+	 * @var Sabre\DAV\Server
+	 */
+	protected $server;
+
+	/**
+	 * List of urls containing principal collections.
+	 * Modify this if your principals are located elsewhere.
+	 *
+	 * @var array
+	 */
+	public $principalCollectionSet = [
+		'principals',
+	];
+
+	/**
+	 * By default ACL is only enforced for nodes that have ACL support (the
+	 * ones that implement IACL). For any other node, access is
+	 * always granted.
+	 *
+	 * To override this behaviour you can turn this setting off. This is useful
+	 * if you plan to fully support ACL in the entire tree.
+	 *
+	 * @var bool
+	 */
+	public $allowAccessToNodesWithoutACL = true;
+
+	/**
+	 * By default nodes that are inaccessible by the user, can still be seen
+	 * in directory listings (PROPFIND on parent with Depth: 1)
+	 *
+	 * In certain cases it's desirable to hide inaccessible nodes. Setting this
+	 * to true will cause these nodes to be hidden from directory listings.
+	 *
+	 * @var bool
+	 */
+	public $hideNodesFromListings = false;
+
+	/**
+	 * This list of properties are the properties a client can search on using
+	 * the {DAV:}principal-property-search report.
+	 *
+	 * The keys are the property names, values are descriptions.
+	 *
+	 * @var array
+	 */
+	public $principalSearchPropertySet = [
+		'{DAV:}displayname'                     => 'Display name',
+		'{http://sabredav.org/ns}email-address' => 'Email address',
+	];
+
+	/**
+	 * Any principal uri's added here, will automatically be added to the list
+	 * of ACL's. They will effectively receive {DAV:}all privileges, as a
+	 * protected privilege.
+	 *
+	 * @var array
+	 */
+	public $adminPrincipals = [];
+
+	/**
+	 * Returns a list of features added by this plugin.
+	 *
+	 * This list is used in the response of a HTTP OPTIONS request.
+	 *
+	 * @return array
+	 */
+	public function getFeatures() {
+
+		return ['access-control', 'calendarserver-principal-property-search'];
+
+	}
+
+	/**
+	 * Returns a list of available methods for a given url
+	 *
+	 * @param string $uri
+	 * @return array
+	 */
+	public function getMethods($uri) {
+
+		return ['ACL'];
+
+	}
+
+	/**
+	 * Returns a plugin name.
+	 *
+	 * Using this name other plugins will be able to access other plugins
+	 * using Sabre\DAV\Server::getPlugin
+	 *
+	 * @return string
+	 */
+	public function getPluginName() {
+
+		return 'acl';
+
+	}
+
+	/**
+	 * Returns a list of reports this plugin supports.
+	 *
+	 * This will be used in the {DAV:}supported-report-set property.
+	 * Note that you still need to subscribe to the 'report' event to actually
+	 * implement them
+	 *
+	 * @param string $uri
+	 * @return array
+	 */
+	public function getSupportedReportSet($uri) {
+
+		return [
+			'{DAV:}expand-property',
+			'{DAV:}principal-property-search',
+			'{DAV:}principal-search-property-set',
+		];
+
+	}
+
+
+	/**
+	 * Checks if the current user has the specified privilege(s).
+	 *
+	 * You can specify a single privilege, or a list of privileges.
+	 * This method will throw an exception if the privilege is not available
+	 * and return true otherwise.
+	 *
+	 * @param string $uri
+	 * @param array|string $privileges
+	 * @param int $recursion
+	 * @param bool $throwExceptions if set to false, this method won't throw exceptions.
+	 * @throws Sabre\DAVACL\Exception\NeedPrivileges
+	 * @return bool
+	 */
+	public function checkPrivileges($uri, $privileges, $recursion = self::R_PARENT, $throwExceptions = true) {
+
+		if (!is_array($privileges)) $privileges = [$privileges];
+
+		$acl = $this->getCurrentUserPrivilegeSet($uri);
+
+		if (is_null($acl)) {
+			if ($this->allowAccessToNodesWithoutACL) {
+				return true;
+			} else {
+				if ($throwExceptions)
+					throw new Exception\NeedPrivileges($uri, $privileges);
+				else
+					return false;
+
+			}
+		}
+
+		$failed = [];
+		foreach ($privileges as $priv) {
+
+			if (!in_array($priv, $acl)) {
+				$failed[] = $priv;
+			}
+
+		}
+
+		if ($failed) {
+			if ($throwExceptions)
+				throw new Exception\NeedPrivileges($uri, $failed);
+			else
+				return false;
+		}
+		return true;
 
-    }
-
-    /**
-     * Returns the standard users' principal.
-     *
-     * This is one authorative principal url for the current user.
-     * This method will return null if the user wasn't logged in.
-     *
-     * @return string|null
-     */
-    public function getCurrentUserPrincipal() {
-
-        $authPlugin = $this->server->getPlugin('auth');
-        if (is_null($authPlugin)) return null;
-        /** @var $authPlugin Sabre\DAV\Auth\Plugin */
-
-        return $authPlugin->getCurrentPrincipal();
-
-    }
-
-
-    /**
-     * Returns a list of principals that's associated to the current
-     * user, either directly or through group membership.
-     *
-     * @return array
-     */
-    public function getCurrentUserPrincipals() {
-
-        $currentUser = $this->getCurrentUserPrincipal();
-
-        if (is_null($currentUser)) return [];
-
-        return array_merge(
-            [$currentUser],
-            $this->getPrincipalMembership($currentUser)
-        );
-
-    }
-
-    /**
-     * This array holds a cache for all the principals that are associated with
-     * a single principal.
-     *
-     * @var array
-     */
-    protected $principalMembershipCache = [];
-
-
-    /**
-     * Returns all the principal groups the specified principal is a member of.
-     *
-     * @param string $principal
-     * @return array
-     */
-    public function getPrincipalMembership($mainPrincipal) {
-
-        // First check our cache
-        if (isset($this->principalMembershipCache[$mainPrincipal])) {
-            return $this->principalMembershipCache[$mainPrincipal];
-        }
-
-        $check = [$mainPrincipal];
-        $principals = [];
-
-        while (count($check)) {
-
-            $principal = array_shift($check);
-
-            $node = $this->server->tree->getNodeForPath($principal);
-            if ($node instanceof IPrincipal) {
-                foreach ($node->getGroupMembership() as $groupMember) {
-
-                    if (!in_array($groupMember, $principals)) {
-
-                        $check[] = $groupMember;
-                        $principals[] = $groupMember;
-
-                    }
-
-                }
-
-            }
-
-        }
-
-        // Store the result in the cache
-        $this->principalMembershipCache[$mainPrincipal] = $principals;
-
-        return $principals;
-
-    }
-
-    /**
-     * Returns the supported privilege structure for this ACL plugin.
-     *
-     * See RFC3744 for more details. Currently we default on a simple,
-     * standard structure.
-     *
-     * You can either get the list of privileges by a uri (path) or by
-     * specifying a Node.
-     *
-     * @param string|INode $node
-     * @return array
-     */
-    public function getSupportedPrivilegeSet($node) {
-
-        if (is_string($node)) {
-            $node = $this->server->tree->getNodeForPath($node);
-        }
-
-        if ($node instanceof IACL) {
-            $result = $node->getSupportedPrivilegeSet();
-
-            if ($result)
-                return $result;
-        }
-
-        return self::getDefaultSupportedPrivilegeSet();
-
-    }
-
-    /**
-     * Returns a fairly standard set of privileges, which may be useful for
-     * other systems to use as a basis.
-     *
-     * @return array
-     */
-    static function getDefaultSupportedPrivilegeSet() {
-
-        return [
-            'privilege'  => '{DAV:}all',
-            'abstract'   => true,
-            'aggregates' => [
-                [
-                    'privilege'  => '{DAV:}read',
-                    'aggregates' => [
-                        [
-                            'privilege' => '{DAV:}read-acl',
-                            'abstract'  => false,
-                        ],
-                        [
-                            'privilege' => '{DAV:}read-current-user-privilege-set',
-                            'abstract'  => false,
-                        ],
-                    ],
-                ], // {DAV:}read
-                [
-                    'privilege'  => '{DAV:}write',
-                    'aggregates' => [
-                        [
-                            'privilege' => '{DAV:}write-acl',
-                            'abstract'  => false,
-                        ],
-                        [
-                            'privilege' => '{DAV:}write-properties',
-                            'abstract'  => false,
-                        ],
-                        [
-                            'privilege' => '{DAV:}write-content',
-                            'abstract'  => false,
-                        ],
-                        [
-                            'privilege' => '{DAV:}bind',
-                            'abstract'  => false,
-                        ],
-                        [
-                            'privilege' => '{DAV:}unbind',
-                            'abstract'  => false,
-                        ],
-                        [
-                            'privilege' => '{DAV:}unlock',
-                            'abstract'  => false,
-                        ],
-                    ],
-                ], // {DAV:}write
-            ],
-        ]; // {DAV:}all
-
-    }
-
-    /**
-     * Returns the supported privilege set as a flat list
-     *
-     * This is much easier to parse.
-     *
-     * The returned list will be index by privilege name.
-     * The value is a struct containing the following properties:
-     *   - aggregates
-     *   - abstract
-     *   - concrete
-     *
-     * @param string|INode $node
-     * @return array
-     */
-    final function getFlatPrivilegeSet($node) {
-
-        $privs = $this->getSupportedPrivilegeSet($node);
-
-        $fpsTraverse = null;
-        $fpsTraverse = function($priv, $concrete, &$flat) use (&$fpsTraverse) {
-
-            $myPriv = [
-                'privilege'  => $priv['privilege'],
-                'abstract'   => isset($priv['abstract']) && $priv['abstract'],
-                'aggregates' => [],
-                'concrete'   => isset($priv['abstract']) && $priv['abstract'] ? $concrete : $priv['privilege'],
-            ];
-
-            if (isset($priv['aggregates'])) {
-
-                foreach ($priv['aggregates'] as $subPriv) {
-
-                    $myPriv['aggregates'][] = $subPriv['privilege'];
-
-                }
-
-            }
-
-            $flat[$priv['privilege']] = $myPriv;
-
-            if (isset($priv['aggregates'])) {
-
-                foreach ($priv['aggregates'] as $subPriv) {
-
-                    $fpsTraverse($subPriv, $myPriv['concrete'], $flat);
-
-                }
-
-            }
-
-        };
-
-        $flat = [];
-        $fpsTraverse($privs, null, $flat);
-
-        return $flat;
-
-    }
-
-    /**
-     * Returns the full ACL list.
-     *
-     * Either a uri or a INode may be passed.
-     *
-     * null will be returned if the node doesn't support ACLs.
-     *
-     * @param string|DAV\INode $node
-     * @return array
-     */
-    public function getACL($node) {
-
-        if (is_string($node)) {
-            $node = $this->server->tree->getNodeForPath($node);
-        }
-        if (!$node instanceof IACL) {
-            return null;
-        }
-        $acl = $node->getACL();
-        foreach ($this->adminPrincipals as $adminPrincipal) {
-            $acl[] = [
-                'principal' => $adminPrincipal,
-                'privilege' => '{DAV:}all',
-                'protected' => true,
-            ];
-        }
-        return $acl;
+	}
+
+	/**
+	 * Returns the standard users' principal.
+	 *
+	 * This is one authorative principal url for the current user.
+	 * This method will return null if the user wasn't logged in.
+	 *
+	 * @return string|null
+	 */
+	public function getCurrentUserPrincipal() {
+
+		$authPlugin = $this->server->getPlugin('auth');
+		if (is_null($authPlugin)) return null;
+		/** @var $authPlugin Sabre\DAV\Auth\Plugin */
+
+		return $authPlugin->getCurrentPrincipal();
+
+	}
+
+
+	/**
+	 * Returns a list of principals that's associated to the current
+	 * user, either directly or through group membership.
+	 *
+	 * @return array
+	 */
+	public function getCurrentUserPrincipals() {
+
+		$currentUser = $this->getCurrentUserPrincipal();
+
+		if (is_null($currentUser)) return [];
+
+		return array_merge(
+			[$currentUser],
+			$this->getPrincipalMembership($currentUser)
+		);
+
+	}
+
+	/**
+	 * This array holds a cache for all the principals that are associated with
+	 * a single principal.
+	 *
+	 * @var array
+	 */
+	protected $principalMembershipCache = [];
+
+
+	/**
+	 * Returns all the principal groups the specified principal is a member of.
+	 *
+	 * @param string $principal
+	 * @return array
+	 */
+	public function getPrincipalMembership($mainPrincipal) {
+
+		// First check our cache
+		if (isset($this->principalMembershipCache[$mainPrincipal])) {
+			return $this->principalMembershipCache[$mainPrincipal];
+		}
+
+		$check = [$mainPrincipal];
+		$principals = [];
+
+		while (count($check)) {
+
+			$principal = array_shift($check);
+
+			$node = $this->server->tree->getNodeForPath($principal);
+			if ($node instanceof IPrincipal) {
+				foreach ($node->getGroupMembership() as $groupMember) {
+
+					if (!in_array($groupMember, $principals)) {
+
+						$check[] = $groupMember;
+						$principals[] = $groupMember;
+
+					}
+
+				}
+
+			}
+
+		}
+
+		// Store the result in the cache
+		$this->principalMembershipCache[$mainPrincipal] = $principals;
+
+		return $principals;
+
+	}
+
+	/**
+	 * Returns the supported privilege structure for this ACL plugin.
+	 *
+	 * See RFC3744 for more details. Currently we default on a simple,
+	 * standard structure.
+	 *
+	 * You can either get the list of privileges by a uri (path) or by
+	 * specifying a Node.
+	 *
+	 * @param string|INode $node
+	 * @return array
+	 */
+	public function getSupportedPrivilegeSet($node) {
+
+		if (is_string($node)) {
+			$node = $this->server->tree->getNodeForPath($node);
+		}
+
+		if ($node instanceof IACL) {
+			$result = $node->getSupportedPrivilegeSet();
+
+			if ($result)
+				return $result;
+		}
+
+		return self::getDefaultSupportedPrivilegeSet();
+
+	}
+
+	/**
+	 * Returns a fairly standard set of privileges, which may be useful for
+	 * other systems to use as a basis.
+	 *
+	 * @return array
+	 */
+	static function getDefaultSupportedPrivilegeSet() {
+
+		return [
+			'privilege'  => '{DAV:}all',
+			'abstract'   => true,
+			'aggregates' => [
+				[
+					'privilege'  => '{DAV:}read',
+					'aggregates' => [
+						[
+							'privilege' => '{DAV:}read-acl',
+							'abstract'  => false,
+						],
+						[
+							'privilege' => '{DAV:}read-current-user-privilege-set',
+							'abstract'  => false,
+						],
+					],
+				], // {DAV:}read
+				[
+					'privilege'  => '{DAV:}write',
+					'aggregates' => [
+						[
+							'privilege' => '{DAV:}write-acl',
+							'abstract'  => false,
+						],
+						[
+							'privilege' => '{DAV:}write-properties',
+							'abstract'  => false,
+						],
+						[
+							'privilege' => '{DAV:}write-content',
+							'abstract'  => false,
+						],
+						[
+							'privilege' => '{DAV:}bind',
+							'abstract'  => false,
+						],
+						[
+							'privilege' => '{DAV:}unbind',
+							'abstract'  => false,
+						],
+						[
+							'privilege' => '{DAV:}unlock',
+							'abstract'  => false,
+						],
+					],
+				], // {DAV:}write
+			],
+		]; // {DAV:}all
+
+	}
+
+	/**
+	 * Returns the supported privilege set as a flat list
+	 *
+	 * This is much easier to parse.
+	 *
+	 * The returned list will be index by privilege name.
+	 * The value is a struct containing the following properties:
+	 *   - aggregates
+	 *   - abstract
+	 *   - concrete
+	 *
+	 * @param string|INode $node
+	 * @return array
+	 */
+	final function getFlatPrivilegeSet($node) {
+
+		$privs = $this->getSupportedPrivilegeSet($node);
+
+		$fpsTraverse = null;
+		$fpsTraverse = function($priv, $concrete, &$flat) use (&$fpsTraverse) {
+
+			$myPriv = [
+				'privilege'  => $priv['privilege'],
+				'abstract'   => isset($priv['abstract']) && $priv['abstract'],
+				'aggregates' => [],
+				'concrete'   => isset($priv['abstract']) && $priv['abstract'] ? $concrete : $priv['privilege'],
+			];
+
+			if (isset($priv['aggregates'])) {
+
+				foreach ($priv['aggregates'] as $subPriv) {
+
+					$myPriv['aggregates'][] = $subPriv['privilege'];
+
+				}
+
+			}
+
+			$flat[$priv['privilege']] = $myPriv;
+
+			if (isset($priv['aggregates'])) {
+
+				foreach ($priv['aggregates'] as $subPriv) {
+
+					$fpsTraverse($subPriv, $myPriv['concrete'], $flat);
+
+				}
+
+			}
+
+		};
+
+		$flat = [];
+		$fpsTraverse($privs, null, $flat);
+
+		return $flat;
+
+	}
+
+	/**
+	 * Returns the full ACL list.
+	 *
+	 * Either a uri or a INode may be passed.
+	 *
+	 * null will be returned if the node doesn't support ACLs.
+	 *
+	 * @param string|DAV\INode $node
+	 * @return array
+	 */
+	public function getACL($node) {
+
+		if (is_string($node)) {
+			$node = $this->server->tree->getNodeForPath($node);
+		}
+		if (!$node instanceof IACL) {
+			return null;
+		}
+		$acl = $node->getACL();
+		foreach ($this->adminPrincipals as $adminPrincipal) {
+			$acl[] = [
+				'principal' => $adminPrincipal,
+				'privilege' => '{DAV:}all',
+				'protected' => true,
+			];
+		}
+		return $acl;
 
-    }
+	}
 
-    /**
-     * Returns a list of privileges the current user has
-     * on a particular node.
-     *
-     * Either a uri or a DAV\INode may be passed.
-     *
-     * null will be returned if the node doesn't support ACLs.
-     *
-     * @param string|DAV\INode $node
-     * @return array
-     */
-    public function getCurrentUserPrivilegeSet($node) {
+	/**
+	 * Returns a list of privileges the current user has
+	 * on a particular node.
+	 *
+	 * Either a uri or a DAV\INode may be passed.
+	 *
+	 * null will be returned if the node doesn't support ACLs.
+	 *
+	 * @param string|DAV\INode $node
+	 * @return array
+	 */
+	public function getCurrentUserPrivilegeSet($node) {
 
-        if (is_string($node)) {
-            $node = $this->server->tree->getNodeForPath($node);
-        }
+		if (is_string($node)) {
+			$node = $this->server->tree->getNodeForPath($node);
+		}
 
-        $acl = $this->getACL($node);
+		$acl = $this->getACL($node);
 
-        if (is_null($acl)) return null;
+		if (is_null($acl)) return null;
 
-        $principals = $this->getCurrentUserPrincipals();
+		$principals = $this->getCurrentUserPrincipals();
 
-        $collected = [];
+		$collected = [];
 
-        foreach ($acl as $ace) {
+		foreach ($acl as $ace) {
 
-            $principal = $ace['principal'];
+			$principal = $ace['principal'];
 
-            switch ($principal) {
+			switch ($principal) {
 
-                case '{DAV:}owner' :
-                    $owner = $node->getOwner();
-                    if ($owner && in_array($owner, $principals)) {
-                        $collected[] = $ace;
-                    }
-                    break;
+				case '{DAV:}owner' :
+					$owner = $node->getOwner();
+					if ($owner && in_array($owner, $principals)) {
+						$collected[] = $ace;
+					}
+					break;
 
 
-                // 'all' matches for every user
-                case '{DAV:}all' :
+				// 'all' matches for every user
+				case '{DAV:}all' :
 
-                // 'authenticated' matched for every user that's logged in.
-                // Since it's not possible to use ACL while not being logged
-                // in, this is also always true.
-                case '{DAV:}authenticated' :
-                    $collected[] = $ace;
-                    break;
-
-                // 'unauthenticated' can never occur either, so we simply
-                // ignore these.
-                case '{DAV:}unauthenticated' :
-                    break;
-
-                default :
-                    if (in_array($ace['principal'], $principals)) {
-                        $collected[] = $ace;
-                    }
-                    break;
-
-            }
-
-
-        }
-
-        // Now we deduct all aggregated privileges.
-        $flat = $this->getFlatPrivilegeSet($node);
-
-        $collected2 = [];
-        while (count($collected)) {
-
-            $current = array_pop($collected);
-            $collected2[] = $current['privilege'];
-
-            foreach ($flat[$current['privilege']]['aggregates'] as $subPriv) {
-                $collected2[] = $subPriv;
-                $collected[] = $flat[$subPriv];
-            }
-
-        }
-
-        return array_values(array_unique($collected2));
-
-    }
-
-
-    /**
-     * Returns a principal based on its uri.
-     *
-     * Returns null if the principal could not be found.
-     *
-     * @param string $uri
-     * @return null|string
-     */
-    public function getPrincipalByUri($uri) {
-
-        $result = null;
-        $collections = $this->principalCollectionSet;
-        foreach ($collections as $collection) {
-
-            $principalCollection = $this->server->tree->getNodeForPath($collection);
-            if (!$principalCollection instanceof IPrincipalCollection) {
-                // Not a principal collection, we're simply going to ignore
-                // this.
-                continue;
-            }
-
-            $result = $principalCollection->findByUri($uri);
-            if ($result) {
-                return $result;
-            }
-
-        }
-
-    }
-
-    /**
-     * Principal property search
-     *
-     * This method can search for principals matching certain values in
-     * properties.
-     *
-     * This method will return a list of properties for the matched properties.
-     *
-     * @param array $searchProperties    The properties to search on. This is a
-     *                                   key-value list. The keys are property
-     *                                   names, and the values the strings to
-     *                                   match them on.
-     * @param array $requestedProperties This is the list of properties to
-     *                                   return for every match.
-     * @param string $collectionUri      The principal collection to search on.
-     *                                   If this is ommitted, the standard
-     *                                   principal collection-set will be used.
-     * @param string $test               "allof" to use AND to search the
-     *                                   properties. 'anyof' for OR.
-     * @return array     This method returns an array structure similar to
-     *                  Sabre\DAV\Server::getPropertiesForPath. Returned
-     *                  properties are index by a HTTP status code.
-     */
-    public function principalSearch(array $searchProperties, array $requestedProperties, $collectionUri = null, $test = 'allof') {
-
-        if (!is_null($collectionUri)) {
-            $uris = [$collectionUri];
-        } else {
-            $uris = $this->principalCollectionSet;
-        }
-
-        $lookupResults = [];
-        foreach ($uris as $uri) {
-
-            $principalCollection = $this->server->tree->getNodeForPath($uri);
-            if (!$principalCollection instanceof IPrincipalCollection) {
-                // Not a principal collection, we're simply going to ignore
-                // this.
-                continue;
-            }
-
-            $results = $principalCollection->searchPrincipals($searchProperties, $test);
-            foreach ($results as $result) {
-                $lookupResults[] = rtrim($uri, '/') . '/' . $result;
-            }
-
-        }
-
-        $matches = [];
-
-        foreach ($lookupResults as $lookupResult) {
-
-            list($matches[]) = $this->server->getPropertiesForPath($lookupResult, $requestedProperties, 0);
-
-        }
-
-        return $matches;
-
-    }
-
-    /**
-     * Sets up the plugin
-     *
-     * This method is automatically called by the server class.
-     *
-     * @param DAV\Server $server
-     * @return void
-     */
-    public function initialize(DAV\Server $server) {
-
-        $this->server = $server;
-        $server->on('propFind',            [$this, 'propFind'], 20);
-        $server->on('beforeMethod',        [$this, 'beforeMethod'], 20);
-        $server->on('beforeBind',          [$this, 'beforeBind'], 20);
-        $server->on('beforeUnbind',        [$this, 'beforeUnbind'], 20);
-        $server->on('propPatch',           [$this, 'propPatch']);
-        $server->on('beforeUnlock',        [$this, 'beforeUnlock'], 20);
-        $server->on('report',              [$this, 'report']);
-        $server->on('method:ACL',          [$this, 'httpAcl']);
-        $server->on('onHTMLActionsPanel',  [$this, 'htmlActionsPanel']);
-
-        array_push($server->protectedProperties,
-            '{DAV:}alternate-URI-set',
-            '{DAV:}principal-URL',
-            '{DAV:}group-membership',
-            '{DAV:}principal-collection-set',
-            '{DAV:}current-user-principal',
-            '{DAV:}supported-privilege-set',
-            '{DAV:}current-user-privilege-set',
-            '{DAV:}acl',
-            '{DAV:}acl-restrictions',
-            '{DAV:}inherited-acl-set',
-            '{DAV:}owner',
-            '{DAV:}group'
-        );
-
-        // Automatically mapping nodes implementing IPrincipal to the
-        // {DAV:}principal resourcetype.
-        $server->resourceTypeMapping['Sabre\\DAVACL\\IPrincipal'] = '{DAV:}principal';
-
-        // Mapping the group-member-set property to the HrefList property
-        // class.
-        $server->xml->elementMap['{DAV:}group-member-set'] = 'Sabre\\DAV\\Xml\\Property\\Href';
-        $server->xml->elementMap['{DAV:}acl'] = 'Sabre\\DAVACL\\Xml\\Property\\Acl';
-        $server->xml->elementMap['{DAV:}expand-property'] = 'Sabre\\DAVACL\\Xml\\Request\\ExpandPropertyReport';
-        $server->xml->elementMap['{DAV:}principal-property-search'] = 'Sabre\\DAVACL\\Xml\\Request\\PrincipalPropertySearchReport';
-        $server->xml->elementMap['{DAV:}principal-search-property-set'] = 'Sabre\\DAVACL\\Xml\\Request\\PrincipalSearchPropertySetReport';
-
-    }
-
-    /* {{{ Event handlers */
-
-    /**
-     * Triggered before any method is handled
-     *
-     * @param RequestInterface $request
-     * @param ResponseInterface $response
-     * @return void
-     */
-    public function beforeMethod(RequestInterface $request, ResponseInterface $response) {
-
-        $method = $request->getMethod();
-        $path = $request->getPath();
-
-        $exists = $this->server->tree->nodeExists($path);
-
-        // If the node doesn't exists, none of these checks apply
-        if (!$exists) return;
-
-        switch ($method) {
-
-            case 'GET' :
-            case 'HEAD' :
-            case 'OPTIONS' :
-                // For these 3 we only need to know if the node is readable.
-                $this->checkPrivileges($path, '{DAV:}read');
-                break;
-
-            case 'PUT' :
-            case 'LOCK' :
-            case 'UNLOCK' :
-                // This method requires the write-content priv if the node
-                // already exists, and bind on the parent if the node is being
-                // created.
-                // The bind privilege is handled in the beforeBind event.
-                $this->checkPrivileges($path, '{DAV:}write-content');
-                break;
-
-
-            case 'PROPPATCH' :
-                $this->checkPrivileges($path, '{DAV:}write-properties');
-                break;
-
-            case 'ACL' :
-                $this->checkPrivileges($path, '{DAV:}write-acl');
-                break;
-
-            case 'COPY' :
-            case 'MOVE' :
-                // Copy requires read privileges on the entire source tree.
-                // If the target exists write-content normally needs to be
-                // checked, however, we're deleting the node beforehand and
-                // creating a new one after, so this is handled by the
-                // beforeUnbind event.
-                //
-                // The creation of the new node is handled by the beforeBind
-                // event.
-                //
-                // If MOVE is used beforeUnbind will also be used to check if
-                // the sourcenode can be deleted.
-                $this->checkPrivileges($path, '{DAV:}read', self::R_RECURSIVE);
-
-                break;
-
-        }
-
-    }
-
-    /**
-     * Triggered before a new node is created.
-     *
-     * This allows us to check permissions for any operation that creates a
-     * new node, such as PUT, MKCOL, MKCALENDAR, LOCK, COPY and MOVE.
-     *
-     * @param string $uri
-     * @return void
-     */
-    public function beforeBind($uri) {
-
-        list($parentUri) = Uri\split($uri);
-        $this->checkPrivileges($parentUri, '{DAV:}bind');
-
-    }
-
-    /**
-     * Triggered before a node is deleted
-     *
-     * This allows us to check permissions for any operation that will delete
-     * an existing node.
-     *
-     * @param string $uri
-     * @return void
-     */
-    public function beforeUnbind($uri) {
-
-        list($parentUri) = Uri\split($uri);
-        $this->checkPrivileges($parentUri, '{DAV:}unbind', self::R_RECURSIVEPARENTS);
-
-    }
-
-    /**
-     * Triggered before a node is unlocked.
-     *
-     * @param string $uri
-     * @param DAV\Locks\LockInfo $lock
-     * @return void
-     */
-    public function beforeUnlock($uri, DAV\Locks\LockInfo $lock) {
-
-
-    }
-
-    /**
-     * Triggered before properties are looked up in specific nodes.
-     *
-     * @param DAV\PropFind $propFind
-     * @param DAV\INode $node
-     * @param array $requestedProperties
-     * @param array $returnedProperties
-     * @return bool
-     */
-    public function propFind(DAV\PropFind $propFind, DAV\INode $node) {
-
-        $path = $propFind->getPath();
-
-        // Checking the read permission
-        if (!$this->checkPrivileges($path, '{DAV:}read', self::R_PARENT, false)) {
-            // User is not allowed to read properties
-
-            // Returning false causes the property-fetching system to pretend
-            // that the node does not exist, and will cause it to be hidden
-            // from listings such as PROPFIND or the browser plugin.
-            if ($this->hideNodesFromListings) {
-                return false;
-            }
-
-            // Otherwise we simply mark every property as 403.
-            foreach ($propFind->getRequestedProperties() as $requestedProperty) {
-                $propFind->set($requestedProperty, null, 403);
-            }
-
-            return;
-
-        }
-
-        /* Adding principal properties */
-        if ($node instanceof IPrincipal) {
-
-            $propFind->handle('{DAV:}alternate-URI-set', function() use ($node) {
-                return new DAV\Xml\Property\Href($node->getAlternateUriSet());
-            });
-            $propFind->handle('{DAV:}principal-URL', function() use ($node) {
-                return new DAV\Xml\Property\Href($node->getPrincipalUrl() . '/');
-            });
-            $propFind->handle('{DAV:}group-member-set', function() use ($node) {
-                $members = $node->getGroupMemberSet();
-                foreach ($members as $k => $member) {
-                    $members[$k] = rtrim($member, '/') . '/';
-                }
-                return new DAV\Xml\Property\Href($members);
-            });
-            $propFind->handle('{DAV:}group-membership', function() use ($node) {
-                $members = $node->getGroupMembership();
-                foreach ($members as $k => $member) {
-                    $members[$k] = rtrim($member, '/') . '/';
-                }
-                return new DAV\Xml\Property\Href($members);
-            });
-            $propFind->handle('{DAV:}displayname', [$node, 'getDisplayName']);
-
-        }
-
-        $propFind->handle('{DAV:}principal-collection-set', function() {
-
-            $val = $this->principalCollectionSet;
-            // Ensuring all collections end with a slash
-            foreach ($val as $k => $v) $val[$k] = $v . '/';
-            return new DAV\Xml\Property\Href($val);
-
-        });
-        $propFind->handle('{DAV:}current-user-principal', function() {
-            if ($url = $this->getCurrentUserPrincipal()) {
-                return new Xml\Property\Principal(Xml\Property\Principal::HREF, $url . '/');
-            } else {
-                return new Xml\Property\Principal(Xml\Property\Principal::UNAUTHENTICATED);
-            }
-        });
-        $propFind->handle('{DAV:}supported-privilege-set', function() use ($node) {
-            return new Xml\Property\SupportedPrivilegeSet($this->getSupportedPrivilegeSet($node));
-        });
-        $propFind->handle('{DAV:}current-user-privilege-set', function() use ($node, $propFind, $path) {
-            if (!$this->checkPrivileges($path, '{DAV:}read-current-user-privilege-set', self::R_PARENT, false)) {
-                $propFind->set('{DAV:}current-user-privilege-set', null, 403);
-            } else {
-                $val = $this->getCurrentUserPrivilegeSet($node);
-                if (!is_null($val)) {
-                    return new Xml\Property\CurrentUserPrivilegeSet($val);
-                }
-            }
-        });
-        $propFind->handle('{DAV:}acl', function() use ($node, $propFind, $path) {
-            /* The ACL property contains all the permissions */
-            if (!$this->checkPrivileges($path, '{DAV:}read-acl', self::R_PARENT, false)) {
-                $propFind->set('{DAV:}acl', null, 403);
-            } else {
-                $acl = $this->getACL($node);
-                if (!is_null($acl)) {
-                    return new Xml\Property\Acl($this->getACL($node));
-                }
-            }
-        });
-        $propFind->handle('{DAV:}acl-restrictions', function() {
-            return new Xml\Property\AclRestrictions();
-        });
-
-        /* Adding ACL properties */
-        if ($node instanceof IACL) {
-            $propFind->handle('{DAV:}owner', function() use ($node) {
-                return new DAV\Xml\Property\Href($node->getOwner() . '/');
-            });
-        }
-
-    }
-
-    /**
-     * This method intercepts PROPPATCH methods and make sure the
-     * group-member-set is updated correctly.
-     *
-     * @param string $path
-     * @param DAV\PropPatch $propPatch
-     * @return void
-     */
-    public function propPatch($path, DAV\PropPatch $propPatch) {
-
-        $propPatch->handle('{DAV:}group-member-set', function($value) use ($path) {
-            if (is_null($value)) {
-                $memberSet = [];
-            } elseif ($value instanceof DAV\Xml\Property\Href) {
-                $memberSet = array_map(
-                    [$this->server, 'calculateUri'],
-                    $value->getHrefs()
-                );
-            } else {
-                throw new DAV\Exception('The group-member-set property MUST be an instance of Sabre\DAV\Property\HrefList or null');
-            }
-            $node = $this->server->tree->getNodeForPath($path);
-            if (!($node instanceof IPrincipal)) {
-                // Fail
-                return false;
-            }
-
-            $node->setGroupMemberSet($memberSet);
-            // We must also clear our cache, just in case
-
-            $this->principalMembershipCache = [];
-
-            return true;
-        });
-
-    }
-
-    /**
-     * This method handles HTTP REPORT requests
-     *
-     * @param string $reportName
-     * @param mixed $report
-     * @param mixed $path
-     * @return bool
-     */
-    public function report($reportName, $report, $path) {
-
-        switch ($reportName) {
-
-            case '{DAV:}principal-property-search' :
-                $this->server->transactionType = 'report-principal-property-search';
-                $this->principalPropertySearchReport($report);
-                return false;
-            case '{DAV:}principal-search-property-set' :
-                $this->server->transactionType = 'report-principal-search-property-set';
-                $this->principalSearchPropertySetReport($report);
-                return false;
-            case '{DAV:}expand-property' :
-                $this->server->transactionType = 'report-expand-property';
-                $this->expandPropertyReport($report);
-                return false;
-
-        }
-
-    }
-
-    /**
-     * This method is responsible for handling the 'ACL' event.
-     *
-     * @param RequestInterface $request
-     * @param ResponseInterface $response
-     * @return bool
-     */
-    public function httpAcl(RequestInterface $request, ResponseInterface $response) {
-
-        $path = $request->getPath();
-        $body = $request->getBodyAsString();
-
-        if (!$body) {
-            throw new DAV\Exception\BadRequest('XML body expected in ACL request');
-        }
-
-        $acl = $this->server->xml->expect('{DAV:}acl', $body);
-        $newAcl = $acl->getPrivileges();
-
-        // Normalizing urls
-        foreach ($newAcl as $k => $newAce) {
-            $newAcl[$k]['principal'] = $this->server->calculateUri($newAce['principal']);
-        }
-        $node = $this->server->tree->getNodeForPath($path);
-
-        if (!$node instanceof IACL) {
-            throw new DAV\Exception\MethodNotAllowed('This node does not support the ACL method');
-        }
-
-        $oldAcl = $this->getACL($node);
-
-        $supportedPrivileges = $this->getFlatPrivilegeSet($node);
-
-        /* Checking if protected principals from the existing principal set are
+				// 'authenticated' matched for every user that's logged in.
+				// Since it's not possible to use ACL while not being logged
+				// in, this is also always true.
+				case '{DAV:}authenticated' :
+					$collected[] = $ace;
+					break;
+
+				// 'unauthenticated' can never occur either, so we simply
+				// ignore these.
+				case '{DAV:}unauthenticated' :
+					break;
+
+				default :
+					if (in_array($ace['principal'], $principals)) {
+						$collected[] = $ace;
+					}
+					break;
+
+			}
+
+
+		}
+
+		// Now we deduct all aggregated privileges.
+		$flat = $this->getFlatPrivilegeSet($node);
+
+		$collected2 = [];
+		while (count($collected)) {
+
+			$current = array_pop($collected);
+			$collected2[] = $current['privilege'];
+
+			foreach ($flat[$current['privilege']]['aggregates'] as $subPriv) {
+				$collected2[] = $subPriv;
+				$collected[] = $flat[$subPriv];
+			}
+
+		}
+
+		return array_values(array_unique($collected2));
+
+	}
+
+
+	/**
+	 * Returns a principal based on its uri.
+	 *
+	 * Returns null if the principal could not be found.
+	 *
+	 * @param string $uri
+	 * @return null|string
+	 */
+	public function getPrincipalByUri($uri) {
+
+		$result = null;
+		$collections = $this->principalCollectionSet;
+		foreach ($collections as $collection) {
+
+			$principalCollection = $this->server->tree->getNodeForPath($collection);
+			if (!$principalCollection instanceof IPrincipalCollection) {
+				// Not a principal collection, we're simply going to ignore
+				// this.
+				continue;
+			}
+
+			$result = $principalCollection->findByUri($uri);
+			if ($result) {
+				return $result;
+			}
+
+		}
+
+	}
+
+	/**
+	 * Principal property search
+	 *
+	 * This method can search for principals matching certain values in
+	 * properties.
+	 *
+	 * This method will return a list of properties for the matched properties.
+	 *
+	 * @param array $searchProperties    The properties to search on. This is a
+	 *                                   key-value list. The keys are property
+	 *                                   names, and the values the strings to
+	 *                                   match them on.
+	 * @param array $requestedProperties This is the list of properties to
+	 *                                   return for every match.
+	 * @param string $collectionUri      The principal collection to search on.
+	 *                                   If this is ommitted, the standard
+	 *                                   principal collection-set will be used.
+	 * @param string $test               "allof" to use AND to search the
+	 *                                   properties. 'anyof' for OR.
+	 * @return array     This method returns an array structure similar to
+	 *                  Sabre\DAV\Server::getPropertiesForPath. Returned
+	 *                  properties are index by a HTTP status code.
+	 */
+	public function principalSearch(array $searchProperties, array $requestedProperties, $collectionUri = null, $test = 'allof') {
+
+		if (!is_null($collectionUri)) {
+			$uris = [$collectionUri];
+		} else {
+			$uris = $this->principalCollectionSet;
+		}
+
+		$lookupResults = [];
+		foreach ($uris as $uri) {
+
+			$principalCollection = $this->server->tree->getNodeForPath($uri);
+			if (!$principalCollection instanceof IPrincipalCollection) {
+				// Not a principal collection, we're simply going to ignore
+				// this.
+				continue;
+			}
+
+			$results = $principalCollection->searchPrincipals($searchProperties, $test);
+			foreach ($results as $result) {
+				$lookupResults[] = rtrim($uri, '/') . '/' . $result;
+			}
+
+		}
+
+		$matches = [];
+
+		foreach ($lookupResults as $lookupResult) {
+
+			list($matches[]) = $this->server->getPropertiesForPath($lookupResult, $requestedProperties, 0);
+
+		}
+
+		return $matches;
+
+	}
+
+	/**
+	 * Sets up the plugin
+	 *
+	 * This method is automatically called by the server class.
+	 *
+	 * @param DAV\Server $server
+	 * @return void
+	 */
+	public function initialize(DAV\Server $server) {
+
+		$this->server = $server;
+		$server->on('propFind',            [$this, 'propFind'], 20);
+		$server->on('beforeMethod',        [$this, 'beforeMethod'], 20);
+		$server->on('beforeBind',          [$this, 'beforeBind'], 20);
+		$server->on('beforeUnbind',        [$this, 'beforeUnbind'], 20);
+		$server->on('propPatch',           [$this, 'propPatch']);
+		$server->on('beforeUnlock',        [$this, 'beforeUnlock'], 20);
+		$server->on('report',              [$this, 'report']);
+		$server->on('method:ACL',          [$this, 'httpAcl']);
+		$server->on('onHTMLActionsPanel',  [$this, 'htmlActionsPanel']);
+
+		array_push($server->protectedProperties,
+			'{DAV:}alternate-URI-set',
+			'{DAV:}principal-URL',
+			'{DAV:}group-membership',
+			'{DAV:}principal-collection-set',
+			'{DAV:}current-user-principal',
+			'{DAV:}supported-privilege-set',
+			'{DAV:}current-user-privilege-set',
+			'{DAV:}acl',
+			'{DAV:}acl-restrictions',
+			'{DAV:}inherited-acl-set',
+			'{DAV:}owner',
+			'{DAV:}group'
+		);
+
+		// Automatically mapping nodes implementing IPrincipal to the
+		// {DAV:}principal resourcetype.
+		$server->resourceTypeMapping['Sabre\\DAVACL\\IPrincipal'] = '{DAV:}principal';
+
+		// Mapping the group-member-set property to the HrefList property
+		// class.
+		$server->xml->elementMap['{DAV:}group-member-set'] = 'Sabre\\DAV\\Xml\\Property\\Href';
+		$server->xml->elementMap['{DAV:}acl'] = 'Sabre\\DAVACL\\Xml\\Property\\Acl';
+		$server->xml->elementMap['{DAV:}expand-property'] = 'Sabre\\DAVACL\\Xml\\Request\\ExpandPropertyReport';
+		$server->xml->elementMap['{DAV:}principal-property-search'] = 'Sabre\\DAVACL\\Xml\\Request\\PrincipalPropertySearchReport';
+		$server->xml->elementMap['{DAV:}principal-search-property-set'] = 'Sabre\\DAVACL\\Xml\\Request\\PrincipalSearchPropertySetReport';
+
+	}
+
+	/* {{{ Event handlers */
+
+	/**
+	 * Triggered before any method is handled
+	 *
+	 * @param RequestInterface $request
+	 * @param ResponseInterface $response
+	 * @return void
+	 */
+	public function beforeMethod(RequestInterface $request, ResponseInterface $response) {
+
+		$method = $request->getMethod();
+		$path = $request->getPath();
+
+		$exists = $this->server->tree->nodeExists($path);
+
+		// If the node doesn't exists, none of these checks apply
+		if (!$exists) return;
+
+		switch ($method) {
+
+			case 'GET' :
+			case 'HEAD' :
+			case 'OPTIONS' :
+				// For these 3 we only need to know if the node is readable.
+				$this->checkPrivileges($path, '{DAV:}read');
+				break;
+
+			case 'PUT' :
+			case 'LOCK' :
+			case 'UNLOCK' :
+				// This method requires the write-content priv if the node
+				// already exists, and bind on the parent if the node is being
+				// created.
+				// The bind privilege is handled in the beforeBind event.
+				$this->checkPrivileges($path, '{DAV:}write-content');
+				break;
+
+
+			case 'PROPPATCH' :
+				$this->checkPrivileges($path, '{DAV:}write-properties');
+				break;
+
+			case 'ACL' :
+				$this->checkPrivileges($path, '{DAV:}write-acl');
+				break;
+
+			case 'COPY' :
+			case 'MOVE' :
+				// Copy requires read privileges on the entire source tree.
+				// If the target exists write-content normally needs to be
+				// checked, however, we're deleting the node beforehand and
+				// creating a new one after, so this is handled by the
+				// beforeUnbind event.
+				//
+				// The creation of the new node is handled by the beforeBind
+				// event.
+				//
+				// If MOVE is used beforeUnbind will also be used to check if
+				// the sourcenode can be deleted.
+				$this->checkPrivileges($path, '{DAV:}read', self::R_RECURSIVE);
+
+				break;
+
+		}
+
+	}
+
+	/**
+	 * Triggered before a new node is created.
+	 *
+	 * This allows us to check permissions for any operation that creates a
+	 * new node, such as PUT, MKCOL, MKCALENDAR, LOCK, COPY and MOVE.
+	 *
+	 * @param string $uri
+	 * @return void
+	 */
+	public function beforeBind($uri) {
+
+		list($parentUri) = Uri\split($uri);
+		$this->checkPrivileges($parentUri, '{DAV:}bind');
+
+	}
+
+	/**
+	 * Triggered before a node is deleted
+	 *
+	 * This allows us to check permissions for any operation that will delete
+	 * an existing node.
+	 *
+	 * @param string $uri
+	 * @return void
+	 */
+	public function beforeUnbind($uri) {
+
+		list($parentUri) = Uri\split($uri);
+		$this->checkPrivileges($parentUri, '{DAV:}unbind', self::R_RECURSIVEPARENTS);
+
+	}
+
+	/**
+	 * Triggered before a node is unlocked.
+	 *
+	 * @param string $uri
+	 * @param DAV\Locks\LockInfo $lock
+	 * @return void
+	 */
+	public function beforeUnlock($uri, DAV\Locks\LockInfo $lock) {
+
+
+	}
+
+	/**
+	 * Triggered before properties are looked up in specific nodes.
+	 *
+	 * @param DAV\PropFind $propFind
+	 * @param DAV\INode $node
+	 * @param array $requestedProperties
+	 * @param array $returnedProperties
+	 * @return bool
+	 */
+	public function propFind(DAV\PropFind $propFind, DAV\INode $node) {
+
+		$path = $propFind->getPath();
+
+		// Checking the read permission
+		if (!$this->checkPrivileges($path, '{DAV:}read', self::R_PARENT, false)) {
+			// User is not allowed to read properties
+
+			// Returning false causes the property-fetching system to pretend
+			// that the node does not exist, and will cause it to be hidden
+			// from listings such as PROPFIND or the browser plugin.
+			if ($this->hideNodesFromListings) {
+				return false;
+			}
+
+			// Otherwise we simply mark every property as 403.
+			foreach ($propFind->getRequestedProperties() as $requestedProperty) {
+				$propFind->set($requestedProperty, null, 403);
+			}
+
+			return;
+
+		}
+
+		/* Adding principal properties */
+		if ($node instanceof IPrincipal) {
+
+			$propFind->handle('{DAV:}alternate-URI-set', function() use ($node) {
+				return new DAV\Xml\Property\Href($node->getAlternateUriSet());
+			});
+			$propFind->handle('{DAV:}principal-URL', function() use ($node) {
+				return new DAV\Xml\Property\Href($node->getPrincipalUrl() . '/');
+			});
+			$propFind->handle('{DAV:}group-member-set', function() use ($node) {
+				$members = $node->getGroupMemberSet();
+				foreach ($members as $k => $member) {
+					$members[$k] = rtrim($member, '/') . '/';
+				}
+				return new DAV\Xml\Property\Href($members);
+			});
+			$propFind->handle('{DAV:}group-membership', function() use ($node) {
+				$members = $node->getGroupMembership();
+				foreach ($members as $k => $member) {
+					$members[$k] = rtrim($member, '/') . '/';
+				}
+				return new DAV\Xml\Property\Href($members);
+			});
+			$propFind->handle('{DAV:}displayname', [$node, 'getDisplayName']);
+
+		}
+
+		$propFind->handle('{DAV:}principal-collection-set', function() {
+
+			$val = $this->principalCollectionSet;
+			// Ensuring all collections end with a slash
+			foreach ($val as $k => $v) $val[$k] = $v . '/';
+			return new DAV\Xml\Property\Href($val);
+
+		});
+		$propFind->handle('{DAV:}current-user-principal', function() {
+			if ($url = $this->getCurrentUserPrincipal()) {
+				return new Xml\Property\Principal(Xml\Property\Principal::HREF, $url . '/');
+			} else {
+				return new Xml\Property\Principal(Xml\Property\Principal::UNAUTHENTICATED);
+			}
+		});
+		$propFind->handle('{DAV:}supported-privilege-set', function() use ($node) {
+			return new Xml\Property\SupportedPrivilegeSet($this->getSupportedPrivilegeSet($node));
+		});
+		$propFind->handle('{DAV:}current-user-privilege-set', function() use ($node, $propFind, $path) {
+			if (!$this->checkPrivileges($path, '{DAV:}read-current-user-privilege-set', self::R_PARENT, false)) {
+				$propFind->set('{DAV:}current-user-privilege-set', null, 403);
+			} else {
+				$val = $this->getCurrentUserPrivilegeSet($node);
+				if (!is_null($val)) {
+					return new Xml\Property\CurrentUserPrivilegeSet($val);
+				}
+			}
+		});
+		$propFind->handle('{DAV:}acl', function() use ($node, $propFind, $path) {
+			/* The ACL property contains all the permissions */
+			if (!$this->checkPrivileges($path, '{DAV:}read-acl', self::R_PARENT, false)) {
+				$propFind->set('{DAV:}acl', null, 403);
+			} else {
+				$acl = $this->getACL($node);
+				if (!is_null($acl)) {
+					return new Xml\Property\Acl($this->getACL($node));
+				}
+			}
+		});
+		$propFind->handle('{DAV:}acl-restrictions', function() {
+			return new Xml\Property\AclRestrictions();
+		});
+
+		/* Adding ACL properties */
+		if ($node instanceof IACL) {
+			$propFind->handle('{DAV:}owner', function() use ($node) {
+				return new DAV\Xml\Property\Href($node->getOwner() . '/');
+			});
+		}
+
+	}
+
+	/**
+	 * This method intercepts PROPPATCH methods and make sure the
+	 * group-member-set is updated correctly.
+	 *
+	 * @param string $path
+	 * @param DAV\PropPatch $propPatch
+	 * @return void
+	 */
+	public function propPatch($path, DAV\PropPatch $propPatch) {
+
+		$propPatch->handle('{DAV:}group-member-set', function($value) use ($path) {
+			if (is_null($value)) {
+				$memberSet = [];
+			} elseif ($value instanceof DAV\Xml\Property\Href) {
+				$memberSet = array_map(
+					[$this->server, 'calculateUri'],
+					$value->getHrefs()
+				);
+			} else {
+				throw new DAV\Exception('The group-member-set property MUST be an instance of Sabre\DAV\Property\HrefList or null');
+			}
+			$node = $this->server->tree->getNodeForPath($path);
+			if (!($node instanceof IPrincipal)) {
+				// Fail
+				return false;
+			}
+
+			$node->setGroupMemberSet($memberSet);
+			// We must also clear our cache, just in case
+
+			$this->principalMembershipCache = [];
+
+			return true;
+		});
+
+	}
+
+	/**
+	 * This method handles HTTP REPORT requests
+	 *
+	 * @param string $reportName
+	 * @param mixed $report
+	 * @param mixed $path
+	 * @return bool
+	 */
+	public function report($reportName, $report, $path) {
+
+		switch ($reportName) {
+
+			case '{DAV:}principal-property-search' :
+				$this->server->transactionType = 'report-principal-property-search';
+				$this->principalPropertySearchReport($report);
+				return false;
+			case '{DAV:}principal-search-property-set' :
+				$this->server->transactionType = 'report-principal-search-property-set';
+				$this->principalSearchPropertySetReport($report);
+				return false;
+			case '{DAV:}expand-property' :
+				$this->server->transactionType = 'report-expand-property';
+				$this->expandPropertyReport($report);
+				return false;
+
+		}
+
+	}
+
+	/**
+	 * This method is responsible for handling the 'ACL' event.
+	 *
+	 * @param RequestInterface $request
+	 * @param ResponseInterface $response
+	 * @return bool
+	 */
+	public function httpAcl(RequestInterface $request, ResponseInterface $response) {
+
+		$path = $request->getPath();
+		$body = $request->getBodyAsString();
+
+		if (!$body) {
+			throw new DAV\Exception\BadRequest('XML body expected in ACL request');
+		}
+
+		$acl = $this->server->xml->expect('{DAV:}acl', $body);
+		$newAcl = $acl->getPrivileges();
+
+		// Normalizing urls
+		foreach ($newAcl as $k => $newAce) {
+			$newAcl[$k]['principal'] = $this->server->calculateUri($newAce['principal']);
+		}
+		$node = $this->server->tree->getNodeForPath($path);
+
+		if (!$node instanceof IACL) {
+			throw new DAV\Exception\MethodNotAllowed('This node does not support the ACL method');
+		}
+
+		$oldAcl = $this->getACL($node);
+
+		$supportedPrivileges = $this->getFlatPrivilegeSet($node);
+
+		/* Checking if protected principals from the existing principal set are
            not overwritten. */
-        foreach ($oldAcl as $oldAce) {
-
-            if (!isset($oldAce['protected']) || !$oldAce['protected']) continue;
-
-            $found = false;
-            foreach ($newAcl as $newAce) {
-                if (
-                    $newAce['privilege'] === $oldAce['privilege'] &&
-                    $newAce['principal'] === $oldAce['principal'] &&
-                    $newAce['protected']
-                )
-                $found = true;
-            }
-
-            if (!$found)
-                throw new Exception\AceConflict('This resource contained a protected {DAV:}ace, but this privilege did not occur in the ACL request');
-
-        }
+		foreach ($oldAcl as $oldAce) {
+
+			if (!isset($oldAce['protected']) || !$oldAce['protected']) continue;
+
+			$found = false;
+			foreach ($newAcl as $newAce) {
+				if (
+					$newAce['privilege'] === $oldAce['privilege'] &&
+					$newAce['principal'] === $oldAce['principal'] &&
+					$newAce['protected']
+				)
+				$found = true;
+			}
+
+			if (!$found)
+				throw new Exception\AceConflict('This resource contained a protected {DAV:}ace, but this privilege did not occur in the ACL request');
+
+		}
 
-        foreach ($newAcl as $newAce) {
-
-            // Do we recognize the privilege
-            if (!isset($supportedPrivileges[$newAce['privilege']])) {
-                throw new Exception\NotSupportedPrivilege('The privilege you specified (' . $newAce['privilege'] . ') is not recognized by this server');
-            }
-
-            if ($supportedPrivileges[$newAce['privilege']]['abstract']) {
-                throw new Exception\NoAbstract('The privilege you specified (' . $newAce['privilege'] . ') is an abstract privilege');
-            }
-
-            // Looking up the principal
-            try {
-                $principal = $this->server->tree->getNodeForPath($newAce['principal']);
-            } catch (DAV\Exception\NotFound $e) {
-                throw new Exception\NotRecognizedPrincipal('The specified principal (' . $newAce['principal'] . ') does not exist');
-            }
-            if (!($principal instanceof IPrincipal)) {
-                throw new Exception\NotRecognizedPrincipal('The specified uri (' . $newAce['principal'] . ') is not a principal');
-            }
+		foreach ($newAcl as $newAce) {
+
+			// Do we recognize the privilege
+			if (!isset($supportedPrivileges[$newAce['privilege']])) {
+				throw new Exception\NotSupportedPrivilege('The privilege you specified (' . $newAce['privilege'] . ') is not recognized by this server');
+			}
+
+			if ($supportedPrivileges[$newAce['privilege']]['abstract']) {
+				throw new Exception\NoAbstract('The privilege you specified (' . $newAce['privilege'] . ') is an abstract privilege');
+			}
+
+			// Looking up the principal
+			try {
+				$principal = $this->server->tree->getNodeForPath($newAce['principal']);
+			} catch (DAV\Exception\NotFound $e) {
+				throw new Exception\NotRecognizedPrincipal('The specified principal (' . $newAce['principal'] . ') does not exist');
+			}
+			if (!($principal instanceof IPrincipal)) {
+				throw new Exception\NotRecognizedPrincipal('The specified uri (' . $newAce['principal'] . ') is not a principal');
+			}
 
-        }
-        $node->setACL($newAcl);
+		}
+		$node->setACL($newAcl);
 
-        $response->setStatus(200);
-
-        // Breaking the event chain, because we handled this method.
-        return false;
-
-    }
-
-    /* }}} */
-
-    /* Reports {{{ */
-
-    /**
-     * The expand-property report is defined in RFC3253 section 3-8.
-     *
-     * This report is very similar to a standard PROPFIND. The difference is
-     * that it has the additional ability to look at properties containing a
-     * {DAV:}href element, follow that property and grab additional elements
-     * there.
-     *
-     * Other rfc's, such as ACL rely on this report, so it made sense to put
-     * it in this plugin.
-     *
-     * @param Xml\Request\ExpandPropertyReport $report
-     * @return void
-     */
-    protected function expandPropertyReport($report) {
+		$response->setStatus(200);
+
+		// Breaking the event chain, because we handled this method.
+		return false;
+
+	}
+
+	/* }}} */
+
+	/* Reports {{{ */
+
+	/**
+	 * The expand-property report is defined in RFC3253 section 3-8.
+	 *
+	 * This report is very similar to a standard PROPFIND. The difference is
+	 * that it has the additional ability to look at properties containing a
+	 * {DAV:}href element, follow that property and grab additional elements
+	 * there.
+	 *
+	 * Other rfc's, such as ACL rely on this report, so it made sense to put
+	 * it in this plugin.
+	 *
+	 * @param Xml\Request\ExpandPropertyReport $report
+	 * @return void
+	 */
+	protected function expandPropertyReport($report) {
 
-        $depth = $this->server->getHTTPDepth(0);
-        $requestUri = $this->server->getRequestUri();
+		$depth = $this->server->getHTTPDepth(0);
+		$requestUri = $this->server->getRequestUri();
 
-        $result = $this->expandProperties($requestUri, $report->properties, $depth);
+		$result = $this->expandProperties($requestUri, $report->properties, $depth);
 
-        $xml = $this->server->xml->write(
-            '{DAV:}multistatus',
-            new DAV\Xml\Response\MultiStatus($result),
-            $this->server->getBaseUri()
-        );
-        $this->server->httpResponse->setHeader('Content-Type', 'application/xml; charset=utf-8');
-        $this->server->httpResponse->setStatus(207);
-        $this->server->httpResponse->setBody($xml);
+		$xml = $this->server->xml->write(
+			'{DAV:}multistatus',
+			new DAV\Xml\Response\MultiStatus($result),
+			$this->server->getBaseUri()
+		);
+		$this->server->httpResponse->setHeader('Content-Type', 'application/xml; charset=utf-8');
+		$this->server->httpResponse->setStatus(207);
+		$this->server->httpResponse->setBody($xml);
 
-    }
+	}
 
-    /**
-     * This method expands all the properties and returns
-     * a list with property values
-     *
-     * @param array $path
-     * @param array $requestedProperties the list of required properties
-     * @param int $depth
-     * @return array
-     */
-    protected function expandProperties($path, array $requestedProperties, $depth) {
+	/**
+	 * This method expands all the properties and returns
+	 * a list with property values
+	 *
+	 * @param array $path
+	 * @param array $requestedProperties the list of required properties
+	 * @param int $depth
+	 * @return array
+	 */
+	protected function expandProperties($path, array $requestedProperties, $depth) {
 
-        $foundProperties = $this->server->getPropertiesForPath($path, array_keys($requestedProperties), $depth);
+		$foundProperties = $this->server->getPropertiesForPath($path, array_keys($requestedProperties), $depth);
 
-        $result = [];
+		$result = [];
 
-        foreach ($foundProperties as $node) {
-
-            foreach ($requestedProperties as $propertyName => $childRequestedProperties) {
-
-                // We're only traversing if sub-properties were requested
-                if (count($childRequestedProperties) === 0) continue;
-
-                // We only have to do the expansion if the property was found
-                // and it contains an href element.
-                if (!array_key_exists($propertyName, $node[200])) continue;
-
-                if (!$node[200][$propertyName] instanceof DAV\Xml\Property\Href) {
-                    continue;
-                }
-
-                $childHrefs = $node[200][$propertyName]->getHrefs();
-                $childProps = [];
-
-                foreach ($childHrefs as $href) {
-                    // Gathering the result of the children
-                    $childProps[] = [
-                        'name'  => '{DAV:}response',
-                        'value' => $this->expandProperties($href, $childRequestedProperties, 0)[0]
-                    ];
-                }
-
-                // Replacing the property with its expannded form.
-                $node[200][$propertyName] = $childProps;
-
-            }
-            $result[] = new DAV\Xml\Element\Response($node['href'], $node);
-
-        }
-
-        return $result;
-
-    }
-
-    /**
-     * principalSearchPropertySetReport
-     *
-     * This method responsible for handing the
-     * {DAV:}principal-search-property-set report. This report returns a list
-     * of properties the client may search on, using the
-     * {DAV:}principal-property-search report.
-     *
-     * @param Xml\Request\PrincipalSearchPropertySetReport $report
-     * @return void
-     */
-    protected function principalSearchPropertySetReport($report) {
-
-        $httpDepth = $this->server->getHTTPDepth(0);
-        if ($httpDepth !== 0) {
-            throw new DAV\Exception\BadRequest('This report is only defined when Depth: 0');
-        }
-
-        $writer = $this->server->xml->getWriter();
-        $writer->openMemory();
-        $writer->startDocument();
-
-        $writer->startElement('{DAV:}principal-search-property-set');
-
-        foreach ($this->principalSearchPropertySet as $propertyName => $description) {
-
-            $writer->startElement('{DAV:}principal-search-property');
-            $writer->startElement('{DAV:}prop');
-
-            $writer->writeElement($propertyName);
-
-            $writer->endElement(); // prop
-
-            if ($description) {
-                $writer->write([[
-                    'name'       => '{DAV:}description',
-                    'value'      => $description,
-                    'attributes' => ['xml:lang' => 'en']
-                ]]);
-            }
-
-            $writer->endElement(); // principal-search-property
-
-
-        }
-
-        $writer->endElement(); // principal-search-property-set
-
-        $this->server->httpResponse->setHeader('Content-Type', 'application/xml; charset=utf-8');
-        $this->server->httpResponse->setStatus(200);
-        $this->server->httpResponse->setBody($writer->outputMemory());
-
-    }
+		foreach ($foundProperties as $node) {
+
+			foreach ($requestedProperties as $propertyName => $childRequestedProperties) {
+
+				// We're only traversing if sub-properties were requested
+				if (count($childRequestedProperties) === 0) continue;
+
+				// We only have to do the expansion if the property was found
+				// and it contains an href element.
+				if (!array_key_exists($propertyName, $node[200])) continue;
+
+				if (!$node[200][$propertyName] instanceof DAV\Xml\Property\Href) {
+					continue;
+				}
+
+				$childHrefs = $node[200][$propertyName]->getHrefs();
+				$childProps = [];
+
+				foreach ($childHrefs as $href) {
+					// Gathering the result of the children
+					$childProps[] = [
+						'name'  => '{DAV:}response',
+						'value' => $this->expandProperties($href, $childRequestedProperties, 0)[0]
+					];
+				}
+
+				// Replacing the property with its expannded form.
+				$node[200][$propertyName] = $childProps;
+
+			}
+			$result[] = new DAV\Xml\Element\Response($node['href'], $node);
+
+		}
+
+		return $result;
+
+	}
+
+	/**
+	 * principalSearchPropertySetReport
+	 *
+	 * This method responsible for handing the
+	 * {DAV:}principal-search-property-set report. This report returns a list
+	 * of properties the client may search on, using the
+	 * {DAV:}principal-property-search report.
+	 *
+	 * @param Xml\Request\PrincipalSearchPropertySetReport $report
+	 * @return void
+	 */
+	protected function principalSearchPropertySetReport($report) {
+
+		$httpDepth = $this->server->getHTTPDepth(0);
+		if ($httpDepth !== 0) {
+			throw new DAV\Exception\BadRequest('This report is only defined when Depth: 0');
+		}
+
+		$writer = $this->server->xml->getWriter();
+		$writer->openMemory();
+		$writer->startDocument();
+
+		$writer->startElement('{DAV:}principal-search-property-set');
+
+		foreach ($this->principalSearchPropertySet as $propertyName => $description) {
+
+			$writer->startElement('{DAV:}principal-search-property');
+			$writer->startElement('{DAV:}prop');
+
+			$writer->writeElement($propertyName);
+
+			$writer->endElement(); // prop
+
+			if ($description) {
+				$writer->write([[
+					'name'       => '{DAV:}description',
+					'value'      => $description,
+					'attributes' => ['xml:lang' => 'en']
+				]]);
+			}
+
+			$writer->endElement(); // principal-search-property
+
+
+		}
+
+		$writer->endElement(); // principal-search-property-set
+
+		$this->server->httpResponse->setHeader('Content-Type', 'application/xml; charset=utf-8');
+		$this->server->httpResponse->setStatus(200);
+		$this->server->httpResponse->setBody($writer->outputMemory());
+
+	}
 
-    /**
-     * principalPropertySearchReport
-     *
-     * This method is responsible for handing the
-     * {DAV:}principal-property-search report. This report can be used for
-     * clients to search for groups of principals, based on the value of one
-     * or more properties.
-     *
-     * @param Xml\Request\PrincipalPropertySearchReport $report
-     * @return void
-     */
-    protected function principalPropertySearchReport($report) {
-
-        $uri = null;
-        if (!$report->applyToPrincipalCollectionSet) {
-            $uri = $this->server->httpRequest->getPath();
-        }
-        if ($this->server->getHttpDepth('0') !== 0) {
-            throw new BadRequest('Depth must be 0');
-        }
-        $result = $this->principalSearch(
-            $report->searchProperties,
-            $report->properties,
-            $uri,
-            $report->test
-        );
-
-        $prefer = $this->server->getHTTPPrefer();
-
-        $this->server->httpResponse->setStatus(207);
-        $this->server->httpResponse->setHeader('Content-Type', 'application/xml; charset=utf-8');
-        $this->server->httpResponse->setHeader('Vary', 'Brief,Prefer');
-        $this->server->httpResponse->setBody($this->server->generateMultiStatus($result, $prefer['return'] === 'minimal'));
-
-    }
-
-    /* }}} */
-
-    /**
-     * This method is used to generate HTML output for the
-     * DAV\Browser\Plugin. This allows us to generate an interface users
-     * can use to create new calendars.
-     *
-     * @param DAV\INode $node
-     * @param string $output
-     * @return bool
-     */
-    public function htmlActionsPanel(DAV\INode $node, &$output) {
-
-        if (!$node instanceof PrincipalCollection)
-            return;
-
-        $output .= '<tr><td colspan="2"><form method="post" action="">
+	/**
+	 * principalPropertySearchReport
+	 *
+	 * This method is responsible for handing the
+	 * {DAV:}principal-property-search report. This report can be used for
+	 * clients to search for groups of principals, based on the value of one
+	 * or more properties.
+	 *
+	 * @param Xml\Request\PrincipalPropertySearchReport $report
+	 * @return void
+	 */
+	protected function principalPropertySearchReport($report) {
+
+		$uri = null;
+		if (!$report->applyToPrincipalCollectionSet) {
+			$uri = $this->server->httpRequest->getPath();
+		}
+		if ($this->server->getHttpDepth('0') !== 0) {
+			throw new BadRequest('Depth must be 0');
+		}
+		$result = $this->principalSearch(
+			$report->searchProperties,
+			$report->properties,
+			$uri,
+			$report->test
+		);
+
+		$prefer = $this->server->getHTTPPrefer();
+
+		$this->server->httpResponse->setStatus(207);
+		$this->server->httpResponse->setHeader('Content-Type', 'application/xml; charset=utf-8');
+		$this->server->httpResponse->setHeader('Vary', 'Brief,Prefer');
+		$this->server->httpResponse->setBody($this->server->generateMultiStatus($result, $prefer['return'] === 'minimal'));
+
+	}
+
+	/* }}} */
+
+	/**
+	 * This method is used to generate HTML output for the
+	 * DAV\Browser\Plugin. This allows us to generate an interface users
+	 * can use to create new calendars.
+	 *
+	 * @param DAV\INode $node
+	 * @param string $output
+	 * @return bool
+	 */
+	public function htmlActionsPanel(DAV\INode $node, &$output) {
+
+		if (!$node instanceof PrincipalCollection)
+			return;
+
+		$output .= '<tr><td colspan="2"><form method="post" action="">
             <h3>Create new principal</h3>
             <input type="hidden" name="sabreAction" value="mkcol" />
             <input type="hidden" name="resourceType" value="{DAV:}principal" />
@@ -1294,28 +1294,28 @@ 
             </form>
             </td></tr>';
 
-        return false;
-
-    }
-
-    /**
-     * Returns a bunch of meta-data about the plugin.
-     *
-     * Providing this information is optional, and is mainly displayed by the
-     * Browser plugin.
-     *
-     * The description key in the returned array may contain html and will not
-     * be sanitized.
-     *
-     * @return array
-     */
-    public function getPluginInfo() {
-
-        return [
-            'name'        => $this->getPluginName(),
-            'description' => 'Adds support for WebDAV ACL (rfc3744)',
-            'link'        => 'http://sabre.io/dav/acl/',
-        ];
-
-    }
+		return false;
+
+	}
+
+	/**
+	 * Returns a bunch of meta-data about the plugin.
+	 *
+	 * Providing this information is optional, and is mainly displayed by the
+	 * Browser plugin.
+	 *
+	 * The description key in the returned array may contain html and will not
+	 * be sanitized.
+	 *
+	 * @return array
+	 */
+	public function getPluginInfo() {
+
+		return [
+			'name'        => $this->getPluginName(),
+			'description' => 'Adds support for WebDAV ACL (rfc3744)',
+			'link'        => 'http://sabre.io/dav/acl/',
+		];
+
+	}
 }

Doc Comments +9 added lines, -11 removed lines

@@ -113,7 +113,7 @@ 
      *
      * This list is used in the response of a HTTP OPTIONS request.
      *
-     * @return array
+     * @return string[]
      */
     public function getFeatures() {
 
@@ -125,7 +125,7 @@ 
      * Returns a list of available methods for a given url
      *
      * @param string $uri
-     * @return array
+     * @return string[]
      */
     public function getMethods($uri) {
 
@@ -155,7 +155,7 @@ 
      * implement them
      *
      * @param string $uri
-     * @return array
+     * @return string[]
      */
     public function getSupportedReportSet($uri) {
 
@@ -176,7 +176,7 @@ 
      * and return true otherwise.
      *
      * @param string $uri
-     * @param array|string $privileges
+     * @param string $privileges
      * @param int $recursion
      * @param bool $throwExceptions if set to false, this method won't throw exceptions.
      * @throws Sabre\DAVACL\Exception\NeedPrivileges
@@ -269,7 +269,7 @@ 
     /**
      * Returns all the principal groups the specified principal is a member of.
      *
-     * @param string $principal
+     * @param string $mainPrincipal
      * @return array
      */
     public function getPrincipalMembership($mainPrincipal) {
@@ -830,9 +830,7 @@ 
      *
      * @param DAV\PropFind $propFind
      * @param DAV\INode $node
-     * @param array $requestedProperties
-     * @param array $returnedProperties
-     * @return bool
+     * @return false|null
      */
     public function propFind(DAV\PropFind $propFind, DAV\INode $node) {
 
@@ -980,7 +978,7 @@ 
      * @param string $reportName
      * @param mixed $report
      * @param mixed $path
-     * @return bool
+     * @return false|null
      */
     public function report($reportName, $report, $path) {
 
@@ -1131,7 +1129,7 @@ 
      * @param array $path
      * @param array $requestedProperties the list of required properties
      * @param int $depth
-     * @return array
+     * @return DAV\Xml\Element\Response[]
      */
     protected function expandProperties($path, array $requestedProperties, $depth) {
 
@@ -1276,7 +1274,7 @@ 
      *
      * @param DAV\INode $node
      * @param string $output
-     * @return bool
+     * @return null|false
      */
     public function htmlActionsPanel(DAV\INode $node, &$output) {
 

Spacing +9 added lines, -9 removed lines

@@ -674,15 +674,15 @@
     public function initialize(DAV\Server $server) {
 
         $this->server = $server;
-        $server->on('propFind',            [$this, 'propFind'], 20);
-        $server->on('beforeMethod',        [$this, 'beforeMethod'], 20);
-        $server->on('beforeBind',          [$this, 'beforeBind'], 20);
-        $server->on('beforeUnbind',        [$this, 'beforeUnbind'], 20);
-        $server->on('propPatch',           [$this, 'propPatch']);
-        $server->on('beforeUnlock',        [$this, 'beforeUnlock'], 20);
-        $server->on('report',              [$this, 'report']);
-        $server->on('method:ACL',          [$this, 'httpAcl']);
-        $server->on('onHTMLActionsPanel',  [$this, 'htmlActionsPanel']);
+        $server->on('propFind', [$this, 'propFind'], 20);
+        $server->on('beforeMethod', [$this, 'beforeMethod'], 20);
+        $server->on('beforeBind', [$this, 'beforeBind'], 20);
+        $server->on('beforeUnbind', [$this, 'beforeUnbind'], 20);
+        $server->on('propPatch', [$this, 'propPatch']);
+        $server->on('beforeUnlock', [$this, 'beforeUnlock'], 20);
+        $server->on('report', [$this, 'report']);
+        $server->on('method:ACL', [$this, 'httpAcl']);
+        $server->on('onHTMLActionsPanel', [$this, 'htmlActionsPanel']);
 
         array_push($server->protectedProperties,
             '{DAV:}alternate-URI-set',

Braces +49 added lines, -25 removed lines

@@ -184,7 +184,9 @@ 
      */
     public function checkPrivileges($uri, $privileges, $recursion = self::R_PARENT, $throwExceptions = true) {
 
-        if (!is_array($privileges)) $privileges = [$privileges];
+        if (!is_array($privileges)) {
+        	$privileges = [$privileges];
+        }
 
         $acl = $this->getCurrentUserPrivilegeSet($uri);
 
@@ -192,10 +194,11 @@ 
             if ($this->allowAccessToNodesWithoutACL) {
                 return true;
             } else {
-                if ($throwExceptions)
-                    throw new Exception\NeedPrivileges($uri, $privileges);
-                else
-                    return false;
+                if ($throwExceptions) {
+                                    throw new Exception\NeedPrivileges($uri, $privileges);
+                } else {
+                                    return false;
+                }
 
             }
         }
@@ -210,10 +213,11 @@ 
         }
 
         if ($failed) {
-            if ($throwExceptions)
-                throw new Exception\NeedPrivileges($uri, $failed);
-            else
-                return false;
+            if ($throwExceptions) {
+                            throw new Exception\NeedPrivileges($uri, $failed);
+            } else {
+                            return false;
+            }
         }
         return true;
 
@@ -230,7 +234,9 @@ 
     public function getCurrentUserPrincipal() {
 
         $authPlugin = $this->server->getPlugin('auth');
-        if (is_null($authPlugin)) return null;
+        if (is_null($authPlugin)) {
+        	return null;
+        }
         /** @var $authPlugin Sabre\DAV\Auth\Plugin */
 
         return $authPlugin->getCurrentPrincipal();
@@ -248,7 +254,9 @@ 
 
         $currentUser = $this->getCurrentUserPrincipal();
 
-        if (is_null($currentUser)) return [];
+        if (is_null($currentUser)) {
+        	return [];
+        }
 
         return array_merge(
             [$currentUser],
@@ -331,8 +339,9 @@ 
         if ($node instanceof IACL) {
             $result = $node->getSupportedPrivilegeSet();
 
-            if ($result)
-                return $result;
+            if ($result) {
+                            return $result;
+            }
         }
 
         return self::getDefaultSupportedPrivilegeSet();
@@ -506,7 +515,9 @@ 
 
         $acl = $this->getACL($node);
 
-        if (is_null($acl)) return null;
+        if (is_null($acl)) {
+        	return null;
+        }
 
         $principals = $this->getCurrentUserPrincipals();
 
@@ -730,7 +741,9 @@ 
         $exists = $this->server->tree->nodeExists($path);
 
         // If the node doesn't exists, none of these checks apply
-        if (!$exists) return;
+        if (!$exists) {
+        	return;
+        }
 
         switch ($method) {
 
@@ -889,7 +902,9 @@ 
 
             $val = $this->principalCollectionSet;
             // Ensuring all collections end with a slash
-            foreach ($val as $k => $v) $val[$k] = $v . '/';
+            foreach ($val as $k => $v) {
+            	$val[$k] = $v . '/';
+            }
             return new DAV\Xml\Property\Href($val);
 
         });
@@ -1040,7 +1055,9 @@ 
            not overwritten. */
         foreach ($oldAcl as $oldAce) {
 
-            if (!isset($oldAce['protected']) || !$oldAce['protected']) continue;
+            if (!isset($oldAce['protected']) || !$oldAce['protected']) {
+            	continue;
+            }
 
             $found = false;
             foreach ($newAcl as $newAce) {
@@ -1048,12 +1065,14 @@ 
                     $newAce['privilege'] === $oldAce['privilege'] &&
                     $newAce['principal'] === $oldAce['principal'] &&
                     $newAce['protected']
-                )
-                $found = true;
+                ) {
+                                $found = true;
+                }
             }
 
-            if (!$found)
-                throw new Exception\AceConflict('This resource contained a protected {DAV:}ace, but this privilege did not occur in the ACL request');
+            if (!$found) {
+                            throw new Exception\AceConflict('This resource contained a protected {DAV:}ace, but this privilege did not occur in the ACL request');
+            }
 
         }
 
@@ -1144,11 +1163,15 @@ 
             foreach ($requestedProperties as $propertyName => $childRequestedProperties) {
 
                 // We're only traversing if sub-properties were requested
-                if (count($childRequestedProperties) === 0) continue;
+                if (count($childRequestedProperties) === 0) {
+                	continue;
+                }
 
                 // We only have to do the expansion if the property was found
                 // and it contains an href element.
-                if (!array_key_exists($propertyName, $node[200])) continue;
+                if (!array_key_exists($propertyName, $node[200])) {
+                	continue;
+                }
 
                 if (!$node[200][$propertyName] instanceof DAV\Xml\Property\Href) {
                     continue;
@@ -1280,8 +1303,9 @@ 
      */
     public function htmlActionsPanel(DAV\INode $node, &$output) {
 
-        if (!$node instanceof PrincipalCollection)
-            return;
+        if (!$node instanceof PrincipalCollection) {
+                    return;
+        }
 
         $output .= '<tr><td colspan="2"><form method="post" action="">
             <h3>Create new principal</h3>

libraries/SabreDAV/DAVACL/PrincipalCollection.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -2,8 +2,8 @@
 
 namespace Sabre\DAVACL;
 
-use Sabre\DAV\Exception\InvalidResourceType;
 use Sabre\DAV\Exception\Forbidden;
+use Sabre\DAV\Exception\InvalidResourceType;
 use Sabre\DAV\IExtendedCollection;
 use Sabre\DAV\MkCol;
 

Indentation +128 added lines, -128 removed lines

@@ -19,133 +19,133 @@
  */
 class PrincipalCollection extends AbstractPrincipalCollection implements IExtendedCollection, IACL {
 
-    /**
-     * This method returns a node for a principal.
-     *
-     * The passed array contains principal information, and is guaranteed to
-     * at least contain a uri item. Other properties may or may not be
-     * supplied by the authentication backend.
-     *
-     * @param array $principal
-     * @return \Sabre\DAV\INode
-     */
-    public function getChildForPrincipal(array $principal) {
-
-        return new Principal($this->principalBackend, $principal);
-
-    }
-
-    /**
-     * Creates a new collection.
-     *
-     * This method will receive a MkCol object with all the information about
-     * the new collection that's being created.
-     *
-     * The MkCol object contains information about the resourceType of the new
-     * collection. If you don't support the specified resourceType, you should
-     * throw Exception\InvalidResourceType.
-     *
-     * The object also contains a list of WebDAV properties for the new
-     * collection.
-     *
-     * You should call the handle() method on this object to specify exactly
-     * which properties you are storing. This allows the system to figure out
-     * exactly which properties you didn't store, which in turn allows other
-     * plugins (such as the propertystorage plugin) to handle storing the
-     * property for you.
-     *
-     * @param string $name
-     * @param MkCol $mkCol
-     * @throws Exception\InvalidResourceType
-     * @return void
-     */
-    public function createExtendedCollection($name, MkCol $mkCol) {
-
-        if (!$mkCol->hasResourceType('{DAV:}principal')) {
-            throw new InvalidResourceType('Only resources of type {DAV:}principal may be created here');
-        }
-
-        $this->principalBackend->createPrincipal(
-            $this->principalPrefix . '/' . $name,
-            $mkCol
-        );
-
-    }
-
-    /**
-     * Returns the owner principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getOwner() {
-        return null;
-    }
-
-    /**
-     * Returns a group principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getGroup() {
-        return null;
-    }
-
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to
-     *      be updated.
-     *
-     * @return array
-     */
-    public function getACL() {
-        return [
-            [
-                'principal' => '{DAV:}authenticated',
-                'privilege' => '{DAV:}read',
-                'protected' => true,
-            ],
-        ];
-    }
-
-    /**
-     * Updates the ACL
-     *
-     * This method will receive a list of new ACE's as an array argument.
-     *
-     * @param array $acl
-     * @return void
-     */
-    public function setACL(array $acl) {
-
-        throw new Forbidden('Updating ACLs is not allowed on this node');
-
-    }
-
-    /**
-     * Returns the list of supported privileges for this node.
-     *
-     * The returned data structure is a list of nested privileges.
-     * See Sabre\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
-     * standard structure.
-     *
-     * If null is returned from this method, the default privilege set is used,
-     * which is fine for most common usecases.
-     *
-     * @return array|null
-     */
-    public function getSupportedPrivilegeSet() {
-
-        return null;
-
-    }
+	/**
+	 * This method returns a node for a principal.
+	 *
+	 * The passed array contains principal information, and is guaranteed to
+	 * at least contain a uri item. Other properties may or may not be
+	 * supplied by the authentication backend.
+	 *
+	 * @param array $principal
+	 * @return \Sabre\DAV\INode
+	 */
+	public function getChildForPrincipal(array $principal) {
+
+		return new Principal($this->principalBackend, $principal);
+
+	}
+
+	/**
+	 * Creates a new collection.
+	 *
+	 * This method will receive a MkCol object with all the information about
+	 * the new collection that's being created.
+	 *
+	 * The MkCol object contains information about the resourceType of the new
+	 * collection. If you don't support the specified resourceType, you should
+	 * throw Exception\InvalidResourceType.
+	 *
+	 * The object also contains a list of WebDAV properties for the new
+	 * collection.
+	 *
+	 * You should call the handle() method on this object to specify exactly
+	 * which properties you are storing. This allows the system to figure out
+	 * exactly which properties you didn't store, which in turn allows other
+	 * plugins (such as the propertystorage plugin) to handle storing the
+	 * property for you.
+	 *
+	 * @param string $name
+	 * @param MkCol $mkCol
+	 * @throws Exception\InvalidResourceType
+	 * @return void
+	 */
+	public function createExtendedCollection($name, MkCol $mkCol) {
+
+		if (!$mkCol->hasResourceType('{DAV:}principal')) {
+			throw new InvalidResourceType('Only resources of type {DAV:}principal may be created here');
+		}
+
+		$this->principalBackend->createPrincipal(
+			$this->principalPrefix . '/' . $name,
+			$mkCol
+		);
+
+	}
+
+	/**
+	 * Returns the owner principal
+	 *
+	 * This must be a url to a principal, or null if there's no owner
+	 *
+	 * @return string|null
+	 */
+	public function getOwner() {
+		return null;
+	}
+
+	/**
+	 * Returns a group principal
+	 *
+	 * This must be a url to a principal, or null if there's no owner
+	 *
+	 * @return string|null
+	 */
+	public function getGroup() {
+		return null;
+	}
+
+	/**
+	 * Returns a list of ACE's for this node.
+	 *
+	 * Each ACE has the following properties:
+	 *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
+	 *     currently the only supported privileges
+	 *   * 'principal', a url to the principal who owns the node
+	 *   * 'protected' (optional), indicating that this ACE is not allowed to
+	 *      be updated.
+	 *
+	 * @return array
+	 */
+	public function getACL() {
+		return [
+			[
+				'principal' => '{DAV:}authenticated',
+				'privilege' => '{DAV:}read',
+				'protected' => true,
+			],
+		];
+	}
+
+	/**
+	 * Updates the ACL
+	 *
+	 * This method will receive a list of new ACE's as an array argument.
+	 *
+	 * @param array $acl
+	 * @return void
+	 */
+	public function setACL(array $acl) {
+
+		throw new Forbidden('Updating ACLs is not allowed on this node');
+
+	}
+
+	/**
+	 * Returns the list of supported privileges for this node.
+	 *
+	 * The returned data structure is a list of nested privileges.
+	 * See Sabre\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
+	 * standard structure.
+	 *
+	 * If null is returned from this method, the default privilege set is used,
+	 * which is fine for most common usecases.
+	 *
+	 * @return array|null
+	 */
+	public function getSupportedPrivilegeSet() {
+
+		return null;
+
+	}
 
 }

libraries/SabreDAV/Event/coroutine.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -2,8 +2,8 @@
 
 namespace Sabre\Event;
 
-use Generator;
 use Exception;
+use Generator;
 
 /**
  * Turn asynchronous promise-based code into something that looks synchronous

Indentation +60 added lines, -60 removed lines

@@ -46,75 +46,75 @@
  */
 function coroutine(callable $gen) {
 
-    $generator = $gen();
-    if (!$generator instanceof Generator) {
-        throw new \InvalidArgumentException('You must pass a generator function');
-    }
+	$generator = $gen();
+	if (!$generator instanceof Generator) {
+		throw new \InvalidArgumentException('You must pass a generator function');
+	}
 
-    // This is the value we're returning.
-    $promise = new Promise();
+	// This is the value we're returning.
+	$promise = new Promise();
 
-    $lastYieldResult = null;
+	$lastYieldResult = null;
 
-    /**
-     * So tempted to use the mythical y-combinator here, but it's not needed in
-     * PHP.
-     */
-    $advanceGenerator = function() use (&$advanceGenerator, $generator, $promise, &$lastYieldResult) {
+	/**
+	 * So tempted to use the mythical y-combinator here, but it's not needed in
+	 * PHP.
+	 */
+	$advanceGenerator = function() use (&$advanceGenerator, $generator, $promise, &$lastYieldResult) {
 
-        while ($generator->valid()) {
+		while ($generator->valid()) {
 
-            $yieldedValue = $generator->current();
-            if ($yieldedValue instanceof Promise) {
-                $yieldedValue->then(
-                    function($value) use ($generator, &$advanceGenerator, &$lastYieldResult) {
-                        $lastYieldResult = $value;
-                        $generator->send($value);
-                        $advanceGenerator();
-                    },
-                    function($reason) use ($generator, $advanceGenerator) {
-                        if ($reason instanceof Exception) {
-                            $generator->throw($reason);
-                        } elseif (is_scalar($reason)) {
-                            $generator->throw(new Exception($reason));
-                        } else {
-                            $type = is_object($reason) ? get_class($reason) : gettype($reason);
-                            $generator->throw(new Exception('Promise was rejected with reason of type: ' . $type));
-                        }
-                        $advanceGenerator();
-                    }
-                )->error(function($reason) use ($promise) {
-                    // This error handler would be called, if something in the
-                    // generator throws an exception, and it's not caught
-                    // locally.
-                    $promise->reject($reason);
-                });
-                // We need to break out of the loop, because $advanceGenerator
-                // will be called asynchronously when the promise has a result.
-                break;
-            } else {
-                // If the value was not a promise, we'll just let it pass through.
-                $lastYieldResult = $yieldedValue;
-                $generator->send($yieldedValue);
-            }
+			$yieldedValue = $generator->current();
+			if ($yieldedValue instanceof Promise) {
+				$yieldedValue->then(
+					function($value) use ($generator, &$advanceGenerator, &$lastYieldResult) {
+						$lastYieldResult = $value;
+						$generator->send($value);
+						$advanceGenerator();
+					},
+					function($reason) use ($generator, $advanceGenerator) {
+						if ($reason instanceof Exception) {
+							$generator->throw($reason);
+						} elseif (is_scalar($reason)) {
+							$generator->throw(new Exception($reason));
+						} else {
+							$type = is_object($reason) ? get_class($reason) : gettype($reason);
+							$generator->throw(new Exception('Promise was rejected with reason of type: ' . $type));
+						}
+						$advanceGenerator();
+					}
+				)->error(function($reason) use ($promise) {
+					// This error handler would be called, if something in the
+					// generator throws an exception, and it's not caught
+					// locally.
+					$promise->reject($reason);
+				});
+				// We need to break out of the loop, because $advanceGenerator
+				// will be called asynchronously when the promise has a result.
+				break;
+			} else {
+				// If the value was not a promise, we'll just let it pass through.
+				$lastYieldResult = $yieldedValue;
+				$generator->send($yieldedValue);
+			}
 
-        }
+		}
 
-        // If the generator is at the end, and we didn't run into an exception,
-        // we can fullfill the promise with the last thing that was yielded to
-        // us.
-        if (!$generator->valid() && $promise->state === Promise::PENDING) {
-            $promise->fulfill($lastYieldResult);
-        }
+		// If the generator is at the end, and we didn't run into an exception,
+		// we can fullfill the promise with the last thing that was yielded to
+		// us.
+		if (!$generator->valid() && $promise->state === Promise::PENDING) {
+			$promise->fulfill($lastYieldResult);
+		}
 
-    };
+	};
 
-    try {
-        $advanceGenerator();
-    } catch (Exception $e) {
-        $promise->reject($e);
-    }
+	try {
+		$advanceGenerator();
+	} catch (Exception $e) {
+		$promise->reject($e);
+	}
 
-    return $promise;
+	return $promise;
 
 }

libraries/SabreDAV/HTTP/functions.php

Doc Comments -1 removed lines

@@ -216,7 +216,6 @@
  * Parameters are currently discarded. There's no known prefer value that
  * uses them.
  *
- * @param string|string[] $header
  * @return array
  */
 function parsePrefer($input) {

Indentation +234 added lines, -234 removed lines

@@ -31,40 +31,40 @@ 
  */
 function parseDate($dateString) {
 
-    // Only the format is checked, valid ranges are checked by strtotime below
-    $month = '(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)';
-    $weekday = '(Monday|Tuesday|Wednesday|Thursday|Friday|Saturday|Sunday)';
-    $wkday = '(Mon|Tue|Wed|Thu|Fri|Sat|Sun)';
-    $time = '([0-1]\d|2[0-3])(\:[0-5]\d){2}';
-    $date3 = $month . ' ([12]\d|3[01]| [1-9])';
-    $date2 = '(0[1-9]|[12]\d|3[01])\-' . $month . '\-\d{2}';
-    // 4-digit year cannot begin with 0 - unix timestamp begins in 1970
-    $date1 = '(0[1-9]|[12]\d|3[01]) ' . $month . ' [1-9]\d{3}';
-
-    // ANSI C's asctime() format
-    // 4-digit year cannot begin with 0 - unix timestamp begins in 1970
-    $asctime_date = $wkday . ' ' . $date3 . ' ' . $time . ' [1-9]\d{3}';
-    // RFC 850, obsoleted by RFC 1036
-    $rfc850_date = $weekday . ', ' . $date2 . ' ' . $time . ' GMT';
-    // RFC 822, updated by RFC 1123
-    $rfc1123_date = $wkday . ', ' . $date1 . ' ' . $time . ' GMT';
-    // allowed date formats by RFC 2616
-    $HTTP_date = "($rfc1123_date|$rfc850_date|$asctime_date)";
-
-    // allow for space around the string and strip it
-    $dateString = trim($dateString, ' ');
-    if (!preg_match('/^' . $HTTP_date . '$/', $dateString))
-        return false;
-
-    // append implicit GMT timezone to ANSI C time format
-    if (strpos($dateString, ' GMT') === false)
-        $dateString .= ' GMT';
-
-    try {
-        return new DateTime($dateString, new \DateTimeZone('UTC'));
-    } catch (\Exception $e) {
-        return false;
-    }
+	// Only the format is checked, valid ranges are checked by strtotime below
+	$month = '(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)';
+	$weekday = '(Monday|Tuesday|Wednesday|Thursday|Friday|Saturday|Sunday)';
+	$wkday = '(Mon|Tue|Wed|Thu|Fri|Sat|Sun)';
+	$time = '([0-1]\d|2[0-3])(\:[0-5]\d){2}';
+	$date3 = $month . ' ([12]\d|3[01]| [1-9])';
+	$date2 = '(0[1-9]|[12]\d|3[01])\-' . $month . '\-\d{2}';
+	// 4-digit year cannot begin with 0 - unix timestamp begins in 1970
+	$date1 = '(0[1-9]|[12]\d|3[01]) ' . $month . ' [1-9]\d{3}';
+
+	// ANSI C's asctime() format
+	// 4-digit year cannot begin with 0 - unix timestamp begins in 1970
+	$asctime_date = $wkday . ' ' . $date3 . ' ' . $time . ' [1-9]\d{3}';
+	// RFC 850, obsoleted by RFC 1036
+	$rfc850_date = $weekday . ', ' . $date2 . ' ' . $time . ' GMT';
+	// RFC 822, updated by RFC 1123
+	$rfc1123_date = $wkday . ', ' . $date1 . ' ' . $time . ' GMT';
+	// allowed date formats by RFC 2616
+	$HTTP_date = "($rfc1123_date|$rfc850_date|$asctime_date)";
+
+	// allow for space around the string and strip it
+	$dateString = trim($dateString, ' ');
+	if (!preg_match('/^' . $HTTP_date . '$/', $dateString))
+		return false;
+
+	// append implicit GMT timezone to ANSI C time format
+	if (strpos($dateString, ' GMT') === false)
+		$dateString .= ' GMT';
+
+	try {
+		return new DateTime($dateString, new \DateTimeZone('UTC'));
+	} catch (\Exception $e) {
+		return false;
+	}
 
 }
 
@@ -76,11 +76,11 @@ 
  */
 function toDate(DateTime $dateTime) {
 
-    // We need to clone it, as we don't want to affect the existing
-    // DateTime.
-    $dateTime = clone $dateTime;
-    $dateTime->setTimeZone(new \DateTimeZone('GMT'));
-    return $dateTime->format('D, d M Y H:i:s \G\M\T');
+	// We need to clone it, as we don't want to affect the existing
+	// DateTime.
+	$dateTime = clone $dateTime;
+	$dateTime->setTimeZone(new \DateTimeZone('GMT'));
+	return $dateTime->format('D, d M Y H:i:s \G\M\T');
 
 }
 
@@ -106,89 +106,89 @@ 
  */
 function negotiateContentType($acceptHeaderValue, array $availableOptions) {
 
-    if (!$acceptHeaderValue) {
-        // Grabbing the first in the list.
-        return reset($availableOptions);
-    }
-
-    $proposals = array_map(
-        'Sabre\HTTP\parseMimeType',
-        explode(',', $acceptHeaderValue)
-    );
-
-    // Ensuring array keys are reset.
-    $availableOptions = array_values($availableOptions);
-
-    $options = array_map(
-        'Sabre\HTTP\parseMimeType',
-        $availableOptions
-    );
-
-    $lastQuality = 0;
-    $lastSpecificity = 0;
-    $lastOptionIndex = 0;
-    $lastChoice = null;
-
-    foreach ($proposals as $proposal) {
-
-        // Ignoring broken values.
-        if (is_null($proposal)) continue;
-
-        // If the quality is lower we don't have to bother comparing.
-        if ($proposal['quality'] < $lastQuality) {
-            continue;
-        }
-
-        foreach ($options as $optionIndex => $option) {
-
-            if ($proposal['type'] !== '*' && $proposal['type'] !== $option['type']) {
-                // no match on type.
-                continue;
-            }
-            if ($proposal['subType'] !== '*' && $proposal['subType'] !== $option['subType']) {
-                // no match on subtype.
-                continue;
-            }
-
-            // Any parameters appearing on the options must appear on
-            // proposals.
-            foreach ($option['parameters'] as $paramName => $paramValue) {
-                if (!array_key_exists($paramName, $proposal['parameters'])) {
-                    continue 2;
-                }
-                if ($paramValue !== $proposal['parameters'][$paramName]) {
-                    continue 2;
-                }
-            }
-
-            // If we got here, we have a match on parameters, type and
-            // subtype. We need to calculate a score for how specific the
-            // match was.
-            $specificity =
-                ($proposal['type'] !== '*' ? 20 : 0) +
-                ($proposal['subType'] !== '*' ? 10 : 0) +
-                count($option['parameters']);
-
-
-            // Does this entry win?
-            if (
-                ($proposal['quality'] > $lastQuality) ||
-                ($proposal['quality'] === $lastQuality && $specificity > $lastSpecificity) ||
-                ($proposal['quality'] === $lastQuality && $specificity === $lastSpecificity && $optionIndex < $lastOptionIndex)
-            ) {
-
-                $lastQuality = $proposal['quality'];
-                $lastSpecificity = $specificity;
-                $lastOptionIndex = $optionIndex;
-                $lastChoice = $availableOptions[$optionIndex];
-
-            }
-
-        }
-
-    }
-
-    return $lastChoice;
+	if (!$acceptHeaderValue) {
+		// Grabbing the first in the list.
+		return reset($availableOptions);
+	}
+
+	$proposals = array_map(
+		'Sabre\HTTP\parseMimeType',
+		explode(',', $acceptHeaderValue)
+	);
+
+	// Ensuring array keys are reset.
+	$availableOptions = array_values($availableOptions);
+
+	$options = array_map(
+		'Sabre\HTTP\parseMimeType',
+		$availableOptions
+	);
+
+	$lastQuality = 0;
+	$lastSpecificity = 0;
+	$lastOptionIndex = 0;
+	$lastChoice = null;
+
+	foreach ($proposals as $proposal) {
+
+		// Ignoring broken values.
+		if (is_null($proposal)) continue;
+
+		// If the quality is lower we don't have to bother comparing.
+		if ($proposal['quality'] < $lastQuality) {
+			continue;
+		}
+
+		foreach ($options as $optionIndex => $option) {
+
+			if ($proposal['type'] !== '*' && $proposal['type'] !== $option['type']) {
+				// no match on type.
+				continue;
+			}
+			if ($proposal['subType'] !== '*' && $proposal['subType'] !== $option['subType']) {
+				// no match on subtype.
+				continue;
+			}
+
+			// Any parameters appearing on the options must appear on
+			// proposals.
+			foreach ($option['parameters'] as $paramName => $paramValue) {
+				if (!array_key_exists($paramName, $proposal['parameters'])) {
+					continue 2;
+				}
+				if ($paramValue !== $proposal['parameters'][$paramName]) {
+					continue 2;
+				}
+			}
+
+			// If we got here, we have a match on parameters, type and
+			// subtype. We need to calculate a score for how specific the
+			// match was.
+			$specificity =
+				($proposal['type'] !== '*' ? 20 : 0) +
+				($proposal['subType'] !== '*' ? 10 : 0) +
+				count($option['parameters']);
+
+
+			// Does this entry win?
+			if (
+				($proposal['quality'] > $lastQuality) ||
+				($proposal['quality'] === $lastQuality && $specificity > $lastSpecificity) ||
+				($proposal['quality'] === $lastQuality && $specificity === $lastSpecificity && $optionIndex < $lastOptionIndex)
+			) {
+
+				$lastQuality = $proposal['quality'];
+				$lastSpecificity = $specificity;
+				$lastOptionIndex = $optionIndex;
+				$lastChoice = $availableOptions[$optionIndex];
+
+			}
+
+		}
+
+	}
+
+	return $lastChoice;
 
 }
 
@@ -221,12 +221,12 @@ 
  */
 function parsePrefer($input) {
 
-    $token = '[!#$%&\'*+\-.^_`~A-Za-z0-9]+';
+	$token = '[!#$%&\'*+\-.^_`~A-Za-z0-9]+';
 
-    // Work in progress
-    $word = '(?: [a-zA-Z0-9]+ | "[a-zA-Z0-9]*" )';
+	// Work in progress
+	$word = '(?: [a-zA-Z0-9]+ | "[a-zA-Z0-9]*" )';
 
-    $regex = <<<REGEX
+	$regex = <<<REGEX
 /
 ^
 (?<name> $token)      # Prefer property name
@@ -239,44 +239,44 @@ 
 /x
 REGEX;
 
-    $output = [];
-    foreach (getHeaderValues($input) as $value) {
-
-        if (!preg_match($regex, $value, $matches)) {
-            // Ignore
-            continue;
-        }
-
-        // Mapping old values to their new counterparts
-        switch ($matches['name']) {
-            case 'return-asynch' :
-                $output['respond-async'] = true;
-                break;
-            case 'return-representation' :
-                $output['return'] = 'representation';
-                break;
-            case 'return-minimal' :
-                $output['return'] = 'minimal';
-                break;
-            case 'strict' :
-                $output['handling'] = 'strict';
-                break;
-            case 'lenient' :
-                $output['handling'] = 'lenient';
-                break;
-            default :
-                if (isset($matches['value'])) {
-                    $value = trim($matches['value'], '"');
-                } else {
-                    $value = true;
-                }
-                $output[strtolower($matches['name'])] = empty($value) ? true : $value;
-                break;
-        }
-
-    }
-
-    return $output;
+	$output = [];
+	foreach (getHeaderValues($input) as $value) {
+
+		if (!preg_match($regex, $value, $matches)) {
+			// Ignore
+			continue;
+		}
+
+		// Mapping old values to their new counterparts
+		switch ($matches['name']) {
+			case 'return-asynch' :
+				$output['respond-async'] = true;
+				break;
+			case 'return-representation' :
+				$output['return'] = 'representation';
+				break;
+			case 'return-minimal' :
+				$output['return'] = 'minimal';
+				break;
+			case 'strict' :
+				$output['handling'] = 'strict';
+				break;
+			case 'lenient' :
+				$output['handling'] = 'lenient';
+				break;
+			default :
+				if (isset($matches['value'])) {
+					$value = trim($matches['value'], '"');
+				} else {
+					$value = true;
+				}
+				$output[strtolower($matches['name'])] = empty($value) ? true : $value;
+				break;
+		}
+
+	}
+
+	return $output;
 
 }
 
@@ -300,16 +300,16 @@ 
  */
 function getHeaderValues($values, $values2 = null) {
 
-    $values = (array)$values;
-    if ($values2) {
-        $values = array_merge($values, (array)$values2);
-    }
-    foreach ($values as $l1) {
-        foreach (explode(',', $l1) as $l2) {
-            $result[] = trim($l2);
-        }
-    }
-    return $result;
+	$values = (array)$values;
+	if ($values2) {
+		$values = array_merge($values, (array)$values2);
+	}
+	foreach ($values as $l1) {
+		foreach (explode(',', $l1) as $l2) {
+			$result[] = trim($l2);
+		}
+	}
+	return $result;
 
 }
 
@@ -326,52 +326,52 @@ 
  */
 function parseMimeType($str) {
 
-    $parameters = [];
-    // If no q= parameter appears, then quality = 1.
-    $quality = 1;
-
-    $parts = explode(';', $str);
-
-    // The first part is the mime-type.
-    $mimeType = array_shift($parts);
-
-    $mimeType = explode('/', trim($mimeType));
-    if (count($mimeType) !== 2) {
-        // Illegal value
-        return null;
-    }
-    list($type, $subType) = $mimeType;
-
-    foreach ($parts as $part) {
-
-        $part = trim($part);
-        if (strpos($part, '=')) {
-            list($partName, $partValue) =
-                explode('=', $part, 2);
-        } else {
-            $partName = $part;
-            $partValue = null;
-        }
-
-        // The quality parameter, if it appears, also marks the end of
-        // the parameter list. Anything after the q= counts as an
-        // 'accept extension' and could introduce new semantics in
-        // content-negotation.
-        if ($partName !== 'q') {
-            $parameters[$partName] = $part;
-        } else {
-            $quality = (float)$partValue;
-            break; // Stop parsing parts
-        }
-
-    }
-
-    return [
-        'type'       => $type,
-        'subType'    => $subType,
-        'quality'    => $quality,
-        'parameters' => $parameters,
-    ];
+	$parameters = [];
+	// If no q= parameter appears, then quality = 1.
+	$quality = 1;
+
+	$parts = explode(';', $str);
+
+	// The first part is the mime-type.
+	$mimeType = array_shift($parts);
+
+	$mimeType = explode('/', trim($mimeType));
+	if (count($mimeType) !== 2) {
+		// Illegal value
+		return null;
+	}
+	list($type, $subType) = $mimeType;
+
+	foreach ($parts as $part) {
+
+		$part = trim($part);
+		if (strpos($part, '=')) {
+			list($partName, $partValue) =
+				explode('=', $part, 2);
+		} else {
+			$partName = $part;
+			$partValue = null;
+		}
+
+		// The quality parameter, if it appears, also marks the end of
+		// the parameter list. Anything after the q= counts as an
+		// 'accept extension' and could introduce new semantics in
+		// content-negotation.
+		if ($partName !== 'q') {
+			$parameters[$partName] = $part;
+		} else {
+			$quality = (float)$partValue;
+			break; // Stop parsing parts
+		}
+
+	}
+
+	return [
+		'type'       => $type,
+		'subType'    => $subType,
+		'quality'    => $quality,
+		'parameters' => $parameters,
+	];
 
 }
 
@@ -385,11 +385,11 @@ 
  */
 function encodePath($path) {
 
-    return preg_replace_callback('/([^A-Za-z0-9_\-\.~\(\)\/:@])/', function($match) {
+	return preg_replace_callback('/([^A-Za-z0-9_\-\.~\(\)\/:@])/', function($match) {
 
-        return '%' . sprintf('%02x', ord($match[0]));
+		return '%' . sprintf('%02x', ord($match[0]));
 
-    }, $path);
+	}, $path);
 
 }
 
@@ -403,11 +403,11 @@ 
  */
 function encodePathSegment($pathSegment) {
 
-    return preg_replace_callback('/([^A-Za-z0-9_\-\.~\(\):@])/', function($match) {
+	return preg_replace_callback('/([^A-Za-z0-9_\-\.~\(\):@])/', function($match) {
 
-        return '%' . sprintf('%02x', ord($match[0]));
+		return '%' . sprintf('%02x', ord($match[0]));
 
-    }, $pathSegment);
+	}, $pathSegment);
 }
 
 /**
@@ -418,7 +418,7 @@ 
  */
 function decodePath($path) {
 
-    return decodePathSegment($path);
+	return decodePathSegment($path);
 
 }
 
@@ -430,16 +430,16 @@ 
  */
 function decodePathSegment($path) {
 
-    $path = rawurldecode($path);
-    $encoding = mb_detect_encoding($path, ['UTF-8', 'ISO-8859-1']);
+	$path = rawurldecode($path);
+	$encoding = mb_detect_encoding($path, ['UTF-8', 'ISO-8859-1']);
 
-    switch ($encoding) {
+	switch ($encoding) {
 
-        case 'ISO-8859-1' :
-            $path = utf8_encode($path);
+		case 'ISO-8859-1' :
+			$path = utf8_encode($path);
 
-    }
+	}
 
-    return $path;
+	return $path;
 
 }

Spacing +3 added lines, -3 removed lines

@@ -300,9 +300,9 @@ 
  */
 function getHeaderValues($values, $values2 = null) {
 
-    $values = (array)$values;
+    $values = (array) $values;
     if ($values2) {
-        $values = array_merge($values, (array)$values2);
+        $values = array_merge($values, (array) $values2);
     }
     foreach ($values as $l1) {
         foreach (explode(',', $l1) as $l2) {
@@ -360,7 +360,7 @@ 
         if ($partName !== 'q') {
             $parameters[$partName] = $part;
         } else {
-            $quality = (float)$partValue;
+            $quality = (float) $partValue;
             break; // Stop parsing parts
         }
 

Braces +9 added lines, -5 removed lines

@@ -53,12 +53,14 @@ 
 
     // allow for space around the string and strip it
     $dateString = trim($dateString, ' ');
-    if (!preg_match('/^' . $HTTP_date . '$/', $dateString))
-        return false;
+    if (!preg_match('/^' . $HTTP_date . '$/', $dateString)) {
+            return false;
+    }
 
     // append implicit GMT timezone to ANSI C time format
-    if (strpos($dateString, ' GMT') === false)
-        $dateString .= ' GMT';
+    if (strpos($dateString, ' GMT') === false) {
+            $dateString .= ' GMT';
+    }
 
     try {
         return new DateTime($dateString, new \DateTimeZone('UTC'));
@@ -132,7 +134,9 @@ 
     foreach ($proposals as $proposal) {
 
         // Ignoring broken values.
-        if (is_null($proposal)) continue;
+        if (is_null($proposal)) {
+        	continue;
+        }
 
         // If the quality is lower we don't have to bother comparing.
         if ($proposal['quality'] < $lastQuality) {

libraries/SabreDAV/HTTP/URLUtil.php

Unused Use Statements -2 removed lines

@@ -2,8 +2,6 @@
 
 namespace Sabre\HTTP;
 
-use Sabre\URI;
-
 /**
  * URL utility class
  *

Indentation +82 added lines, -82 removed lines

@@ -17,87 +17,87 @@
  */
 class URLUtil {
 
-    /**
-     * Encodes the path of a url.
-     *
-     * slashes (/) are treated as path-separators.
-     *
-     * @deprecated use \Sabre\HTTP\encodePath()
-     * @param string $path
-     * @return string
-     */
-    static function encodePath($path) {
-
-        return encodePath($path);
-
-    }
-
-    /**
-     * Encodes a 1 segment of a path
-     *
-     * Slashes are considered part of the name, and are encoded as %2f
-     *
-     * @deprecated use \Sabre\HTTP\encodePathSegment()
-     * @param string $pathSegment
-     * @return string
-     */
-    static function encodePathSegment($pathSegment) {
-
-        return encodePathSegment($pathSegment);
-
-    }
-
-    /**
-     * Decodes a url-encoded path
-     *
-     * @deprecated use \Sabre\HTTP\decodePath
-     * @param string $path
-     * @return string
-     */
-    static function decodePath($path) {
-
-        return decodePath($path);
-
-    }
-
-    /**
-     * Decodes a url-encoded path segment
-     *
-     * @deprecated use \Sabre\HTTP\decodePathSegment()
-     * @param string $path
-     * @return string
-     */
-    static function decodePathSegment($path) {
-
-        return decodePathSegment($path);
-
-    }
-
-    /**
-     * Returns the 'dirname' and 'basename' for a path.
-     *
-     * @deprecated Use Sabre\Uri\split().
-     * @param string $path
-     * @return array
-     */
-    static function splitPath($path) {
-
-        return Uri\split($path);
-
-    }
-
-    /**
-     * Resolves relative urls, like a browser would.
-     *
-     * @deprecated Use Sabre\Uri\resolve().
-     * @param string $basePath
-     * @param string $newPath
-     * @return string
-     */
-    static function resolve($basePath, $newPath) {
-
-        return Uri\resolve($basePath, $newPath);
-
-    }
+	/**
+	 * Encodes the path of a url.
+	 *
+	 * slashes (/) are treated as path-separators.
+	 *
+	 * @deprecated use \Sabre\HTTP\encodePath()
+	 * @param string $path
+	 * @return string
+	 */
+	static function encodePath($path) {
+
+		return encodePath($path);
+
+	}
+
+	/**
+	 * Encodes a 1 segment of a path
+	 *
+	 * Slashes are considered part of the name, and are encoded as %2f
+	 *
+	 * @deprecated use \Sabre\HTTP\encodePathSegment()
+	 * @param string $pathSegment
+	 * @return string
+	 */
+	static function encodePathSegment($pathSegment) {
+
+		return encodePathSegment($pathSegment);
+
+	}
+
+	/**
+	 * Decodes a url-encoded path
+	 *
+	 * @deprecated use \Sabre\HTTP\decodePath
+	 * @param string $path
+	 * @return string
+	 */
+	static function decodePath($path) {
+
+		return decodePath($path);
+
+	}
+
+	/**
+	 * Decodes a url-encoded path segment
+	 *
+	 * @deprecated use \Sabre\HTTP\decodePathSegment()
+	 * @param string $path
+	 * @return string
+	 */
+	static function decodePathSegment($path) {
+
+		return decodePathSegment($path);
+
+	}
+
+	/**
+	 * Returns the 'dirname' and 'basename' for a path.
+	 *
+	 * @deprecated Use Sabre\Uri\split().
+	 * @param string $path
+	 * @return array
+	 */
+	static function splitPath($path) {
+
+		return Uri\split($path);
+
+	}
+
+	/**
+	 * Resolves relative urls, like a browser would.
+	 *
+	 * @deprecated Use Sabre\Uri\resolve().
+	 * @param string $basePath
+	 * @param string $newPath
+	 * @return string
+	 */
+	static function resolve($basePath, $newPath) {
+
+		return Uri\resolve($basePath, $newPath);
+
+	}
 
 }

libraries/SabreDAV/HTTP/Util.php

Doc Comments +2 added lines, -2 removed lines

@@ -31,8 +31,8 @@
      * Deprecated! Use negotiateContentType.
      *
      * @deprecated Use \Sabre\HTTP\NegotiateContentType
-     * @param string|null $acceptHeader
-     * @param array $availableOptions
+     * @param string|null $acceptHeaderValue
+     * @param string[] $availableOptions
      * @return string|null
      */
     static function negotiate($acceptHeaderValue, array $availableOptions) {

Indentation +47 added lines, -47 removed lines

@@ -13,62 +13,62 @@
  */
 class Util {
 
-    /**
-     * Content negotiation
-     *
-     * @deprecated Use \Sabre\HTTP\negotiateContentType
-     * @param string|null $acceptHeaderValue
-     * @param array $availableOptions
-     * @return string|null
-     */
-    static function negotiateContentType($acceptHeaderValue, array $availableOptions) {
+	/**
+	 * Content negotiation
+	 *
+	 * @deprecated Use \Sabre\HTTP\negotiateContentType
+	 * @param string|null $acceptHeaderValue
+	 * @param array $availableOptions
+	 * @return string|null
+	 */
+	static function negotiateContentType($acceptHeaderValue, array $availableOptions) {
 
-        return negotiateContentType($acceptHeaderValue, $availableOptions);
+		return negotiateContentType($acceptHeaderValue, $availableOptions);
 
-    }
+	}
 
-    /**
-     * Deprecated! Use negotiateContentType.
-     *
-     * @deprecated Use \Sabre\HTTP\NegotiateContentType
-     * @param string|null $acceptHeader
-     * @param array $availableOptions
-     * @return string|null
-     */
-    static function negotiate($acceptHeaderValue, array $availableOptions) {
+	/**
+	 * Deprecated! Use negotiateContentType.
+	 *
+	 * @deprecated Use \Sabre\HTTP\NegotiateContentType
+	 * @param string|null $acceptHeader
+	 * @param array $availableOptions
+	 * @return string|null
+	 */
+	static function negotiate($acceptHeaderValue, array $availableOptions) {
 
-        return negotiateContentType($acceptHeaderValue, $availableOptions);
+		return negotiateContentType($acceptHeaderValue, $availableOptions);
 
-    }
+	}
 
-    /**
-     * Parses a RFC2616-compatible date string
-     *
-     * This method returns false if the date is invalid
-     *
-     * @deprecated Use parseDate
-     * @param string $dateHeader
-     * @return bool|DateTime
-     */
-    static function parseHTTPDate($dateHeader) {
+	/**
+	 * Parses a RFC2616-compatible date string
+	 *
+	 * This method returns false if the date is invalid
+	 *
+	 * @deprecated Use parseDate
+	 * @param string $dateHeader
+	 * @return bool|DateTime
+	 */
+	static function parseHTTPDate($dateHeader) {
 
-        return parseDate($dateHeader);
+		return parseDate($dateHeader);
 
-    }
+	}
 
-    /**
-     * Transforms a DateTime object to HTTP's most common date format.
-     *
-     * We're serializing it as the RFC 1123 date, which, for HTTP must be
-     * specified as GMT.
-     *
-     * @deprecated Use toDate
-     * @param \DateTime $dateTime
-     * @return string
-     */
-    static function toHTTPDate(\DateTime $dateTime) {
+	/**
+	 * Transforms a DateTime object to HTTP's most common date format.
+	 *
+	 * We're serializing it as the RFC 1123 date, which, for HTTP must be
+	 * specified as GMT.
+	 *
+	 * @deprecated Use toDate
+	 * @param \DateTime $dateTime
+	 * @return string
+	 */
+	static function toHTTPDate(\DateTime $dateTime) {
 
-        return toDate($dateTime);
+		return toDate($dateTime);
 
-    }
+	}
 }

libraries/SabreDAV/VObject/Cli.php

Unused Use Statements +1 added lines, -2 removed lines

@@ -2,8 +2,7 @@
 
 namespace Sabre\VObject;
 
-use
-    InvalidArgumentException;
+use InvalidArgumentException;
 
 /**
  * This is the CLI interface for sabre-vobject.

Spacing +5 added lines, -5 removed lines

@@ -335,10 +335,10 @@ 
 
         switch ($vObj->name) {
             case 'VCALENDAR' :
-                $this->log("iCalendar: " . (string)$vObj->VERSION);
+                $this->log("iCalendar: " . (string) $vObj->VERSION);
                 break;
             case 'VCARD' :
-                $this->log("vCard: " . (string)$vObj->VERSION);
+                $this->log("vCard: " . (string) $vObj->VERSION);
                 break;
         }
 
@@ -382,10 +382,10 @@ 
 
         switch ($vObj->name) {
             case 'VCALENDAR' :
-                $this->log("iCalendar: " . (string)$vObj->VERSION);
+                $this->log("iCalendar: " . (string) $vObj->VERSION);
                 break;
             case 'VCARD' :
-                $this->log("vCard: " . (string)$vObj->VERSION);
+                $this->log("vCard: " . (string) $vObj->VERSION);
                 break;
         }
 
@@ -652,7 +652,7 @@ 
                 }
                 $first2 = true;
                 // Looping through property sub-values
-                foreach ((array)$part as $subPart) {
+                foreach ((array) $part as $subPart) {
                     if ($first2) {
                         $first2 = false;
                     } else {

Indentation +729 added lines, -729 removed lines

@@ -3,7 +3,7 @@ 
 namespace Sabre\VObject;
 
 use
-    InvalidArgumentException;
+	InvalidArgumentException;
 
 /**
  * This is the CLI interface for sabre-vobject.
@@ -14,759 +14,759 @@ 
  */
 class Cli {
 
-    /**
-     * No output.
-     *
-     * @var bool
-     */
-    protected $quiet = false;
-
-    /**
-     * Help display.
-     *
-     * @var bool
-     */
-    protected $showHelp = false;
-
-    /**
-     * Wether to spit out 'mimedir' or 'json' format.
-     *
-     * @var string
-     */
-    protected $format;
-
-    /**
-     * JSON pretty print.
-     *
-     * @var bool
-     */
-    protected $pretty;
-
-    /**
-     * Source file.
-     *
-     * @var string
-     */
-    protected $inputPath;
-
-    /**
-     * Destination file.
-     *
-     * @var string
-     */
-    protected $outputPath;
-
-    /**
-     * output stream.
-     *
-     * @var resource
-     */
-    protected $stdout;
-
-    /**
-     * stdin.
-     *
-     * @var resource
-     */
-    protected $stdin;
-
-    /**
-     * stderr.
-     *
-     * @var resource
-     */
-    protected $stderr;
-
-    /**
-     * Input format (one of json or mimedir).
-     *
-     * @var string
-     */
-    protected $inputFormat;
-
-    /**
-     * Makes the parser less strict.
-     *
-     * @var bool
-     */
-    protected $forgiving = false;
-
-    /**
-     * Main function.
-     *
-     * @return int
-     */
-    public function main(array $argv) {
-
-        // @codeCoverageIgnoreStart
-        // We cannot easily test this, so we'll skip it. Pretty basic anyway.
-
-        if (!$this->stderr) {
-            $this->stderr = fopen('php://stderr', 'w');
-        }
-        if (!$this->stdout) {
-            $this->stdout = fopen('php://stdout', 'w');
-        }
-        if (!$this->stdin) {
-            $this->stdin = fopen('php://stdin', 'r');
-        }
-
-        // @codeCoverageIgnoreEnd
-
-
-        try {
-
-            list($options, $positional) = $this->parseArguments($argv);
-
-            if (isset($options['q'])) {
-                $this->quiet = true;
-            }
-            $this->log($this->colorize('green', "sabre/vobject ") . $this->colorize('yellow', Version::VERSION));
-
-            foreach ($options as $name => $value) {
-
-                switch ($name) {
-
-                    case 'q' :
-                        // Already handled earlier.
-                        break;
-                    case 'h' :
-                    case 'help' :
-                        $this->showHelp();
-                        return 0;
-                        break;
-                    case 'format' :
-                        switch ($value) {
-
-                            // jcard/jcal documents
-                            case 'jcard' :
-                            case 'jcal' :
-
-                            // specific document versions
-                            case 'vcard21' :
-                            case 'vcard30' :
-                            case 'vcard40' :
-                            case 'icalendar20' :
-
-                            // specific formats
-                            case 'json' :
-                            case 'mimedir' :
-
-                            // icalendar/vcad
-                            case 'icalendar' :
-                            case 'vcard' :
-                                $this->format = $value;
-                                break;
-
-                            default :
-                                throw new InvalidArgumentException('Unknown format: ' . $value);
-
-                        }
-                        break;
-                    case 'pretty' :
-                        if (version_compare(PHP_VERSION, '5.4.0') >= 0) {
-                            $this->pretty = true;
-                        }
-                        break;
-                    case 'forgiving' :
-                        $this->forgiving = true;
-                        break;
-                    case 'inputformat' :
-                        switch ($value) {
-                            // json formats
-                            case 'jcard' :
-                            case 'jcal' :
-                            case 'json' :
-                                $this->inputFormat = 'json';
-                                break;
-
-                            // mimedir formats
-                            case 'mimedir' :
-                            case 'icalendar' :
-                            case 'vcard' :
-                            case 'vcard21' :
-                            case 'vcard30' :
-                            case 'vcard40' :
-                            case 'icalendar20' :
-
-                                $this->inputFormat = 'mimedir';
-                                break;
-
-                            default :
-                                throw new InvalidArgumentException('Unknown format: ' . $value);
-
-                        }
-                        break;
-                    default :
-                        throw new InvalidArgumentException('Unknown option: ' . $name);
-
-                }
-
-            }
-
-            if (count($positional) === 0) {
-                $this->showHelp();
-                return 1;
-            }
-
-            if (count($positional) === 1) {
-                throw new InvalidArgumentException('Inputfile is a required argument');
-            }
-
-            if (count($positional) > 3) {
-                throw new InvalidArgumentException('Too many arguments');
-            }
-
-            if (!in_array($positional[0], ['validate', 'repair', 'convert', 'color'])) {
-                throw new InvalidArgumentException('Uknown command: ' . $positional[0]);
-            }
-
-        } catch (InvalidArgumentException $e) {
-            $this->showHelp();
-            $this->log('Error: ' . $e->getMessage(), 'red');
-            return 1;
-        }
-
-        $command = $positional[0];
-
-        $this->inputPath = $positional[1];
-        $this->outputPath = isset($positional[2]) ? $positional[2] : '-';
-
-        if ($this->outputPath !== '-') {
-            $this->stdout = fopen($this->outputPath, 'w');
-        }
-
-        if (!$this->inputFormat) {
-            if (substr($this->inputPath, -5) === '.json') {
-                $this->inputFormat = 'json';
-            } else {
-                $this->inputFormat = 'mimedir';
-            }
-        }
-        if (!$this->format) {
-            if (substr($this->outputPath, -5) === '.json') {
-                $this->format = 'json';
-            } else {
-                $this->format = 'mimedir';
-            }
-        }
-
-
-        $realCode = 0;
-
-        try {
-
-            while ($input = $this->readInput()) {
-
-                $returnCode = $this->$command($input);
-                if ($returnCode !== 0) $realCode = $returnCode;
-
-            }
-
-        } catch (EofException $e) {
-            // end of file
-        } catch (\Exception $e) {
-            $this->log('Error: ' . $e->getMessage(), 'red');
-            return 2;
-        }
-
-        return $realCode;
-
-    }
-
-    /**
-     * Shows the help message.
-     *
-     * @return void
-     */
-    protected function showHelp() {
-
-        $this->log('Usage:', 'yellow');
-        $this->log("  vobject [options] command [arguments]");
-        $this->log('');
-        $this->log('Options:', 'yellow');
-        $this->log($this->colorize('green', '  -q            ') . "Don't output anything.");
-        $this->log($this->colorize('green', '  -help -h      ') . "Display this help message.");
-        $this->log($this->colorize('green', '  --format      ') . "Convert to a specific format. Must be one of: vcard, vcard21,");
-        $this->log($this->colorize('green', '  --forgiving   ') . "Makes the parser less strict.");
-        $this->log("                vcard30, vcard40, icalendar20, jcal, jcard, json, mimedir.");
-        $this->log($this->colorize('green', '  --inputformat ') . "If the input format cannot be guessed from the extension, it");
-        $this->log("                must be specified here.");
-        // Only PHP 5.4 and up
-        if (version_compare(PHP_VERSION, '5.4.0') >= 0) {
-            $this->log($this->colorize('green', '  --pretty      ') . "json pretty-print.");
-        }
-        $this->log('');
-        $this->log('Commands:', 'yellow');
-        $this->log($this->colorize('green', '  validate') . ' source_file              Validates a file for correctness.');
-        $this->log($this->colorize('green', '  repair') . ' source_file [output_file]  Repairs a file.');
-        $this->log($this->colorize('green', '  convert') . ' source_file [output_file] Converts a file.');
-        $this->log($this->colorize('green', '  color') . ' source_file                 Colorize a file, useful for debbugging.');
-        $this->log(
-        <<<HELP
+	/**
+	 * No output.
+	 *
+	 * @var bool
+	 */
+	protected $quiet = false;
+
+	/**
+	 * Help display.
+	 *
+	 * @var bool
+	 */
+	protected $showHelp = false;
+
+	/**
+	 * Wether to spit out 'mimedir' or 'json' format.
+	 *
+	 * @var string
+	 */
+	protected $format;
+
+	/**
+	 * JSON pretty print.
+	 *
+	 * @var bool
+	 */
+	protected $pretty;
+
+	/**
+	 * Source file.
+	 *
+	 * @var string
+	 */
+	protected $inputPath;
+
+	/**
+	 * Destination file.
+	 *
+	 * @var string
+	 */
+	protected $outputPath;
+
+	/**
+	 * output stream.
+	 *
+	 * @var resource
+	 */
+	protected $stdout;
+
+	/**
+	 * stdin.
+	 *
+	 * @var resource
+	 */
+	protected $stdin;
+
+	/**
+	 * stderr.
+	 *
+	 * @var resource
+	 */
+	protected $stderr;
+
+	/**
+	 * Input format (one of json or mimedir).
+	 *
+	 * @var string
+	 */
+	protected $inputFormat;
+
+	/**
+	 * Makes the parser less strict.
+	 *
+	 * @var bool
+	 */
+	protected $forgiving = false;
+
+	/**
+	 * Main function.
+	 *
+	 * @return int
+	 */
+	public function main(array $argv) {
+
+		// @codeCoverageIgnoreStart
+		// We cannot easily test this, so we'll skip it. Pretty basic anyway.
+
+		if (!$this->stderr) {
+			$this->stderr = fopen('php://stderr', 'w');
+		}
+		if (!$this->stdout) {
+			$this->stdout = fopen('php://stdout', 'w');
+		}
+		if (!$this->stdin) {
+			$this->stdin = fopen('php://stdin', 'r');
+		}
+
+		// @codeCoverageIgnoreEnd
+
+
+		try {
+
+			list($options, $positional) = $this->parseArguments($argv);
+
+			if (isset($options['q'])) {
+				$this->quiet = true;
+			}
+			$this->log($this->colorize('green', "sabre/vobject ") . $this->colorize('yellow', Version::VERSION));
+
+			foreach ($options as $name => $value) {
+
+				switch ($name) {
+
+					case 'q' :
+						// Already handled earlier.
+						break;
+					case 'h' :
+					case 'help' :
+						$this->showHelp();
+						return 0;
+						break;
+					case 'format' :
+						switch ($value) {
+
+							// jcard/jcal documents
+							case 'jcard' :
+							case 'jcal' :
+
+							// specific document versions
+							case 'vcard21' :
+							case 'vcard30' :
+							case 'vcard40' :
+							case 'icalendar20' :
+
+							// specific formats
+							case 'json' :
+							case 'mimedir' :
+
+							// icalendar/vcad
+							case 'icalendar' :
+							case 'vcard' :
+								$this->format = $value;
+								break;
+
+							default :
+								throw new InvalidArgumentException('Unknown format: ' . $value);
+
+						}
+						break;
+					case 'pretty' :
+						if (version_compare(PHP_VERSION, '5.4.0') >= 0) {
+							$this->pretty = true;
+						}
+						break;
+					case 'forgiving' :
+						$this->forgiving = true;
+						break;
+					case 'inputformat' :
+						switch ($value) {
+							// json formats
+							case 'jcard' :
+							case 'jcal' :
+							case 'json' :
+								$this->inputFormat = 'json';
+								break;
+
+							// mimedir formats
+							case 'mimedir' :
+							case 'icalendar' :
+							case 'vcard' :
+							case 'vcard21' :
+							case 'vcard30' :
+							case 'vcard40' :
+							case 'icalendar20' :
+
+								$this->inputFormat = 'mimedir';
+								break;
+
+							default :
+								throw new InvalidArgumentException('Unknown format: ' . $value);
+
+						}
+						break;
+					default :
+						throw new InvalidArgumentException('Unknown option: ' . $name);
+
+				}
+
+			}
+
+			if (count($positional) === 0) {
+				$this->showHelp();
+				return 1;
+			}
+
+			if (count($positional) === 1) {
+				throw new InvalidArgumentException('Inputfile is a required argument');
+			}
+
+			if (count($positional) > 3) {
+				throw new InvalidArgumentException('Too many arguments');
+			}
+
+			if (!in_array($positional[0], ['validate', 'repair', 'convert', 'color'])) {
+				throw new InvalidArgumentException('Uknown command: ' . $positional[0]);
+			}
+
+		} catch (InvalidArgumentException $e) {
+			$this->showHelp();
+			$this->log('Error: ' . $e->getMessage(), 'red');
+			return 1;
+		}
+
+		$command = $positional[0];
+
+		$this->inputPath = $positional[1];
+		$this->outputPath = isset($positional[2]) ? $positional[2] : '-';
+
+		if ($this->outputPath !== '-') {
+			$this->stdout = fopen($this->outputPath, 'w');
+		}
+
+		if (!$this->inputFormat) {
+			if (substr($this->inputPath, -5) === '.json') {
+				$this->inputFormat = 'json';
+			} else {
+				$this->inputFormat = 'mimedir';
+			}
+		}
+		if (!$this->format) {
+			if (substr($this->outputPath, -5) === '.json') {
+				$this->format = 'json';
+			} else {
+				$this->format = 'mimedir';
+			}
+		}
+
+
+		$realCode = 0;
+
+		try {
+
+			while ($input = $this->readInput()) {
+
+				$returnCode = $this->$command($input);
+				if ($returnCode !== 0) $realCode = $returnCode;
+
+			}
+
+		} catch (EofException $e) {
+			// end of file
+		} catch (\Exception $e) {
+			$this->log('Error: ' . $e->getMessage(), 'red');
+			return 2;
+		}
+
+		return $realCode;
+
+	}
+
+	/**
+	 * Shows the help message.
+	 *
+	 * @return void
+	 */
+	protected function showHelp() {
+
+		$this->log('Usage:', 'yellow');
+		$this->log("  vobject [options] command [arguments]");
+		$this->log('');
+		$this->log('Options:', 'yellow');
+		$this->log($this->colorize('green', '  -q            ') . "Don't output anything.");
+		$this->log($this->colorize('green', '  -help -h      ') . "Display this help message.");
+		$this->log($this->colorize('green', '  --format      ') . "Convert to a specific format. Must be one of: vcard, vcard21,");
+		$this->log($this->colorize('green', '  --forgiving   ') . "Makes the parser less strict.");
+		$this->log("                vcard30, vcard40, icalendar20, jcal, jcard, json, mimedir.");
+		$this->log($this->colorize('green', '  --inputformat ') . "If the input format cannot be guessed from the extension, it");
+		$this->log("                must be specified here.");
+		// Only PHP 5.4 and up
+		if (version_compare(PHP_VERSION, '5.4.0') >= 0) {
+			$this->log($this->colorize('green', '  --pretty      ') . "json pretty-print.");
+		}
+		$this->log('');
+		$this->log('Commands:', 'yellow');
+		$this->log($this->colorize('green', '  validate') . ' source_file              Validates a file for correctness.');
+		$this->log($this->colorize('green', '  repair') . ' source_file [output_file]  Repairs a file.');
+		$this->log($this->colorize('green', '  convert') . ' source_file [output_file] Converts a file.');
+		$this->log($this->colorize('green', '  color') . ' source_file                 Colorize a file, useful for debbugging.');
+		$this->log(
+		<<<HELP
 
 If source_file is set as '-', STDIN will be used.
 If output_file is omitted, STDOUT will be used.
 All other output is sent to STDERR.
 
 HELP
-        );
-
-        $this->log('Examples:', 'yellow');
-        $this->log('   vobject convert contact.vcf contact.json');
-        $this->log('   vobject convert --format=vcard40 old.vcf new.vcf');
-        $this->log('   vobject convert --inputformat=json --format=mimedir - -');
-        $this->log('   vobject color calendar.ics');
-        $this->log('');
-        $this->log('https://github.com/fruux/sabre-vobject', 'purple');
-
-    }
-
-    /**
-     * Validates a VObject file.
-     *
-     * @param Component $vObj
-     *
-     * @return int
-     */
-    protected function validate(Component $vObj) {
-
-        $returnCode = 0;
-
-        switch ($vObj->name) {
-            case 'VCALENDAR' :
-                $this->log("iCalendar: " . (string)$vObj->VERSION);
-                break;
-            case 'VCARD' :
-                $this->log("vCard: " . (string)$vObj->VERSION);
-                break;
-        }
-
-        $warnings = $vObj->validate();
-        if (!count($warnings)) {
-            $this->log("  No warnings!");
-        } else {
-
-            $levels = [
-                1 => 'REPAIRED',
-                2 => 'WARNING',
-                3 => 'ERROR',
-            ];
-            $returnCode = 2;
-            foreach ($warnings as $warn) {
-
-                $extra = '';
-                if ($warn['node'] instanceof Property) {
-                    $extra = ' (property: "' . $warn['node']->name . '")';
-                }
-                $this->log("  [" . $levels[$warn['level']] . '] ' . $warn['message'] . $extra);
-
-            }
-
-        }
-
-        return $returnCode;
-
-    }
-
-    /**
-     * Repairs a VObject file.
-     *
-     * @param Component $vObj
-     *
-     * @return int
-     */
-    protected function repair(Component $vObj) {
-
-        $returnCode = 0;
-
-        switch ($vObj->name) {
-            case 'VCALENDAR' :
-                $this->log("iCalendar: " . (string)$vObj->VERSION);
-                break;
-            case 'VCARD' :
-                $this->log("vCard: " . (string)$vObj->VERSION);
-                break;
-        }
-
-        $warnings = $vObj->validate(Node::REPAIR);
-        if (!count($warnings)) {
-            $this->log("  No warnings!");
-        } else {
-
-            $levels = [
-                1 => 'REPAIRED',
-                2 => 'WARNING',
-                3 => 'ERROR',
-            ];
-            $returnCode = 2;
-            foreach ($warnings as $warn) {
-
-                $extra = '';
-                if ($warn['node'] instanceof Property) {
-                    $extra = ' (property: "' . $warn['node']->name . '")';
-                }
-                $this->log("  [" . $levels[$warn['level']] . '] ' . $warn['message'] . $extra);
-
-            }
-
-        }
-        fwrite($this->stdout, $vObj->serialize());
-
-        return $returnCode;
-
-    }
-
-    /**
-     * Converts a vObject file to a new format.
-     *
-     * @param Component $vObj
-     *
-     * @return int
-     */
-    protected function convert($vObj) {
-
-        $json = false;
-        $convertVersion = null;
-        $forceInput = null;
-
-        switch ($this->format) {
-            case 'json' :
-                $json = true;
-                if ($vObj->name === 'VCARD') {
-                    $convertVersion = Document::VCARD40;
-                }
-                break;
-            case 'jcard' :
-                $json = true;
-                $forceInput = 'VCARD';
-                $convertVersion = Document::VCARD40;
-                break;
-            case 'jcal' :
-                $json = true;
-                $forceInput = 'VCALENDAR';
-                break;
-            case 'mimedir' :
-            case 'icalendar' :
-            case 'icalendar20' :
-            case 'vcard' :
-                break;
-            case 'vcard21' :
-                $convertVersion = Document::VCARD21;
-                break;
-            case 'vcard30' :
-                $convertVersion = Document::VCARD30;
-                break;
-            case 'vcard40' :
-                $convertVersion = Document::VCARD40;
-                break;
-
-        }
-
-        if ($forceInput && $vObj->name !== $forceInput) {
-            throw new \Exception('You cannot convert a ' . strtolower($vObj->name) . ' to ' . $this->format);
-        }
-        if ($convertVersion) {
-            $vObj = $vObj->convert($convertVersion);
-        }
-        if ($json) {
-            $jsonOptions = 0;
-            if ($this->pretty) {
-                $jsonOptions = JSON_PRETTY_PRINT;
-            }
-            fwrite($this->stdout, json_encode($vObj->jsonSerialize(), $jsonOptions));
-        } else {
-            fwrite($this->stdout, $vObj->serialize());
-        }
-
-        return 0;
-
-    }
-
-    /**
-     * Colorizes a file.
-     *
-     * @param Component $vObj
-     *
-     * @return int
-     */
-    protected function color($vObj) {
-
-        fwrite($this->stdout, $this->serializeComponent($vObj));
-
-    }
-
-    /**
-     * Returns an ansi color string for a color name.
-     *
-     * @param string $color
-     *
-     * @return string
-     */
-    protected function colorize($color, $str, $resetTo = 'default') {
-
-        $colors = [
-            'cyan'    => '1;36',
-            'red'     => '1;31',
-            'yellow'  => '1;33',
-            'blue'    => '0;34',
-            'green'   => '0;32',
-            'default' => '0',
-            'purple'  => '0;35',
-        ];
-        return "\033[" . $colors[$color] . 'm' . $str . "\033[" . $colors[$resetTo] . "m";
-
-    }
-
-    /**
-     * Writes out a string in specific color.
-     *
-     * @param string $color
-     * @param string $str
-     *
-     * @return void
-     */
-    protected function cWrite($color, $str) {
-
-        fwrite($this->stdout, $this->colorize($color, $str));
-
-    }
-
-    protected function serializeComponent(Component $vObj) {
-
-        $this->cWrite('cyan', 'BEGIN');
-        $this->cWrite('red', ':');
-        $this->cWrite('yellow', $vObj->name . "\n");
-
-        /**
-         * Gives a component a 'score' for sorting purposes.
-         *
-         * This is solely used by the childrenSort method.
-         *
-         * A higher score means the item will be lower in the list.
-         * To avoid score collisions, each "score category" has a reasonable
-         * space to accomodate elements. The $key is added to the $score to
-         * preserve the original relative order of elements.
-         *
-         * @param int $key
-         * @param array $array
-         *
-         * @return int
-         */
-        $sortScore = function($key, $array) {
-
-            if ($array[$key] instanceof Component) {
-
-                // We want to encode VTIMEZONE first, this is a personal
-                // preference.
-                if ($array[$key]->name === 'VTIMEZONE') {
-                    $score = 300000000;
-                    return $score + $key;
-                } else {
-                    $score = 400000000;
-                    return $score + $key;
-                }
-            } else {
-                // Properties get encoded first
-                // VCARD version 4.0 wants the VERSION property to appear first
-                if ($array[$key] instanceof Property) {
-                    if ($array[$key]->name === 'VERSION') {
-                        $score = 100000000;
-                        return $score + $key;
-                    } else {
-                        // All other properties
-                        $score = 200000000;
-                        return $score + $key;
-                    }
-                }
-            }
-
-        };
-
-        $children = $vObj->children();
-        $tmp = $children;
-        uksort(
-            $children,
-            function($a, $b) use ($sortScore, $tmp) {
-
-                $sA = $sortScore($a, $tmp);
-                $sB = $sortScore($b, $tmp);
-
-                return $sA - $sB;
-
-            }
-        );
-
-        foreach ($children as $child) {
-            if ($child instanceof Component) {
-                $this->serializeComponent($child);
-            } else {
-                $this->serializeProperty($child);
-            }
-        }
-
-        $this->cWrite('cyan', 'END');
-        $this->cWrite('red', ':');
-        $this->cWrite('yellow', $vObj->name . "\n");
-
-    }
-
-    /**
-     * Colorizes a property.
-     *
-     * @param Property $property
-     *
-     * @return void
-     */
-    protected function serializeProperty(Property $property) {
-
-        if ($property->group) {
-            $this->cWrite('default', $property->group);
-            $this->cWrite('red', '.');
-        }
-
-        $this->cWrite('yellow', $property->name);
-
-        foreach ($property->parameters as $param) {
-
-            $this->cWrite('red', ';');
-            $this->cWrite('blue', $param->serialize());
-
-        }
-        $this->cWrite('red', ':');
-
-        if ($property instanceof Property\Binary) {
-
-            $this->cWrite('default', 'embedded binary stripped. (' . strlen($property->getValue()) . ' bytes)');
-
-        } else {
-
-            $parts = $property->getParts();
-            $first1 = true;
-            // Looping through property values
-            foreach ($parts as $part) {
-                if ($first1) {
-                    $first1 = false;
-                } else {
-                    $this->cWrite('red', $property->delimiter);
-                }
-                $first2 = true;
-                // Looping through property sub-values
-                foreach ((array)$part as $subPart) {
-                    if ($first2) {
-                        $first2 = false;
-                    } else {
-                        // The sub-value delimiter is always comma
-                        $this->cWrite('red', ',');
-                    }
-
-                    $subPart = strtr(
-                        $subPart,
-                        [
-                            '\\' => $this->colorize('purple', '\\\\', 'green'),
-                            ';'  => $this->colorize('purple', '\;', 'green'),
-                            ','  => $this->colorize('purple', '\,', 'green'),
-                            "\n" => $this->colorize('purple', "\\n\n\t", 'green'),
-                            "\r" => "",
-                        ]
-                    );
-
-                    $this->cWrite('green', $subPart);
-                }
-            }
-
-        }
-        $this->cWrite("default", "\n");
-
-    }
-
-    /**
-     * Parses the list of arguments.
-     *
-     * @param array $argv
-     *
-     * @return void
-     */
-    protected function parseArguments(array $argv) {
-
-        $positional = [];
-        $options = [];
+		);
+
+		$this->log('Examples:', 'yellow');
+		$this->log('   vobject convert contact.vcf contact.json');
+		$this->log('   vobject convert --format=vcard40 old.vcf new.vcf');
+		$this->log('   vobject convert --inputformat=json --format=mimedir - -');
+		$this->log('   vobject color calendar.ics');
+		$this->log('');
+		$this->log('https://github.com/fruux/sabre-vobject', 'purple');
+
+	}
+
+	/**
+	 * Validates a VObject file.
+	 *
+	 * @param Component $vObj
+	 *
+	 * @return int
+	 */
+	protected function validate(Component $vObj) {
+
+		$returnCode = 0;
+
+		switch ($vObj->name) {
+			case 'VCALENDAR' :
+				$this->log("iCalendar: " . (string)$vObj->VERSION);
+				break;
+			case 'VCARD' :
+				$this->log("vCard: " . (string)$vObj->VERSION);
+				break;
+		}
+
+		$warnings = $vObj->validate();
+		if (!count($warnings)) {
+			$this->log("  No warnings!");
+		} else {
+
+			$levels = [
+				1 => 'REPAIRED',
+				2 => 'WARNING',
+				3 => 'ERROR',
+			];
+			$returnCode = 2;
+			foreach ($warnings as $warn) {
+
+				$extra = '';
+				if ($warn['node'] instanceof Property) {
+					$extra = ' (property: "' . $warn['node']->name . '")';
+				}
+				$this->log("  [" . $levels[$warn['level']] . '] ' . $warn['message'] . $extra);
+
+			}
+
+		}
+
+		return $returnCode;
+
+	}
+
+	/**
+	 * Repairs a VObject file.
+	 *
+	 * @param Component $vObj
+	 *
+	 * @return int
+	 */
+	protected function repair(Component $vObj) {
+
+		$returnCode = 0;
+
+		switch ($vObj->name) {
+			case 'VCALENDAR' :
+				$this->log("iCalendar: " . (string)$vObj->VERSION);
+				break;
+			case 'VCARD' :
+				$this->log("vCard: " . (string)$vObj->VERSION);
+				break;
+		}
+
+		$warnings = $vObj->validate(Node::REPAIR);
+		if (!count($warnings)) {
+			$this->log("  No warnings!");
+		} else {
+
+			$levels = [
+				1 => 'REPAIRED',
+				2 => 'WARNING',
+				3 => 'ERROR',
+			];
+			$returnCode = 2;
+			foreach ($warnings as $warn) {
+
+				$extra = '';
+				if ($warn['node'] instanceof Property) {
+					$extra = ' (property: "' . $warn['node']->name . '")';
+				}
+				$this->log("  [" . $levels[$warn['level']] . '] ' . $warn['message'] . $extra);
+
+			}
+
+		}
+		fwrite($this->stdout, $vObj->serialize());
+
+		return $returnCode;
+
+	}
+
+	/**
+	 * Converts a vObject file to a new format.
+	 *
+	 * @param Component $vObj
+	 *
+	 * @return int
+	 */
+	protected function convert($vObj) {
+
+		$json = false;
+		$convertVersion = null;
+		$forceInput = null;
+
+		switch ($this->format) {
+			case 'json' :
+				$json = true;
+				if ($vObj->name === 'VCARD') {
+					$convertVersion = Document::VCARD40;
+				}
+				break;
+			case 'jcard' :
+				$json = true;
+				$forceInput = 'VCARD';
+				$convertVersion = Document::VCARD40;
+				break;
+			case 'jcal' :
+				$json = true;
+				$forceInput = 'VCALENDAR';
+				break;
+			case 'mimedir' :
+			case 'icalendar' :
+			case 'icalendar20' :
+			case 'vcard' :
+				break;
+			case 'vcard21' :
+				$convertVersion = Document::VCARD21;
+				break;
+			case 'vcard30' :
+				$convertVersion = Document::VCARD30;
+				break;
+			case 'vcard40' :
+				$convertVersion = Document::VCARD40;
+				break;
+
+		}
+
+		if ($forceInput && $vObj->name !== $forceInput) {
+			throw new \Exception('You cannot convert a ' . strtolower($vObj->name) . ' to ' . $this->format);
+		}
+		if ($convertVersion) {
+			$vObj = $vObj->convert($convertVersion);
+		}
+		if ($json) {
+			$jsonOptions = 0;
+			if ($this->pretty) {
+				$jsonOptions = JSON_PRETTY_PRINT;
+			}
+			fwrite($this->stdout, json_encode($vObj->jsonSerialize(), $jsonOptions));
+		} else {
+			fwrite($this->stdout, $vObj->serialize());
+		}
+
+		return 0;
+
+	}
+
+	/**
+	 * Colorizes a file.
+	 *
+	 * @param Component $vObj
+	 *
+	 * @return int
+	 */
+	protected function color($vObj) {
+
+		fwrite($this->stdout, $this->serializeComponent($vObj));
+
+	}
+
+	/**
+	 * Returns an ansi color string for a color name.
+	 *
+	 * @param string $color
+	 *
+	 * @return string
+	 */
+	protected function colorize($color, $str, $resetTo = 'default') {
+
+		$colors = [
+			'cyan'    => '1;36',
+			'red'     => '1;31',
+			'yellow'  => '1;33',
+			'blue'    => '0;34',
+			'green'   => '0;32',
+			'default' => '0',
+			'purple'  => '0;35',
+		];
+		return "\033[" . $colors[$color] . 'm' . $str . "\033[" . $colors[$resetTo] . "m";
+
+	}
+
+	/**
+	 * Writes out a string in specific color.
+	 *
+	 * @param string $color
+	 * @param string $str
+	 *
+	 * @return void
+	 */
+	protected function cWrite($color, $str) {
+
+		fwrite($this->stdout, $this->colorize($color, $str));
+
+	}
+
+	protected function serializeComponent(Component $vObj) {
+
+		$this->cWrite('cyan', 'BEGIN');
+		$this->cWrite('red', ':');
+		$this->cWrite('yellow', $vObj->name . "\n");
+
+		/**
+		 * Gives a component a 'score' for sorting purposes.
+		 *
+		 * This is solely used by the childrenSort method.
+		 *
+		 * A higher score means the item will be lower in the list.
+		 * To avoid score collisions, each "score category" has a reasonable
+		 * space to accomodate elements. The $key is added to the $score to
+		 * preserve the original relative order of elements.
+		 *
+		 * @param int $key
+		 * @param array $array
+		 *
+		 * @return int
+		 */
+		$sortScore = function($key, $array) {
+
+			if ($array[$key] instanceof Component) {
+
+				// We want to encode VTIMEZONE first, this is a personal
+				// preference.
+				if ($array[$key]->name === 'VTIMEZONE') {
+					$score = 300000000;
+					return $score + $key;
+				} else {
+					$score = 400000000;
+					return $score + $key;
+				}
+			} else {
+				// Properties get encoded first
+				// VCARD version 4.0 wants the VERSION property to appear first
+				if ($array[$key] instanceof Property) {
+					if ($array[$key]->name === 'VERSION') {
+						$score = 100000000;
+						return $score + $key;
+					} else {
+						// All other properties
+						$score = 200000000;
+						return $score + $key;
+					}
+				}
+			}
+
+		};
+
+		$children = $vObj->children();
+		$tmp = $children;
+		uksort(
+			$children,
+			function($a, $b) use ($sortScore, $tmp) {
+
+				$sA = $sortScore($a, $tmp);
+				$sB = $sortScore($b, $tmp);
+
+				return $sA - $sB;
+
+			}
+		);
+
+		foreach ($children as $child) {
+			if ($child instanceof Component) {
+				$this->serializeComponent($child);
+			} else {
+				$this->serializeProperty($child);
+			}
+		}
+
+		$this->cWrite('cyan', 'END');
+		$this->cWrite('red', ':');
+		$this->cWrite('yellow', $vObj->name . "\n");
+
+	}
+
+	/**
+	 * Colorizes a property.
+	 *
+	 * @param Property $property
+	 *
+	 * @return void
+	 */
+	protected function serializeProperty(Property $property) {
+
+		if ($property->group) {
+			$this->cWrite('default', $property->group);
+			$this->cWrite('red', '.');
+		}
+
+		$this->cWrite('yellow', $property->name);
+
+		foreach ($property->parameters as $param) {
+
+			$this->cWrite('red', ';');
+			$this->cWrite('blue', $param->serialize());
+
+		}
+		$this->cWrite('red', ':');
+
+		if ($property instanceof Property\Binary) {
+
+			$this->cWrite('default', 'embedded binary stripped. (' . strlen($property->getValue()) . ' bytes)');
+
+		} else {
+
+			$parts = $property->getParts();
+			$first1 = true;
+			// Looping through property values
+			foreach ($parts as $part) {
+				if ($first1) {
+					$first1 = false;
+				} else {
+					$this->cWrite('red', $property->delimiter);
+				}
+				$first2 = true;
+				// Looping through property sub-values
+				foreach ((array)$part as $subPart) {
+					if ($first2) {
+						$first2 = false;
+					} else {
+						// The sub-value delimiter is always comma
+						$this->cWrite('red', ',');
+					}
+
+					$subPart = strtr(
+						$subPart,
+						[
+							'\\' => $this->colorize('purple', '\\\\', 'green'),
+							';'  => $this->colorize('purple', '\;', 'green'),
+							','  => $this->colorize('purple', '\,', 'green'),
+							"\n" => $this->colorize('purple', "\\n\n\t", 'green'),
+							"\r" => "",
+						]
+					);
+
+					$this->cWrite('green', $subPart);
+				}
+			}
+
+		}
+		$this->cWrite("default", "\n");
+
+	}
+
+	/**
+	 * Parses the list of arguments.
+	 *
+	 * @param array $argv
+	 *
+	 * @return void
+	 */
+	protected function parseArguments(array $argv) {
+
+		$positional = [];
+		$options = [];
 		
 		$countArgv = count($argv);
-        for ($ii = 0; $ii < $countArgv; $ii++) {
+		for ($ii = 0; $ii < $countArgv; $ii++) {
 
-            // Skipping the first argument.
-            if ($ii === 0) continue;
+			// Skipping the first argument.
+			if ($ii === 0) continue;
 
-            $v = $argv[$ii];
+			$v = $argv[$ii];
 
-            if (substr($v, 0, 2) === '--') {
-                // This is a long-form option.
-                $optionName = substr($v, 2);
-                $optionValue = true;
-                if (strpos($optionName, '=')) {
-                    list($optionName, $optionValue) = explode('=', $optionName);
-                }
-                $options[$optionName] = $optionValue;
-            } elseif (substr($v, 0, 1) === '-' && strlen($v) > 1) {
-                // This is a short-form option.
-                foreach (str_split(substr($v, 1)) as $option) {
-                    $options[$option] = true;
-                }
+			if (substr($v, 0, 2) === '--') {
+				// This is a long-form option.
+				$optionName = substr($v, 2);
+				$optionValue = true;
+				if (strpos($optionName, '=')) {
+					list($optionName, $optionValue) = explode('=', $optionName);
+				}
+				$options[$optionName] = $optionValue;
+			} elseif (substr($v, 0, 1) === '-' && strlen($v) > 1) {
+				// This is a short-form option.
+				foreach (str_split(substr($v, 1)) as $option) {
+					$options[$option] = true;
+				}
 
-            } else {
+			} else {
 
-                $positional[] = $v;
+				$positional[] = $v;
 
-            }
+			}
 
-        }
+		}
 
-        return [$options, $positional];
+		return [$options, $positional];
 
-    }
+	}
 
-    protected $parser;
+	protected $parser;
 
-    /**
-     * Reads the input file.
-     *
-     * @return Component
-     */
-    protected function readInput() {
+	/**
+	 * Reads the input file.
+	 *
+	 * @return Component
+	 */
+	protected function readInput() {
 
-        if (!$this->parser) {
-            if ($this->inputPath !== '-') {
-                $this->stdin = fopen($this->inputPath, 'r');
-            }
+		if (!$this->parser) {
+			if ($this->inputPath !== '-') {
+				$this->stdin = fopen($this->inputPath, 'r');
+			}
 
-            if ($this->inputFormat === 'mimedir') {
-                $this->parser = new Parser\MimeDir($this->stdin, ($this->forgiving ? Reader::OPTION_FORGIVING : 0));
-            } else {
-                $this->parser = new Parser\Json($this->stdin, ($this->forgiving ? Reader::OPTION_FORGIVING : 0));
-            }
-        }
+			if ($this->inputFormat === 'mimedir') {
+				$this->parser = new Parser\MimeDir($this->stdin, ($this->forgiving ? Reader::OPTION_FORGIVING : 0));
+			} else {
+				$this->parser = new Parser\Json($this->stdin, ($this->forgiving ? Reader::OPTION_FORGIVING : 0));
+			}
+		}
 
-        return $this->parser->parse();
+		return $this->parser->parse();
 
-    }
+	}
 
-    /**
-     * Sends a message to STDERR.
-     *
-     * @param string $msg
-     *
-     * @return void
-     */
-    protected function log($msg, $color = 'default') {
+	/**
+	 * Sends a message to STDERR.
+	 *
+	 * @param string $msg
+	 *
+	 * @return void
+	 */
+	protected function log($msg, $color = 'default') {
 
-        if (!$this->quiet) {
-            if ($color !== 'default') {
-                $msg = $this->colorize($color, $msg);
-            }
-            fwrite($this->stderr, $msg . "\n");
-        }
+		if (!$this->quiet) {
+			if ($color !== 'default') {
+				$msg = $this->colorize($color, $msg);
+			}
+			fwrite($this->stderr, $msg . "\n");
+		}
 
-    }
+	}
 
 }

Braces +6 added lines, -2 removed lines

@@ -259,7 +259,9 @@ 
             while ($input = $this->readInput()) {
 
                 $returnCode = $this->$command($input);
-                if ($returnCode !== 0) $realCode = $returnCode;
+                if ($returnCode !== 0) {
+                	$realCode = $returnCode;
+                }
 
             }
 
@@ -696,7 +698,9 @@ 
         for ($ii = 0; $ii < $countArgv; $ii++) {
 
             // Skipping the first argument.
-            if ($ii === 0) continue;
+            if ($ii === 0) {
+            	continue;
+            }
 
             $v = $argv[$ii];