nextcloud / server

lib/private/TempManager.php

Indentation +221 added lines, -221 removed lines

@@ -34,246 +34,246 @@
 use OCP\ITempManager;
 
 class TempManager implements ITempManager {
-	/** @var string[] Current temporary files and folders, used for cleanup */
-	protected $current = [];
-	/** @var string i.e. /tmp on linux systems */
-	protected $tmpBaseDir;
-	/** @var ILogger */
-	protected $log;
-	/** @var IConfig */
-	protected $config;
+    /** @var string[] Current temporary files and folders, used for cleanup */
+    protected $current = [];
+    /** @var string i.e. /tmp on linux systems */
+    protected $tmpBaseDir;
+    /** @var ILogger */
+    protected $log;
+    /** @var IConfig */
+    protected $config;
 
-	/** Prefix */
-	const TMP_PREFIX = 'oc_tmp_';
+    /** Prefix */
+    const TMP_PREFIX = 'oc_tmp_';
 
-	/**
-	 * @param \OCP\ILogger $logger
-	 * @param \OCP\IConfig $config
-	 */
-	public function __construct(ILogger $logger, IConfig $config) {
-		$this->log = $logger;
-		$this->config = $config;
-		$this->tmpBaseDir = $this->getTempBaseDir();
-	}
+    /**
+     * @param \OCP\ILogger $logger
+     * @param \OCP\IConfig $config
+     */
+    public function __construct(ILogger $logger, IConfig $config) {
+        $this->log = $logger;
+        $this->config = $config;
+        $this->tmpBaseDir = $this->getTempBaseDir();
+    }
 
-	/**
-	 * Builds the filename with suffix and removes potential dangerous characters
-	 * such as directory separators.
-	 *
-	 * @param string $absolutePath Absolute path to the file / folder
-	 * @param string $postFix Postfix appended to the temporary file name, may be user controlled
-	 * @return string
-	 */
-	private function buildFileNameWithSuffix($absolutePath, $postFix = '') {
-		if($postFix !== '') {
-			$postFix = '.' . ltrim($postFix, '.');
-			$postFix = str_replace(['\\', '/'], '', $postFix);
-			$absolutePath .= '-';
-		}
+    /**
+     * Builds the filename with suffix and removes potential dangerous characters
+     * such as directory separators.
+     *
+     * @param string $absolutePath Absolute path to the file / folder
+     * @param string $postFix Postfix appended to the temporary file name, may be user controlled
+     * @return string
+     */
+    private function buildFileNameWithSuffix($absolutePath, $postFix = '') {
+        if($postFix !== '') {
+            $postFix = '.' . ltrim($postFix, '.');
+            $postFix = str_replace(['\\', '/'], '', $postFix);
+            $absolutePath .= '-';
+        }
 
-		return $absolutePath . $postFix;
-	}
+        return $absolutePath . $postFix;
+    }
 
-	/**
-	 * Create a temporary file and return the path
-	 *
-	 * @param string $postFix Postfix appended to the temporary file name
-	 * @return string
-	 */
-	public function getTemporaryFile($postFix = '') {
-		if (is_writable($this->tmpBaseDir)) {
-			// To create an unique file and prevent the risk of race conditions
-			// or duplicated temporary files by other means such as collisions
-			// we need to create the file using `tempnam` and append a possible
-			// postfix to it later
-			$file = tempnam($this->tmpBaseDir, self::TMP_PREFIX);
-			$this->current[] = $file;
+    /**
+     * Create a temporary file and return the path
+     *
+     * @param string $postFix Postfix appended to the temporary file name
+     * @return string
+     */
+    public function getTemporaryFile($postFix = '') {
+        if (is_writable($this->tmpBaseDir)) {
+            // To create an unique file and prevent the risk of race conditions
+            // or duplicated temporary files by other means such as collisions
+            // we need to create the file using `tempnam` and append a possible
+            // postfix to it later
+            $file = tempnam($this->tmpBaseDir, self::TMP_PREFIX);
+            $this->current[] = $file;
 
-			// If a postfix got specified sanitize it and create a postfixed
-			// temporary file
-			if($postFix !== '') {
-				$fileNameWithPostfix = $this->buildFileNameWithSuffix($file, $postFix);
-				touch($fileNameWithPostfix);
-				chmod($fileNameWithPostfix, 0600);
-				$this->current[] = $fileNameWithPostfix;
-				return $fileNameWithPostfix;
-			}
+            // If a postfix got specified sanitize it and create a postfixed
+            // temporary file
+            if($postFix !== '') {
+                $fileNameWithPostfix = $this->buildFileNameWithSuffix($file, $postFix);
+                touch($fileNameWithPostfix);
+                chmod($fileNameWithPostfix, 0600);
+                $this->current[] = $fileNameWithPostfix;
+                return $fileNameWithPostfix;
+            }
 
-			return $file;
-		} else {
-			$this->log->warning(
-				'Can not create a temporary file in directory {dir}. Check it exists and has correct permissions',
-				[
-					'dir' => $this->tmpBaseDir,
-				]
-			);
-			return false;
-		}
-	}
+            return $file;
+        } else {
+            $this->log->warning(
+                'Can not create a temporary file in directory {dir}. Check it exists and has correct permissions',
+                [
+                    'dir' => $this->tmpBaseDir,
+                ]
+            );
+            return false;
+        }
+    }
 
-	/**
-	 * Create a temporary folder and return the path
-	 *
-	 * @param string $postFix Postfix appended to the temporary folder name
-	 * @return string
-	 */
-	public function getTemporaryFolder($postFix = '') {
-		if (is_writable($this->tmpBaseDir)) {
-			// To create an unique directory and prevent the risk of race conditions
-			// or duplicated temporary files by other means such as collisions
-			// we need to create the file using `tempnam` and append a possible
-			// postfix to it later
-			$uniqueFileName = tempnam($this->tmpBaseDir, self::TMP_PREFIX);
-			$this->current[] = $uniqueFileName;
+    /**
+     * Create a temporary folder and return the path
+     *
+     * @param string $postFix Postfix appended to the temporary folder name
+     * @return string
+     */
+    public function getTemporaryFolder($postFix = '') {
+        if (is_writable($this->tmpBaseDir)) {
+            // To create an unique directory and prevent the risk of race conditions
+            // or duplicated temporary files by other means such as collisions
+            // we need to create the file using `tempnam` and append a possible
+            // postfix to it later
+            $uniqueFileName = tempnam($this->tmpBaseDir, self::TMP_PREFIX);
+            $this->current[] = $uniqueFileName;
 
-			// Build a name without postfix
-			$path = $this->buildFileNameWithSuffix($uniqueFileName . '-folder', $postFix);
-			mkdir($path, 0700);
-			$this->current[] = $path;
+            // Build a name without postfix
+            $path = $this->buildFileNameWithSuffix($uniqueFileName . '-folder', $postFix);
+            mkdir($path, 0700);
+            $this->current[] = $path;
 
-			return $path . '/';
-		} else {
-			$this->log->warning(
-				'Can not create a temporary folder in directory {dir}. Check it exists and has correct permissions',
-				[
-					'dir' => $this->tmpBaseDir,
-				]
-			);
-			return false;
-		}
-	}
+            return $path . '/';
+        } else {
+            $this->log->warning(
+                'Can not create a temporary folder in directory {dir}. Check it exists and has correct permissions',
+                [
+                    'dir' => $this->tmpBaseDir,
+                ]
+            );
+            return false;
+        }
+    }
 
-	/**
-	 * Remove the temporary files and folders generated during this request
-	 */
-	public function clean() {
-		$this->cleanFiles($this->current);
-	}
+    /**
+     * Remove the temporary files and folders generated during this request
+     */
+    public function clean() {
+        $this->cleanFiles($this->current);
+    }
 
-	/**
-	 * @param string[] $files
-	 */
-	protected function cleanFiles($files) {
-		foreach ($files as $file) {
-			if (file_exists($file)) {
-				try {
-					\OC_Helper::rmdirr($file);
-				} catch (\UnexpectedValueException $ex) {
-					$this->log->warning(
-						"Error deleting temporary file/folder: {file} - Reason: {error}",
-						[
-							'file' => $file,
-							'error' => $ex->getMessage(),
-						]
-					);
-				}
-			}
-		}
-	}
+    /**
+     * @param string[] $files
+     */
+    protected function cleanFiles($files) {
+        foreach ($files as $file) {
+            if (file_exists($file)) {
+                try {
+                    \OC_Helper::rmdirr($file);
+                } catch (\UnexpectedValueException $ex) {
+                    $this->log->warning(
+                        "Error deleting temporary file/folder: {file} - Reason: {error}",
+                        [
+                            'file' => $file,
+                            'error' => $ex->getMessage(),
+                        ]
+                    );
+                }
+            }
+        }
+    }
 
-	/**
-	 * Remove old temporary files and folders that were failed to be cleaned
-	 */
-	public function cleanOld() {
-		$this->cleanFiles($this->getOldFiles());
-	}
+    /**
+     * Remove old temporary files and folders that were failed to be cleaned
+     */
+    public function cleanOld() {
+        $this->cleanFiles($this->getOldFiles());
+    }
 
-	/**
-	 * Get all temporary files and folders generated by oc older than an hour
-	 *
-	 * @return string[]
-	 */
-	protected function getOldFiles() {
-		$cutOfTime = time() - 3600;
-		$files = [];
-		$dh = opendir($this->tmpBaseDir);
-		if ($dh) {
-			while (($file = readdir($dh)) !== false) {
-				if (substr($file, 0, 7) === self::TMP_PREFIX) {
-					$path = $this->tmpBaseDir . '/' . $file;
-					$mtime = filemtime($path);
-					if ($mtime < $cutOfTime) {
-						$files[] = $path;
-					}
-				}
-			}
-		}
-		return $files;
-	}
+    /**
+     * Get all temporary files and folders generated by oc older than an hour
+     *
+     * @return string[]
+     */
+    protected function getOldFiles() {
+        $cutOfTime = time() - 3600;
+        $files = [];
+        $dh = opendir($this->tmpBaseDir);
+        if ($dh) {
+            while (($file = readdir($dh)) !== false) {
+                if (substr($file, 0, 7) === self::TMP_PREFIX) {
+                    $path = $this->tmpBaseDir . '/' . $file;
+                    $mtime = filemtime($path);
+                    if ($mtime < $cutOfTime) {
+                        $files[] = $path;
+                    }
+                }
+            }
+        }
+        return $files;
+    }
 
-	/**
-	 * Get the temporary base directory configured on the server
-	 *
-	 * @return string Path to the temporary directory or null
-	 * @throws \UnexpectedValueException
-	 */
-	public function getTempBaseDir() {
-		if ($this->tmpBaseDir) {
-			return $this->tmpBaseDir;
-		}
+    /**
+     * Get the temporary base directory configured on the server
+     *
+     * @return string Path to the temporary directory or null
+     * @throws \UnexpectedValueException
+     */
+    public function getTempBaseDir() {
+        if ($this->tmpBaseDir) {
+            return $this->tmpBaseDir;
+        }
 
-		$directories = [];
-		if ($temp = $this->config->getSystemValue('tempdirectory', null)) {
-			$directories[] = $temp;
-		}
-		if ($temp = \OC::$server->getIniWrapper()->get('upload_tmp_dir')) {
-			$directories[] = $temp;
-		}
-		if ($temp = getenv('TMP')) {
-			$directories[] = $temp;
-		}
-		if ($temp = getenv('TEMP')) {
-			$directories[] = $temp;
-		}
-		if ($temp = getenv('TMPDIR')) {
-			$directories[] = $temp;
-		}
-		if ($temp = sys_get_temp_dir()) {
-			$directories[] = $temp;
-		}
+        $directories = [];
+        if ($temp = $this->config->getSystemValue('tempdirectory', null)) {
+            $directories[] = $temp;
+        }
+        if ($temp = \OC::$server->getIniWrapper()->get('upload_tmp_dir')) {
+            $directories[] = $temp;
+        }
+        if ($temp = getenv('TMP')) {
+            $directories[] = $temp;
+        }
+        if ($temp = getenv('TEMP')) {
+            $directories[] = $temp;
+        }
+        if ($temp = getenv('TMPDIR')) {
+            $directories[] = $temp;
+        }
+        if ($temp = sys_get_temp_dir()) {
+            $directories[] = $temp;
+        }
 
-		foreach ($directories as $dir) {
-			if ($this->checkTemporaryDirectory($dir)) {
-				return $dir;
-			}
-		}
+        foreach ($directories as $dir) {
+            if ($this->checkTemporaryDirectory($dir)) {
+                return $dir;
+            }
+        }
 
-		$temp = tempnam(dirname(__FILE__), '');
-		if (file_exists($temp)) {
-			unlink($temp);
-			return dirname($temp);
-		}
-		throw new \UnexpectedValueException('Unable to detect system temporary directory');
-	}
+        $temp = tempnam(dirname(__FILE__), '');
+        if (file_exists($temp)) {
+            unlink($temp);
+            return dirname($temp);
+        }
+        throw new \UnexpectedValueException('Unable to detect system temporary directory');
+    }
 
-	/**
-	 * Check if a temporary directory is ready for use
-	 *
-	 * @param mixed $directory
-	 * @return bool
-	 */
-	private function checkTemporaryDirectory($directory) {
-		// suppress any possible errors caused by is_writable
-		// checks missing or invalid path or characters, wrong permissions etc
-		try {
-			if (is_writable($directory)) {
-				return true;
-			}
-		} catch (\Exception $e) {
-		}
-		$this->log->warning('Temporary directory {dir} is not present or writable',
-			['dir' => $directory]
-		);
-		return false;
-	}
+    /**
+     * Check if a temporary directory is ready for use
+     *
+     * @param mixed $directory
+     * @return bool
+     */
+    private function checkTemporaryDirectory($directory) {
+        // suppress any possible errors caused by is_writable
+        // checks missing or invalid path or characters, wrong permissions etc
+        try {
+            if (is_writable($directory)) {
+                return true;
+            }
+        } catch (\Exception $e) {
+        }
+        $this->log->warning('Temporary directory {dir} is not present or writable',
+            ['dir' => $directory]
+        );
+        return false;
+    }
 
-	/**
-	 * Override the temporary base directory
-	 *
-	 * @param string $directory
-	 */
-	public function overrideTempBaseDir($directory) {
-		$this->tmpBaseDir = $directory;
-	}
+    /**
+     * Override the temporary base directory
+     *
+     * @param string $directory
+     */
+    public function overrideTempBaseDir($directory) {
+        $this->tmpBaseDir = $directory;
+    }
 
 }

lib/private/App/CodeChecker/MigrationSchemaChecker.php

Indentation +164 added lines, -164 removed lines

@@ -29,179 +29,179 @@
 
 class MigrationSchemaChecker extends NodeVisitorAbstract {
 
-	/** @var string */
-	protected $schemaVariableName = null;
-	/** @var array */
-	protected $tableVariableNames = [];
-	/** @var array */
-	public $errors = [];
+    /** @var string */
+    protected $schemaVariableName = null;
+    /** @var array */
+    protected $tableVariableNames = [];
+    /** @var array */
+    public $errors = [];
 
-	/**
-	 * @param Node $node
-	 * @return void
-	 *
-	 * @suppress PhanUndeclaredProperty
-	 */
-	public function enterNode(Node $node) {
-		/**
-		 * Check tables
-		 */
-		if ($this->schemaVariableName !== null &&
-			 $node instanceof Node\Expr\Assign &&
-			 $node->var instanceof Node\Expr\Variable &&
-			 $node->expr instanceof Node\Expr\MethodCall &&
-			 $node->expr->var instanceof Node\Expr\Variable &&
-			 $node->expr->var->name === $this->schemaVariableName) {
+    /**
+     * @param Node $node
+     * @return void
+     *
+     * @suppress PhanUndeclaredProperty
+     */
+    public function enterNode(Node $node) {
+        /**
+         * Check tables
+         */
+        if ($this->schemaVariableName !== null &&
+             $node instanceof Node\Expr\Assign &&
+             $node->var instanceof Node\Expr\Variable &&
+             $node->expr instanceof Node\Expr\MethodCall &&
+             $node->expr->var instanceof Node\Expr\Variable &&
+             $node->expr->var->name === $this->schemaVariableName) {
 
-			if ($node->expr->name === 'createTable') {
-				if (isset($node->expr->args[0]) && $node->expr->args[0]->value instanceof Node\Scalar\String_) {
-					if (!$this->checkNameLength($node->expr->args[0]->value->value)) {
-						$this->errors[] = [
-							'line' => $node->getLine(),
-							'disallowedToken' => $node->expr->args[0]->value->value,
-							'reason' => 'Table name is too long (max. 27)',
-						];
-					} else {
-						$this->tableVariableNames[$node->var->name] = $node->expr->args[0]->value->value;
-					}
-				}
-			} else if ($node->expr->name === 'getTable') {
-				if (isset($node->expr->args[0]) && $node->expr->args[0]->value instanceof Node\Scalar\String_) {
-					$this->tableVariableNames[$node->var->name] = $node->expr->args[0]->value->value;
-				}
-			}
-		} else if ($this->schemaVariableName !== null &&
-			 $node instanceof Node\Expr\MethodCall &&
-			 $node->var instanceof Node\Expr\Variable &&
-			 $node->var->name === $this->schemaVariableName) {
+            if ($node->expr->name === 'createTable') {
+                if (isset($node->expr->args[0]) && $node->expr->args[0]->value instanceof Node\Scalar\String_) {
+                    if (!$this->checkNameLength($node->expr->args[0]->value->value)) {
+                        $this->errors[] = [
+                            'line' => $node->getLine(),
+                            'disallowedToken' => $node->expr->args[0]->value->value,
+                            'reason' => 'Table name is too long (max. 27)',
+                        ];
+                    } else {
+                        $this->tableVariableNames[$node->var->name] = $node->expr->args[0]->value->value;
+                    }
+                }
+            } else if ($node->expr->name === 'getTable') {
+                if (isset($node->expr->args[0]) && $node->expr->args[0]->value instanceof Node\Scalar\String_) {
+                    $this->tableVariableNames[$node->var->name] = $node->expr->args[0]->value->value;
+                }
+            }
+        } else if ($this->schemaVariableName !== null &&
+             $node instanceof Node\Expr\MethodCall &&
+             $node->var instanceof Node\Expr\Variable &&
+             $node->var->name === $this->schemaVariableName) {
 
-			if ($node->name === 'renameTable') {
-				$this->errors[] = [
-					'line' => $node->getLine(),
-					'disallowedToken' => 'Deprecated method',
-					'reason' => sprintf(
-						'`$%s->renameTable()` must not be used',
-						$node->var->name
-					),
-				];
-			}
+            if ($node->name === 'renameTable') {
+                $this->errors[] = [
+                    'line' => $node->getLine(),
+                    'disallowedToken' => 'Deprecated method',
+                    'reason' => sprintf(
+                        '`$%s->renameTable()` must not be used',
+                        $node->var->name
+                    ),
+                ];
+            }
 
-		/**
-		 * Check columns and Indexes
-		 */
-		} else if (!empty($this->tableVariableNames) &&
-			 $node instanceof Node\Expr\MethodCall &&
-			 $node->var instanceof Node\Expr\Variable &&
-			 isset($this->tableVariableNames[$node->var->name])) {
+        /**
+         * Check columns and Indexes
+         */
+        } else if (!empty($this->tableVariableNames) &&
+             $node instanceof Node\Expr\MethodCall &&
+             $node->var instanceof Node\Expr\Variable &&
+             isset($this->tableVariableNames[$node->var->name])) {
 
-			if ($node->name === 'addColumn' || $node->name === 'changeColumn') {
-				if (isset($node->args[0]) && $node->args[0]->value instanceof Node\Scalar\String_) {
-					if (!$this->checkNameLength($node->args[0]->value->value)) {
-						$this->errors[] = [
-							'line' => $node->getLine(),
-							'disallowedToken' => $node->args[0]->value->value,
-							'reason' => sprintf(
-								'Column name is too long on table `%s` (max. 27)',
-								$this->tableVariableNames[$node->var->name]
-							),
-						];
-					}
+            if ($node->name === 'addColumn' || $node->name === 'changeColumn') {
+                if (isset($node->args[0]) && $node->args[0]->value instanceof Node\Scalar\String_) {
+                    if (!$this->checkNameLength($node->args[0]->value->value)) {
+                        $this->errors[] = [
+                            'line' => $node->getLine(),
+                            'disallowedToken' => $node->args[0]->value->value,
+                            'reason' => sprintf(
+                                'Column name is too long on table `%s` (max. 27)',
+                                $this->tableVariableNames[$node->var->name]
+                            ),
+                        ];
+                    }
 
-					// On autoincrement the max length of the table name is 21 instead of 27
-					if (isset($node->args[2]) && $node->args[2]->value instanceof Node\Expr\Array_) {
-						/** @var Node\Expr\Array_ $options */
-						$options = $node->args[2]->value;
-						if ($this->checkColumnForAutoincrement($options)) {
-							if (!$this->checkNameLength($this->tableVariableNames[$node->var->name], true)) {
-								$this->errors[] = [
-									'line' => $node->getLine(),
-									'disallowedToken' => $this->tableVariableNames[$node->var->name],
-									'reason' => 'Table name is too long because of autoincrement (max. 21)',
-								];
-							}
-						}
-					}
-				}
-			} else if ($node->name === 'addIndex' ||
-				 $node->name === 'addUniqueIndex' ||
-				 $node->name === 'renameIndex' ||
-				 $node->name === 'setPrimaryKey') {
-				if (isset($node->args[1]) && $node->args[1]->value instanceof Node\Scalar\String_) {
-					if (!$this->checkNameLength($node->args[1]->value->value)) {
-						$this->errors[] = [
-							'line' => $node->getLine(),
-							'disallowedToken' => $node->args[1]->value->value,
-							'reason' => sprintf(
-								'Index name is too long on table `%s` (max. 27)',
-								$this->tableVariableNames[$node->var->name]
-							),
-						];
-					}
-				}
-			} else if ($node->name === 'addForeignKeyConstraint') {
-				if (isset($node->args[4]) && $node->args[4]->value instanceof Node\Scalar\String_) {
-					if (!$this->checkNameLength($node->args[4]->value->value)) {
-						$this->errors[] = [
-							'line' => $node->getLine(),
-							'disallowedToken' => $node->args[4]->value->value,
-							'reason' => sprintf(
-								'Constraint name is too long on table `%s` (max. 27)',
-								$this->tableVariableNames[$node->var->name]
-							),
-						];
-					}
-				}
-			} else if ($node->name === 'renameColumn') {
-				$this->errors[] = [
-					'line' => $node->getLine(),
-					'disallowedToken' => 'Deprecated method',
-					'reason' => sprintf(
-						'`$%s->renameColumn()` must not be used',
-						$node->var->name
-					),
-				];
-			}
+                    // On autoincrement the max length of the table name is 21 instead of 27
+                    if (isset($node->args[2]) && $node->args[2]->value instanceof Node\Expr\Array_) {
+                        /** @var Node\Expr\Array_ $options */
+                        $options = $node->args[2]->value;
+                        if ($this->checkColumnForAutoincrement($options)) {
+                            if (!$this->checkNameLength($this->tableVariableNames[$node->var->name], true)) {
+                                $this->errors[] = [
+                                    'line' => $node->getLine(),
+                                    'disallowedToken' => $this->tableVariableNames[$node->var->name],
+                                    'reason' => 'Table name is too long because of autoincrement (max. 21)',
+                                ];
+                            }
+                        }
+                    }
+                }
+            } else if ($node->name === 'addIndex' ||
+                 $node->name === 'addUniqueIndex' ||
+                 $node->name === 'renameIndex' ||
+                 $node->name === 'setPrimaryKey') {
+                if (isset($node->args[1]) && $node->args[1]->value instanceof Node\Scalar\String_) {
+                    if (!$this->checkNameLength($node->args[1]->value->value)) {
+                        $this->errors[] = [
+                            'line' => $node->getLine(),
+                            'disallowedToken' => $node->args[1]->value->value,
+                            'reason' => sprintf(
+                                'Index name is too long on table `%s` (max. 27)',
+                                $this->tableVariableNames[$node->var->name]
+                            ),
+                        ];
+                    }
+                }
+            } else if ($node->name === 'addForeignKeyConstraint') {
+                if (isset($node->args[4]) && $node->args[4]->value instanceof Node\Scalar\String_) {
+                    if (!$this->checkNameLength($node->args[4]->value->value)) {
+                        $this->errors[] = [
+                            'line' => $node->getLine(),
+                            'disallowedToken' => $node->args[4]->value->value,
+                            'reason' => sprintf(
+                                'Constraint name is too long on table `%s` (max. 27)',
+                                $this->tableVariableNames[$node->var->name]
+                            ),
+                        ];
+                    }
+                }
+            } else if ($node->name === 'renameColumn') {
+                $this->errors[] = [
+                    'line' => $node->getLine(),
+                    'disallowedToken' => 'Deprecated method',
+                    'reason' => sprintf(
+                        '`$%s->renameColumn()` must not be used',
+                        $node->var->name
+                    ),
+                ];
+            }
 
-		/**
-		 * Find the schema
-		 */
-		} else if ($node instanceof Node\Expr\Assign &&
-			 $node->expr instanceof Node\Expr\FuncCall &&
-			 $node->var instanceof Node\Expr\Variable &&
-			 $node->expr->name instanceof Node\Expr\Variable &&
-			 $node->expr->name->name === 'schemaClosure') {
-			// E.g. $schema = $schemaClosure();
-			$this->schemaVariableName = $node->var->name;
-		}
-	}
+        /**
+         * Find the schema
+         */
+        } else if ($node instanceof Node\Expr\Assign &&
+             $node->expr instanceof Node\Expr\FuncCall &&
+             $node->var instanceof Node\Expr\Variable &&
+             $node->expr->name instanceof Node\Expr\Variable &&
+             $node->expr->name->name === 'schemaClosure') {
+            // E.g. $schema = $schemaClosure();
+            $this->schemaVariableName = $node->var->name;
+        }
+    }
 
-	protected function checkNameLength($tableName, $hasAutoincrement = false) {
-		if ($hasAutoincrement) {
-			return strlen($tableName) <= 21;
-		}
-		return strlen($tableName) <= 27;
-	}
+    protected function checkNameLength($tableName, $hasAutoincrement = false) {
+        if ($hasAutoincrement) {
+            return strlen($tableName) <= 21;
+        }
+        return strlen($tableName) <= 27;
+    }
 
-	/**
-	 * @param Node\Expr\Array_ $optionsArray
-	 * @return bool Whether the column is an autoincrement column
-	 */
-	protected function checkColumnForAutoincrement(Node\Expr\Array_ $optionsArray) {
-		foreach ($optionsArray->items as $option) {
-			if ($option->key instanceof Node\Scalar\String_) {
-				if ($option->key->value === 'autoincrement' &&
-					 $option->value instanceof Node\Expr\ConstFetch) {
-					/** @var Node\Expr\ConstFetch $const */
-					$const = $option->value;
+    /**
+     * @param Node\Expr\Array_ $optionsArray
+     * @return bool Whether the column is an autoincrement column
+     */
+    protected function checkColumnForAutoincrement(Node\Expr\Array_ $optionsArray) {
+        foreach ($optionsArray->items as $option) {
+            if ($option->key instanceof Node\Scalar\String_) {
+                if ($option->key->value === 'autoincrement' &&
+                     $option->value instanceof Node\Expr\ConstFetch) {
+                    /** @var Node\Expr\ConstFetch $const */
+                    $const = $option->value;
 
-					if ($const->name instanceof Name &&
-						 $const->name->parts === ['true']) {
-						return true;
-					}
-				}
-			}
-		}
+                    if ($const->name instanceof Name &&
+                         $const->name->parts === ['true']) {
+                        return true;
+                    }
+                }
+            }
+        }
 
-		return false;
-	}
+        return false;
+    }
 }

lib/private/OCS/Exception.php

Indentation +9 added lines, -9 removed lines

@@ -25,16 +25,16 @@
 
 class Exception extends \Exception {
 
-	/** @var Result */
-	private $result;
+    /** @var Result */
+    private $result;
 
-	public function __construct(Result $result) {
-		parent::__construct();
-		$this->result = $result;
-	}
+    public function __construct(Result $result) {
+        parent::__construct();
+        $this->result = $result;
+    }
 
-	public function getResult() {
-		return $this->result;
-	}
+    public function getResult() {
+        return $this->result;
+    }
 
 }

lib/private/BackgroundJob/TimedJob.php

Indentation +20 added lines, -20 removed lines

@@ -32,26 +32,26 @@
  * @package OC\BackgroundJob
  */
 abstract class TimedJob extends Job {
-	protected $interval = 0;
+    protected $interval = 0;
 
-	/**
-	 * set the interval for the job
-	 *
-	 * @param int $interval
-	 */
-	public function setInterval($interval) {
-		$this->interval = $interval;
-	}
+    /**
+     * set the interval for the job
+     *
+     * @param int $interval
+     */
+    public function setInterval($interval) {
+        $this->interval = $interval;
+    }
 
-	/**
-	 * run the job if
-	 *
-	 * @param JobList $jobList
-	 * @param ILogger|null $logger
-	 */
-	public function execute($jobList, ILogger $logger = null) {
-		if ((time() - $this->lastRun) > $this->interval) {
-			parent::execute($jobList, $logger);
-		}
-	}
+    /**
+     * run the job if
+     *
+     * @param JobList $jobList
+     * @param ILogger|null $logger
+     */
+    public function execute($jobList, ILogger $logger = null) {
+        if ((time() - $this->lastRun) > $this->interval) {
+            parent::execute($jobList, $logger);
+        }
+    }
 }

lib/private/BackgroundJob/QueuedJob.php

Indentation +10 added lines, -10 removed lines

@@ -32,14 +32,14 @@
  * @package OC\BackgroundJob
  */
 abstract class QueuedJob extends Job {
-	/**
-	 * run the job, then remove it from the joblist
-	 *
-	 * @param JobList $jobList
-	 * @param ILogger|null $logger
-	 */
-	public function execute($jobList, ILogger $logger = null) {
-		$jobList->remove($this, $this->argument);
-		parent::execute($jobList, $logger);
-	}
+    /**
+     * run the job, then remove it from the joblist
+     *
+     * @param JobList $jobList
+     * @param ILogger|null $logger
+     */
+    public function execute($jobList, ILogger $logger = null) {
+        $jobList->remove($this, $this->argument);
+        parent::execute($jobList, $logger);
+    }
 }

lib/private/Files/Storage/Wrapper/Encoding.php

Indentation +498 added lines, -498 removed lines

@@ -34,502 +34,502 @@
  */
 class Encoding extends Wrapper {
 
-	/**
-	 * @var ICache
-	 */
-	private $namesCache;
-
-	/**
-	 * @param array $parameters
-	 */
-	public function __construct($parameters) {
-		$this->storage = $parameters['storage'];
-		$this->namesCache = new CappedMemoryCache();
-	}
-
-	/**
-	 * Returns whether the given string is only made of ASCII characters
-	 *
-	 * @param string $str string
-	 *
-	 * @return bool true if the string is all ASCII, false otherwise
-	 */
-	private function isAscii($str) {
-		return (bool) !preg_match('/[\\x80-\\xff]+/', $str);
-	}
-
-	/**
-	 * Checks whether the given path exists in NFC or NFD form after checking
-	 * each form for each path section and returns the correct form.
-	 * If no existing path found, returns the path as it was given.
-	 *
-	 * @param string $fullPath path to check
-	 *
-	 * @return string original or converted path
-	 */
-	private function findPathToUse($fullPath) {
-		$cachedPath = $this->namesCache[$fullPath];
-		if ($cachedPath !== null) {
-			return $cachedPath;
-		}
-
-		$sections = explode('/', $fullPath);
-		$path = '';
-		foreach ($sections as $section) {
-			$convertedPath = $this->findPathToUseLastSection($path, $section);
-			if ($convertedPath === null) {
-				// no point in continuing if the section was not found, use original path
-				return $fullPath;
-			}
-			$path = $convertedPath . '/';
-		}
-		$path = rtrim($path, '/');
-		return $path;
-	}
-
-	/**
-	 * Checks whether the last path section of the given path exists in NFC or NFD form
-	 * and returns the correct form. If no existing path found, returns null.
-	 *
-	 * @param string $basePath base path to check
-	 * @param string $lastSection last section of the path to check for NFD/NFC variations
-	 *
-	 * @return string|null original or converted path, or null if none of the forms was found
-	 */
-	private function findPathToUseLastSection($basePath, $lastSection) {
-		$fullPath = $basePath . $lastSection;
-		if ($lastSection === '' || $this->isAscii($lastSection) || $this->storage->file_exists($fullPath)) {
-			$this->namesCache[$fullPath] = $fullPath;
-			return $fullPath;
-		}
-
-		// swap encoding
-		if (\Normalizer::isNormalized($lastSection, \Normalizer::FORM_C)) {
-			$otherFormPath = \Normalizer::normalize($lastSection, \Normalizer::FORM_D);
-		} else {
-			$otherFormPath = \Normalizer::normalize($lastSection, \Normalizer::FORM_C);
-		}
-		$otherFullPath = $basePath . $otherFormPath;
-		if ($this->storage->file_exists($otherFullPath)) {
-			$this->namesCache[$fullPath] = $otherFullPath;
-			return $otherFullPath;
-		}
-
-		// return original path, file did not exist at all
-		$this->namesCache[$fullPath] = $fullPath;
-		return null;
-	}
-
-	/**
-	 * see http://php.net/manual/en/function.mkdir.php
-	 *
-	 * @param string $path
-	 * @return bool
-	 */
-	public function mkdir($path) {
-		// note: no conversion here, method should not be called with non-NFC names!
-		$result = $this->storage->mkdir($path);
-		if ($result) {
-			$this->namesCache[$path] = $path;
-		}
-		return $result;
-	}
-
-	/**
-	 * see http://php.net/manual/en/function.rmdir.php
-	 *
-	 * @param string $path
-	 * @return bool
-	 */
-	public function rmdir($path) {
-		$result = $this->storage->rmdir($this->findPathToUse($path));
-		if ($result) {
-			unset($this->namesCache[$path]);
-		}
-		return $result;
-	}
-
-	/**
-	 * see http://php.net/manual/en/function.opendir.php
-	 *
-	 * @param string $path
-	 * @return resource
-	 */
-	public function opendir($path) {
-		return $this->storage->opendir($this->findPathToUse($path));
-	}
-
-	/**
-	 * see http://php.net/manual/en/function.is_dir.php
-	 *
-	 * @param string $path
-	 * @return bool
-	 */
-	public function is_dir($path) {
-		return $this->storage->is_dir($this->findPathToUse($path));
-	}
-
-	/**
-	 * see http://php.net/manual/en/function.is_file.php
-	 *
-	 * @param string $path
-	 * @return bool
-	 */
-	public function is_file($path) {
-		return $this->storage->is_file($this->findPathToUse($path));
-	}
-
-	/**
-	 * see http://php.net/manual/en/function.stat.php
-	 * only the following keys are required in the result: size and mtime
-	 *
-	 * @param string $path
-	 * @return array
-	 */
-	public function stat($path) {
-		return $this->storage->stat($this->findPathToUse($path));
-	}
-
-	/**
-	 * see http://php.net/manual/en/function.filetype.php
-	 *
-	 * @param string $path
-	 * @return bool
-	 */
-	public function filetype($path) {
-		return $this->storage->filetype($this->findPathToUse($path));
-	}
-
-	/**
-	 * see http://php.net/manual/en/function.filesize.php
-	 * The result for filesize when called on a folder is required to be 0
-	 *
-	 * @param string $path
-	 * @return int
-	 */
-	public function filesize($path) {
-		return $this->storage->filesize($this->findPathToUse($path));
-	}
-
-	/**
-	 * check if a file can be created in $path
-	 *
-	 * @param string $path
-	 * @return bool
-	 */
-	public function isCreatable($path) {
-		return $this->storage->isCreatable($this->findPathToUse($path));
-	}
-
-	/**
-	 * check if a file can be read
-	 *
-	 * @param string $path
-	 * @return bool
-	 */
-	public function isReadable($path) {
-		return $this->storage->isReadable($this->findPathToUse($path));
-	}
-
-	/**
-	 * check if a file can be written to
-	 *
-	 * @param string $path
-	 * @return bool
-	 */
-	public function isUpdatable($path) {
-		return $this->storage->isUpdatable($this->findPathToUse($path));
-	}
-
-	/**
-	 * check if a file can be deleted
-	 *
-	 * @param string $path
-	 * @return bool
-	 */
-	public function isDeletable($path) {
-		return $this->storage->isDeletable($this->findPathToUse($path));
-	}
-
-	/**
-	 * check if a file can be shared
-	 *
-	 * @param string $path
-	 * @return bool
-	 */
-	public function isSharable($path) {
-		return $this->storage->isSharable($this->findPathToUse($path));
-	}
-
-	/**
-	 * get the full permissions of a path.
-	 * Should return a combination of the PERMISSION_ constants defined in lib/public/constants.php
-	 *
-	 * @param string $path
-	 * @return int
-	 */
-	public function getPermissions($path) {
-		return $this->storage->getPermissions($this->findPathToUse($path));
-	}
-
-	/**
-	 * see http://php.net/manual/en/function.file_exists.php
-	 *
-	 * @param string $path
-	 * @return bool
-	 */
-	public function file_exists($path) {
-		return $this->storage->file_exists($this->findPathToUse($path));
-	}
-
-	/**
-	 * see http://php.net/manual/en/function.filemtime.php
-	 *
-	 * @param string $path
-	 * @return int
-	 */
-	public function filemtime($path) {
-		return $this->storage->filemtime($this->findPathToUse($path));
-	}
-
-	/**
-	 * see http://php.net/manual/en/function.file_get_contents.php
-	 *
-	 * @param string $path
-	 * @return string
-	 */
-	public function file_get_contents($path) {
-		return $this->storage->file_get_contents($this->findPathToUse($path));
-	}
-
-	/**
-	 * see http://php.net/manual/en/function.file_put_contents.php
-	 *
-	 * @param string $path
-	 * @param string $data
-	 * @return bool
-	 */
-	public function file_put_contents($path, $data) {
-		return $this->storage->file_put_contents($this->findPathToUse($path), $data);
-	}
-
-	/**
-	 * see http://php.net/manual/en/function.unlink.php
-	 *
-	 * @param string $path
-	 * @return bool
-	 */
-	public function unlink($path) {
-		$result = $this->storage->unlink($this->findPathToUse($path));
-		if ($result) {
-			unset($this->namesCache[$path]);
-		}
-		return $result;
-	}
-
-	/**
-	 * see http://php.net/manual/en/function.rename.php
-	 *
-	 * @param string $path1
-	 * @param string $path2
-	 * @return bool
-	 */
-	public function rename($path1, $path2) {
-		// second name always NFC
-		return $this->storage->rename($this->findPathToUse($path1), $this->findPathToUse($path2));
-	}
-
-	/**
-	 * see http://php.net/manual/en/function.copy.php
-	 *
-	 * @param string $path1
-	 * @param string $path2
-	 * @return bool
-	 */
-	public function copy($path1, $path2) {
-		return $this->storage->copy($this->findPathToUse($path1), $this->findPathToUse($path2));
-	}
-
-	/**
-	 * see http://php.net/manual/en/function.fopen.php
-	 *
-	 * @param string $path
-	 * @param string $mode
-	 * @return resource
-	 */
-	public function fopen($path, $mode) {
-		$result = $this->storage->fopen($this->findPathToUse($path), $mode);
-		if ($result && $mode !== 'r' && $mode !== 'rb') {
-			unset($this->namesCache[$path]);
-		}
-		return $result;
-	}
-
-	/**
-	 * get the mimetype for a file or folder
-	 * The mimetype for a folder is required to be "httpd/unix-directory"
-	 *
-	 * @param string $path
-	 * @return string
-	 */
-	public function getMimeType($path) {
-		return $this->storage->getMimeType($this->findPathToUse($path));
-	}
-
-	/**
-	 * see http://php.net/manual/en/function.hash.php
-	 *
-	 * @param string $type
-	 * @param string $path
-	 * @param bool $raw
-	 * @return string
-	 */
-	public function hash($type, $path, $raw = false) {
-		return $this->storage->hash($type, $this->findPathToUse($path), $raw);
-	}
-
-	/**
-	 * see http://php.net/manual/en/function.free_space.php
-	 *
-	 * @param string $path
-	 * @return int
-	 */
-	public function free_space($path) {
-		return $this->storage->free_space($this->findPathToUse($path));
-	}
-
-	/**
-	 * search for occurrences of $query in file names
-	 *
-	 * @param string $query
-	 * @return array
-	 */
-	public function search($query) {
-		return $this->storage->search($query);
-	}
-
-	/**
-	 * see http://php.net/manual/en/function.touch.php
-	 * If the backend does not support the operation, false should be returned
-	 *
-	 * @param string $path
-	 * @param int $mtime
-	 * @return bool
-	 */
-	public function touch($path, $mtime = null) {
-		return $this->storage->touch($this->findPathToUse($path), $mtime);
-	}
-
-	/**
-	 * get the path to a local version of the file.
-	 * The local version of the file can be temporary and doesn't have to be persistent across requests
-	 *
-	 * @param string $path
-	 * @return string
-	 */
-	public function getLocalFile($path) {
-		return $this->storage->getLocalFile($this->findPathToUse($path));
-	}
-
-	/**
-	 * check if a file or folder has been updated since $time
-	 *
-	 * @param string $path
-	 * @param int $time
-	 * @return bool
-	 *
-	 * hasUpdated for folders should return at least true if a file inside the folder is add, removed or renamed.
-	 * returning true for other changes in the folder is optional
-	 */
-	public function hasUpdated($path, $time) {
-		return $this->storage->hasUpdated($this->findPathToUse($path), $time);
-	}
-
-	/**
-	 * get a cache instance for the storage
-	 *
-	 * @param string $path
-	 * @param \OC\Files\Storage\Storage (optional) the storage to pass to the cache
-	 * @return \OC\Files\Cache\Cache
-	 */
-	public function getCache($path = '', $storage = null) {
-		if (!$storage) {
-			$storage = $this;
-		}
-		return $this->storage->getCache($this->findPathToUse($path), $storage);
-	}
-
-	/**
-	 * get a scanner instance for the storage
-	 *
-	 * @param string $path
-	 * @param \OC\Files\Storage\Storage (optional) the storage to pass to the scanner
-	 * @return \OC\Files\Cache\Scanner
-	 */
-	public function getScanner($path = '', $storage = null) {
-		if (!$storage) {
-			$storage = $this;
-		}
-		return $this->storage->getScanner($this->findPathToUse($path), $storage);
-	}
-
-	/**
-	 * get the ETag for a file or folder
-	 *
-	 * @param string $path
-	 * @return string
-	 */
-	public function getETag($path) {
-		return $this->storage->getETag($this->findPathToUse($path));
-	}
-
-	/**
-	 * @param IStorage $sourceStorage
-	 * @param string $sourceInternalPath
-	 * @param string $targetInternalPath
-	 * @return bool
-	 */
-	public function copyFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath) {
-		if ($sourceStorage === $this) {
-			return $this->copy($sourceInternalPath, $this->findPathToUse($targetInternalPath));
-		}
-
-		$result = $this->storage->copyFromStorage($sourceStorage, $sourceInternalPath, $this->findPathToUse($targetInternalPath));
-		if ($result) {
-			unset($this->namesCache[$targetInternalPath]);
-		}
-		return $result;
-	}
-
-	/**
-	 * @param IStorage $sourceStorage
-	 * @param string $sourceInternalPath
-	 * @param string $targetInternalPath
-	 * @return bool
-	 */
-	public function moveFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath) {
-		if ($sourceStorage === $this) {
-			$result = $this->rename($sourceInternalPath, $this->findPathToUse($targetInternalPath));
-			if ($result) {
-				unset($this->namesCache[$sourceInternalPath]);
-				unset($this->namesCache[$targetInternalPath]);
-			}
-			return $result;
-		}
-
-		$result = $this->storage->moveFromStorage($sourceStorage, $sourceInternalPath, $this->findPathToUse($targetInternalPath));
-		if ($result) {
-			unset($this->namesCache[$sourceInternalPath]);
-			unset($this->namesCache[$targetInternalPath]);
-		}
-		return $result;
-	}
-
-	/**
-	 * @param string $path
-	 * @return array
-	 */
-	public function getMetaData($path) {
-		return $this->storage->getMetaData($this->findPathToUse($path));
-	}
+    /**
+     * @var ICache
+     */
+    private $namesCache;
+
+    /**
+     * @param array $parameters
+     */
+    public function __construct($parameters) {
+        $this->storage = $parameters['storage'];
+        $this->namesCache = new CappedMemoryCache();
+    }
+
+    /**
+     * Returns whether the given string is only made of ASCII characters
+     *
+     * @param string $str string
+     *
+     * @return bool true if the string is all ASCII, false otherwise
+     */
+    private function isAscii($str) {
+        return (bool) !preg_match('/[\\x80-\\xff]+/', $str);
+    }
+
+    /**
+     * Checks whether the given path exists in NFC or NFD form after checking
+     * each form for each path section and returns the correct form.
+     * If no existing path found, returns the path as it was given.
+     *
+     * @param string $fullPath path to check
+     *
+     * @return string original or converted path
+     */
+    private function findPathToUse($fullPath) {
+        $cachedPath = $this->namesCache[$fullPath];
+        if ($cachedPath !== null) {
+            return $cachedPath;
+        }
+
+        $sections = explode('/', $fullPath);
+        $path = '';
+        foreach ($sections as $section) {
+            $convertedPath = $this->findPathToUseLastSection($path, $section);
+            if ($convertedPath === null) {
+                // no point in continuing if the section was not found, use original path
+                return $fullPath;
+            }
+            $path = $convertedPath . '/';
+        }
+        $path = rtrim($path, '/');
+        return $path;
+    }
+
+    /**
+     * Checks whether the last path section of the given path exists in NFC or NFD form
+     * and returns the correct form. If no existing path found, returns null.
+     *
+     * @param string $basePath base path to check
+     * @param string $lastSection last section of the path to check for NFD/NFC variations
+     *
+     * @return string|null original or converted path, or null if none of the forms was found
+     */
+    private function findPathToUseLastSection($basePath, $lastSection) {
+        $fullPath = $basePath . $lastSection;
+        if ($lastSection === '' || $this->isAscii($lastSection) || $this->storage->file_exists($fullPath)) {
+            $this->namesCache[$fullPath] = $fullPath;
+            return $fullPath;
+        }
+
+        // swap encoding
+        if (\Normalizer::isNormalized($lastSection, \Normalizer::FORM_C)) {
+            $otherFormPath = \Normalizer::normalize($lastSection, \Normalizer::FORM_D);
+        } else {
+            $otherFormPath = \Normalizer::normalize($lastSection, \Normalizer::FORM_C);
+        }
+        $otherFullPath = $basePath . $otherFormPath;
+        if ($this->storage->file_exists($otherFullPath)) {
+            $this->namesCache[$fullPath] = $otherFullPath;
+            return $otherFullPath;
+        }
+
+        // return original path, file did not exist at all
+        $this->namesCache[$fullPath] = $fullPath;
+        return null;
+    }
+
+    /**
+     * see http://php.net/manual/en/function.mkdir.php
+     *
+     * @param string $path
+     * @return bool
+     */
+    public function mkdir($path) {
+        // note: no conversion here, method should not be called with non-NFC names!
+        $result = $this->storage->mkdir($path);
+        if ($result) {
+            $this->namesCache[$path] = $path;
+        }
+        return $result;
+    }
+
+    /**
+     * see http://php.net/manual/en/function.rmdir.php
+     *
+     * @param string $path
+     * @return bool
+     */
+    public function rmdir($path) {
+        $result = $this->storage->rmdir($this->findPathToUse($path));
+        if ($result) {
+            unset($this->namesCache[$path]);
+        }
+        return $result;
+    }
+
+    /**
+     * see http://php.net/manual/en/function.opendir.php
+     *
+     * @param string $path
+     * @return resource
+     */
+    public function opendir($path) {
+        return $this->storage->opendir($this->findPathToUse($path));
+    }
+
+    /**
+     * see http://php.net/manual/en/function.is_dir.php
+     *
+     * @param string $path
+     * @return bool
+     */
+    public function is_dir($path) {
+        return $this->storage->is_dir($this->findPathToUse($path));
+    }
+
+    /**
+     * see http://php.net/manual/en/function.is_file.php
+     *
+     * @param string $path
+     * @return bool
+     */
+    public function is_file($path) {
+        return $this->storage->is_file($this->findPathToUse($path));
+    }
+
+    /**
+     * see http://php.net/manual/en/function.stat.php
+     * only the following keys are required in the result: size and mtime
+     *
+     * @param string $path
+     * @return array
+     */
+    public function stat($path) {
+        return $this->storage->stat($this->findPathToUse($path));
+    }
+
+    /**
+     * see http://php.net/manual/en/function.filetype.php
+     *
+     * @param string $path
+     * @return bool
+     */
+    public function filetype($path) {
+        return $this->storage->filetype($this->findPathToUse($path));
+    }
+
+    /**
+     * see http://php.net/manual/en/function.filesize.php
+     * The result for filesize when called on a folder is required to be 0
+     *
+     * @param string $path
+     * @return int
+     */
+    public function filesize($path) {
+        return $this->storage->filesize($this->findPathToUse($path));
+    }
+
+    /**
+     * check if a file can be created in $path
+     *
+     * @param string $path
+     * @return bool
+     */
+    public function isCreatable($path) {
+        return $this->storage->isCreatable($this->findPathToUse($path));
+    }
+
+    /**
+     * check if a file can be read
+     *
+     * @param string $path
+     * @return bool
+     */
+    public function isReadable($path) {
+        return $this->storage->isReadable($this->findPathToUse($path));
+    }
+
+    /**
+     * check if a file can be written to
+     *
+     * @param string $path
+     * @return bool
+     */
+    public function isUpdatable($path) {
+        return $this->storage->isUpdatable($this->findPathToUse($path));
+    }
+
+    /**
+     * check if a file can be deleted
+     *
+     * @param string $path
+     * @return bool
+     */
+    public function isDeletable($path) {
+        return $this->storage->isDeletable($this->findPathToUse($path));
+    }
+
+    /**
+     * check if a file can be shared
+     *
+     * @param string $path
+     * @return bool
+     */
+    public function isSharable($path) {
+        return $this->storage->isSharable($this->findPathToUse($path));
+    }
+
+    /**
+     * get the full permissions of a path.
+     * Should return a combination of the PERMISSION_ constants defined in lib/public/constants.php
+     *
+     * @param string $path
+     * @return int
+     */
+    public function getPermissions($path) {
+        return $this->storage->getPermissions($this->findPathToUse($path));
+    }
+
+    /**
+     * see http://php.net/manual/en/function.file_exists.php
+     *
+     * @param string $path
+     * @return bool
+     */
+    public function file_exists($path) {
+        return $this->storage->file_exists($this->findPathToUse($path));
+    }
+
+    /**
+     * see http://php.net/manual/en/function.filemtime.php
+     *
+     * @param string $path
+     * @return int
+     */
+    public function filemtime($path) {
+        return $this->storage->filemtime($this->findPathToUse($path));
+    }
+
+    /**
+     * see http://php.net/manual/en/function.file_get_contents.php
+     *
+     * @param string $path
+     * @return string
+     */
+    public function file_get_contents($path) {
+        return $this->storage->file_get_contents($this->findPathToUse($path));
+    }
+
+    /**
+     * see http://php.net/manual/en/function.file_put_contents.php
+     *
+     * @param string $path
+     * @param string $data
+     * @return bool
+     */
+    public function file_put_contents($path, $data) {
+        return $this->storage->file_put_contents($this->findPathToUse($path), $data);
+    }
+
+    /**
+     * see http://php.net/manual/en/function.unlink.php
+     *
+     * @param string $path
+     * @return bool
+     */
+    public function unlink($path) {
+        $result = $this->storage->unlink($this->findPathToUse($path));
+        if ($result) {
+            unset($this->namesCache[$path]);
+        }
+        return $result;
+    }
+
+    /**
+     * see http://php.net/manual/en/function.rename.php
+     *
+     * @param string $path1
+     * @param string $path2
+     * @return bool
+     */
+    public function rename($path1, $path2) {
+        // second name always NFC
+        return $this->storage->rename($this->findPathToUse($path1), $this->findPathToUse($path2));
+    }
+
+    /**
+     * see http://php.net/manual/en/function.copy.php
+     *
+     * @param string $path1
+     * @param string $path2
+     * @return bool
+     */
+    public function copy($path1, $path2) {
+        return $this->storage->copy($this->findPathToUse($path1), $this->findPathToUse($path2));
+    }
+
+    /**
+     * see http://php.net/manual/en/function.fopen.php
+     *
+     * @param string $path
+     * @param string $mode
+     * @return resource
+     */
+    public function fopen($path, $mode) {
+        $result = $this->storage->fopen($this->findPathToUse($path), $mode);
+        if ($result && $mode !== 'r' && $mode !== 'rb') {
+            unset($this->namesCache[$path]);
+        }
+        return $result;
+    }
+
+    /**
+     * get the mimetype for a file or folder
+     * The mimetype for a folder is required to be "httpd/unix-directory"
+     *
+     * @param string $path
+     * @return string
+     */
+    public function getMimeType($path) {
+        return $this->storage->getMimeType($this->findPathToUse($path));
+    }
+
+    /**
+     * see http://php.net/manual/en/function.hash.php
+     *
+     * @param string $type
+     * @param string $path
+     * @param bool $raw
+     * @return string
+     */
+    public function hash($type, $path, $raw = false) {
+        return $this->storage->hash($type, $this->findPathToUse($path), $raw);
+    }
+
+    /**
+     * see http://php.net/manual/en/function.free_space.php
+     *
+     * @param string $path
+     * @return int
+     */
+    public function free_space($path) {
+        return $this->storage->free_space($this->findPathToUse($path));
+    }
+
+    /**
+     * search for occurrences of $query in file names
+     *
+     * @param string $query
+     * @return array
+     */
+    public function search($query) {
+        return $this->storage->search($query);
+    }
+
+    /**
+     * see http://php.net/manual/en/function.touch.php
+     * If the backend does not support the operation, false should be returned
+     *
+     * @param string $path
+     * @param int $mtime
+     * @return bool
+     */
+    public function touch($path, $mtime = null) {
+        return $this->storage->touch($this->findPathToUse($path), $mtime);
+    }
+
+    /**
+     * get the path to a local version of the file.
+     * The local version of the file can be temporary and doesn't have to be persistent across requests
+     *
+     * @param string $path
+     * @return string
+     */
+    public function getLocalFile($path) {
+        return $this->storage->getLocalFile($this->findPathToUse($path));
+    }
+
+    /**
+     * check if a file or folder has been updated since $time
+     *
+     * @param string $path
+     * @param int $time
+     * @return bool
+     *
+     * hasUpdated for folders should return at least true if a file inside the folder is add, removed or renamed.
+     * returning true for other changes in the folder is optional
+     */
+    public function hasUpdated($path, $time) {
+        return $this->storage->hasUpdated($this->findPathToUse($path), $time);
+    }
+
+    /**
+     * get a cache instance for the storage
+     *
+     * @param string $path
+     * @param \OC\Files\Storage\Storage (optional) the storage to pass to the cache
+     * @return \OC\Files\Cache\Cache
+     */
+    public function getCache($path = '', $storage = null) {
+        if (!$storage) {
+            $storage = $this;
+        }
+        return $this->storage->getCache($this->findPathToUse($path), $storage);
+    }
+
+    /**
+     * get a scanner instance for the storage
+     *
+     * @param string $path
+     * @param \OC\Files\Storage\Storage (optional) the storage to pass to the scanner
+     * @return \OC\Files\Cache\Scanner
+     */
+    public function getScanner($path = '', $storage = null) {
+        if (!$storage) {
+            $storage = $this;
+        }
+        return $this->storage->getScanner($this->findPathToUse($path), $storage);
+    }
+
+    /**
+     * get the ETag for a file or folder
+     *
+     * @param string $path
+     * @return string
+     */
+    public function getETag($path) {
+        return $this->storage->getETag($this->findPathToUse($path));
+    }
+
+    /**
+     * @param IStorage $sourceStorage
+     * @param string $sourceInternalPath
+     * @param string $targetInternalPath
+     * @return bool
+     */
+    public function copyFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath) {
+        if ($sourceStorage === $this) {
+            return $this->copy($sourceInternalPath, $this->findPathToUse($targetInternalPath));
+        }
+
+        $result = $this->storage->copyFromStorage($sourceStorage, $sourceInternalPath, $this->findPathToUse($targetInternalPath));
+        if ($result) {
+            unset($this->namesCache[$targetInternalPath]);
+        }
+        return $result;
+    }
+
+    /**
+     * @param IStorage $sourceStorage
+     * @param string $sourceInternalPath
+     * @param string $targetInternalPath
+     * @return bool
+     */
+    public function moveFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath) {
+        if ($sourceStorage === $this) {
+            $result = $this->rename($sourceInternalPath, $this->findPathToUse($targetInternalPath));
+            if ($result) {
+                unset($this->namesCache[$sourceInternalPath]);
+                unset($this->namesCache[$targetInternalPath]);
+            }
+            return $result;
+        }
+
+        $result = $this->storage->moveFromStorage($sourceStorage, $sourceInternalPath, $this->findPathToUse($targetInternalPath));
+        if ($result) {
+            unset($this->namesCache[$sourceInternalPath]);
+            unset($this->namesCache[$targetInternalPath]);
+        }
+        return $result;
+    }
+
+    /**
+     * @param string $path
+     * @return array
+     */
+    public function getMetaData($path) {
+        return $this->storage->getMetaData($this->findPathToUse($path));
+    }
 }

lib/public/IDateTimeFormatter.php

Indentation +104 added lines, -104 removed lines

@@ -30,114 +30,114 @@
  * @since 8.0.0
  */
 interface IDateTimeFormatter {
-	/**
-	 * Formats the date of the given timestamp
-	 *
-	 * @param int|\DateTime		$timestamp
-	 * @param string	$format			Either 'full', 'long', 'medium' or 'short'
-	 * 				full:	e.g. 'EEEE, MMMM d, y'	=> 'Wednesday, August 20, 2014'
-	 * 				long:	e.g. 'MMMM d, y'		=> 'August 20, 2014'
-	 * 				medium:	e.g. 'MMM d, y'			=> 'Aug 20, 2014'
-	 * 				short:	e.g. 'M/d/yy'			=> '8/20/14'
-	 * 				The exact format is dependent on the language
-	 * @param \DateTimeZone|null	$timeZone	The timezone to use
-	 * @param \OCP\IL10N|null	$l			The locale to use
-	 * @return string Formatted date string
-	 * @since 8.0.0
-	 */
-	public function formatDate($timestamp, $format = 'long', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null);
+    /**
+     * Formats the date of the given timestamp
+     *
+     * @param int|\DateTime		$timestamp
+     * @param string	$format			Either 'full', 'long', 'medium' or 'short'
+     * 				full:	e.g. 'EEEE, MMMM d, y'	=> 'Wednesday, August 20, 2014'
+     * 				long:	e.g. 'MMMM d, y'		=> 'August 20, 2014'
+     * 				medium:	e.g. 'MMM d, y'			=> 'Aug 20, 2014'
+     * 				short:	e.g. 'M/d/yy'			=> '8/20/14'
+     * 				The exact format is dependent on the language
+     * @param \DateTimeZone|null	$timeZone	The timezone to use
+     * @param \OCP\IL10N|null	$l			The locale to use
+     * @return string Formatted date string
+     * @since 8.0.0
+     */
+    public function formatDate($timestamp, $format = 'long', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null);
 
-	/**
-	 * Formats the date of the given timestamp
-	 *
-	 * @param int|\DateTime		$timestamp
-	 * @param string	$format			Either 'full', 'long', 'medium' or 'short'
-	 * 				full:	e.g. 'EEEE, MMMM d, y'	=> 'Wednesday, August 20, 2014'
-	 * 				long:	e.g. 'MMMM d, y'		=> 'August 20, 2014'
-	 * 				medium:	e.g. 'MMM d, y'			=> 'Aug 20, 2014'
-	 * 				short:	e.g. 'M/d/yy'			=> '8/20/14'
-	 * 				The exact format is dependent on the language
-	 * 					Uses 'Today', 'Yesterday' and 'Tomorrow' when applicable
-	 * @param \DateTimeZone|null	$timeZone	The timezone to use
-	 * @param \OCP\IL10N|null	$l			The locale to use
-	 * @return string Formatted relative date string
-	 * @since 8.0.0
-	 */
-	public function formatDateRelativeDay($timestamp, $format = 'long', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null);
+    /**
+     * Formats the date of the given timestamp
+     *
+     * @param int|\DateTime		$timestamp
+     * @param string	$format			Either 'full', 'long', 'medium' or 'short'
+     * 				full:	e.g. 'EEEE, MMMM d, y'	=> 'Wednesday, August 20, 2014'
+     * 				long:	e.g. 'MMMM d, y'		=> 'August 20, 2014'
+     * 				medium:	e.g. 'MMM d, y'			=> 'Aug 20, 2014'
+     * 				short:	e.g. 'M/d/yy'			=> '8/20/14'
+     * 				The exact format is dependent on the language
+     * 					Uses 'Today', 'Yesterday' and 'Tomorrow' when applicable
+     * @param \DateTimeZone|null	$timeZone	The timezone to use
+     * @param \OCP\IL10N|null	$l			The locale to use
+     * @return string Formatted relative date string
+     * @since 8.0.0
+     */
+    public function formatDateRelativeDay($timestamp, $format = 'long', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null);
 
-	/**
-	 * Gives the relative date of the timestamp
-	 * Only works for past dates
-	 *
-	 * @param int|\DateTime	$timestamp
-	 * @param int|\DateTime|null	$baseTimestamp	Timestamp to compare $timestamp against, defaults to current time
-	 * @param \OCP\IL10N|null		$l			The locale to use
-	 * @return string	Dates returned are:
-	 * 				<  1 month	=> Today, Yesterday, n days ago
-	 * 				< 13 month	=> last month, n months ago
-	 * 				>= 13 month	=> last year, n years ago
-	 * @since 8.0.0
-	 */
-	public function formatDateSpan($timestamp, $baseTimestamp = null, \OCP\IL10N $l = null);
+    /**
+     * Gives the relative date of the timestamp
+     * Only works for past dates
+     *
+     * @param int|\DateTime	$timestamp
+     * @param int|\DateTime|null	$baseTimestamp	Timestamp to compare $timestamp against, defaults to current time
+     * @param \OCP\IL10N|null		$l			The locale to use
+     * @return string	Dates returned are:
+     * 				<  1 month	=> Today, Yesterday, n days ago
+     * 				< 13 month	=> last month, n months ago
+     * 				>= 13 month	=> last year, n years ago
+     * @since 8.0.0
+     */
+    public function formatDateSpan($timestamp, $baseTimestamp = null, \OCP\IL10N $l = null);
 
-	/**
-	 * Formats the time of the given timestamp
-	 *
-	 * @param int|\DateTime $timestamp
-	 * @param string	$format			Either 'full', 'long', 'medium' or 'short'
-	 * 				full:	e.g. 'h:mm:ss a zzzz'	=> '11:42:13 AM GMT+0:00'
-	 * 				long:	e.g. 'h:mm:ss a z'		=> '11:42:13 AM GMT'
-	 * 				medium:	e.g. 'h:mm:ss a'		=> '11:42:13 AM'
-	 * 				short:	e.g. 'h:mm a'			=> '11:42 AM'
-	 * 				The exact format is dependent on the language
-	 * @param \DateTimeZone|null	$timeZone	The timezone to use
-	 * @param \OCP\IL10N|null		$l			The locale to use
-	 * @return string Formatted time string
-	 * @since 8.0.0
-	 */
-	public function formatTime($timestamp, $format = 'medium', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null);
+    /**
+     * Formats the time of the given timestamp
+     *
+     * @param int|\DateTime $timestamp
+     * @param string	$format			Either 'full', 'long', 'medium' or 'short'
+     * 				full:	e.g. 'h:mm:ss a zzzz'	=> '11:42:13 AM GMT+0:00'
+     * 				long:	e.g. 'h:mm:ss a z'		=> '11:42:13 AM GMT'
+     * 				medium:	e.g. 'h:mm:ss a'		=> '11:42:13 AM'
+     * 				short:	e.g. 'h:mm a'			=> '11:42 AM'
+     * 				The exact format is dependent on the language
+     * @param \DateTimeZone|null	$timeZone	The timezone to use
+     * @param \OCP\IL10N|null		$l			The locale to use
+     * @return string Formatted time string
+     * @since 8.0.0
+     */
+    public function formatTime($timestamp, $format = 'medium', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null);
 
-	/**
-	 * Gives the relative past time of the timestamp
-	 *
-	 * @param int|\DateTime	$timestamp
-	 * @param int|\DateTime|null	$baseTimestamp	Timestamp to compare $timestamp against, defaults to current time
-	 * @param \OCP\IL10N|null		$l			The locale to use
-	 * @return string	Dates returned are:
-	 * 				< 60 sec	=> seconds ago
-	 * 				<  1 hour	=> n minutes ago
-	 * 				<  1 day	=> n hours ago
-	 * 				<  1 month	=> Yesterday, n days ago
-	 * 				< 13 month	=> last month, n months ago
-	 * 				>= 13 month	=> last year, n years ago
-	 * @since 8.0.0
-	 */
-	public function formatTimeSpan($timestamp, $baseTimestamp = null, \OCP\IL10N $l = null);
+    /**
+     * Gives the relative past time of the timestamp
+     *
+     * @param int|\DateTime	$timestamp
+     * @param int|\DateTime|null	$baseTimestamp	Timestamp to compare $timestamp against, defaults to current time
+     * @param \OCP\IL10N|null		$l			The locale to use
+     * @return string	Dates returned are:
+     * 				< 60 sec	=> seconds ago
+     * 				<  1 hour	=> n minutes ago
+     * 				<  1 day	=> n hours ago
+     * 				<  1 month	=> Yesterday, n days ago
+     * 				< 13 month	=> last month, n months ago
+     * 				>= 13 month	=> last year, n years ago
+     * @since 8.0.0
+     */
+    public function formatTimeSpan($timestamp, $baseTimestamp = null, \OCP\IL10N $l = null);
 
-	/**
-	 * Formats the date and time of the given timestamp
-	 *
-	 * @param int|\DateTime $timestamp
-	 * @param string	$formatDate		See formatDate() for description
-	 * @param string	$formatTime		See formatTime() for description
-	 * @param \DateTimeZone|null	$timeZone	The timezone to use
-	 * @param \OCP\IL10N|null		$l			The locale to use
-	 * @return string Formatted date and time string
-	 * @since 8.0.0
-	 */
-	public function formatDateTime($timestamp, $formatDate = 'long', $formatTime = 'medium', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null);
+    /**
+     * Formats the date and time of the given timestamp
+     *
+     * @param int|\DateTime $timestamp
+     * @param string	$formatDate		See formatDate() for description
+     * @param string	$formatTime		See formatTime() for description
+     * @param \DateTimeZone|null	$timeZone	The timezone to use
+     * @param \OCP\IL10N|null		$l			The locale to use
+     * @return string Formatted date and time string
+     * @since 8.0.0
+     */
+    public function formatDateTime($timestamp, $formatDate = 'long', $formatTime = 'medium', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null);
 
-	/**
-	 * Formats the date and time of the given timestamp
-	 *
-	 * @param int|\DateTime $timestamp
-	 * @param string	$formatDate		See formatDate() for description
-	 * 					Uses 'Today', 'Yesterday' and 'Tomorrow' when applicable
-	 * @param string	$formatTime		See formatTime() for description
-	 * @param \DateTimeZone|null	$timeZone	The timezone to use
-	 * @param \OCP\IL10N|null		$l			The locale to use
-	 * @return string Formatted relative date and time string
-	 * @since 8.0.0
-	 */
-	public function formatDateTimeRelativeDay($timestamp, $formatDate = 'long', $formatTime = 'medium', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null);
+    /**
+     * Formats the date and time of the given timestamp
+     *
+     * @param int|\DateTime $timestamp
+     * @param string	$formatDate		See formatDate() for description
+     * 					Uses 'Today', 'Yesterday' and 'Tomorrow' when applicable
+     * @param string	$formatTime		See formatTime() for description
+     * @param \DateTimeZone|null	$timeZone	The timezone to use
+     * @param \OCP\IL10N|null		$l			The locale to use
+     * @return string Formatted relative date and time string
+     * @since 8.0.0
+     */
+    public function formatDateTimeRelativeDay($timestamp, $formatDate = 'long', $formatTime = 'medium', \DateTimeZone $timeZone = null, \OCP\IL10N $l = null);
 }

lib/public/App/ManagerEvent.php

Indentation +51 added lines, -51 removed lines

@@ -32,61 +32,61 @@
  */
 class ManagerEvent extends Event {
 
-	const EVENT_APP_ENABLE = 'OCP\App\IAppManager::enableApp';
-	const EVENT_APP_ENABLE_FOR_GROUPS = 'OCP\App\IAppManager::enableAppForGroups';
-	const EVENT_APP_DISABLE = 'OCP\App\IAppManager::disableApp';
+    const EVENT_APP_ENABLE = 'OCP\App\IAppManager::enableApp';
+    const EVENT_APP_ENABLE_FOR_GROUPS = 'OCP\App\IAppManager::enableAppForGroups';
+    const EVENT_APP_DISABLE = 'OCP\App\IAppManager::disableApp';
 
-	/**
-	 * @since 9.1.0
-	 */
-	const EVENT_APP_UPDATE = 'OCP\App\IAppManager::updateApp';
+    /**
+     * @since 9.1.0
+     */
+    const EVENT_APP_UPDATE = 'OCP\App\IAppManager::updateApp';
 
-	/** @var string */
-	protected $event;
-	/** @var string */
-	protected $appID;
-	/** @var \OCP\IGroup[]|null */
-	protected $groups;
+    /** @var string */
+    protected $event;
+    /** @var string */
+    protected $appID;
+    /** @var \OCP\IGroup[]|null */
+    protected $groups;
 
-	/**
-	 * DispatcherEvent constructor.
-	 *
-	 * @param string $event
-	 * @param $appID
-	 * @param \OCP\IGroup[]|null $groups
-	 * @since 9.0.0
-	 */
-	public function __construct($event, $appID, array $groups = null) {
-		$this->event = $event;
-		$this->appID = $appID;
-		$this->groups = $groups;
-	}
+    /**
+     * DispatcherEvent constructor.
+     *
+     * @param string $event
+     * @param $appID
+     * @param \OCP\IGroup[]|null $groups
+     * @since 9.0.0
+     */
+    public function __construct($event, $appID, array $groups = null) {
+        $this->event = $event;
+        $this->appID = $appID;
+        $this->groups = $groups;
+    }
 
-	/**
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public function getEvent() {
-		return $this->event;
-	}
+    /**
+     * @return string
+     * @since 9.0.0
+     */
+    public function getEvent() {
+        return $this->event;
+    }
 
-	/**
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public function getAppID() {
-		return $this->appID;
-	}
+    /**
+     * @return string
+     * @since 9.0.0
+     */
+    public function getAppID() {
+        return $this->appID;
+    }
 
-	/**
-	 * returns the group Ids
-	 * @return string[]
-	 * @since 9.0.0
-	 */
-	public function getGroups() {
-		return array_map(function ($group) {
-			/** @var \OCP\IGroup $group */
-			return $group->getGID();
-		}, $this->groups);
-	}
+    /**
+     * returns the group Ids
+     * @return string[]
+     * @since 9.0.0
+     */
+    public function getGroups() {
+        return array_map(function ($group) {
+            /** @var \OCP\IGroup $group */
+            return $group->getGID();
+        }, $this->groups);
+    }
 }

lib/public/Search/PagedProvider.php

Indentation +32 added lines, -32 removed lines

@@ -30,39 +30,39 @@
  */
 abstract class PagedProvider extends Provider {
 
-	/**
-	 * show all results
-	 * @since 8.0.0
-	 */
-	const SIZE_ALL = 0;
+    /**
+     * show all results
+     * @since 8.0.0
+     */
+    const SIZE_ALL = 0;
 
-	/**
-	 * Constructor
-	 * @param array $options
-	 * @since 8.0.0
-	 */
-	public function __construct($options) {
-		parent::__construct($options);
-	}
+    /**
+     * Constructor
+     * @param array $options
+     * @since 8.0.0
+     */
+    public function __construct($options) {
+        parent::__construct($options);
+    }
 
-	/**
-	 * Search for $query
-	 * @param string $query
-	 * @return array An array of OCP\Search\Result's
-	 * @since 8.0.0
-	 */
-	public function search($query) {
-		// old apps might assume they get all results, so we use SIZE_ALL
-		return $this->searchPaged($query, 1, self::SIZE_ALL);
-	}
+    /**
+     * Search for $query
+     * @param string $query
+     * @return array An array of OCP\Search\Result's
+     * @since 8.0.0
+     */
+    public function search($query) {
+        // old apps might assume they get all results, so we use SIZE_ALL
+        return $this->searchPaged($query, 1, self::SIZE_ALL);
+    }
 
-	/**
-	 * Search for $query
-	 * @param string $query
-	 * @param int $page pages start at page 1
-	 * @param int $size 0 = SIZE_ALL
-	 * @return array An array of OCP\Search\Result's
-	 * @since 8.0.0
-	 */
-	abstract public function searchPaged($query, $page, $size);
+    /**
+     * Search for $query
+     * @param string $query
+     * @param int $page pages start at page 1
+     * @param int $size 0 = SIZE_ALL
+     * @return array An array of OCP\Search\Result's
+     * @since 8.0.0
+     */
+    abstract public function searchPaged($query, $page, $size);
 }