nextcloud / server

lib/public/isearch.php

Indentation +37 added lines, -37 removed lines

@@ -33,46 +33,46 @@
  */
 interface ISearch {
 
-	/**
-	 * Search all providers for $query
-	 * @param string $query
-	 * @param string[] $inApps optionally limit results to the given apps
-	 * @return array An array of OCP\Search\Result's
-	 * @deprecated 8.0.0 use searchPaged() with page and size
-	 * @since 7.0.0 - parameter $inApps was added in 8.0.0
-	 */
-	public function search($query, array $inApps = array());
+    /**
+     * Search all providers for $query
+     * @param string $query
+     * @param string[] $inApps optionally limit results to the given apps
+     * @return array An array of OCP\Search\Result's
+     * @deprecated 8.0.0 use searchPaged() with page and size
+     * @since 7.0.0 - parameter $inApps was added in 8.0.0
+     */
+    public function search($query, array $inApps = array());
 
-	/**
-	 * Search all providers for $query
-	 * @param string $query
-	 * @param string[] $inApps optionally limit results to the given apps
-	 * @param int $page pages start at page 1
-	 * @param int $size
-	 * @return array An array of OCP\Search\Result's
-	 * @since 8.0.0
-	 */
-	public function searchPaged($query, array $inApps = array(), $page = 1, $size = 30);
+    /**
+     * Search all providers for $query
+     * @param string $query
+     * @param string[] $inApps optionally limit results to the given apps
+     * @param int $page pages start at page 1
+     * @param int $size
+     * @return array An array of OCP\Search\Result's
+     * @since 8.0.0
+     */
+    public function searchPaged($query, array $inApps = array(), $page = 1, $size = 30);
 
-	/**
-	 * Register a new search provider to search with
-	 * @param string $class class name of a OCP\Search\Provider
-	 * @param array $options optional
-	 * @since 7.0.0
-	 */
-	public function registerProvider($class, array $options = array());
+    /**
+     * Register a new search provider to search with
+     * @param string $class class name of a OCP\Search\Provider
+     * @param array $options optional
+     * @since 7.0.0
+     */
+    public function registerProvider($class, array $options = array());
 
-	/**
-	 * Remove one existing search provider
-	 * @param string $provider class name of a OCP\Search\Provider
-	 * @since 7.0.0
-	 */
-	public function removeProvider($provider);
+    /**
+     * Remove one existing search provider
+     * @param string $provider class name of a OCP\Search\Provider
+     * @since 7.0.0
+     */
+    public function removeProvider($provider);
 
-	/**
-	 * Remove all registered search providers
-	 * @since 7.0.0
-	 */
-	public function clearProviders();
+    /**
+     * Remove all registered search providers
+     * @since 7.0.0
+     */
+    public function clearProviders();
 
 }

lib/public/contacts.php

Indentation +141 added lines, -141 removed lines

@@ -33,153 +33,153 @@
 // This means that they should be used by apps instead of the internal ownCloud classes
 namespace OCP {
 
-	/**
-	 * This class provides access to the contacts app. Use this class exclusively if you want to access contacts.
-	 *
-	 * Contacts in general will be expressed as an array of key-value-pairs.
-	 * The keys will match the property names defined in https://tools.ietf.org/html/rfc2426#section-1
-	 *
-	 * Proposed workflow for working with contacts:
-	 *  - search for the contacts
-	 *  - manipulate the results array
-	 *  - createOrUpdate will save the given contacts overwriting the existing data
-	 *
-	 * For updating it is mandatory to keep the id.
-	 * Without an id a new contact will be created.
-	 *
-	 * @deprecated 8.1.0 use methods of \OCP\Contacts\IManager - \OC::$server->getContactsManager();
-	 * @since 5.0.0
-	 */
-	class Contacts {
+    /**
+     * This class provides access to the contacts app. Use this class exclusively if you want to access contacts.
+     *
+     * Contacts in general will be expressed as an array of key-value-pairs.
+     * The keys will match the property names defined in https://tools.ietf.org/html/rfc2426#section-1
+     *
+     * Proposed workflow for working with contacts:
+     *  - search for the contacts
+     *  - manipulate the results array
+     *  - createOrUpdate will save the given contacts overwriting the existing data
+     *
+     * For updating it is mandatory to keep the id.
+     * Without an id a new contact will be created.
+     *
+     * @deprecated 8.1.0 use methods of \OCP\Contacts\IManager - \OC::$server->getContactsManager();
+     * @since 5.0.0
+     */
+    class Contacts {
 
-		/**
-		 * This function is used to search and find contacts within the users address books.
-		 * In case $pattern is empty all contacts will be returned.
-		 *
-		 * Example:
-		 *  Following function shows how to search for contacts for the name and the email address.
-		 *
-		 *		public static function getMatchingRecipient($term) {
-		 *			// The API is not active -> nothing to do
-		 *			if (!\OCP\Contacts::isEnabled()) {
-		 *				return array();
-		 *			}
-		 *
-		 *			$result = \OCP\Contacts::search($term, array('FN', 'EMAIL'));
-		 *			$receivers = array();
-		 *			foreach ($result as $r) {
-		 *				$id = $r['id'];
-		 *				$fn = $r['FN'];
-		 *				$email = $r['EMAIL'];
-		 *				if (!is_array($email)) {
-		 *					$email = array($email);
-		 *				}
-		 *
-		 *				// loop through all email addresses of this contact
-		 *				foreach ($email as $e) {
-		 *				$displayName = $fn . " <$e>";
-		 *				$receivers[] = array(
-		 *					'id'    => $id,
-		 *					'label' => $displayName,
-		 *					'value' => $displayName);
-		 *				}
-		 *			}
-		 *
-		 *			return $receivers;
-		 *		}
-		 *
-		 *
-		 * @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
-		 * @deprecated 8.1.0 use search() of \OCP\Contacts\IManager - \OC::$server->getContactsManager();
-		 * @since 5.0.0
-		 */
-		public static function search($pattern, $searchProperties = array(), $options = array()) {
-			$cm = \OC::$server->getContactsManager();
-			return $cm->search($pattern, $searchProperties, $options);
-		}
+        /**
+         * This function is used to search and find contacts within the users address books.
+         * In case $pattern is empty all contacts will be returned.
+         *
+         * Example:
+         *  Following function shows how to search for contacts for the name and the email address.
+         *
+         *		public static function getMatchingRecipient($term) {
+         *			// The API is not active -> nothing to do
+         *			if (!\OCP\Contacts::isEnabled()) {
+         *				return array();
+         *			}
+         *
+         *			$result = \OCP\Contacts::search($term, array('FN', 'EMAIL'));
+         *			$receivers = array();
+         *			foreach ($result as $r) {
+         *				$id = $r['id'];
+         *				$fn = $r['FN'];
+         *				$email = $r['EMAIL'];
+         *				if (!is_array($email)) {
+         *					$email = array($email);
+         *				}
+         *
+         *				// loop through all email addresses of this contact
+         *				foreach ($email as $e) {
+         *				$displayName = $fn . " <$e>";
+         *				$receivers[] = array(
+         *					'id'    => $id,
+         *					'label' => $displayName,
+         *					'value' => $displayName);
+         *				}
+         *			}
+         *
+         *			return $receivers;
+         *		}
+         *
+         *
+         * @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
+         * @deprecated 8.1.0 use search() of \OCP\Contacts\IManager - \OC::$server->getContactsManager();
+         * @since 5.0.0
+         */
+        public static function search($pattern, $searchProperties = array(), $options = array()) {
+            $cm = \OC::$server->getContactsManager();
+            return $cm->search($pattern, $searchProperties, $options);
+        }
 
-		/**
-		 * 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 $address_book_key
-		 * @return bool successful or not
-		 * @deprecated 8.1.0 use delete() of \OCP\Contacts\IManager - \OC::$server->getContactsManager();
-		 * @since 5.0.0
-		 */
-		public static function delete($id, $address_book_key) {
-			$cm = \OC::$server->getContactsManager();
-			return $cm->delete($id, $address_book_key);
-		}
+        /**
+         * 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 $address_book_key
+         * @return bool successful or not
+         * @deprecated 8.1.0 use delete() of \OCP\Contacts\IManager - \OC::$server->getContactsManager();
+         * @since 5.0.0
+         */
+        public static function delete($id, $address_book_key) {
+            $cm = \OC::$server->getContactsManager();
+            return $cm->delete($id, $address_book_key);
+        }
 
-		/**
-		 * 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 $address_book_key identifier of the address book in which the contact shall be created or updated
-		 * @return array an array representing the contact just created or updated
-		 * @deprecated 8.1.0 use createOrUpdate() of \OCP\Contacts\IManager - \OC::$server->getContactsManager();
-		 * @since 5.0.0
-		 */
-		public static function createOrUpdate($properties, $address_book_key) {
-			$cm = \OC::$server->getContactsManager();
-			return $cm->createOrUpdate($properties, $address_book_key);
-		}
+        /**
+         * 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 $address_book_key identifier of the address book in which the contact shall be created or updated
+         * @return array an array representing the contact just created or updated
+         * @deprecated 8.1.0 use createOrUpdate() of \OCP\Contacts\IManager - \OC::$server->getContactsManager();
+         * @since 5.0.0
+         */
+        public static function createOrUpdate($properties, $address_book_key) {
+            $cm = \OC::$server->getContactsManager();
+            return $cm->createOrUpdate($properties, $address_book_key);
+        }
 
-		/**
-		 * Check if contacts are available (e.g. contacts app enabled)
-		 *
-		 * @return bool true if enabled, false if not
-		 * @deprecated 8.1.0 use isEnabled() of \OCP\Contacts\IManager - \OC::$server->getContactsManager();
-		 * @since 5.0.0
-		 */
-		public static function isEnabled() {
-			$cm = \OC::$server->getContactsManager();
-			return $cm->isEnabled();
-		}
+        /**
+         * Check if contacts are available (e.g. contacts app enabled)
+         *
+         * @return bool true if enabled, false if not
+         * @deprecated 8.1.0 use isEnabled() of \OCP\Contacts\IManager - \OC::$server->getContactsManager();
+         * @since 5.0.0
+         */
+        public static function isEnabled() {
+            $cm = \OC::$server->getContactsManager();
+            return $cm->isEnabled();
+        }
 
-		/**
-		 * @param \OCP\IAddressBook $address_book
-		 * @deprecated 8.1.0 use registerAddressBook() of \OCP\Contacts\IManager - \OC::$server->getContactsManager();
-		 * @since 5.0.0
-		 */
-		public static function registerAddressBook(\OCP\IAddressBook $address_book) {
-			$cm = \OC::$server->getContactsManager();
-			$cm->registerAddressBook($address_book);
-		}
+        /**
+         * @param \OCP\IAddressBook $address_book
+         * @deprecated 8.1.0 use registerAddressBook() of \OCP\Contacts\IManager - \OC::$server->getContactsManager();
+         * @since 5.0.0
+         */
+        public static function registerAddressBook(\OCP\IAddressBook $address_book) {
+            $cm = \OC::$server->getContactsManager();
+            $cm->registerAddressBook($address_book);
+        }
 
-		/**
-		 * @param \OCP\IAddressBook $address_book
-		 * @deprecated 8.1.0 use unregisterAddressBook() of \OCP\Contacts\IManager - \OC::$server->getContactsManager();
-		 * @since 5.0.0
-		 */
-		public static function unregisterAddressBook(\OCP\IAddressBook $address_book) {
-			$cm = \OC::$server->getContactsManager();
-			$cm->unregisterAddressBook($address_book);
-		}
+        /**
+         * @param \OCP\IAddressBook $address_book
+         * @deprecated 8.1.0 use unregisterAddressBook() of \OCP\Contacts\IManager - \OC::$server->getContactsManager();
+         * @since 5.0.0
+         */
+        public static function unregisterAddressBook(\OCP\IAddressBook $address_book) {
+            $cm = \OC::$server->getContactsManager();
+            $cm->unregisterAddressBook($address_book);
+        }
 
-		/**
-		 * @return array
-		 * @deprecated 8.1.0 use getAddressBooks() of \OCP\Contacts\IManager - \OC::$server->getContactsManager();
-		 * @since 5.0.0
-		 */
-		public static function getAddressBooks() {
-			$cm = \OC::$server->getContactsManager();
-			return $cm->getAddressBooks();
-		}
+        /**
+         * @return array
+         * @deprecated 8.1.0 use getAddressBooks() of \OCP\Contacts\IManager - \OC::$server->getContactsManager();
+         * @since 5.0.0
+         */
+        public static function getAddressBooks() {
+            $cm = \OC::$server->getContactsManager();
+            return $cm->getAddressBooks();
+        }
 
-		/**
-		 * removes all registered address book instances
-		 * @deprecated 8.1.0 use clear() of \OCP\Contacts\IManager - \OC::$server->getContactsManager();
-		 * @since 5.0.0
-		 */
-		public static function clear() {
-			$cm = \OC::$server->getContactsManager();
-			$cm->clear();
-		}
-	}
+        /**
+         * removes all registered address book instances
+         * @deprecated 8.1.0 use clear() of \OCP\Contacts\IManager - \OC::$server->getContactsManager();
+         * @since 5.0.0
+         */
+        public static function clear() {
+            $cm = \OC::$server->getContactsManager();
+            $cm->clear();
+        }
+    }
 }

lib/public/preview/iprovider.php

Indentation +25 added lines, -25 removed lines

@@ -29,31 +29,31 @@
  * @since 8.1.0
  */
 interface IProvider {
-	/**
-	 * @return string Regex with the mimetypes that are supported by this provider
-	 * @since 8.1.0
-	 */
-	public function getMimeType();
+    /**
+     * @return string Regex with the mimetypes that are supported by this provider
+     * @since 8.1.0
+     */
+    public function getMimeType();
 
-	/**
-	 * Check if a preview can be generated for $path
-	 *
-	 * @param \OCP\Files\FileInfo $file
-	 * @return bool
-	 * @since 8.1.0
-	 */
-	public function isAvailable(\OCP\Files\FileInfo $file);
+    /**
+     * Check if a preview can be generated for $path
+     *
+     * @param \OCP\Files\FileInfo $file
+     * @return bool
+     * @since 8.1.0
+     */
+    public function isAvailable(\OCP\Files\FileInfo $file);
 
-	/**
-	 * get thumbnail for file at path $path
-	 *
-	 * @param string $path Path of file
-	 * @param int $maxX The maximum X size of the thumbnail. It can be smaller depending on the shape of the image
-	 * @param int $maxY The maximum Y size of the thumbnail. It can be smaller depending on the shape of the image
-	 * @param bool $scalingup Disable/Enable upscaling of previews
-	 * @param \OC\Files\View $fileview fileview object of user folder
-	 * @return bool|\OCP\IImage false if no preview was generated
-	 * @since 8.1.0
-	 */
-	public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview);
+    /**
+     * get thumbnail for file at path $path
+     *
+     * @param string $path Path of file
+     * @param int $maxX The maximum X size of the thumbnail. It can be smaller depending on the shape of the image
+     * @param int $maxY The maximum Y size of the thumbnail. It can be smaller depending on the shape of the image
+     * @param bool $scalingup Disable/Enable upscaling of previews
+     * @param \OC\Files\View $fileview fileview object of user folder
+     * @return bool|\OCP\IImage false if no preview was generated
+     * @since 8.1.0
+     */
+    public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview);
 }

lib/public/db.php

Indentation +90 added lines, -90 removed lines

@@ -45,102 +45,102 @@
  * @since 4.5.0
  */
 class DB {
-	/**
-	 * Prepare a SQL query
-	 * @param string $query Query string
-	 * @param int $limit Limit of the SQL statement
-	 * @param int $offset Offset of the SQL statement
-	 * @return \OC_DB_StatementWrapper prepared SQL query
-	 *
-	 * SQL query via Doctrine prepare(), needs to be execute()'d!
-	 * @deprecated 8.1.0 use prepare() of \OCP\IDBConnection - \OC::$server->getDatabaseConnection()
-	 * @since 4.5.0
-	 */
-	static public function prepare( $query, $limit=null, $offset=null ) {
-		return(\OC_DB::prepare($query, $limit, $offset));
-	}
+    /**
+     * Prepare a SQL query
+     * @param string $query Query string
+     * @param int $limit Limit of the SQL statement
+     * @param int $offset Offset of the SQL statement
+     * @return \OC_DB_StatementWrapper prepared SQL query
+     *
+     * SQL query via Doctrine prepare(), needs to be execute()'d!
+     * @deprecated 8.1.0 use prepare() of \OCP\IDBConnection - \OC::$server->getDatabaseConnection()
+     * @since 4.5.0
+     */
+    static public function prepare( $query, $limit=null, $offset=null ) {
+        return(\OC_DB::prepare($query, $limit, $offset));
+    }
 
-	/**
-	 * Insert a row if the matching row does not exists.
-	 *
-	 * @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
-	 * @return int number of inserted rows
-	 * @throws \Doctrine\DBAL\DBALException
-	 * @deprecated 8.1.0 use insertIfNotExist() of \OCP\IDBConnection - \OC::$server->getDatabaseConnection()
-	 * @since 5.0.0 - parameter $compare was added in 8.1.0
-	 *
-	 */
-	public static function insertIfNotExist($table, $input, array $compare = null) {
-		return \OC::$server->getDatabaseConnection()->insertIfNotExist($table, $input, $compare);
-	}
+    /**
+     * Insert a row if the matching row does not exists.
+     *
+     * @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
+     * @return int number of inserted rows
+     * @throws \Doctrine\DBAL\DBALException
+     * @deprecated 8.1.0 use insertIfNotExist() of \OCP\IDBConnection - \OC::$server->getDatabaseConnection()
+     * @since 5.0.0 - parameter $compare was added in 8.1.0
+     *
+     */
+    public static function insertIfNotExist($table, $input, array $compare = null) {
+        return \OC::$server->getDatabaseConnection()->insertIfNotExist($table, $input, $compare);
+    }
 
-	/**
-	 * Gets last value of autoincrement
-	 * @param string $table The optional table name (will replace *PREFIX*) and add sequence suffix
-	 * @return string
-	 *
-	 * \Doctrine\DBAL\Connection lastInsertID()
-	 *
-	 * Call this method right after the insert command or other functions may
-	 * cause trouble!
-	 * @deprecated 8.1.0 use lastInsertId() of \OCP\IDBConnection - \OC::$server->getDatabaseConnection()
-	 * @since 4.5.0
-	 */
-	public static function insertid($table=null) {
-		return \OC::$server->getDatabaseConnection()->lastInsertId($table);
-	}
+    /**
+     * Gets last value of autoincrement
+     * @param string $table The optional table name (will replace *PREFIX*) and add sequence suffix
+     * @return string
+     *
+     * \Doctrine\DBAL\Connection lastInsertID()
+     *
+     * Call this method right after the insert command or other functions may
+     * cause trouble!
+     * @deprecated 8.1.0 use lastInsertId() of \OCP\IDBConnection - \OC::$server->getDatabaseConnection()
+     * @since 4.5.0
+     */
+    public static function insertid($table=null) {
+        return \OC::$server->getDatabaseConnection()->lastInsertId($table);
+    }
 
-	/**
-	 * Start a transaction
-	 * @deprecated 8.1.0 use beginTransaction() of \OCP\IDBConnection - \OC::$server->getDatabaseConnection()
-	 * @since 4.5.0
-	 */
-	public static function beginTransaction() {
-		\OC::$server->getDatabaseConnection()->beginTransaction();
-	}
+    /**
+     * Start a transaction
+     * @deprecated 8.1.0 use beginTransaction() of \OCP\IDBConnection - \OC::$server->getDatabaseConnection()
+     * @since 4.5.0
+     */
+    public static function beginTransaction() {
+        \OC::$server->getDatabaseConnection()->beginTransaction();
+    }
 
-	/**
-	 * Commit the database changes done during a transaction that is in progress
-	 * @deprecated 8.1.0 use commit() of \OCP\IDBConnection - \OC::$server->getDatabaseConnection()
-	 * @since 4.5.0
-	 */
-	public static function commit() {
-		\OC::$server->getDatabaseConnection()->commit();
-	}
+    /**
+     * Commit the database changes done during a transaction that is in progress
+     * @deprecated 8.1.0 use commit() of \OCP\IDBConnection - \OC::$server->getDatabaseConnection()
+     * @since 4.5.0
+     */
+    public static function commit() {
+        \OC::$server->getDatabaseConnection()->commit();
+    }
 
-	/**
-	 * Rollback the database changes done during a transaction that is in progress
-	 * @deprecated 8.1.0 use rollback() of \OCP\IDBConnection - \OC::$server->getDatabaseConnection()
-	 * @since 8.0.0
-	 */
-	public static function rollback() {
-		\OC::$server->getDatabaseConnection()->rollback();
-	}
+    /**
+     * Rollback the database changes done during a transaction that is in progress
+     * @deprecated 8.1.0 use rollback() of \OCP\IDBConnection - \OC::$server->getDatabaseConnection()
+     * @since 8.0.0
+     */
+    public static function rollback() {
+        \OC::$server->getDatabaseConnection()->rollback();
+    }
 
-	/**
-	 * Check if a result is an error, works with Doctrine
-	 * @param mixed $result
-	 * @return bool
-	 * @deprecated 8.1.0 Doctrine returns false on error (and throws an exception)
-	 * @since 4.5.0
-	 */
-	public static function isError($result) {
-		// Doctrine returns false on error (and throws an exception)
-		return $result === false;
-	}
+    /**
+     * Check if a result is an error, works with Doctrine
+     * @param mixed $result
+     * @return bool
+     * @deprecated 8.1.0 Doctrine returns false on error (and throws an exception)
+     * @since 4.5.0
+     */
+    public static function isError($result) {
+        // Doctrine returns false on error (and throws an exception)
+        return $result === false;
+    }
 
-	/**
-	 * returns the error code and message as a string for logging
-	 * works with DoctrineException
-	 * @return string
-	 * @deprecated 8.1.0 use getError() of \OCP\IDBConnection - \OC::$server->getDatabaseConnection()
-	 * @since 6.0.0
-	 */
-	public static function getErrorMessage() {
-		return \OC::$server->getDatabaseConnection()->getError();
-	}
+    /**
+     * returns the error code and message as a string for logging
+     * works with DoctrineException
+     * @return string
+     * @deprecated 8.1.0 use getError() of \OCP\IDBConnection - \OC::$server->getDatabaseConnection()
+     * @since 6.0.0
+     */
+    public static function getErrorMessage() {
+        return \OC::$server->getDatabaseConnection()->getError();
+    }
 
 }

Spacing +2 added lines, -2 removed lines

@@ -56,7 +56,7 @@ 
 	 * @deprecated 8.1.0 use prepare() of \OCP\IDBConnection - \OC::$server->getDatabaseConnection()
 	 * @since 4.5.0
 	 */
-	static public function prepare( $query, $limit=null, $offset=null ) {
+	static public function prepare($query, $limit = null, $offset = null) {
 		return(\OC_DB::prepare($query, $limit, $offset));
 	}
 
@@ -89,7 +89,7 @@ 
 	 * @deprecated 8.1.0 use lastInsertId() of \OCP\IDBConnection - \OC::$server->getDatabaseConnection()
 	 * @since 4.5.0
 	 */
-	public static function insertid($table=null) {
+	public static function insertid($table = null) {
 		return \OC::$server->getDatabaseConnection()->lastInsertId($table);
 	}
 

lib/public/backgroundjob.php

Indentation +123 added lines, -123 removed lines

@@ -50,136 +50,136 @@
  * @since 4.5.0
  */
 class BackgroundJob {
-	/**
-	 * get the execution type of background jobs
-	 *
-	 * @return string
-	 *
-	 * This method returns the type how background jobs are executed. If the user
-	 * did not select something, the type is ajax.
-	 * @since 5.0.0
-	 */
-	public static function getExecutionType() {
-		return \OC::$server->getConfig()->getAppValue('core', 'backgroundjobs_mode', 'ajax');
-	}
+    /**
+     * get the execution type of background jobs
+     *
+     * @return string
+     *
+     * This method returns the type how background jobs are executed. If the user
+     * did not select something, the type is ajax.
+     * @since 5.0.0
+     */
+    public static function getExecutionType() {
+        return \OC::$server->getConfig()->getAppValue('core', 'backgroundjobs_mode', 'ajax');
+    }
 
-	/**
-	 * sets the background jobs execution type
-	 *
-	 * @param string $type execution type
-	 * @return false|null
-	 *
-	 * This method sets the execution type of the background jobs. Possible types
-	 * are "none", "ajax", "webcron", "cron"
-	 * @since 5.0.0
-	 */
-	public static function setExecutionType($type) {
-		if( !in_array( $type, array('none', 'ajax', 'webcron', 'cron'))) {
-			return false;
-		}
-		\OC::$server->getConfig()->setAppValue('core', 'backgroundjobs_mode', $type);
-	}
+    /**
+     * sets the background jobs execution type
+     *
+     * @param string $type execution type
+     * @return false|null
+     *
+     * This method sets the execution type of the background jobs. Possible types
+     * are "none", "ajax", "webcron", "cron"
+     * @since 5.0.0
+     */
+    public static function setExecutionType($type) {
+        if( !in_array( $type, array('none', 'ajax', 'webcron', 'cron'))) {
+            return false;
+        }
+        \OC::$server->getConfig()->setAppValue('core', 'backgroundjobs_mode', $type);
+    }
 
-	/**
-	 * @param string $job
-	 * @param mixed $argument
-	 * @deprecated 8.1.0 Use \OC::$server->getJobList()->add() instead
-	 * @since 6.0.0
-	 */
-	public static function registerJob($job, $argument = null) {
-		$jobList = \OC::$server->getJobList();
-		$jobList->add($job, $argument);
-	}
+    /**
+     * @param string $job
+     * @param mixed $argument
+     * @deprecated 8.1.0 Use \OC::$server->getJobList()->add() instead
+     * @since 6.0.0
+     */
+    public static function registerJob($job, $argument = null) {
+        $jobList = \OC::$server->getJobList();
+        $jobList->add($job, $argument);
+    }
 
-	/**
-	 * @deprecated 6.0.0
-	 * creates a regular task
-	 * @param string $klass class name
-	 * @param string $method method name
-	 * @return boolean|null
-	 * @since 4.5.0
-	 */
-	public static function addRegularTask($klass, $method) {
-		if (!\OC::needUpgrade()) {
-			self::registerJob('OC\BackgroundJob\Legacy\RegularJob', array($klass, $method));
-			return true;
-		}
-	}
+    /**
+     * @deprecated 6.0.0
+     * creates a regular task
+     * @param string $klass class name
+     * @param string $method method name
+     * @return boolean|null
+     * @since 4.5.0
+     */
+    public static function addRegularTask($klass, $method) {
+        if (!\OC::needUpgrade()) {
+            self::registerJob('OC\BackgroundJob\Legacy\RegularJob', array($klass, $method));
+            return true;
+        }
+    }
 
-	/**
-	 * @deprecated 6.0.0
-	 * gets all regular tasks
-	 * @return array
-	 *
-	 * key is string "$klass-$method", value is array( $klass, $method )
-	 * @since 4.5.0
-	 */
-	static public function allRegularTasks() {
-		return [];
-	}
+    /**
+     * @deprecated 6.0.0
+     * gets all regular tasks
+     * @return array
+     *
+     * key is string "$klass-$method", value is array( $klass, $method )
+     * @since 4.5.0
+     */
+    static public function allRegularTasks() {
+        return [];
+    }
 
-	/**
-	 * @deprecated 6.0.0
-	 * Gets one queued task
-	 * @param int $id ID of the task
-	 * @return BackgroundJob\IJob|null
-	 * @since 4.5.0
-	 */
-	public static function findQueuedTask($id) {
-		$jobList = \OC::$server->getJobList();
-		return $jobList->getById($id);
-	}
+    /**
+     * @deprecated 6.0.0
+     * Gets one queued task
+     * @param int $id ID of the task
+     * @return BackgroundJob\IJob|null
+     * @since 4.5.0
+     */
+    public static function findQueuedTask($id) {
+        $jobList = \OC::$server->getJobList();
+        return $jobList->getById($id);
+    }
 
-	/**
-	 * @deprecated 6.0.0
-	 * Gets all queued tasks
-	 * @return array an array of associative arrays
-	 * @since 4.5.0
-	 */
-	public static function allQueuedTasks() {
-		return [];
-	}
+    /**
+     * @deprecated 6.0.0
+     * Gets all queued tasks
+     * @return array an array of associative arrays
+     * @since 4.5.0
+     */
+    public static function allQueuedTasks() {
+        return [];
+    }
 
-	/**
-	 * @deprecated 6.0.0
-	 * Gets all queued tasks of a specific app
-	 * @param string $app app name
-	 * @return array an array of associative arrays
-	 * @since 4.5.0
-	 */
-	public static function queuedTaskWhereAppIs($app) {
-		return [];
-	}
+    /**
+     * @deprecated 6.0.0
+     * Gets all queued tasks of a specific app
+     * @param string $app app name
+     * @return array an array of associative arrays
+     * @since 4.5.0
+     */
+    public static function queuedTaskWhereAppIs($app) {
+        return [];
+    }
 
-	/**
-	 * @deprecated 6.0.0
-	 * queues a task
-	 * @param string $app app name
-	 * @param string $class class name
-	 * @param string $method method name
-	 * @param string $parameters all useful data as text
-	 * @return boolean id of task
-	 * @since 4.5.0
-	 */
-	public static function addQueuedTask($app, $class, $method, $parameters) {
-		self::registerJob('OC\BackgroundJob\Legacy\QueuedJob', array('app' => $app, 'klass' => $class, 'method' => $method, 'parameters' => $parameters));
-		return true;
-	}
+    /**
+     * @deprecated 6.0.0
+     * queues a task
+     * @param string $app app name
+     * @param string $class class name
+     * @param string $method method name
+     * @param string $parameters all useful data as text
+     * @return boolean id of task
+     * @since 4.5.0
+     */
+    public static function addQueuedTask($app, $class, $method, $parameters) {
+        self::registerJob('OC\BackgroundJob\Legacy\QueuedJob', array('app' => $app, 'klass' => $class, 'method' => $method, 'parameters' => $parameters));
+        return true;
+    }
 
-	/**
-	 * @deprecated 6.0.0
-	 * deletes a queued task
-	 * @param int $id id of task
-	 * @return boolean|null
-	 *
-	 * Deletes a report
-	 * @since 4.5.0
-	 */
-	public static function deleteQueuedTask($id) {
-		$jobList = \OC::$server->getJobList();
-		$job = $jobList->getById($id);
-		if ($job) {
-			$jobList->remove($job);
-		}
-	}
+    /**
+     * @deprecated 6.0.0
+     * deletes a queued task
+     * @param int $id id of task
+     * @return boolean|null
+     *
+     * Deletes a report
+     * @since 4.5.0
+     */
+    public static function deleteQueuedTask($id) {
+        $jobList = \OC::$server->getJobList();
+        $job = $jobList->getById($id);
+        if ($job) {
+            $jobList->remove($job);
+        }
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -74,7 +74,7 @@
 	 * @since 5.0.0
 	 */
 	public static function setExecutionType($type) {
-		if( !in_array( $type, array('none', 'ajax', 'webcron', 'cron'))) {
+		if (!in_array($type, array('none', 'ajax', 'webcron', 'cron'))) {
 			return false;
 		}
 		\OC::$server->getConfig()->setAppValue('core', 'backgroundjobs_mode', $type);

lib/public/defaults.php

Indentation +132 added lines, -132 removed lines

@@ -40,136 +40,136 @@
  */
 class Defaults {
 
-	/**
-	 * \OC_Defaults instance to retrieve the defaults
-	 * @return string
-	 * @since 6.0.0
-	 */
-	private $defaults;
-
-	/**
-	 * creates a \OC_Defaults instance which is used in all methods to retrieve the
-	 * actual defaults
-	 * @since 6.0.0
-	 */
-	function __construct() {
-		$this->defaults = \OC::$server->getThemingDefaults();
-	}
-
-	/**
-	 * get base URL for the organisation behind your ownCloud instance
-	 * @return string
-	 * @since 6.0.0
-	 */
-	public function getBaseUrl() {
-		return $this->defaults->getBaseUrl();
-	}
-
-	/**
-	 * link to the desktop sync client
-	 * @return string
-	 * @since 6.0.0
-	 */
-	public function getSyncClientUrl() {
-		return $this->defaults->getSyncClientUrl();
-	}
-
-	/**
-	 * link to the iOS client
-	 * @return string
-	 * @since 8.0.0
-	 */
-	public function getiOSClientUrl() {
-		return $this->defaults->getiOSClientUrl();
-	}
-
-	/**
-	 * link to the Android client
-	 * @return string
-	 * @since 8.0.0
-	 */
-	public function getAndroidClientUrl() {
-		return $this->defaults->getAndroidClientUrl();
-	}
-
-	/**
-	 * base URL to the documentation of your ownCloud instance
-	 * @return string
-	 * @since 6.0.0
-	 */
-	public function getDocBaseUrl() {
-		return $this->defaults->getDocBaseUrl();
-	}
-
-	/**
-	 * name of your ownCloud instance
-	 * @return string
-	 * @since 6.0.0
-	 */
-	public function getName() {
-		return $this->defaults->getName();
-	}
-
-	/**
-	 * name of your ownCloud instance containing HTML styles
-	 * @return string
-	 * @since 8.0.0
-	 */
-	public function getHTMLName() {
-		return $this->defaults->getHTMLName();
-	}
-
-	/**
-	 * Entity behind your onwCloud instance
-	 * @return string
-	 * @since 6.0.0
-	 */
-	public function getEntity() {
-		return $this->defaults->getEntity();
-	}
-
-	/**
-	 * ownCloud slogan
-	 * @return string
-	 * @since 6.0.0
-	 */
-	public function getSlogan() {
-		return $this->defaults->getSlogan();
-	}
-
-	/**
-	 * logo claim
-	 * @return string
-	 * @since 6.0.0
-	 */
-	public function getLogoClaim() {
-		return $this->defaults->getLogoClaim();
-	}
-
-	/**
-	 * footer, short version
-	 * @return string
-	 * @since 6.0.0
-	 */
-	public function getShortFooter() {
-		return $this->defaults->getShortFooter();
-	}
-
-	/**
-	 * footer, long version
-	 * @return string
-	 * @since 6.0.0
-	 */
-	public function getLongFooter() {
-		return $this->defaults->getLongFooter();
-	}
-
-	/**
-	 * Returns the AppId for the App Store for the iOS Client
-	 * @return string AppId
-	 * @since 8.0.0
-	 */
-	public function getiTunesAppId() {
-		return $this->defaults->getiTunesAppId();
-	}
+    /**
+     * \OC_Defaults instance to retrieve the defaults
+     * @return string
+     * @since 6.0.0
+     */
+    private $defaults;
+
+    /**
+     * creates a \OC_Defaults instance which is used in all methods to retrieve the
+     * actual defaults
+     * @since 6.0.0
+     */
+    function __construct() {
+        $this->defaults = \OC::$server->getThemingDefaults();
+    }
+
+    /**
+     * get base URL for the organisation behind your ownCloud instance
+     * @return string
+     * @since 6.0.0
+     */
+    public function getBaseUrl() {
+        return $this->defaults->getBaseUrl();
+    }
+
+    /**
+     * link to the desktop sync client
+     * @return string
+     * @since 6.0.0
+     */
+    public function getSyncClientUrl() {
+        return $this->defaults->getSyncClientUrl();
+    }
+
+    /**
+     * link to the iOS client
+     * @return string
+     * @since 8.0.0
+     */
+    public function getiOSClientUrl() {
+        return $this->defaults->getiOSClientUrl();
+    }
+
+    /**
+     * link to the Android client
+     * @return string
+     * @since 8.0.0
+     */
+    public function getAndroidClientUrl() {
+        return $this->defaults->getAndroidClientUrl();
+    }
+
+    /**
+     * base URL to the documentation of your ownCloud instance
+     * @return string
+     * @since 6.0.0
+     */
+    public function getDocBaseUrl() {
+        return $this->defaults->getDocBaseUrl();
+    }
+
+    /**
+     * name of your ownCloud instance
+     * @return string
+     * @since 6.0.0
+     */
+    public function getName() {
+        return $this->defaults->getName();
+    }
+
+    /**
+     * name of your ownCloud instance containing HTML styles
+     * @return string
+     * @since 8.0.0
+     */
+    public function getHTMLName() {
+        return $this->defaults->getHTMLName();
+    }
+
+    /**
+     * Entity behind your onwCloud instance
+     * @return string
+     * @since 6.0.0
+     */
+    public function getEntity() {
+        return $this->defaults->getEntity();
+    }
+
+    /**
+     * ownCloud slogan
+     * @return string
+     * @since 6.0.0
+     */
+    public function getSlogan() {
+        return $this->defaults->getSlogan();
+    }
+
+    /**
+     * logo claim
+     * @return string
+     * @since 6.0.0
+     */
+    public function getLogoClaim() {
+        return $this->defaults->getLogoClaim();
+    }
+
+    /**
+     * footer, short version
+     * @return string
+     * @since 6.0.0
+     */
+    public function getShortFooter() {
+        return $this->defaults->getShortFooter();
+    }
+
+    /**
+     * footer, long version
+     * @return string
+     * @since 6.0.0
+     */
+    public function getLongFooter() {
+        return $this->defaults->getLongFooter();
+    }
+
+    /**
+     * Returns the AppId for the App Store for the iOS Client
+     * @return string AppId
+     * @since 8.0.0
+     */
+    public function getiTunesAppId() {
+        return $this->defaults->getiTunesAppId();
+    }
 }

lib/public/idb.php

Indentation +2 added lines, -2 removed lines

@@ -37,7 +37,7 @@ 
      * @param int $limit the maximum number of rows
      * @param int $offset from which row we want to start
      * @return \OC_DB_StatementWrapper prepared SQL query
-	 * @since 7.0.0
+     * @since 7.0.0
      */
     public function prepareQuery($sql, $limit=null, $offset=null);
 
@@ -46,7 +46,7 @@ 
      * Used to get the id of the just inserted element
      * @param string $tableName the name of the table where we inserted the item
      * @return int the id of the inserted element
-	 * @since 7.0.0
+     * @since 7.0.0
      */
     public function getInsertId($tableName);
 

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
      * @return \OC_DB_StatementWrapper prepared SQL query
 	 * @since 7.0.0
      */
-    public function prepareQuery($sql, $limit=null, $offset=null);
+    public function prepareQuery($sql, $limit = null, $offset = null);
 
 
     /**

lib/public/iservercontainer.php

Indentation +464 added lines, -464 removed lines

@@ -56,468 +56,468 @@
  */
 interface IServerContainer {
 
-	/**
-	 * The contacts manager will act as a broker between consumers for contacts information and
-	 * providers which actual deliver the contact information.
-	 *
-	 * @return \OCP\Contacts\IManager
-	 * @since 6.0.0
-	 */
-	public function getContactsManager();
-
-	/**
-	 * The current request object holding all information about the request currently being processed
-	 * is returned from this method.
-	 * In case the current execution was not initiated by a web request null is returned
-	 *
-	 * @return \OCP\IRequest
-	 * @since 6.0.0
-	 */
-	public function getRequest();
-
-	/**
-	 * Returns the preview manager which can create preview images for a given file
-	 *
-	 * @return \OCP\IPreview
-	 * @since 6.0.0
-	 */
-	public function getPreviewManager();
-
-	/**
-	 * Returns the tag manager which can get and set tags for different object types
-	 *
-	 * @see \OCP\ITagManager::load()
-	 * @return \OCP\ITagManager
-	 * @since 6.0.0
-	 */
-	public function getTagManager();
-
-	/**
-	 * Returns the root folder of ownCloud's data directory
-	 *
-	 * @return \OCP\Files\IRootFolder
-	 * @since 6.0.0 - between 6.0.0 and 8.0.0 this returned \OCP\Files\Folder
-	 */
-	public function getRootFolder();
-
-	/**
-	 * Returns a view to ownCloud's files folder
-	 *
-	 * @param string $userId user ID
-	 * @return \OCP\Files\Folder
-	 * @since 6.0.0 - parameter $userId was added in 8.0.0
-	 * @see getUserFolder in \OCP\Files\IRootFolder
-	 */
-	public function getUserFolder($userId = null);
-
-	/**
-	 * Returns an app-specific view in ownClouds data directory
-	 *
-	 * @return \OCP\Files\Folder
-	 * @since 6.0.0
-	 */
-	public function getAppFolder();
-
-	/**
-	 * Returns a user manager
-	 *
-	 * @return \OCP\IUserManager
-	 * @since 8.0.0
-	 */
-	public function getUserManager();
-
-	/**
-	 * Returns a group manager
-	 *
-	 * @return \OCP\IGroupManager
-	 * @since 8.0.0
-	 */
-	public function getGroupManager();
-
-	/**
-	 * Returns the user session
-	 *
-	 * @return \OCP\IUserSession
-	 * @since 6.0.0
-	 */
-	public function getUserSession();
-
-	/**
-	 * Returns the navigation manager
-	 *
-	 * @return \OCP\INavigationManager
-	 * @since 6.0.0
-	 */
-	public function getNavigationManager();
-
-	/**
-	 * Returns the config manager
-	 *
-	 * @return \OCP\IConfig
-	 * @since 6.0.0
-	 */
-	public function getConfig();
-
-	/**
-	 * Returns a Crypto instance
-	 *
-	 * @return \OCP\Security\ICrypto
-	 * @since 8.0.0
-	 */
-	public function getCrypto();
-
-	/**
-	 * Returns a Hasher instance
-	 *
-	 * @return \OCP\Security\IHasher
-	 * @since 8.0.0
-	 */
-	public function getHasher();
-
-	/**
-	 * Returns a SecureRandom instance
-	 *
-	 * @return \OCP\Security\ISecureRandom
-	 * @since 8.1.0
-	 */
-	public function getSecureRandom();
-
-	/**
-	 * Returns a CredentialsManager instance
-	 *
-	 * @return \OCP\Security\ICredentialsManager
-	 * @since 9.0.0
-	 */
-	public function getCredentialsManager();
-
-	/**
-	 * Returns an instance of the db facade
-	 * @deprecated 8.1.0 use getDatabaseConnection, will be removed in ownCloud 10
-	 * @return \OCP\IDb
-	 * @since 7.0.0
-	 */
-	public function getDb();
-
-	/**
-	 * Returns the app config manager
-	 *
-	 * @return \OCP\IAppConfig
-	 * @since 7.0.0
-	 */
-	public function getAppConfig();
-
-	/**
-	 * @return \OCP\L10N\IFactory
-	 * @since 8.2.0
-	 */
-	public function getL10NFactory();
-
-	/**
-	 * get an L10N instance
-	 * @param string $app appid
-	 * @param string $lang
-	 * @return \OCP\IL10N
-	 * @since 6.0.0 - parameter $lang was added in 8.0.0
-	 */
-	public function getL10N($app, $lang = null);
-
-	/**
-	 * @return \OC\Encryption\Manager
-	 * @since 8.1.0
-	 */
-	public function getEncryptionManager();
-
-	/**
-	 * @return \OC\Encryption\File
-	 * @since 8.1.0
-	 */
-	public function getEncryptionFilesHelper();
-
-	/**
-	 * @return \OCP\Encryption\Keys\IStorage
-	 * @since 8.1.0
-	 */
-	public function getEncryptionKeyStorage();
-
-	/**
-	 * Returns the URL generator
-	 *
-	 * @return \OCP\IURLGenerator
-	 * @since 6.0.0
-	 */
-	public function getURLGenerator();
-
-	/**
-	 * Returns the Helper
-	 *
-	 * @return \OCP\IHelper
-	 * @since 6.0.0
-	 */
-	public function getHelper();
-
-	/**
-	 * Returns an ICache instance
-	 *
-	 * @return \OCP\ICache
-	 * @since 6.0.0
-	 */
-	public function getCache();
-
-	/**
-	 * Returns an \OCP\CacheFactory instance
-	 *
-	 * @return \OCP\ICacheFactory
-	 * @since 7.0.0
-	 */
-	public function getMemCacheFactory();
-
-	/**
-	 * Returns the current session
-	 *
-	 * @return \OCP\ISession
-	 * @since 6.0.0
-	 */
-	public function getSession();
-
-	/**
-	 * Returns the activity manager
-	 *
-	 * @return \OCP\Activity\IManager
-	 * @since 6.0.0
-	 */
-	public function getActivityManager();
-
-	/**
-	 * Returns the current session
-	 *
-	 * @return \OCP\IDBConnection
-	 * @since 6.0.0
-	 */
-	public function getDatabaseConnection();
-
-	/**
-	 * Returns an avatar manager, used for avatar functionality
-	 *
-	 * @return \OCP\IAvatarManager
-	 * @since 6.0.0
-	 */
-	public function getAvatarManager();
-
-	/**
-	 * Returns an job list for controlling background jobs
-	 *
-	 * @return \OCP\BackgroundJob\IJobList
-	 * @since 7.0.0
-	 */
-	public function getJobList();
-
-	/**
-	 * Returns a logger instance
-	 *
-	 * @return \OCP\ILogger
-	 * @since 8.0.0
-	 */
-	public function getLogger();
-
-	/**
-	 * Returns a router for generating and matching urls
-	 *
-	 * @return \OCP\Route\IRouter
-	 * @since 7.0.0
-	 */
-	public function getRouter();
-
-	/**
-	 * Returns a search instance
-	 *
-	 * @return \OCP\ISearch
-	 * @since 7.0.0
-	 */
-	public function getSearch();
-
-	/**
-	 * Get the certificate manager for the user
-	 *
-	 * @param string $userId (optional) if not specified the current loggedin user is used, use null to get the system certificate manager
-	 * @return \OCP\ICertificateManager | null if $userId is null and no user is logged in
-	 * @since 8.0.0
-	 */
-	public function getCertificateManager($userId = null);
-
-	/**
-	 * Create a new event source
-	 *
-	 * @return \OCP\IEventSource
-	 * @since 8.0.0
-	 */
-	public function createEventSource();
-
-	/**
-	 * Returns an instance of the HTTP helper class
-	 * @return \OC\HTTPHelper
-	 * @deprecated 8.1.0 Use \OCP\Http\Client\IClientService
-	 * @since 8.0.0
-	 */
-	public function getHTTPHelper();
-
-	/**
-	 * Returns an instance of the HTTP client service
-	 *
-	 * @return \OCP\Http\Client\IClientService
-	 * @since 8.1.0
-	 */
-	public function getHTTPClientService();
-
-	/**
-	 * Get the active event logger
-	 *
-	 * @return \OCP\Diagnostics\IEventLogger
-	 * @since 8.0.0
-	 */
-	public function getEventLogger();
-
-	/**
-	 * Get the active query logger
-	 *
-	 * The returned logger only logs data when debug mode is enabled
-	 *
-	 * @return \OCP\Diagnostics\IQueryLogger
-	 * @since 8.0.0
-	 */
-	public function getQueryLogger();
-
-	/**
-	 * Get the manager for temporary files and folders
-	 *
-	 * @return \OCP\ITempManager
-	 * @since 8.0.0
-	 */
-	public function getTempManager();
-
-	/**
-	 * Get the app manager
-	 *
-	 * @return \OCP\App\IAppManager
-	 * @since 8.0.0
-	 */
-	public function getAppManager();
-
-	/**
-	 * Get the webroot
-	 *
-	 * @return string
-	 * @since 8.0.0
-	 */
-	public function getWebRoot();
-
-	/**
-	 * @return \OCP\Files\Config\IMountProviderCollection
-	 * @since 8.0.0
-	 */
-	public function getMountProviderCollection();
-
-	/**
-	 * Get the IniWrapper
-	 *
-	 * @return \bantu\IniGetWrapper\IniGetWrapper
-	 * @since 8.0.0
-	 */
-	public function getIniWrapper();
-	/**
-	 * @return \OCP\Command\IBus
-	 * @since 8.1.0
-	 */
-	public function getCommandBus();
-
-	/**
-	 * Creates a new mailer
-	 *
-	 * @return \OCP\Mail\IMailer
-	 * @since 8.1.0
-	 */
-	public function getMailer();
-
-	/**
-	 * Get the locking provider
-	 *
-	 * @return \OCP\Lock\ILockingProvider
-	 * @since 8.1.0
-	 */
-	public function getLockingProvider();
-
-	/**
-	 * @return \OCP\Files\Mount\IMountManager
-	 * @since 8.2.0
-	 */
-	public function getMountManager();
-
-	/**
-	 * Get the MimeTypeDetector
-	 *
-	 * @return \OCP\Files\IMimeTypeDetector
-	 * @since 8.2.0
-	 */
-	public function getMimeTypeDetector();
-
-	/**
-	 * Get the MimeTypeLoader
-	 *
-	 * @return \OCP\Files\IMimeTypeLoader
-	 * @since 8.2.0
-	 */
-	public function getMimeTypeLoader();
-
-	/**
-	 * Get the EventDispatcher
-	 *
-	 * @return EventDispatcherInterface
-	 * @since 8.2.0
-	 */
-	public function getEventDispatcher();
-
-	/**
-	 * Get the Notification Manager
-	 *
-	 * @return \OCP\Notification\IManager
-	 * @since 9.0.0
-	 */
-	public function getNotificationManager();
-
-	/**
-	 * @return \OCP\Comments\ICommentsManager
-	 * @since 9.0.0
-	 */
-	public function getCommentsManager();
-
-	/**
-	 * Returns the system-tag manager
-	 *
-	 * @return \OCP\SystemTag\ISystemTagManager
-	 *
-	 * @since 9.0.0
-	 */
-	public function getSystemTagManager();
-
-	/**
-	 * Returns the system-tag object mapper
-	 *
-	 * @return \OCP\SystemTag\ISystemTagObjectMapper
-	 *
-	 * @since 9.0.0
-	 */
-	public function getSystemTagObjectMapper();
-
-	/**
-	 * Returns the share manager
-	 *
-	 * @return \OCP\Share\IManager
-	 * @since 9.0.0
-	 */
-	public function getShareManager();
-
-	/**
-	 * @return IContentSecurityPolicyManager
-	 * @since 9.0.0
-	 */
-	public function getContentSecurityPolicyManager();
+    /**
+     * The contacts manager will act as a broker between consumers for contacts information and
+     * providers which actual deliver the contact information.
+     *
+     * @return \OCP\Contacts\IManager
+     * @since 6.0.0
+     */
+    public function getContactsManager();
+
+    /**
+     * The current request object holding all information about the request currently being processed
+     * is returned from this method.
+     * In case the current execution was not initiated by a web request null is returned
+     *
+     * @return \OCP\IRequest
+     * @since 6.0.0
+     */
+    public function getRequest();
+
+    /**
+     * Returns the preview manager which can create preview images for a given file
+     *
+     * @return \OCP\IPreview
+     * @since 6.0.0
+     */
+    public function getPreviewManager();
+
+    /**
+     * Returns the tag manager which can get and set tags for different object types
+     *
+     * @see \OCP\ITagManager::load()
+     * @return \OCP\ITagManager
+     * @since 6.0.0
+     */
+    public function getTagManager();
+
+    /**
+     * Returns the root folder of ownCloud's data directory
+     *
+     * @return \OCP\Files\IRootFolder
+     * @since 6.0.0 - between 6.0.0 and 8.0.0 this returned \OCP\Files\Folder
+     */
+    public function getRootFolder();
+
+    /**
+     * Returns a view to ownCloud's files folder
+     *
+     * @param string $userId user ID
+     * @return \OCP\Files\Folder
+     * @since 6.0.0 - parameter $userId was added in 8.0.0
+     * @see getUserFolder in \OCP\Files\IRootFolder
+     */
+    public function getUserFolder($userId = null);
+
+    /**
+     * Returns an app-specific view in ownClouds data directory
+     *
+     * @return \OCP\Files\Folder
+     * @since 6.0.0
+     */
+    public function getAppFolder();
+
+    /**
+     * Returns a user manager
+     *
+     * @return \OCP\IUserManager
+     * @since 8.0.0
+     */
+    public function getUserManager();
+
+    /**
+     * Returns a group manager
+     *
+     * @return \OCP\IGroupManager
+     * @since 8.0.0
+     */
+    public function getGroupManager();
+
+    /**
+     * Returns the user session
+     *
+     * @return \OCP\IUserSession
+     * @since 6.0.0
+     */
+    public function getUserSession();
+
+    /**
+     * Returns the navigation manager
+     *
+     * @return \OCP\INavigationManager
+     * @since 6.0.0
+     */
+    public function getNavigationManager();
+
+    /**
+     * Returns the config manager
+     *
+     * @return \OCP\IConfig
+     * @since 6.0.0
+     */
+    public function getConfig();
+
+    /**
+     * Returns a Crypto instance
+     *
+     * @return \OCP\Security\ICrypto
+     * @since 8.0.0
+     */
+    public function getCrypto();
+
+    /**
+     * Returns a Hasher instance
+     *
+     * @return \OCP\Security\IHasher
+     * @since 8.0.0
+     */
+    public function getHasher();
+
+    /**
+     * Returns a SecureRandom instance
+     *
+     * @return \OCP\Security\ISecureRandom
+     * @since 8.1.0
+     */
+    public function getSecureRandom();
+
+    /**
+     * Returns a CredentialsManager instance
+     *
+     * @return \OCP\Security\ICredentialsManager
+     * @since 9.0.0
+     */
+    public function getCredentialsManager();
+
+    /**
+     * Returns an instance of the db facade
+     * @deprecated 8.1.0 use getDatabaseConnection, will be removed in ownCloud 10
+     * @return \OCP\IDb
+     * @since 7.0.0
+     */
+    public function getDb();
+
+    /**
+     * Returns the app config manager
+     *
+     * @return \OCP\IAppConfig
+     * @since 7.0.0
+     */
+    public function getAppConfig();
+
+    /**
+     * @return \OCP\L10N\IFactory
+     * @since 8.2.0
+     */
+    public function getL10NFactory();
+
+    /**
+     * get an L10N instance
+     * @param string $app appid
+     * @param string $lang
+     * @return \OCP\IL10N
+     * @since 6.0.0 - parameter $lang was added in 8.0.0
+     */
+    public function getL10N($app, $lang = null);
+
+    /**
+     * @return \OC\Encryption\Manager
+     * @since 8.1.0
+     */
+    public function getEncryptionManager();
+
+    /**
+     * @return \OC\Encryption\File
+     * @since 8.1.0
+     */
+    public function getEncryptionFilesHelper();
+
+    /**
+     * @return \OCP\Encryption\Keys\IStorage
+     * @since 8.1.0
+     */
+    public function getEncryptionKeyStorage();
+
+    /**
+     * Returns the URL generator
+     *
+     * @return \OCP\IURLGenerator
+     * @since 6.0.0
+     */
+    public function getURLGenerator();
+
+    /**
+     * Returns the Helper
+     *
+     * @return \OCP\IHelper
+     * @since 6.0.0
+     */
+    public function getHelper();
+
+    /**
+     * Returns an ICache instance
+     *
+     * @return \OCP\ICache
+     * @since 6.0.0
+     */
+    public function getCache();
+
+    /**
+     * Returns an \OCP\CacheFactory instance
+     *
+     * @return \OCP\ICacheFactory
+     * @since 7.0.0
+     */
+    public function getMemCacheFactory();
+
+    /**
+     * Returns the current session
+     *
+     * @return \OCP\ISession
+     * @since 6.0.0
+     */
+    public function getSession();
+
+    /**
+     * Returns the activity manager
+     *
+     * @return \OCP\Activity\IManager
+     * @since 6.0.0
+     */
+    public function getActivityManager();
+
+    /**
+     * Returns the current session
+     *
+     * @return \OCP\IDBConnection
+     * @since 6.0.0
+     */
+    public function getDatabaseConnection();
+
+    /**
+     * Returns an avatar manager, used for avatar functionality
+     *
+     * @return \OCP\IAvatarManager
+     * @since 6.0.0
+     */
+    public function getAvatarManager();
+
+    /**
+     * Returns an job list for controlling background jobs
+     *
+     * @return \OCP\BackgroundJob\IJobList
+     * @since 7.0.0
+     */
+    public function getJobList();
+
+    /**
+     * Returns a logger instance
+     *
+     * @return \OCP\ILogger
+     * @since 8.0.0
+     */
+    public function getLogger();
+
+    /**
+     * Returns a router for generating and matching urls
+     *
+     * @return \OCP\Route\IRouter
+     * @since 7.0.0
+     */
+    public function getRouter();
+
+    /**
+     * Returns a search instance
+     *
+     * @return \OCP\ISearch
+     * @since 7.0.0
+     */
+    public function getSearch();
+
+    /**
+     * Get the certificate manager for the user
+     *
+     * @param string $userId (optional) if not specified the current loggedin user is used, use null to get the system certificate manager
+     * @return \OCP\ICertificateManager | null if $userId is null and no user is logged in
+     * @since 8.0.0
+     */
+    public function getCertificateManager($userId = null);
+
+    /**
+     * Create a new event source
+     *
+     * @return \OCP\IEventSource
+     * @since 8.0.0
+     */
+    public function createEventSource();
+
+    /**
+     * Returns an instance of the HTTP helper class
+     * @return \OC\HTTPHelper
+     * @deprecated 8.1.0 Use \OCP\Http\Client\IClientService
+     * @since 8.0.0
+     */
+    public function getHTTPHelper();
+
+    /**
+     * Returns an instance of the HTTP client service
+     *
+     * @return \OCP\Http\Client\IClientService
+     * @since 8.1.0
+     */
+    public function getHTTPClientService();
+
+    /**
+     * Get the active event logger
+     *
+     * @return \OCP\Diagnostics\IEventLogger
+     * @since 8.0.0
+     */
+    public function getEventLogger();
+
+    /**
+     * Get the active query logger
+     *
+     * The returned logger only logs data when debug mode is enabled
+     *
+     * @return \OCP\Diagnostics\IQueryLogger
+     * @since 8.0.0
+     */
+    public function getQueryLogger();
+
+    /**
+     * Get the manager for temporary files and folders
+     *
+     * @return \OCP\ITempManager
+     * @since 8.0.0
+     */
+    public function getTempManager();
+
+    /**
+     * Get the app manager
+     *
+     * @return \OCP\App\IAppManager
+     * @since 8.0.0
+     */
+    public function getAppManager();
+
+    /**
+     * Get the webroot
+     *
+     * @return string
+     * @since 8.0.0
+     */
+    public function getWebRoot();
+
+    /**
+     * @return \OCP\Files\Config\IMountProviderCollection
+     * @since 8.0.0
+     */
+    public function getMountProviderCollection();
+
+    /**
+     * Get the IniWrapper
+     *
+     * @return \bantu\IniGetWrapper\IniGetWrapper
+     * @since 8.0.0
+     */
+    public function getIniWrapper();
+    /**
+     * @return \OCP\Command\IBus
+     * @since 8.1.0
+     */
+    public function getCommandBus();
+
+    /**
+     * Creates a new mailer
+     *
+     * @return \OCP\Mail\IMailer
+     * @since 8.1.0
+     */
+    public function getMailer();
+
+    /**
+     * Get the locking provider
+     *
+     * @return \OCP\Lock\ILockingProvider
+     * @since 8.1.0
+     */
+    public function getLockingProvider();
+
+    /**
+     * @return \OCP\Files\Mount\IMountManager
+     * @since 8.2.0
+     */
+    public function getMountManager();
+
+    /**
+     * Get the MimeTypeDetector
+     *
+     * @return \OCP\Files\IMimeTypeDetector
+     * @since 8.2.0
+     */
+    public function getMimeTypeDetector();
+
+    /**
+     * Get the MimeTypeLoader
+     *
+     * @return \OCP\Files\IMimeTypeLoader
+     * @since 8.2.0
+     */
+    public function getMimeTypeLoader();
+
+    /**
+     * Get the EventDispatcher
+     *
+     * @return EventDispatcherInterface
+     * @since 8.2.0
+     */
+    public function getEventDispatcher();
+
+    /**
+     * Get the Notification Manager
+     *
+     * @return \OCP\Notification\IManager
+     * @since 9.0.0
+     */
+    public function getNotificationManager();
+
+    /**
+     * @return \OCP\Comments\ICommentsManager
+     * @since 9.0.0
+     */
+    public function getCommentsManager();
+
+    /**
+     * Returns the system-tag manager
+     *
+     * @return \OCP\SystemTag\ISystemTagManager
+     *
+     * @since 9.0.0
+     */
+    public function getSystemTagManager();
+
+    /**
+     * Returns the system-tag object mapper
+     *
+     * @return \OCP\SystemTag\ISystemTagObjectMapper
+     *
+     * @since 9.0.0
+     */
+    public function getSystemTagObjectMapper();
+
+    /**
+     * Returns the share manager
+     *
+     * @return \OCP\Share\IManager
+     * @since 9.0.0
+     */
+    public function getShareManager();
+
+    /**
+     * @return IContentSecurityPolicyManager
+     * @since 9.0.0
+     */
+    public function getContentSecurityPolicyManager();
 }

lib/public/activity/iextension.php

Indentation +112 added lines, -112 removed lines

@@ -39,127 +39,127 @@
  * @since 8.0.0
  */
 interface IExtension {
-	const METHOD_STREAM = 'stream';
-	const METHOD_MAIL = 'email';
+    const METHOD_STREAM = 'stream';
+    const METHOD_MAIL = 'email';
 
-	const PRIORITY_VERYLOW 	= 10;
-	const PRIORITY_LOW	= 20;
-	const PRIORITY_MEDIUM	= 30;
-	const PRIORITY_HIGH	= 40;
-	const PRIORITY_VERYHIGH	= 50;
+    const PRIORITY_VERYLOW 	= 10;
+    const PRIORITY_LOW	= 20;
+    const PRIORITY_MEDIUM	= 30;
+    const PRIORITY_HIGH	= 40;
+    const PRIORITY_VERYHIGH	= 50;
 
-	/**
-	 * The extension can return an array of additional notification types.
-	 * If no additional types are to be added false is to be returned
-	 *
-	 * @param string $languageCode
-	 * @return array|false Array "stringID of the type" => "translated string description for the setting"
-	 * 				or Array "stringID of the type" => [
-	 * 					'desc' => "translated string description for the setting"
-	 * 					'methods' => [self::METHOD_*],
-	 * 				]
-	 * @since 8.0.0 - 8.2.0: Added support to allow limiting notifications to certain methods
-	 */
-	public function getNotificationTypes($languageCode);
+    /**
+     * The extension can return an array of additional notification types.
+     * If no additional types are to be added false is to be returned
+     *
+     * @param string $languageCode
+     * @return array|false Array "stringID of the type" => "translated string description for the setting"
+     * 				or Array "stringID of the type" => [
+     * 					'desc' => "translated string description for the setting"
+     * 					'methods' => [self::METHOD_*],
+     * 				]
+     * @since 8.0.0 - 8.2.0: Added support to allow limiting notifications to certain methods
+     */
+    public function getNotificationTypes($languageCode);
 
-	/**
-	 * For a given method additional types to be displayed in the settings can be returned.
-	 * In case no additional types are to be added false is to be returned.
-	 *
-	 * @param string $method
-	 * @return array|false
-	 * @since 8.0.0
-	 */
-	public function getDefaultTypes($method);
+    /**
+     * For a given method additional types to be displayed in the settings can be returned.
+     * In case no additional types are to be added false is to be returned.
+     *
+     * @param string $method
+     * @return array|false
+     * @since 8.0.0
+     */
+    public function getDefaultTypes($method);
 
-	/**
-	 * A string naming the css class for the icon to be used can be returned.
-	 * If no icon is known for the given type false is to be returned.
-	 *
-	 * @param string $type
-	 * @return string|false
-	 * @since 8.0.0
-	 */
-	public function getTypeIcon($type);
+    /**
+     * A string naming the css class for the icon to be used can be returned.
+     * If no icon is known for the given type false is to be returned.
+     *
+     * @param string $type
+     * @return string|false
+     * @since 8.0.0
+     */
+    public function getTypeIcon($type);
 
-	/**
-	 * The extension can translate a given message to the requested languages.
-	 * If no translation is available false is to be returned.
-	 *
-	 * @param string $app
-	 * @param string $text
-	 * @param array $params
-	 * @param boolean $stripPath
-	 * @param boolean $highlightParams
-	 * @param string $languageCode
-	 * @return string|false
-	 * @since 8.0.0
-	 */
-	public function translate($app, $text, $params, $stripPath, $highlightParams, $languageCode);
+    /**
+     * The extension can translate a given message to the requested languages.
+     * If no translation is available false is to be returned.
+     *
+     * @param string $app
+     * @param string $text
+     * @param array $params
+     * @param boolean $stripPath
+     * @param boolean $highlightParams
+     * @param string $languageCode
+     * @return string|false
+     * @since 8.0.0
+     */
+    public function translate($app, $text, $params, $stripPath, $highlightParams, $languageCode);
 
-	/**
-	 * The extension can define the type of parameters for translation
-	 *
-	 * Currently known types are:
-	 * * file		=> will strip away the path of the file and add a tooltip with it
-	 * * username	=> will add the avatar of the user
-	 *
-	 * @param string $app
-	 * @param string $text
-	 * @return array|false
-	 * @since 8.0.0
-	 */
-	public function getSpecialParameterList($app, $text);
+    /**
+     * The extension can define the type of parameters for translation
+     *
+     * Currently known types are:
+     * * file		=> will strip away the path of the file and add a tooltip with it
+     * * username	=> will add the avatar of the user
+     *
+     * @param string $app
+     * @param string $text
+     * @return array|false
+     * @since 8.0.0
+     */
+    public function getSpecialParameterList($app, $text);
 
-	/**
-	 * The extension can define the parameter grouping by returning the index as integer.
-	 * In case no grouping is required false is to be returned.
-	 *
-	 * @param array $activity
-	 * @return integer|false
-	 * @since 8.0.0
-	 */
-	public function getGroupParameter($activity);
+    /**
+     * The extension can define the parameter grouping by returning the index as integer.
+     * In case no grouping is required false is to be returned.
+     *
+     * @param array $activity
+     * @return integer|false
+     * @since 8.0.0
+     */
+    public function getGroupParameter($activity);
 
-	/**
-	 * The extension can define additional navigation entries. The array returned has to contain two keys 'top'
-	 * and 'apps' which hold arrays with the relevant entries.
-	 * If no further entries are to be added false is no be returned.
-	 *
-	 * @return array|false
-	 * @since 8.0.0
-	 */
-	public function getNavigation();
+    /**
+     * The extension can define additional navigation entries. The array returned has to contain two keys 'top'
+     * and 'apps' which hold arrays with the relevant entries.
+     * If no further entries are to be added false is no be returned.
+     *
+     * @return array|false
+     * @since 8.0.0
+     */
+    public function getNavigation();
 
-	/**
-	 * The extension can check if a customer filter (given by a query string like filter=abc) is valid or not.
-	 *
-	 * @param string $filterValue
-	 * @return boolean
-	 * @since 8.0.0
-	 */
-	public function isFilterValid($filterValue);
+    /**
+     * The extension can check if a customer filter (given by a query string like filter=abc) is valid or not.
+     *
+     * @param string $filterValue
+     * @return boolean
+     * @since 8.0.0
+     */
+    public function isFilterValid($filterValue);
 
-	/**
-	 * The extension can filter the types based on the filter if required.
-	 * In case no filter is to be applied false is to be returned unchanged.
-	 *
-	 * @param array $types
-	 * @param string $filter
-	 * @return array|false
-	 * @since 8.0.0
-	 */
-	public function filterNotificationTypes($types, $filter);
+    /**
+     * The extension can filter the types based on the filter if required.
+     * In case no filter is to be applied false is to be returned unchanged.
+     *
+     * @param array $types
+     * @param string $filter
+     * @return array|false
+     * @since 8.0.0
+     */
+    public function filterNotificationTypes($types, $filter);
 
-	/**
-	 * For a given filter the extension can specify the sql query conditions including parameters for that query.
-	 * In case the extension does not know the filter false is to be returned.
-	 * The query condition and the parameters are to be returned as array with two elements.
-	 * E.g. return array('`app` = ? and `message` like ?', array('mail', 'ownCloud%'));
-	 *
-	 * @param string $filter
-	 * @return array|false
-	 * @since 8.0.0
-	 */
-	public function getQueryForFilter($filter);
+    /**
+     * For a given filter the extension can specify the sql query conditions including parameters for that query.
+     * In case the extension does not know the filter false is to be returned.
+     * The query condition and the parameters are to be returned as array with two elements.
+     * E.g. return array('`app` = ? and `message` like ?', array('mail', 'ownCloud%'));
+     *
+     * @param string $filter
+     * @return array|false
+     * @since 8.0.0
+     */
+    public function getQueryForFilter($filter);
 }

Spacing +5 added lines, -5 removed lines

@@ -42,11 +42,11 @@
 	const METHOD_STREAM = 'stream';
 	const METHOD_MAIL = 'email';
 
-	const PRIORITY_VERYLOW 	= 10;
-	const PRIORITY_LOW	= 20;
-	const PRIORITY_MEDIUM	= 30;
-	const PRIORITY_HIGH	= 40;
-	const PRIORITY_VERYHIGH	= 50;
+	const PRIORITY_VERYLOW = 10;
+	const PRIORITY_LOW = 20;
+	const PRIORITY_MEDIUM = 30;
+	const PRIORITY_HIGH = 40;
+	const PRIORITY_VERYHIGH = 50;
 
 	/**
 	 * The extension can return an array of additional notification types.