nextcloud / server

lib/private/DB/QueryBuilder/Literal.php

Indentation +11 added lines, -11 removed lines

@@ -25,17 +25,17 @@
 use OCP\DB\QueryBuilder\ILiteral;
 
 class Literal implements ILiteral {
-	/** @var mixed */
-	protected $literal;
+    /** @var mixed */
+    protected $literal;
 
-	public function __construct($literal) {
-		$this->literal = $literal;
-	}
+    public function __construct($literal) {
+        $this->literal = $literal;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function __toString() {
-		return (string) $this->literal;
-	}
+    /**
+     * @return string
+     */
+    public function __toString() {
+        return (string) $this->literal;
+    }
 }

lib/private/DB/AdapterSqlite.php

Spacing +2 added lines, -2 removed lines

@@ -64,14 +64,14 @@
 		if (empty($compare)) {
 			$compare = array_keys($input);
 		}
-		$fieldList = '`' . implode('`,`', array_keys($input)) . '`';
+		$fieldList = '`'.implode('`,`', array_keys($input)).'`';
 		$query = "INSERT INTO `$table` ($fieldList) SELECT "
 			. str_repeat('?,', count($input) - 1).'? '
 			. " WHERE NOT EXISTS (SELECT 1 FROM `$table` WHERE ";
 
 		$inserts = array_values($input);
 		foreach ($compare as $key) {
-			$query .= '`' . $key . '`';
+			$query .= '`'.$key.'`';
 			if (is_null($input[$key])) {
 				$query .= ' IS NULL AND ';
 			} else {

Indentation +61 added lines, -61 removed lines

@@ -29,70 +29,70 @@
 use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
 
 class AdapterSqlite extends Adapter {
-	/**
-	 * @param string $tableName
-	 */
-	public function lockTable($tableName) {
-		$this->conn->executeUpdate('BEGIN EXCLUSIVE TRANSACTION');
-	}
+    /**
+     * @param string $tableName
+     */
+    public function lockTable($tableName) {
+        $this->conn->executeUpdate('BEGIN EXCLUSIVE TRANSACTION');
+    }
 
-	public function unlockTable() {
-		$this->conn->executeUpdate('COMMIT TRANSACTION');
-	}
+    public function unlockTable() {
+        $this->conn->executeUpdate('COMMIT TRANSACTION');
+    }
 
-	public function fixupStatement($statement) {
-		$statement = preg_replace('/`(\w+)` ILIKE \?/', 'LOWER($1) LIKE LOWER(?)', $statement);
-		$statement = str_replace('`', '"', $statement);
-		$statement = str_ireplace('NOW()', 'datetime(\'now\')', $statement);
-		$statement = str_ireplace('GREATEST(', 'MAX(', $statement);
-		$statement = str_ireplace('UNIX_TIMESTAMP()', 'strftime(\'%s\',\'now\')', $statement);
-		return $statement;
-	}
+    public function fixupStatement($statement) {
+        $statement = preg_replace('/`(\w+)` ILIKE \?/', 'LOWER($1) LIKE LOWER(?)', $statement);
+        $statement = str_replace('`', '"', $statement);
+        $statement = str_ireplace('NOW()', 'datetime(\'now\')', $statement);
+        $statement = str_ireplace('GREATEST(', 'MAX(', $statement);
+        $statement = str_ireplace('UNIX_TIMESTAMP()', 'strftime(\'%s\',\'now\')', $statement);
+        return $statement;
+    }
 
-	/**
-	 * Insert a row if the matching row does not exists. To accomplish proper race condition avoidance
-	 * it is needed that there is also a unique constraint on the values. Then this method will
-	 * catch the exception and return 0.
-	 *
-	 * @param string $table The table name (will replace *PREFIX* with the actual prefix)
-	 * @param array $input data that should be inserted into the table  (column name => value)
-	 * @param array|null $compare List of values that should be checked for "if not exists"
-	 *				If this is null or an empty array, all keys of $input will be compared
-	 *				Please note: text fields (clob) must not be used in the compare array
-	 * @return int number of inserted rows
-	 * @throws \Doctrine\DBAL\Exception
-	 * @deprecated 15.0.0 - use unique index and "try { $db->insert() } catch (UniqueConstraintViolationException $e) {}" instead, because it is more reliable and does not have the risk for deadlocks - see https://github.com/nextcloud/server/pull/12371
-	 */
-	public function insertIfNotExist($table, $input, array $compare = null) {
-		if (empty($compare)) {
-			$compare = array_keys($input);
-		}
-		$fieldList = '`' . implode('`,`', array_keys($input)) . '`';
-		$query = "INSERT INTO `$table` ($fieldList) SELECT "
-			. str_repeat('?,', count($input) - 1).'? '
-			. " WHERE NOT EXISTS (SELECT 1 FROM `$table` WHERE ";
+    /**
+     * Insert a row if the matching row does not exists. To accomplish proper race condition avoidance
+     * it is needed that there is also a unique constraint on the values. Then this method will
+     * catch the exception and return 0.
+     *
+     * @param string $table The table name (will replace *PREFIX* with the actual prefix)
+     * @param array $input data that should be inserted into the table  (column name => value)
+     * @param array|null $compare List of values that should be checked for "if not exists"
+     *				If this is null or an empty array, all keys of $input will be compared
+     *				Please note: text fields (clob) must not be used in the compare array
+     * @return int number of inserted rows
+     * @throws \Doctrine\DBAL\Exception
+     * @deprecated 15.0.0 - use unique index and "try { $db->insert() } catch (UniqueConstraintViolationException $e) {}" instead, because it is more reliable and does not have the risk for deadlocks - see https://github.com/nextcloud/server/pull/12371
+     */
+    public function insertIfNotExist($table, $input, array $compare = null) {
+        if (empty($compare)) {
+            $compare = array_keys($input);
+        }
+        $fieldList = '`' . implode('`,`', array_keys($input)) . '`';
+        $query = "INSERT INTO `$table` ($fieldList) SELECT "
+            . str_repeat('?,', count($input) - 1).'? '
+            . " WHERE NOT EXISTS (SELECT 1 FROM `$table` WHERE ";
 
-		$inserts = array_values($input);
-		foreach ($compare as $key) {
-			$query .= '`' . $key . '`';
-			if (is_null($input[$key])) {
-				$query .= ' IS NULL AND ';
-			} else {
-				$inserts[] = $input[$key];
-				$query .= ' = ? AND ';
-			}
-		}
-		$query = substr($query, 0, -5);
-		$query .= ')';
+        $inserts = array_values($input);
+        foreach ($compare as $key) {
+            $query .= '`' . $key . '`';
+            if (is_null($input[$key])) {
+                $query .= ' IS NULL AND ';
+            } else {
+                $inserts[] = $input[$key];
+                $query .= ' = ? AND ';
+            }
+        }
+        $query = substr($query, 0, -5);
+        $query .= ')';
 
-		try {
-			return $this->conn->executeUpdate($query, $inserts);
-		} catch (UniqueConstraintViolationException $e) {
-			// if this is thrown then a concurrent insert happened between the insert and the sub-select in the insert, that should have avoided it
-			// it's fine to ignore this then
-			//
-			// more discussions about this can be found at https://github.com/nextcloud/server/pull/12315
-			return 0;
-		}
-	}
+        try {
+            return $this->conn->executeUpdate($query, $inserts);
+        } catch (UniqueConstraintViolationException $e) {
+            // if this is thrown then a concurrent insert happened between the insert and the sub-select in the insert, that should have avoided it
+            // it's fine to ignore this then
+            //
+            // more discussions about this can be found at https://github.com/nextcloud/server/pull/12315
+            return 0;
+        }
+    }
 }

lib/private/DB/Adapter.php

Spacing +5 added lines, -5 removed lines

@@ -66,7 +66,7 @@ 
 	 */
 	public function lockTable($tableName) {
 		$this->conn->beginTransaction();
-		$this->conn->executeUpdate('LOCK TABLE `' .$tableName . '` IN EXCLUSIVE MODE');
+		$this->conn->executeUpdate('LOCK TABLE `'.$tableName.'` IN EXCLUSIVE MODE');
 	}
 
 	/**
@@ -93,14 +93,14 @@ 
 		if (empty($compare)) {
 			$compare = array_keys($input);
 		}
-		$query = 'INSERT INTO `' .$table . '` (`'
-			. implode('`,`', array_keys($input)) . '`) SELECT '
+		$query = 'INSERT INTO `'.$table.'` (`'
+			. implode('`,`', array_keys($input)).'`) SELECT '
 			. str_repeat('?,', count($input) - 1).'? ' // Is there a prettier alternative?
-			. 'FROM `' . $table . '` WHERE ';
+			. 'FROM `'.$table.'` WHERE ';
 
 		$inserts = array_values($input);
 		foreach ($compare as $key) {
-			$query .= '`' . $key . '`';
+			$query .= '`'.$key.'`';
 			if (is_null($input[$key])) {
 				$query .= ' IS NULL AND ';
 			} else {

Indentation +102 added lines, -102 removed lines

@@ -36,115 +36,115 @@
  * handled by the database abstraction layer.
  */
 class Adapter {
-	/**
-	 * @var \OC\DB\Connection $conn
-	 */
-	protected $conn;
+    /**
+     * @var \OC\DB\Connection $conn
+     */
+    protected $conn;
 
-	public function __construct($conn) {
-		$this->conn = $conn;
-	}
+    public function __construct($conn) {
+        $this->conn = $conn;
+    }
 
-	/**
-	 * @param string $table name
-	 *
-	 * @return int id of last insert statement
-	 * @throws Exception
-	 */
-	public function lastInsertId($table) {
-		return (int) $this->conn->realLastInsertId($table);
-	}
+    /**
+     * @param string $table name
+     *
+     * @return int id of last insert statement
+     * @throws Exception
+     */
+    public function lastInsertId($table) {
+        return (int) $this->conn->realLastInsertId($table);
+    }
 
-	/**
-	 * @param string $statement that needs to be changed so the db can handle it
-	 * @return string changed statement
-	 */
-	public function fixupStatement($statement) {
-		return $statement;
-	}
+    /**
+     * @param string $statement that needs to be changed so the db can handle it
+     * @return string changed statement
+     */
+    public function fixupStatement($statement) {
+        return $statement;
+    }
 
-	/**
-	 * Create an exclusive read+write lock on a table
-	 *
-	 * @param string $tableName
-	 * @throws Exception
-	 * @since 9.1.0
-	 */
-	public function lockTable($tableName) {
-		$this->conn->beginTransaction();
-		$this->conn->executeUpdate('LOCK TABLE `' .$tableName . '` IN EXCLUSIVE MODE');
-	}
+    /**
+     * Create an exclusive read+write lock on a table
+     *
+     * @param string $tableName
+     * @throws Exception
+     * @since 9.1.0
+     */
+    public function lockTable($tableName) {
+        $this->conn->beginTransaction();
+        $this->conn->executeUpdate('LOCK TABLE `' .$tableName . '` IN EXCLUSIVE MODE');
+    }
 
-	/**
-	 * Release a previous acquired lock again
-	 *
-	 * @throws Exception
-	 * @since 9.1.0
-	 */
-	public function unlockTable() {
-		$this->conn->commit();
-	}
+    /**
+     * Release a previous acquired lock again
+     *
+     * @throws Exception
+     * @since 9.1.0
+     */
+    public function unlockTable() {
+        $this->conn->commit();
+    }
 
-	/**
-	 * Insert a row if the matching row does not exists. To accomplish proper race condition avoidance
-	 * it is needed that there is also a unique constraint on the values. Then this method will
-	 * catch the exception and return 0.
-	 *
-	 * @param string $table The table name (will replace *PREFIX* with the actual prefix)
-	 * @param array $input data that should be inserted into the table  (column name => value)
-	 * @param array|null $compare List of values that should be checked for "if not exists"
-	 *				If this is null or an empty array, all keys of $input will be compared
-	 *				Please note: text fields (clob) must not be used in the compare array
-	 * @return int number of inserted rows
-	 * @throws Exception
-	 * @deprecated 15.0.0 - use unique index and "try { $db->insert() } catch (UniqueConstraintViolationException $e) {}" instead, because it is more reliable and does not have the risk for deadlocks - see https://github.com/nextcloud/server/pull/12371
-	 */
-	public function insertIfNotExist($table, $input, array $compare = null) {
-		if (empty($compare)) {
-			$compare = array_keys($input);
-		}
-		$query = 'INSERT INTO `' .$table . '` (`'
-			. implode('`,`', array_keys($input)) . '`) SELECT '
-			. str_repeat('?,', count($input) - 1).'? ' // Is there a prettier alternative?
-			. 'FROM `' . $table . '` WHERE ';
+    /**
+     * Insert a row if the matching row does not exists. To accomplish proper race condition avoidance
+     * it is needed that there is also a unique constraint on the values. Then this method will
+     * catch the exception and return 0.
+     *
+     * @param string $table The table name (will replace *PREFIX* with the actual prefix)
+     * @param array $input data that should be inserted into the table  (column name => value)
+     * @param array|null $compare List of values that should be checked for "if not exists"
+     *				If this is null or an empty array, all keys of $input will be compared
+     *				Please note: text fields (clob) must not be used in the compare array
+     * @return int number of inserted rows
+     * @throws Exception
+     * @deprecated 15.0.0 - use unique index and "try { $db->insert() } catch (UniqueConstraintViolationException $e) {}" instead, because it is more reliable and does not have the risk for deadlocks - see https://github.com/nextcloud/server/pull/12371
+     */
+    public function insertIfNotExist($table, $input, array $compare = null) {
+        if (empty($compare)) {
+            $compare = array_keys($input);
+        }
+        $query = 'INSERT INTO `' .$table . '` (`'
+            . implode('`,`', array_keys($input)) . '`) SELECT '
+            . str_repeat('?,', count($input) - 1).'? ' // Is there a prettier alternative?
+            . 'FROM `' . $table . '` WHERE ';
 
-		$inserts = array_values($input);
-		foreach ($compare as $key) {
-			$query .= '`' . $key . '`';
-			if (is_null($input[$key])) {
-				$query .= ' IS NULL AND ';
-			} else {
-				$inserts[] = $input[$key];
-				$query .= ' = ? AND ';
-			}
-		}
-		$query = substr($query, 0, -5);
-		$query .= ' HAVING COUNT(*) = 0';
+        $inserts = array_values($input);
+        foreach ($compare as $key) {
+            $query .= '`' . $key . '`';
+            if (is_null($input[$key])) {
+                $query .= ' IS NULL AND ';
+            } else {
+                $inserts[] = $input[$key];
+                $query .= ' = ? AND ';
+            }
+        }
+        $query = substr($query, 0, -5);
+        $query .= ' HAVING COUNT(*) = 0';
 
-		try {
-			return $this->conn->executeUpdate($query, $inserts);
-		} catch (UniqueConstraintViolationException $e) {
-			// if this is thrown then a concurrent insert happened between the insert and the sub-select in the insert, that should have avoided it
-			// it's fine to ignore this then
-			//
-			// more discussions about this can be found at https://github.com/nextcloud/server/pull/12315
-			return 0;
-		}
-	}
+        try {
+            return $this->conn->executeUpdate($query, $inserts);
+        } catch (UniqueConstraintViolationException $e) {
+            // if this is thrown then a concurrent insert happened between the insert and the sub-select in the insert, that should have avoided it
+            // it's fine to ignore this then
+            //
+            // more discussions about this can be found at https://github.com/nextcloud/server/pull/12315
+            return 0;
+        }
+    }
 
-	/**
-	 * @throws \OCP\DB\Exception
-	 */
-	public function insertIgnoreConflict(string $table, array $values) : int {
-		try {
-			$builder = $this->conn->getQueryBuilder();
-			$builder->insert($table);
-			foreach ($values as $key => $value) {
-				$builder->setValue($key, $builder->createNamedParameter($value));
-			}
-			return $builder->execute();
-		} catch (UniqueConstraintViolationException $e) {
-			return 0;
-		}
-	}
+    /**
+     * @throws \OCP\DB\Exception
+     */
+    public function insertIgnoreConflict(string $table, array $values) : int {
+        try {
+            $builder = $this->conn->getQueryBuilder();
+            $builder->insert($table);
+            foreach ($values as $key => $value) {
+                $builder->setValue($key, $builder->createNamedParameter($value));
+            }
+            return $builder->execute();
+        } catch (UniqueConstraintViolationException $e) {
+            return 0;
+        }
+    }
 }

lib/private/DB/OracleConnection.php

Spacing +2 added lines, -2 removed lines

@@ -82,7 +82,7 @@ 
 	 * @param string $table table name without the prefix
 	 */
 	public function dropTable($table) {
-		$table = $this->tablePrefix . trim($table);
+		$table = $this->tablePrefix.trim($table);
 		$table = $this->quoteIdentifier($table);
 		$schema = $this->getSchemaManager();
 		if ($schema->tablesExist([$table])) {
@@ -97,7 +97,7 @@ 
 	 * @return bool
 	 */
 	public function tableExists($table) {
-		$table = $this->tablePrefix . trim($table);
+		$table = $this->tablePrefix.trim($table);
 		$table = $this->quoteIdentifier($table);
 		$schema = $this->getSchemaManager();
 		return $schema->tablesExist([$table]);

Indentation +71 added lines, -71 removed lines

@@ -28,80 +28,80 @@
 namespace OC\DB;
 
 class OracleConnection extends Connection {
-	/**
-	 * Quote the keys of the array
-	 */
-	private function quoteKeys(array $data) {
-		$return = [];
-		$c = $this->getDatabasePlatform()->getIdentifierQuoteCharacter();
-		foreach ($data as $key => $value) {
-			if ($key[0] !== $c) {
-				$return[$this->quoteIdentifier($key)] = $value;
-			} else {
-				$return[$key] = $value;
-			}
-		}
-		return $return;
-	}
+    /**
+     * Quote the keys of the array
+     */
+    private function quoteKeys(array $data) {
+        $return = [];
+        $c = $this->getDatabasePlatform()->getIdentifierQuoteCharacter();
+        foreach ($data as $key => $value) {
+            if ($key[0] !== $c) {
+                $return[$this->quoteIdentifier($key)] = $value;
+            } else {
+                $return[$key] = $value;
+            }
+        }
+        return $return;
+    }
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function insert($table, array $data, array $types = []) {
-		if ($table[0] !== $this->getDatabasePlatform()->getIdentifierQuoteCharacter()) {
-			$table = $this->quoteIdentifier($table);
-		}
-		$data = $this->quoteKeys($data);
-		return parent::insert($table, $data, $types);
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function insert($table, array $data, array $types = []) {
+        if ($table[0] !== $this->getDatabasePlatform()->getIdentifierQuoteCharacter()) {
+            $table = $this->quoteIdentifier($table);
+        }
+        $data = $this->quoteKeys($data);
+        return parent::insert($table, $data, $types);
+    }
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function update($table, array $data, array $criteria, array $types = []) {
-		if ($table[0] !== $this->getDatabasePlatform()->getIdentifierQuoteCharacter()) {
-			$table = $this->quoteIdentifier($table);
-		}
-		$data = $this->quoteKeys($data);
-		$criteria = $this->quoteKeys($criteria);
-		return parent::update($table, $data, $criteria, $types);
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function update($table, array $data, array $criteria, array $types = []) {
+        if ($table[0] !== $this->getDatabasePlatform()->getIdentifierQuoteCharacter()) {
+            $table = $this->quoteIdentifier($table);
+        }
+        $data = $this->quoteKeys($data);
+        $criteria = $this->quoteKeys($criteria);
+        return parent::update($table, $data, $criteria, $types);
+    }
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function delete($table, array $criteria, array $types = []) {
-		if ($table[0] !== $this->getDatabasePlatform()->getIdentifierQuoteCharacter()) {
-			$table = $this->quoteIdentifier($table);
-		}
-		$criteria = $this->quoteKeys($criteria);
-		return parent::delete($table, $criteria);
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function delete($table, array $criteria, array $types = []) {
+        if ($table[0] !== $this->getDatabasePlatform()->getIdentifierQuoteCharacter()) {
+            $table = $this->quoteIdentifier($table);
+        }
+        $criteria = $this->quoteKeys($criteria);
+        return parent::delete($table, $criteria);
+    }
 
-	/**
-	 * Drop a table from the database if it exists
-	 *
-	 * @param string $table table name without the prefix
-	 */
-	public function dropTable($table) {
-		$table = $this->tablePrefix . trim($table);
-		$table = $this->quoteIdentifier($table);
-		$schema = $this->getSchemaManager();
-		if ($schema->tablesExist([$table])) {
-			$schema->dropTable($table);
-		}
-	}
+    /**
+     * Drop a table from the database if it exists
+     *
+     * @param string $table table name without the prefix
+     */
+    public function dropTable($table) {
+        $table = $this->tablePrefix . trim($table);
+        $table = $this->quoteIdentifier($table);
+        $schema = $this->getSchemaManager();
+        if ($schema->tablesExist([$table])) {
+            $schema->dropTable($table);
+        }
+    }
 
-	/**
-	 * Check if a table exists
-	 *
-	 * @param string $table table name without the prefix
-	 * @return bool
-	 */
-	public function tableExists($table) {
-		$table = $this->tablePrefix . trim($table);
-		$table = $this->quoteIdentifier($table);
-		$schema = $this->getSchemaManager();
-		return $schema->tablesExist([$table]);
-	}
+    /**
+     * Check if a table exists
+     *
+     * @param string $table table name without the prefix
+     * @return bool
+     */
+    public function tableExists($table) {
+        $table = $this->tablePrefix . trim($table);
+        $table = $this->quoteIdentifier($table);
+        $schema = $this->getSchemaManager();
+        return $schema->tablesExist([$table]);
+    }
 }

lib/private/Command/FileAccess.php

Indentation +7 added lines, -7 removed lines

@@ -25,12 +25,12 @@
 use OCP\IUser;
 
 trait FileAccess {
-	protected function setupFS(IUser $user) {
-		\OC_Util::setupFS($user->getUID());
-	}
+    protected function setupFS(IUser $user) {
+        \OC_Util::setupFS($user->getUID());
+    }
 
-	protected function getUserFolder(IUser $user) {
-		$this->setupFS($user);
-		return \OC::$server->getUserFolder($user->getUID());
-	}
+    protected function getUserFolder(IUser $user) {
+        $this->setupFS($user);
+        return \OC::$server->getUserFolder($user->getUID());
+    }
 }

lib/private/Memcache/APCu.php

Spacing +13 added lines, -13 removed lines

@@ -37,7 +37,7 @@ 
 	use CADTrait;
 
 	public function get($key) {
-		$result = apcu_fetch($this->getPrefix() . $key, $success);
+		$result = apcu_fetch($this->getPrefix().$key, $success);
 		if (!$success) {
 			return null;
 		}
@@ -45,24 +45,24 @@ 
 	}
 
 	public function set($key, $value, $ttl = 0) {
-		return apcu_store($this->getPrefix() . $key, $value, $ttl);
+		return apcu_store($this->getPrefix().$key, $value, $ttl);
 	}
 
 	public function hasKey($key) {
-		return apcu_exists($this->getPrefix() . $key);
+		return apcu_exists($this->getPrefix().$key);
 	}
 
 	public function remove($key) {
-		return apcu_delete($this->getPrefix() . $key);
+		return apcu_delete($this->getPrefix().$key);
 	}
 
 	public function clear($prefix = '') {
-		$ns = $this->getPrefix() . $prefix;
+		$ns = $this->getPrefix().$prefix;
 		$ns = preg_quote($ns, '/');
 		if (class_exists('\APCIterator')) {
-			$iter = new \APCIterator('user', '/^' . $ns . '/', APC_ITER_KEY);
+			$iter = new \APCIterator('user', '/^'.$ns.'/', APC_ITER_KEY);
 		} else {
-			$iter = new \APCUIterator('/^' . $ns . '/', APC_ITER_KEY);
+			$iter = new \APCUIterator('/^'.$ns.'/', APC_ITER_KEY);
 		}
 		return apcu_delete($iter);
 	}
@@ -76,7 +76,7 @@ 
 	 * @return bool
 	 */
 	public function add($key, $value, $ttl = 0) {
-		return apcu_add($this->getPrefix() . $key, $value, $ttl);
+		return apcu_add($this->getPrefix().$key, $value, $ttl);
 	}
 
 	/**
@@ -100,8 +100,8 @@ 
 		 * see https://github.com/krakjoe/apcu/issues/183#issuecomment-244038221
 		 * for details
 		 */
-		return apcu_exists($this->getPrefix() . $key)
-			? apcu_inc($this->getPrefix() . $key, $step)
+		return apcu_exists($this->getPrefix().$key)
+			? apcu_inc($this->getPrefix().$key, $step)
 			: false;
 	}
 
@@ -125,8 +125,8 @@ 
 		 * see https://github.com/krakjoe/apcu/issues/183#issuecomment-244038221
 		 * for details
 		 */
-		return apcu_exists($this->getPrefix() . $key)
-			? apcu_dec($this->getPrefix() . $key, $step)
+		return apcu_exists($this->getPrefix().$key)
+			? apcu_dec($this->getPrefix().$key, $step)
 			: false;
 	}
 
@@ -141,7 +141,7 @@ 
 	public function cas($key, $old, $new) {
 		// apc only does cas for ints
 		if (is_int($old) and is_int($new)) {
-			return apcu_cas($this->getPrefix() . $key, $old, $new);
+			return apcu_cas($this->getPrefix().$key, $old, $new);
 		} else {
 			return $this->casEmulated($key, $old, $new);
 		}

Indentation +122 added lines, -122 removed lines

@@ -31,137 +31,137 @@
 use OCP\IMemcache;
 
 class APCu extends Cache implements IMemcache {
-	use CASTrait {
-		cas as casEmulated;
-	}
+    use CASTrait {
+        cas as casEmulated;
+    }
 
-	use CADTrait;
+    use CADTrait;
 
-	public function get($key) {
-		$result = apcu_fetch($this->getPrefix() . $key, $success);
-		if (!$success) {
-			return null;
-		}
-		return $result;
-	}
+    public function get($key) {
+        $result = apcu_fetch($this->getPrefix() . $key, $success);
+        if (!$success) {
+            return null;
+        }
+        return $result;
+    }
 
-	public function set($key, $value, $ttl = 0) {
-		return apcu_store($this->getPrefix() . $key, $value, $ttl);
-	}
+    public function set($key, $value, $ttl = 0) {
+        return apcu_store($this->getPrefix() . $key, $value, $ttl);
+    }
 
-	public function hasKey($key) {
-		return apcu_exists($this->getPrefix() . $key);
-	}
+    public function hasKey($key) {
+        return apcu_exists($this->getPrefix() . $key);
+    }
 
-	public function remove($key) {
-		return apcu_delete($this->getPrefix() . $key);
-	}
+    public function remove($key) {
+        return apcu_delete($this->getPrefix() . $key);
+    }
 
-	public function clear($prefix = '') {
-		$ns = $this->getPrefix() . $prefix;
-		$ns = preg_quote($ns, '/');
-		if (class_exists('\APCIterator')) {
-			$iter = new \APCIterator('user', '/^' . $ns . '/', APC_ITER_KEY);
-		} else {
-			$iter = new \APCUIterator('/^' . $ns . '/', APC_ITER_KEY);
-		}
-		return apcu_delete($iter);
-	}
+    public function clear($prefix = '') {
+        $ns = $this->getPrefix() . $prefix;
+        $ns = preg_quote($ns, '/');
+        if (class_exists('\APCIterator')) {
+            $iter = new \APCIterator('user', '/^' . $ns . '/', APC_ITER_KEY);
+        } else {
+            $iter = new \APCUIterator('/^' . $ns . '/', APC_ITER_KEY);
+        }
+        return apcu_delete($iter);
+    }
 
-	/**
-	 * Set a value in the cache if it's not already stored
-	 *
-	 * @param string $key
-	 * @param mixed $value
-	 * @param int $ttl Time To Live in seconds. Defaults to 60*60*24
-	 * @return bool
-	 */
-	public function add($key, $value, $ttl = 0) {
-		return apcu_add($this->getPrefix() . $key, $value, $ttl);
-	}
+    /**
+     * Set a value in the cache if it's not already stored
+     *
+     * @param string $key
+     * @param mixed $value
+     * @param int $ttl Time To Live in seconds. Defaults to 60*60*24
+     * @return bool
+     */
+    public function add($key, $value, $ttl = 0) {
+        return apcu_add($this->getPrefix() . $key, $value, $ttl);
+    }
 
-	/**
-	 * Increase a stored number
-	 *
-	 * @param string $key
-	 * @param int $step
-	 * @return int | bool
-	 */
-	public function inc($key, $step = 1) {
-		$this->add($key, 0);
-		/**
-		 * TODO - hack around a PHP 7 specific issue in APCu
-		 *
-		 * on PHP 7 the apcu_inc method on a non-existing object will increment
-		 * "0" and result in "1" as value - therefore we check for existence
-		 * first
-		 *
-		 * on PHP 5.6 this is not the case
-		 *
-		 * see https://github.com/krakjoe/apcu/issues/183#issuecomment-244038221
-		 * for details
-		 */
-		return apcu_exists($this->getPrefix() . $key)
-			? apcu_inc($this->getPrefix() . $key, $step)
-			: false;
-	}
+    /**
+     * Increase a stored number
+     *
+     * @param string $key
+     * @param int $step
+     * @return int | bool
+     */
+    public function inc($key, $step = 1) {
+        $this->add($key, 0);
+        /**
+         * TODO - hack around a PHP 7 specific issue in APCu
+         *
+         * on PHP 7 the apcu_inc method on a non-existing object will increment
+         * "0" and result in "1" as value - therefore we check for existence
+         * first
+         *
+         * on PHP 5.6 this is not the case
+         *
+         * see https://github.com/krakjoe/apcu/issues/183#issuecomment-244038221
+         * for details
+         */
+        return apcu_exists($this->getPrefix() . $key)
+            ? apcu_inc($this->getPrefix() . $key, $step)
+            : false;
+    }
 
-	/**
-	 * Decrease a stored number
-	 *
-	 * @param string $key
-	 * @param int $step
-	 * @return int | bool
-	 */
-	public function dec($key, $step = 1) {
-		/**
-		 * TODO - hack around a PHP 7 specific issue in APCu
-		 *
-		 * on PHP 7 the apcu_dec method on a non-existing object will decrement
-		 * "0" and result in "-1" as value - therefore we check for existence
-		 * first
-		 *
-		 * on PHP 5.6 this is not the case
-		 *
-		 * see https://github.com/krakjoe/apcu/issues/183#issuecomment-244038221
-		 * for details
-		 */
-		return apcu_exists($this->getPrefix() . $key)
-			? apcu_dec($this->getPrefix() . $key, $step)
-			: false;
-	}
+    /**
+     * Decrease a stored number
+     *
+     * @param string $key
+     * @param int $step
+     * @return int | bool
+     */
+    public function dec($key, $step = 1) {
+        /**
+         * TODO - hack around a PHP 7 specific issue in APCu
+         *
+         * on PHP 7 the apcu_dec method on a non-existing object will decrement
+         * "0" and result in "-1" as value - therefore we check for existence
+         * first
+         *
+         * on PHP 5.6 this is not the case
+         *
+         * see https://github.com/krakjoe/apcu/issues/183#issuecomment-244038221
+         * for details
+         */
+        return apcu_exists($this->getPrefix() . $key)
+            ? apcu_dec($this->getPrefix() . $key, $step)
+            : false;
+    }
 
-	/**
-	 * Compare and set
-	 *
-	 * @param string $key
-	 * @param mixed $old
-	 * @param mixed $new
-	 * @return bool
-	 */
-	public function cas($key, $old, $new) {
-		// apc only does cas for ints
-		if (is_int($old) and is_int($new)) {
-			return apcu_cas($this->getPrefix() . $key, $old, $new);
-		} else {
-			return $this->casEmulated($key, $old, $new);
-		}
-	}
+    /**
+     * Compare and set
+     *
+     * @param string $key
+     * @param mixed $old
+     * @param mixed $new
+     * @return bool
+     */
+    public function cas($key, $old, $new) {
+        // apc only does cas for ints
+        if (is_int($old) and is_int($new)) {
+            return apcu_cas($this->getPrefix() . $key, $old, $new);
+        } else {
+            return $this->casEmulated($key, $old, $new);
+        }
+    }
 
-	public static function isAvailable(): bool {
-		if (!extension_loaded('apcu')) {
-			return false;
-		} elseif (!\OC::$server->get(IniGetWrapper::class)->getBool('apc.enabled')) {
-			return false;
-		} elseif (!\OC::$server->get(IniGetWrapper::class)->getBool('apc.enable_cli') && \OC::$CLI) {
-			return false;
-		} elseif (
-			version_compare(phpversion('apc') ?: '0.0.0', '4.0.6') === -1 &&
-			version_compare(phpversion('apcu') ?: '0.0.0', '5.1.0') === -1
-		) {
-			return false;
-		} else {
-			return true;
-		}
-	}
+    public static function isAvailable(): bool {
+        if (!extension_loaded('apcu')) {
+            return false;
+        } elseif (!\OC::$server->get(IniGetWrapper::class)->getBool('apc.enabled')) {
+            return false;
+        } elseif (!\OC::$server->get(IniGetWrapper::class)->getBool('apc.enable_cli') && \OC::$CLI) {
+            return false;
+        } elseif (
+            version_compare(phpversion('apc') ?: '0.0.0', '4.0.6') === -1 &&
+            version_compare(phpversion('apcu') ?: '0.0.0', '5.1.0') === -1
+        ) {
+            return false;
+        } else {
+            return true;
+        }
+    }
 }

lib/private/Group/Backend.php

Spacing +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
 	 * compared with \OC\Group\Backend::CREATE_GROUP etc.
 	 */
 	public function implementsActions($actions) {
-		return (bool)($this->getSupportedActions() & $actions);
+		return (bool) ($this->getSupportedActions() & $actions);
 	}
 
 	/**

Indentation +93 added lines, -93 removed lines

@@ -28,107 +28,107 @@
  * Abstract base class for user management
  */
 abstract class Backend implements \OCP\GroupInterface {
-	/**
-	 * error code for functions not provided by the group backend
-	 */
-	public const NOT_IMPLEMENTED = -501;
+    /**
+     * error code for functions not provided by the group backend
+     */
+    public const NOT_IMPLEMENTED = -501;
 
-	protected $possibleActions = [
-		self::CREATE_GROUP => 'createGroup',
-		self::DELETE_GROUP => 'deleteGroup',
-		self::ADD_TO_GROUP => 'addToGroup',
-		self::REMOVE_FROM_GOUP => 'removeFromGroup',
-		self::COUNT_USERS => 'countUsersInGroup',
-		self::GROUP_DETAILS => 'getGroupDetails',
-		self::IS_ADMIN => 'isAdmin',
-	];
+    protected $possibleActions = [
+        self::CREATE_GROUP => 'createGroup',
+        self::DELETE_GROUP => 'deleteGroup',
+        self::ADD_TO_GROUP => 'addToGroup',
+        self::REMOVE_FROM_GOUP => 'removeFromGroup',
+        self::COUNT_USERS => 'countUsersInGroup',
+        self::GROUP_DETAILS => 'getGroupDetails',
+        self::IS_ADMIN => 'isAdmin',
+    ];
 
-	/**
-	 * Get all supported actions
-	 * @return int bitwise-or'ed actions
-	 *
-	 * Returns the supported actions as int to be
-	 * compared with \OC\Group\Backend::CREATE_GROUP 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 \OC\Group\Backend::CREATE_GROUP 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 bool
-	 *
-	 * Returns the supported actions as int to be
-	 * compared with \OC\Group\Backend::CREATE_GROUP etc.
-	 */
-	public function implementsActions($actions) {
-		return (bool)($this->getSupportedActions() & $actions);
-	}
+    /**
+     * Check if backend implements actions
+     * @param int $actions bitwise-or'ed actions
+     * @return bool
+     *
+     * Returns the supported actions as int to be
+     * compared with \OC\Group\Backend::CREATE_GROUP etc.
+     */
+    public function implementsActions($actions) {
+        return (bool)($this->getSupportedActions() & $actions);
+    }
 
-	/**
-	 * is user in group?
-	 * @param string $uid uid of the user
-	 * @param string $gid gid of the group
-	 * @return bool
-	 *
-	 * Checks whether the user is member of a group or not.
-	 */
-	public function inGroup($uid, $gid) {
-		return in_array($gid, $this->getUserGroups($uid));
-	}
+    /**
+     * is user in group?
+     * @param string $uid uid of the user
+     * @param string $gid gid of the group
+     * @return bool
+     *
+     * Checks whether the user is member of a group or not.
+     */
+    public function inGroup($uid, $gid) {
+        return in_array($gid, $this->getUserGroups($uid));
+    }
 
-	/**
-	 * Get all groups a user belongs to
-	 * @param string $uid Name of the user
-	 * @return array an array of group names
-	 *
-	 * This function fetches all groups a user belongs to. It does not check
-	 * if the user exists at all.
-	 */
-	public function getUserGroups($uid) {
-		return [];
-	}
+    /**
+     * Get all groups a user belongs to
+     * @param string $uid Name of the user
+     * @return array an array of group names
+     *
+     * This function fetches all groups a user belongs to. It does not check
+     * if the user exists at all.
+     */
+    public function getUserGroups($uid) {
+        return [];
+    }
 
-	/**
-	 * get a list of all groups
-	 * @param string $search
-	 * @param int $limit
-	 * @param int $offset
-	 * @return array an array of group names
-	 *
-	 * Returns a list with all groups
-	 */
+    /**
+     * get a list of all groups
+     * @param string $search
+     * @param int $limit
+     * @param int $offset
+     * @return array an array of group names
+     *
+     * Returns a list with all groups
+     */
 
-	public function getGroups($search = '', $limit = -1, $offset = 0) {
-		return [];
-	}
+    public function getGroups($search = '', $limit = -1, $offset = 0) {
+        return [];
+    }
 
-	/**
-	 * check if a group exists
-	 * @param string $gid
-	 * @return bool
-	 */
-	public function groupExists($gid) {
-		return in_array($gid, $this->getGroups($gid, 1));
-	}
+    /**
+     * check if a group exists
+     * @param string $gid
+     * @return bool
+     */
+    public function groupExists($gid) {
+        return in_array($gid, $this->getGroups($gid, 1));
+    }
 
-	/**
-	 * get a list of all users in a group
-	 * @param string $gid
-	 * @param string $search
-	 * @param int $limit
-	 * @param int $offset
-	 * @return array<int,string> an array of user ids
-	 */
-	public function usersInGroup($gid, $search = '', $limit = -1, $offset = 0) {
-		return [];
-	}
+    /**
+     * get a list of all users in a group
+     * @param string $gid
+     * @param string $search
+     * @param int $limit
+     * @param int $offset
+     * @return array<int,string> an array of user ids
+     */
+    public function usersInGroup($gid, $search = '', $limit = -1, $offset = 0) {
+        return [];
+    }
 }

lib/private/Activity/EventMerger.php

Spacing +12 added lines, -12 removed lines

@@ -133,10 +133,10 @@ 
 
 		// Check that all parameters from $event exist in $previousEvent
 		foreach ($params1 as $key => $parameter) {
-			if (preg_match('/^' . $mergeParameter . '(\d+)?$/', $key)) {
+			if (preg_match('/^'.$mergeParameter.'(\d+)?$/', $key)) {
 				if (!$this->checkParameterAlreadyExits($params, $mergeParameter, $parameter)) {
 					$combined++;
-					$params[$mergeParameter . $combined] = $parameter;
+					$params[$mergeParameter.$combined] = $parameter;
 				}
 				continue;
 			}
@@ -151,10 +151,10 @@ 
 
 		// Check that all parameters from $previousEvent exist in $event
 		foreach ($params2 as $key => $parameter) {
-			if (preg_match('/^' . $mergeParameter . '(\d+)?$/', $key)) {
+			if (preg_match('/^'.$mergeParameter.'(\d+)?$/', $key)) {
 				if (!$this->checkParameterAlreadyExits($params, $mergeParameter, $parameter)) {
 					$combined++;
-					$params[$mergeParameter . $combined] = $parameter;
+					$params[$mergeParameter.$combined] = $parameter;
 				}
 				continue;
 			}
@@ -178,7 +178,7 @@ 
 	 */
 	protected function checkParameterAlreadyExits($parameters, $mergeParameter, $parameter) {
 		foreach ($parameters as $key => $param) {
-			if (preg_match('/^' . $mergeParameter . '(\d+)?$/', $key)) {
+			if (preg_match('/^'.$mergeParameter.'(\d+)?$/', $key)) {
 				if ($param === $parameter) {
 					return true;
 				}
@@ -196,30 +196,30 @@ 
 	protected function getExtendedSubject($subject, $parameter, $counter) {
 		switch ($counter) {
 			case 1:
-				$replacement = '{' . $parameter . '1}';
+				$replacement = '{'.$parameter.'1}';
 				break;
 			case 2:
 				$replacement = $this->l10n->t(
 					'%1$s and %2$s',
-					['{' . $parameter . '2}', '{' . $parameter . '1}']
+					['{'.$parameter.'2}', '{'.$parameter.'1}']
 				);
 				break;
 			case 3:
 				$replacement = $this->l10n->t(
 					'%1$s, %2$s and %3$s',
-					['{' . $parameter . '3}', '{' . $parameter . '2}', '{' . $parameter . '1}']
+					['{'.$parameter.'3}', '{'.$parameter.'2}', '{'.$parameter.'1}']
 				);
 				break;
 			case 4:
 				$replacement = $this->l10n->t(
 					'%1$s, %2$s, %3$s and %4$s',
-					['{' . $parameter . '4}', '{' . $parameter . '3}', '{' . $parameter . '2}', '{' . $parameter . '1}']
+					['{'.$parameter.'4}', '{'.$parameter.'3}', '{'.$parameter.'2}', '{'.$parameter.'1}']
 				);
 				break;
 			case 5:
 				$replacement = $this->l10n->t(
 					'%1$s, %2$s, %3$s, %4$s and %5$s',
-					['{' . $parameter . '5}', '{' . $parameter . '4}', '{' . $parameter . '3}', '{' . $parameter . '2}', '{' . $parameter . '1}']
+					['{'.$parameter.'5}', '{'.$parameter.'4}', '{'.$parameter.'3}', '{'.$parameter.'2}', '{'.$parameter.'1}']
 				);
 				break;
 			default:
@@ -227,7 +227,7 @@ 
 		}
 
 		return str_replace(
-			'{' . $parameter . '}',
+			'{'.$parameter.'}',
 			$replacement,
 			$subject
 		);
@@ -241,7 +241,7 @@ 
 	protected function generateParsedSubject($subject, $parameters) {
 		$placeholders = $replacements = [];
 		foreach ($parameters as $placeholder => $parameter) {
-			$placeholders[] = '{' . $placeholder . '}';
+			$placeholders[] = '{'.$placeholder.'}';
 			if ($parameter['type'] === 'file') {
 				$replacements[] = trim($parameter['path'], '/');
 			} elseif (isset($parameter['name'])) {

Indentation +202 added lines, -202 removed lines

@@ -29,231 +29,231 @@
 use OCP\IL10N;
 
 class EventMerger implements IEventMerger {
-	/** @var IL10N */
-	protected $l10n;
+    /** @var IL10N */
+    protected $l10n;
 
-	/**
-	 * @param IL10N $l10n
-	 */
-	public function __construct(IL10N $l10n) {
-		$this->l10n = $l10n;
-	}
+    /**
+     * @param IL10N $l10n
+     */
+    public function __construct(IL10N $l10n) {
+        $this->l10n = $l10n;
+    }
 
-	/**
-	 * Combines two events when possible to have grouping:
-	 *
-	 * Example1: Two events with subject '{user} created {file}' and
-	 * $mergeParameter file with different file and same user will be merged
-	 * to '{user} created {file1} and {file2}' and the childEvent on the return
-	 * will be set, if the events have been merged.
-	 *
-	 * Example2: Two events with subject '{user} created {file}' and
-	 * $mergeParameter file with same file and same user will be merged to
-	 * '{user} created {file1}' and the childEvent on the return will be set, if
-	 * the events have been merged.
-	 *
-	 * The following requirements have to be met, in order to be merged:
-	 * - Both events need to have the same `getApp()`
-	 * - Both events must not have a message `getMessage()`
-	 * - Both events need to have the same subject `getSubject()`
-	 * - Both events need to have the same object type `getObjectType()`
-	 * - The time difference between both events must not be bigger then 3 hours
-	 * - Only up to 5 events can be merged.
-	 * - All parameters apart from such starting with $mergeParameter must be
-	 *   the same for both events.
-	 *
-	 * @param string $mergeParameter
-	 * @param IEvent $event
-	 * @param IEvent|null $previousEvent
-	 * @return IEvent
-	 */
-	public function mergeEvents($mergeParameter, IEvent $event, IEvent $previousEvent = null) {
-		// No second event => can not combine
-		if (!$previousEvent instanceof IEvent) {
-			return $event;
-		}
+    /**
+     * Combines two events when possible to have grouping:
+     *
+     * Example1: Two events with subject '{user} created {file}' and
+     * $mergeParameter file with different file and same user will be merged
+     * to '{user} created {file1} and {file2}' and the childEvent on the return
+     * will be set, if the events have been merged.
+     *
+     * Example2: Two events with subject '{user} created {file}' and
+     * $mergeParameter file with same file and same user will be merged to
+     * '{user} created {file1}' and the childEvent on the return will be set, if
+     * the events have been merged.
+     *
+     * The following requirements have to be met, in order to be merged:
+     * - Both events need to have the same `getApp()`
+     * - Both events must not have a message `getMessage()`
+     * - Both events need to have the same subject `getSubject()`
+     * - Both events need to have the same object type `getObjectType()`
+     * - The time difference between both events must not be bigger then 3 hours
+     * - Only up to 5 events can be merged.
+     * - All parameters apart from such starting with $mergeParameter must be
+     *   the same for both events.
+     *
+     * @param string $mergeParameter
+     * @param IEvent $event
+     * @param IEvent|null $previousEvent
+     * @return IEvent
+     */
+    public function mergeEvents($mergeParameter, IEvent $event, IEvent $previousEvent = null) {
+        // No second event => can not combine
+        if (!$previousEvent instanceof IEvent) {
+            return $event;
+        }
 
-		// Different app => can not combine
-		if ($event->getApp() !== $previousEvent->getApp()) {
-			return $event;
-		}
+        // Different app => can not combine
+        if ($event->getApp() !== $previousEvent->getApp()) {
+            return $event;
+        }
 
-		// Message is set => can not combine
-		if ($event->getMessage() !== '' || $previousEvent->getMessage() !== '') {
-			return $event;
-		}
+        // Message is set => can not combine
+        if ($event->getMessage() !== '' || $previousEvent->getMessage() !== '') {
+            return $event;
+        }
 
-		// Different subject => can not combine
-		if ($event->getSubject() !== $previousEvent->getSubject()) {
-			return $event;
-		}
+        // Different subject => can not combine
+        if ($event->getSubject() !== $previousEvent->getSubject()) {
+            return $event;
+        }
 
-		// Different object type => can not combine
-		if ($event->getObjectType() !== $previousEvent->getObjectType()) {
-			return $event;
-		}
+        // Different object type => can not combine
+        if ($event->getObjectType() !== $previousEvent->getObjectType()) {
+            return $event;
+        }
 
-		// More than 3 hours difference => can not combine
-		if (abs($event->getTimestamp() - $previousEvent->getTimestamp()) > 3 * 60 * 60) {
-			return $event;
-		}
+        // More than 3 hours difference => can not combine
+        if (abs($event->getTimestamp() - $previousEvent->getTimestamp()) > 3 * 60 * 60) {
+            return $event;
+        }
 
-		// Other parameters are not the same => can not combine
-		try {
-			[$combined, $parameters] = $this->combineParameters($mergeParameter, $event, $previousEvent);
-		} catch (\UnexpectedValueException $e) {
-			return $event;
-		}
+        // Other parameters are not the same => can not combine
+        try {
+            [$combined, $parameters] = $this->combineParameters($mergeParameter, $event, $previousEvent);
+        } catch (\UnexpectedValueException $e) {
+            return $event;
+        }
 
-		try {
-			$newSubject = $this->getExtendedSubject($event->getRichSubject(), $mergeParameter, $combined);
-			$parsedSubject = $this->generateParsedSubject($newSubject, $parameters);
+        try {
+            $newSubject = $this->getExtendedSubject($event->getRichSubject(), $mergeParameter, $combined);
+            $parsedSubject = $this->generateParsedSubject($newSubject, $parameters);
 
-			$event->setRichSubject($newSubject, $parameters)
-				->setParsedSubject($parsedSubject)
-				->setChildEvent($previousEvent)
-				->setTimestamp(max($event->getTimestamp(), $previousEvent->getTimestamp()));
-		} catch (\UnexpectedValueException $e) {
-			return $event;
-		}
+            $event->setRichSubject($newSubject, $parameters)
+                ->setParsedSubject($parsedSubject)
+                ->setChildEvent($previousEvent)
+                ->setTimestamp(max($event->getTimestamp(), $previousEvent->getTimestamp()));
+        } catch (\UnexpectedValueException $e) {
+            return $event;
+        }
 
-		return $event;
-	}
+        return $event;
+    }
 
-	/**
-	 * @param string $mergeParameter
-	 * @param IEvent $event
-	 * @param IEvent $previousEvent
-	 * @return array
-	 * @throws \UnexpectedValueException
-	 */
-	protected function combineParameters($mergeParameter, IEvent $event, IEvent $previousEvent) {
-		$params1 = $event->getRichSubjectParameters();
-		$params2 = $previousEvent->getRichSubjectParameters();
-		$params = [];
+    /**
+     * @param string $mergeParameter
+     * @param IEvent $event
+     * @param IEvent $previousEvent
+     * @return array
+     * @throws \UnexpectedValueException
+     */
+    protected function combineParameters($mergeParameter, IEvent $event, IEvent $previousEvent) {
+        $params1 = $event->getRichSubjectParameters();
+        $params2 = $previousEvent->getRichSubjectParameters();
+        $params = [];
 
-		$combined = 0;
+        $combined = 0;
 
-		// Check that all parameters from $event exist in $previousEvent
-		foreach ($params1 as $key => $parameter) {
-			if (preg_match('/^' . $mergeParameter . '(\d+)?$/', $key)) {
-				if (!$this->checkParameterAlreadyExits($params, $mergeParameter, $parameter)) {
-					$combined++;
-					$params[$mergeParameter . $combined] = $parameter;
-				}
-				continue;
-			}
+        // Check that all parameters from $event exist in $previousEvent
+        foreach ($params1 as $key => $parameter) {
+            if (preg_match('/^' . $mergeParameter . '(\d+)?$/', $key)) {
+                if (!$this->checkParameterAlreadyExits($params, $mergeParameter, $parameter)) {
+                    $combined++;
+                    $params[$mergeParameter . $combined] = $parameter;
+                }
+                continue;
+            }
 
-			if (!isset($params2[$key]) || $params2[$key] !== $parameter) {
-				// Parameter missing on $previousEvent or different => can not combine
-				throw new \UnexpectedValueException();
-			}
+            if (!isset($params2[$key]) || $params2[$key] !== $parameter) {
+                // Parameter missing on $previousEvent or different => can not combine
+                throw new \UnexpectedValueException();
+            }
 
-			$params[$key] = $parameter;
-		}
+            $params[$key] = $parameter;
+        }
 
-		// Check that all parameters from $previousEvent exist in $event
-		foreach ($params2 as $key => $parameter) {
-			if (preg_match('/^' . $mergeParameter . '(\d+)?$/', $key)) {
-				if (!$this->checkParameterAlreadyExits($params, $mergeParameter, $parameter)) {
-					$combined++;
-					$params[$mergeParameter . $combined] = $parameter;
-				}
-				continue;
-			}
+        // Check that all parameters from $previousEvent exist in $event
+        foreach ($params2 as $key => $parameter) {
+            if (preg_match('/^' . $mergeParameter . '(\d+)?$/', $key)) {
+                if (!$this->checkParameterAlreadyExits($params, $mergeParameter, $parameter)) {
+                    $combined++;
+                    $params[$mergeParameter . $combined] = $parameter;
+                }
+                continue;
+            }
 
-			if (!isset($params1[$key]) || $params1[$key] !== $parameter) {
-				// Parameter missing on $event or different => can not combine
-				throw new \UnexpectedValueException();
-			}
+            if (!isset($params1[$key]) || $params1[$key] !== $parameter) {
+                // Parameter missing on $event or different => can not combine
+                throw new \UnexpectedValueException();
+            }
 
-			$params[$key] = $parameter;
-		}
+            $params[$key] = $parameter;
+        }
 
-		return [$combined, $params];
-	}
+        return [$combined, $params];
+    }
 
-	/**
-	 * @param array[] $parameters
-	 * @param string $mergeParameter
-	 * @param array $parameter
-	 * @return bool
-	 */
-	protected function checkParameterAlreadyExits($parameters, $mergeParameter, $parameter) {
-		foreach ($parameters as $key => $param) {
-			if (preg_match('/^' . $mergeParameter . '(\d+)?$/', $key)) {
-				if ($param === $parameter) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
+    /**
+     * @param array[] $parameters
+     * @param string $mergeParameter
+     * @param array $parameter
+     * @return bool
+     */
+    protected function checkParameterAlreadyExits($parameters, $mergeParameter, $parameter) {
+        foreach ($parameters as $key => $param) {
+            if (preg_match('/^' . $mergeParameter . '(\d+)?$/', $key)) {
+                if ($param === $parameter) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
 
-	/**
-	 * @param string $subject
-	 * @param string $parameter
-	 * @param int $counter
-	 * @return mixed
-	 */
-	protected function getExtendedSubject($subject, $parameter, $counter) {
-		switch ($counter) {
-			case 1:
-				$replacement = '{' . $parameter . '1}';
-				break;
-			case 2:
-				$replacement = $this->l10n->t(
-					'%1$s and %2$s',
-					['{' . $parameter . '2}', '{' . $parameter . '1}']
-				);
-				break;
-			case 3:
-				$replacement = $this->l10n->t(
-					'%1$s, %2$s and %3$s',
-					['{' . $parameter . '3}', '{' . $parameter . '2}', '{' . $parameter . '1}']
-				);
-				break;
-			case 4:
-				$replacement = $this->l10n->t(
-					'%1$s, %2$s, %3$s and %4$s',
-					['{' . $parameter . '4}', '{' . $parameter . '3}', '{' . $parameter . '2}', '{' . $parameter . '1}']
-				);
-				break;
-			case 5:
-				$replacement = $this->l10n->t(
-					'%1$s, %2$s, %3$s, %4$s and %5$s',
-					['{' . $parameter . '5}', '{' . $parameter . '4}', '{' . $parameter . '3}', '{' . $parameter . '2}', '{' . $parameter . '1}']
-				);
-				break;
-			default:
-				throw new \UnexpectedValueException();
-		}
+    /**
+     * @param string $subject
+     * @param string $parameter
+     * @param int $counter
+     * @return mixed
+     */
+    protected function getExtendedSubject($subject, $parameter, $counter) {
+        switch ($counter) {
+            case 1:
+                $replacement = '{' . $parameter . '1}';
+                break;
+            case 2:
+                $replacement = $this->l10n->t(
+                    '%1$s and %2$s',
+                    ['{' . $parameter . '2}', '{' . $parameter . '1}']
+                );
+                break;
+            case 3:
+                $replacement = $this->l10n->t(
+                    '%1$s, %2$s and %3$s',
+                    ['{' . $parameter . '3}', '{' . $parameter . '2}', '{' . $parameter . '1}']
+                );
+                break;
+            case 4:
+                $replacement = $this->l10n->t(
+                    '%1$s, %2$s, %3$s and %4$s',
+                    ['{' . $parameter . '4}', '{' . $parameter . '3}', '{' . $parameter . '2}', '{' . $parameter . '1}']
+                );
+                break;
+            case 5:
+                $replacement = $this->l10n->t(
+                    '%1$s, %2$s, %3$s, %4$s and %5$s',
+                    ['{' . $parameter . '5}', '{' . $parameter . '4}', '{' . $parameter . '3}', '{' . $parameter . '2}', '{' . $parameter . '1}']
+                );
+                break;
+            default:
+                throw new \UnexpectedValueException();
+        }
 
-		return str_replace(
-			'{' . $parameter . '}',
-			$replacement,
-			$subject
-		);
-	}
+        return str_replace(
+            '{' . $parameter . '}',
+            $replacement,
+            $subject
+        );
+    }
 
-	/**
-	 * @param string $subject
-	 * @param array[] $parameters
-	 * @return string
-	 */
-	protected function generateParsedSubject($subject, $parameters) {
-		$placeholders = $replacements = [];
-		foreach ($parameters as $placeholder => $parameter) {
-			$placeholders[] = '{' . $placeholder . '}';
-			if ($parameter['type'] === 'file') {
-				$replacements[] = trim($parameter['path'], '/');
-			} elseif (isset($parameter['name'])) {
-				$replacements[] = $parameter['name'];
-			} else {
-				$replacements[] = $parameter['id'];
-			}
-		}
+    /**
+     * @param string $subject
+     * @param array[] $parameters
+     * @return string
+     */
+    protected function generateParsedSubject($subject, $parameters) {
+        $placeholders = $replacements = [];
+        foreach ($parameters as $placeholder => $parameter) {
+            $placeholders[] = '{' . $placeholder . '}';
+            if ($parameter['type'] === 'file') {
+                $replacements[] = trim($parameter['path'], '/');
+            } elseif (isset($parameter['name'])) {
+                $replacements[] = $parameter['name'];
+            } else {
+                $replacements[] = $parameter['id'];
+            }
+        }
 
-		return str_replace($placeholders, $replacements, $subject);
-	}
+        return str_replace($placeholders, $replacements, $subject);
+    }
 }

lib/private/Template/TemplateFileLocator.php

Indentation +29 added lines, -29 removed lines

@@ -26,37 +26,37 @@
 namespace OC\Template;
 
 class TemplateFileLocator {
-	protected $dirs;
-	private $path;
+    protected $dirs;
+    private $path;
 
-	/**
-	 * @param string[] $dirs
-	 */
-	public function __construct($dirs) {
-		$this->dirs = $dirs;
-	}
+    /**
+     * @param string[] $dirs
+     */
+    public function __construct($dirs) {
+        $this->dirs = $dirs;
+    }
 
-	/**
-	 * @param string $template
-	 * @return string
-	 * @throws \Exception
-	 */
-	public function find($template) {
-		if ($template === '') {
-			throw new \InvalidArgumentException('Empty template name');
-		}
+    /**
+     * @param string $template
+     * @return string
+     * @throws \Exception
+     */
+    public function find($template) {
+        if ($template === '') {
+            throw new \InvalidArgumentException('Empty template name');
+        }
 
-		foreach ($this->dirs as $dir) {
-			$file = $dir.$template.'.php';
-			if (is_file($file)) {
-				$this->path = $dir;
-				return $file;
-			}
-		}
-		throw new \Exception('template file not found: template:'.$template);
-	}
+        foreach ($this->dirs as $dir) {
+            $file = $dir.$template.'.php';
+            if (is_file($file)) {
+                $this->path = $dir;
+                return $file;
+            }
+        }
+        throw new \Exception('template file not found: template:'.$template);
+    }
 
-	public function getPath() {
-		return $this->path;
-	}
+    public function getPath() {
+        return $this->path;
+    }
 }