nextcloud / server

apps/files_sharing/lib/Command/CleanupRemoteStorages.php

Spacing +5 added lines, -5 removed lines

@@ -60,11 +60,11 @@ 
 
 		$remoteStorages = $this->getRemoteStorages();
 
-		$output->writeln(count($remoteStorages) . ' remote storage(s) need(s) to be checked');
+		$output->writeln(count($remoteStorages).' remote storage(s) need(s) to be checked');
 
 		$remoteShareIds = $this->getRemoteShareIds();
 
-		$output->writeln(count($remoteShareIds) . ' remote share(s) exist');
+		$output->writeln(count($remoteShareIds).' remote share(s) exist');
 
 		foreach ($remoteShareIds as $id => $remoteShareId) {
 			if (isset($remoteStorages[$remoteShareId])) {
@@ -142,13 +142,13 @@ 
 			->where($queryBuilder->expr()->like(
 				'id',
 				// match all 'shared::' + 32 characters storages
-				$queryBuilder->createNamedParameter($this->connection->escapeLikeParameter('shared::') . str_repeat('_', 32)),
+				$queryBuilder->createNamedParameter($this->connection->escapeLikeParameter('shared::').str_repeat('_', 32)),
 				IQueryBuilder::PARAM_STR)
 			)
 			->andWhere($queryBuilder->expr()->notLike(
 				'id',
 				// but not the ones starting with a '/', they are for normal shares
-				$queryBuilder->createNamedParameter($this->connection->escapeLikeParameter('shared::/') . '%'),
+				$queryBuilder->createNamedParameter($this->connection->escapeLikeParameter('shared::/').'%'),
 				IQueryBuilder::PARAM_STR)
 			)->orderBy('numeric_id');
 		$query = $queryBuilder->execute();
@@ -172,7 +172,7 @@ 
 		$remoteShareIds = [];
 
 		while ($row = $query->fetch()) {
-			$remoteShareIds[$row['id']] = 'shared::' . md5($row['share_token'] . '@' . $row['remote']);
+			$remoteShareIds[$row['id']] = 'shared::'.md5($row['share_token'].'@'.$row['remote']);
 		}
 
 		return $remoteShareIds;

Indentation +143 added lines, -143 removed lines

@@ -37,147 +37,147 @@
  */
 class CleanupRemoteStorages extends Command {
 
-	/**
-	 * @var IDBConnection
-	 */
-	protected $connection;
-
-	public function __construct(IDBConnection $connection) {
-		$this->connection = $connection;
-		parent::__construct();
-	}
-
-	protected function configure() {
-		$this
-			->setName('sharing:cleanup-remote-storages')
-			->setDescription('Cleanup shared storage entries that have no matching entry in the shares_external table')
-			->addOption(
-				'dry-run',
-				null,
-				InputOption::VALUE_NONE,
-				'only show which storages would be deleted'
-			);
-	}
-
-	public function execute(InputInterface $input, OutputInterface $output) {
-
-		$remoteStorages = $this->getRemoteStorages();
-
-		$output->writeln(count($remoteStorages) . ' remote storage(s) need(s) to be checked');
-
-		$remoteShareIds = $this->getRemoteShareIds();
-
-		$output->writeln(count($remoteShareIds) . ' remote share(s) exist');
-
-		foreach ($remoteShareIds as $id => $remoteShareId) {
-			if (isset($remoteStorages[$remoteShareId])) {
-				if ($input->getOption('dry-run') || $output->isVerbose()) {
-					$output->writeln("<info>$remoteShareId belongs to remote share $id</info>");
-				}
-
-				unset($remoteStorages[$remoteShareId]);
-			} else {
-				$output->writeln("<comment>$remoteShareId for share $id has no matching storage, yet</comment>");
-			}
-		}
-
-		if (empty($remoteStorages)) {
-			$output->writeln('<info>no storages deleted</info>');
-		} else {
-			$dryRun = $input->getOption('dry-run');
-			foreach ($remoteStorages as $id => $numericId) {
-				if ($dryRun) {
-					$output->writeln("<error>$id [$numericId] can be deleted</error>");
-					$this->countFiles($numericId, $output);
-				} else {
-					$this->deleteStorage($id, $numericId, $output);
-				}
-			}
-		}
-	}
-
-	public function countFiles($numericId, OutputInterface $output) {
-		$queryBuilder = $this->connection->getQueryBuilder();
-		$queryBuilder->select($queryBuilder->func()->count('fileid'))
-			->from('filecache')
-			->where($queryBuilder->expr()->eq(
-				'storage',
-				$queryBuilder->createNamedParameter($numericId, IQueryBuilder::PARAM_STR),
-				IQueryBuilder::PARAM_STR)
-			);
-		$result = $queryBuilder->execute();
-		$count = $result->fetchColumn();
-		$output->writeln("$count files can be deleted for storage $numericId");
-	}
-
-	public function deleteStorage($id, $numericId, OutputInterface $output) {
-		$queryBuilder = $this->connection->getQueryBuilder();
-		$queryBuilder->delete('storages')
-			->where($queryBuilder->expr()->eq(
-				'id',
-				$queryBuilder->createNamedParameter($id, IQueryBuilder::PARAM_STR),
-				IQueryBuilder::PARAM_STR)
-			);
-		$output->write("deleting $id [$numericId] ... ");
-		$count = $queryBuilder->execute();
-		$output->writeln("deleted $count storage");
-		$this->deleteFiles($numericId, $output);
-	}
-
-	public function deleteFiles($numericId, OutputInterface $output) {
-		$queryBuilder = $this->connection->getQueryBuilder();
-		$queryBuilder->delete('filecache')
-			->where($queryBuilder->expr()->eq(
-				'storage',
-				$queryBuilder->createNamedParameter($numericId, IQueryBuilder::PARAM_STR),
-				IQueryBuilder::PARAM_STR)
-			);
-		$output->write("deleting files for storage $numericId ... ");
-		$count = $queryBuilder->execute();
-		$output->writeln("deleted $count files");
-	}
-
-	public function getRemoteStorages() {
-
-		$queryBuilder = $this->connection->getQueryBuilder();
-		$queryBuilder->select(['id', 'numeric_id'])
-			->from('storages')
-			->where($queryBuilder->expr()->like(
-				'id',
-				// match all 'shared::' + 32 characters storages
-				$queryBuilder->createNamedParameter($this->connection->escapeLikeParameter('shared::') . str_repeat('_', 32)),
-				IQueryBuilder::PARAM_STR)
-			)
-			->andWhere($queryBuilder->expr()->notLike(
-				'id',
-				// but not the ones starting with a '/', they are for normal shares
-				$queryBuilder->createNamedParameter($this->connection->escapeLikeParameter('shared::/') . '%'),
-				IQueryBuilder::PARAM_STR)
-			)->orderBy('numeric_id');
-		$query = $queryBuilder->execute();
-
-		$remoteStorages = [];
-
-		while ($row = $query->fetch()) {
-			$remoteStorages[$row['id']] = $row['numeric_id'];
-		}
-
-		return $remoteStorages;
-	}
-
-	public function getRemoteShareIds() {
-
-		$queryBuilder = $this->connection->getQueryBuilder();
-		$queryBuilder->select(['id', 'share_token', 'remote'])
-			->from('share_external');
-		$query = $queryBuilder->execute();
-
-		$remoteShareIds = [];
-
-		while ($row = $query->fetch()) {
-			$remoteShareIds[$row['id']] = 'shared::' . md5($row['share_token'] . '@' . $row['remote']);
-		}
-
-		return $remoteShareIds;
-	}
+    /**
+     * @var IDBConnection
+     */
+    protected $connection;
+
+    public function __construct(IDBConnection $connection) {
+        $this->connection = $connection;
+        parent::__construct();
+    }
+
+    protected function configure() {
+        $this
+            ->setName('sharing:cleanup-remote-storages')
+            ->setDescription('Cleanup shared storage entries that have no matching entry in the shares_external table')
+            ->addOption(
+                'dry-run',
+                null,
+                InputOption::VALUE_NONE,
+                'only show which storages would be deleted'
+            );
+    }
+
+    public function execute(InputInterface $input, OutputInterface $output) {
+
+        $remoteStorages = $this->getRemoteStorages();
+
+        $output->writeln(count($remoteStorages) . ' remote storage(s) need(s) to be checked');
+
+        $remoteShareIds = $this->getRemoteShareIds();
+
+        $output->writeln(count($remoteShareIds) . ' remote share(s) exist');
+
+        foreach ($remoteShareIds as $id => $remoteShareId) {
+            if (isset($remoteStorages[$remoteShareId])) {
+                if ($input->getOption('dry-run') || $output->isVerbose()) {
+                    $output->writeln("<info>$remoteShareId belongs to remote share $id</info>");
+                }
+
+                unset($remoteStorages[$remoteShareId]);
+            } else {
+                $output->writeln("<comment>$remoteShareId for share $id has no matching storage, yet</comment>");
+            }
+        }
+
+        if (empty($remoteStorages)) {
+            $output->writeln('<info>no storages deleted</info>');
+        } else {
+            $dryRun = $input->getOption('dry-run');
+            foreach ($remoteStorages as $id => $numericId) {
+                if ($dryRun) {
+                    $output->writeln("<error>$id [$numericId] can be deleted</error>");
+                    $this->countFiles($numericId, $output);
+                } else {
+                    $this->deleteStorage($id, $numericId, $output);
+                }
+            }
+        }
+    }
+
+    public function countFiles($numericId, OutputInterface $output) {
+        $queryBuilder = $this->connection->getQueryBuilder();
+        $queryBuilder->select($queryBuilder->func()->count('fileid'))
+            ->from('filecache')
+            ->where($queryBuilder->expr()->eq(
+                'storage',
+                $queryBuilder->createNamedParameter($numericId, IQueryBuilder::PARAM_STR),
+                IQueryBuilder::PARAM_STR)
+            );
+        $result = $queryBuilder->execute();
+        $count = $result->fetchColumn();
+        $output->writeln("$count files can be deleted for storage $numericId");
+    }
+
+    public function deleteStorage($id, $numericId, OutputInterface $output) {
+        $queryBuilder = $this->connection->getQueryBuilder();
+        $queryBuilder->delete('storages')
+            ->where($queryBuilder->expr()->eq(
+                'id',
+                $queryBuilder->createNamedParameter($id, IQueryBuilder::PARAM_STR),
+                IQueryBuilder::PARAM_STR)
+            );
+        $output->write("deleting $id [$numericId] ... ");
+        $count = $queryBuilder->execute();
+        $output->writeln("deleted $count storage");
+        $this->deleteFiles($numericId, $output);
+    }
+
+    public function deleteFiles($numericId, OutputInterface $output) {
+        $queryBuilder = $this->connection->getQueryBuilder();
+        $queryBuilder->delete('filecache')
+            ->where($queryBuilder->expr()->eq(
+                'storage',
+                $queryBuilder->createNamedParameter($numericId, IQueryBuilder::PARAM_STR),
+                IQueryBuilder::PARAM_STR)
+            );
+        $output->write("deleting files for storage $numericId ... ");
+        $count = $queryBuilder->execute();
+        $output->writeln("deleted $count files");
+    }
+
+    public function getRemoteStorages() {
+
+        $queryBuilder = $this->connection->getQueryBuilder();
+        $queryBuilder->select(['id', 'numeric_id'])
+            ->from('storages')
+            ->where($queryBuilder->expr()->like(
+                'id',
+                // match all 'shared::' + 32 characters storages
+                $queryBuilder->createNamedParameter($this->connection->escapeLikeParameter('shared::') . str_repeat('_', 32)),
+                IQueryBuilder::PARAM_STR)
+            )
+            ->andWhere($queryBuilder->expr()->notLike(
+                'id',
+                // but not the ones starting with a '/', they are for normal shares
+                $queryBuilder->createNamedParameter($this->connection->escapeLikeParameter('shared::/') . '%'),
+                IQueryBuilder::PARAM_STR)
+            )->orderBy('numeric_id');
+        $query = $queryBuilder->execute();
+
+        $remoteStorages = [];
+
+        while ($row = $query->fetch()) {
+            $remoteStorages[$row['id']] = $row['numeric_id'];
+        }
+
+        return $remoteStorages;
+    }
+
+    public function getRemoteShareIds() {
+
+        $queryBuilder = $this->connection->getQueryBuilder();
+        $queryBuilder->select(['id', 'share_token', 'remote'])
+            ->from('share_external');
+        $query = $queryBuilder->execute();
+
+        $remoteShareIds = [];
+
+        while ($row = $query->fetch()) {
+            $remoteShareIds[$row['id']] = 'shared::' . md5($row['share_token'] . '@' . $row['remote']);
+        }
+
+        return $remoteShareIds;
+    }
 }

lib/private/legacy/db/statementwrapper.php

Spacing +4 added lines, -4 removed lines

@@ -54,8 +54,8 @@ 
 	/**
 	 * pass all other function directly to the \Doctrine\DBAL\Driver\Statement
 	 */
-	public function __call($name,$arguments) {
-		return call_user_func_array(array($this->statement,$name), $arguments);
+	public function __call($name, $arguments) {
+		return call_user_func_array(array($this->statement, $name), $arguments);
 	}
 
 	/**
@@ -64,7 +64,7 @@ 
 	 * @param array $input
 	 * @return \OC_DB_StatementWrapper|int|bool
 	 */
-	public function execute($input= []) {
+	public function execute($input = []) {
 		$this->lastArguments = $input;
 		if (count($input) > 0) {
 			$result = $this->statement->execute($input);
@@ -113,7 +113,7 @@ 
 	 * @param integer|null $length max length when using an OUT bind
 	 * @return boolean
 	 */
-	public function bindParam($column, &$variable, $type = null, $length = null){
+	public function bindParam($column, &$variable, $type = null, $length = null) {
 		return $this->statement->bindParam($column, $variable, $type, $length);
 	}
 }

Indentation +72 added lines, -72 removed lines

@@ -37,83 +37,83 @@
  * @method array fetchAll(integer $fetchMode = null);
  */
 class OC_DB_StatementWrapper {
-	/**
-	 * @var \Doctrine\DBAL\Driver\Statement
-	 */
-	private $statement = null;
-	private $isManipulation = false;
-	private $lastArguments = array();
+    /**
+     * @var \Doctrine\DBAL\Driver\Statement
+     */
+    private $statement = null;
+    private $isManipulation = false;
+    private $lastArguments = array();
 
-	/**
-	 * @param boolean $isManipulation
-	 */
-	public function __construct($statement, $isManipulation) {
-		$this->statement = $statement;
-		$this->isManipulation = $isManipulation;
-	}
+    /**
+     * @param boolean $isManipulation
+     */
+    public function __construct($statement, $isManipulation) {
+        $this->statement = $statement;
+        $this->isManipulation = $isManipulation;
+    }
 
-	/**
-	 * pass all other function directly to the \Doctrine\DBAL\Driver\Statement
-	 */
-	public function __call($name,$arguments) {
-		return call_user_func_array(array($this->statement,$name), $arguments);
-	}
+    /**
+     * pass all other function directly to the \Doctrine\DBAL\Driver\Statement
+     */
+    public function __call($name,$arguments) {
+        return call_user_func_array(array($this->statement,$name), $arguments);
+    }
 
-	/**
-	 * make execute return the result instead of a bool
-	 *
-	 * @param array $input
-	 * @return \OC_DB_StatementWrapper|int|bool
-	 */
-	public function execute($input= []) {
-		$this->lastArguments = $input;
-		if (count($input) > 0) {
-			$result = $this->statement->execute($input);
-		} else {
-			$result = $this->statement->execute();
-		}
+    /**
+     * make execute return the result instead of a bool
+     *
+     * @param array $input
+     * @return \OC_DB_StatementWrapper|int|bool
+     */
+    public function execute($input= []) {
+        $this->lastArguments = $input;
+        if (count($input) > 0) {
+            $result = $this->statement->execute($input);
+        } else {
+            $result = $this->statement->execute();
+        }
 
-		if ($result === false) {
-			return false;
-		}
-		if ($this->isManipulation) {
-			return $this->statement->rowCount();
-		} else {
-			return $this;
-		}
-	}
+        if ($result === false) {
+            return false;
+        }
+        if ($this->isManipulation) {
+            return $this->statement->rowCount();
+        } else {
+            return $this;
+        }
+    }
 
-	/**
-	 * provide an alias for fetch
-	 *
-	 * @return mixed
-	 */
-	public function fetchRow() {
-		return $this->statement->fetch();
-	}
+    /**
+     * provide an alias for fetch
+     *
+     * @return mixed
+     */
+    public function fetchRow() {
+        return $this->statement->fetch();
+    }
 
-	/**
-	 * Provide a simple fetchOne.
-	 *
-	 * fetch single column from the next row
-	 * @param int $column the column number to fetch
-	 * @return string
-	 */
-	public function fetchOne($column = 0) {
-		return $this->statement->fetchColumn($column);
-	}
+    /**
+     * Provide a simple fetchOne.
+     *
+     * fetch single column from the next row
+     * @param int $column the column number to fetch
+     * @return string
+     */
+    public function fetchOne($column = 0) {
+        return $this->statement->fetchColumn($column);
+    }
 
-	/**
-	 * Binds a PHP variable to a corresponding named or question mark placeholder in the
-	 * SQL statement that was use to prepare the statement.
-	 *
-	 * @param mixed $column Either the placeholder name or the 1-indexed placeholder index
-	 * @param mixed $variable The variable to bind
-	 * @param integer|null $type one of the  PDO::PARAM_* constants
-	 * @param integer|null $length max length when using an OUT bind
-	 * @return boolean
-	 */
-	public function bindParam($column, &$variable, $type = null, $length = null){
-		return $this->statement->bindParam($column, $variable, $type, $length);
-	}
+    /**
+     * Binds a PHP variable to a corresponding named or question mark placeholder in the
+     * SQL statement that was use to prepare the statement.
+     *
+     * @param mixed $column Either the placeholder name or the 1-indexed placeholder index
+     * @param mixed $variable The variable to bind
+     * @param integer|null $type one of the  PDO::PARAM_* constants
+     * @param integer|null $length max length when using an OUT bind
+     * @return boolean
+     */
+    public function bindParam($column, &$variable, $type = null, $length = null){
+        return $this->statement->bindParam($column, $variable, $type, $length);
+    }
 }

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/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/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);
 }

lib/public/Share/Exceptions/GenericShareException.php

Indentation +13 added lines, -13 removed lines

@@ -31,18 +31,18 @@
  */
 class GenericShareException extends HintException {
 
-	/**
-	 * @param string $message
-	 * @param string $hint
-	 * @param int $code
-	 * @param \Exception|null $previous
-	 * @since 9.0.0
-	 */
-	public function __construct($message = '', $hint = '', $code = 0, \Exception $previous = null) {
-		if (empty($message)) {
-			$message = 'There was an error retrieving the share. Maybe the link is wrong, it was unshared, or it was deleted.';
-		}
-		parent::__construct($message, $hint, $code, $previous);
-	}
+    /**
+     * @param string $message
+     * @param string $hint
+     * @param int $code
+     * @param \Exception|null $previous
+     * @since 9.0.0
+     */
+    public function __construct($message = '', $hint = '', $code = 0, \Exception $previous = null) {
+        if (empty($message)) {
+            $message = 'There was an error retrieving the share. Maybe the link is wrong, it was unshared, or it was deleted.';
+        }
+        parent::__construct($message, $hint, $code, $previous);
+    }
 
 }