Inspection of "Merge pull request #36393 from nextcloud/3rdparty-..." - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 970f39...e4f050 )

by Joas

created 2023-02-02 13:25 UTC

Status

Indentation +85 added lines, -85 removed lines patch added patch discarded remove patch

@@ -35,99 +35,99 @@
 block discarded – undo
 use OCP\IUser;
 
 class LegacyTrashBackend implements ITrashBackend {
-	/** @var array */
-	private $deletedFiles = [];
+    /** @var array */
+    private $deletedFiles = [];
 
-	/** @var IRootFolder */
-	private $rootFolder;
+    /** @var IRootFolder */
+    private $rootFolder;
 
-	public function __construct(IRootFolder $rootFolder) {
-		$this->rootFolder = $rootFolder;
-	}
+    public function __construct(IRootFolder $rootFolder) {
+        $this->rootFolder = $rootFolder;
+    }
 
-	/**
-	 * @param array $items
-	 * @param IUser $user
-	 * @param ITrashItem $parent
-	 * @return ITrashItem[]
-	 */
-	private function mapTrashItems(array $items, IUser $user, ITrashItem $parent = null): array {
-		$parentTrashPath = ($parent instanceof ITrashItem) ? $parent->getTrashPath() : '';
-		$isRoot = $parent === null;
-		return array_map(function (FileInfo $file) use ($parent, $parentTrashPath, $isRoot, $user) {
-			$originalLocation = $isRoot ? $file['extraData'] : $parent->getOriginalLocation() . '/' . $file->getName();
-			if (!$originalLocation) {
-				$originalLocation = $file->getName();
-			}
-			return new TrashItem(
-				$this,
-				$originalLocation,
-				$file->getMTime(),
-				$parentTrashPath . '/' . $file->getName() . ($isRoot ? '.d' . $file->getMtime() : ''),
-				$file,
-				$user
-			);
-		}, $items);
-	}
+    /**
+     * @param array $items
+     * @param IUser $user
+     * @param ITrashItem $parent
+     * @return ITrashItem[]
+     */
+    private function mapTrashItems(array $items, IUser $user, ITrashItem $parent = null): array {
+        $parentTrashPath = ($parent instanceof ITrashItem) ? $parent->getTrashPath() : '';
+        $isRoot = $parent === null;
+        return array_map(function (FileInfo $file) use ($parent, $parentTrashPath, $isRoot, $user) {
+            $originalLocation = $isRoot ? $file['extraData'] : $parent->getOriginalLocation() . '/' . $file->getName();
+            if (!$originalLocation) {
+                $originalLocation = $file->getName();
+            }
+            return new TrashItem(
+                $this,
+                $originalLocation,
+                $file->getMTime(),
+                $parentTrashPath . '/' . $file->getName() . ($isRoot ? '.d' . $file->getMtime() : ''),
+                $file,
+                $user
+            );
+        }, $items);
+    }
 
-	public function listTrashRoot(IUser $user): array {
-		$entries = Helper::getTrashFiles('/', $user->getUID());
-		return $this->mapTrashItems($entries, $user);
-	}
+    public function listTrashRoot(IUser $user): array {
+        $entries = Helper::getTrashFiles('/', $user->getUID());
+        return $this->mapTrashItems($entries, $user);
+    }
 
-	public function listTrashFolder(ITrashItem $folder): array {
-		$user = $folder->getUser();
-		$entries = Helper::getTrashFiles($folder->getTrashPath(), $user->getUID());
-		return $this->mapTrashItems($entries, $user ,$folder);
-	}
+    public function listTrashFolder(ITrashItem $folder): array {
+        $user = $folder->getUser();
+        $entries = Helper::getTrashFiles($folder->getTrashPath(), $user->getUID());
+        return $this->mapTrashItems($entries, $user ,$folder);
+    }
 
-	public function restoreItem(ITrashItem $item) {
-		Trashbin::restore($item->getTrashPath(), $item->getName(), $item->isRootItem() ? $item->getDeletedTime() : null);
-	}
+    public function restoreItem(ITrashItem $item) {
+        Trashbin::restore($item->getTrashPath(), $item->getName(), $item->isRootItem() ? $item->getDeletedTime() : null);
+    }
 
-	public function removeItem(ITrashItem $item) {
-		$user = $item->getUser();
-		if ($item->isRootItem()) {
-			$path = substr($item->getTrashPath(), 0, -strlen('.d' . $item->getDeletedTime()));
-			Trashbin::delete($path, $user->getUID(), $item->getDeletedTime());
-		} else {
-			Trashbin::delete($item->getTrashPath(), $user->getUID(), null);
-		}
-	}
+    public function removeItem(ITrashItem $item) {
+        $user = $item->getUser();
+        if ($item->isRootItem()) {
+            $path = substr($item->getTrashPath(), 0, -strlen('.d' . $item->getDeletedTime()));
+            Trashbin::delete($path, $user->getUID(), $item->getDeletedTime());
+        } else {
+            Trashbin::delete($item->getTrashPath(), $user->getUID(), null);
+        }
+    }
 
-	public function moveToTrash(IStorage $storage, string $internalPath): bool {
-		if (!$storage instanceof Storage) {
-			return false;
-		}
-		$normalized = Filesystem::normalizePath($storage->getMountPoint() . '/' . $internalPath, true, false, true);
-		$view = Filesystem::getView();
-		if (!isset($this->deletedFiles[$normalized]) && $view instanceof View) {
-			$this->deletedFiles[$normalized] = $normalized;
-			if ($filesPath = $view->getRelativePath($normalized)) {
-				$filesPath = trim($filesPath, '/');
-				$result = \OCA\Files_Trashbin\Trashbin::move2trash($filesPath);
-			} else {
-				$result = false;
-			}
-			unset($this->deletedFiles[$normalized]);
-		} else {
-			$result = false;
-		}
+    public function moveToTrash(IStorage $storage, string $internalPath): bool {
+        if (!$storage instanceof Storage) {
+            return false;
+        }
+        $normalized = Filesystem::normalizePath($storage->getMountPoint() . '/' . $internalPath, true, false, true);
+        $view = Filesystem::getView();
+        if (!isset($this->deletedFiles[$normalized]) && $view instanceof View) {
+            $this->deletedFiles[$normalized] = $normalized;
+            if ($filesPath = $view->getRelativePath($normalized)) {
+                $filesPath = trim($filesPath, '/');
+                $result = \OCA\Files_Trashbin\Trashbin::move2trash($filesPath);
+            } else {
+                $result = false;
+            }
+            unset($this->deletedFiles[$normalized]);
+        } else {
+            $result = false;
+        }
 
-		return $result;
-	}
+        return $result;
+    }
 
-	public function getTrashNodeById(IUser $user, int $fileId) {
-		try {
-			$userFolder = $this->rootFolder->getUserFolder($user->getUID());
-			$trash = $userFolder->getParent()->get('files_trashbin/files');
-			$trashFiles = $trash->getById($fileId);
-			if (!$trashFiles) {
-				return null;
-			}
-			return $trashFiles ? array_pop($trashFiles) : null;
-		} catch (NotFoundException $e) {
-			return null;
-		}
-	}
+    public function getTrashNodeById(IUser $user, int $fileId) {
+        try {
+            $userFolder = $this->rootFolder->getUserFolder($user->getUID());
+            $trash = $userFolder->getParent()->get('files_trashbin/files');
+            $trashFiles = $trash->getById($fileId);
+            if (!$trashFiles) {
+                return null;
+            }
+            return $trashFiles ? array_pop($trashFiles) : null;
+        } catch (NotFoundException $e) {
+            return null;
+        }
+    }
 }

Please login to merge, or discard this patch.

core/Migrations/Version14000Date20180626223656.php 1 patch

Indentation +37 added lines, -37 removed lines patch added patch discarded remove patch

@@ -28,42 +28,42 @@
 block discarded – undo
 use OCP\Migration\SimpleMigrationStep;
 
 class Version14000Date20180626223656 extends SimpleMigrationStep {
-	public function changeSchema(\OCP\Migration\IOutput $output, \Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
-		if (!$schema->hasTable('whats_new')) {
-			$table = $schema->createTable('whats_new');
-			$table->addColumn('id', 'integer', [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 4,
-				'unsigned' => true,
-			]);
-			$table->addColumn('version', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '11',
-			]);
-			$table->addColumn('etag', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('last_check', 'integer', [
-				'notnull' => true,
-				'length' => 4,
-				'unsigned' => true,
-				'default' => 0,
-			]);
-			$table->addColumn('data', 'text', [
-				'notnull' => true,
-				'default' => '',
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addUniqueIndex(['version'], 'version');
-			$table->addIndex(['version', 'etag'], 'version_etag_idx');
-		}
+    public function changeSchema(\OCP\Migration\IOutput $output, \Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
+        if (!$schema->hasTable('whats_new')) {
+            $table = $schema->createTable('whats_new');
+            $table->addColumn('id', 'integer', [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 4,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('version', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '11',
+            ]);
+            $table->addColumn('etag', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('last_check', 'integer', [
+                'notnull' => true,
+                'length' => 4,
+                'unsigned' => true,
+                'default' => 0,
+            ]);
+            $table->addColumn('data', 'text', [
+                'notnull' => true,
+                'default' => '',
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addUniqueIndex(['version'], 'version');
+            $table->addIndex(['version', 'etag'], 'version_etag_idx');
+        }
 
-		return $schema;
-	}
+        return $schema;
+    }
 }

Please login to merge, or discard this patch.

core/Migrations/Version19000Date20200211083441.php 1 patch

Indentation +31 added lines, -31 removed lines patch added patch discarded remove patch

@@ -10,36 +10,36 @@
 block discarded – undo
 use OCP\Migration\SimpleMigrationStep;
 
 class Version19000Date20200211083441 extends SimpleMigrationStep {
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		if (!$schema->hasTable('webauthn')) {
-			$table = $schema->createTable('webauthn');
-			$table->addColumn('id', 'integer', [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 64,
-			]);
-			$table->addColumn('uid', 'string', [
-				'notnull' => true,
-				'length' => 64,
-			]);
-			$table->addColumn('name', 'string', [
-				'notnull' => true,
-				'length' => 64,
-			]);
-			$table->addColumn('public_key_credential_id', 'string', [
-				'notnull' => true,
-				'length' => 255
-			]);
-			$table->addColumn('data', 'text', [
-				'notnull' => true,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addIndex(['uid'], 'webauthn_uid');
-			$table->addIndex(['public_key_credential_id'], 'webauthn_publicKeyCredentialId');
-		}
-		return $schema;
-	}
+        if (!$schema->hasTable('webauthn')) {
+            $table = $schema->createTable('webauthn');
+            $table->addColumn('id', 'integer', [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 64,
+            ]);
+            $table->addColumn('uid', 'string', [
+                'notnull' => true,
+                'length' => 64,
+            ]);
+            $table->addColumn('name', 'string', [
+                'notnull' => true,
+                'length' => 64,
+            ]);
+            $table->addColumn('public_key_credential_id', 'string', [
+                'notnull' => true,
+                'length' => 255
+            ]);
+            $table->addColumn('data', 'text', [
+                'notnull' => true,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addIndex(['uid'], 'webauthn_uid');
+            $table->addIndex(['public_key_credential_id'], 'webauthn_publicKeyCredentialId');
+        }
+        return $schema;
+    }
 }

Please login to merge, or discard this patch.

core/Migrations/Version14000Date20180522074438.php 1 patch

Indentation +25 added lines, -25 removed lines patch added patch discarded remove patch

@@ -33,31 +33,31 @@
 block discarded – undo
 use OCP\Migration\SimpleMigrationStep;
 
 class Version14000Date20180522074438 extends SimpleMigrationStep {
-	public function changeSchema(IOutput $output, Closure $schemaClosure,
-								 array $options): ISchemaWrapper {
-		$schema = $schemaClosure();
+    public function changeSchema(IOutput $output, Closure $schemaClosure,
+                                    array $options): ISchemaWrapper {
+        $schema = $schemaClosure();
 
-		if (!$schema->hasTable('twofactor_providers')) {
-			$table = $schema->createTable('twofactor_providers');
-			$table->addColumn('provider_id', 'string',
-				[
-					'notnull' => true,
-					'length' => 32,
-				]);
-			$table->addColumn('uid', 'string',
-				[
-					'notnull' => true,
-					'length' => 64,
-				]);
-			$table->addColumn('enabled', 'smallint',
-				[
-					'notnull' => true,
-					'length' => 1,
-				]);
-			$table->setPrimaryKey(['provider_id', 'uid']);
-			$table->addIndex(['uid'], 'twofactor_providers_uid');
-		}
+        if (!$schema->hasTable('twofactor_providers')) {
+            $table = $schema->createTable('twofactor_providers');
+            $table->addColumn('provider_id', 'string',
+                [
+                    'notnull' => true,
+                    'length' => 32,
+                ]);
+            $table->addColumn('uid', 'string',
+                [
+                    'notnull' => true,
+                    'length' => 64,
+                ]);
+            $table->addColumn('enabled', 'smallint',
+                [
+                    'notnull' => true,
+                    'length' => 1,
+                ]);
+            $table->setPrimaryKey(['provider_id', 'uid']);
+            $table->addIndex(['uid'], 'twofactor_providers_uid');
+        }
 
-		return $schema;
-	}
+        return $schema;
+    }
 }

Please login to merge, or discard this patch.

lib/public/Files/Cache/IWatcher.php 1 patch

Indentation +46 added lines, -46 removed lines patch added patch discarded remove patch

@@ -28,56 +28,56 @@
 block discarded – undo
  * @since 9.0.0
  */
 interface IWatcher {
-	public const CHECK_NEVER = 0; // never check the underlying filesystem for updates
-	public const CHECK_ONCE = 1; // check the underlying filesystem for updates once every request for each file
-	public const CHECK_ALWAYS = 2; // always check the underlying filesystem for updates
+    public const CHECK_NEVER = 0; // never check the underlying filesystem for updates
+    public const CHECK_ONCE = 1; // check the underlying filesystem for updates once every request for each file
+    public const CHECK_ALWAYS = 2; // always check the underlying filesystem for updates
 
-	/**
-	 * @param int $policy either IWatcher::CHECK_NEVER, IWatcher::CHECK_ONCE, IWatcher::CHECK_ALWAYS
-	 * @since 9.0.0
-	 */
-	public function setPolicy($policy);
+    /**
+     * @param int $policy either IWatcher::CHECK_NEVER, IWatcher::CHECK_ONCE, IWatcher::CHECK_ALWAYS
+     * @since 9.0.0
+     */
+    public function setPolicy($policy);
 
-	/**
-	 * @return int either IWatcher::CHECK_NEVER, IWatcher::CHECK_ONCE, IWatcher::CHECK_ALWAYS
-	 * @since 9.0.0
-	 */
-	public function getPolicy();
+    /**
+     * @return int either IWatcher::CHECK_NEVER, IWatcher::CHECK_ONCE, IWatcher::CHECK_ALWAYS
+     * @since 9.0.0
+     */
+    public function getPolicy();
 
-	/**
-	 * check $path for updates and update if needed
-	 *
-	 * @param string $path
-	 * @param ICacheEntry|null $cachedEntry
-	 * @return boolean true if path was updated
-	 * @since 9.0.0
-	 */
-	public function checkUpdate($path, $cachedEntry = null);
+    /**
+     * check $path for updates and update if needed
+     *
+     * @param string $path
+     * @param ICacheEntry|null $cachedEntry
+     * @return boolean true if path was updated
+     * @since 9.0.0
+     */
+    public function checkUpdate($path, $cachedEntry = null);
 
-	/**
-	 * Update the cache for changes to $path
-	 *
-	 * @param string $path
-	 * @param ICacheEntry $cachedData
-	 * @since 9.0.0
-	 */
-	public function update($path, $cachedData);
+    /**
+     * Update the cache for changes to $path
+     *
+     * @param string $path
+     * @param ICacheEntry $cachedData
+     * @since 9.0.0
+     */
+    public function update($path, $cachedData);
 
-	/**
-	 * Check if the cache for $path needs to be updated
-	 *
-	 * @param string $path
-	 * @param ICacheEntry $cachedData
-	 * @return bool
-	 * @since 9.0.0
-	 */
-	public function needsUpdate($path, $cachedData);
+    /**
+     * Check if the cache for $path needs to be updated
+     *
+     * @param string $path
+     * @param ICacheEntry $cachedData
+     * @return bool
+     * @since 9.0.0
+     */
+    public function needsUpdate($path, $cachedData);
 
-	/**
-	 * remove deleted files in $path from the cache
-	 *
-	 * @param string $path
-	 * @since 9.0.0
-	 */
-	public function cleanFolder($path);
+    /**
+     * remove deleted files in $path from the cache
+     *
+     * @param string $path
+     * @since 9.0.0
+     */
+    public function cleanFolder($path);
 }

Please login to merge, or discard this patch.

lib/public/Files/Notify/IChange.php 1 patch

Indentation +22 added lines, -22 removed lines patch added patch discarded remove patch

@@ -29,28 +29,28 @@
 block discarded – undo
  * @since 12.0.0
  */
 interface IChange {
-	public const ADDED = 1;
-	public const REMOVED = 2;
-	public const MODIFIED = 3;
-	public const RENAMED = 4;
+    public const ADDED = 1;
+    public const REMOVED = 2;
+    public const MODIFIED = 3;
+    public const RENAMED = 4;
 
-	/**
-	 * Get the type of the change
-	 *
-	 * @return int IChange::ADDED, IChange::REMOVED, IChange::MODIFIED or IChange::RENAMED
-	 *
-	 * @since 12.0.0
-	 */
-	public function getType();
+    /**
+     * Get the type of the change
+     *
+     * @return int IChange::ADDED, IChange::REMOVED, IChange::MODIFIED or IChange::RENAMED
+     *
+     * @since 12.0.0
+     */
+    public function getType();
 
-	/**
-	 * Get the path of the file that was changed relative to the root of the storage
-	 *
-	 * Note, for rename changes this path is the old path for the file
-	 *
-	 * @return mixed
-	 *
-	 * @since 12.0.0
-	 */
-	public function getPath();
+    /**
+     * Get the path of the file that was changed relative to the root of the storage
+     *
+     * Note, for rename changes this path is the old path for the file
+     *
+     * @return mixed
+     *
+     * @since 12.0.0
+     */
+    public function getPath();
 }

Please login to merge, or discard this patch.

lib/public/Files/StorageNotAvailableException.php 1 patch

Indentation +44 added lines, -44 removed lines patch added patch discarded remove patch

@@ -44,50 +44,50 @@
 block discarded – undo
  * @since 6.0.0 - since 8.2.1 based on HintException
  */
 class StorageNotAvailableException extends HintException {
-	public const STATUS_SUCCESS = 0;
-	public const STATUS_ERROR = 1;
-	public const STATUS_INDETERMINATE = 2;
-	public const STATUS_INCOMPLETE_CONF = 3;
-	public const STATUS_UNAUTHORIZED = 4;
-	public const STATUS_TIMEOUT = 5;
-	public const STATUS_NETWORK_ERROR = 6;
+    public const STATUS_SUCCESS = 0;
+    public const STATUS_ERROR = 1;
+    public const STATUS_INDETERMINATE = 2;
+    public const STATUS_INCOMPLETE_CONF = 3;
+    public const STATUS_UNAUTHORIZED = 4;
+    public const STATUS_TIMEOUT = 5;
+    public const STATUS_NETWORK_ERROR = 6;
 
-	/**
-	 * StorageNotAvailableException constructor.
-	 *
-	 * @param string $message
-	 * @param int $code
-	 * @param \Exception|null $previous
-	 * @since 6.0.0
-	 */
-	public function __construct($message = '', $code = self::STATUS_ERROR, \Exception $previous = null) {
-		$l = \OC::$server->getL10N('core');
-		parent::__construct($message, $l->t('Storage is temporarily not available'), $code, $previous);
-	}
+    /**
+     * StorageNotAvailableException constructor.
+     *
+     * @param string $message
+     * @param int $code
+     * @param \Exception|null $previous
+     * @since 6.0.0
+     */
+    public function __construct($message = '', $code = self::STATUS_ERROR, \Exception $previous = null) {
+        $l = \OC::$server->getL10N('core');
+        parent::__construct($message, $l->t('Storage is temporarily not available'), $code, $previous);
+    }
 
-	/**
-	 * Get the name for a status code
-	 *
-	 * @param int $code
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public static function getStateCodeName($code) {
-		switch ($code) {
-			case self::STATUS_SUCCESS:
-				return 'ok';
-			case self::STATUS_ERROR:
-				return 'error';
-			case self::STATUS_INDETERMINATE:
-				return 'indeterminate';
-			case self::STATUS_UNAUTHORIZED:
-				return 'unauthorized';
-			case self::STATUS_TIMEOUT:
-				return 'timeout';
-			case self::STATUS_NETWORK_ERROR:
-				return 'network error';
-			default:
-				return 'unknown';
-		}
-	}
+    /**
+     * Get the name for a status code
+     *
+     * @param int $code
+     * @return string
+     * @since 9.0.0
+     */
+    public static function getStateCodeName($code) {
+        switch ($code) {
+            case self::STATUS_SUCCESS:
+                return 'ok';
+            case self::STATUS_ERROR:
+                return 'error';
+            case self::STATUS_INDETERMINATE:
+                return 'indeterminate';
+            case self::STATUS_UNAUTHORIZED:
+                return 'unauthorized';
+            case self::STATUS_TIMEOUT:
+                return 'timeout';
+            case self::STATUS_NETWORK_ERROR:
+                return 'network error';
+            default:
+                return 'unknown';
+        }
+    }
 }

Please login to merge, or discard this patch.

lib/public/Files/Search/ISearchBinaryOperator.php 1 patch

Indentation +21 added lines, -21 removed lines patch added patch discarded remove patch

@@ -27,27 +27,27 @@
 block discarded – undo
  * @since 12.0.0
  */
 interface ISearchBinaryOperator extends ISearchOperator {
-	public const OPERATOR_AND = 'and';
-	public const OPERATOR_OR = 'or';
-	public const OPERATOR_NOT = 'not';
+    public const OPERATOR_AND = 'and';
+    public const OPERATOR_OR = 'or';
+    public const OPERATOR_NOT = 'not';
 
-	/**
-	 * The type of binary operator
-	 *
-	 * One of the ISearchBinaryOperator::OPERATOR_* constants
-	 *
-	 * @return string
-	 * @since 12.0.0
-	 */
-	public function getType();
+    /**
+     * The type of binary operator
+     *
+     * One of the ISearchBinaryOperator::OPERATOR_* constants
+     *
+     * @return string
+     * @since 12.0.0
+     */
+    public function getType();
 
-	/**
-	 * The arguments for the binary operator
-	 *
-	 * One argument for the 'not' operator and two for 'and' and 'or'
-	 *
-	 * @return ISearchOperator[]
-	 * @since 12.0.0
-	 */
-	public function getArguments();
+    /**
+     * The arguments for the binary operator
+     *
+     * One argument for the 'not' operator and two for 'and' and 'or'
+     *
+     * @return ISearchOperator[]
+     * @since 12.0.0
+     */
+    public function getArguments();
 }

Please login to merge, or discard this patch.

lib/public/AppFramework/Http.php 1 patch

Indentation +59 added lines, -59 removed lines patch added patch discarded remove patch

@@ -34,63 +34,63 @@
 block discarded – undo
  * @since 6.0.0
  */
 class Http {
-	public const STATUS_CONTINUE = 100;
-	public const STATUS_SWITCHING_PROTOCOLS = 101;
-	public const STATUS_PROCESSING = 102;
-	public const STATUS_OK = 200;
-	public const STATUS_CREATED = 201;
-	public const STATUS_ACCEPTED = 202;
-	public const STATUS_NON_AUTHORATIVE_INFORMATION = 203;
-	public const STATUS_NO_CONTENT = 204;
-	public const STATUS_RESET_CONTENT = 205;
-	public const STATUS_PARTIAL_CONTENT = 206;
-	public const STATUS_MULTI_STATUS = 207;
-	public const STATUS_ALREADY_REPORTED = 208;
-	public const STATUS_IM_USED = 226;
-	public const STATUS_MULTIPLE_CHOICES = 300;
-	public const STATUS_MOVED_PERMANENTLY = 301;
-	public const STATUS_FOUND = 302;
-	public const STATUS_SEE_OTHER = 303;
-	public const STATUS_NOT_MODIFIED = 304;
-	public const STATUS_USE_PROXY = 305;
-	public const STATUS_RESERVED = 306;
-	public const STATUS_TEMPORARY_REDIRECT = 307;
-	public const STATUS_BAD_REQUEST = 400;
-	public const STATUS_UNAUTHORIZED = 401;
-	public const STATUS_PAYMENT_REQUIRED = 402;
-	public const STATUS_FORBIDDEN = 403;
-	public const STATUS_NOT_FOUND = 404;
-	public const STATUS_METHOD_NOT_ALLOWED = 405;
-	public const STATUS_NOT_ACCEPTABLE = 406;
-	public const STATUS_PROXY_AUTHENTICATION_REQUIRED = 407;
-	public const STATUS_REQUEST_TIMEOUT = 408;
-	public const STATUS_CONFLICT = 409;
-	public const STATUS_GONE = 410;
-	public const STATUS_LENGTH_REQUIRED = 411;
-	public const STATUS_PRECONDITION_FAILED = 412;
-	public const STATUS_REQUEST_ENTITY_TOO_LARGE = 413;
-	public const STATUS_REQUEST_URI_TOO_LONG = 414;
-	public const STATUS_UNSUPPORTED_MEDIA_TYPE = 415;
-	public const STATUS_REQUEST_RANGE_NOT_SATISFIABLE = 416;
-	public const STATUS_EXPECTATION_FAILED = 417;
-	public const STATUS_IM_A_TEAPOT = 418;
-	public const STATUS_UNPROCESSABLE_ENTITY = 422;
-	public const STATUS_LOCKED = 423;
-	public const STATUS_FAILED_DEPENDENCY = 424;
-	public const STATUS_UPGRADE_REQUIRED = 426;
-	public const STATUS_PRECONDITION_REQUIRED = 428;
-	public const STATUS_TOO_MANY_REQUESTS = 429;
-	public const STATUS_REQUEST_HEADER_FIELDS_TOO_LARGE = 431;
-	public const STATUS_INTERNAL_SERVER_ERROR = 500;
-	public const STATUS_NOT_IMPLEMENTED = 501;
-	public const STATUS_BAD_GATEWAY = 502;
-	public const STATUS_SERVICE_UNAVAILABLE = 503;
-	public const STATUS_GATEWAY_TIMEOUT = 504;
-	public const STATUS_HTTP_VERSION_NOT_SUPPORTED = 505;
-	public const STATUS_VARIANT_ALSO_NEGOTIATES = 506;
-	public const STATUS_INSUFFICIENT_STORAGE = 507;
-	public const STATUS_LOOP_DETECTED = 508;
-	public const STATUS_BANDWIDTH_LIMIT_EXCEEDED = 509;
-	public const STATUS_NOT_EXTENDED = 510;
-	public const STATUS_NETWORK_AUTHENTICATION_REQUIRED = 511;
+    public const STATUS_CONTINUE = 100;
+    public const STATUS_SWITCHING_PROTOCOLS = 101;
+    public const STATUS_PROCESSING = 102;
+    public const STATUS_OK = 200;
+    public const STATUS_CREATED = 201;
+    public const STATUS_ACCEPTED = 202;
+    public const STATUS_NON_AUTHORATIVE_INFORMATION = 203;
+    public const STATUS_NO_CONTENT = 204;
+    public const STATUS_RESET_CONTENT = 205;
+    public const STATUS_PARTIAL_CONTENT = 206;
+    public const STATUS_MULTI_STATUS = 207;
+    public const STATUS_ALREADY_REPORTED = 208;
+    public const STATUS_IM_USED = 226;
+    public const STATUS_MULTIPLE_CHOICES = 300;
+    public const STATUS_MOVED_PERMANENTLY = 301;
+    public const STATUS_FOUND = 302;
+    public const STATUS_SEE_OTHER = 303;
+    public const STATUS_NOT_MODIFIED = 304;
+    public const STATUS_USE_PROXY = 305;
+    public const STATUS_RESERVED = 306;
+    public const STATUS_TEMPORARY_REDIRECT = 307;
+    public const STATUS_BAD_REQUEST = 400;
+    public const STATUS_UNAUTHORIZED = 401;
+    public const STATUS_PAYMENT_REQUIRED = 402;
+    public const STATUS_FORBIDDEN = 403;
+    public const STATUS_NOT_FOUND = 404;
+    public const STATUS_METHOD_NOT_ALLOWED = 405;
+    public const STATUS_NOT_ACCEPTABLE = 406;
+    public const STATUS_PROXY_AUTHENTICATION_REQUIRED = 407;
+    public const STATUS_REQUEST_TIMEOUT = 408;
+    public const STATUS_CONFLICT = 409;
+    public const STATUS_GONE = 410;
+    public const STATUS_LENGTH_REQUIRED = 411;
+    public const STATUS_PRECONDITION_FAILED = 412;
+    public const STATUS_REQUEST_ENTITY_TOO_LARGE = 413;
+    public const STATUS_REQUEST_URI_TOO_LONG = 414;
+    public const STATUS_UNSUPPORTED_MEDIA_TYPE = 415;
+    public const STATUS_REQUEST_RANGE_NOT_SATISFIABLE = 416;
+    public const STATUS_EXPECTATION_FAILED = 417;
+    public const STATUS_IM_A_TEAPOT = 418;
+    public const STATUS_UNPROCESSABLE_ENTITY = 422;
+    public const STATUS_LOCKED = 423;
+    public const STATUS_FAILED_DEPENDENCY = 424;
+    public const STATUS_UPGRADE_REQUIRED = 426;
+    public const STATUS_PRECONDITION_REQUIRED = 428;
+    public const STATUS_TOO_MANY_REQUESTS = 429;
+    public const STATUS_REQUEST_HEADER_FIELDS_TOO_LARGE = 431;
+    public const STATUS_INTERNAL_SERVER_ERROR = 500;
+    public const STATUS_NOT_IMPLEMENTED = 501;
+    public const STATUS_BAD_GATEWAY = 502;
+    public const STATUS_SERVICE_UNAVAILABLE = 503;
+    public const STATUS_GATEWAY_TIMEOUT = 504;
+    public const STATUS_HTTP_VERSION_NOT_SUPPORTED = 505;
+    public const STATUS_VARIANT_ALSO_NEGOTIATES = 506;
+    public const STATUS_INSUFFICIENT_STORAGE = 507;
+    public const STATUS_LOOP_DETECTED = 508;
+    public const STATUS_BANDWIDTH_LIMIT_EXCEEDED = 509;
+    public const STATUS_NOT_EXTENDED = 510;
+    public const STATUS_NETWORK_AUTHENTICATION_REQUIRED = 511;
 }

Please login to merge, or discard this patch.

		@@ -35,99 +35,99 @@
		block discarded – undo
35	35	use OCP\IUser;
36	36
37	37	class LegacyTrashBackend implements ITrashBackend {
38		- /** @var array */
39		- private $deletedFiles = [];
	38	+ /** @var array */
	39	+ private $deletedFiles = [];
40	40
41		- /** @var IRootFolder */
42		- private $rootFolder;
	41	+ /** @var IRootFolder */
	42	+ private $rootFolder;
43	43
44		- public function __construct(IRootFolder $rootFolder) {
45		- $this->rootFolder = $rootFolder;
46		- }
	44	+ public function __construct(IRootFolder $rootFolder) {
	45	+ $this->rootFolder = $rootFolder;
	46	+ }
47	47
48		- /**
49		- * @param array $items
50		- * @param IUser $user
51		- * @param ITrashItem $parent
52		- * @return ITrashItem[]
53		- */
54		- private function mapTrashItems(array $items, IUser $user, ITrashItem $parent = null): array {
55		- $parentTrashPath = ($parent instanceof ITrashItem) ? $parent->getTrashPath() : '';
56		- $isRoot = $parent === null;
57		- return array_map(function (FileInfo $file) use ($parent, $parentTrashPath, $isRoot, $user) {
58		- $originalLocation = $isRoot ? $file['extraData'] : $parent->getOriginalLocation() . '/' . $file->getName();
59		- if (!$originalLocation) {
60		- $originalLocation = $file->getName();
61		- }
62		- return new TrashItem(
63		- $this,
64		- $originalLocation,
65		- $file->getMTime(),
66		- $parentTrashPath . '/' . $file->getName() . ($isRoot ? '.d' . $file->getMtime() : ''),
67		- $file,
68		- $user
69		- );
70		- }, $items);
71		- }
	48	+ /**
	49	+ * @param array $items
	50	+ * @param IUser $user
	51	+ * @param ITrashItem $parent
	52	+ * @return ITrashItem[]
	53	+ */
	54	+ private function mapTrashItems(array $items, IUser $user, ITrashItem $parent = null): array {
	55	+ $parentTrashPath = ($parent instanceof ITrashItem) ? $parent->getTrashPath() : '';
	56	+ $isRoot = $parent === null;
	57	+ return array_map(function (FileInfo $file) use ($parent, $parentTrashPath, $isRoot, $user) {
	58	+ $originalLocation = $isRoot ? $file['extraData'] : $parent->getOriginalLocation() . '/' . $file->getName();
	59	+ if (!$originalLocation) {
	60	+ $originalLocation = $file->getName();
	61	+ }
	62	+ return new TrashItem(
	63	+ $this,
	64	+ $originalLocation,
	65	+ $file->getMTime(),
	66	+ $parentTrashPath . '/' . $file->getName() . ($isRoot ? '.d' . $file->getMtime() : ''),
	67	+ $file,
	68	+ $user
	69	+ );
	70	+ }, $items);
	71	+ }
72	72
73		- public function listTrashRoot(IUser $user): array {
74		- $entries = Helper::getTrashFiles('/', $user->getUID());
75		- return $this->mapTrashItems($entries, $user);
76		- }
	73	+ public function listTrashRoot(IUser $user): array {
	74	+ $entries = Helper::getTrashFiles('/', $user->getUID());
	75	+ return $this->mapTrashItems($entries, $user);
	76	+ }
77	77
78		- public function listTrashFolder(ITrashItem $folder): array {
79		- $user = $folder->getUser();
80		- $entries = Helper::getTrashFiles($folder->getTrashPath(), $user->getUID());
81		- return $this->mapTrashItems($entries, $user ,$folder);
82		- }
	78	+ public function listTrashFolder(ITrashItem $folder): array {
	79	+ $user = $folder->getUser();
	80	+ $entries = Helper::getTrashFiles($folder->getTrashPath(), $user->getUID());
	81	+ return $this->mapTrashItems($entries, $user ,$folder);
	82	+ }
83	83
84		- public function restoreItem(ITrashItem $item) {
85		- Trashbin::restore($item->getTrashPath(), $item->getName(), $item->isRootItem() ? $item->getDeletedTime() : null);
86		- }
	84	+ public function restoreItem(ITrashItem $item) {
	85	+ Trashbin::restore($item->getTrashPath(), $item->getName(), $item->isRootItem() ? $item->getDeletedTime() : null);
	86	+ }
87	87
88		- public function removeItem(ITrashItem $item) {
89		- $user = $item->getUser();
90		- if ($item->isRootItem()) {
91		- $path = substr($item->getTrashPath(), 0, -strlen('.d' . $item->getDeletedTime()));
92		- Trashbin::delete($path, $user->getUID(), $item->getDeletedTime());
93		- } else {
94		- Trashbin::delete($item->getTrashPath(), $user->getUID(), null);
95		- }
96		- }
	88	+ public function removeItem(ITrashItem $item) {
	89	+ $user = $item->getUser();
	90	+ if ($item->isRootItem()) {
	91	+ $path = substr($item->getTrashPath(), 0, -strlen('.d' . $item->getDeletedTime()));
	92	+ Trashbin::delete($path, $user->getUID(), $item->getDeletedTime());
	93	+ } else {
	94	+ Trashbin::delete($item->getTrashPath(), $user->getUID(), null);
	95	+ }
	96	+ }
97	97
98		- public function moveToTrash(IStorage $storage, string $internalPath): bool {
99		- if (!$storage instanceof Storage) {
100		- return false;
101		- }
102		- $normalized = Filesystem::normalizePath($storage->getMountPoint() . '/' . $internalPath, true, false, true);
103		- $view = Filesystem::getView();
104		- if (!isset($this->deletedFiles[$normalized]) && $view instanceof View) {
105		- $this->deletedFiles[$normalized] = $normalized;
106		- if ($filesPath = $view->getRelativePath($normalized)) {
107		- $filesPath = trim($filesPath, '/');
108		- $result = \OCA\Files_Trashbin\Trashbin::move2trash($filesPath);
109		- } else {
110		- $result = false;
111		- }
112		- unset($this->deletedFiles[$normalized]);
113		- } else {
114		- $result = false;
115		- }
	98	+ public function moveToTrash(IStorage $storage, string $internalPath): bool {
	99	+ if (!$storage instanceof Storage) {
	100	+ return false;
	101	+ }
	102	+ $normalized = Filesystem::normalizePath($storage->getMountPoint() . '/' . $internalPath, true, false, true);
	103	+ $view = Filesystem::getView();
	104	+ if (!isset($this->deletedFiles[$normalized]) && $view instanceof View) {
	105	+ $this->deletedFiles[$normalized] = $normalized;
	106	+ if ($filesPath = $view->getRelativePath($normalized)) {
	107	+ $filesPath = trim($filesPath, '/');
	108	+ $result = \OCA\Files_Trashbin\Trashbin::move2trash($filesPath);
	109	+ } else {
	110	+ $result = false;
	111	+ }
	112	+ unset($this->deletedFiles[$normalized]);
	113	+ } else {
	114	+ $result = false;
	115	+ }
116	116
117		- return $result;
118		- }
	117	+ return $result;
	118	+ }
119	119
120		- public function getTrashNodeById(IUser $user, int $fileId) {
121		- try {
122		- $userFolder = $this->rootFolder->getUserFolder($user->getUID());
123		- $trash = $userFolder->getParent()->get('files_trashbin/files');
124		- $trashFiles = $trash->getById($fileId);
125		- if (!$trashFiles) {
126		- return null;
127		- }
128		- return $trashFiles ? array_pop($trashFiles) : null;
129		- } catch (NotFoundException $e) {
130		- return null;
131		- }
132		- }
	120	+ public function getTrashNodeById(IUser $user, int $fileId) {
	121	+ try {
	122	+ $userFolder = $this->rootFolder->getUserFolder($user->getUID());
	123	+ $trash = $userFolder->getParent()->get('files_trashbin/files');
	124	+ $trashFiles = $trash->getById($fileId);
	125	+ if (!$trashFiles) {
	126	+ return null;
	127	+ }
	128	+ return $trashFiles ? array_pop($trashFiles) : null;
	129	+ } catch (NotFoundException $e) {
	130	+ return null;
	131	+ }
	132	+ }
133	133	}

		@@ -28,42 +28,42 @@
		block discarded – undo
28	28	use OCP\Migration\SimpleMigrationStep;
29	29
30	30	class Version14000Date20180626223656 extends SimpleMigrationStep {
31		- public function changeSchema(\OCP\Migration\IOutput $output, \Closure $schemaClosure, array $options) {
32		- /** @var ISchemaWrapper $schema */
33		- $schema = $schemaClosure();
34		- if (!$schema->hasTable('whats_new')) {
35		- $table = $schema->createTable('whats_new');
36		- $table->addColumn('id', 'integer', [
37		- 'autoincrement' => true,
38		- 'notnull' => true,
39		- 'length' => 4,
40		- 'unsigned' => true,
41		- ]);
42		- $table->addColumn('version', 'string', [
43		- 'notnull' => true,
44		- 'length' => 64,
45		- 'default' => '11',
46		- ]);
47		- $table->addColumn('etag', 'string', [
48		- 'notnull' => true,
49		- 'length' => 64,
50		- 'default' => '',
51		- ]);
52		- $table->addColumn('last_check', 'integer', [
53		- 'notnull' => true,
54		- 'length' => 4,
55		- 'unsigned' => true,
56		- 'default' => 0,
57		- ]);
58		- $table->addColumn('data', 'text', [
59		- 'notnull' => true,
60		- 'default' => '',
61		- ]);
62		- $table->setPrimaryKey(['id']);
63		- $table->addUniqueIndex(['version'], 'version');
64		- $table->addIndex(['version', 'etag'], 'version_etag_idx');
65		- }
	31	+ public function changeSchema(\OCP\Migration\IOutput $output, \Closure $schemaClosure, array $options) {
	32	+ /** @var ISchemaWrapper $schema */
	33	+ $schema = $schemaClosure();
	34	+ if (!$schema->hasTable('whats_new')) {
	35	+ $table = $schema->createTable('whats_new');
	36	+ $table->addColumn('id', 'integer', [
	37	+ 'autoincrement' => true,
	38	+ 'notnull' => true,
	39	+ 'length' => 4,
	40	+ 'unsigned' => true,
	41	+ ]);
	42	+ $table->addColumn('version', 'string', [
	43	+ 'notnull' => true,
	44	+ 'length' => 64,
	45	+ 'default' => '11',
	46	+ ]);
	47	+ $table->addColumn('etag', 'string', [
	48	+ 'notnull' => true,
	49	+ 'length' => 64,
	50	+ 'default' => '',
	51	+ ]);
	52	+ $table->addColumn('last_check', 'integer', [
	53	+ 'notnull' => true,
	54	+ 'length' => 4,
	55	+ 'unsigned' => true,
	56	+ 'default' => 0,
	57	+ ]);
	58	+ $table->addColumn('data', 'text', [
	59	+ 'notnull' => true,
	60	+ 'default' => '',
	61	+ ]);
	62	+ $table->setPrimaryKey(['id']);
	63	+ $table->addUniqueIndex(['version'], 'version');
	64	+ $table->addIndex(['version', 'etag'], 'version_etag_idx');
	65	+ }
66	66
67		- return $schema;
68		- }
	67	+ return $schema;
	68	+ }
69	69	}

		@@ -10,36 +10,36 @@
		block discarded – undo
10	10	use OCP\Migration\SimpleMigrationStep;
11	11
12	12	class Version19000Date20200211083441 extends SimpleMigrationStep {
13		- public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
14		- /** @var ISchemaWrapper $schema */
15		- $schema = $schemaClosure();
	13	+ public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
	14	+ /** @var ISchemaWrapper $schema */
	15	+ $schema = $schemaClosure();
16	16
17		- if (!$schema->hasTable('webauthn')) {
18		- $table = $schema->createTable('webauthn');
19		- $table->addColumn('id', 'integer', [
20		- 'autoincrement' => true,
21		- 'notnull' => true,
22		- 'length' => 64,
23		- ]);
24		- $table->addColumn('uid', 'string', [
25		- 'notnull' => true,
26		- 'length' => 64,
27		- ]);
28		- $table->addColumn('name', 'string', [
29		- 'notnull' => true,
30		- 'length' => 64,
31		- ]);
32		- $table->addColumn('public_key_credential_id', 'string', [
33		- 'notnull' => true,
34		- 'length' => 255
35		- ]);
36		- $table->addColumn('data', 'text', [
37		- 'notnull' => true,
38		- ]);
39		- $table->setPrimaryKey(['id']);
40		- $table->addIndex(['uid'], 'webauthn_uid');
41		- $table->addIndex(['public_key_credential_id'], 'webauthn_publicKeyCredentialId');
42		- }
43		- return $schema;
44		- }
	17	+ if (!$schema->hasTable('webauthn')) {
	18	+ $table = $schema->createTable('webauthn');
	19	+ $table->addColumn('id', 'integer', [
	20	+ 'autoincrement' => true,
	21	+ 'notnull' => true,
	22	+ 'length' => 64,
	23	+ ]);
	24	+ $table->addColumn('uid', 'string', [
	25	+ 'notnull' => true,
	26	+ 'length' => 64,
	27	+ ]);
	28	+ $table->addColumn('name', 'string', [
	29	+ 'notnull' => true,
	30	+ 'length' => 64,
	31	+ ]);
	32	+ $table->addColumn('public_key_credential_id', 'string', [
	33	+ 'notnull' => true,
	34	+ 'length' => 255
	35	+ ]);
	36	+ $table->addColumn('data', 'text', [
	37	+ 'notnull' => true,
	38	+ ]);
	39	+ $table->setPrimaryKey(['id']);
	40	+ $table->addIndex(['uid'], 'webauthn_uid');
	41	+ $table->addIndex(['public_key_credential_id'], 'webauthn_publicKeyCredentialId');
	42	+ }
	43	+ return $schema;
	44	+ }
45	45	}

		@@ -33,31 +33,31 @@
		block discarded – undo
33	33	use OCP\Migration\SimpleMigrationStep;
34	34
35	35	class Version14000Date20180522074438 extends SimpleMigrationStep {
36		- public function changeSchema(IOutput $output, Closure $schemaClosure,
37		- array $options): ISchemaWrapper {
38		- $schema = $schemaClosure();
	36	+ public function changeSchema(IOutput $output, Closure $schemaClosure,
	37	+ array $options): ISchemaWrapper {
	38	+ $schema = $schemaClosure();
39	39
40		- if (!$schema->hasTable('twofactor_providers')) {
41		- $table = $schema->createTable('twofactor_providers');
42		- $table->addColumn('provider_id', 'string',
43		- [
44		- 'notnull' => true,
45		- 'length' => 32,
46		- ]);
47		- $table->addColumn('uid', 'string',
48		- [
49		- 'notnull' => true,
50		- 'length' => 64,
51		- ]);
52		- $table->addColumn('enabled', 'smallint',
53		- [
54		- 'notnull' => true,
55		- 'length' => 1,
56		- ]);
57		- $table->setPrimaryKey(['provider_id', 'uid']);
58		- $table->addIndex(['uid'], 'twofactor_providers_uid');
59		- }
	40	+ if (!$schema->hasTable('twofactor_providers')) {
	41	+ $table = $schema->createTable('twofactor_providers');
	42	+ $table->addColumn('provider_id', 'string',
	43	+ [
	44	+ 'notnull' => true,
	45	+ 'length' => 32,
	46	+ ]);
	47	+ $table->addColumn('uid', 'string',
	48	+ [
	49	+ 'notnull' => true,
	50	+ 'length' => 64,
	51	+ ]);
	52	+ $table->addColumn('enabled', 'smallint',
	53	+ [
	54	+ 'notnull' => true,
	55	+ 'length' => 1,
	56	+ ]);
	57	+ $table->setPrimaryKey(['provider_id', 'uid']);
	58	+ $table->addIndex(['uid'], 'twofactor_providers_uid');
	59	+ }
60	60
61		- return $schema;
62		- }
	61	+ return $schema;
	62	+ }
63	63	}

		@@ -28,56 +28,56 @@
		block discarded – undo
28	28	* @since 9.0.0
29	29	*/
30	30	interface IWatcher {
31		- public const CHECK_NEVER = 0; // never check the underlying filesystem for updates
32		- public const CHECK_ONCE = 1; // check the underlying filesystem for updates once every request for each file
33		- public const CHECK_ALWAYS = 2; // always check the underlying filesystem for updates
	31	+ public const CHECK_NEVER = 0; // never check the underlying filesystem for updates
	32	+ public const CHECK_ONCE = 1; // check the underlying filesystem for updates once every request for each file
	33	+ public const CHECK_ALWAYS = 2; // always check the underlying filesystem for updates
34	34
35		- /**
36		- * @param int $policy either IWatcher::CHECK_NEVER, IWatcher::CHECK_ONCE, IWatcher::CHECK_ALWAYS
37		- * @since 9.0.0
38		- */
39		- public function setPolicy($policy);
	35	+ /**
	36	+ * @param int $policy either IWatcher::CHECK_NEVER, IWatcher::CHECK_ONCE, IWatcher::CHECK_ALWAYS
	37	+ * @since 9.0.0
	38	+ */
	39	+ public function setPolicy($policy);
40	40
41		- /**
42		- * @return int either IWatcher::CHECK_NEVER, IWatcher::CHECK_ONCE, IWatcher::CHECK_ALWAYS
43		- * @since 9.0.0
44		- */
45		- public function getPolicy();
	41	+ /**
	42	+ * @return int either IWatcher::CHECK_NEVER, IWatcher::CHECK_ONCE, IWatcher::CHECK_ALWAYS
	43	+ * @since 9.0.0
	44	+ */
	45	+ public function getPolicy();
46	46
47		- /**
48		- * check $path for updates and update if needed
49		- *
50		- * @param string $path
51		- * @param ICacheEntry\|null $cachedEntry
52		- * @return boolean true if path was updated
53		- * @since 9.0.0
54		- */
55		- public function checkUpdate($path, $cachedEntry = null);
	47	+ /**
	48	+ * check $path for updates and update if needed
	49	+ *
	50	+ * @param string $path
	51	+ * @param ICacheEntry\|null $cachedEntry
	52	+ * @return boolean true if path was updated
	53	+ * @since 9.0.0
	54	+ */
	55	+ public function checkUpdate($path, $cachedEntry = null);
56	56
57		- /**
58		- * Update the cache for changes to $path
59		- *
60		- * @param string $path
61		- * @param ICacheEntry $cachedData
62		- * @since 9.0.0
63		- */
64		- public function update($path, $cachedData);
	57	+ /**
	58	+ * Update the cache for changes to $path
	59	+ *
	60	+ * @param string $path
	61	+ * @param ICacheEntry $cachedData
	62	+ * @since 9.0.0
	63	+ */
	64	+ public function update($path, $cachedData);
65	65
66		- /**
67		- * Check if the cache for $path needs to be updated
68		- *
69		- * @param string $path
70		- * @param ICacheEntry $cachedData
71		- * @return bool
72		- * @since 9.0.0
73		- */
74		- public function needsUpdate($path, $cachedData);
	66	+ /**
	67	+ * Check if the cache for $path needs to be updated
	68	+ *
	69	+ * @param string $path
	70	+ * @param ICacheEntry $cachedData
	71	+ * @return bool
	72	+ * @since 9.0.0
	73	+ */
	74	+ public function needsUpdate($path, $cachedData);
75	75
76		- /**
77		- * remove deleted files in $path from the cache
78		- *
79		- * @param string $path
80		- * @since 9.0.0
81		- */
82		- public function cleanFolder($path);
	76	+ /**
	77	+ * remove deleted files in $path from the cache
	78	+ *
	79	+ * @param string $path
	80	+ * @since 9.0.0
	81	+ */
	82	+ public function cleanFolder($path);
83	83	}

		@@ -29,28 +29,28 @@
		block discarded – undo
29	29	* @since 12.0.0
30	30	*/
31	31	interface IChange {
32		- public const ADDED = 1;
33		- public const REMOVED = 2;
34		- public const MODIFIED = 3;
35		- public const RENAMED = 4;
	32	+ public const ADDED = 1;
	33	+ public const REMOVED = 2;
	34	+ public const MODIFIED = 3;
	35	+ public const RENAMED = 4;
36	36
37		- /**
38		- * Get the type of the change
39		- *
40		- * @return int IChange::ADDED, IChange::REMOVED, IChange::MODIFIED or IChange::RENAMED
41		- *
42		- * @since 12.0.0
43		- */
44		- public function getType();
	37	+ /**
	38	+ * Get the type of the change
	39	+ *
	40	+ * @return int IChange::ADDED, IChange::REMOVED, IChange::MODIFIED or IChange::RENAMED
	41	+ *
	42	+ * @since 12.0.0
	43	+ */
	44	+ public function getType();
45	45
46		- /**
47		- * Get the path of the file that was changed relative to the root of the storage
48		- *
49		- * Note, for rename changes this path is the old path for the file
50		- *
51		- * @return mixed
52		- *
53		- * @since 12.0.0
54		- */
55		- public function getPath();
	46	+ /**
	47	+ * Get the path of the file that was changed relative to the root of the storage
	48	+ *
	49	+ * Note, for rename changes this path is the old path for the file
	50	+ *
	51	+ * @return mixed
	52	+ *
	53	+ * @since 12.0.0
	54	+ */
	55	+ public function getPath();
56	56	}

		@@ -44,50 +44,50 @@
		block discarded – undo
44	44	* @since 6.0.0 - since 8.2.1 based on HintException
45	45	*/
46	46	class StorageNotAvailableException extends HintException {
47		- public const STATUS_SUCCESS = 0;
48		- public const STATUS_ERROR = 1;
49		- public const STATUS_INDETERMINATE = 2;
50		- public const STATUS_INCOMPLETE_CONF = 3;
51		- public const STATUS_UNAUTHORIZED = 4;
52		- public const STATUS_TIMEOUT = 5;
53		- public const STATUS_NETWORK_ERROR = 6;
	47	+ public const STATUS_SUCCESS = 0;
	48	+ public const STATUS_ERROR = 1;
	49	+ public const STATUS_INDETERMINATE = 2;
	50	+ public const STATUS_INCOMPLETE_CONF = 3;
	51	+ public const STATUS_UNAUTHORIZED = 4;
	52	+ public const STATUS_TIMEOUT = 5;
	53	+ public const STATUS_NETWORK_ERROR = 6;
54	54
55		- /**
56		- * StorageNotAvailableException constructor.
57		- *
58		- * @param string $message
59		- * @param int $code
60		- * @param \Exception\|null $previous
61		- * @since 6.0.0
62		- */
63		- public function __construct($message = '', $code = self::STATUS_ERROR, \Exception $previous = null) {
64		- $l = \OC::$server->getL10N('core');
65		- parent::__construct($message, $l->t('Storage is temporarily not available'), $code, $previous);
66		- }
	55	+ /**
	56	+ * StorageNotAvailableException constructor.
	57	+ *
	58	+ * @param string $message
	59	+ * @param int $code
	60	+ * @param \Exception\|null $previous
	61	+ * @since 6.0.0
	62	+ */
	63	+ public function __construct($message = '', $code = self::STATUS_ERROR, \Exception $previous = null) {
	64	+ $l = \OC::$server->getL10N('core');
	65	+ parent::__construct($message, $l->t('Storage is temporarily not available'), $code, $previous);
	66	+ }
67	67
68		- /**
69		- * Get the name for a status code
70		- *
71		- * @param int $code
72		- * @return string
73		- * @since 9.0.0
74		- */
75		- public static function getStateCodeName($code) {
76		- switch ($code) {
77		- case self::STATUS_SUCCESS:
78		- return 'ok';
79		- case self::STATUS_ERROR:
80		- return 'error';
81		- case self::STATUS_INDETERMINATE:
82		- return 'indeterminate';
83		- case self::STATUS_UNAUTHORIZED:
84		- return 'unauthorized';
85		- case self::STATUS_TIMEOUT:
86		- return 'timeout';
87		- case self::STATUS_NETWORK_ERROR:
88		- return 'network error';
89		- default:
90		- return 'unknown';
91		- }
92		- }
	68	+ /**
	69	+ * Get the name for a status code
	70	+ *
	71	+ * @param int $code
	72	+ * @return string
	73	+ * @since 9.0.0
	74	+ */
	75	+ public static function getStateCodeName($code) {
	76	+ switch ($code) {
	77	+ case self::STATUS_SUCCESS:
	78	+ return 'ok';
	79	+ case self::STATUS_ERROR:
	80	+ return 'error';
	81	+ case self::STATUS_INDETERMINATE:
	82	+ return 'indeterminate';
	83	+ case self::STATUS_UNAUTHORIZED:
	84	+ return 'unauthorized';
	85	+ case self::STATUS_TIMEOUT:
	86	+ return 'timeout';
	87	+ case self::STATUS_NETWORK_ERROR:
	88	+ return 'network error';
	89	+ default:
	90	+ return 'unknown';
	91	+ }
	92	+ }
93	93	}

		@@ -27,27 +27,27 @@
		block discarded – undo
27	27	* @since 12.0.0
28	28	*/
29	29	interface ISearchBinaryOperator extends ISearchOperator {
30		- public const OPERATOR_AND = 'and';
31		- public const OPERATOR_OR = 'or';
32		- public const OPERATOR_NOT = 'not';
	30	+ public const OPERATOR_AND = 'and';
	31	+ public const OPERATOR_OR = 'or';
	32	+ public const OPERATOR_NOT = 'not';
33	33
34		- /**
35		- * The type of binary operator
36		- *
37		- * One of the ISearchBinaryOperator::OPERATOR_* constants
38		- *
39		- * @return string
40		- * @since 12.0.0
41		- */
42		- public function getType();
	34	+ /**
	35	+ * The type of binary operator
	36	+ *
	37	+ * One of the ISearchBinaryOperator::OPERATOR_* constants
	38	+ *
	39	+ * @return string
	40	+ * @since 12.0.0
	41	+ */
	42	+ public function getType();
43	43
44		- /**
45		- * The arguments for the binary operator
46		- *
47		- * One argument for the 'not' operator and two for 'and' and 'or'
48		- *
49		- * @return ISearchOperator[]
50		- * @since 12.0.0
51		- */
52		- public function getArguments();
	44	+ /**
	45	+ * The arguments for the binary operator
	46	+ *
	47	+ * One argument for the 'not' operator and two for 'and' and 'or'
	48	+ *
	49	+ * @return ISearchOperator[]
	50	+ * @since 12.0.0
	51	+ */
	52	+ public function getArguments();
53	53	}

		@@ -34,63 +34,63 @@
		block discarded – undo
34	34	* @since 6.0.0
35	35	*/
36	36	class Http {
37		- public const STATUS_CONTINUE = 100;
38		- public const STATUS_SWITCHING_PROTOCOLS = 101;
39		- public const STATUS_PROCESSING = 102;
40		- public const STATUS_OK = 200;
41		- public const STATUS_CREATED = 201;
42		- public const STATUS_ACCEPTED = 202;
43		- public const STATUS_NON_AUTHORATIVE_INFORMATION = 203;
44		- public const STATUS_NO_CONTENT = 204;
45		- public const STATUS_RESET_CONTENT = 205;
46		- public const STATUS_PARTIAL_CONTENT = 206;
47		- public const STATUS_MULTI_STATUS = 207;
48		- public const STATUS_ALREADY_REPORTED = 208;
49		- public const STATUS_IM_USED = 226;
50		- public const STATUS_MULTIPLE_CHOICES = 300;
51		- public const STATUS_MOVED_PERMANENTLY = 301;
52		- public const STATUS_FOUND = 302;
53		- public const STATUS_SEE_OTHER = 303;
54		- public const STATUS_NOT_MODIFIED = 304;
55		- public const STATUS_USE_PROXY = 305;
56		- public const STATUS_RESERVED = 306;
57		- public const STATUS_TEMPORARY_REDIRECT = 307;
58		- public const STATUS_BAD_REQUEST = 400;
59		- public const STATUS_UNAUTHORIZED = 401;
60		- public const STATUS_PAYMENT_REQUIRED = 402;
61		- public const STATUS_FORBIDDEN = 403;
62		- public const STATUS_NOT_FOUND = 404;
63		- public const STATUS_METHOD_NOT_ALLOWED = 405;
64		- public const STATUS_NOT_ACCEPTABLE = 406;
65		- public const STATUS_PROXY_AUTHENTICATION_REQUIRED = 407;
66		- public const STATUS_REQUEST_TIMEOUT = 408;
67		- public const STATUS_CONFLICT = 409;
68		- public const STATUS_GONE = 410;
69		- public const STATUS_LENGTH_REQUIRED = 411;
70		- public const STATUS_PRECONDITION_FAILED = 412;
71		- public const STATUS_REQUEST_ENTITY_TOO_LARGE = 413;
72		- public const STATUS_REQUEST_URI_TOO_LONG = 414;
73		- public const STATUS_UNSUPPORTED_MEDIA_TYPE = 415;
74		- public const STATUS_REQUEST_RANGE_NOT_SATISFIABLE = 416;
75		- public const STATUS_EXPECTATION_FAILED = 417;
76		- public const STATUS_IM_A_TEAPOT = 418;
77		- public const STATUS_UNPROCESSABLE_ENTITY = 422;
78		- public const STATUS_LOCKED = 423;
79		- public const STATUS_FAILED_DEPENDENCY = 424;
80		- public const STATUS_UPGRADE_REQUIRED = 426;
81		- public const STATUS_PRECONDITION_REQUIRED = 428;
82		- public const STATUS_TOO_MANY_REQUESTS = 429;
83		- public const STATUS_REQUEST_HEADER_FIELDS_TOO_LARGE = 431;
84		- public const STATUS_INTERNAL_SERVER_ERROR = 500;
85		- public const STATUS_NOT_IMPLEMENTED = 501;
86		- public const STATUS_BAD_GATEWAY = 502;
87		- public const STATUS_SERVICE_UNAVAILABLE = 503;
88		- public const STATUS_GATEWAY_TIMEOUT = 504;
89		- public const STATUS_HTTP_VERSION_NOT_SUPPORTED = 505;
90		- public const STATUS_VARIANT_ALSO_NEGOTIATES = 506;
91		- public const STATUS_INSUFFICIENT_STORAGE = 507;
92		- public const STATUS_LOOP_DETECTED = 508;
93		- public const STATUS_BANDWIDTH_LIMIT_EXCEEDED = 509;
94		- public const STATUS_NOT_EXTENDED = 510;
95		- public const STATUS_NETWORK_AUTHENTICATION_REQUIRED = 511;
	37	+ public const STATUS_CONTINUE = 100;
	38	+ public const STATUS_SWITCHING_PROTOCOLS = 101;
	39	+ public const STATUS_PROCESSING = 102;
	40	+ public const STATUS_OK = 200;
	41	+ public const STATUS_CREATED = 201;
	42	+ public const STATUS_ACCEPTED = 202;
	43	+ public const STATUS_NON_AUTHORATIVE_INFORMATION = 203;
	44	+ public const STATUS_NO_CONTENT = 204;
	45	+ public const STATUS_RESET_CONTENT = 205;
	46	+ public const STATUS_PARTIAL_CONTENT = 206;
	47	+ public const STATUS_MULTI_STATUS = 207;
	48	+ public const STATUS_ALREADY_REPORTED = 208;
	49	+ public const STATUS_IM_USED = 226;
	50	+ public const STATUS_MULTIPLE_CHOICES = 300;
	51	+ public const STATUS_MOVED_PERMANENTLY = 301;
	52	+ public const STATUS_FOUND = 302;
	53	+ public const STATUS_SEE_OTHER = 303;
	54	+ public const STATUS_NOT_MODIFIED = 304;
	55	+ public const STATUS_USE_PROXY = 305;
	56	+ public const STATUS_RESERVED = 306;
	57	+ public const STATUS_TEMPORARY_REDIRECT = 307;
	58	+ public const STATUS_BAD_REQUEST = 400;
	59	+ public const STATUS_UNAUTHORIZED = 401;
	60	+ public const STATUS_PAYMENT_REQUIRED = 402;
	61	+ public const STATUS_FORBIDDEN = 403;
	62	+ public const STATUS_NOT_FOUND = 404;
	63	+ public const STATUS_METHOD_NOT_ALLOWED = 405;
	64	+ public const STATUS_NOT_ACCEPTABLE = 406;
	65	+ public const STATUS_PROXY_AUTHENTICATION_REQUIRED = 407;
	66	+ public const STATUS_REQUEST_TIMEOUT = 408;
	67	+ public const STATUS_CONFLICT = 409;
	68	+ public const STATUS_GONE = 410;
	69	+ public const STATUS_LENGTH_REQUIRED = 411;
	70	+ public const STATUS_PRECONDITION_FAILED = 412;
	71	+ public const STATUS_REQUEST_ENTITY_TOO_LARGE = 413;
	72	+ public const STATUS_REQUEST_URI_TOO_LONG = 414;
	73	+ public const STATUS_UNSUPPORTED_MEDIA_TYPE = 415;
	74	+ public const STATUS_REQUEST_RANGE_NOT_SATISFIABLE = 416;
	75	+ public const STATUS_EXPECTATION_FAILED = 417;
	76	+ public const STATUS_IM_A_TEAPOT = 418;
	77	+ public const STATUS_UNPROCESSABLE_ENTITY = 422;
	78	+ public const STATUS_LOCKED = 423;
	79	+ public const STATUS_FAILED_DEPENDENCY = 424;
	80	+ public const STATUS_UPGRADE_REQUIRED = 426;
	81	+ public const STATUS_PRECONDITION_REQUIRED = 428;
	82	+ public const STATUS_TOO_MANY_REQUESTS = 429;
	83	+ public const STATUS_REQUEST_HEADER_FIELDS_TOO_LARGE = 431;
	84	+ public const STATUS_INTERNAL_SERVER_ERROR = 500;
	85	+ public const STATUS_NOT_IMPLEMENTED = 501;
	86	+ public const STATUS_BAD_GATEWAY = 502;
	87	+ public const STATUS_SERVICE_UNAVAILABLE = 503;
	88	+ public const STATUS_GATEWAY_TIMEOUT = 504;
	89	+ public const STATUS_HTTP_VERSION_NOT_SUPPORTED = 505;
	90	+ public const STATUS_VARIANT_ALSO_NEGOTIATES = 506;
	91	+ public const STATUS_INSUFFICIENT_STORAGE = 507;
	92	+ public const STATUS_LOOP_DETECTED = 508;
	93	+ public const STATUS_BANDWIDTH_LIMIT_EXCEEDED = 509;
	94	+ public const STATUS_NOT_EXTENDED = 510;
	95	+ public const STATUS_NETWORK_AUTHENTICATION_REQUIRED = 511;
96	96	}

nextcloud / server

Push — master ( 970f39...e4f050 )

Status

Category

Indentation +85 added lines, -85 removed lines patch added patch discarded remove patch

Indentation +37 added lines, -37 removed lines patch added patch discarded remove patch

Indentation +31 added lines, -31 removed lines patch added patch discarded remove patch

Indentation +25 added lines, -25 removed lines patch added patch discarded remove patch

Indentation +46 added lines, -46 removed lines patch added patch discarded remove patch

Indentation +22 added lines, -22 removed lines patch added patch discarded remove patch

Indentation +44 added lines, -44 removed lines patch added patch discarded remove patch

Indentation +21 added lines, -21 removed lines patch added patch discarded remove patch

Indentation +59 added lines, -59 removed lines patch added patch discarded remove patch