Squash 'a | b' into 'a|b', in /lib
This commit is contained in:
parent
b5bc37d2e4
commit
a7ae2e874a
|
@ -123,7 +123,7 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D
|
|||
/**
|
||||
* Returns the data
|
||||
*
|
||||
* @return string | resource
|
||||
* @return string|resource
|
||||
*/
|
||||
public function get() {
|
||||
|
||||
|
|
|
@ -303,7 +303,7 @@ class MDB2SchemaReader {
|
|||
}
|
||||
|
||||
/**
|
||||
* @param \SimpleXMLElement | string $xml
|
||||
* @param \SimpleXMLElement|string $xml
|
||||
* @return bool
|
||||
*/
|
||||
private function asBool($xml) {
|
||||
|
|
|
@ -41,7 +41,7 @@ class OC_DB_StatementWrapper {
|
|||
* make execute return the result instead of a bool
|
||||
*
|
||||
* @param array $input
|
||||
* @return \OC_DB_StatementWrapper | int
|
||||
* @return \OC_DB_StatementWrapper|int
|
||||
*/
|
||||
public function execute($input=array()) {
|
||||
if(OC_Config::getValue( "log_query", false)) {
|
||||
|
|
|
@ -225,7 +225,7 @@ class OC_Files {
|
|||
* checks if the selected files are within the size constraint. If not, outputs an error page.
|
||||
*
|
||||
* @param string $dir
|
||||
* @param array | string $files
|
||||
* @param array|string $files
|
||||
*/
|
||||
static function validateZipDownload($dir, $files) {
|
||||
if (!OC_Config::getValue('allowZipDownload', true)) {
|
||||
|
|
|
@ -109,7 +109,7 @@ class Cache {
|
|||
* get the stored metadata of a file or folder
|
||||
*
|
||||
* @param string/int $file
|
||||
* @return array | false
|
||||
* @return array|false
|
||||
*/
|
||||
public function get($file) {
|
||||
if (is_string($file) or $file == '') {
|
||||
|
@ -597,7 +597,7 @@ class Cache {
|
|||
* get the path of a file on this storage by it's id
|
||||
*
|
||||
* @param int $id
|
||||
* @return string | null
|
||||
* @return string|null
|
||||
*/
|
||||
public function getPathById($id) {
|
||||
$sql = 'SELECT `path` FROM `*PREFIX*filecache` WHERE `fileid` = ? AND `storage` = ?';
|
||||
|
|
|
@ -55,7 +55,7 @@ class Watcher {
|
|||
* check $path for updates
|
||||
*
|
||||
* @param string $path
|
||||
* @return boolean | array true if path was updated, otherwise the cached data is returned
|
||||
* @return boolean|array true if path was updated, otherwise the cached data is returned
|
||||
*/
|
||||
public function checkUpdate($path) {
|
||||
if ($this->watchPolicy === self::CHECK_ALWAYS or ($this->watchPolicy === self::CHECK_ONCE and array_search($path, $this->checkedPaths) === false)) {
|
||||
|
|
|
@ -147,7 +147,7 @@ class FileInfo implements \OCP\Files\FileInfo, \ArrayAccess {
|
|||
}
|
||||
|
||||
/**
|
||||
* @return \OCP\Files\FileInfo::TYPE_FILE | \OCP\Files\FileInfo::TYPE_FOLDER
|
||||
* @return \OCP\Files\FileInfo::TYPE_FILE|\OCP\Files\FileInfo::TYPE_FOLDER
|
||||
*/
|
||||
public function getType() {
|
||||
if (isset($this->data['type'])) {
|
||||
|
|
|
@ -28,7 +28,7 @@ class Mount {
|
|||
private $loader;
|
||||
|
||||
/**
|
||||
* @param string | \OC\Files\Storage\Storage $storage
|
||||
* @param string|\OC\Files\Storage\Storage $storage
|
||||
* @param string $mountpoint
|
||||
* @param array $arguments (optional)\
|
||||
* @param \OC\Files\Storage\Loader $loader
|
||||
|
|
|
@ -19,7 +19,7 @@ class TemplateManager {
|
|||
* get the path of the template for a mimetype
|
||||
*
|
||||
* @param string $mimetype
|
||||
* @return string | null
|
||||
* @return string|null
|
||||
*/
|
||||
public function getTemplatePath($mimetype) {
|
||||
if (isset($this->templates[$mimetype])) {
|
||||
|
|
|
@ -796,7 +796,7 @@ class View {
|
|||
* @param string $path
|
||||
* @param boolean $includeMountPoints whether to add mountpoint sizes,
|
||||
* defaults to true
|
||||
* @return \OC\Files\FileInfo | false
|
||||
* @return \OC\Files\FileInfo|false
|
||||
*/
|
||||
public function getFileInfo($path, $includeMountPoints = true) {
|
||||
$data = array();
|
||||
|
@ -991,7 +991,7 @@ class View {
|
|||
* change file metadata
|
||||
*
|
||||
* @param string $path
|
||||
* @param array | \OCP\Files\FileInfo $data
|
||||
* @param array|\OCP\Files\FileInfo $data
|
||||
* @return int
|
||||
*
|
||||
* returns the fileid of the updated file
|
||||
|
|
|
@ -217,7 +217,7 @@ class OC_Group_Database extends OC_Group_Backend {
|
|||
* @param string $search
|
||||
* @param int $limit
|
||||
* @param int $offset
|
||||
* @return int | false
|
||||
* @return int|false
|
||||
*/
|
||||
public function countUsersInGroup($gid, $search = '') {
|
||||
$stmt = OC_DB::prepare('SELECT COUNT(`uid`) AS `count` FROM `*PREFIX*group_user` WHERE `gid` = ? AND `uid` LIKE ?');
|
||||
|
|
|
@ -159,7 +159,7 @@ class OC_Group_Dummy extends OC_Group_Backend {
|
|||
|
||||
/**
|
||||
* @brief get the number of all users in a group
|
||||
* @return int | bool
|
||||
* @return int|bool
|
||||
*/
|
||||
public function countUsersInGroup($gid, $search = '', $limit = -1, $offset = 0) {
|
||||
if(isset($this->groups[$gid])) {
|
||||
|
|
|
@ -26,7 +26,7 @@ class Group {
|
|||
private $usersLoaded;
|
||||
|
||||
/**
|
||||
* @var \OC_Group_Backend[] | \OC_Group_Database[] $backend
|
||||
* @var \OC_Group_Backend[]|\OC_Group_Database[] $backend
|
||||
*/
|
||||
private $backends;
|
||||
|
||||
|
@ -184,7 +184,7 @@ class Group {
|
|||
* returns the number of users matching the search string
|
||||
*
|
||||
* @param string $search
|
||||
* @return int | bool
|
||||
* @return int|bool
|
||||
*/
|
||||
public function count($search) {
|
||||
$users = false;
|
||||
|
|
|
@ -28,7 +28,7 @@ use OC\Hooks\PublicEmitter;
|
|||
*/
|
||||
class Manager extends PublicEmitter {
|
||||
/**
|
||||
* @var \OC_Group_Backend[] | \OC_Group_Database[] $backends
|
||||
* @var \OC_Group_Backend[]|\OC_Group_Database[] $backends
|
||||
*/
|
||||
private $backends = array();
|
||||
|
||||
|
|
|
@ -362,7 +362,7 @@ class Share extends \OC\Share\Constants {
|
|||
/**
|
||||
* Based on the given token the share information will be returned - password protected shares will be verified
|
||||
* @param string $token
|
||||
* @return array | boolean false will be returned in case the token is unknown or unauthorized
|
||||
* @return array|boolean false will be returned in case the token is unknown or unauthorized
|
||||
*/
|
||||
public static function getShareByToken($token, $checkPasswordProtection = true) {
|
||||
$query = \OC_DB::prepare('SELECT * FROM `*PREFIX*share` WHERE `token` = ?', 1);
|
||||
|
|
|
@ -35,7 +35,7 @@ class Updater extends BasicEmitter {
|
|||
/**
|
||||
* Check if a new version is available
|
||||
* @param string $updaterUrl the url to check, i.e. 'http://apps.owncloud.com/updater.php'
|
||||
* @return array | bool
|
||||
* @return array|bool
|
||||
*/
|
||||
public function check($updaterUrl) {
|
||||
|
||||
|
|
|
@ -98,7 +98,7 @@ class OC_User {
|
|||
|
||||
/**
|
||||
* @brief Adds the backend to the list of used backends
|
||||
* @param string | OC_User_Backend $backend default: database The backend to use for user management
|
||||
* @param string|OC_User_Backend $backend default: database The backend to use for user management
|
||||
* @return bool
|
||||
*
|
||||
* Set the User Authentication Module
|
||||
|
|
|
@ -273,7 +273,7 @@ class OC_User_Database extends OC_User_Backend {
|
|||
/**
|
||||
* counts the users in the database
|
||||
*
|
||||
* @return int | bool
|
||||
* @return int|bool
|
||||
*/
|
||||
public function countUsers() {
|
||||
$query = OC_DB::prepare('SELECT COUNT(*) FROM `*PREFIX*users`');
|
||||
|
|
|
@ -127,7 +127,7 @@ class OC_User_Dummy extends OC_User_Backend {
|
|||
/**
|
||||
* counts the users in the database
|
||||
*
|
||||
* @return int | bool
|
||||
* @return int|bool
|
||||
*/
|
||||
public function countUsers() {
|
||||
return 0;
|
||||
|
|
|
@ -222,7 +222,7 @@ class Manager extends PublicEmitter {
|
|||
* @param string $uid
|
||||
* @param string $password
|
||||
* @throws \Exception
|
||||
* @return bool | \OC\User\User the created user of false
|
||||
* @return bool|\OC\User\User the created user of false
|
||||
*/
|
||||
public function createUser($uid, $password) {
|
||||
$l = \OC_L10N::get('lib');
|
||||
|
|
|
@ -33,7 +33,7 @@ class User {
|
|||
private $enabled;
|
||||
|
||||
/**
|
||||
* @var Emitter | Manager $emitter
|
||||
* @var Emitter|Manager $emitter
|
||||
*/
|
||||
private $emitter;
|
||||
|
||||
|
|
|
@ -104,7 +104,7 @@ interface FileInfo {
|
|||
/**
|
||||
* Check whether this is a file or a folder
|
||||
*
|
||||
* @return \OCP\Files\FileInfo::TYPE_FILE | \OCP\Files\FileInfo::TYPE_FOLDER
|
||||
* @return \OCP\Files\FileInfo::TYPE_FILE|\OCP\Files\FileInfo::TYPE_FOLDER
|
||||
*/
|
||||
public function getType();
|
||||
|
||||
|
|
|
@ -160,7 +160,7 @@ class Share extends \OC\Share\Constants {
|
|||
/**
|
||||
* Based on the given token the share information will be returned - password protected shares will be verified
|
||||
* @param string $token
|
||||
* @return array | bool false will be returned in case the token is unknown or unauthorized
|
||||
* @return array|bool false will be returned in case the token is unknown or unauthorized
|
||||
*/
|
||||
public static function getShareByToken($token, $checkPasswordProtection = true) {
|
||||
return \OC\Share\Share::getShareByToken($token, $checkPasswordProtection);
|
||||
|
|
Loading…
Reference in New Issue