nextcloud / server

lib/private/HintException.php

Indentation +39 added lines, -39 removed lines

@@ -35,46 +35,46 @@
  */
 class HintException extends \Exception {
 
-	private $hint;
+    private $hint;
 
-	/**
-	 * HintException constructor.
-	 *
-	 * @param string $message  The error message. It will be not revealed to the
-	 *                         the user (unless the hint is empty) and thus
-	 *                         should be not translated.
-	 * @param string $hint     A useful message that is presented to the end
-	 *                         user. It should be translated, but must not
-	 *                         contain sensitive data.
-	 * @param int $code
-	 * @param \Exception|null $previous
-	 */
-	public function __construct($message, $hint = '', $code = 0, \Exception $previous = null) {
-		$this->hint = $hint;
-		parent::__construct($message, $code, $previous);
-	}
+    /**
+     * HintException constructor.
+     *
+     * @param string $message  The error message. It will be not revealed to the
+     *                         the user (unless the hint is empty) and thus
+     *                         should be not translated.
+     * @param string $hint     A useful message that is presented to the end
+     *                         user. It should be translated, but must not
+     *                         contain sensitive data.
+     * @param int $code
+     * @param \Exception|null $previous
+     */
+    public function __construct($message, $hint = '', $code = 0, \Exception $previous = null) {
+        $this->hint = $hint;
+        parent::__construct($message, $code, $previous);
+    }
 
-	/**
-	 * Returns a string representation of this Exception that includes the error
-	 * code, the message and the hint.
-	 *
-	 * @return string
-	 */
-	public function __toString() {
-		return __CLASS__ . ": [{$this->code}]: {$this->message} ({$this->hint})\n";
-	}
+    /**
+     * Returns a string representation of this Exception that includes the error
+     * code, the message and the hint.
+     *
+     * @return string
+     */
+    public function __toString() {
+        return __CLASS__ . ": [{$this->code}]: {$this->message} ({$this->hint})\n";
+    }
 
-	/**
-	 * Returns the hint with the intention to be presented to the end user. If
-	 * an empty hint was specified upon instatiation, the message is returned
-	 * instead.
-	 *
-	 * @return string
-	 */
-	public function getHint() {
-		if (empty($this->hint)) {
-			return $this->message;
-		}
-		return $this->hint;
-	}
+    /**
+     * Returns the hint with the intention to be presented to the end user. If
+     * an empty hint was specified upon instatiation, the message is returned
+     * instead.
+     *
+     * @return string
+     */
+    public function getHint() {
+        if (empty($this->hint)) {
+            return $this->message;
+        }
+        return $this->hint;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
 	 * @return string
 	 */
 	public function __toString() {
-		return __CLASS__ . ": [{$this->code}]: {$this->message} ({$this->hint})\n";
+		return __CLASS__.": [{$this->code}]: {$this->message} ({$this->hint})\n";
 	}
 
 	/**

lib/private/Repair.php

Spacing +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\EventDispatcher\GenericEvent;
 
-class Repair implements IOutput{
+class Repair implements IOutput {
 	/* @var IRepairStep[] */
 	private $repairSteps;
 	/** @var EventDispatcher */

Indentation +167 added lines, -167 removed lines

@@ -57,171 +57,171 @@
 use Symfony\Component\EventDispatcher\GenericEvent;
 
 class Repair implements IOutput{
-	/* @var IRepairStep[] */
-	private $repairSteps;
-	/** @var EventDispatcher */
-	private $dispatcher;
-	/** @var string */
-	private $currentStep;
-
-	/**
-	 * Creates a new repair step runner
-	 *
-	 * @param IRepairStep[] $repairSteps array of RepairStep instances
-	 * @param EventDispatcher $dispatcher
-	 */
-	public function __construct($repairSteps = [], EventDispatcher $dispatcher = null) {
-		$this->repairSteps = $repairSteps;
-		$this->dispatcher = $dispatcher;
-	}
-
-	/**
-	 * Run a series of repair steps for common problems
-	 */
-	public function run() {
-		if (count($this->repairSteps) === 0) {
-			$this->emit('\OC\Repair', 'info', array('No repair steps available'));
-			return;
-		}
-		// run each repair step
-		foreach ($this->repairSteps as $step) {
-			$this->currentStep = $step->getName();
-			$this->emit('\OC\Repair', 'step', [$this->currentStep]);
-			$step->run($this);
-		}
-	}
-
-	/**
-	 * Add repair step
-	 *
-	 * @param IRepairStep|string $repairStep repair step
-	 * @throws \Exception
-	 */
-	public function addStep($repairStep) {
-		if (is_string($repairStep)) {
-			try {
-				$s = \OC::$server->query($repairStep);
-			} catch (QueryException $e) {
-				if (class_exists($repairStep)) {
-					$s = new $repairStep();
-				} else {
-					throw new \Exception("Repair step '$repairStep' is unknown");
-				}
-			}
-
-			if ($s instanceof IRepairStep) {
-				$this->repairSteps[] = $s;
-			} else {
-				throw new \Exception("Repair step '$repairStep' is not of type \\OCP\\Migration\\IRepairStep");
-			}
-		} else {
-			$this->repairSteps[] = $repairStep;
-		}
-	}
-
-	/**
-	 * Returns the default repair steps to be run on the
-	 * command line or after an upgrade.
-	 *
-	 * @return IRepairStep[]
-	 */
-	public static function getRepairSteps() {
-		return [
-			new Collation(\OC::$server->getConfig(), \OC::$server->getLogger(), \OC::$server->getDatabaseConnection(), false),
-			new RepairMimeTypes(\OC::$server->getConfig()),
-			new CleanTags(\OC::$server->getDatabaseConnection(), \OC::$server->getUserManager()),
-			new RepairInvalidShares(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection()),
-			new RemoveRootShares(\OC::$server->getDatabaseConnection(), \OC::$server->getUserManager(), \OC::$server->getLazyRootFolder()),
-			new MoveUpdaterStepFile(\OC::$server->getConfig()),
-			new FixMountStorages(\OC::$server->getDatabaseConnection()),
-			new RepairInvalidPaths(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig()),
-			new AddLogRotateJob(\OC::$server->getJobList()),
-			new ClearFrontendCaches(\OC::$server->getMemCacheFactory(), \OC::$server->query(SCSSCacher::class), \OC::$server->query(JSCombiner::class)),
-			new AddPreviewBackgroundCleanupJob(\OC::$server->getJobList()),
-			new AddCleanupUpdaterBackupsJob(\OC::$server->getJobList()),
-			new RepairPendingCronJobs(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig()),
-			new SetVcardDatabaseUID(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig()),
-		];
-	}
-
-	/**
-	 * Returns expensive repair steps to be run on the
-	 * command line with a special option.
-	 *
-	 * @return IRepairStep[]
-	 */
-	public static function getExpensiveRepairSteps() {
-		return [
-			new OldGroupMembershipShares(\OC::$server->getDatabaseConnection(), \OC::$server->getGroupManager()),
-		];
-	}
-
-	/**
-	 * Returns the repair steps to be run before an
-	 * upgrade.
-	 *
-	 * @return IRepairStep[]
-	 */
-	public static function getBeforeUpgradeRepairSteps() {
-		$connection = \OC::$server->getDatabaseConnection();
-		$config = \OC::$server->getConfig();
-		$steps = [
-			new Collation(\OC::$server->getConfig(), \OC::$server->getLogger(), $connection, true),
-			new SqliteAutoincrement($connection),
-			new SaveAccountsTableData($connection, $config),
-			new DropAccountTermsTable($connection),
-		];
-
-		return $steps;
-	}
-
-	/**
-	 * @param string $scope
-	 * @param string $method
-	 * @param array $arguments
-	 */
-	public function emit($scope, $method, array $arguments = []) {
-		if (!is_null($this->dispatcher)) {
-			$this->dispatcher->dispatch("$scope::$method",
-				new GenericEvent("$scope::$method", $arguments));
-		}
-	}
-
-	public function info($string) {
-		// for now just emit as we did in the past
-		$this->emit('\OC\Repair', 'info', array($string));
-	}
-
-	/**
-	 * @param string $message
-	 */
-	public function warning($message) {
-		// for now just emit as we did in the past
-		$this->emit('\OC\Repair', 'warning', [$message]);
-	}
-
-	/**
-	 * @param int $max
-	 */
-	public function startProgress($max = 0) {
-		// for now just emit as we did in the past
-		$this->emit('\OC\Repair', 'startProgress', [$max, $this->currentStep]);
-	}
-
-	/**
-	 * @param int $step
-	 * @param string $description
-	 */
-	public function advance($step = 1, $description = '') {
-		// for now just emit as we did in the past
-		$this->emit('\OC\Repair', 'advance', [$step, $description]);
-	}
-
-	/**
-	 * @param int $max
-	 */
-	public function finishProgress() {
-		// for now just emit as we did in the past
-		$this->emit('\OC\Repair', 'finishProgress', []);
-	}
+    /* @var IRepairStep[] */
+    private $repairSteps;
+    /** @var EventDispatcher */
+    private $dispatcher;
+    /** @var string */
+    private $currentStep;
+
+    /**
+     * Creates a new repair step runner
+     *
+     * @param IRepairStep[] $repairSteps array of RepairStep instances
+     * @param EventDispatcher $dispatcher
+     */
+    public function __construct($repairSteps = [], EventDispatcher $dispatcher = null) {
+        $this->repairSteps = $repairSteps;
+        $this->dispatcher = $dispatcher;
+    }
+
+    /**
+     * Run a series of repair steps for common problems
+     */
+    public function run() {
+        if (count($this->repairSteps) === 0) {
+            $this->emit('\OC\Repair', 'info', array('No repair steps available'));
+            return;
+        }
+        // run each repair step
+        foreach ($this->repairSteps as $step) {
+            $this->currentStep = $step->getName();
+            $this->emit('\OC\Repair', 'step', [$this->currentStep]);
+            $step->run($this);
+        }
+    }
+
+    /**
+     * Add repair step
+     *
+     * @param IRepairStep|string $repairStep repair step
+     * @throws \Exception
+     */
+    public function addStep($repairStep) {
+        if (is_string($repairStep)) {
+            try {
+                $s = \OC::$server->query($repairStep);
+            } catch (QueryException $e) {
+                if (class_exists($repairStep)) {
+                    $s = new $repairStep();
+                } else {
+                    throw new \Exception("Repair step '$repairStep' is unknown");
+                }
+            }
+
+            if ($s instanceof IRepairStep) {
+                $this->repairSteps[] = $s;
+            } else {
+                throw new \Exception("Repair step '$repairStep' is not of type \\OCP\\Migration\\IRepairStep");
+            }
+        } else {
+            $this->repairSteps[] = $repairStep;
+        }
+    }
+
+    /**
+     * Returns the default repair steps to be run on the
+     * command line or after an upgrade.
+     *
+     * @return IRepairStep[]
+     */
+    public static function getRepairSteps() {
+        return [
+            new Collation(\OC::$server->getConfig(), \OC::$server->getLogger(), \OC::$server->getDatabaseConnection(), false),
+            new RepairMimeTypes(\OC::$server->getConfig()),
+            new CleanTags(\OC::$server->getDatabaseConnection(), \OC::$server->getUserManager()),
+            new RepairInvalidShares(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection()),
+            new RemoveRootShares(\OC::$server->getDatabaseConnection(), \OC::$server->getUserManager(), \OC::$server->getLazyRootFolder()),
+            new MoveUpdaterStepFile(\OC::$server->getConfig()),
+            new FixMountStorages(\OC::$server->getDatabaseConnection()),
+            new RepairInvalidPaths(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig()),
+            new AddLogRotateJob(\OC::$server->getJobList()),
+            new ClearFrontendCaches(\OC::$server->getMemCacheFactory(), \OC::$server->query(SCSSCacher::class), \OC::$server->query(JSCombiner::class)),
+            new AddPreviewBackgroundCleanupJob(\OC::$server->getJobList()),
+            new AddCleanupUpdaterBackupsJob(\OC::$server->getJobList()),
+            new RepairPendingCronJobs(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig()),
+            new SetVcardDatabaseUID(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig()),
+        ];
+    }
+
+    /**
+     * Returns expensive repair steps to be run on the
+     * command line with a special option.
+     *
+     * @return IRepairStep[]
+     */
+    public static function getExpensiveRepairSteps() {
+        return [
+            new OldGroupMembershipShares(\OC::$server->getDatabaseConnection(), \OC::$server->getGroupManager()),
+        ];
+    }
+
+    /**
+     * Returns the repair steps to be run before an
+     * upgrade.
+     *
+     * @return IRepairStep[]
+     */
+    public static function getBeforeUpgradeRepairSteps() {
+        $connection = \OC::$server->getDatabaseConnection();
+        $config = \OC::$server->getConfig();
+        $steps = [
+            new Collation(\OC::$server->getConfig(), \OC::$server->getLogger(), $connection, true),
+            new SqliteAutoincrement($connection),
+            new SaveAccountsTableData($connection, $config),
+            new DropAccountTermsTable($connection),
+        ];
+
+        return $steps;
+    }
+
+    /**
+     * @param string $scope
+     * @param string $method
+     * @param array $arguments
+     */
+    public function emit($scope, $method, array $arguments = []) {
+        if (!is_null($this->dispatcher)) {
+            $this->dispatcher->dispatch("$scope::$method",
+                new GenericEvent("$scope::$method", $arguments));
+        }
+    }
+
+    public function info($string) {
+        // for now just emit as we did in the past
+        $this->emit('\OC\Repair', 'info', array($string));
+    }
+
+    /**
+     * @param string $message
+     */
+    public function warning($message) {
+        // for now just emit as we did in the past
+        $this->emit('\OC\Repair', 'warning', [$message]);
+    }
+
+    /**
+     * @param int $max
+     */
+    public function startProgress($max = 0) {
+        // for now just emit as we did in the past
+        $this->emit('\OC\Repair', 'startProgress', [$max, $this->currentStep]);
+    }
+
+    /**
+     * @param int $step
+     * @param string $description
+     */
+    public function advance($step = 1, $description = '') {
+        // for now just emit as we did in the past
+        $this->emit('\OC\Repair', 'advance', [$step, $description]);
+    }
+
+    /**
+     * @param int $max
+     */
+    public function finishProgress() {
+        // for now just emit as we did in the past
+        $this->emit('\OC\Repair', 'finishProgress', []);
+    }
 }

lib/private/User/Backend.php

Indentation +120 added lines, -120 removed lines

@@ -29,136 +29,136 @@
  * capabilities.
  */
 abstract class Backend implements UserInterface {
-	/**
-	 * error code for functions not provided by the user backend
-	 */
-	const NOT_IMPLEMENTED = -501;
+    /**
+     * error code for functions not provided by the user backend
+     */
+    const NOT_IMPLEMENTED = -501;
 
-	/**
-	 * actions that user backends can define
-	 */
-	const CREATE_USER		= 1;			// 1 << 0
-	const SET_PASSWORD		= 16;			// 1 << 4
-	const CHECK_PASSWORD	= 256;			// 1 << 8
-	const GET_HOME			= 4096;			// 1 << 12
-	const GET_DISPLAYNAME	= 65536;		// 1 << 16
-	const SET_DISPLAYNAME	= 1048576;		// 1 << 20
-	const PROVIDE_AVATAR	= 16777216;		// 1 << 24
-	const COUNT_USERS		= 268435456;	// 1 << 28
+    /**
+     * actions that user backends can define
+     */
+    const CREATE_USER		= 1;			// 1 << 0
+    const SET_PASSWORD		= 16;			// 1 << 4
+    const CHECK_PASSWORD	= 256;			// 1 << 8
+    const GET_HOME			= 4096;			// 1 << 12
+    const GET_DISPLAYNAME	= 65536;		// 1 << 16
+    const SET_DISPLAYNAME	= 1048576;		// 1 << 20
+    const PROVIDE_AVATAR	= 16777216;		// 1 << 24
+    const COUNT_USERS		= 268435456;	// 1 << 28
 
-	protected $possibleActions = array(
-		self::CREATE_USER => 'createUser',
-		self::SET_PASSWORD => 'setPassword',
-		self::CHECK_PASSWORD => 'checkPassword',
-		self::GET_HOME => 'getHome',
-		self::GET_DISPLAYNAME => 'getDisplayName',
-		self::SET_DISPLAYNAME => 'setDisplayName',
-		self::PROVIDE_AVATAR => 'canChangeAvatar',
-		self::COUNT_USERS => 'countUsers',
-	);
+    protected $possibleActions = array(
+        self::CREATE_USER => 'createUser',
+        self::SET_PASSWORD => 'setPassword',
+        self::CHECK_PASSWORD => 'checkPassword',
+        self::GET_HOME => 'getHome',
+        self::GET_DISPLAYNAME => 'getDisplayName',
+        self::SET_DISPLAYNAME => 'setDisplayName',
+        self::PROVIDE_AVATAR => 'canChangeAvatar',
+        self::COUNT_USERS => 'countUsers',
+    );
 
-	/**
-	* Get all supported actions
-	* @return int bitwise-or'ed actions
-	*
-	* Returns the supported actions as int to be
-	* compared with self::CREATE_USER etc.
-	*/
-	public function getSupportedActions() {
-		$actions = 0;
-		foreach($this->possibleActions AS $action => $methodName) {
-			if(method_exists($this, $methodName)) {
-				$actions |= $action;
-			}
-		}
+    /**
+     * Get all supported actions
+     * @return int bitwise-or'ed actions
+     *
+     * Returns the supported actions as int to be
+     * compared with self::CREATE_USER etc.
+     */
+    public function getSupportedActions() {
+        $actions = 0;
+        foreach($this->possibleActions AS $action => $methodName) {
+            if(method_exists($this, $methodName)) {
+                $actions |= $action;
+            }
+        }
 
-		return $actions;
-	}
+        return $actions;
+    }
 
-	/**
-	* Check if backend implements actions
-	* @param int $actions bitwise-or'ed actions
-	* @return boolean
-	*
-	* Returns the supported actions as int to be
-	* compared with self::CREATE_USER etc.
-	*/
-	public function implementsActions($actions) {
-		return (bool)($this->getSupportedActions() & $actions);
-	}
+    /**
+     * Check if backend implements actions
+     * @param int $actions bitwise-or'ed actions
+     * @return boolean
+     *
+     * Returns the supported actions as int to be
+     * compared with self::CREATE_USER etc.
+     */
+    public function implementsActions($actions) {
+        return (bool)($this->getSupportedActions() & $actions);
+    }
 
-	/**
-	 * delete a user
-	 * @param string $uid The username of the user to delete
-	 * @return bool
-	 *
-	 * Deletes a user
-	 */
-	public function deleteUser( $uid ) {
-		return false;
-	}
+    /**
+     * delete a user
+     * @param string $uid The username of the user to delete
+     * @return bool
+     *
+     * Deletes a user
+     */
+    public function deleteUser( $uid ) {
+        return false;
+    }
 
-	/**
-	 * Get a list of all users
-	 *
-	 * @param string $search
-	 * @param null|int $limit
-	 * @param null|int $offset
-	 * @return string[] an array of all uids
-	 */
-	public function getUsers($search = '', $limit = null, $offset = null) {
-		return array();
-	}
+    /**
+     * Get a list of all users
+     *
+     * @param string $search
+     * @param null|int $limit
+     * @param null|int $offset
+     * @return string[] an array of all uids
+     */
+    public function getUsers($search = '', $limit = null, $offset = null) {
+        return array();
+    }
 
-	/**
-	* check if a user exists
-	* @param string $uid the username
-	* @return boolean
-	*/
-	public function userExists($uid) {
-		return false;
-	}
+    /**
+     * check if a user exists
+     * @param string $uid the username
+     * @return boolean
+     */
+    public function userExists($uid) {
+        return false;
+    }
 
-	/**
-	* get the user's home directory
-	* @param string $uid the username
-	* @return boolean
-	*/
-	public function getHome($uid) {
-		return false;
-	}
+    /**
+     * get the user's home directory
+     * @param string $uid the username
+     * @return boolean
+     */
+    public function getHome($uid) {
+        return false;
+    }
 
-	/**
-	 * get display name of the user
-	 * @param string $uid user ID of the user
-	 * @return string display name
-	 */
-	public function getDisplayName($uid) {
-		return $uid;
-	}
+    /**
+     * get display name of the user
+     * @param string $uid user ID of the user
+     * @return string display name
+     */
+    public function getDisplayName($uid) {
+        return $uid;
+    }
 
-	/**
-	 * Get a list of all display names and user ids.
-	 *
-	 * @param string $search
-	 * @param string|null $limit
-	 * @param string|null $offset
-	 * @return array an array of all displayNames (value) and the corresponding uids (key)
-	 */
-	public function getDisplayNames($search = '', $limit = null, $offset = null) {
-		$displayNames = array();
-		$users = $this->getUsers($search, $limit, $offset);
-		foreach ( $users as $user) {
-			$displayNames[$user] = $user;
-		}
-		return $displayNames;
-	}
+    /**
+     * Get a list of all display names and user ids.
+     *
+     * @param string $search
+     * @param string|null $limit
+     * @param string|null $offset
+     * @return array an array of all displayNames (value) and the corresponding uids (key)
+     */
+    public function getDisplayNames($search = '', $limit = null, $offset = null) {
+        $displayNames = array();
+        $users = $this->getUsers($search, $limit, $offset);
+        foreach ( $users as $user) {
+            $displayNames[$user] = $user;
+        }
+        return $displayNames;
+    }
 
-	/**
-	 * Check if a user list is available or not
-	 * @return boolean if users can be listed or not
-	 */
-	public function hasUserListings() {
-		return false;
-	}
+    /**
+     * Check if a user list is available or not
+     * @return boolean if users can be listed or not
+     */
+    public function hasUserListings() {
+        return false;
+    }
 }

Spacing +13 added lines, -13 removed lines

@@ -37,14 +37,14 @@ 
 	/**
 	 * actions that user backends can define
 	 */
-	const CREATE_USER		= 1;			// 1 << 0
-	const SET_PASSWORD		= 16;			// 1 << 4
-	const CHECK_PASSWORD	= 256;			// 1 << 8
-	const GET_HOME			= 4096;			// 1 << 12
-	const GET_DISPLAYNAME	= 65536;		// 1 << 16
-	const SET_DISPLAYNAME	= 1048576;		// 1 << 20
-	const PROVIDE_AVATAR	= 16777216;		// 1 << 24
-	const COUNT_USERS		= 268435456;	// 1 << 28
+	const CREATE_USER = 1; // 1 << 0
+	const SET_PASSWORD = 16; // 1 << 4
+	const CHECK_PASSWORD = 256; // 1 << 8
+	const GET_HOME = 4096; // 1 << 12
+	const GET_DISPLAYNAME	= 65536; // 1 << 16
+	const SET_DISPLAYNAME	= 1048576; // 1 << 20
+	const PROVIDE_AVATAR = 16777216; // 1 << 24
+	const COUNT_USERS = 268435456; // 1 << 28
 
 	protected $possibleActions = array(
 		self::CREATE_USER => 'createUser',
@@ -66,8 +66,8 @@ 
 	*/
 	public function getSupportedActions() {
 		$actions = 0;
-		foreach($this->possibleActions AS $action => $methodName) {
-			if(method_exists($this, $methodName)) {
+		foreach ($this->possibleActions AS $action => $methodName) {
+			if (method_exists($this, $methodName)) {
 				$actions |= $action;
 			}
 		}
@@ -84,7 +84,7 @@ 
 	* compared with self::CREATE_USER etc.
 	*/
 	public function implementsActions($actions) {
-		return (bool)($this->getSupportedActions() & $actions);
+		return (bool) ($this->getSupportedActions() & $actions);
 	}
 
 	/**
@@ -94,7 +94,7 @@ 
 	 *
 	 * Deletes a user
 	 */
-	public function deleteUser( $uid ) {
+	public function deleteUser($uid) {
 		return false;
 	}
 
@@ -148,7 +148,7 @@ 
 	public function getDisplayNames($search = '', $limit = null, $offset = null) {
 		$displayNames = array();
 		$users = $this->getUsers($search, $limit, $offset);
-		foreach ( $users as $user) {
+		foreach ($users as $user) {
 			$displayNames[$user] = $user;
 		}
 		return $displayNames;

lib/private/Diagnostics/Event.php

Indentation +65 added lines, -65 removed lines

@@ -26,79 +26,79 @@
 use OCP\Diagnostics\IEvent;
 
 class Event implements IEvent {
-	/**
-	 * @var string
-	 */
-	protected $id;
+    /**
+     * @var string
+     */
+    protected $id;
 
-	/**
-	 * @var float
-	 */
-	protected $start;
+    /**
+     * @var float
+     */
+    protected $start;
 
-	/**
-	 * @var float
-	 */
-	protected $end;
+    /**
+     * @var float
+     */
+    protected $end;
 
-	/**
-	 * @var string
-	 */
-	protected $description;
+    /**
+     * @var string
+     */
+    protected $description;
 
-	/**
-	 * @param string $id
-	 * @param string $description
-	 * @param float $start
-	 */
-	public function __construct($id, $description, $start) {
-		$this->id = $id;
-		$this->description = $description;
-		$this->start = $start;
-	}
+    /**
+     * @param string $id
+     * @param string $description
+     * @param float $start
+     */
+    public function __construct($id, $description, $start) {
+        $this->id = $id;
+        $this->description = $description;
+        $this->start = $start;
+    }
 
-	/**
-	 * @param float $time
-	 */
-	public function end($time) {
-		$this->end = $time;
-	}
+    /**
+     * @param float $time
+     */
+    public function end($time) {
+        $this->end = $time;
+    }
 
-	/**
-	 * @return float
-	 */
-	public function getStart() {
-		return $this->start;
-	}
+    /**
+     * @return float
+     */
+    public function getStart() {
+        return $this->start;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getId() {
-		return $this->id;
-	}
+    /**
+     * @return string
+     */
+    public function getId() {
+        return $this->id;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getDescription() {
-		return $this->description;
-	}
+    /**
+     * @return string
+     */
+    public function getDescription() {
+        return $this->description;
+    }
 
-	/**
-	 * @return float
-	 */
-	public function getEnd() {
-		return $this->end;
-	}
+    /**
+     * @return float
+     */
+    public function getEnd() {
+        return $this->end;
+    }
 
-	/**
-	 * @return float
-	 */
-	public function getDuration() {
-		if (!$this->end) {
-			$this->end = microtime(true);
-		}
-		return $this->end - $this->start;
-	}
+    /**
+     * @return float
+     */
+    public function getDuration() {
+        if (!$this->end) {
+            $this->end = microtime(true);
+        }
+        return $this->end - $this->start;
+    }
 }

lib/private/Tagging/TagMapper.php

Spacing +4 added lines, -4 removed lines

@@ -50,12 +50,12 @@ 
 	* @return array An array of Tag objects.
 	*/
 	public function loadTags($owners, $type) {
-		if(!is_array($owners)) {
+		if (!is_array($owners)) {
 			$owners = array($owners);
 		}
 
-		$sql = 'SELECT `id`, `uid`, `type`, `category` FROM `' . $this->getTableName() . '` '
-			. 'WHERE `uid` IN (' . str_repeat('?,', count($owners)-1) . '?) AND `type` = ? ORDER BY `category`';
+		$sql = 'SELECT `id`, `uid`, `type`, `category` FROM `'.$this->getTableName().'` '
+			. 'WHERE `uid` IN ('.str_repeat('?,', count($owners) - 1).'?) AND `type` = ? ORDER BY `category`';
 		return $this->findEntities($sql, array_merge($owners, array($type)));
 	}
 
@@ -66,7 +66,7 @@ 
 	* @return bool
 	*/
 	public function tagExists($tag) {
-		$sql = 'SELECT `id`, `uid`, `type`, `category` FROM `' . $this->getTableName() . '` '
+		$sql = 'SELECT `id`, `uid`, `type`, `category` FROM `'.$this->getTableName().'` '
 			. 'WHERE `uid` = ? AND `type` = ? AND `category` = ?';
 		try {
 			$this->findEntity($sql, array($tag->getOwner(), $tag->getType(), $tag->getName()));

Indentation +39 added lines, -39 removed lines

@@ -33,47 +33,47 @@
  */
 class TagMapper extends Mapper {
 
-	/**
-	* Constructor.
-	*
-	* @param IDBConnection $db Instance of the Db abstraction layer.
-	*/
-	public function __construct(IDBConnection $db) {
-		parent::__construct($db, 'vcategory', Tag::class);
-	}
+    /**
+     * Constructor.
+     *
+     * @param IDBConnection $db Instance of the Db abstraction layer.
+     */
+    public function __construct(IDBConnection $db) {
+        parent::__construct($db, 'vcategory', Tag::class);
+    }
 
-	/**
-	* Load tags from the database.
-	*
-	* @param array|string $owners The user(s) whose tags we are going to load.
-	* @param string $type The type of item for which we are loading tags.
-	* @return array An array of Tag objects.
-	*/
-	public function loadTags($owners, $type) {
-		if(!is_array($owners)) {
-			$owners = array($owners);
-		}
+    /**
+     * Load tags from the database.
+     *
+     * @param array|string $owners The user(s) whose tags we are going to load.
+     * @param string $type The type of item for which we are loading tags.
+     * @return array An array of Tag objects.
+     */
+    public function loadTags($owners, $type) {
+        if(!is_array($owners)) {
+            $owners = array($owners);
+        }
 
-		$sql = 'SELECT `id`, `uid`, `type`, `category` FROM `' . $this->getTableName() . '` '
-			. 'WHERE `uid` IN (' . str_repeat('?,', count($owners)-1) . '?) AND `type` = ? ORDER BY `category`';
-		return $this->findEntities($sql, array_merge($owners, array($type)));
-	}
+        $sql = 'SELECT `id`, `uid`, `type`, `category` FROM `' . $this->getTableName() . '` '
+            . 'WHERE `uid` IN (' . str_repeat('?,', count($owners)-1) . '?) AND `type` = ? ORDER BY `category`';
+        return $this->findEntities($sql, array_merge($owners, array($type)));
+    }
 
-	/**
-	* Check if a given Tag object already exists in the database.
-	*
-	* @param Tag $tag The tag to look for in the database.
-	* @return bool
-	*/
-	public function tagExists($tag) {
-		$sql = 'SELECT `id`, `uid`, `type`, `category` FROM `' . $this->getTableName() . '` '
-			. 'WHERE `uid` = ? AND `type` = ? AND `category` = ?';
-		try {
-			$this->findEntity($sql, array($tag->getOwner(), $tag->getType(), $tag->getName()));
-		} catch (DoesNotExistException $e) {
-			return false;
-		}
-		return true;
-	}
+    /**
+     * Check if a given Tag object already exists in the database.
+     *
+     * @param Tag $tag The tag to look for in the database.
+     * @return bool
+     */
+    public function tagExists($tag) {
+        $sql = 'SELECT `id`, `uid`, `type`, `category` FROM `' . $this->getTableName() . '` '
+            . 'WHERE `uid` = ? AND `type` = ? AND `category` = ?';
+        try {
+            $this->findEntity($sql, array($tag->getOwner(), $tag->getType(), $tag->getName()));
+        } catch (DoesNotExistException $e) {
+            return false;
+        }
+        return true;
+    }
 }
 

lib/private/Tagging/Tag.php

Indentation +47 added lines, -47 removed lines

@@ -37,54 +37,54 @@
  */
 class Tag extends Entity {
 
-	protected $owner;
-	protected $type;
-	protected $name;
+    protected $owner;
+    protected $type;
+    protected $name;
 
-	/**
-	* Constructor.
-	*
-	* @param string $owner The tag's owner
-	* @param string $type The type of item this tag is used for
-	* @param string $name The tag's name
-	*/
-	public function __construct($owner = null, $type = null, $name = null) {
-		$this->setOwner($owner);
-		$this->setType($type);
-		$this->setName($name);
-	}
+    /**
+     * Constructor.
+     *
+     * @param string $owner The tag's owner
+     * @param string $type The type of item this tag is used for
+     * @param string $name The tag's name
+     */
+    public function __construct($owner = null, $type = null, $name = null) {
+        $this->setOwner($owner);
+        $this->setType($type);
+        $this->setName($name);
+    }
 
-	/**
-	 * Transform a database columnname to a property
-	 *
-	 * @param string $columnName the name of the column
-	 * @return string the property name
-	 * @todo migrate existing database columns to the correct names
-	 * to be able to drop this direct mapping
-	 */
-	public function columnToProperty($columnName){
-		if ($columnName === 'category') {
-		    return 'name';
-		} elseif ($columnName === 'uid') {
-		    return 'owner';
-		} else {
-		    return parent::columnToProperty($columnName);
-		}
-	}
+    /**
+     * Transform a database columnname to a property
+     *
+     * @param string $columnName the name of the column
+     * @return string the property name
+     * @todo migrate existing database columns to the correct names
+     * to be able to drop this direct mapping
+     */
+    public function columnToProperty($columnName){
+        if ($columnName === 'category') {
+            return 'name';
+        } elseif ($columnName === 'uid') {
+            return 'owner';
+        } else {
+            return parent::columnToProperty($columnName);
+        }
+    }
 
-	/**
-	 * Transform a property to a database column name
-	 *
-	 * @param string $property the name of the property
-	 * @return string the column name
-	 */
-	public function propertyToColumn($property){
-		if ($property === 'name') {
-		    return 'category';
-		} elseif ($property === 'owner') {
-		    return 'uid';
-		} else {
-		    return parent::propertyToColumn($property);
-		}
-	}
+    /**
+     * Transform a property to a database column name
+     *
+     * @param string $property the name of the property
+     * @return string the column name
+     */
+    public function propertyToColumn($property){
+        if ($property === 'name') {
+            return 'category';
+        } elseif ($property === 'owner') {
+            return 'uid';
+        } else {
+            return parent::propertyToColumn($property);
+        }
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -62,7 +62,7 @@ 
 	 * @todo migrate existing database columns to the correct names
 	 * to be able to drop this direct mapping
 	 */
-	public function columnToProperty($columnName){
+	public function columnToProperty($columnName) {
 		if ($columnName === 'category') {
 		    return 'name';
 		} elseif ($columnName === 'uid') {
@@ -78,7 +78,7 @@ 
 	 * @param string $property the name of the property
 	 * @return string the column name
 	 */
-	public function propertyToColumn($property){
+	public function propertyToColumn($property) {
 		if ($property === 'name') {
 		    return 'category';
 		} elseif ($property === 'owner') {

lib/private/TagManager.php

Indentation +44 added lines, -44 removed lines

@@ -40,53 +40,53 @@
 
 class TagManager implements \OCP\ITagManager {
 
-	/**
-	 * User session
-	 *
-	 * @var \OCP\IUserSession
-	 */
-	private $userSession;
+    /**
+     * User session
+     *
+     * @var \OCP\IUserSession
+     */
+    private $userSession;
 
-	/**
-	 * TagMapper
-	 *
-	 * @var TagMapper
-	 */
-	private $mapper;
+    /**
+     * TagMapper
+     *
+     * @var TagMapper
+     */
+    private $mapper;
 
-	/**
-	* Constructor.
-	*
-	* @param TagMapper $mapper Instance of the TagMapper abstraction layer.
-	* @param \OCP\IUserSession $userSession the user session
-	*/
-	public function __construct(TagMapper $mapper, \OCP\IUserSession $userSession) {
-		$this->mapper = $mapper;
-		$this->userSession = $userSession;
+    /**
+     * Constructor.
+     *
+     * @param TagMapper $mapper Instance of the TagMapper abstraction layer.
+     * @param \OCP\IUserSession $userSession the user session
+     */
+    public function __construct(TagMapper $mapper, \OCP\IUserSession $userSession) {
+        $this->mapper = $mapper;
+        $this->userSession = $userSession;
 
-	}
+    }
 
-	/**
-	* Create a new \OCP\ITags instance and load tags from db.
-	*
-	* @see \OCP\ITags
-	* @param string $type The type identifier e.g. 'contact' or 'event'.
-	* @param array $defaultTags An array of default tags to be used if none are stored.
-	* @param boolean $includeShared Whether to include tags for items shared with this user by others.
-	* @param string $userId user for which to retrieve the tags, defaults to the currently
-	* logged in user
-	* @return \OCP\ITags
-	*/
-	public function load($type, $defaultTags = array(), $includeShared = false, $userId = null) {
-		if (is_null($userId)) {
-			$user = $this->userSession->getUser();
-			if ($user === null) {
-				// nothing we can do without a user
-				return null;
-			}
-			$userId = $this->userSession->getUser()->getUId();
-		}
-		return new Tags($this->mapper, $userId, $type, $defaultTags, $includeShared);
-	}
+    /**
+     * Create a new \OCP\ITags instance and load tags from db.
+     *
+     * @see \OCP\ITags
+     * @param string $type The type identifier e.g. 'contact' or 'event'.
+     * @param array $defaultTags An array of default tags to be used if none are stored.
+     * @param boolean $includeShared Whether to include tags for items shared with this user by others.
+     * @param string $userId user for which to retrieve the tags, defaults to the currently
+     * logged in user
+     * @return \OCP\ITags
+     */
+    public function load($type, $defaultTags = array(), $includeShared = false, $userId = null) {
+        if (is_null($userId)) {
+            $user = $this->userSession->getUser();
+            if ($user === null) {
+                // nothing we can do without a user
+                return null;
+            }
+            $userId = $this->userSession->getUser()->getUId();
+        }
+        return new Tags($this->mapper, $userId, $type, $defaultTags, $includeShared);
+    }
 
 }

lib/private/ContactsManager.php

Indentation +160 added lines, -160 removed lines

@@ -27,164 +27,164 @@
 
 namespace OC {
 
-	class ContactsManager implements \OCP\Contacts\IManager {
-
-		/**
-		 * This function is used to search and find contacts within the users address books.
-		 * In case $pattern is empty all contacts will be returned.
-		 *
-		 * @param string $pattern which should match within the $searchProperties
-		 * @param array $searchProperties defines the properties within the query pattern should match
-		 * @param array $options - for future use. One should always have options!
-		 * @return array an array of contacts which are arrays of key-value-pairs
-		 */
-		public function search($pattern, $searchProperties = array(), $options = array()) {
-			$this->loadAddressBooks();
-			$result = array();
-			foreach($this->addressBooks as $addressBook) {
-				$r = $addressBook->search($pattern, $searchProperties, $options);
-				$contacts = array();
-				foreach($r as $c){
-					$c['addressbook-key'] = $addressBook->getKey();
-					$contacts[] = $c;
-				}
-				$result = array_merge($result, $contacts);
-			}
-
-			return $result;
-		}
-
-		/**
-		 * This function can be used to delete the contact identified by the given id
-		 *
-		 * @param object $id the unique identifier to a contact
-		 * @param string $addressBookKey identifier of the address book in which the contact shall be deleted
-		 * @return bool successful or not
-		 */
-		public function delete($id, $addressBookKey) {
-			$addressBook = $this->getAddressBook($addressBookKey);
-			if (!$addressBook) {
-				return null;
-			}
-
-			if ($addressBook->getPermissions() & \OCP\Constants::PERMISSION_DELETE) {
-				return $addressBook->delete($id);
-			}
-
-			return null;
-		}
-
-		/**
-		 * This function is used to create a new contact if 'id' is not given or not present.
-		 * Otherwise the contact will be updated by replacing the entire data set.
-		 *
-		 * @param array $properties this array if key-value-pairs defines a contact
-		 * @param string $addressBookKey identifier of the address book in which the contact shall be created or updated
-		 * @return array representing the contact just created or updated
-		 */
-		public function createOrUpdate($properties, $addressBookKey) {
-			$addressBook = $this->getAddressBook($addressBookKey);
-			if (!$addressBook) {
-				return null;
-			}
-
-			if ($addressBook->getPermissions() & \OCP\Constants::PERMISSION_CREATE) {
-				return $addressBook->createOrUpdate($properties);
-			}
-
-			return null;
-		}
-
-		/**
-		 * Check if contacts are available (e.g. contacts app enabled)
-		 *
-		 * @return bool true if enabled, false if not
-		 */
-		public function isEnabled() {
-			return !empty($this->addressBooks) || !empty($this->addressBookLoaders);
-		}
-
-		/**
-		 * @param \OCP\IAddressBook $addressBook
-		 */
-		public function registerAddressBook(\OCP\IAddressBook $addressBook) {
-			$this->addressBooks[$addressBook->getKey()] = $addressBook;
-		}
-
-		/**
-		 * @param \OCP\IAddressBook $addressBook
-		 */
-		public function unregisterAddressBook(\OCP\IAddressBook $addressBook) {
-			unset($this->addressBooks[$addressBook->getKey()]);
-		}
-
-		/**
-		 * @return array
-		 */
-		public function getAddressBooks() {
-			$this->loadAddressBooks();
-			$result = array();
-			foreach($this->addressBooks as $addressBook) {
-				$result[$addressBook->getKey()] = $addressBook->getDisplayName();
-			}
-
-			return $result;
-		}
-
-		/**
-		 * removes all registered address book instances
-		 */
-		public function clear() {
-			$this->addressBooks = array();
-			$this->addressBookLoaders = array();
-		}
-
-		/**
-		 * @var \OCP\IAddressBook[] which holds all registered address books
-		 */
-		private $addressBooks = array();
-
-		/**
-		 * @var \Closure[] to call to load/register address books
-		 */
-		private $addressBookLoaders = array();
-
-		/**
-		 * In order to improve lazy loading a closure can be registered which will be called in case
-		 * address books are actually requested
-		 *
-		 * @param \Closure $callable
-		 */
-		public function register(\Closure $callable)
-		{
-			$this->addressBookLoaders[] = $callable;
-		}
-
-		/**
-		 * Get (and load when needed) the address book for $key
-		 *
-		 * @param string $addressBookKey
-		 * @return \OCP\IAddressBook
-		 */
-		protected function getAddressBook($addressBookKey)
-		{
-			$this->loadAddressBooks();
-			if (!array_key_exists($addressBookKey, $this->addressBooks)) {
-				return null;
-			}
-
-			return $this->addressBooks[$addressBookKey];
-		}
-
-		/**
-		 * Load all address books registered with 'register'
-		 */
-		protected function loadAddressBooks()
-		{
-			foreach($this->addressBookLoaders as $callable) {
-				$callable($this);
-			}
-			$this->addressBookLoaders = array();
-		}
-	}
+    class ContactsManager implements \OCP\Contacts\IManager {
+
+        /**
+         * This function is used to search and find contacts within the users address books.
+         * In case $pattern is empty all contacts will be returned.
+         *
+         * @param string $pattern which should match within the $searchProperties
+         * @param array $searchProperties defines the properties within the query pattern should match
+         * @param array $options - for future use. One should always have options!
+         * @return array an array of contacts which are arrays of key-value-pairs
+         */
+        public function search($pattern, $searchProperties = array(), $options = array()) {
+            $this->loadAddressBooks();
+            $result = array();
+            foreach($this->addressBooks as $addressBook) {
+                $r = $addressBook->search($pattern, $searchProperties, $options);
+                $contacts = array();
+                foreach($r as $c){
+                    $c['addressbook-key'] = $addressBook->getKey();
+                    $contacts[] = $c;
+                }
+                $result = array_merge($result, $contacts);
+            }
+
+            return $result;
+        }
+
+        /**
+         * This function can be used to delete the contact identified by the given id
+         *
+         * @param object $id the unique identifier to a contact
+         * @param string $addressBookKey identifier of the address book in which the contact shall be deleted
+         * @return bool successful or not
+         */
+        public function delete($id, $addressBookKey) {
+            $addressBook = $this->getAddressBook($addressBookKey);
+            if (!$addressBook) {
+                return null;
+            }
+
+            if ($addressBook->getPermissions() & \OCP\Constants::PERMISSION_DELETE) {
+                return $addressBook->delete($id);
+            }
+
+            return null;
+        }
+
+        /**
+         * This function is used to create a new contact if 'id' is not given or not present.
+         * Otherwise the contact will be updated by replacing the entire data set.
+         *
+         * @param array $properties this array if key-value-pairs defines a contact
+         * @param string $addressBookKey identifier of the address book in which the contact shall be created or updated
+         * @return array representing the contact just created or updated
+         */
+        public function createOrUpdate($properties, $addressBookKey) {
+            $addressBook = $this->getAddressBook($addressBookKey);
+            if (!$addressBook) {
+                return null;
+            }
+
+            if ($addressBook->getPermissions() & \OCP\Constants::PERMISSION_CREATE) {
+                return $addressBook->createOrUpdate($properties);
+            }
+
+            return null;
+        }
+
+        /**
+         * Check if contacts are available (e.g. contacts app enabled)
+         *
+         * @return bool true if enabled, false if not
+         */
+        public function isEnabled() {
+            return !empty($this->addressBooks) || !empty($this->addressBookLoaders);
+        }
+
+        /**
+         * @param \OCP\IAddressBook $addressBook
+         */
+        public function registerAddressBook(\OCP\IAddressBook $addressBook) {
+            $this->addressBooks[$addressBook->getKey()] = $addressBook;
+        }
+
+        /**
+         * @param \OCP\IAddressBook $addressBook
+         */
+        public function unregisterAddressBook(\OCP\IAddressBook $addressBook) {
+            unset($this->addressBooks[$addressBook->getKey()]);
+        }
+
+        /**
+         * @return array
+         */
+        public function getAddressBooks() {
+            $this->loadAddressBooks();
+            $result = array();
+            foreach($this->addressBooks as $addressBook) {
+                $result[$addressBook->getKey()] = $addressBook->getDisplayName();
+            }
+
+            return $result;
+        }
+
+        /**
+         * removes all registered address book instances
+         */
+        public function clear() {
+            $this->addressBooks = array();
+            $this->addressBookLoaders = array();
+        }
+
+        /**
+         * @var \OCP\IAddressBook[] which holds all registered address books
+         */
+        private $addressBooks = array();
+
+        /**
+         * @var \Closure[] to call to load/register address books
+         */
+        private $addressBookLoaders = array();
+
+        /**
+         * In order to improve lazy loading a closure can be registered which will be called in case
+         * address books are actually requested
+         *
+         * @param \Closure $callable
+         */
+        public function register(\Closure $callable)
+        {
+            $this->addressBookLoaders[] = $callable;
+        }
+
+        /**
+         * Get (and load when needed) the address book for $key
+         *
+         * @param string $addressBookKey
+         * @return \OCP\IAddressBook
+         */
+        protected function getAddressBook($addressBookKey)
+        {
+            $this->loadAddressBooks();
+            if (!array_key_exists($addressBookKey, $this->addressBooks)) {
+                return null;
+            }
+
+            return $this->addressBooks[$addressBookKey];
+        }
+
+        /**
+         * Load all address books registered with 'register'
+         */
+        protected function loadAddressBooks()
+        {
+            foreach($this->addressBookLoaders as $callable) {
+                $callable($this);
+            }
+            $this->addressBookLoaders = array();
+        }
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -41,10 +41,10 @@ 
 		public function search($pattern, $searchProperties = array(), $options = array()) {
 			$this->loadAddressBooks();
 			$result = array();
-			foreach($this->addressBooks as $addressBook) {
+			foreach ($this->addressBooks as $addressBook) {
 				$r = $addressBook->search($pattern, $searchProperties, $options);
 				$contacts = array();
-				foreach($r as $c){
+				foreach ($r as $c) {
 					$c['addressbook-key'] = $addressBook->getKey();
 					$contacts[] = $c;
 				}
@@ -124,7 +124,7 @@ 
 		public function getAddressBooks() {
 			$this->loadAddressBooks();
 			$result = array();
-			foreach($this->addressBooks as $addressBook) {
+			foreach ($this->addressBooks as $addressBook) {
 				$result[$addressBook->getKey()] = $addressBook->getDisplayName();
 			}
 
@@ -181,7 +181,7 @@ 
 		 */
 		protected function loadAddressBooks()
 		{
-			foreach($this->addressBookLoaders as $callable) {
+			foreach ($this->addressBookLoaders as $callable) {
 				$callable($this);
 			}
 			$this->addressBookLoaders = array();

lib/private/Archive/Archive.php

Braces +1 added lines, -1 removed lines

@@ -134,7 +134,7 @@
 				}
 				if(is_dir($source.'/'.$file)) {
 					$this->addRecursive($path.'/'.$file, $source.'/'.$file);
-				}else{
+				} else{
 					$this->addFile($path.'/'.$file, $source.'/'.$file);
 				}
 			}

Indentation +107 added lines, -107 removed lines

@@ -33,111 +33,111 @@
 namespace OC\Archive;
 
 abstract class Archive {
-	/**
-	 * @param $source
-	 */
-	public abstract function __construct($source);
-	/**
-	 * add an empty folder to the archive
-	 * @param string $path
-	 * @return bool
-	 */
-	public abstract function addFolder($path);
-	/**
-	 * add a file to the archive
-	 * @param string $path
-	 * @param string $source either a local file or string data
-	 * @return bool
-	 */
-	public abstract function addFile($path, $source='');
-	/**
-	 * rename a file or folder in the archive
-	 * @param string $source
-	 * @param string $dest
-	 * @return bool
-	 */
-	public abstract function rename($source, $dest);
-	/**
-	 * get the uncompressed size of a file in the archive
-	 * @param string $path
-	 * @return int
-	 */
-	public abstract function filesize($path);
-	/**
-	 * get the last modified time of a file in the archive
-	 * @param string $path
-	 * @return int
-	 */
-	public abstract function mtime($path);
-	/**
-	 * get the files in a folder
-	 * @param string $path
-	 * @return array
-	 */
-	public abstract function getFolder($path);
-	/**
-	 * get all files in the archive
-	 * @return array
-	 */
-	public abstract function getFiles();
-	/**
-	 * get the content of a file
-	 * @param string $path
-	 * @return string
-	 */
-	public abstract function getFile($path);
-	/**
-	 * extract a single file from the archive
-	 * @param string $path
-	 * @param string $dest
-	 * @return bool
-	 */
-	public abstract function extractFile($path, $dest);
-	/**
-	 * extract the archive
-	 * @param string $dest
-	 * @return bool
-	 */
-	public abstract function extract($dest);
-	/**
-	 * check if a file or folder exists in the archive
-	 * @param string $path
-	 * @return bool
-	 */
-	public abstract function fileExists($path);
-	/**
-	 * remove a file or folder from the archive
-	 * @param string $path
-	 * @return bool
-	 */
-	public abstract function remove($path);
-	/**
-	 * get a file handler
-	 * @param string $path
-	 * @param string $mode
-	 * @return resource
-	 */
-	public abstract function getStream($path, $mode);
-	/**
-	 * add a folder and all its content
-	 * @param string $path
-	 * @param string $source
-	 * @return boolean|null
-	 */
-	public function addRecursive($path, $source) {
-		$dh = opendir($source);
-		if(is_resource($dh)) {
-			$this->addFolder($path);
-			while (($file = readdir($dh)) !== false) {
-				if($file === '.' || $file === '..') {
-					continue;
-				}
-				if(is_dir($source.'/'.$file)) {
-					$this->addRecursive($path.'/'.$file, $source.'/'.$file);
-				}else{
-					$this->addFile($path.'/'.$file, $source.'/'.$file);
-				}
-			}
-		}
-	}
+    /**
+     * @param $source
+     */
+    public abstract function __construct($source);
+    /**
+     * add an empty folder to the archive
+     * @param string $path
+     * @return bool
+     */
+    public abstract function addFolder($path);
+    /**
+     * add a file to the archive
+     * @param string $path
+     * @param string $source either a local file or string data
+     * @return bool
+     */
+    public abstract function addFile($path, $source='');
+    /**
+     * rename a file or folder in the archive
+     * @param string $source
+     * @param string $dest
+     * @return bool
+     */
+    public abstract function rename($source, $dest);
+    /**
+     * get the uncompressed size of a file in the archive
+     * @param string $path
+     * @return int
+     */
+    public abstract function filesize($path);
+    /**
+     * get the last modified time of a file in the archive
+     * @param string $path
+     * @return int
+     */
+    public abstract function mtime($path);
+    /**
+     * get the files in a folder
+     * @param string $path
+     * @return array
+     */
+    public abstract function getFolder($path);
+    /**
+     * get all files in the archive
+     * @return array
+     */
+    public abstract function getFiles();
+    /**
+     * get the content of a file
+     * @param string $path
+     * @return string
+     */
+    public abstract function getFile($path);
+    /**
+     * extract a single file from the archive
+     * @param string $path
+     * @param string $dest
+     * @return bool
+     */
+    public abstract function extractFile($path, $dest);
+    /**
+     * extract the archive
+     * @param string $dest
+     * @return bool
+     */
+    public abstract function extract($dest);
+    /**
+     * check if a file or folder exists in the archive
+     * @param string $path
+     * @return bool
+     */
+    public abstract function fileExists($path);
+    /**
+     * remove a file or folder from the archive
+     * @param string $path
+     * @return bool
+     */
+    public abstract function remove($path);
+    /**
+     * get a file handler
+     * @param string $path
+     * @param string $mode
+     * @return resource
+     */
+    public abstract function getStream($path, $mode);
+    /**
+     * add a folder and all its content
+     * @param string $path
+     * @param string $source
+     * @return boolean|null
+     */
+    public function addRecursive($path, $source) {
+        $dh = opendir($source);
+        if(is_resource($dh)) {
+            $this->addFolder($path);
+            while (($file = readdir($dh)) !== false) {
+                if($file === '.' || $file === '..') {
+                    continue;
+                }
+                if(is_dir($source.'/'.$file)) {
+                    $this->addRecursive($path.'/'.$file, $source.'/'.$file);
+                }else{
+                    $this->addFile($path.'/'.$file, $source.'/'.$file);
+                }
+            }
+        }
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -49,7 +49,7 @@ 
 	 * @param string $source either a local file or string data
 	 * @return bool
 	 */
-	public abstract function addFile($path, $source='');
+	public abstract function addFile($path, $source = '');
 	/**
 	 * rename a file or folder in the archive
 	 * @param string $source
@@ -126,15 +126,15 @@ 
 	 */
 	public function addRecursive($path, $source) {
 		$dh = opendir($source);
-		if(is_resource($dh)) {
+		if (is_resource($dh)) {
 			$this->addFolder($path);
 			while (($file = readdir($dh)) !== false) {
-				if($file === '.' || $file === '..') {
+				if ($file === '.' || $file === '..') {
 					continue;
 				}
-				if(is_dir($source.'/'.$file)) {
+				if (is_dir($source.'/'.$file)) {
 					$this->addRecursive($path.'/'.$file, $source.'/'.$file);
-				}else{
+				} else {
 					$this->addFile($path.'/'.$file, $source.'/'.$file);
 				}
 			}